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

Fix extraneous padding on some image posts

Browse Source 
Changelog-Fixed: Fix extraneous padding on some image posts
This commit is contained in:
William Casarin
2023-04-05 13:12:56 -07:00
parent b131c74ee3
commit 7bf18336d0
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
damus/Views/NoteContentView.swift
View File

@@ -260,7 +260,10 @@ func render_blocks(blocks: [Block], profiles: Profiles, privkey: String?) -> Not
.filter({ $0.is_note_mention }) .filter({ $0.is_note_mention })
.count == 1 .count == 1
var ind: Int = -1
let txt: AttributedString = blocks.reduce("") { str, block in let txt: AttributedString = blocks.reduce("") { str, block in
ind = ind + 1
switch block { switch block {
case .mention(let m): case .mention(let m):
if m.type == .event && one_note_ref { if m.type == .event && one_note_ref {
@@ -268,7 +271,14 @@ func render_blocks(blocks: [Block], profiles: Profiles, privkey: String?) -> Not
} }
return str + mention_str(m, profiles: profiles) return str + mention_str(m, profiles: profiles)
case .text(let txt): case .text(let txt):
return str + AttributedString(stringLiteral: txt) var trimmed = txt
if let prev = blocks[safe: ind-1], case .url(let u) = prev, is_image_url(u) {
trimmed = " " + trim_prefix(trimmed)
}
if let next = blocks[safe: ind+1], case .url(let u) = next, is_image_url(u) {
trimmed = trim_suffix(trimmed)
}
return str + AttributedString(stringLiteral: trimmed)
case .hashtag(let htag): case .hashtag(let htag):
return str + hashtag_str(htag) return str + hashtag_str(htag)
case .invoice(let invoice): case .invoice(let invoice):