summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authoranatawa12 <anatawa12@icloud.com>2023-11-23 18:56:20 +0900
committerGitHub <noreply@github.com>2023-11-23 18:56:20 +0900
commit864827f788cd1671a4db2ebc159c1c8ab031b7ad (patch)
tree689fa67a1f438cc3410446cd893397d91c2d6725 /packages/backend/src/core
parent絵文字のオートコンプリート強化の対応 (#12365) (diff)
downloadmisskey-864827f788cd1671a4db2ebc159c1c8ab031b7ad.tar.gz
misskey-864827f788cd1671a4db2ebc159c1c8ab031b7ad.tar.bz2
misskey-864827f788cd1671a4db2ebc159c1c8ab031b7ad.zip
Hard mute (#12376)
* feat(backend,misskey-js): hard mute storage in backend * fix(backend,misskey-js): mute word record type * chore(frontend): generalize XWordMute * feat(frontend): configure hard mute * feat(frontend): hard mute notes on the timelines * lint(backend,frontend): fix lint failure * chore(misskey-js): update api.md * fix(backend): test failure * chore(frontend): check word mute for reply * chore: limit hard mute count
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/entities/UserEntityService.ts1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 17e7988176..917f4e06d0 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -473,6 +473,7 @@ export class UserEntityService implements OnModuleInit {
hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id),
unreadNotificationsCount: notificationsInfo?.unreadCount,
mutedWords: profile!.mutedWords,
+ hardMutedWords: profile!.hardMutedWords,
mutedInstances: profile!.mutedInstances,
mutingNotificationTypes: [], // 後方互換性のため
notificationRecieveConfig: profile!.notificationRecieveConfig,