From 749dbef349c53ff9bf13f705e674c72ac76e20ca Mon Sep 17 00:00:00 2001 From: default Date: Thu, 21 Sep 2023 21:25:45 +0200 Subject: [PATCH] Used xs_match() in some places. --- Makefile | 2 +- html.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ffad6c2..daf6743 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ data.o: data.c xs.h xs_io.h xs_json.h xs_openssl.h xs_glob.h xs_set.h \ xs_time.h snac.h format.o: format.c xs.h xs_regex.h xs_mime.h snac.h html.o: html.c xs.h xs_io.h xs_json.h xs_regex.h xs_set.h xs_openssl.h \ - xs_time.h xs_mime.h snac.h + xs_time.h xs_mime.h xs_match.h snac.h http.o: http.c xs.h xs_io.h xs_openssl.h xs_curl.h xs_time.h xs_json.h \ snac.h httpd.o: httpd.c xs.h xs_io.h xs_json.h xs_socket.h xs_httpd.h xs_mime.h \ diff --git a/html.c b/html.c index e8d31a3..175dcdc 100644 --- a/html.c +++ b/html.c @@ -9,6 +9,7 @@ #include "xs_openssl.h" #include "xs_time.h" #include "xs_mime.h" +#include "xs_match.h" #include "snac.h" @@ -203,8 +204,7 @@ xs_str *html_msg_icon(xs_str *os, const xs_dict *msg) int priv = 0; const char *type = xs_dict_get(msg, "type"); - if (strcmp(type, "Note") == 0 || strcmp(type, "Question") == 0 || - strcmp(type, "Page") == 0 || strcmp(type, "Article") == 0) + if (xs_match(type, "Note|Question|Page|Article")) url = xs_dict_get(msg, "id"); priv = !is_msg_public(msg); @@ -1387,8 +1387,7 @@ xs_str *html_entry(snac *user, xs_str *os, const xs_dict *msg, int local, continue; /* infer MIME type from non-specific attachments */ - if (xs_list_len(attach) < 2 && - (strcmp(t, "Link") == 0 || strcmp(t, "Document") == 0)) { + if (xs_list_len(attach) < 2 && xs_match(t, "Link|Document")) { const char *mt = xs_mime_by_ext(url); if (xs_startswith(mt, "image/") ||