mirror of
https://codeberg.org/grunfink/snac2.git
synced 2024-11-21 21:05:05 +00:00
Merge branch 'master' of comam.es:git/snac2
This commit is contained in:
commit
b2555fb6b9
3 changed files with 18 additions and 16 deletions
16
data.c
16
data.c
|
@ -3650,3 +3650,19 @@ t_announcement *announcement(const double after)
|
|||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
xs_str *make_url(const char *href, const char *proxy)
|
||||
/* makes an URL, possibly including proxying */
|
||||
{
|
||||
xs_str *url = NULL;
|
||||
|
||||
if (proxy && !xs_startswith(href, srv_baseurl)) {
|
||||
xs *p = xs_str_cat(xs_dup(proxy), "/proxy/");
|
||||
url = xs_replace(href, "https:/" "/", p);
|
||||
}
|
||||
else
|
||||
url = xs_dup(href);
|
||||
|
||||
return url;
|
||||
}
|
||||
|
|
16
html.c
16
html.c
|
@ -42,22 +42,6 @@ int login(snac *snac, const xs_dict *headers)
|
|||
}
|
||||
|
||||
|
||||
xs_str *make_url(const char *href, const char *proxy)
|
||||
/* makes an URL, possibly including proxying */
|
||||
{
|
||||
xs_str *url = NULL;
|
||||
|
||||
if (proxy && !xs_startswith(href, srv_baseurl)) {
|
||||
xs *p = xs_str_cat(xs_dup(proxy), "/proxy/");
|
||||
url = xs_replace(href, "https:/" "/", p);
|
||||
}
|
||||
else
|
||||
url = xs_dup(href);
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
|
||||
xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems, const char *proxy)
|
||||
/* replaces all the :shortnames: with the emojis in tag */
|
||||
{
|
||||
|
|
2
snac.h
2
snac.h
|
@ -409,3 +409,5 @@ typedef struct {
|
|||
char *text;
|
||||
} t_announcement;
|
||||
t_announcement *announcement(double after);
|
||||
|
||||
xs_str *make_url(const char *href, const char *proxy);
|
||||
|
|
Loading…
Reference in a new issue