Export strings for translation

Signed-off-by: Terry Yiu <git@tyiu.xyz>

.github/ISSUE_TEMPLATE/app_release.md

@@ -1,52 +0,0 @@
----
-name: App release process
-about: Begin preparing for a new app release
-title: 'Release: '
-labels: release-tasks
-assignees: ''
-
----
-
-A new version release. Please attempt to follow the release process steps below in the order they are shown.
-
-## TestFlight release candidates
-
-### Release candidate 1
-
-**Version:** _[Enter full build information for the release candidate, including major and minor version number, build number, and commit hash]_
-
-1. [ ] Merge in all needed changes to `master`
-2. [ ] Check CI, make sure it is passing
-3. [ ] Prepare preliminary changelog as a draft PR: _[Enter PR link to changelog here]_
-4. [ ] Make a _release_ build and submit to the internal TestFlight group via our new Release candidate workflow in Xcode Cloud.
-5. [ ] Prepare short screencast style video with main changes for the announcement
-6. [ ] Publish release build to these TestFlight groups:
-    - [ ] Alpha testers group
-    - [ ] Translators group
-    - [ ] Purple group
-7. [ ] Publish announcement on Nostr
-
-
-_[Duplicate this release candidate section if there is more than one release candidate]_
-
-
-## App Store release
-
-1. [ ] Release candidate checks:
-    - [ ] Release candidate has been on Purple TestFlight for at least one week
-    - [ ] No blocker issues came from feedback from Purple users (double-check)
-    - [ ] Check with stakeholders
-    - [ ] Check with developers & product for any release showstoppers (e.g., critical newfound bugs)
-2. [ ] Thorough check on release notes
-3. [ ] Submit to App Store review (with manual publishing setting enabled)
-4. [ ] Get App Store approval from Apple
-5. [ ] Prepare announcement
-7. [ ] Publish on the App Store and make announcement
-8. [ ] Publish changelog and tag commit hash corresponding to the release
-9. [ ] Perform a version bump on the repository, in preparation for the next release
-
-
-## Notes/others
-
-_Enter any relevant notes here_
-

.github/pull_request_template.md

@@ -6,7 +6,6 @@ _[Please provide a summary of the changes in this PR.]_
 
 - [ ] I have read (or I am familiar with) the [Contribution Guidelines](../docs/CONTRIBUTING.md)
 - [ ] I have tested the changes in this PR
-- [ ] I have opened or referred to an existing github issue related to this change.
 - [ ] My PR is either small, or I have split it into smaller logical commits that are easier to review
 - [ ] I have added the signoff line to all my commits. See [Signing off your work](../docs/CONTRIBUTING.md#sign-your-work---the-developers-certificate-of-origin)
 - [ ] I have added appropriate changelog entries for the changes in this PR. See [Adding changelog entries](../docs/CONTRIBUTING.md#add-changelog-changed-changelog-fixed-etc)

ACKNOWLEDGEMENTS.md

@@ -1,5 +0,0 @@
-### Acknowledgements and licenses
-
-1. This product contains code derived from [Nostr SDK iOS](https://github.com/nostr-sdk/nostr-sdk-ios). [License](https://github.com/nostr-sdk/nostr-sdk-ios/blob/40df800c6749d7ce0b6fd7328e76cbc0dc71c87b/LICENSE)
-2. This product includes software developed by the "Marcin Krzyzanowski" (http://krzyzanowskim.com/). [License](https://github.com/krzyzanowskim/CryptoSwift/blob/e74bbbfbef939224b242ae7c342a90e60b88b5ce/LICENSE)
-

CHANGELOG.md

@@ -1,163 +1,3 @@
-## [1.14] - 2025-05-25
-
-### Added
-
-- Added safety reminder to wallets with higher balance (Daniel D’Aquino)
-- Added one-click Coinos wallet setup (Daniel D’Aquino)
-- Add notification setting to hide hellthreads (Terry Yiu)
-- Added separated first aid option for relay lists that does not need a contact list reset (Daniel D’Aquino)
-- Added NIP-65 relay list support (Daniel D’Aquino)
-- Added Unicode 16 emoji reactions for iOS 18.4+ by upgrading EmojiPicker (Terry Yiu)
-- Added a search interface to the settings screen (SanjaySiddharth)
-- Added view introducing users to Zaps (ericholguin)
-- Added new wallet view with balance and transactions list (ericholguin)
-- Added copy technical info button to user visible errors, so that users can more easily share errors with developers (Daniel D’Aquino)
-- Add dismiss button to wallet high balance reminders (Daniel D’Aquino)
-- Zap receiver information now included for outgoing zaps (Daniel D’Aquino)
-- Added inline note rendering of invoices to pull up wallet selector sheet (Terry Yiu)
-- Added route to profile page from wallet tx list (ericholguin)
-
-
-### Changed
-
-- Added additional information on top of blurred images (SanjaySiddharth)
-- Improved robustness of relay list handling (Daniel D’Aquino)
-- Updated image cache for better stability (Daniel D’Aquino)
-- Improved integration with Nostr Wallet Connect wallets (ericholguin)
-- Added relay connectivity information to NWC settings (Daniel D’Aquino)
-- Improved handling around NWC responses (Daniel D’Aquino)
-- Added more human visible errors on NWC wallets to aid with troubleshooting (Daniel D’Aquino)
-- Re-enabled note zaps as permitted by the new App Store guidelines (Daniel D’Aquino)
-
-
-
-### Fixed
-
-- Hide future notes from timeline (Terry Yiu)
-- Fixed issue where profiles with a NIP-65 relay list would not display on Damus (Daniel D’Aquino)
-- Fix quote notes to include missing q tag (Terry Yiu)
-- Fixed issue where the side menu would close when copying the npub (SanjaySiddharth)
-- Fixed issue where cached images would be backed up to iCloud (Daniel D’Aquino)
-- Optimized classify_url function (Terry Yiu)
-- Fixed note rendering for those that contain previewable items or leading and trailing whitespaces (Terry Yiu)
-- Fixed issue where some videos would become unplayable after some time using the app (Daniel D’Aquino)
-
-
-[1.14]: https://github.com/damus-io/damus/releases/tag/v1.14
-
-
-## [1.13.1] - 2025-03-21
-
-### Fixed
-
-- Fixed an issue where threads would not load properly (Daniel D’Aquino)
-
-
-[1.13.1]: https://github.com/damus-io/damus/releases/tag/v1.13.1
-
-
-## [1.13] - 2025-03-14
-
-### Added
-
-- Added local persistence of note drafts (Daniel D’Aquino)
-- Added user-friendly error view for errors around the app that would not fit in other places (Daniel D’Aquino)
-- Coinos connection button in Wallet view (ericholguin)
-- Added Alby Go to mobile wallets selection menu (Tomek ⚡ K)
-- Minor accessibility improvements around picture editing and onboarding (Daniel D’Aquino)
-- Profile image cropping tools (Daniel D’Aquino)
-- Added Conversations tab to profiles (Terry Yiu)
-- Added profile pictures to push notifications (William Casarin)
-
-
-### Changed
-
-- Don't show reposts for the same note more than once in your home feed (William Casarin)
-- Improved profile image bandwidth optimization (Daniel D’Aquino)
-- Improved reliability of picture selector (Daniel D’Aquino)
-- Changed spaces to newlines in new posts to provide cleaner separation between text, uploaded media, and quoted notes (Terry Yiu)
-
-
-### Fixed
-
-- Fixed issue where some push notifications would not open in the app and leave users confused (Daniel D’Aquino)
-- Fixed issue where app would need a restart for new NWC wallets to work (Daniel D’Aquino)
-- Fixed overly sensitive horizontal swipe on thread chat view (Daniel D’Aquino)
-- Trim whitespaces from Lightning addresses (Terry Yiu)
-- Fixed translation export script by upgrading nostr-sdk-swift dependency to support Mac Catalyst (Terry Yiu)
-- Fixed issue where users continue to receive push notifications after logout (Daniel D’Aquino)
-- Fixed an issue where events on a thread view would occasionally disappear (Daniel D’Aquino)
-- Improved robustness of the URL handler (Daniel D’Aquino)
-- Translate notes even if they are in a preferred language but not the current language as that is what users expect (Terry Yiu)
-- Cancel ongoing uploading operations after the user cancels the post (Swift Coder)
-- Fixed link and photo sharing support on macOS (Swift Coder)
-- Fix bug where profile view was showing more than just the notes and replies on the notes / notes & replies tabs (Terry Yiu)
-- Fixed reposts banner to be localizable (Terry Yiu)
-
-
-### Removed
-
-- Removed language filtering from Universe feed because language detection can be inaccurate (Terry Yiu)
-- Removed mystery tabs meant to fix tab switching bug that no longer exists (Terry Yiu)
-
-
-
-[1.13](https://github.com/damus-io/damus/releases/tag/v1.13): https://github.com/damus-io/damus/releases/tag/v1.13
-
-
-## [1.12.3] - 2025-02-06
-
-### Added
-
-- Purple members who have been active for more than a year now get a special badge (Daniel D’Aquino)
-
-### Changed
-
-- Improved clarity of the mute button to indicate it can be used for blocking a user (Daniel D’Aquino)
-- Made the microphone access request message more clear to users (Daniel D’Aquino)
-
-[v1.12.3]: https://github.com/damus-io/damus/releases/tag/v1.12.3
-
-
-## [1.12](https://github.com/damus-io/damus/releases/tag/v1.12) - 2024-12-20
-
-### Added
-
-- Render Gif and video files while composing posts (Swift Coder)
-- Add profile info text in stretchable banner with follow button (Swift Coder)
-- Paste Gif image similar to jpeg and png files (Swift Coder)
-
-
-### Changed
-
-- Improved UX around the label for searching words (Daniel D’Aquino)
-- Improved accessibility support on some elements (Daniel D’Aquino)
-
-
-### Fixed
-
-- Fixed issue where the "next" button would appear hidden and hard to click on the create account view (Daniel D’Aquino)
-- Fix non scrollable wallet screen (Swift Coder)
-- Fixed suggested users category titles to be localizable (Terry Yiu)
-- Fixed GradientFollowButton to have consistent width and autoscale text limited to 1 line (Terry Yiu)
-- Fixed right-to-left localization issues (Terry Yiu)
-- Fixed AddMuteItemView to trim leading and trailing whitespaces from mute text and disallow adding text with only whitespaces (Terry Yiu)
-- Fixed SideMenuView text to autoscale and limit to 1 line (Terry Yiu)
-- Fixed an issue where a profile would need to be input twice in the search to be found (Daniel D’Aquino)
-- Fixed non-breaking spaces in localized strings (Terry Yiu)
-- Fixed localization issue on Add mute item button (Terry Yiu)
-- Replace non-breaking spaces with regular spaces as Apple's NSLocalizedString macro does not seem to work with it (Terry Yiu)
-- Fixed localization issues in RelayConfigView (Terry Yiu)
-- Fix duplicate uploads (Swift Coder)
-- Remove duplicate pubkey from Follow Suggestion list (Swift Coder)
-- Fix Page control indicator (Swift Coder)
-- Fix damus sharing issues (Swift Coder)
-- Fixed issue where banner edit button is unclickable (Daniel D’Aquino)
-- Handle empty notification pages by displaying suitable text (Swift Coder)
-
-[v1.12](https://github.com/damus-io/damus/releases/tag/v1.12): [https://github.com/damus-io/damus/releases/tag/v1.12]
-
-
 ## [v1.11(10)](https://github.com/damus-io/damus/releases/tag/v1.11-10) - 2024-11-18
 
 ### Added

DamusNotificationService/DamusNotificationService.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.usernotifications.communication</key>
-	<true/>
 	<key>com.apple.developer.kernel.extended-virtual-addressing</key>
 	<true/>
 	<key>com.apple.security.app-sandbox</key>

DamusNotificationService/NotificationExtensionState.swift

@@ -18,7 +18,7 @@ struct NotificationExtensionState: HeadlessDamusState {
     let lnurls: LNUrls
     
     init?() {
-        guard let ndb = Ndb(owns_db_file: false) else { return nil }
+        guard let ndb = try? Ndb(owns_db_file: false) else { return nil }
         self.ndb = ndb
         
         guard let keypair = get_saved_keypair() else { return nil }

DamusNotificationService/NotificationService.swift

@@ -5,32 +5,15 @@
 //  Created by Daniel D’Aquino on 2023-11-10.
 //
 
-import Kingfisher
-import ImageIO
 import UserNotifications
 import Foundation
-import UniformTypeIdentifiers
-import Intents
 
 class NotificationService: UNNotificationServiceExtension {
 
     var contentHandler: ((UNNotificationContent) -> Void)?
     var bestAttemptContent: UNMutableNotificationContent?
 
-    private func configureKingfisherCache() {
-        guard let groupURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.DAMUS_APP_GROUP_IDENTIFIER) else {
-            return
-        }
-
-        let cachePath = groupURL.appendingPathComponent(Constants.IMAGE_CACHE_DIRNAME)
-        if let cache = try? ImageCache(name: "sharedCache", cacheDirectoryURL: cachePath) {
-            KingfisherManager.shared.cache = cache
-        }
-    }
-
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
-        configureKingfisherCache()
-
         self.contentHandler = contentHandler
         
         guard let nostr_event_json = request.content.userInfo["nostr_event"] as? String,
@@ -57,16 +40,9 @@ class NotificationService: UNNotificationServiceExtension {
             return
         }
 
-        let sender_profile = {
-            let txn = state.ndb.lookup_profile(nostr_event.pubkey)
-            let profile = txn?.unsafeUnownedValue?.profile
-            let picture = ((profile?.picture.map { URL(string: $0) }) ?? URL(string: robohash(nostr_event.pubkey)))!
-            return ProfileBuf(picture: picture,
-                                 name: profile?.name,
-                         display_name: profile?.display_name,
-                                nip05: profile?.nip05)
-        }()
-        let sender_pubkey = nostr_event.pubkey
+        let txn = state.ndb.lookup_profile(nostr_event.pubkey)
+        let profile = txn?.unsafeUnownedValue?.profile
+        let name = Profile.displayName(profile: profile, pubkey: nostr_event.pubkey).displayName
 
         // Don't show notification details that match mute list.
         // TODO: Remove this code block once we get notification suppression entitlement from Apple. It will be covered by the `guard should_display_notification` block
@@ -80,7 +56,7 @@ class NotificationService: UNNotificationServiceExtension {
             contentHandler(content)
             return
         }
-
+        
         guard should_display_notification(state: state, event: nostr_event, mode: .push) else {
             Log.debug("should_display_notification failed", for: .push_notifications)
             // We should not display notification for this event. Suppress notification.
@@ -89,7 +65,7 @@ class NotificationService: UNNotificationServiceExtension {
             contentHandler(request.content)
             return
         }
-
+        
         guard let notification_object = generate_local_notification_object(from: nostr_event, state: state) else {
             Log.debug("generate_local_notification_object failed", for: .push_notifications)
             // We could not process this notification. Probably an unsupported nostr event kind. Suppress.
@@ -98,58 +74,15 @@ class NotificationService: UNNotificationServiceExtension {
             contentHandler(request.content)
             return
         }
-
-
+        
         Task {
-            let sender_dn = DisplayName(name: sender_profile.name, display_name: sender_profile.display_name, pubkey: sender_pubkey)
-            guard let (improvedContent, _) = await NotificationFormatter.shared.format_message(displayName: sender_dn.displayName, notify: notification_object, state: state) else {
+            guard let (improvedContent, _) = await NotificationFormatter.shared.format_message(displayName: name, notify: notification_object, state: state) else {
 
                 Log.debug("NotificationFormatter.format_message failed", for: .push_notifications)
                 return
             }
 
-            do {
-                var options: [AnyHashable: Any] = [:]
-                if let imageSource = CGImageSourceCreateWithURL(sender_profile.picture as CFURL, nil),
-                   let uti = CGImageSourceGetType(imageSource) {
-                    options[UNNotificationAttachmentOptionsTypeHintKey] = uti
-                }
-
-                let attachment = try UNNotificationAttachment(identifier: sender_profile.picture.absoluteString, url: sender_profile.picture, options: options)
-                improvedContent.attachments = [attachment]
-            } catch {
-                Log.error("failed to get notification attachment: %s", for: .push_notifications, error.localizedDescription)
-            }
-
-            let kind = nostr_event.known_kind
-
-            // these aren't supported yet
-            if !(kind == .text || kind == .dm) {
-                contentHandler(improvedContent)
-                return
-            }
-
-            // rich communication notifications for kind1, dms, etc
-
-            let message_intent = await message_intent_from_note(ndb: state.ndb,
-                                                                sender_profile: sender_profile,
-                                                                content: improvedContent.body,
-                                                                note: nostr_event,
-                                                                our_pubkey: state.keypair.pubkey)
-
-            improvedContent.threadIdentifier = nostr_event.thread_id().hex()
-            improvedContent.categoryIdentifier = "COMMUNICATION"
-
-            let interaction = INInteraction(intent: message_intent, response: nil)
-            interaction.direction = .incoming
-            do {
-                try await interaction.donate()
-                let updated = try improvedContent.updating(from: message_intent)
-                contentHandler(updated)
-            } catch {
-                Log.error("failed to donate interaction: %s", for: .push_notifications, error.localizedDescription)
-                contentHandler(improvedContent)
-            }
+            contentHandler(improvedContent)
         }
     }
     
@@ -162,162 +95,3 @@ class NotificationService: UNNotificationServiceExtension {
     }
 
 }
-
-struct ProfileBuf {
-    let picture: URL
-    let name: String?
-    let display_name: String?
-    let nip05: String?
-}
-
-func message_intent_from_note(ndb: Ndb, sender_profile: ProfileBuf, content: String, note: NdbNote, our_pubkey: Pubkey) async -> INSendMessageIntent {
-    let sender_pk = note.pubkey
-    let sender = await profile_to_inperson(name: sender_profile.name,
-                                   display_name: sender_profile.display_name,
-                                        picture: sender_profile.picture.absoluteString,
-                                          nip05: sender_profile.nip05,
-                                         pubkey: sender_pk,
-                                     our_pubkey: our_pubkey)
-
-    let conversationIdentifier = note.thread_id().hex()
-    var recipients: [INPerson] = []
-    var pks: [Pubkey] = []
-    let meta = INSendMessageIntentDonationMetadata()
-
-    // gather recipients
-    if let recipient_note_id = note.direct_replies() {
-        let replying_to = ndb.lookup_note(recipient_note_id)
-        if let replying_to_pk = replying_to?.unsafeUnownedValue?.pubkey {
-            meta.isReplyToCurrentUser = replying_to_pk == our_pubkey
-
-            if replying_to_pk != sender_pk {
-                // we push the actual person being replied to first
-                pks.append(replying_to_pk)
-            }
-        }
-    }
-
-    let pubkeys = Array(note.referenced_pubkeys)
-    meta.recipientCount = pubkeys.count
-    if pubkeys.contains(sender_pk) {
-        meta.recipientCount -= 1
-    }
-
-    for pk in pubkeys.prefix(3) {
-        if pk == sender_pk || pks.contains(pk) {
-            continue
-        }
-
-        if !meta.isReplyToCurrentUser && pk == our_pubkey {
-            meta.mentionsCurrentUser = true
-        }
-
-        pks.append(pk)
-    }
-
-    for pk in pks {
-        let recipient = await pubkey_to_inperson(ndb: ndb, pubkey: pk, our_pubkey: our_pubkey)
-        recipients.append(recipient)
-    }
-
-    // we enable default formatting this way
-    var groupName = INSpeakableString(spokenPhrase: "")
-
-    // otherwise we just say its a DM
-    if note.known_kind == .dm {
-        groupName = INSpeakableString(spokenPhrase: "DM")
-    }
-
-    let intent = INSendMessageIntent(recipients: recipients,
-                            outgoingMessageType: .outgoingMessageText,
-                                        content: content,
-                             speakableGroupName: groupName,
-                         conversationIdentifier: conversationIdentifier,
-                                    serviceName: "kind\(note.kind)",
-                                         sender: sender,
-                                    attachments: nil)
-    intent.donationMetadata = meta
-
-    // this is needed for recipients > 0
-    if let img = sender.image {
-        intent.setImage(img, forParameterNamed: \.speakableGroupName)
-    }
-
-    return intent
-}
-
-func pubkey_to_inperson(ndb: Ndb, pubkey: Pubkey, our_pubkey: Pubkey) async -> INPerson {
-    let profile_txn = ndb.lookup_profile(pubkey)
-    let profile = profile_txn?.unsafeUnownedValue?.profile
-    let name = profile?.name
-    let display_name = profile?.display_name
-    let nip05 = profile?.nip05
-    let picture = profile?.picture
-
-    return await profile_to_inperson(name: name,
-                             display_name: display_name,
-                                  picture: picture,
-                                    nip05: nip05,
-                                   pubkey: pubkey,
-                               our_pubkey: our_pubkey)
-}
-
-func fetch_pfp(picture: URL) async throws -> RetrieveImageResult {
-    try await withCheckedThrowingContinuation { continuation in
-        KingfisherManager.shared.retrieveImage(with: Kingfisher.ImageResource(downloadURL: picture)) { result in
-            switch result {
-            case .success(let img):
-                continuation.resume(returning: img)
-            case .failure(let error):
-                continuation.resume(throwing: error)
-            }
-        }
-    }
-}
-
-func profile_to_inperson(name: String?, display_name: String?, picture: String?, nip05: String?, pubkey: Pubkey, our_pubkey: Pubkey) async -> INPerson {
-    let npub = pubkey.npub
-    let handle = INPersonHandle(value: npub, type: .unknown)
-    var aliases: [INPersonHandle] = []
-
-    if let nip05 {
-        aliases.append(INPersonHandle(value: nip05, type: .emailAddress))
-    }
-
-    let nostrName = DisplayName(name: name, display_name: display_name, pubkey: pubkey)
-    let nameComponents = nostrName.nameComponents()
-    let displayName = nostrName.displayName
-    let contactIdentifier = npub
-    let customIdentifier = npub
-    let suggestionType = INPersonSuggestionType.socialProfile
-
-    var image: INImage? = nil
-
-    if let picture,
-       let url = URL(string: picture),
-       let img = try? await fetch_pfp(picture: url),
-       let imgdata = img.data()
-    {
-        image = INImage(imageData: imgdata)
-    } else {
-        Log.error("Failed to fetch pfp (%s) for %s", for: .push_notifications, picture ?? "nil", displayName)
-    }
-
-    let person = INPerson(personHandle: handle,
-                        nameComponents: nameComponents,
-                           displayName: displayName,
-                                 image: image,
-                     contactIdentifier: contactIdentifier,
-                      customIdentifier: customIdentifier,
-                                  isMe: pubkey == our_pubkey,
-                        suggestionType: suggestionType
-    )
-
-    return person
-}
-
-func robohash(_ pk: Pubkey) -> String {
-    return "https://robohash.org/" + pk.hex()
-}
-
-

Package.swift

@@ -1,32 +1,3 @@
-// swift-tools-version: 6.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "damus",
-    platforms: [
-        .iOS(.v16),
-        .macOS(.v12)
-    ],
-    products: [
-        .library(
-            name: "damus",
-            targets: ["damus"]),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/jb55/secp256k1.swift.git", branch: "main")
-    ],
-    targets: [
-        .target(
-            name: "damus",
-            dependencies: [
-                .product(name: "secp256k1", package: "secp256k1.swift")
-            ],
-            path: "damus"),
-        .testTarget(
-            name: "damusTests",
-            dependencies: ["damus"],
-            path: "damusTests"),
-    ]
-)
+dependencies: [
+    .Package(url: "https://github.com/jb55/secp256k1.swift.git", branch: "main")
+]

README.md

@@ -8,7 +8,7 @@ A twitter-like [nostr][nostr] client for iPhone, iPad and MacOS.
 
 [nostr]: https://github.com/fiatjaf/nostr
 
-## How is Damus better than X/Twitter?
+## How is Damus better than twitter?
 There are no toxic algorithms.\
 You can send or receive zaps (satoshis) without asking for permission.\
 [There is no central database](https://fiatjaf.com/nostr.html). Therefore, Damus is censorship resistant.\

TODO

@@ -1 +0,0 @@
-Fix q tags

damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "06318d35ee2e6bd681b95591e67da33a9461b48a3c652e58bd9d1a6f0d82bdac",
+  "originHash" : "534c8e58993919d5ead25ceb4788c8e492c86bc2cf5833dc651ae60a0f30169c",
   "pins" : [
     {
       "identity" : "codescanner",
@@ -9,21 +9,13 @@
         "revision" : "9fa582f4b36c69c2a55bff5fb3377eb170ae273c"
       }
     },
-    {
-      "identity" : "cryptoswift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
-      "state" : {
-        "revision" : "e74bbbfbef939224b242ae7c342a90e60b88b5ce"
-      }
-    },
     {
       "identity" : "emojikit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tyiu/EmojiKit",
       "state" : {
-        "revision" : "47a4b1402de26be0299dcb4d667c1faaf21a7874",
-        "version" : "0.2.0"
+        "revision" : "05805f72d63a6d6a2d7dc7fe14abd37c1317b11a",
+        "version" : "0.1.2"
       }
     },
     {
@@ -31,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tyiu/EmojiPicker.git",
       "state" : {
-        "revision" : "3f48903721eae223238ff0af17c22d6373d33813",
-        "version" : "0.2.0"
+        "revision" : "0c28b4a1a6b8840cf2580bda59517f6d0a733dc8",
+        "version" : "0.1.1"
       }
     },
     {
@@ -49,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/onevcat/Kingfisher",
       "state" : {
-        "revision" : "4c6b067f96953ee19526e49e4189403a2be21fb3",
-        "version" : "8.3.1"
+        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
+        "version" : "7.6.1"
       }
     },
     {
@@ -105,14 +97,6 @@
         "version" : "0.1.2"
       }
     },
-    {
-      "identity" : "swiftycrop",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/benedom/SwiftyCrop",
-      "state" : {
-        "revision" : "454d0a0d4faf6f3a19c8d817ab9d7d27524bd79f"
-      }
-    },
     {
       "identity" : "swipeactions",
       "kind" : "remoteSourceControl",

damus/Assets.xcassets/Logos/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Logos/alby.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "alby.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "alby.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "alby.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "coinos.png",
+      "filename" : "profile-banner.jpeg",
       "idiom" : "universal"
     }
   ],

damus/Assets.xcassets/alby-go.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "alby-go.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/alby.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images": [
+    {
+      "filename": "alby.svg",
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "alby.svg"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "alby.svg"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

damus/Components/Gradients/MutinyGradient.swift

@@ -0,0 +1,15 @@
+//
+//  MutinyGradient.swift
+//  damus
+//
+//  Created by eric on 3/9/24.
+//
+
+import SwiftUI
+
+fileprivate let mutiny_grad_c1 = hex_col(r: 39, g: 95, b: 161)
+fileprivate let mutiny_grad_c2 = hex_col(r: 13, g: 33, b: 56)
+fileprivate let mutiny_grad = [mutiny_grad_c2, mutiny_grad_c1]
+
+let MutinyGradient: LinearGradient =
+    LinearGradient(colors: mutiny_grad, startPoint: .top, endPoint: .bottom)

damus/Components/InvoiceView.swift

@@ -94,30 +94,26 @@ enum OpenWalletError: Error {
 }
 
 func open_with_wallet(wallet: Wallet.Model, invoice: String) throws {
-    let url = try getUrlToOpen(invoice: invoice, with: wallet)
-    this_app.open(url)
-}
-
-func getUrlToOpen(invoice: String, with wallet: Wallet.Model) throws(OpenWalletError) -> URL {
     if let url = URL(string: "\(wallet.link)\(invoice)"), this_app.canOpenURL(url) {
-        return url
+        this_app.open(url)
     } else {
         guard let store_link = wallet.appStoreLink else {
-            throw .no_wallet_to_open
+            throw OpenWalletError.no_wallet_to_open
         }
         
         guard let url = URL(string: store_link) else {
-            throw .store_link_invalid
+            throw OpenWalletError.store_link_invalid
         }
         
         guard this_app.canOpenURL(url) else {
-            throw .system_cannot_open_store_link
+            throw OpenWalletError.system_cannot_open_store_link
         }
         
-        return url
+        this_app.open(url)
     }
 }
 
+
 let test_invoice = Invoice(description: .description("this is a description"), amount: .specific(10000), string: "lnbc100n1p357sl0sp5t9n56wdztun39lgdqlr30xqwksg3k69q4q2rkr52aplujw0esn0qpp5mrqgljk62z20q4nvgr6lzcyn6fhylzccwdvu4k77apg3zmrkujjqdpzw35xjueqd9ejqcfqv3jhxcmjd9c8g6t0dcxqyjw5qcqpjrzjqt56h4gvp5yx36u2uzqa6qwcsk3e2duunfxppzj9vhypc3wfe2wswz607uqq3xqqqsqqqqqqqqqqqlqqyg9qyysgqagx5h20aeulj3gdwx3kxs8u9f4mcakdkwuakasamm9562ffyr9en8yg20lg0ygnr9zpwp68524kmda0t5xp2wytex35pu8hapyjajxqpsql29r", expiry: 604800, payment_hash: Data(), created_at: 1666139119)
 
 struct InvoiceView_Previews: PreviewProvider {

damus/Components/NoteZapButton.swift

@@ -84,7 +84,7 @@ struct NoteZapButton: View {
             print("cancel_zap: we already have a real zap, can't cancel")
             break
         case .pending(let pzap):
-            guard let res = cancel_zap(zap: pzap, box: damus_state.nostrNetwork.postbox, zapcache: damus_state.zaps, evcache: damus_state.events) else {
+            guard let res = cancel_zap(zap: pzap, box: damus_state.postbox, zapcache: damus_state.zaps, evcache: damus_state.events) else {
                 
                 UIImpactFeedbackGenerator(style: .soft).impactOccurred()
                 return
@@ -179,7 +179,7 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
     }
     
     // Only take the first 10 because reasons
-    let relays = Array(damus_state.nostrNetwork.pool.our_descriptors.prefix(10))
+    let relays = Array(damus_state.pool.our_descriptors.prefix(10))
     let content = comment ?? ""
     
     guard let mzapreq = make_zap_request_event(keypair: keypair, content: content, relays: relays, target: target, zap_type: zap_type) else {
@@ -232,7 +232,7 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
                 flusher = .once({ pe in
                     // send donation zap when the pending zap is flushed, this allows user to cancel and not send a donation
                     Task { @MainActor in
-                        await WalletConnect.send_donation_zap(pool: damus_state.nostrNetwork.pool, postbox: damus_state.nostrNetwork.postbox, nwc: nwc_state.url, percent: damus_state.settings.donation_percent, base_msats: amount_msat)
+                        await send_donation_zap(pool: damus_state.pool, postbox: damus_state.postbox, nwc: nwc_state.url, percent: damus_state.settings.donation_percent, base_msats: amount_msat)
                     }
                 })
             }
@@ -240,7 +240,7 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
             // we don't have a delay on one-tap nozaps (since this will be from customize zap view)
             let delay = damus_state.settings.nozaps ? nil : 5.0
 
-            let nwc_req = WalletConnect.pay(url: nwc_state.url, pool: damus_state.nostrNetwork.pool, post: damus_state.nostrNetwork.postbox, invoice: inv, zap_request: zapreq, delay: delay, on_flush: flusher)
+            let nwc_req = nwc_pay(url: nwc_state.url, pool: damus_state.pool, post: damus_state.postbox, invoice: inv, delay: delay, on_flush: flusher)
 
             guard let nwc_req, case .nwc(let pzap_state) = pending_zap_state else {
                 print("nwc: failed to send nwc request for zapreq \(reqid.reqid)")

damus/Components/Reposted.swift

@@ -10,68 +10,22 @@ import SwiftUI
 struct Reposted: View {
     let damus: DamusState
     let pubkey: Pubkey
-    let target: NostrEvent
-    @State var reposts: Int
-
-    init(damus: DamusState, pubkey: Pubkey, target: NostrEvent) {
-        self.damus = damus
-        self.pubkey = pubkey
-        self.target = target
-        self.reposts = damus.boosts.counts[target.id] ?? 1
-    }
 
     var body: some View {
         HStack(alignment: .center) {
             Image("repost")
                 .foregroundColor(Color.gray)
-
-            // Show profile picture of the reposter only if the reposter is not the author of the reposted note.
-            if pubkey != target.pubkey {
-                ProfilePicView(pubkey: pubkey, size: eventview_pfp_size(.small), highlight: .none, profiles: damus.profiles, disable_animation: damus.settings.disable_animation)
-                    .onTapGesture {
-                        show_profile_action_sheet_if_enabled(damus_state: damus, pubkey: pubkey)
-                    }
-                    .onLongPressGesture(minimumDuration: 0.1) {
-                        UIImpactFeedbackGenerator(style: .medium).impactOccurred()
-                        damus.nav.push(route: Route.ProfileByKey(pubkey: pubkey))
-                    }
-            }
-
-            NavigationLink(value: Route.Reposts(reposts: .reposts(state: damus, target: target.id))) {
-                Text(people_reposted_text(profiles: damus.profiles, pubkey: pubkey, reposts: reposts))
-                    .font(.subheadline)
-                    .foregroundColor(.gray)
-            }
+            ProfileName(pubkey: pubkey, damus: damus, show_nip5_domain: false)
+                    .foregroundColor(Color.gray)
+            Text("Reposted", comment: "Text indicating that the note was reposted (i.e. re-shared).")
+                .foregroundColor(Color.gray)
         }
-        .onReceive(handle_notify(.update_stats), perform: { note_id in
-            guard note_id == target.id else { return }
-            let repost_count = damus.boosts.counts[target.id]
-            if let repost_count, reposts != repost_count {
-                reposts = repost_count
-            }
-        })
-    }
-}
-
-func people_reposted_text(profiles: Profiles, pubkey: Pubkey, reposts: Int, locale: Locale = Locale.current) -> String {
-    guard reposts > 0 else {
-        return ""
-    }
-
-    let bundle = bundleForLocale(locale: locale)
-    let other_reposts = reposts - 1
-    let display_name = event_author_name(profiles: profiles, pubkey: pubkey)
-
-    if other_reposts == 0 {
-        return String(format: NSLocalizedString("%@ reposted", bundle: bundle, comment: "Text indicating that the note was reposted (i.e. re-shared)."), locale: locale, display_name)
-    } else {
-        return String(format: localizedStringFormat(key: "people_reposted_count", locale: locale), locale: locale, other_reposts, display_name)
     }
 }
 
 struct Reposted_Previews: PreviewProvider {
     static var previews: some View {
         let test_state = test_damus_state
-        Reposted(damus: test_state, pubkey: test_state.pubkey, target: test_note)
+        Reposted(damus: test_state, pubkey: test_state.pubkey)
     }
 }

damus/Components/SelectableText.swift

@@ -63,7 +63,7 @@ struct SelectableText: View {
         })) {
             if let event, case .show_highlight_post_view(let highlighted_text) = self.selectedTextActionState {
                 PostView(
-                    action: .highlighting(.init(selected_text: highlighted_text, source: .event(event.id))),
+                    action: .highlighting(.init(selected_text: highlighted_text, source: .event(event))),
                     damus_state: damus_state
                 )
                 .presentationDragIndicator(.visible)
@@ -94,12 +94,12 @@ struct SelectableText: View {
         case show_mute_word_view(highlighted_text: String)
         
         func should_show_highlight_post_view() -> Bool {
-            guard case .show_highlight_post_view = self else { return false }
+            guard case .show_highlight_post_view(let highlighted_text) = self else { return false }
             return true
         }
         
         func should_show_mute_word_view() -> Bool {
-            guard case .show_mute_word_view = self else { return false }
+            guard case .show_mute_word_view(let highlighted_text) = self else { return false }
             return true
         }
         
@@ -119,23 +119,16 @@ struct SelectableText: View {
 fileprivate class TextView: UITextView {
     var postHighlight: (String) -> Void
     var muteWord: (String) -> Void
-    private let enableHighlighting: Bool
 
-    init(frame: CGRect, textContainer: NSTextContainer?, postHighlight: @escaping (String) -> Void, muteWord: @escaping (String) -> Void, enableHighlighting: Bool) {
+    init(frame: CGRect, textContainer: NSTextContainer?, postHighlight: @escaping (String) -> Void, muteWord: @escaping (String) -> Void) {
         self.postHighlight = postHighlight
         self.muteWord = muteWord
-        self.enableHighlighting = enableHighlighting
-
         super.init(frame: frame, textContainer: textContainer)
-
-        if enableHighlighting {
-            self.delegate = self
-        }
     }
 
     required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
+            fatalError("init(coder:) has not been implemented")
+        }
 
     override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
         if action == #selector(highlightText(_:)) {
@@ -149,44 +142,23 @@ fileprivate class TextView: UITextView {
         return super.canPerformAction(action, withSender: sender)
     }
     
-    private func getSelectedText() -> String? {
+    func getSelectedText() -> String? {
         guard let selectedRange = self.selectedTextRange else { return nil }
         return self.text(in: selectedRange)
     }
 
-    @objc private func highlightText(_ sender: Any?) {
+    @objc public func highlightText(_ sender: Any?) {
         guard let selectedText = self.getSelectedText() else { return }
         self.postHighlight(selectedText)
     }
     
-    @objc private func muteText(_ sender: Any?) {
+    @objc public func muteText(_ sender: Any?) {
         guard let selectedText = self.getSelectedText() else { return }
         self.muteWord(selectedText)
     }
 
 }
 
-extension TextView: UITextViewDelegate {
-    func textView(_ textView: UITextView, editMenuForTextIn range: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu? {
-        guard enableHighlighting,
-              let selectedTextRange = self.selectedTextRange,
-              let selectedText = self.text(in: selectedTextRange),
-              !selectedText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
-            return nil
-        }
-
-        let highlightAction = UIAction(title: NSLocalizedString("Highlight", comment: "Context menu action to highlight the selected text as context to draft a new note."), image: UIImage(systemName: "highlighter")) { [weak self] _ in
-            self?.postHighlight(selectedText)
-        }
-
-        let muteAction = UIAction(title: NSLocalizedString("Mute", comment: "Context menu action to mute the selected word."), image: UIImage(systemName: "speaker.slash")) { [weak self] _ in
-            self?.muteWord(selectedText)
-        }
-
-        return UIMenu(children: suggestedActions + [highlightAction, muteAction])
-    }
-}
-
 fileprivate struct TextViewRepresentable: UIViewRepresentable {
 
     let attributedString: AttributedString
@@ -200,7 +172,7 @@ fileprivate struct TextViewRepresentable: UIViewRepresentable {
     @Binding var height: CGFloat
 
     func makeUIView(context: UIViewRepresentableContext<Self>) -> TextView {
-        let view = TextView(frame: .zero, textContainer: nil, postHighlight: postHighlight, muteWord: muteWord, enableHighlighting: enableHighlighting)
+        let view = TextView(frame: .zero, textContainer: nil, postHighlight: postHighlight, muteWord: muteWord)
         view.isEditable = false
         view.dataDetectorTypes = .all
         view.isSelectable = true
@@ -211,6 +183,11 @@ fileprivate struct TextViewRepresentable: UIViewRepresentable {
         view.textContainerInset.right = 1.0
         view.textAlignment = textAlignment
 
+        let menuController = UIMenuController.shared
+        let highlightItem = UIMenuItem(title: "Highlight", action: #selector(view.highlightText(_:)))
+        let muteItem = UIMenuItem(title: "Mute", action: #selector(view.muteText(_:)))
+        menuController.menuItems = self.enableHighlighting ? [highlightItem, muteItem] : []
+
         return view
     }
 

damus/Components/Status/UserStatusSheet.swift

@@ -213,6 +213,6 @@ struct UserStatusSheet: View {
 
 struct UserStatusSheet_Previews: PreviewProvider {
     static var previews: some View {
-        UserStatusSheet(damus_state: test_damus_state, postbox: test_damus_state.nostrNetwork.postbox, keypair: test_keypair, status: .init())
+        UserStatusSheet(damus_state: test_damus_state, postbox: test_damus_state.postbox, keypair: test_keypair, status: .init())
     }
 }

damus/Components/SupporterBadge.swift

@@ -12,14 +12,6 @@ struct SupporterBadge: View {
     let purple_account: DamusPurple.Account?
     let style: Style
     let text_color: Color
-    var badge_variant: BadgeVariant {
-        if purple_account?.attributes.contains(.memberForMoreThanOneYear) == true {
-            return .oneYearSpecial
-        }
-        else {
-            return .normal
-        }
-    }
     
     init(percent: Int?, purple_account: DamusPurple.Account? = nil, style: Style, text_color: Color = .secondary) {
         self.percent = percent
@@ -34,18 +26,13 @@ struct SupporterBadge: View {
         HStack {
             if let purple_account, purple_account.active == true {
                 HStack(spacing: 1) {
-                    switch self.badge_variant {
-                    case .normal:
-                        StarShape()
-                            .frame(width:size, height:size)
-                            .foregroundStyle(GoldGradient)
-                    case .oneYearSpecial:
-                        DoubleStar(size: size)
-                    }
-                    
-                    if self.style == .full,
-                       let ordinal = self.purple_account?.ordinal() {
-                        Text(ordinal)
+                    Image("star.fill")
+                        .resizable()
+                        .frame(width:size, height:size)
+                        .foregroundStyle(GoldGradient)
+                    if self.style == .full {
+                        let date = format_date(date: purple_account.created_at, time_style: .none)
+                        Text(date)
                             .foregroundStyle(text_color)
                             .font(.caption)
                     }
@@ -69,102 +56,8 @@ struct SupporterBadge: View {
         case full       // Shows the entire badge with a purple subscriber number if present
         case compact    // Does not show purple subscriber number. Only shows the star (if applicable)
     }
-    
-    enum BadgeVariant {
-        /// A normal badge that people are used to
-        case normal
-        /// A special badge for users who have been members for more than a year
-        case oneYearSpecial
-    }
 }
 
-
-struct StarShape: Shape {
-    func path(in rect: CGRect) -> Path {
-        var path = Path()
-        let center = CGPoint(x: rect.midX, y: rect.midY)
-        let radius: CGFloat = min(rect.width, rect.height) / 2
-        let points = 5
-        let adjustment: CGFloat = .pi / 2
-        
-        for i in 0..<points * 2 {
-            let angle = (CGFloat(i) * .pi / CGFloat(points)) - adjustment
-            let pointRadius = i % 2 == 0 ? radius : radius * 0.4
-            let point = CGPoint(x: center.x + pointRadius * cos(angle), y: center.y + pointRadius * sin(angle))
-            if i == 0 {
-                path.move(to: point)
-            } else {
-                path.addLine(to: point)
-            }
-        }
-        path.closeSubpath()
-        return path
-    }
-}
-
-struct DoubleStar: View {
-    let size: CGFloat
-    var starOffset: CGFloat = 5
-    
-    var body: some View {
-        if #available(iOS 17.0, *) {
-            DoubleStarShape(starOffset: starOffset)
-                .frame(width: size, height: size)
-                .foregroundStyle(GoldGradient)
-                .padding(.trailing, starOffset)
-        } else {
-            Fallback(size: size, starOffset: starOffset)
-        }
-    }
-    
-    @available(iOS 17.0, *)
-    struct DoubleStarShape: Shape {
-        var strokeSize: CGFloat = 3
-        var starOffset: CGFloat
-
-        func path(in rect: CGRect) -> Path {
-            let normalSizedStarPath = StarShape().path(in: rect)
-            let largerStarPath = StarShape().path(in: rect.insetBy(dx: -strokeSize, dy: -strokeSize))
-            
-            let finalPath = normalSizedStarPath
-                .subtracting(
-                    largerStarPath.offsetBy(dx: starOffset, dy: 0)
-                )
-                .union(
-                    normalSizedStarPath.offsetBy(dx: starOffset, dy: 0)
-                )
-            
-            return finalPath
-        }
-    }
-    
-    /// A fallback view for those who cannot run iOS 17
-    struct Fallback: View {
-        var size: CGFloat
-        var starOffset: CGFloat
-        
-        var body: some View {
-            HStack {
-                StarShape()
-                    .frame(width: size, height: size)
-                    .foregroundStyle(GoldGradient)
-                
-                StarShape()
-                    .fill(GoldGradient)
-                    .overlay(
-                        StarShape()
-                            .stroke(Color.damusAdaptableWhite, lineWidth: 1)
-                    )
-                    .frame(width: size + 1, height: size + 1)
-                    .padding(.leading, -size - starOffset)
-            }
-            .padding(.trailing, -3)
-        }
-    }
-}
-
-
-
 func support_level_color(_ percent: Int) -> Color {
     if percent == 0 {
         return .gray
@@ -193,7 +86,7 @@ struct SupporterBadge_Previews: PreviewProvider {
         HStack(alignment: .center) {
             SupporterBadge(
                 percent: nil,
-                purple_account: DamusPurple.Account(pubkey: test_pubkey, created_at: .now, expiry: .now.addingTimeInterval(10000), subscriber_number: subscriber_number, active: true, attributes: []),
+                purple_account: DamusPurple.Account(pubkey: test_pubkey, created_at: .now, expiry: .now.addingTimeInterval(10000), subscriber_number: subscriber_number, active: true),
                 style: .full
             )
                 .frame(width: 100)
@@ -225,52 +118,4 @@ struct SupporterBadge_Previews: PreviewProvider {
     }
 }
 
-#Preview("1 yr badge") {
-    VStack {
-        HStack(alignment: .center) {
-            SupporterBadge(
-                percent: nil,
-                purple_account: DamusPurple.Account(pubkey: test_pubkey, created_at: .now, expiry: .now.addingTimeInterval(10000), subscriber_number: 3, active: true, attributes: []),
-                style: .full
-            )
-                .frame(width: 100)
-        }
-        
-        HStack(alignment: .center) {
-            SupporterBadge(
-                percent: nil,
-                purple_account: DamusPurple.Account(pubkey: test_pubkey, created_at: .now, expiry: .now.addingTimeInterval(10000), subscriber_number: 3, active: true, attributes: [.memberForMoreThanOneYear]),
-                style: .full
-            )
-                .frame(width: 100)
-        }
-        
-        Text(verbatim: "Double star (just shape itself, with alt background color, to show it adapts to background well)")
-            .multilineTextAlignment(.center)
-        
-        if #available(iOS 17.0, *) {
-            HStack(alignment: .center) {
-                DoubleStar.DoubleStarShape(starOffset: 5)
-                    .frame(width: 17, height: 17)
-                    .padding(.trailing, -8)
-            }
-            .background(Color.blue)
-        }
-        
-        Text(verbatim: "Double star (fallback for iOS 16 and below)")
-
-        HStack(alignment: .center) {
-            DoubleStar.Fallback(size: 17, starOffset: 5)
-        }
-        
-        Text(verbatim: "Double star (fallback for iOS 16 and below, with alt color limitation shown)")
-            .multilineTextAlignment(.center)
-        
-        HStack(alignment: .center) {
-            DoubleStar.Fallback(size: 17, starOffset: 5)
-        }
-        .background(Color.blue)
-    }
-}
-
 

damus/Components/TranslateView.swift

@@ -160,7 +160,7 @@ func translate_note(profiles: Profiles, keypair: Keypair, event: NostrEvent, set
 
     // Render translated note
     let translated_blocks = parse_note_content(content: .content(translated_note, event.tags))
-    let artifacts = render_blocks(blocks: translated_blocks, profiles: profiles, can_hide_last_previewable_refs: true)
+    let artifacts = render_blocks(blocks: translated_blocks, profiles: profiles)
     
     // and cache it
     return .translated(Translated(artifacts: artifacts, language: note_lang))

damus/ContentView.swift

@@ -31,8 +31,7 @@ enum Sheets: Identifiable {
     case onboardingSuggestions
     case purple(DamusPurpleURL)
     case purple_onboarding
-    case error(ErrorView.UserPresentableError)
-
+    
     static func zap(target: ZapTarget, lnurl: String) -> Sheets {
         return .zap(ZapSheet(target: target, lnurl: lnurl))
     }
@@ -54,7 +53,6 @@ enum Sheets: Identifiable {
         case .onboardingSuggestions: return "onboarding-suggestions"
         case .purple(let purple_url): return "purple" + purple_url.url_string()
         case .purple_onboarding: return "purple_onboarding"
-        case .error(_): return "error"
         }
     }
 }
@@ -199,7 +197,7 @@ struct ContentView: View {
     func MaybeReportView(target: ReportTarget) -> some View {
         Group {
             if let keypair = damus_state.keypair.to_full() {
-                ReportView(postbox: damus_state.nostrNetwork.postbox, target: target, keypair: keypair)
+                ReportView(postbox: damus_state.postbox, target: target, keypair: keypair)
             } else {
                 EmptyView()
             }
@@ -222,6 +220,12 @@ struct ContentView: View {
         navigationCoordinator.push(route: Route.Script(script: model))
     }
     
+    func open_profile(pubkey: Pubkey) {
+        let profile_model = ProfileModel(pubkey: pubkey, damus: damus_state!)
+        let followers = FollowersModel(damus_state: damus_state!, target: pubkey)
+        navigationCoordinator.push(route: Route.Profile(profile: profile_model, followers: followers))
+    }
+    
     func open_search(filt: NostrFilter) {
         let search = SearchModel(state: damus_state!, search: filt)
         navigationCoordinator.push(route: Route.Search(search: search))
@@ -306,9 +310,6 @@ struct ContentView: View {
                 hasSeenOnboardingSuggestions = true
             }
             self.appDelegate?.state = damus_state
-            Task {  // We probably don't need this to be a detached task. According to https://docs.swift.org/swift-book/documentation/the-swift-programming-language/concurrency/#Defining-and-Calling-Asynchronous-Functions, awaits are only suspension points that do not block the thread.
-                await self.listenAndHandleLocalNotifications()
-            }
         }
         .sheet(item: $active_sheet) { item in
             switch item {
@@ -317,7 +318,7 @@ struct ContentView: View {
             case .post(let action):
                 PostView(action: action, damus_state: damus_state!)
             case .user_status:
-                UserStatusSheet(damus_state: damus_state!, postbox: damus_state!.nostrNetwork.postbox, keypair: damus_state!.keypair, status: damus_state!.profiles.profile_data(damus_state!.pubkey).status)
+                UserStatusSheet(damus_state: damus_state!, postbox: damus_state!.postbox, keypair: damus_state!.keypair, status: damus_state!.profiles.profile_data(damus_state!.pubkey).status)
                     .presentationDragIndicator(.visible)
             case .event:
                 EventDetailView()
@@ -338,14 +339,36 @@ struct ContentView: View {
                 DamusPurpleURLSheetView(damus_state: damus_state!, purple_url: purple_url)
             case .purple_onboarding:
                 DamusPurpleNewUserOnboardingView(damus_state: damus_state)
-            case .error(let error):
-                ErrorView(damus_state: damus_state!, error: error)
             }
         }
         .onOpenURL { url in
-            Task {
-                let open_action = await DamusURLHandler.handle_opening_url_and_compute_view_action(damus_state: self.damus_state, url: url)
-                self.execute_open_action(open_action)
+            on_open_url(state: damus_state!, url: url) { res in
+                guard let res else {
+                    return
+                }
+                
+                switch res {
+                    case .filter(let filt): self.open_search(filt: filt)
+                    case .profile(let pk):  self.open_profile(pubkey: pk)
+                    case .event(let ev):    self.open_event(ev: ev)
+                    case .wallet_connect(let nwc): self.open_wallet(nwc: nwc)
+                    case .script(let data): self.open_script(data)
+                    case .purple(let purple_url):
+                        if case let .welcome(checkout_id) = purple_url.variant {
+                            // If this is a welcome link, do the following before showing the onboarding screen:
+                            // 1. Check if this is legitimate and good to go.
+                            // 2. Mark as complete if this is good to go.
+                            Task {
+                                let is_good_to_go = try? await damus_state.purple.check_and_mark_ln_checkout_is_good_to_go(checkout_id: checkout_id)
+                                if is_good_to_go == true {
+                                    self.active_sheet = .purple(purple_url)
+                                }
+                            }
+                        }
+                        else {
+                            self.active_sheet = .purple(purple_url)
+                        }
+                }
             }
         }
         .onReceive(handle_notify(.compose)) { action in
@@ -356,7 +379,7 @@ struct ContentView: View {
             self.hide_bar = !show
         }
         .onReceive(timer) { n in
-            self.damus_state?.nostrNetwork.postbox.try_flushing_events()
+            self.damus_state?.postbox.try_flushing_events()
             self.damus_state!.profiles.profile_data(self.damus_state!.pubkey).status.try_expire()
         }
         .onReceive(handle_notify(.report)) { target in
@@ -387,12 +410,12 @@ struct ContentView: View {
             let prof = Profile(name: profile.name, display_name: profile.display_name, about: profile.about, picture: profile.picture, banner: profile.banner, website: profile.website, lud06: profile.lud06, lud16: lud16, nip05: profile.nip05, damus_donation: profile.damus_donation, reactions: profile.reactions)
 
             guard let ev = make_metadata_event(keypair: keypair, metadata: prof) else { return }
-            ds.nostrNetwork.postbox.send(ev)
+            ds.postbox.send(ev)
         }
         .onReceive(handle_notify(.broadcast)) { ev in
             guard let ds = self.damus_state else { return }
 
-            ds.nostrNetwork.postbox.send(ev)
+            ds.postbox.send(ev)
         }
         .onReceive(handle_notify(.unfollow)) { target in
             guard let state = self.damus_state else { return }
@@ -414,7 +437,7 @@ struct ContentView: View {
                       return
             }
 
-            if !handle_post_notification(keypair: keypair, postbox: state.nostrNetwork.postbox, events: state.events, post: post) {
+            if !handle_post_notification(keypair: keypair, postbox: state.postbox, events: state.events, post: post) {
                 self.active_sheet = nil
             }
         }
@@ -458,7 +481,7 @@ struct ContentView: View {
             }
         }
         .onReceive(handle_notify(.disconnect_relays)) { () in
-            damus_state.nostrNetwork.pool.disconnect()
+            damus_state.pool.disconnect()
         }
         .onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { obj in
             print("txn: 📙 DAMUS ACTIVE NOTIFY")
@@ -504,10 +527,31 @@ struct ContentView: View {
                 break
             case .active:
                 print("txn: 📙 DAMUS ACTIVE")
-                damus_state.nostrNetwork.pool.ping()
+                damus_state.pool.ping()
             @unknown default:
                 break
             }
+        }
+        .onReceive(handle_notify(.local_notification)) { local in
+            guard let damus_state else { return }
+
+            switch local.mention {
+            case .pubkey(let pubkey):
+                open_profile(pubkey: pubkey)
+
+            case .note(let noteId):
+                openEvent(noteId: noteId, notificationType: local.type)
+            case .nevent(let nevent):
+                openEvent(noteId: nevent.noteid, notificationType: local.type)
+            case .nprofile(let nprofile):
+                open_profile(pubkey: nprofile.author)
+            case .nrelay(_):
+                break
+            case .naddr(let naddr):
+                break
+            }
+
+
         }
         .onReceive(handle_notify(.onlyzaps_mode)) { hide in
             home.filter_events()
@@ -523,7 +567,7 @@ struct ContentView: View {
             let prof = Profile(name: profile.name, display_name: profile.display_name, about: profile.about, picture: profile.picture, banner: profile.banner, website: profile.website, lud06: profile.lud06, lud16: profile.lud16, nip05: profile.nip05, damus_donation: profile.damus_donation, reactions: !hide)
 
             guard let profile_ev = make_metadata_event(keypair: keypair, metadata: prof) else { return }
-            ds.nostrNetwork.postbox.send(profile_ev)
+            ds.postbox.send(profile_ev)
         }
         .alert(NSLocalizedString("User muted", comment: "Alert message to indicate the user has been muted"), isPresented: $user_muted_confirm, actions: {
             Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to muted a user was successful.")) {
@@ -555,7 +599,7 @@ struct ContentView: View {
                 }
                 
                 ds.mutelist_manager.set_mutelist(mutelist)
-                ds.nostrNetwork.postbox.send(mutelist)
+                ds.postbox.send(mutelist)
 
                 confirm_overwrite_mutelist = false
                 confirm_mute = false
@@ -564,7 +608,7 @@ struct ContentView: View {
         }, message: {
             Text("No mute list found, create a new one? This will overwrite any previous mute lists.", comment: "Alert message prompt that asks if the user wants to create a new mute list, overwriting previous mute lists.")
         })
-        .alert(NSLocalizedString("Mute/Block User", comment: "Title of alert for muting/blocking a user."), isPresented: $confirm_mute, actions: {
+        .alert(NSLocalizedString("Mute User", comment: "Title of alert for muting a user."), isPresented: $confirm_mute, actions: {
             Button(NSLocalizedString("Cancel", comment: "Alert button to cancel out of alert for muting a user."), role: .cancel) {
                 confirm_mute = false
             }
@@ -587,7 +631,7 @@ struct ContentView: View {
                     }
 
                     ds.mutelist_manager.set_mutelist(ev)
-                    ds.nostrNetwork.postbox.send(ev)
+                    ds.postbox.send(ev)
                 }
             }
         }, message: {
@@ -617,28 +661,6 @@ struct ContentView: View {
         self.selected_timeline = timeline
     }
 
-    /// Listens to requests to open a push/local user notification
-    ///
-    /// This function never returns, it just keeps streaming
-    func listenAndHandleLocalNotifications() async {
-        for await notification in await QueueableNotify<LossyLocalNotification>.shared.stream {
-            self.handleNotification(notification: notification)
-        }
-    }
-
-    func handleNotification(notification: LossyLocalNotification) {
-        Log.info("ContentView is handling a notification", for: .push_notifications)
-        guard damus_state != nil else {
-            // This should never happen because `listenAndHandleLocalNotifications` is called after damus state is initialized in `onAppear`
-            assertionFailure("DamusState not loaded when ContentView (new handler) was handling a notification")
-            Log.error("DamusState not loaded when ContentView (new handler) was handling a notification", for: .push_notifications)
-            return
-        }
-        let local = notification
-        let openAction = local.toViewOpenAction()
-        self.execute_open_action(openAction)
-    }
-
     func connect() {
         // nostrdb
         var mndb = Ndb()
@@ -656,14 +678,28 @@ struct ContentView: View {
 
         guard let ndb = mndb else { return  }
 
+        let pool = RelayPool(ndb: ndb, keypair: keypair)
         let model_cache = RelayModelCache()
         let relay_filters = RelayFilters(our_pubkey: pubkey)
+        let bootstrap_relays = load_bootstrap_relays(pubkey: pubkey)
         
         let settings = UserSettingsStore.globally_load_for(pubkey: pubkey)
 
         let new_relay_filters = load_relay_filters(pubkey) == nil
+        for relay in bootstrap_relays {
+            let descriptor = RelayDescriptor(url: relay, info: .rw)
+            add_new_relay(model_cache: model_cache, relay_filters: relay_filters, pool: pool, descriptor: descriptor, new_relay_filters: new_relay_filters, logging_enabled: settings.developer_mode)
+        }
 
-        self.damus_state = DamusState(keypair: keypair,
+        pool.register_handler(sub_id: sub_id, handler: home.handle_event)
+        
+        if let nwc_str = settings.nostr_wallet_connect,
+           let nwc = WalletConnectURL(str: nwc_str) {
+            try? pool.add_relay(.nwc(url: nwc.relay))
+        }
+
+        self.damus_state = DamusState(pool: pool,
+                                      keypair: keypair,
                                       likes: EventCounter(our_pubkey: pubkey),
                                       boosts: EventCounter(our_pubkey: pubkey),
                                       contacts: Contacts(our_pubkey: pubkey),
@@ -679,6 +715,8 @@ struct ContentView: View {
                                       drafts: Drafts(),
                                       events: EventCache(ndb: ndb),
                                       bookmarks: BookmarksManager(pubkey: pubkey),
+                                      postbox: PostBox(pool: pool),
+                                      bootstrap_relays: bootstrap_relays,
                                       replies: ReplyCounter(our_pubkey: pubkey),
                                       wallet: WalletModel(settings: settings),
                                       nav: self.navigationCoordinator,
@@ -702,8 +740,7 @@ struct ContentView: View {
             // Purple API is an experimental feature. If not enabled, do not connect `StoreObserver` with Purple API to avoid leaking receipts
         }
         
-        damus_state.nostrNetwork.pool.register_handler(sub_id: sub_id, handler: home.handle_event)
-        damus_state.nostrNetwork.connect()
+        pool.connect()
     }
 
     func music_changed(_ state: MusicState) {
@@ -726,45 +763,25 @@ struct ContentView: View {
             pdata.status.music = music
 
             guard let ev = music.to_note(keypair: kp) else { return }
-            damus_state.nostrNetwork.postbox.send(ev)
+            damus_state.postbox.send(ev)
         }
     }
-    
-    /// An open action within the app
-    /// This is used to model, store, and communicate a desired view action to be taken as a result of opening an object,
-    /// for example a URL
-    ///
-    /// ## Implementation notes
-    ///
-    /// - The reason this was created was to separate URL parsing logic, the underlying actions that mutate the state of the app, and the action to be taken on the view layer as a result. This makes it easier to test, to read the URL handling code, and to add new functionality in between the two (e.g. a confirmation screen before proceeding with a given open action)
-    enum ViewOpenAction {
-        /// Open a page route
-        case route(Route)
-        /// Open a sheet
-        case sheet(Sheets)
-        /// Open an external URL
-        case external_url(URL)
-        /// Do nothing.
-        ///
-        /// ## Implementation notes
-        /// - This is used here instead of Optional values to make semantics explicit and force better programming intent, instead of accidentally doing nothing because of Swift's syntax sugar.
-        case no_action
-    }
-    
-    /// Executes an action to open something in the app view
-    ///
-    /// - Parameter open_action: The action to perform
-    func execute_open_action(_ open_action: ViewOpenAction) {
-        switch open_action {
-        case .route(let route):
-            navigationCoordinator.push(route: route)
-        case .sheet(let sheet):
-            self.active_sheet = sheet
-        case .external_url(let url):
-            this_app.open(url)
-        case .no_action:
+
+    private func openEvent(noteId: NoteId, notificationType: LocalNotificationType) {
+        guard let target = damus_state.events.lookup(noteId) else {
             return
         }
+
+        switch notificationType {
+        case .dm:
+            selected_timeline = .dms
+            damus_state.dms.set_active_dm(target.pubkey)
+            navigationCoordinator.push(route: Route.DMChat(dms: damus_state.dms.active_model))
+        case .like, .zap, .mention, .repost, .reply, .tagged:
+            open_event(ev: target)
+        case .profile_zap:
+            break
+        }
     }
 }
 
@@ -914,41 +931,14 @@ enum FindEventType {
 
 enum FoundEvent {
     case profile(Pubkey)
+    case invalid_profile(NostrEvent)
     case event(NostrEvent)
 }
 
-/// Finds an event from NostrDB if it exists, or from the network
-///
-/// This is the callback version. There is also an asyc/await version of this function.
-///
-/// - Parameters:
-///   - state: Damus state
-///   - query_: The query, including the event being looked for, and the relays to use when looking
-///   - callback: The function to call with results
 func find_event(state: DamusState, query query_: FindEvent, callback: @escaping (FoundEvent?) -> ()) {
     return find_event_with_subid(state: state, query: query_, subid: UUID().description, callback: callback)
 }
 
-/// Finds an event from NostrDB if it exists, or from the network
-///
-/// This is a the async/await version of `find_event`. Use this when using callbacks is impossible or cumbersome.
-///
-/// - Parameters:
-///   - state: Damus state
-///   - query_: The query, including the event being looked for, and the relays to use when looking
-///   - callback: The function to call with results
-func find_event(state: DamusState, query query_: FindEvent) async -> FoundEvent? {
-    await withCheckedContinuation { continuation in
-        find_event(state: state, query: query_) { event in
-            var already_resumed = false
-            if !already_resumed {   // Ensure we do not resume twice, as it causes a crash
-                continuation.resume(returning: event)
-                already_resumed = true
-            }
-        }
-    }
-}
-
 func find_event_with_subid(state: DamusState, query query_: FindEvent, subid: String, callback: @escaping (FoundEvent?) -> ()) {
 
     var filter: NostrFilter? = nil
@@ -979,7 +969,7 @@ func find_event_with_subid(state: DamusState, query query_: FindEvent, subid: St
     var has_event = false
     guard let filter else { return }
     
-    state.nostrNetwork.pool.subscribe_to(sub_id: subid, filters: [filter], to: find_from) { relay_id, res  in
+    state.pool.subscribe_to(sub_id: subid, filters: [filter], to: find_from) { relay_id, res  in
         guard case .nostr_event(let ev) = res else {
             return
         }
@@ -993,11 +983,15 @@ func find_event_with_subid(state: DamusState, query query_: FindEvent, subid: St
             break
         case .event(_, let ev):
             has_event = true
-            state.nostrNetwork.pool.unsubscribe(sub_id: subid)
+            state.pool.unsubscribe(sub_id: subid)
             
             switch query {
             case .profile:
                 if ev.known_kind == .metadata {
+                    guard state.ndb.lookup_profile_key(ev.pubkey) != nil else {
+                        callback(.invalid_profile(ev))
+                        return
+                    }
                     callback(.profile(ev.pubkey))
                 }
             case .event:
@@ -1006,38 +1000,30 @@ func find_event_with_subid(state: DamusState, query query_: FindEvent, subid: St
         case .eose:
             if !has_event {
                 attempts += 1
-                if attempts >= state.nostrNetwork.pool.our_descriptors.count {
-                    callback(nil)   // If we could not find any events in any of the relays we are connected to, send back nil
+                if attempts == state.pool.our_descriptors.count / 2 {
+                    callback(nil)
                 }
+                state.pool.unsubscribe(sub_id: subid, to: [relay_id])
             }
-            state.nostrNetwork.pool.unsubscribe(sub_id: subid, to: [relay_id])   // We are only finding an event once, so close subscription on eose
         case .notice:
             break
         case .auth:
             break
         }
+
     }
 }
 
-
-/// Finds a replaceable event based on an `naddr` address.
-///
-/// This is the callback version of the function. There is another function that makes use of async/await
-///
-/// - Parameters:
-///   - damus_state: The Damus state
-///   - naddr: the `naddr` address
-///   - callback: A function to handle the found event
 func naddrLookup(damus_state: DamusState, naddr: NAddr, callback: @escaping (NostrEvent?) -> ()) {
-    let nostrKinds: [NostrKind]? = NostrKind(rawValue: naddr.kind).map { [$0] }
+    var nostrKinds: [NostrKind]? = NostrKind(rawValue: naddr.kind).map { [$0] }
 
     let filter = NostrFilter(kinds: nostrKinds, authors: [naddr.author])
     
     let subid = UUID().description
     
-    damus_state.nostrNetwork.pool.subscribe_to(sub_id: subid, filters: [filter], to: nil) { relay_id, res  in
+    damus_state.pool.subscribe_to(sub_id: subid, filters: [filter], to: nil) { relay_id, res  in
         guard case .nostr_event(let ev) = res else {
-            damus_state.nostrNetwork.pool.unsubscribe(sub_id: subid, to: [relay_id])
+            damus_state.pool.unsubscribe(sub_id: subid, to: [relay_id])
             return
         }
         
@@ -1045,34 +1031,14 @@ func naddrLookup(damus_state: DamusState, naddr: NAddr, callback: @escaping (Nos
             for tag in ev.tags {
                 if(tag.count >= 2 && tag[0].string() == "d"){
                     if (tag[1].string() == naddr.identifier){
-                        damus_state.nostrNetwork.pool.unsubscribe(sub_id: subid, to: [relay_id])
+                        damus_state.pool.unsubscribe(sub_id: subid, to: [relay_id])
                         callback(ev)
                         return
                     }
                 }
             }
         }
-        damus_state.nostrNetwork.pool.unsubscribe(sub_id: subid, to: [relay_id])
-    }
-}
-
-/// Finds a replaceable event based on an `naddr` address.
-///
-/// This is the async/await version of the function. Another version of this function which makes use of callback functions also exists .
-///
-/// - Parameters:
-///   - damus_state: The Damus state
-///   - naddr: the `naddr` address
-///   - callback: A function to handle the found event
-func naddrLookup(damus_state: DamusState, naddr: NAddr) async -> NostrEvent? {
-    await withCheckedContinuation { continuation in
-        var already_resumed = false
-        naddrLookup(damus_state: damus_state, naddr: naddr) { event in
-            if !already_resumed {   // Ensure we do not resume twice, as it causes a crash
-                continuation.resume(returning: event)
-                already_resumed = true
-            }
-        }
+        damus_state.pool.unsubscribe(sub_id: subid, to: [relay_id])
     }
 }
 
@@ -1100,7 +1066,7 @@ func handle_unfollow(state: DamusState, unfollow: FollowRef) -> Bool {
 
     let old_contacts = state.contacts.event
 
-    guard let ev = unfollow_reference(postbox: state.nostrNetwork.postbox, our_contacts: old_contacts, keypair: keypair, unfollow: unfollow)
+    guard let ev = unfollow_reference(postbox: state.postbox, our_contacts: old_contacts, keypair: keypair, unfollow: unfollow)
     else {
         return false
     }
@@ -1126,7 +1092,7 @@ func handle_follow(state: DamusState, follow: FollowRef) -> Bool {
         return false
     }
 
-    guard let ev = follow_reference(box: state.nostrNetwork.postbox, our_contacts: state.contacts.event, keypair: keypair, follow: follow)
+    guard let ev = follow_reference(box: state.postbox, our_contacts: state.contacts.event, keypair: keypair, follow: follow)
     else {
         return false
     }
@@ -1186,32 +1152,60 @@ func handle_post_notification(keypair: FullKeypair, postbox: PostBox, events: Ev
     }
 }
 
-extension LossyLocalNotification {
-    /// Computes a view open action from a mention reference.
-    /// Use this when opening a user-presentable interface to a specific mention reference.
-    func toViewOpenAction() -> ContentView.ViewOpenAction {
-        switch self.mention {
-        case .pubkey(let pubkey):
-            return .route(.ProfileByKey(pubkey: pubkey))
-        case .note(let noteId):
-            return .route(.LoadableNostrEvent(note_reference: .note_id(noteId)))
-        case .nevent(let nEvent):
-            // TODO: Improve this by implementing a route that handles nevents with their relay hints.
-            return .route(.LoadableNostrEvent(note_reference: .note_id(nEvent.noteid)))
-        case .nprofile(let nProfile):
-            // TODO: Improve this by implementing a profile route that handles nprofiles with their relay hints.
-            return .route(.ProfileByKey(pubkey: nProfile.author))
-        case .nrelay:
-            // We do not need to implement `nrelay` support, it has been deprecated.
-            // See https://github.com/nostr-protocol/nips/blob/6e7a618e7f873bb91e743caacc3b09edab7796a0/BREAKING.md?plain=1#L21
-            return .sheet(.error(ErrorView.UserPresentableError(
-                user_visible_description: NSLocalizedString("You opened an invalid link. The link you tried to open refers to \"nrelay\", which has been deprecated and is not supported.", comment: "User-visible error description for a user who tries to open a deprecated \"nrelay\" link."),
-                tip: NSLocalizedString("Please contact the person who provided the link, and ask for another link.", comment: "User-visible tip on what to do if a link contains a deprecated \"nrelay\" reference."),
-                technical_info: "`MentionRef.toViewOpenAction` detected deprecated `nrelay` contents"
-            )))
-        case .naddr(let nAddr):
-            return .route(.LoadableNostrEvent(note_reference: .naddr(nAddr)))
+
+enum OpenResult {
+    case profile(Pubkey)
+    case filter(NostrFilter)
+    case event(NostrEvent)
+    case wallet_connect(WalletConnectURL)
+    case script([UInt8])
+    case purple(DamusPurpleURL)
+}
+
+func on_open_url(state: DamusState, url: URL, result: @escaping (OpenResult?) -> Void) {
+    if let purple_url = DamusPurpleURL(url: url) {
+        result(.purple(purple_url))
+        return
+    }
+    
+    if let nwc = WalletConnectURL(str: url.absoluteString) {
+        result(.wallet_connect(nwc))
+        return
+    }
+    
+    guard let link = decode_nostr_uri(url.absoluteString) else {
+        result(nil)
+        return
+    }
+    
+    switch link {
+    case .ref(let ref):
+        switch ref {
+        case .pubkey(let pk):
+            result(.profile(pk))
+        case .event(let noteid):
+            find_event(state: state, query: .event(evid: noteid)) { res in
+                guard let res, case .event(let ev) = res else { return }
+                result(.event(ev))
+            }
+        case .hashtag(let ht):
+            result(.filter(.filter_hashtag([ht.hashtag])))
+        case .param, .quote, .reference:
+            // doesn't really make sense here
+            break
+        case .naddr(let naddr):
+            naddrLookup(damus_state: state, naddr: naddr) { res in
+                guard let res = res else { return }
+                result(.event(res))
+            }
         }
+    case .filter(let filt):
+        result(.filter(filt))
+        break
+        // TODO: handle filter searches?
+    case .script(let script):
+        result(.script(script))
+        break
     }
 }
 

damus/Info.plist

@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>INSendMessageIntent</string>
-	</array>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -52,8 +48,6 @@
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>river</string>
-		<string>alby</string>
-		<string>albygo</string>
 		<string>bitcoinbeach</string>
 		<string>breez</string>
 		<string>muun</string>
@@ -77,6 +71,6 @@
 	<key>NSAppleMusicUsageDescription</key>
 	<string>Damus needs access to your media library for playback statuses</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>Damus needs access to your microphone to allow you to create video recordings that you can choose to post publicly on the network</string>
+	<string>Damus needs access to your microphone for creating video recording posts</string>
 </dict>
 </plist>

damus/Models/Camera/CameraService+Extensions.swift

@@ -0,0 +1,32 @@
+//
+//  CameraService+Extensions.swift
+//  damus
+//
+//  Created by Suhail Saqan on 8/5/23.
+//
+
+import Foundation
+import UIKit
+import AVFoundation
+
+extension AVCaptureVideoOrientation {
+    init?(deviceOrientation: UIDeviceOrientation) {
+        switch deviceOrientation {
+        case .portrait: self = .portrait
+        case .portraitUpsideDown: self = .portraitUpsideDown
+        case .landscapeLeft: self = .landscapeRight
+        case .landscapeRight: self = .landscapeLeft
+        default: return nil
+        }
+    }
+
+    init?(interfaceOrientation: UIInterfaceOrientation) {
+        switch interfaceOrientation {
+        case .portrait: self = .portrait
+        case .portraitUpsideDown: self = .portraitUpsideDown
+        case .landscapeLeft: self = .landscapeLeft
+        case .landscapeRight: self = .landscapeRight
+        default: return nil
+        }
+    }
+}