skorotkiewicz/yosup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better mention support, fixed open thread.

Browse source
This commit is contained in:
Thomas Mathews 2023-01-20 10:00:57 -08:00
parent 21ce55f1cd
commit 3970bb5acd
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/ui/fmt.js
View file

@ -32,8 +32,7 @@ function format_content(model, ev, show_media) {
}
const content = (ev.kind == KIND_DM ? ev.decrypted || ev.content : ev.content)
.trim();
const body = fmt_mentions(model, fmt_body(content, show_media),
event_get_tag_values(ev));
const body = fmt_mentions(model, fmt_body(content, show_media), ev.tags);
let cw = get_content_warning(ev.tags)
if (cw !== null) {
let cwHTML = "Content Warning"
@ -78,15 +77,20 @@ function fmt_mentions(model, str, tags) {
}
if (x == "")
continue;
// Specification says it's 0-based
let ref = tags[parseInt(x)];
if (!ref) {
let tag = tags[parseInt(x)];
if (!tag) {
buf += `#[${x}]`
continue;
}
let profile = model_get_profile(model, ref);
buf += `<span class="username clickable" data-pubkey="${ref}">
${fmt_name(profile)}</span>`;
let ref = tag[1];
if (tag[0] == 'e') {
buf += `<span class="clickable bold" action="open-thread"
data-thread-id="${ref}">note:${fmt_pubkey(ref)}</span>`;
} else if (tag[0] == 'p') {
let profile = model_get_profile(model, ref);
buf += `<span class="username clickable" data-pubkey="${ref}">
${fmt_name(profile)}</span>`;
}
}
return buf;
}