Revert "Merge branch 'nip19-mentions' into 'main'"
This reverts merge request !353
This commit is contained in:
parent
844103c047
commit
a4b96f0a9c
|
@ -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 };
|
||||||
|
|
Loading…
Reference in New Issue