tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mention: fix missing @ on mentions

Browse Source 
Fixes: d07ad67778 ("nip19: add bech32 TLV url parsing")
This commit is contained in:
William Casarin
2024-01-22 15:00:20 -08:00
parent c67741983e
commit d455d86a05
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
damus/Models/NoteContent.swift
View File

@@ -191,18 +191,20 @@ func getDisplayName(pk: Pubkey, profiles: Profiles) -> String {
func mention_str(_ m: Mention<MentionRef>, profiles: Profiles) -> CompatibleText { func mention_str(_ m: Mention<MentionRef>, profiles: Profiles) -> CompatibleText {
let bech32String = Bech32Object.encode(m.ref.toBech32Object()) let bech32String = Bech32Object.encode(m.ref.toBech32Object())
let attributedStringLiteral: String = { let display_str: String = {
switch m.ref { switch m.ref {
case .pubkey(let pk): return getDisplayName(pk: pk, profiles: profiles) case .pubkey(let pk): return getDisplayName(pk: pk, profiles: profiles)
case .note: return "@\(abbrev_pubkey(bech32String))" case .note: return abbrev_pubkey(bech32String)
case .nevent: return "@\(abbrev_pubkey(bech32String))" case .nevent: return abbrev_pubkey(bech32String)
case .nprofile(let nprofile): return getDisplayName(pk: nprofile.author, profiles: profiles) case .nprofile(let nprofile): return getDisplayName(pk: nprofile.author, profiles: profiles)
case .nrelay(let url): return url case .nrelay(let url): return url
case .naddr: return "@\(abbrev_pubkey(bech32String))" case .naddr: return abbrev_pubkey(bech32String)
} }
}() }()
var attributedString = AttributedString(stringLiteral: attributedStringLiteral) let display_str_with_at = "@\(display_str)"
var attributedString = AttributedString(stringLiteral: display_str_with_at)
attributedString.link = URL(string: "damus:nostr:\(bech32String)") attributedString.link = URL(string: "damus:nostr:\(bech32String)")
attributedString.foregroundColor = DamusColors.purple attributedString.foregroundColor = DamusColors.purple