From b7ef87031d04a515c5037d3a52156cae87b851fc Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 24 Dec 2022 21:35:50 -0800 Subject: [PATCH] Fix url replacement for links with no scheme --- Meshtastic/Helpers/MeshPackets.swift | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index e6e43598..f6336b9a 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -27,10 +27,9 @@ func generateMessageMarkdown (message: String) -> String { let phone = messageWithMarkdown[range] messageWithMarkdown = messageWithMarkdown.replacingOccurrences(of: phone, with: "[\(phone)](tel:\(phone))") } else if match.resultType == .link { - let url = match.url?.absoluteString ?? "" - if url.count > 0 { - messageWithMarkdown = messageWithMarkdown.replacingOccurrences(of: url, with: "[\(String(match.url?.host ?? "Link"))\(String(match.url?.path ?? ""))](\(url))") - } + let url = messageWithMarkdown[range] + let absoluteUrl = match.url?.absoluteString ?? "" + messageWithMarkdown = messageWithMarkdown.replacingOccurrences(of: url, with: "[\(String(match.url?.host ?? "Link"))\(String(match.url?.path ?? ""))](\(absoluteUrl))") } } }