diff --git a/locales/index.d.ts b/locales/index.d.ts index 6a9d9f294e..0ac3fe5844 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -12096,6 +12096,10 @@ export interface Locale extends ILocale { * {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}" */ diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index a8667b4469..49b7a05666 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -593,6 +593,7 @@ export class UserEntityService implements OnModuleInit { faviconUrl: instance.faviconUrl, themeColor: instance.themeColor, isSilenced: instance.isSilenced, + isSilencedForMe: !bypassSilence && instance.isSilenced, mandatoryCW: instance.mandatoryCW, } : undefined), followersCount: followersCount ?? 0, diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts index 54c4ba3516..5b0ecf181c 100644 --- a/packages/backend/src/models/json-schema/user.ts +++ b/packages/backend/src/models/json-schema/user.ts @@ -232,6 +232,10 @@ export const packedUserLiteSchema = { type: 'boolean', nullable: false, optional: false, }, + isSilencedForMe: { + type: 'boolean', + nullable: false, optional: false, + }, mandatoryCW: { type: 'string', nullable: true, optional: false, diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue index fac948a987..9765c6b212 100644 --- a/packages/frontend/src/components/SkMutedNote.vue +++ b/packages/frontend/src/components/SkMutedNote.vue @@ -20,7 +20,7 @@ Displays a placeholder for a muted note.