Commit graph

4551 commits

Author SHA1 Message Date
Hazelnoot
018b3d3dee merge: Better beta emoji panel (!1146)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1146

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-09-25 14:44:36 -04:00
Hazelnoot
0100bc68cc merge: Replace confusing "always show ads" setting with "hide ads" (!1134)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1134

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-09-25 14:08:35 -04:00
Marie
741e612508 merge: Expand Mandatory CW feature and fixup block/mute/silence features (resolves #809, #910, #912, #943, #1064, #1142, and #1186) (!1148)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1148

Closes #809, #910, #912, #943, #1064, #1142, and #1186

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-09-25 20:05:46 +02:00
Hazelnoot
49901cc46b merge: Conditional role tester (!1201)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1201

Closes #897

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-09-14 06:56:13 -04:00
Hazelnoot
857ed9b90a merge: Fix moderation status badges (!1223)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1223

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-09-13 14:32:49 -04:00
Hazelnoot
13b6097a12 merge: Allow for sending announcement mails with List-Unsubscribe: (!1164)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1164

Closes #854

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-09-13 12:32:39 -04:00
Hazelnoot
39dfe47d6a replace dynamic class name with inline styles for SkBadgeStrip 2025-09-13 11:43:52 -04:00
Hazelnoot
0cfb48d363 fix missing CSS in SkBadgeStrip 2025-09-13 11:43:52 -04:00
Hazelnoot
52efe033f5 fix inverted canHideAds condition 2025-09-13 11:39:54 -04:00
Hazelnoot
f95ed0faa7 re-use existing "forceShowAds" preference model 2025-09-13 11:39:53 -04:00
Hazelnoot
dc9c6a34b6 disable hide ads setting instead of excluding it 2025-09-13 11:39:53 -04:00
Hazelnoot
b6b87b320e replace confusing "always show ads" setting with "hide ads" 2025-09-13 11:39:53 -04:00
Hazelnoot
c66020c6cd restore appendContentWarning 2025-09-13 11:34:39 -04:00
Hazelnoot
641180fb2f fix muted notes not filling their container 2025-09-13 11:34:39 -04:00
Hazelnoot
b3428480de hide mandatory CWs when "uncollapse CWs on notes" is enabled 2025-09-13 11:34:38 -04:00
Hazelnoot
97371bd893 update get-note-summary (both copies) to use same wording as SkMutedNote 2025-09-13 11:34:38 -04:00
Hazelnoot
84ffc6361b fix duplicate mandatory CWs in following feed 2025-09-13 11:34:38 -04:00
Hazelnoot
f3d7229c55 add missing instance mandatory CW to frontend getNoteSummary 2025-09-13 11:34:38 -04:00
Hazelnoot
f1fc8bc357 add bypassSilence property at note level to fix silenced users' self-boosts showing a warning even when the user is followed 2025-09-13 11:34:37 -04:00
Hazelnoot
0f2e8fd454 disable silence for the entire user profile section 2025-09-13 11:34:37 -04:00
Hazelnoot
f9a45238e9 fix mute overrides for bulk-disabling silence 2025-09-13 11:34:37 -04:00
Hazelnoot
21f3834729 exclude user / instance mandatoryCW when bypassSilence is set 2025-09-13 11:34:37 -04:00
Hazelnoot
7728e749f1 return bypassSilence to the frontend and remove isSilencedForMe 2025-09-13 11:34:37 -04:00
Hazelnoot
e425d841b1 fix vue warning about defineExpose import 2025-09-13 11:34:37 -04:00
Hazelnoot
bc16dc78d4 add instance.isSilencedForMe 2025-09-13 11:34:37 -04:00
Hazelnoot
455be9e197 replace note.isSilenced with user.isSilencedForMe 2025-09-13 11:34:36 -04:00
Hazelnoot
b76bb672d9 bulk-expand silenced notes 2025-09-13 11:34:36 -04:00
Hazelnoot
e5dfcf6f64 fix SkPatternTest 2025-09-13 11:34:36 -04:00
Hazelnoot
0a97e442b2 count "isSilenced" as a mute condition 2025-09-13 11:34:36 -04:00
Hazelnoot
64694be004 mute silenced notes in frontend 2025-09-13 11:34:36 -04:00
Hazelnoot
24e14c78fd fix optional parameter in SkPatternText 2025-09-13 11:34:36 -04:00
Hazelnoot
62ec2ff34e move mandatory CW button above edit controls in note menu 2025-09-13 11:34:36 -04:00
Hazelnoot
a04f49b932 move "force CW" button to moderation section 2025-09-13 11:34:36 -04:00
Hazelnoot
1448533957 add context menu to set user CW 2025-09-13 11:34:36 -04:00
Hazelnoot
ba433d8914 don't recursively check mute text and improve grouping 2025-09-13 11:34:36 -04:00
Hazelnoot
179c7e18bd don't recurse for word mutes in sub-notes and following-feed entries 2025-09-13 11:34:36 -04:00
Hazelnoot
8652a4c63b allow SkMutedNote to not recurse for word mutes 2025-09-13 11:34:36 -04:00
Hazelnoot
57b9988c81 bulk-expand mandatory CWs on the following feed's user view 2025-09-13 11:34:36 -04:00
Hazelnoot
dfb3106dea propagate mute expand events from all note types 2025-09-13 11:34:36 -04:00
Hazelnoot
ffcb6de3c0 expand matching user/instance in DynamicNote 2025-09-13 11:34:36 -04:00
Hazelnoot
d62be884b3 replace "Mark instance as NSFW" toggle with an instance-level mandatory CW 2025-09-13 11:34:36 -04:00
Hazelnoot
604f5a5c68 fix SkPatternTest.vue 2025-09-13 11:34:36 -04:00
Hazelnoot
376997cbcc limit length of instance name in mutes 2025-09-13 11:34:36 -04:00
Hazelnoot
9f0fdbbb51 bulk-expand mandatory CWs 2025-09-13 11:34:36 -04:00
Hazelnoot
4847257011 fix bulk expand mute 2025-09-13 11:34:35 -04:00
Hazelnoot
40695c7925 expand all user/instance mutes when viewing a user's profile 2025-09-13 11:34:35 -04:00
Hazelnoot
ca9410e4fe allow mutes to be overridden by DI 2025-09-13 11:34:35 -04:00
Hazelnoot
812a82d41e emit event when expanding a muted note 2025-09-13 11:34:35 -04:00
Hazelnoot
5e0115335a add mandatory CW for instances 2025-09-13 11:34:35 -04:00
Hazelnoot
595c004a74 show mute info on single line 2025-09-13 11:34:35 -04:00