Dedup poll() code, make main view refreshable

Author: binwiederhier

ntfy/App/AppMain.swift

@@ -4,12 +4,10 @@ import Firebase
 // Must have before release:
 // TODO: Verify whether model version needs to be specified
 // TODO: Make AppDelegate prettier
-// TODO: Remove duplicate code for poll()
 
 // Nice to have
 // TODO: Make notification click open detail view
 // TODO: Slide up dialog for "add topic"
-// TODO: Pull down "refresh all"
 
 @main
 struct AppMain: App {

ntfy/Persistence/SubscriptionManager.swift

@@ -11,8 +11,21 @@ struct SubscriptionManager {
         Log.d(tag, "Subscribing to \(topicUrl(baseUrl: baseUrl, topic: topic))")
         Messaging.messaging().subscribe(toTopic: topic)
         let subscription = store.saveSubscription(baseUrl: baseUrl, topic: topic)
-        
-        // FIXME: Duplicate code!
+        poll(subscription)
+    }
+    
+    func unsubscribe(_ subscription: Subscription) {
+        Log.d(tag, "Unsubscribing from \(subscription.urlString())")
+        DispatchQueue.main.async {
+            if let topic = subscription.topic {
+                Messaging.messaging().unsubscribe(fromTopic: topic)
+            }
+            store.delete(subscription: subscription)
+        }
+    }
+    
+    func poll(_ subscription: Subscription) {
+        Log.d(tag, "Polling from \(subscription.urlString())")
         ApiService.shared.poll(subscription: subscription) { messages, error in
             guard let messages = messages else {
                 Log.e(tag, "Polling failed", error)
@@ -28,14 +41,4 @@ struct SubscriptionManager {
             }
         }
     }
-    
-    func unsubscribe(_ subscription: Subscription) {
-        Log.d(tag, "Unsubscribing from \(subscription.urlString())")
-        DispatchQueue.main.async {
-            if let topic = subscription.topic {
-                Messaging.messaging().unsubscribe(fromTopic: topic)
-            }
-            store.delete(subscription: subscription)
-        }
-    }
 }

ntfy/Views/NotificationListView.swift

@@ -120,7 +120,7 @@ struct NotificationListView: View {
             }
         })
         .refreshable {
-            poll()
+            subscriptionManager.poll(subscription)
         }
     }
 
@@ -177,23 +177,6 @@ struct NotificationListView: View {
         }
         editMode = .inactive
     }
-    
-    private func poll() {
-        ApiService.shared.poll(subscription: subscription) { messages, error in
-            guard let messages = messages else {
-                Log.e(tag, "Polling failed", error)
-                return
-            }
-            Log.d(tag, "Polling success, \(messages.count) new message(s)", messages)
-            if !messages.isEmpty {
-                DispatchQueue.main.async {
-                    for message in messages {
-                        store.save(notificationFromMessage: message, withSubscription: subscription)
-                    }
-                }
-            }
-        }
-    }
 }
 
 struct NotificationRowView: View {

ntfy/Views/SubscriptionListView.swift

@@ -43,6 +43,11 @@ struct SubscriptionListView: View {
                     .padding(40)
                 }
             })
+            .refreshable {
+                subscriptions.forEach { subscription in
+                    subscriptionManager.poll(subscription)
+                }
+            }
         }
         .navigationViewStyle(StackNavigationViewStyle())
     }