ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4946 - Linkification strips trailing brackets from URLs

Browse Source
This commit is contained in:
Stefan Ceriu
2026-01-12 15:46:42 +02:00
committed by Stefan Ceriu
parent 4cfedefcca
commit 29dfba140d
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Extensions/CharacterSet.swift
+6
View File
@@ -30,4 +30,10 @@ extension CharacterSet {
static let matrixUserIDAllowedCharacters = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyz0123456789._=-/@:") static let matrixUserIDAllowedCharacters = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyz0123456789._=-/@:")
static let roomAliasAllowedCharacters = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyz0123456789!$&‘()*+/;=?@[]-._:#") static let roomAliasAllowedCharacters = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyz0123456789!$&‘()*+/;=?@[]-._:#")
static let punctuationWithoutClosingBracketCharacters: CharacterSet = {
var baseSet: CharacterSet = .punctuationCharacters
baseSet.remove(")")
return baseSet
}()
} }
ElementX/Sources/Other/Extensions/String.swift
+4 -3
View File
@@ -125,10 +125,11 @@ extension String {
link.insert(contentsOf: "https://", at: link.startIndex) link.insert(contentsOf: "https://", at: link.startIndex)
} }
// Don't include punctuation characters at the end of links // Don't include punctuation characters at the end of links but keep
// e.g `https://element.io/blog:` <- which is a valid link but the wrong place // closing brackets as per https://github.com/element-hq/element-x-ios/issues/4946
// e.g `https://element.io/blog:` which is a valid link but the wrong place
while !link.isEmpty, while !link.isEmpty,
link.rangeOfCharacter(from: .punctuationCharacters, options: .backwards)?.upperBound == link.endIndex { link.rangeOfCharacter(from: .punctuationWithoutClosingBracketCharacters, options: .backwards)?.upperBound == link.endIndex {
link = String(link.dropLast()) link = String(link.dropLast())
} }
UnitTests/Sources/AttributedStringBuilderTests.swift
+6 -5
View File
@@ -80,7 +80,7 @@ class AttributedStringBuilderTests: XCTestCase {
} }
func testPunctuationAtTheEndOfPlainStringLinks() { func testPunctuationAtTheEndOfPlainStringLinks() {
let plainString = "This text contains a https://www.matrix.org:;., link." let plainString = "Most punctuation marks are removed https://www.matrix.org:;., but closing brackets are kept https://example.com/(test)"
guard let attributedString = attributedStringBuilder.fromPlain(plainString) else { guard let attributedString = attributedStringBuilder.fromPlain(plainString) else {
XCTFail("Could not build the attributed string") XCTFail("Could not build the attributed string")
@@ -89,11 +89,12 @@ class AttributedStringBuilderTests: XCTestCase {
XCTAssertEqual(String(attributedString.characters), plainString) XCTAssertEqual(String(attributedString.characters), plainString)
XCTAssertEqual(attributedString.runs.count, 3) XCTAssertEqual(attributedString.runs.count, 4)
let link = attributedString.runs.first { $0.link != nil }?.link let firstLink = attributedString.runs.first { $0.link != nil }?.link
XCTAssertEqual(firstLink, "https://www.matrix.org")
XCTAssertEqual(link?.host, "www.matrix.org") let secondLink = attributedString.runs.last { $0.link != nil }?.link
XCTAssertEqual(secondLink, "https://example.com/(test)")
} }
func testLinkDefaultScheme() { func testLinkDefaultScheme() {