merge: allow custom oneko image via themes - fixes #472 (!478 )

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/478 Closes #472
merge: hide images/videos in og cards, when under a CW - fixes #487 (!488 )
2024-11-22 12:33:08 +02:00 · 2024-04-12 20:01:05 +00:00 · 2024-04-11 20:40:38 +00:00 · 2024-04-07 16:58:13 +01:00 · 2024-03-23 12:19:13 +00:00
2 changed files with 3 additions and 3 deletions
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@ -5,8 +5,8 @@ block vars
 	- const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
 	- const url = `${config.url}/notes/${note.id}`;
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
-	- const images = (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive)
-	- const videos = (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive)
+	- const images = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive)
+	- const videos = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive)

 block title
 	= `${title} | ${instanceName}`
--- a/packages/frontend/src/components/SkOneko.vue
+++ b/packages/frontend/src/components/SkOneko.vue
@ -235,6 +235,6 @@ onMounted(init);
 	pointer-events: none;
 	image-rendering: pixelated;
 	z-index: 2147483647;
-	background-image: url(/client-assets/oneko.gif);
+	background-image: var(--oneko-image, url(/client-assets/oneko.gif));
 }
 </style>
Author	SHA1	Message	Date
dakkar	e3609c61ae	merge: allow custom oneko image via themes - fixes #472 (!478 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/478 Closes #472	2024-04-12 20:01:05 +00:00
dakkar	e0afeff248	merge: hide images/videos in og cards, when under a CW - fixes #487 (!488 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/488 Closes #487 Approved-by: Marie <marie@kaifa.ch> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>	2024-04-11 20:40:38 +00:00
dakkar	56dca6dbf5	hide images/videos in og cards, when under a CW - fixes #487	2024-04-07 16:58:13 +01:00
dakkar	74362af828	allow custom oneko image via themes - fixes #472 after this change, one can set a custom image by: * upload an appropriate image to the drive (some images can be found at https://github.com/vencordcss/onekocord/tree/main/onekoskins), possibly with the "keep original" option set * copy the URL to the image in the drive * create/edit a theme so that it contains (inside `props`): "oneko-image": '"url(https://yourinstance.example.com/files/ee17b385-a084-4e2a-b531-225dfb96cc3c)', with the proper URL That's it!	2024-03-23 12:19:13 +00:00