From 433d3fcbf143786e1ea2f5c593f4bcef7246b4c0 Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Tue, 3 Mar 2026 16:30:07 -0500 Subject: Separate search into separate functions --- src/routes/(app)/dm/+page.svelte | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/routes/(app)/dm/+page.svelte b/src/routes/(app)/dm/+page.svelte index 5d337139..e82e6351 100644 --- a/src/routes/(app)/dm/+page.svelte +++ b/src/routes/(app)/dm/+page.svelte @@ -294,15 +294,26 @@ muted = await mutedAccounts(user); } - const searchMatches = (chat: object, query: string) => { + const nameMatches = (chat: object, query: string) => { const lowerQuery = query.toLowerCase(); const chatName = name(chat).toLowerCase(); + return chatName.includes(lowerQuery); + } + + const nip05Matches = (chat: object, query: string) => { + const lowerQuery = query.toLowerCase(); const chatNip05 = chat?.nip05; - return chatName.includes(lowerQuery) || - chatNip05 && chatNip05.includes(lowerQuery) || - chat.pubkey.includes(lowerQuery) || + return chatNip05 && chatNip05.includes(lowerQuery); + } + + const pubkeyMatches = (chat: object, query: string) => { + const lowerQuery = query.toLowerCase(); + return chat.pubkey.includes(lowerQuery) || npubEncode(chat.pubkey).includes(lowerQuery); } + + const searchMatches = (chat: object, query: string) => + nameMatches(chat, query) || nip05Matches(chat, query) || pubkeyMatches(chat, query);