misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge: Expand Mandatory CW feature and fixup block/mute/silence features (resolves #809, #910, #912, #943, #1064, #1142, and #1186) (!1148)

Browse source 
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>
This commit is contained in:
Marie 2025-09-25 20:05:46 +02:00
commit 741e612508
125 changed files with 3195 additions and 1338 deletions
Download patch file Download diff file Expand all files Collapse all files

54
locales/index.d.ts vendored
View file

@ -9216,6 +9216,14 @@ export interface Locale extends ILocale {
* Apply mandatory CW on users
*/
"write:admin:cw-user": string;
/**
* Apply mandatory CW on notes
*/
"write:admin:cw-note": string;
/**
* Apply mandatory CW on instances
*/
"write:admin:cw-instance": string;
/**
* Silence users
*/
@ -10953,13 +10961,13 @@ export interface Locale extends ILocale {
*/
"setMandatoryCW": string;
/**
* Set remote instance as NSFW
* Set content warning for note
*/
"setRemoteInstanceNSFW": string;
"setMandatoryCWForNote": string;
/**
* Unset remote instance as NSFW
* Set content warning for instance
*/
"unsetRemoteInstanceNSFW": string;
"setMandatoryCWForInstance": string;
/**
* Rejected reports from remote instance
*/
@ -12088,6 +12096,26 @@ export interface Locale extends ILocale {
* {name} said something in a muted thread
*/
"userSaysSomethingInMutedThread": ParameterizedString<"name">;
/**
* {name} has been silenced by {host} staff
*/
"silencedUserSaysSomething": ParameterizedString<"name" | "host">;
/**
* {name} has been silenced by {host} staff
*/
"silencedInstanceSaysSomething": ParameterizedString<"name" | "host">;
/**
* {name} is flagged: "{cw}"
*/
"userIsFlaggedAs": ParameterizedString<"name" | "cw">;
/**
* Note is flagged: "{cw}"
*/
"noteIsFlaggedAs": ParameterizedString<"cw">;
/**
* {name} is flagged: "{cw}"
*/
"instanceIsFlaggedAs": ParameterizedString<"name" | "cw">;
/**
* Mark all media from user as NSFW
*/
@ -13038,9 +13066,25 @@ export interface Locale extends ILocale {
*/
"mandatoryCW": string;
/**
* Applies a content warning to all posts created by this user. If the post already has a CW, then this is appended to the end.
* Applies a content warning to all posts created by this user. The forced warnings will appear like a word mute to distinguish them from the author's own content warnings.
*/
"mandatoryCWDescription": string;
/**
* Force content warning
*/
"mandatoryCWForNote": string;
/**
* Applies an additional content warning to this post. The new warning will appear like a word mute to distinguish it from the author's own content warning.
*/
"mandatoryCWForNoteDescription": string;
/**
* Force content warning
*/
"mandatoryCWForInstance": string;
/**
* Applies a content warning to all posts originating from this instance. The forced warnings will appear like a word mute to distinguish them from the notes' own content warnings.
*/
"mandatoryCWForInstanceDescription": string;
/**
* Fetch linked note
*/