Better dangling hashtag checking.

3 files changed, 11 insertions, 8 deletions

diff --git a/html.c b/html.c
index 6a5aa10..322bafa 100644
--- a/html.c
+++ b/html.c
@@ -2317,8 +2317,9 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
 
     /* show all hashtags that has not been shown previously in the content */
     const xs_list *tags = xs_dict_get(msg, "tag");
-    if (xs_type(tags) == XSTYPE_LIST && xs_list_len(tags)) {
-        const char *o_content = xs_dict_get_def(msg, "content", "");
+    const char *o_content = xs_dict_get_def(msg, "content", "");
+
+    if (xs_is_string(o_content) && xs_is_list(tags) && xs_list_len(tags)) {
         xs *content = xs_utf8_to_lower(o_content);
         const xs_dict *tag;
 
@@ -2328,16 +2329,15 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
         xs_list_foreach(tags, tag) {
             const char *type = xs_dict_get(tag, "type");
 
-            if (xs_type(type) == XSTYPE_STRING && strcmp(type, "Hashtag") == 0) {
+            if (xs_is_string(type) && strcmp(type, "Hashtag") == 0) {
                 const char *o_href = xs_dict_get(tag, "href");
+                const char *name   = xs_dict_get(tag, "name");
 
-                if (xs_type(o_href) == XSTYPE_STRING) {
+                if (xs_is_string(o_href) && xs_is_string(name)) {
                     xs *href = xs_utf8_to_lower(o_href);
 
-                    if (xs_str_in(content, href) == -1) {
+                    if (xs_str_in(content, href) == -1 && xs_str_in(content, name) == -1) {
                         /* not in the content: add here */
-                        const char *name = xs_dict_get(tag, "name");
-
                         xs_html_add(add_hashtags,
                             xs_html_tag("li",
                                 xs_html_tag("a",
diff --git a/xs.h b/xs.h
index 2a90467..45952c9 100644
--- a/xs.h
+++ b/xs.h
@@ -157,6 +157,9 @@ unsigned int xs_hash_func(const char *data, int size);
 #define xs_is_true(v) (xs_type((v)) == XSTYPE_TRUE)
 #define xs_is_false(v) (xs_type((v)) == XSTYPE_FALSE)
 #define xs_not(v) xs_stock(xs_is_true((v)) ? XSTYPE_FALSE : XSTYPE_TRUE)
+#define xs_is_string(v) (xs_type((v)) == XSTYPE_STRING)
+#define xs_is_list(v) (xs_type((v)) == XSTYPE_LIST)
+#define xs_is_dict(v) (xs_type((v)) == XSTYPE_DICT)
 
 #define xs_list_foreach(l, v) for (int ct_##__LINE__ = 0; xs_list_next(l, &v, &ct_##__LINE__); )
 #define xs_dict_foreach(l, k, v) for (int ct_##__LINE__ = 0; xs_dict_next(l, &k, &v, &ct_##__LINE__); )
diff --git a/xs_version.h b/xs_version.h
index ded4335..ce3d06b 100644
--- a/xs_version.h
+++ b/xs_version.h
@@ -1 +1 @@
-/* c317231894f28c39ba45a46f493f124d12a12f3a 2025-01-12T06:56:21+01:00 */
+/* cebb5663f26bc91b80c787525f5953b97839e0f7 2025-01-12T14:57:12+01:00 */