Fix hashtag parsing

Changelog-Fixed: No longer parse hashtags in urls
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-07-28 13:10:00 -07:00
parent 49ff8824ac
commit e6db7369cd
3 changed files with 88 additions and 28 deletions

View File

@@ -132,6 +132,19 @@ func is_hashtag_char(_ c: Character) -> Bool {
return c.isLetter || c.isNumber
}
func prev_char(_ p: Parser, n: Int) -> Character? {
if p.pos - n < 0 {
return nil
}
let ind = p.str.index(p.str.startIndex, offsetBy: p.pos - n)
return p.str[ind]
}
func is_punctuation(_ c: Character) -> Bool {
return c.isWhitespace || c.isPunctuation
}
func parse_hashtag(_ p: Parser) -> String? {
let start = p.pos
@@ -139,6 +152,13 @@ func parse_hashtag(_ p: Parser) -> String? {
return nil
}
if let prev = prev_char(p, n: 2) {
// we don't allow adjacent hashtags
if !is_punctuation(prev) {
return nil
}
}
guard let str = parse_while(p, match: is_hashtag_char) else {
p.pos = start
return nil

View File

@@ -12,25 +12,25 @@ enum PostBlock {
case ref(ReferencedId)
case hashtag(String)
var is_text: Bool {
if case .text = self {
return true
var is_text: String? {
if case .text(let txt) = self {
return txt
}
return false
return nil
}
var is_hashtag: Bool {
if case .hashtag = self {
return true
var is_hashtag: String? {
if case .hashtag(let ht) = self {
return ht
}
return false
return nil
}
var is_ref: Bool {
if case .ref = self {
return true
var is_ref: ReferencedId? {
if case .ref(let ref) = self {
return ref
}
return false
return nil
}
}