summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--html.c10
-rw-r--r--xs_mime.h1
2 files changed, 4 insertions, 7 deletions
diff --git a/html.c b/html.c
index 103ce3d..c8015a1 100644
--- a/html.c
+++ b/html.c
@@ -95,14 +95,10 @@ xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems, const char *p
95 // on akkoma instances mediaType is not present. 95 // on akkoma instances mediaType is not present.
96 // but we need to to know if the image is an svg or not. 96 // but we need to to know if the image is an svg or not.
97 // for now, i just use the file extention, which may not be the most reliable... 97 // for now, i just use the file extention, which may not be the most reliable...
98 int is_svg = 0; 98 if (!xs_is_string(mt))
99 if (xs_is_string(mt)) { 99 mt = xs_mime_by_ext(u);
100 is_svg = (strcmp(mt, "image/svg+xml") == 0);
101 } else {
102 is_svg = xs_endswith(u, ".svg");
103 }
104 100
105 if (is_svg && !xs_is_true(xs_dict_get(srv_config, "enable_svg"))) 101 if (strcmp(mt, "image/svg+xml") == 0 && !xs_is_true(xs_dict_get(srv_config, "enable_svg")))
106 s = xs_replace_i(s, n, ""); 102 s = xs_replace_i(s, n, "");
107 else { 103 else {
108 xs *url = make_url(u, proxy, 0); 104 xs *url = make_url(u, proxy, 0);
diff --git a/xs_mime.h b/xs_mime.h
index 6f65382..5f70922 100644
--- a/xs_mime.h
+++ b/xs_mime.h
@@ -38,6 +38,7 @@ const char *xs_mime_types[] = {
38 "ogv", "video/ogg", 38 "ogv", "video/ogg",
39 "opus", "audio/ogg", 39 "opus", "audio/ogg",
40 "png", "image/png", 40 "png", "image/png",
41 "apng", "image/apng",
41 "svg", "image/svg+xml", 42 "svg", "image/svg+xml",
42 "svgz", "image/svg+xml", 43 "svgz", "image/svg+xml",
43 "txt", "text/plain", 44 "txt", "text/plain",