moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'revert-844103c0' into 'main' 

Revert "Merge branch 'nip19-mentions' into 'main'"

See merge request soapbox-pub/ditto!354
This commit is contained in:
Alex Gleason 2024-06-03 17:52:50 +00:00
parent 844103c047 a4b96f0a9c
commit 2f0c5f4abd
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/utils/note.ts
View File

@ -1,7 +1,7 @@
import 'linkify-plugin-hashtag'; import 'linkify-plugin-hashtag';
import linkifyStr from 'linkify-string'; import linkifyStr from 'linkify-string';
import linkify from 'linkifyjs'; import linkify from 'linkifyjs';
import { nip21 } from 'nostr-tools'; import { nip19, nip21 } from 'nostr-tools';
import { Conf } from '@/config.ts'; import { Conf } from '@/config.ts';
import { getUrlMediaType, isPermittedMediaType } from '@/utils/media.ts'; import { getUrlMediaType, isPermittedMediaType } from '@/utils/media.ts';
@ -18,10 +18,15 @@ const linkifyOpts: linkify.Opts = {
}, },
url: ({ content }) => { url: ({ content }) => {
try { try {
const { value } = nip21.parse(content); const { decoded } = nip21.parse(content);
const name = value.substring(0, 8); const pubkey = getDecodedPubkey(decoded);
const href = Conf.local(`/@${value}`); if (pubkey) {
const name = pubkey.substring(0, 8);
const href = Conf.local(`/users/${pubkey}`);
return `<span class="h-card"><a class="u-url mention" href="${href}" rel="ugc">@<span>${name}</span></a></span>`; return `<span class="h-card"><a class="u-url mention" href="${href}" rel="ugc">@<span>${name}</span></a></span>`;
} else {
return '';
}
} catch { } catch {
return `<a href="${content}">${content}</a>`; return `<a href="${content}">${content}</a>`;
} }
@ -103,4 +108,14 @@ function isLinkURL(link: Link): boolean {
return link.type === 'url'; return link.type === 'url';
} }
/** Get pubkey from decoded bech32 entity, or undefined if not applicable. */
function getDecodedPubkey(decoded: nip19.DecodeResult): string | undefined {
switch (decoded.type) {
case 'npub':
return decoded.data;
case 'nprofile':
return decoded.data.pubkey;
}
}
export { getMediaLinks, parseNoteContent, stripimeta }; export { getMediaLinks, parseNoteContent, stripimeta };