Fix: Frontend側の不要なTimeoutを削除

Author: mattyatea

packages/backend/src/core/EmojiSuggestionService.ts

@@ -20,6 +20,7 @@ const WORKER_RESPONSE_SCHEMA_VERSION = 'emoji-suggest-worker-response-v1';
 const NORMALIZATION_SCHEMA_VERSION = 'emoji-suggest-normalization-v1';
 const WORKER_OWNED_VERSION_PLACEHOLDER = 'worker-owned';
 const MAX_NORMALIZED_TEXT_LENGTH = 1000;
+const MIN_SUGGESTION_SCORE = 0.4;
 
 export type EmojiSuggestionCandidate = {
 	name: string;
@@ -173,7 +174,7 @@ export class EmojiSuggestionService {
 	}
 
 	private isEligible(note: MiNote): boolean {
-		return note.visibility === 'public';
+		return note.visibility === 'public' || note.visibility === 'home';
 	}
 
 	private createFallback(meta: MiMeta, reason: string): EmojiSuggestionResponse {
@@ -233,6 +234,7 @@ function parseWorkerResponse(value: unknown, maxResults: number): EmojiSuggestio
 	const items: EmojiSuggestionCandidate[] = [];
 	for (const item of value.items) {
 		if (!isWorkerSuggestItem(item)) return createMalformedFallback();
+		if (item.score < MIN_SUGGESTION_SCORE) continue;
 		items.push({
 			name: item.name,
 			score: item.score,

packages/backend/test/unit/EmojiSuggestionService.ts

@@ -82,7 +82,7 @@ describe('EmojiSuggestionService', () => {
 		};
 	}
 
-	test('calls Worker for public notes regardless of localOnly', async () => {
+	test('calls Worker for public and home notes regardless of localOnly', async () => {
 		const send = vi.fn(async () => jsonResponse(workerResponse()));
 		const { service, logInfo } = createService(createMeta(), send);
 
@@ -125,8 +125,15 @@ describe('EmojiSuggestionService', () => {
 		const localOnlyBody = JSON.parse(send.mock.calls[1][1].body as string) as { eligibility: { visibility: string; localOnly: boolean } };
 		expect(localOnlyBody.eligibility).toEqual({ visibility: 'public', localOnly: true });
 
+		await expect(service.suggestForNote(createNote({ visibility: 'home' }))).resolves.toMatchObject({
+			source: 'live',
+			items: [{ name: 'ablobgoodnightreverse' }],
+		});
+		expect(send).toHaveBeenCalledTimes(3);
+		const homeBody = JSON.parse(send.mock.calls[2][1].body as string) as { eligibility: { visibility: string; localOnly: boolean } };
+		expect(homeBody.eligibility).toEqual({ visibility: 'home', localOnly: false });
+
 		for (const note of [
-			createNote({ visibility: 'home' }),
 			createNote({ visibility: 'followers' }),
 			createNote({ visibility: 'specified' }),
 		]) {
@@ -137,7 +144,7 @@ describe('EmojiSuggestionService', () => {
 			});
 		}
 
-		expect(send).toHaveBeenCalledTimes(2);
+		expect(send).toHaveBeenCalledTimes(3);
 	});
 
 	test('emits redacted backend observability for cache hit, auth failure, and timeout', async () => {
@@ -218,6 +225,23 @@ describe('EmojiSuggestionService', () => {
 		}
 	});
 
+	test('filters proxied Worker suggestions below the minimum score', async () => {
+		const send = vi.fn(async () => jsonResponse(workerResponse({
+			items: [
+				{ name: 'below-threshold', score: 0.39, aliases: ['below'], category: 'fixture' },
+				{ name: 'threshold-ok', score: 0.4, aliases: ['threshold'], category: 'fixture' },
+			],
+		})));
+		const { service, logInfo } = createService(createMeta(), send);
+
+		await expect(service.suggestForNote(createNote({ visibility: 'home' }))).resolves.toMatchObject({
+			source: 'live',
+			items: [{ name: 'threshold-ok', score: 0.4 }],
+		});
+		expect(send).toHaveBeenCalledTimes(1);
+		expect(readLastLogEvent(logInfo)).toMatchObject({ resultCount: 1 });
+	});
+
 	test('normalizes cw notes without exposing hidden body text', () => {
 		const normalized = normalizeEmojiSuggestionNoteText(createNote({
 			cw: 'fixture cw @alice https://example.invalid',

packages/frontend/src/components/MkEmojiPicker.vue

@@ -176,8 +176,8 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 
 const router = useRouter();
 const PREVIEW_DELAY = 500;
-const SUGGESTION_TIMEOUT_MS = 1500;
 const FALLBACK_SUGGESTION_LIMIT = 8;
+const MIN_SUGGESTION_SCORE = 0.4;
 
 type EmojiSuggestionItem = {
 	name: string;
@@ -308,7 +308,6 @@ const suggestedEmojis = ref<Misskey.entities.EmojiSimple[]>([]);
 const tab = ref<'index' | 'custom' | 'unicode' | 'tags'>('index');
 
 let suggestionAbortController: AbortController | null = null;
-let suggestionTimeoutId: number | null = null;
 
 const customEmojiFolderRoot: CustomEmojiFolderTree = { value: '', category: '', children: [] };
 
@@ -517,15 +516,10 @@ function canRequestSuggestions(): boolean {
 	return props.asReactionPicker === true &&
 		instance.emojiSuggestion?.enabled === true &&
 		note != null &&
-		note.visibility === 'public';
+		(note.visibility === 'public' || note.visibility === 'home');
 }
 
 function clearSuggestionRequest(): void {
-	if (suggestionTimeoutId !== null) {
-		window.clearTimeout(suggestionTimeoutId);
-		suggestionTimeoutId = null;
-	}
-
 	if (suggestionAbortController !== null) {
 		suggestionAbortController.abort();
 		suggestionAbortController = null;
@@ -538,6 +532,8 @@ function normalizeSuggestionItems(items: EmojiSuggestionItem[]): Misskey.entitie
 	const emojis: Misskey.entities.EmojiSimple[] = [];
 
 	for (const item of items) {
+		if (item.score < MIN_SUGGESTION_SCORE) continue;
+
 		const name = item.name.replaceAll(':', '').trim();
 		if (name === '' || seen.has(name)) continue;
 
@@ -583,9 +579,6 @@ async function loadSuggestedEmojis(): Promise<void> {
 	const noteId = props.targetNote!.id;
 	const abortController = new AbortController();
 	suggestionAbortController = abortController;
-	suggestionTimeoutId = window.setTimeout(() => {
-		abortController.abort();
-	}, SUGGESTION_TIMEOUT_MS);
 
 	try {
 		const response: unknown = await misskeyApi('notes/reactions/suggestions', {
@@ -603,10 +596,6 @@ async function loadSuggestedEmojis(): Promise<void> {
 		}
 	} finally {
 		if (suggestionAbortController === abortController) {
-			if (suggestionTimeoutId !== null) {
-				window.clearTimeout(suggestionTimeoutId);
-				suggestionTimeoutId = null;
-			}
 			suggestionAbortController = null;
 		}
 	}

packages/frontend/test/emoji-picker-suggestions.test.ts

@@ -136,6 +136,26 @@ const fallbackEmoji: Misskey.entities.EmojiSimple = {
 	roleIdsThatCanBeUsedThisEmojiAsReaction: [],
 };
 
+const thresholdEmoji: Misskey.entities.EmojiSimple = {
+	name: 'threshold_ok',
+	aliases: ['threshold'],
+	category: 'story',
+	url: '/client-assets/about-icon.png',
+	localOnly: false,
+	isSensitive: false,
+	roleIdsThatCanBeUsedThisEmojiAsReaction: [],
+};
+
+const belowThresholdEmoji: Misskey.entities.EmojiSimple = {
+	name: 'below_threshold',
+	aliases: ['below'],
+	category: 'story',
+	url: '/client-assets/about-icon.png',
+	localOnly: false,
+	isSensitive: false,
+	roleIdsThatCanBeUsedThisEmojiAsReaction: [],
+};
+
 function createNote(overrides: Partial<Misskey.entities.Note> = {}): Misskey.entities.Note {
 	return {
 		id: 'qa-note-fixture',
@@ -210,7 +230,7 @@ beforeEach(() => {
 	clearFlatEmojiSuggestionPublicMeta();
 	setEmojiSuggestionPublicMeta({ enabled: true, maxSuggestions: 4 });
 
-	customEmojis.value = [suggestedEmoji, fallbackEmoji];
+	customEmojis.value = [suggestedEmoji, fallbackEmoji, thresholdEmoji, belowThresholdEmoji];
 	mockedRecentlyUsedEmojis.value = [];
 	customEmojisMap.clear();
 	for (const emoji of customEmojis.value) {
@@ -327,8 +347,64 @@ describe('MkEmojiPicker emoji suggestions QA flows', () => {
 		expect(mockedMisskeyApi.mock.calls[0][0]).toBe('notes/reactions/suggestions');
 	});
 
+	test('shows eligible home suggestions', async () => {
+		mockedMisskeyApi.mockResolvedValueOnce({
+			items: [{
+				name: suggestedEmoji.name,
+				score: 0.98,
+				aliases: suggestedEmoji.aliases,
+				category: suggestedEmoji.category,
+			}],
+			source: 'live',
+			reason: 'component-test',
+			modelVersion: 'fixture-model',
+			emojiIndexVersion: 'fixture-index',
+		});
+
+		const result = await renderPicker({
+			targetNote: createNote({ visibility: 'home' }),
+			pinnedEmojis: [':fallback_ok:'],
+		});
+
+		await waitFor(() => expect(result.getByText('Suggested')).not.toBeNull());
+		await waitFor(() => expect(mockedMisskeyApi).toHaveBeenCalledTimes(1));
+		expect(mockedMisskeyApi.mock.calls[0][0]).toBe('notes/reactions/suggestions');
+	});
+
+	test('filters suggestion items below the minimum score before rendering', async () => {
+		mockedMisskeyApi.mockResolvedValueOnce({
+			items: [
+				{
+					name: belowThresholdEmoji.name,
+					score: 0.39,
+					aliases: belowThresholdEmoji.aliases,
+					category: belowThresholdEmoji.category,
+				},
+				{
+					name: thresholdEmoji.name,
+					score: 0.4,
+					aliases: thresholdEmoji.aliases,
+					category: thresholdEmoji.category,
+				},
+			],
+			source: 'live',
+			reason: 'component-test',
+			modelVersion: 'fixture-model',
+			emojiIndexVersion: 'fixture-index',
+		});
+
+		const result = await renderPicker({
+			targetNote: createNote({ visibility: 'home' }),
+			pinnedEmojis: [':fallback_ok:'],
+		});
+
+		await waitFor(() => expect(result.getByText('Suggested')).not.toBeNull());
+		await waitFor(() => expect(mockedMisskeyApi).toHaveBeenCalledTimes(1));
+		expect(result.container.querySelector('[data-emoji=":threshold_ok:"]')).not.toBeNull();
+		expect(result.container.querySelector('[data-emoji=":below_threshold:"]')).toBeNull();
+	});
+
 	test.each([
-		{ visibility: 'home' },
 		{ visibility: 'followers' },
 		{ visibility: 'specified' },
 	] satisfies Partial<Misskey.entities.Note>[])('does not request suggestions for ineligible note fixture %#', async (overrides) => {