merge: save and restore UI language together with other prefs - fixes #443 (!451 )

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/451 Closes #443 Approved-by: Marie <marie@kaifa.ch>
merge: hide images/videos in og cards, when under a CW - fixes #487 (!488 )
2024-11-25 10:03:08 +02:00 · 2024-04-12 03:13:15 +00:00 · 2024-04-11 20:40:38 +00:00 · 2024-04-07 16:58:13 +01:00
1 changed files with 2 additions and 2 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 images = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive)
-	- const videos = (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive)
+	- const videos = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive)
 block title
 	= `${title} | ${instanceName}`
Author	SHA1	Message	Date
dakkar	dd5ff46b95	merge: save and restore UI language together with other prefs - fixes #443 (!451 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/451 Closes #443 Approved-by: Marie <marie@kaifa.ch>	2024-04-12 03:13:15 +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