Pachyderm/Sources/Pachyderm/Model/Hashtag.swift

@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import WebURL
-import WebURLFoundationExtras
 
 public class Hashtag: Codable {
     public let name: String
@@ -22,18 +20,6 @@ public class Hashtag: Codable {
         self.history = nil
     }
     
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.name = try container.decode(String.self, forKey: .name)
-        // pixelfed (possibly others) don't fully escape special characters in the hashtag url
-        if let url = URL(try container.decode(WebURL.self, forKey: .url)) {
-            self.url = url
-        } else {
-            throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "unable to convert WebURL to URL")
-        }
-        self.history = try container.decodeIfPresent([History].self, forKey: .history)
-    }
-    
     private enum CodingKeys: String, CodingKey {
         case name
         case url

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -85,16 +85,14 @@ class ProfileStatusesViewController: DiffableTimelineLikeTableViewController<Pro
             case let .failure(error):
                 completion(.failure(.client(error)))
                 
-            case let .success(statuses, _):
+            case let .success(statuses, pagination):
-                if !statuses.isEmpty {
+                self.older = pagination?.older
-                    self.newer = .after(id: statuses.first!.id, count: nil)
+                self.newer = pagination?.newer
-                    self.older = .before(id: statuses.last!.id, count: nil)
-                }
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     DispatchQueue.main.async {
                         var snapshot = self.dataSource.snapshot()
-                        snapshot.appendItems(statuses.map { Item(id: $0.id, state: .unknown, pinned: false) }, toSection: .statuses)
+                        snapshot.appendItems(statuses.map { Item(id: $0.id, state: .unknown) }, toSection: .statuses)
                         if self.kind == .statuses {
                             self.loadPinnedStatuses(snapshot: { snapshot }, completion: completion)
                         } else {
@@ -122,7 +120,7 @@ class ProfileStatusesViewController: DiffableTimelineLikeTableViewController<Pro
                     DispatchQueue.main.async {
                         var snapshot = snapshot()
                         snapshot.deleteItems(snapshot.itemIdentifiers(inSection: .pinned))
-                        snapshot.appendItems(statuses.map { Item(id: $0.id, state: .unknown, pinned: true) }, toSection: .pinned)
+                        snapshot.appendItems(statuses.map { Item(id: $0.id, state: .unknown) }, toSection: .pinned)
                         completion(.success(snapshot))
                     }
                 }
@@ -141,17 +139,19 @@ class ProfileStatusesViewController: DiffableTimelineLikeTableViewController<Pro
             case let .failure(error):
                 completion(.failure(.client(error)))
                 
-            case let .success(statuses, _):
+            case let .success(statuses, pagination):
                 guard !statuses.isEmpty else {
                     completion(.failure(.noOlder))
                     return
                 }
                 
-                self.older = .before(id: statuses.last!.id, count: nil)
+                if let older = pagination?.older {
+                    self.older = older
+                }
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot()
-                    snapshot.appendItems(statuses.map { Item(id: $0.id, state: .unknown, pinned: false) }, toSection: .statuses)
+                    snapshot.appendItems(statuses.map { Item(id: $0.id, state: .unknown) }, toSection: .statuses)
                     completion(.success(snapshot))
                 }
             }
@@ -170,17 +170,19 @@ class ProfileStatusesViewController: DiffableTimelineLikeTableViewController<Pro
             case let .failure(error):
                 completion(.failure(.client(error)))
                 
-            case let .success(statuses, _):
+            case let .success(statuses, pagination):
                 guard !statuses.isEmpty else {
-                    completion(.failure(.allCaughtUp))
+                    completion(.failure(.noNewer))
                     return
                 }
                 
-                self.newer = .after(id: statuses.first!.id, count: nil)
+                if let newer = pagination?.newer {
+                    self.newer = newer
+                }
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot()
-                    let items = statuses.map { Item(id: $0.id, state: .unknown, pinned: false) }
+                    let items = statuses.map { Item(id: $0.id, state: .unknown) }
                     if let first = snapshot.itemIdentifiers(inSection: .statuses).first {
                         snapshot.insertItems(items, beforeItem: first)
                     } else {
@@ -246,15 +248,13 @@ extension ProfileStatusesViewController {
     struct Item: Hashable {
         let id: String
         let state: StatusState
-        let pinned: Bool
         
         static func ==(lhs: Item, rhs: Item) -> Bool {
-            return lhs.id == rhs.id && lhs.pinned == rhs.pinned
+            return lhs.id == rhs.id
         }
         
         func hash(into hasher: inout Hasher) {
             hasher.combine(id)
-            hasher.combine(pinned)
         }
     }
 }

Tusker/Screens/Timeline/TimelineTableViewController.swift

@@ -151,11 +151,9 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
             case let .failure(error):
                 completion(.failure(.client(error)))
                 
-            case let .success(statuses, _):
+            case let .success(statuses, pagination):
-                if !statuses.isEmpty {
+                self.newer = pagination?.newer
-                    self.newer = .after(id: statuses.first!.id, count: nil)
+                self.older = pagination?.older
-                    self.older = .before(id: statuses.last!.id, count: nil)
-                }
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     DispatchQueue.main.async {
@@ -185,6 +183,7 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
                 return
             }
             snapshot.appendItems([.confirmLoadMore], toSection: .footer)
+            self.dataSource.apply(snapshot)
             completion(.success(snapshot))
             return
         }
@@ -196,10 +195,8 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
             case let .failure(error):
                 completion(.failure(.client(error)))
                 
-            case let .success(statuses, _):
+            case let .success(statuses, pagination):
-                if !statuses.isEmpty {
+                self.older = pagination?.older
-                    self.older = .before(id: statuses.last!.id, count: nil)
-                }
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot()
@@ -223,13 +220,17 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
             case let .failure(error):
                 completion(.failure(.client(error)))
                 
-            case let .success(statuses, _):
+            case let .success(statuses, pagination):
                 guard !statuses.isEmpty else {
                     completion(.failure(.allCaughtUp))
                     return
                 }
                 
-                self.newer = .after(id: statuses.first!.id, count: nil)
+                // if there are no new statuses, pagination is nil
+                // if we were to then overwrite self.newer, future refresh would fail
+                if let newer = pagination?.newer {
+                    self.newer = newer
+                }
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot()