mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-12-24 08:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compose: Fix editing, now keep line breaks and link close #602

Browse source
This commit is contained in:
Thomas Ricouard 2023-02-04 11:21:30 +01:00
parent 11b9346b0e
commit 86937e65fe
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Packages/Models/Sources/Models/Alias/HTMLString.swift
View file

@ -29,7 +29,17 @@ public struct HTMLString: Decodable, Equatable, Hashable {
let document: Document = try SwiftSoup.parse(htmlValue) let document: Document = try SwiftSoup.parse(htmlValue)
handleNode(node: document) handleNode(node: document)
asRawText = try document.text() document.outputSettings(OutputSettings().prettyPrint(pretty: false))
try document.select("br").after("\n")
try document.select("p").after("\n\n")
let html = try document.html()
var text = try SwiftSoup.clean(html, "", Whitelist.none(), OutputSettings().prettyPrint(pretty: false)) ?? ""
// Remove the two last line break added after the last paragraph.
if text.hasSuffix("\n\n") {
_ = text.removeLast()
_ = text.removeLast()
}
asRawText = text
} catch { } catch {
asRawText = htmlValue asRawText = htmlValue
} }

2
Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
View file

@ -232,7 +232,7 @@ public class StatusEditorViewModel: ObservableObject {
selectedRange = .init(location: statusText.string.utf16.count, length: 0) selectedRange = .init(location: statusText.string.utf16.count, length: 0)
markedTextRange = nil markedTextRange = nil
case let .edit(status): case let .edit(status):
var rawText = NSAttributedString(status.content.asSafeMarkdownAttributedString).string var rawText = status.content.asRawText
for mention in status.mentions { for mention in status.mentions {
rawText = rawText.replacingOccurrences(of: "@\(mention.username)", with: "@\(mention.acct)") rawText = rawText.replacingOccurrences(of: "@\(mention.username)", with: "@\(mention.acct)")
} }