damus

commit 668b0a94df0b17c406b4476d2bd2e2dbae9af01a
parent ebba9d3004f7839aeb377c4ba252cecf969c412d
Author: Bartholomew Joyce <bartholomew.michael.joyce@gmail.com>
Date:   Wed, 12 Apr 2023 21:47:35 +0200

cleanup nostr bech32 entity parsing

Closes: #911

Diffstat:
M
damus-c/cursor.h
 | 
9
++++-----
M
damus-c/nostr_bech32.c
 | 
2
+-

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/damus-c/cursor.h b/damus-c/cursor.h
@@ -10,7 +10,6 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "bech32.h"
 
 typedef unsigned char u8;
 
@@ -32,8 +31,8 @@ static inline int is_invalid_url_ending(char c) {
     return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
 }
 
-static inline int is_bech32_character(char c) {
-    return (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || bech32_charset_rev[c] != -1;
+static inline int is_alphanumeric(char c) {
+    return (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9');
 }
 
 static inline void make_cursor(struct cursor *c, const u8 *content, size_t len)
@@ -75,14 +74,14 @@ static inline int consume_until_whitespace(struct cursor *cur, int or_end) {
     return or_end;
 }
 
-static inline int consume_until_non_bech32_character(struct cursor *cur, int or_end) {
+static inline int consume_until_non_alphanumeric(struct cursor *cur, int or_end) {
     char c;
     int consumedAtLeastOne = 0;
 
     while (cur->p < cur->end) {
         c = *cur->p;
 
-        if (!is_bech32_character(c))
+        if (!is_alphanumeric(c))
             return consumedAtLeastOne;
 
         cur->p++;
diff --git a/damus-c/nostr_bech32.c b/damus-c/nostr_bech32.c
@@ -222,7 +222,7 @@ int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
     
     start = cur->p;
     
-    if (!consume_until_non_bech32_character(cur, 1)) {
+    if (!consume_until_non_alphanumeric(cur, 1)) {
         cur->p = start;
         return 0;
     }