Pachyderm/Sources/Pachyderm/Model/Hashtag.swift

@@ -35,7 +35,8 @@ public class Hashtag: Codable {
                 throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "unable to convert WebURL \(s?.debugDescription ?? "nil") to URL")
             }
         } catch {
-            self.url = try container.decode(URL.self, forKey: .url)
+            let s = try? container.decode(String.self, forKey: .url)
+            throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "unable to decode WebURL from \(s?.debugDescription ?? "nil")")
         }
         self.history = try container.decodeIfPresent([History].self, forKey: .history)
     }

Pachyderm/Sources/Pachyderm/Model/Mention.swift

@@ -8,33 +8,14 @@
 
 import Foundation
 import WebURL
-import WebURLFoundationExtras
 
 public class Mention: Codable {
-    public let url: URL
+    public let url: WebURL
     public let username: String
     public let acct: String
     /// The instance-local ID of the user being mentioned.
     public let id: String
     
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.username = try container.decode(String.self, forKey: .username)
-        self.acct = try container.decode(String.self, forKey: .acct)
-        self.id = try container.decode(String.self, forKey: .id)
-        do {
-            let webURL = try container.decode(WebURL.self, forKey: .url)
-            if let url = URL(webURL) {
-                self.url = url
-            } else {
-                let s = try? container.decode(String.self, forKey: .url)
-                throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "unable to convert WebURL \(s?.debugDescription ?? "nil") to URL")
-            }
-        } catch {
-            self.url = try container.decode(URL.self, forKey: .url)
-        }
-    }
-    
     private enum CodingKeys: String, CodingKey {
         case url
         case username

Pachyderm/Sources/Pachyderm/Model/Notification.swift

@@ -21,10 +21,6 @@ public class Notification: Decodable {
         self.id = try container.decode(String.self, forKey: .id)
         if let kind = try? container.decode(Kind.self, forKey: .kind) {
             self.kind = kind
-        } else if let s = try? container.decode(String.self, forKey: .kind),
-                  s == "status" {
-            // represent notifications of other people posting as regular mentions for now
-            self.kind = .mention
         } else {
             self.kind = .unknown
         }

Pachyderm/Tests/PachydermTests/URLTests.swift

@@ -1,20 +0,0 @@
-//
-//  URLTests.swift
-//  
-//
-//  Created by Shadowfacts on 5/17/22.
-//
-
-import XCTest
-import WebURL
-import WebURLFoundationExtras
-
-class URLTests: XCTestCase {
-
-    func testDecodeURL() {
-        print(WebURL(URL(string: "https://xn--baw-joa.social/@unituebingen")!))
-        let url = WebURL("https://xn--baw-joa.social/@unituebingen")
-        print(url)
-    }
-
-}

Tusker/Views/ContentTextView.swift

@@ -108,12 +108,10 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
                 // screws up its determination of the line height making multiple lines of emojis squash together
                 attributed.append(NSAttributedString(string: "\n", attributes: [.font: defaultFont]))
             case "a":
-                let href = try! node.attr("href")
-                if let webURL = WebURL(href),
+                if let link = try? node.attr("href"),
+                   let webURL = WebURL(link),
                    let url = URL(webURL) {
                     attributed.addAttribute(.link, value: url, range: attributed.fullRange)
-                } else if let url = URL(string: href) {
-                    attributed.addAttribute(.link, value: url, range: attributed.fullRange)
                 }
             case "p":
                 attributed.append(NSAttributedString(string: "\n\n", attributes: [.font: defaultFont]))

Tusker/Views/StatusContentTextView.swift

@@ -27,7 +27,7 @@ class StatusContentTextView: ContentTextView {
             let status = mastodonController.persistentContainer.status(for: statusID) {
             mention = status.mentions.first { (mention) in
                 // Mastodon and Pleroma include the @ in the <a> text, GNU Social does not
-                (text.dropFirst() == mention.username || text == mention.username) && url.host == mention.url.host!
+                (text.dropFirst() == mention.username || text == mention.username) && url.host == mention.url.host!.serialized
             }
         } else {
             mention = nil