Merge branch 'release_1.10' into master

damus/Models/NotificationsManager.swift

@@ -68,6 +68,15 @@ func generate_local_notification_object(from ev: NostrEvent, state: HeadlessDamu
             let content_preview = render_notification_content_preview(ev: ev, profiles: state.profiles, keypair: state.keypair)
             return LocalNotification(type: .mention, event: ev, target: ev, content: content_preview)
         }
+        if ev.referenced_ids.contains(where: { note_id in
+            guard let note_author: Pubkey = state.ndb.lookup_note(note_id)?.unsafeUnownedValue?.pubkey else { return false }
+            guard note_author == state.keypair.pubkey else { return false }
+            return true
+        }) {
+            // This is a reply to one of our posts
+            let content_preview = render_notification_content_preview(ev: ev, profiles: state.profiles, keypair: state.keypair)
+            return LocalNotification(type: .reply, event: ev, target: ev, content: content_preview)
+        }
     } else if type == .boost,
               state.settings.repost_notification,
               let inner_ev = ev.get_inner_event()

damus/Models/PushNotificationClient.swift

@@ -160,7 +160,7 @@ struct PushNotificationClient {
     }
     
     func current_push_notification_environment() -> Environment {
-        return self.settings.send_device_token_to_localhost ? .local_test(host: nil) : .production
+        return self.settings.push_notification_environment
     }
 }
 
@@ -201,9 +201,10 @@ extension PushNotificationClient {
     }
     
     enum Environment: CaseIterable, Codable, Identifiable, StringCodable, Equatable, Hashable {
-        static var allCases: [Environment] = [.local_test(host: nil), .production]
+        static var allCases: [Environment] = [.local_test(host: nil), .staging, .production]
         
         case local_test(host: String?)
+        case staging
         case production
 
         func text_description() -> String {
@@ -212,6 +213,8 @@ extension PushNotificationClient {
                     return NSLocalizedString("Test (local)", comment: "Label indicating a local test environment for Push notification functionality (Developer feature)")
                 case .production:
                     return NSLocalizedString("Production", comment: "Label indicating the production environment for Push notification functionality")
+                case .staging:
+                    return NSLocalizedString("Staging (for dev builds)", comment: "Label indicating the staging environment for Push notification functionality")
             }
         }
 
@@ -221,7 +224,8 @@ extension PushNotificationClient {
                     URL(string: "http://\(host ?? "localhost:8000")") ?? Constants.PUSH_NOTIFICATION_SERVER_TEST_BASE_URL
                 case .production:
                     Constants.PUSH_NOTIFICATION_SERVER_PRODUCTION_BASE_URL
-                    
+                case .staging:
+                    Constants.PUSH_NOTIFICATION_SERVER_STAGING_BASE_URL
             }
         }
         
@@ -240,6 +244,8 @@ extension PushNotificationClient {
                     self = .local_test(host: nil)
                 case "production":
                     self = .production
+                case "staging":
+                    self = .staging
                 default:
                     let components = string.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: false)
                     if components.count == 2 && components[0] == "local_test" {
@@ -257,6 +263,8 @@ extension PushNotificationClient {
                         return "local_test:\(host)"
                     }
                     return "local_test"
+                case .staging:
+                    return "staging"
                 case .production:
                     return "production"
             }
@@ -273,6 +281,8 @@ extension PushNotificationClient {
                     }
                 case .production:
                     return "production"
+                case .staging:
+                    return "staging"
             }
         }
     }

damus/Models/UserSettingsStore.swift

@@ -210,8 +210,8 @@ class UserSettingsStore: ObservableObject {
     @Setting(key: "enable_experimental_push_notifications", default_value: false)
     var enable_experimental_push_notifications: Bool
     
-    @Setting(key: "send_device_token_to_localhost", default_value: false)
-    var send_device_token_to_localhost: Bool
+    @StringSetting(key: "push_notification_environment", default_value: .production)
+    var push_notification_environment: PushNotificationClient.Environment
     
     @Setting(key: "enable_experimental_purple_api", default_value: false)
     var enable_experimental_purple_api: Bool