mirrors/misskey
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-08-08 16:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

make calculateMuteStatus return array with checkOnly = true and split calculateMuteStatus into word mute part and built-in soft mute part (#17829)

Browse Source 
* refactor: make calculateMuteStatus return array even when checkOnly = true

* refactor: simplify calculateMuteStatus result type

* refactor: split calculateMuteStatus into word mute part and built-in part
This commit is contained in:
anatawa12
2026-08-04 17:38:18 +09:00
committed by GitHub
parent 1c82afbc23
commit b812ddbbf2
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/src/composables/use-note.ts
+15 -17
View File
@@ -62,36 +62,34 @@ export interface UseNoteOptions {
currentAntenna?: Ref<Misskey.entities.Antenna | null> | null;
}
export function calculateMuteStatus<
CheckOnly extends boolean,
CheckForSensitiveMedia extends boolean,
ReturnTypeA = CheckOnly extends true ? boolean : Array<string | string[]> | false | 'sensitiveMute',
ReturnTypeB = CheckForSensitiveMedia extends true ? ReturnTypeA : Exclude<ReturnTypeA, 'sensitiveMute'>,
>(
export function checkNoteWordMute(
noteToCheck: Misskey.entities.Note,
user: typeof $i,
mutedWords: Array<string | string[]> | null,
checkForSensitiveMedia: CheckForSensitiveMedia,
checkOnly: CheckOnly = false as CheckOnly,
): ReturnTypeB {
): Array<string | string[]> | false {
if (mutedWords != null) {
const result = checkWordMute(noteToCheck, user, mutedWords);
if (Array.isArray(result)) return checkOnly ? (result.length > 0) as ReturnTypeB : result as ReturnTypeB;
if (Array.isArray(result)) return result;
const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, user, mutedWords);
if (Array.isArray(replyResult)) return checkOnly ? (replyResult.length > 0) as ReturnTypeB : replyResult as ReturnTypeB;
if (Array.isArray(replyResult)) return replyResult;
const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, user, mutedWords);
if (Array.isArray(renoteResult)) return checkOnly ? (renoteResult.length > 0) as ReturnTypeB : renoteResult as ReturnTypeB;
if (Array.isArray(renoteResult)) return renoteResult;
}
if (checkOnly) return false as ReturnTypeB;
return false;
}
export function checkBuiltinSoftMute(
noteToCheck: Misskey.entities.Note,
checkForSensitiveMedia: boolean,
): 'sensitiveMute' | false {
if (checkForSensitiveMedia && noteToCheck.files?.some((v) => v.isSensitive)) {
return 'sensitiveMute' as ReturnTypeB;
return 'sensitiveMute' as never;
}
return false as ReturnTypeB;
return false;
}
/** MkNote, MkNoteDetailedの共通ロジック */
@@ -146,8 +144,8 @@ export function useNote(
// ミュート判定
// mutedはミュート解除の操作で書き換わるのでrefだが、hardMutedは解除できないのでリアクティブにしない
const muted = ref($i ? calculateMuteStatus(appearNote, $i, $i.mutedWords, inTimeline && !tl_withSensitive.value) : false);
const hardMuted = props.withHardMute && $i ? calculateMuteStatus(appearNote, $i, $i.hardMutedWords, inTimeline && !tl_withSensitive.value, true) : false;
const muted = ref($i ? checkNoteWordMute(appearNote, $i, $i.mutedWords) || checkBuiltinSoftMute(appearNote, inTimeline && !tl_withSensitive.value) : false);
const hardMuted = props.withHardMute && $i ? checkNoteWordMute(appearNote, $i, $i.hardMutedWords) : false;
// 導出値
// rawNote / appearNote / $i.id / prefer.s は変化しないので一度だけ計算する