nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-10-06 03:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup nostr bech32 entity parsing

Browse Source 
Closes: #911
This commit is contained in:
Bartholomew Joyce 2023-04-12 21:47:35 +02:00 committed by William Casarin
parent ebba9d3004
commit 668b0a94df
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
damus-c/cursor.h
View File

@ -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++;

2
damus-c/nostr_bech32.c
View File

@ -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;
}