mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

search: parse bech32 ids from pasted URLs

Browse source
This commit is contained in:
Alex Gleason 2024-08-07 12:11:13 -05:00
parent b3eb65f5ce
commit 1efd4fad12
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/controllers/api/search.ts
View file

@ -5,7 +5,7 @@ import { z } from 'zod';
import { AppController } from '@/app.ts'; import { AppController } from '@/app.ts';
import { booleanParamSchema } from '@/schema.ts'; import { booleanParamSchema } from '@/schema.ts';
import { Storages } from '@/storages.ts'; import { Storages } from '@/storages.ts';
import { dedupeEvents } from '@/utils.ts'; import { bech32ToPubkey, dedupeEvents } from '@/utils.ts';
import { nip05Cache } from '@/utils/nip05.ts'; import { nip05Cache } from '@/utils/nip05.ts';
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts'; import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { renderStatus } from '@/views/mastodon/statuses.ts'; import { renderStatus } from '@/views/mastodon/statuses.ts';
@ -60,14 +60,10 @@ const searchController: AppController = async (c) => {
), ),
]); ]);
if ((result.data.type === 'accounts') && (accounts.length < 1) && (result.data.q.match(/npub1\w+/))) { // Render account from pubkey.
const possibleNpub = result.data.q; const pubkey = bech32ToPubkey(result.data.q);
try { if (pubkey && !accounts.find((account) => account.id === pubkey)) {
const npubHex = nip19.decode(possibleNpub); accounts.unshift(await accountFromPubkey(pubkey));
accounts.push(await accountFromPubkey(String(npubHex.data)));
} catch (e) {
console.log(e);
}
} }
return c.json({ return c.json({
@ -130,9 +126,11 @@ async function getLookupFilters({ q, type, resolve }: SearchQuery, signal: Abort
return filters; return filters;
} }
if (new RegExp(`^${nip19.BECH32_REGEX.source}$`).test(q)) { const bech32 = extractBech32(q);
if (bech32) {
try { try {
const result = nip19.decode(q); const result = nip19.decode(bech32);
switch (result.type) { switch (result.type) {
case 'npub': case 'npub':
if (accounts) filters.push({ kinds: [0], authors: [result.data] }); if (accounts) filters.push({ kinds: [0], authors: [result.data] });
@ -151,10 +149,10 @@ async function getLookupFilters({ q, type, resolve }: SearchQuery, signal: Abort
} }
break; break;
} }
} catch (_e) { } catch {
// do nothing // do nothing
} }
} else if (/^[0-9a-f]{64}$/.test(q)) { } else if (n.id().safeParse(q).success) {
if (accounts) filters.push({ kinds: [0], authors: [q] }); if (accounts) filters.push({ kinds: [0], authors: [q] });
if (statuses) filters.push({ kinds: [1], ids: [q] }); if (statuses) filters.push({ kinds: [1], ids: [q] });
} else if (accounts && ACCT_REGEX.test(q)) { } else if (accounts && ACCT_REGEX.test(q)) {
@ -163,7 +161,7 @@ async function getLookupFilters({ q, type, resolve }: SearchQuery, signal: Abort
if (pubkey) { if (pubkey) {
filters.push({ kinds: [0], authors: [pubkey] }); filters.push({ kinds: [0], authors: [pubkey] });
} }
} catch (_e) { } catch {
// do nothing // do nothing
} }
} }
@ -171,4 +169,30 @@ async function getLookupFilters({ q, type, resolve }: SearchQuery, signal: Abort
return filters; return filters;
} }
/** Extract a bech32 ID out of a search query string. */
function extractBech32(value: string): string | undefined {
let bech32: string = value;
try {
const uri = new URL(value);
switch (uri.protocol) {
// Extract from NIP-19 URI, eg `nostr:npub1q3sle0kvfsehgsuexttt3ugjd8xdklxfwwkh559wxckmzddywnws6cd26p`.
case 'nostr:':
bech32 = uri.pathname;
break;
// Extract from URL, eg `https://njump.me/npub1q3sle0kvfsehgsuexttt3ugjd8xdklxfwwkh559wxckmzddywnws6cd26p`.
case 'http:':
case 'https:':
bech32 = uri.pathname.slice(1);
break;
}
} catch {
// do nothing
}
if (n.bech32().safeParse(bech32).success) {
return bech32;
}
}
export { searchController }; export { searchController };