Merge remote-tracking branch 'upstream/main' into patch-3

2024-03-19 10:52:29 +09:00
parent 73dae9f7b5 3abf302b0b
commit ad43d594c9
174 changed files with 7262 additions and 5065 deletions
@@ -59,7 +59,7 @@ export function TagMenu({
  const displayTag = '#' + tag

  const isMuted = Boolean(
-    (preferences?.mutedWords?.find(
+    (preferences?.moderationPrefs.mutedWords?.find(
      m => m.value === tag && m.targets.includes('tag'),
    ) ??
      optimisticUpsert?.find(
@@ -50,7 +50,7 @@ export function TagMenu({
  const {mutateAsync: removeMutedWord, variables: optimisticRemove} =
    useRemoveMutedWordMutation()
  const isMuted = Boolean(
-    (preferences?.mutedWords?.find(
+    (preferences?.moderationPrefs.mutedWords?.find(
      m => m.value === tag && m.targets.includes('tag'),
    ) ??
      optimisticUpsert?.find(