mastoapi: minor fix in verify_credentials.

This commit is contained in:
default 2023-08-16 18:18:46 +02:00
parent a291d3d9bf
commit d26b31ed1d
3 changed files with 51 additions and 2 deletions

View File

@ -980,7 +980,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
if (logged_in) {
xs *acct = xs_dict_new();
acct = xs_dict_append(acct, "id", xs_dict_get(snac1.config, "uid"));
acct = xs_dict_append(acct, "id", snac1.md5);
acct = xs_dict_append(acct, "username", xs_dict_get(snac1.config, "uid"));
acct = xs_dict_append(acct, "acct", xs_dict_get(snac1.config, "uid"));
acct = xs_dict_append(acct, "display_name", xs_dict_get(snac1.config, "name"));

View File

@ -8,6 +8,8 @@ xs_list *xs_regex_split_n(const char *str, const char *rx, int count);
#define xs_regex_split(str, rx) xs_regex_split_n(str, rx, XS_ALL)
xs_list *xs_regex_match_n(const char *str, const char *rx, int count);
#define xs_regex_match(str, rx) xs_regex_match_n(str, rx, XS_ALL)
xs_list *xs_regex_replace_n(const char *str, const char *rx, const char *rep, int count);
#define xs_regex_replace(str, rx, rep) xs_regex_replace_n(str, rx, rep, XS_ALL)
#ifdef XS_IMPLEMENTATION
@ -75,6 +77,53 @@ xs_list *xs_regex_match_n(const char *str, const char *rx, int count)
return list;
}
xs_list *xs_regex_replace_n(const char *str, const char *rx, const char *rep, int count)
/* replaces all matches with the rep string. If it contains unescaped &,
they are replaced with the match */
{
xs_str *s = xs_str_new(NULL);
xs *split = xs_regex_split_n(str, rx, count);
xs_list *p;
xs_val *v;
int n = 0;
int pholder = !!strchr(rep, '&');
p = split;
while (xs_list_iter(&p, &v)) {
if (n & 0x1) {
if (pholder) {
/* rep has a placeholder; process char by char */
const char *p = rep;
while (*p) {
if (*p == '&')
s = xs_str_cat(s, v);
else {
if (*p == '\\')
p++;
if (!*p)
break;
s = xs_append_m(s, p, 1);
}
p++;
}
}
else
s = xs_str_cat(s, rep);
}
else
s = xs_str_cat(s, v);
n++;
}
return s;
}
#endif /* XS_IMPLEMENTATION */
#endif /* XS_REGEX_H */

View File

@ -1 +1 @@
/* 17cae699036ab791f9bd4e9c1b875b1f808121f0 */
/* b7e9713d90382d8da0b58023f4c78416e6ca1bc5 */