1
0

cleanup, simplify, and merge duplicate word mute implementations

This commit is contained in:
Hazelnoot
2025-05-13 22:58:24 -04:00
parent b52db71e18
commit 8348a36f24
6 changed files with 44 additions and 72 deletions
@@ -4,7 +4,6 @@
*/
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import type { Ref, WritableComputedRef } from 'vue';
import type { PageHeaderItem } from '@/types/page-header.js';
import type { MenuItem } from '@/types/menu.js';
@@ -14,8 +13,6 @@ import { i18n } from '@/i18n.js';
import { popupMenu } from '@/os.js';
import { prefer } from '@/preferences.js';
import { followingTab, followersTab, mutualsTab, defaultFollowingFeedState } from '@/types/following-feed.js';
import { $i } from '@/i';
import { checkWordMute } from '@/utility/check-word-mute';
export function followingTabName(tab: FollowingFeedTab): string;
export function followingTabName(tab: FollowingFeedTab | null | undefined): null;
@@ -153,34 +150,3 @@ function createDefaultStorage(): Ref<StorageInterface> {
}));
}
export function getSoftMutedWords(note: Misskey.entities.Note): string | null {
return getMutedWords(note, $i?.mutedWords);
}
export function getHardMutedWords(note: Misskey.entities.Note): string | null {
return getMutedWords(note, $i?.hardMutedWords);
}
// Match the typing used by Misskey
type Mutes = (string | string[])[] | null | undefined;
// Adapted from MkNote.ts
function getMutedWords(note: Misskey.entities.Note, mutes: Mutes): string | null {
return checkMute(note, mutes)
?? checkMute(note.reply, mutes)
?? checkMute(note.renote, mutes);
}
// Adapted from check-word-mute.ts
function checkMute(note: Misskey.entities.Note | undefined | null, mutes: Mutes): string | null {
if (!note) {
return null;
}
if (!mutes || mutes.length < 1) {
return null;
}
const mutedWords = checkWordMute(note, $i, mutes);
return mutedWords ? mutedWords.flat(2).join(', ') : null;
}