mirrors/snac2
3
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-10 03:50:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve (partially) the issue with mentions without server.

Browse Source 
Mastodon (mainly from the API) usually include mentions without server,
which is just stupid. This patch tries to resolve these broken mentions in
process_tags() by looking for a user name starting with it in the already
pre-populated tag list. As of now, this only works if the message is an
inReplyTo and the broken mention is the one of the original
(attributedTo) poster.
This commit is contained in:
default 2023-05-12 11:56:17 +02:00
parent 2e27a805fc
commit d35c949a13
1 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
activitypub.c
View File

@ -368,12 +368,44 @@ void process_tags(snac *snac, const char *content, xs_str **n_content, xs_list *
xs_val *v; xs_val *v;
int n = 0; int n = 0;
split = xs_regex_split(content, "(@[A-Za-z0-9_]+@[A-Za-z0-9\\.-]+|&#[0-9]+;|#[^ ,\\.:;<]+)"); split = xs_regex_split(content, "(@[A-Za-z0-9_]+(@[A-Za-z0-9\\.-]+)?|&#[0-9]+;|#[^ ,\\.:;<]+)");
p = split; p = split;
while (xs_list_iter(&p, &v)) { while (xs_list_iter(&p, &v)) {
if ((n & 0x1)) { if ((n & 0x1)) {
if (*v == '@') { if (*v == '@') {
xs *link = NULL;
if (strchr(v + 1, '@') == NULL) {
/* only one @? it's a dumb Mastodon-like mention
without server; check if there is anybody
whose name starts with this in the tag list */
xs_list *p2 = tl;
xs_dict *v2;
xs *pname = xs_fmt("%s@", v);
while (xs_list_iter(&p2, &v2)) {
const char *type = xs_dict_get(v2, "type");
if (type && strcmp(type, "Mention") == 0) {
const char *name = xs_dict_get(v2, "name");
const char *href = xs_dict_get(v2, "href");
if (name && href && (xs_startswith(name, pname) ||
xs_startswith(name, pname + 1))) {
/* good enough :shrug2: */
link = xs_fmt(
"<a href=\"%s\" class=\"u-url mention\">%s</a>", href, name);
break;
}
}
}
snac_debug(snac, 2, xs_fmt(
"mention without server '%s' (%s)", v, link ? link : "none"));
}
else {
/* query the webfinger about this fellow */ /* query the webfinger about this fellow */
xs *v2 = xs_strip_chars_i(xs_dup(v), "@."); xs *v2 = xs_strip_chars_i(xs_dup(v), "@.");
xs *actor = NULL; xs *actor = NULL;
@ -385,7 +417,6 @@ void process_tags(snac *snac, const char *content, xs_str **n_content, xs_list *
if (valid_status(status)) { if (valid_status(status)) {
xs *d = xs_dict_new(); xs *d = xs_dict_new();
xs *n = xs_fmt("@%s", uid); xs *n = xs_fmt("@%s", uid);
xs *l = xs_fmt("<a href=\"%s\" class=\"u-url mention\">%s</a>", actor, n);
d = xs_dict_append(d, "type", "Mention"); d = xs_dict_append(d, "type", "Mention");
d = xs_dict_append(d, "href", actor); d = xs_dict_append(d, "href", actor);
@ -393,11 +424,13 @@ void process_tags(snac *snac, const char *content, xs_str **n_content, xs_list *
tl = xs_list_append(tl, d); tl = xs_list_append(tl, d);
/* add the code */ link = xs_fmt("<a href=\"%s\" class=\"u-url mention\">%s</a>", actor, n);
nc = xs_str_cat(nc, l);
} }
}
if (!xs_is_null(link))
nc = xs_str_cat(nc, link);
else else
/* store as is */
nc = xs_str_cat(nc, v); nc = xs_str_cat(nc, v);
} }
else else