Fix localization bugs and export localizations

.github/workflows/run-tests.yaml

@@ -0,0 +1,17 @@
+name: Test
+on:
+  push:
+    branches:
+      - "master"
+  pull_request:
+    branches:
+      - "*"
+jobs:
+  test:
+    name: Run Tests
+    runs-on: macos-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v1
+    - name: Running Tests
+      run: xcodebuild test -scheme damus -project damus.xcodeproj -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.0' | xcpretty && exit ${PIPESTATUS[0]}

.gitignore

@@ -1,8 +1,5 @@
 xcuserdata
 /.direnv
 damus/TestingPrivate.swift
-damus.xcodeproj/xcshareddata/xcbaselines
 .DS_Store
 TODO.bak
-tags
-build-git-hash.txt

.mailmap

@@ -1,6 +0,0 @@
-Terry Yiu <git@tyiu.xyz> <963907+tyiu@users.noreply.github.com>
-Ben Weeks <ben.weeks@knowall.ai> <ben.weeks@outlook.com>
-Suhail Saqan <suhail.saqan@gmail.com> <43693074+suhailsaqan@users.noreply.github.com>
-cr0bar <cr0bar@cr0.bar> <cr0bar@users.noreply.github.com>
-Swift <scoder1747@gmail.com> <120697811+scoder1747@users.noreply.github.com>
-Daniel D'Aquino <daniel@daquino.me> <patches@damus.io>

.rgignore

@@ -1,2 +0,0 @@
-translations/
-*.lproj/

DamusNotificationService/DamusNotificationService.entitlements

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.com.damus</string>
-	</array>
-	<key>com.apple.security.network.client</key>
-	<true/>
-</dict>
-</plist>

DamusNotificationService/Info.plist

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.usernotifications.service</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
-	</dict>
-</dict>
-</plist>

DamusNotificationService/NostrEventInfoFromPushNotification.swift

@@ -1,49 +0,0 @@
-//
-//  NostrEventInfoFromPushNotification.swift
-//  DamusNotificationService
-//
-//  Created by Daniel D’Aquino on 2023-11-13.
-//
-
-import Foundation
-
-/// The representation of a JSON-encoded Nostr Event used by the push notification server
-/// Needs to match with https://gitlab.com/soapbox-pub/strfry-policies/-/raw/433459d8084d1f2d6500fdf916f22caa3b4d7be5/src/types.ts
-struct NostrEventInfoFromPushNotification: Codable {
-    let id: String          // Hex-encoded
-    let sig: String         // Hex-encoded
-    let kind: NostrKind
-    let tags: [[String]]
-    let pubkey: String      // Hex-encoded
-    let content: String
-    let created_at: Int
-    
-    static func from(dictionary: [AnyHashable: Any]) -> NostrEventInfoFromPushNotification? {
-        guard let id = dictionary["id"] as? String,
-              let sig = dictionary["sig"] as? String,
-              let kind_int = dictionary["kind"] as? UInt32,
-              let kind = NostrKind(rawValue: kind_int),
-              let tags = dictionary["tags"] as? [[String]],
-              let pubkey = dictionary["pubkey"] as? String,
-              let content = dictionary["content"] as? String,
-              let created_at = dictionary["created_at"] as? Int else {
-            return nil
-        }
-        return NostrEventInfoFromPushNotification(id: id, sig: sig, kind: kind, tags: tags, pubkey: pubkey, content: content, created_at: created_at)
-    }
-    
-    func reactionEmoji() -> String? {
-        guard self.kind == NostrKind.like else {
-            return nil
-        }
-
-        switch self.content {
-        case "", "+":
-            return "❤️"
-        case "-":
-            return "👎"
-        default:
-            return self.content
-        }
-    }
-}

DamusNotificationService/NotificationFormatter.swift

@@ -1,48 +0,0 @@
-//
-//  NotificationFormatter.swift
-//  DamusNotificationService
-//
-//  Created by Daniel D’Aquino on 2023-11-13.
-//
-
-import Foundation
-import UserNotifications
-
-struct NotificationFormatter {
-    static var shared = NotificationFormatter()
-    
-    // TODO: These is a very generic notification formatter. Once we integrate NostrDB into the extension, we should reuse various functions present in `HomeModel.swift`
-    func formatMessage(event: NostrEventInfoFromPushNotification) -> UNNotificationContent? {
-        let content = UNMutableNotificationContent()
-        if let event_json_data = try? JSONEncoder().encode(event),  // Must be encoded, as the notification completion handler requires this object to conform to `NSSecureCoding`
-           let event_json_string = String(data: event_json_data, encoding: .utf8) {
-            content.userInfo = [
-                "nostr_event_info": event_json_string
-            ]
-        }
-        switch event.kind {
-            case .text:
-                content.title = NSLocalizedString("Someone posted a note", comment: "Title label for push notification where someone posted a note")
-                content.body = event.content
-                break
-            case .dm:
-                content.title = NSLocalizedString("New message", comment: "Title label for push notifications where a direct message was sent to the user")
-                content.body = NSLocalizedString("(Contents are encrypted)", comment: "Label on push notification indicating that the contents of the message are encrypted")
-                break
-            case .like:
-                guard let reactionEmoji = event.reactionEmoji() else {
-                    content.title = NSLocalizedString("Someone reacted to your note", comment: "Generic title label for push notifications where someone reacted to the user's post")
-                    break
-                }
-                content.title = NSLocalizedString("New note reaction", comment: "Title label for push notifications where someone reacted to the user's post with a specific emoji")
-                content.body = String(format: NSLocalizedString("Someone reacted to your note with %@", comment: "Body label for push notifications where someone reacted to the user's post with a specific emoji"), reactionEmoji)
-                break
-            case .zap:
-                content.title = NSLocalizedString("Someone zapped you ⚡️", comment: "Title label for a push notification where someone zapped the user")
-                break
-            default:
-                return nil
-        }
-        return content
-    }
-}

DamusNotificationService/NotificationService.swift

@@ -1,47 +0,0 @@
-//
-//  NotificationService.swift
-//  DamusNotificationService
-//
-//  Created by Daniel D’Aquino on 2023-11-10.
-//
-
-import UserNotifications
-import Foundation
-
-class NotificationService: UNNotificationServiceExtension {
-
-    var contentHandler: ((UNNotificationContent) -> Void)?
-    var bestAttemptContent: UNMutableNotificationContent?
-
-    override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
-        self.contentHandler = contentHandler
-        
-        let ndb: Ndb? = try? Ndb(owns_db_file: false)
-        
-        // Modify the notification content here...
-        guard let nostrEventInfoDictionary = request.content.userInfo["nostr_event"] as? [AnyHashable: Any],
-              let nostrEventInfo = NostrEventInfoFromPushNotification.from(dictionary: nostrEventInfoDictionary) else {
-            contentHandler(request.content)
-            return;
-        }
-        
-        // Log that we got a push notification
-        if let pubkey = Pubkey(hex: nostrEventInfo.pubkey),
-           let txn = ndb?.lookup_profile(pubkey) {
-            Log.debug("Got push notification from %s (%s)", for: .push_notifications, (txn.unsafeUnownedValue?.profile?.display_name ?? "Unknown"), nostrEventInfo.pubkey)
-        }
-        
-        if let improvedContent = NotificationFormatter.shared.formatMessage(event: nostrEventInfo) {
-            contentHandler(improvedContent)
-        }
-    }
-    
-    override func serviceExtensionTimeWillExpire() {
-        // Called just before the extension will be terminated by the system.
-        // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
-        if let contentHandler = contentHandler, let bestAttemptContent =  bestAttemptContent {
-            contentHandler(bestAttemptContent)
-        }
-    }
-
-}

Makefile

@@ -1,13 +0,0 @@
-
-all: nostrscript/primal.wasm
-
-nostrscript/%.wasm: nostrscript/%.ts nostrscript/nostr.ts Makefile
-	asc $< --runtime stub --outFile $@  --optimize
-
-tags:
-	find damus-c -name '*.c' -or -name '*.h' | xargs ctags
-
-clean:
-	rm nostrscript/*.wasm
-
-.PHONY: tags

Package.swift

@@ -1,3 +1,4 @@
 dependencies: [
+    .Package(url: "https://github.com/daltoniam/Starscream.git", majorVersion: 4),
     .Package(url: "https://github.com/jb55/secp256k1.swift.git", branch: "main")
 ]

README.md

@@ -1,4 +1,3 @@
-[![Run Test Suite](https://github.com/damus-io/damus/actions/workflows/run-tests.yaml/badge.svg?branch=master)](https://github.com/damus-io/damus/actions/workflows/run-tests.yaml)
 
 # damus
 
@@ -26,7 +25,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 ## Getting Started on Damus 
 
 ### Damus iOS
-1) Get the Damus app on the iOS App Store: https://apps.apple.com/ca/app/damus/id1628663131
+1) Get the Damus app on TestFlight: https://testflight.apple.com/join/CLwjLxWl
 
 #### ⚙️ Settings (gear icon, top right)
 - Relays: You can add more relays to send your notes to by tapping the "+". 
@@ -49,7 +48,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
   4. Add @ direcly followed by the pubkey (e.g., `@npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s`)
 - You can also long-press a Note to grab their User ID aka pubkey or Note ID to link directly to a Note.
 - Currently you can't delete your Notes in the iOS app
-- Share images by pasting the image url which you can grab from imgbb, imgur, etc. (i.e., `https://i.ibb.co/2SHZbwm/alpha60.jpg`). Currently images only load for people you follow in the 🏠 Personal Feed. Images are not automatically loaded in 🔍 Global Feed
+- Share images by pasting the image url which you can grab from imgbb, imgur, etc. (i.e., `(https://i.ibb.co/2SHZbwm/alpha60.jpg)`). Currently images only load for people you follow in the 🏠 Personal Feed. Images are not automatically loaded in 🔍 Global Feed
 - Engaging with Notes
   - 💬 Replying to a Note: Tap the chat icon underneath the note. This will show up in the users’ notifications and in your 🏠 Personal and 🔍 Global Feeds
   - ♺ Reposts: Tap the repost icon which will show up in your 🏠 Personal and 🔍 Global Feeds
@@ -92,40 +91,15 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 
 ## Contributing
 
-Contributors welcome! Start by examining known issues: https://github.com/damus-io/damus/issues.
+Contributors welcome! [Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on github as well.
 
-### Mailing lists
+[git-send-email]: http://git-send-email.io
 
-We have a few mailing lists that anyone can join to get involved in damus development:
+## git log bot
 
-- [dev][dev-list] - development discussions
-- [patches][patches-list] - code submission and review
-- [product][product-list] - product discussions
-- [design][design-list] - design discussions
+npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas
 
-[dev-list]: https://damus.io/list/dev
-[patches-list]: https://damus.io/list/patches
-[product-list]: https://damus.io/list/product
-[design-list]: https://damus.io/list/design
-
-### Contributing
-
-See [docs/CONTRIBUTING.md](./docs/CONTRIBUTING.md)
-
-### Privacy
-Your internet protocol (IP) address is exposed to the relays you connect to, and third party media hosters (e.g. nostr.build, imgur.com, giphy.com, youtube.com etc.) that render on Damus. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online.
-
-The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
-
-### Translations
-
-Translators welcome! Join the [Transifex][transifex] project.
-
-All user-facing strings must have a comment in order to provide context to translators. If a SwiftUI component has a `comment` parameter, use that. Otherwise, wrap your string with `NSLocalizedString` with the `comment` field populated.
-
-[transifex]: https://explore.transifex.com/damus/damus-ios/
-
-### Awards
+### Awards 
 
 There may be nostr badges awarded for contributors in the future... :)
 
@@ -133,7 +107,3 @@ First contributors:
 
 1. @randymcmillan
 2. @jcarucci27
-
-### git log bot
-
-npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas

damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/InfoPlist.strings

@@ -0,0 +1,6 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "Damus";
+/* Bundle name */
+"CFBundleName" = "damus";
+/* Privacy - Photo Library Additions Usage Description */
+"NSPhotoLibraryAddUsageDescription" = "\"Granting Damus access to your photo library allows you to save photos.";

damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict

@@ -2,6 +2,24 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>collapsed_event_view_other_notes</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>··· %#@NOTES@ ···</string>
+		<key>NOTES</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>zero</key>
+			<string>0 other notes</string>
+			<key>one</key>
+			<string>1 other note</string>
+			<key>other</key>
+			<string>%d other notes</string>
+		</dict>
+	</dict>
 	<key>followers_count</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -12,12 +30,12 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Followers</string>
 			<key>one</key>
-			<string>Seguidor</string>
-			<key>many</key>
-			<string>Seguidores</string>
+			<string>Follower</string>
 			<key>other</key>
-			<string>Seguidores</string>
+			<string>Followers</string>
 		</dict>
 	</dict>
 	<key>reactions_count</key>
@@ -30,12 +48,12 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Reactions</string>
 			<key>one</key>
-			<string>Reação</string>
-			<key>many</key>
-			<string>Reações</string>
+			<string>Reaction</string>
 			<key>other</key>
-			<string>Reações</string>
+			<string>Reactions</string>
 		</dict>
 	</dict>
 	<key>relays_count</key>
@@ -48,10 +66,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Relays</string>
 			<key>one</key>
 			<string>Relay</string>
-			<key>many</key>
-			<string>Relays</string>
 			<key>other</key>
 			<string>Relays</string>
 		</dict>
@@ -59,37 +77,37 @@
 	<key>replying_to_one_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@OTHERS@</string>
+		<string>Replying to %@%#@OTHERS@</string>
 		<key>OTHERS</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string></string>
 			<key>one</key>
-			<string>Respondendo a %2$@ &amp; %1$d outros</string>
-			<key>many</key>
-			<string>Respondendo a %2$@ &amp; %1$d outros</string>
+			<string> &amp; 1 other</string>
 			<key>other</key>
-			<string>Respondendo a %2$@ &amp; %1$d outros</string>
+			<string> &amp; %d others</string>
 		</dict>
 	</dict>
 	<key>replying_to_two_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@OTHERS@</string>
+		<string>Replying to %@, %@%#@OTHERS@</string>
 		<key>OTHERS</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string></string>
 			<key>one</key>
-			<string>Respondendo a %2$@, %3$@ &amp; %1$d outros</string>
-			<key>many</key>
-			<string>Respondendo a %2$@, %3$@ &amp; %1$d outros</string>
+			<string> &amp; 1 other</string>
 			<key>other</key>
-			<string>Respondendo a %2$@, %3$@ &amp; %1$d outros</string>
+			<string> &amp; %d others</string>
 		</dict>
 	</dict>
 	<key>reposts_count</key>
@@ -102,48 +120,30 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Reposts</string>
 			<key>one</key>
 			<string>Repost</string>
-			<key>many</key>
-			<string>Reposts</string>
 			<key>other</key>
 			<string>Reposts</string>
 		</dict>
 	</dict>
-	<key>sats_count</key>
+	<key>tips_count</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%1$#@SATS@</string>
-		<key>SATS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>@</string>
-			<key>one</key>
-			<string>%2$@ sat</string>
-			<key>many</key>
-			<string>%2$@ sats</string>
-			<key>other</key>
-			<string>%2$@ sats</string>
-		</dict>
-	</dict>
-	<key>zaps_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@ZAPS@</string>
-		<key>ZAPS</key>
+		<string>%#@TIPS@</string>
+		<key>TIPS</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Tips</string>
 			<key>one</key>
-			<string>Zap</string>
-			<key>many</key>
-			<string>Zaps</string>
+			<string>Tip</string>
 			<key>other</key>
-			<string>Zaps</string>
+			<string>Tips</string>
 		</dict>
 	</dict>
 </dict>

damus Localizations/en-US.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "damus.xcodeproj",
   "targetLocale" : "en-US",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "14C18",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "14.2"
   },
   "version" : "1.0"
 }

damus Localizations/es-419.xcloc/Localized Contents/es-419.xliff

@@ -0,0 +1,868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
+  <file original="damus/en-US.lproj/InfoPlist.strings" datatype="plaintext" source-language="en-US" target-language="es-419">
+    <header>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
+    </header>
+    <body>
+      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
+        <source>Damus</source>
+        <note>Bundle display name</note>
+      </trans-unit>
+      <trans-unit id="CFBundleName" xml:space="preserve">
+        <source>damus</source>
+        <note>Bundle name</note>
+      </trans-unit>
+      <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
+        <source>"Granting Damus access to your photo library allows you to save photos.</source>
+        <note>Privacy - Photo Library Additions Usage Description</note>
+      </trans-unit>
+    </body>
+  </file>
+  <file original="damus/en-US.lproj/Localizable.strings" source-language="en-US" target-language="es-419" datatype="plaintext">
+    <header>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
+    </header>
+    <body>
+      <trans-unit id="   " xml:space="preserve">
+        <source>   </source>
+        <note>Blank space to separate profile picture from profile editor form.</note>
+      </trans-unit>
+      <trans-unit id="%@" xml:space="preserve">
+        <source>%@</source>
+        <note>Amount of time that has passed since reply quote event occurred.
+Abbreviated version of a nostr public key.</note>
+      </trans-unit>
+      <trans-unit id="%@ %@" xml:space="preserve">
+        <source>%@ %@</source>
+        <note>Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.</note>
+      </trans-unit>
+      <trans-unit id="%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." xml:space="preserve">
+        <source>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</source>
+        <note>Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.</note>
+      </trans-unit>
+      <trans-unit id="%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" xml:space="preserve">
+        <source>%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs</source>
+        <note>Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string.</note>
+      </trans-unit>
+      <trans-unit id="%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." xml:space="preserve">
+        <source>%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.</source>
+        <note>Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.</note>
+      </trans-unit>
+      <trans-unit id="%lld" xml:space="preserve">
+        <source>%lld</source>
+        <note>Number of reposts.
+Number of profiles a user is following.</note>
+      </trans-unit>
+      <trans-unit id="%lld/%lld" xml:space="preserve">
+        <source>%lld/%lld</source>
+        <note>Fraction of how many of the user's relay servers that are operational.</note>
+      </trans-unit>
+      <trans-unit id="'%@' at '%@' will be used for verification" xml:space="preserve">
+        <source>'%@' at '%@' will be used for verification</source>
+        <note>Description of how the nip05 identifier would be used for verification.</note>
+      </trans-unit>
+      <trans-unit id="'%@' is an invalid nip05 identifier. It should look like an email." xml:space="preserve">
+        <source>'%@' is an invalid nip05 identifier. It should look like an email.</source>
+        <note>Description of why the nip05 identifier is invalid.</note>
+      </trans-unit>
+      <trans-unit id="(Profile.displayName(profile: profile, pubkey: whos))'s Followers" xml:space="preserve">
+        <source>(Profile.displayName(profile: profile, pubkey: whos))'s Followers</source>
+        <note>Navigation bar title for view that shows who is following a user.</note>
+      </trans-unit>
+      <trans-unit id="(formattedSats) sat" xml:space="preserve">
+        <source>(formattedSats) sat</source>
+        <note>Amount of 1 sat.</note>
+      </trans-unit>
+      <trans-unit id="(formattedSats) sats" xml:space="preserve">
+        <source>(formattedSats) sats</source>
+        <note>Amount of sats.</note>
+      </trans-unit>
+      <trans-unit id="(who) following" xml:space="preserve">
+        <source>(who) following</source>
+        <note>Navigation bar title for view that shows who a user is following.</note>
+      </trans-unit>
+      <trans-unit id="&lt; e &gt;" xml:space="preserve">
+        <source>&lt; e &gt;</source>
+        <note>Placeholder for event mention.</note>
+      </trans-unit>
+      <trans-unit id="@" xml:space="preserve">
+        <source>@</source>
+        <note>Prefix character to username.</note>
+      </trans-unit>
+      <trans-unit id="About" xml:space="preserve">
+        <source>About</source>
+        <note>Label to prompt for about text entry for user to describe about themself.</note>
+      </trans-unit>
+      <trans-unit id="About Me" xml:space="preserve">
+        <source>About Me</source>
+        <note>Label for About Me section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Absolute Boss" xml:space="preserve">
+        <source>Absolute Boss</source>
+        <note>Placeholder text for About Me description.</note>
+      </trans-unit>
+      <trans-unit id="Account ID" xml:space="preserve">
+        <source>Account ID</source>
+        <note>Label to indicate the public ID of the account.</note>
+      </trans-unit>
+      <trans-unit id="Add" xml:space="preserve">
+        <source>Add</source>
+        <note>Button to add recommended relay server.
+   Button to confirm adding user inputted relay.</note>
+      </trans-unit>
+      <trans-unit id="Add Relay" xml:space="preserve">
+        <source>Add Relay</source>
+        <note>Label for section for adding a relay server.</note>
+      </trans-unit>
+      <trans-unit id="Any" xml:space="preserve">
+        <source>Any</source>
+        <note>Any amount of sats</note>
+      </trans-unit>
+      <trans-unit id="Are you sure you want to repost this?" xml:space="preserve">
+        <source>Are you sure you want to repost this?</source>
+        <note>Alert message to ask if user wants to repost a post.</note>
+      </trans-unit>
+      <trans-unit id="Banner Image" xml:space="preserve">
+        <source>Banner Image</source>
+        <note>Label for Banner Image section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." xml:space="preserve">
+        <source>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</source>
+        <note>Reminder to user that they should save their account information.</note>
+      </trans-unit>
+      <trans-unit id="Bitcoin Beach" xml:space="preserve">
+        <source>Bitcoin Beach</source>
+        <note>Dropdown option label for Lightning wallet, Bitcoin Beach.</note>
+      </trans-unit>
+      <trans-unit id="Bitcoin Lightning Tips" xml:space="preserve">
+        <source>Bitcoin Lightning Tips</source>
+        <note>Label for Bitcoin Lightning Tips section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Blixt Wallet" xml:space="preserve">
+        <source>Blixt Wallet</source>
+        <note>Dropdown option label for Lightning wallet, Blixt Wallet</note>
+      </trans-unit>
+      <trans-unit id="Blue Wallet" xml:space="preserve">
+        <source>Blue Wallet</source>
+        <note>Dropdown option label for Lightning wallet, Blue Wallet.</note>
+      </trans-unit>
+      <trans-unit id="Breez" xml:space="preserve">
+        <source>Breez</source>
+        <note>Dropdown option label for Lightning wallet, Breez.</note>
+      </trans-unit>
+      <trans-unit id="Broadcast" xml:space="preserve">
+        <source>Broadcast</source>
+        <note>Context menu option for broadcasting the user's note to all of the user's connected relay servers.</note>
+      </trans-unit>
+      <trans-unit id="Cancel" xml:space="preserve">
+        <source>Cancel</source>
+        <note>Button to cancel out of posting a note.
+   Button to cancel out of reposting a post.
+   Button to cancel out of view adding user inputted relay.
+   Cancel out of logging out the user.</note>
+      </trans-unit>
+      <trans-unit id="Cash App" xml:space="preserve">
+        <source>Cash App</source>
+        <note>Dropdown option label for Lightning wallet, Cash App.</note>
+      </trans-unit>
+      <trans-unit id="Chat" xml:space="preserve">
+        <source>Chat</source>
+        <note>Navigation bar title for Chatroom view.</note>
+      </trans-unit>
+      <trans-unit id="Clear" xml:space="preserve">
+        <source>Clear</source>
+        <note>Button for clearing cached data.</note>
+      </trans-unit>
+      <trans-unit id="Clear Cache" xml:space="preserve">
+        <source>Clear Cache</source>
+        <note>Section title for clearing cached data.</note>
+      </trans-unit>
+      <trans-unit id="Copied" xml:space="preserve">
+        <source>Copied</source>
+        <note>Label indicating that a user's key was copied.</note>
+      </trans-unit>
+      <trans-unit id="Copy" xml:space="preserve">
+        <source>Copy</source>
+        <note>Button to copy a relay server address.</note>
+      </trans-unit>
+      <trans-unit id="Copy Account ID" xml:space="preserve">
+        <source>Copy Account ID</source>
+        <note>Context menu option for copying the ID of the account that created the note.</note>
+      </trans-unit>
+      <trans-unit id="Copy Image" xml:space="preserve">
+        <source>Copy Image</source>
+        <note>Context menu option to copy an image into clipboard.
+   Context menu option to copy an image to clipboard.</note>
+      </trans-unit>
+      <trans-unit id="Copy Image URL" xml:space="preserve">
+        <source>Copy Image URL</source>
+        <note>Context menu option to copy the URL of an image into clipboard.</note>
+      </trans-unit>
+      <trans-unit id="Copy LNURL" xml:space="preserve">
+        <source>Copy LNURL</source>
+        <note>Context menu option for copying a user's Lightning URL.</note>
+      </trans-unit>
+      <trans-unit id="Copy Note ID" xml:space="preserve">
+        <source>Copy Note ID</source>
+        <note>Context menu option for copying the ID of the note.</note>
+      </trans-unit>
+      <trans-unit id="Copy Note JSON" xml:space="preserve">
+        <source>Copy Note JSON</source>
+        <note>Context menu option for copying the JSON text from the note.</note>
+      </trans-unit>
+      <trans-unit id="Copy Text" xml:space="preserve">
+        <source>Copy Text</source>
+        <note>Context menu option for copying the text from an note.</note>
+      </trans-unit>
+      <trans-unit id="Copy User ID" xml:space="preserve">
+        <source>Copy User ID</source>
+        <note>Context menu option for copying the ID of the user who created the note.</note>
+      </trans-unit>
+      <trans-unit id="Copy invoice" xml:space="preserve">
+        <source>Copy invoice</source>
+        <note>Title of section for copying a Lightning invoice identifier.</note>
+      </trans-unit>
+      <trans-unit id="Create" xml:space="preserve">
+        <source>Create</source>
+        <note>Button to create account.</note>
+      </trans-unit>
+      <trans-unit id="Create Account" xml:space="preserve">
+        <source>Create Account</source>
+        <note>Button to create an account.</note>
+      </trans-unit>
+      <trans-unit id="Creator(s) of Bitcoin. Absolute legend." xml:space="preserve">
+        <source>Creator(s) of Bitcoin. Absolute legend.</source>
+        <note>Example description about Bitcoin creator(s), Satoshi Nakamoto.</note>
+      </trans-unit>
+      <trans-unit id="DM" xml:space="preserve">
+        <source>DM</source>
+        <note>Navigation title for DM view, which is the English abbreviation for Direct Message.</note>
+      </trans-unit>
+      <trans-unit id="Damus" xml:space="preserve">
+        <source>Damus</source>
+        <note>Name of the app, shown on the first screen when user is not logged in.</note>
+      </trans-unit>
+      <trans-unit id="Default Wallet" xml:space="preserve">
+        <source>Default Wallet</source>
+        <note>Button to pay a Lightning invoice with the user's default Lightning wallet.</note>
+      </trans-unit>
+      <trans-unit id="Delete" xml:space="preserve">
+        <source>Delete</source>
+        <note>Button to delete a relay server that the user connects to.</note>
+      </trans-unit>
+      <trans-unit id="Dismiss" xml:space="preserve">
+        <source>Dismiss</source>
+        <note>Button to dismiss a text field alert.</note>
+      </trans-unit>
+      <trans-unit id="Display Name" xml:space="preserve">
+        <source>Display Name</source>
+        <note>Label to prompt display name entry.</note>
+      </trans-unit>
+      <trans-unit id="Done" xml:space="preserve">
+        <source>Done</source>
+        <note>Button to dismiss wallet selection view for paying Lightning invoice.</note>
+      </trans-unit>
+      <trans-unit id="Earn Money" xml:space="preserve">
+        <source>Earn Money</source>
+        <note>Heading indicating that this application allows users to earn money.</note>
+      </trans-unit>
+      <trans-unit id="Edit" xml:space="preserve">
+        <source>Edit</source>
+        <note>Button to edit user's profile.</note>
+      </trans-unit>
+      <trans-unit id="Encrypted" xml:space="preserve">
+        <source>Encrypted</source>
+        <note>Heading indicating that this application keeps private messaging end-to-end encrypted.</note>
+      </trans-unit>
+      <trans-unit id="Encrypted DMs" xml:space="preserve">
+        <source>Encrypted DMs</source>
+        <note>Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message.</note>
+      </trans-unit>
+      <trans-unit id="Enter your account key to login:" xml:space="preserve">
+        <source>Enter your account key to login:</source>
+        <note>Prompt for user to enter an account key to login.</note>
+      </trans-unit>
+      <trans-unit id="Error: %@" xml:space="preserve">
+        <source>Error: %@</source>
+        <note>Error message indicating why saving keys failed.</note>
+      </trans-unit>
+      <trans-unit id="Filter State" xml:space="preserve">
+        <source>Filter State</source>
+        <note>Filter state for seeing either only posts, or posts &amp; replies.</note>
+      </trans-unit>
+      <trans-unit id="Follow" xml:space="preserve">
+        <source>Follow</source>
+        <note>Button to follow a user.</note>
+      </trans-unit>
+      <trans-unit id="Followers" xml:space="preserve">
+        <source>Followers</source>
+        <note>Label describing followers of a user.</note>
+      </trans-unit>
+      <trans-unit id="Following" xml:space="preserve">
+        <source>Following</source>
+        <note>Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile.
+Part of a larger sentence to describe how many profiles a user is following.</note>
+      </trans-unit>
+      <trans-unit id="Following..." xml:space="preserve">
+        <source>Following...</source>
+        <note>Label to indicate that the user is in the process of following another user.</note>
+      </trans-unit>
+      <trans-unit id="Follows" xml:space="preserve">
+        <source>Follows</source>
+        <note>Text to indicate that button next to it is in a state that will follow a profile when tapped.</note>
+      </trans-unit>
+      <trans-unit id="Global" xml:space="preserve">
+        <source>Global</source>
+        <note>Navigation bar title for Global view where posts from all connected relay servers appear.</note>
+      </trans-unit>
+      <trans-unit id="Goto post %@" xml:space="preserve">
+        <source>Goto post %@</source>
+        <note>Navigation link to go to post referenced by hex code.</note>
+      </trans-unit>
+      <trans-unit id="Goto profile %@" xml:space="preserve">
+        <source>Goto profile %@</source>
+        <note>Navigation link to go to profile.</note>
+      </trans-unit>
+      <trans-unit id="Home" xml:space="preserve">
+        <source>Home</source>
+        <note>Navigation bar title for Home view where posts and replies appear from those who the user is following.</note>
+      </trans-unit>
+      <trans-unit id="Invalid key" xml:space="preserve">
+        <source>Invalid key</source>
+        <note>Error message indicating that an invalid account key was entered for login.</note>
+      </trans-unit>
+      <trans-unit id="LNLink" xml:space="preserve">
+        <source>LNLink</source>
+        <note>Dropdown option label for Lightning wallet, LNLink.</note>
+      </trans-unit>
+      <trans-unit id="Left Handed" xml:space="preserve">
+        <source>Left Handed</source>
+        <note>Moves the post button to the left side of the screen</note>
+      </trans-unit>
+      <trans-unit id="Let's go!" xml:space="preserve">
+        <source>Let's go!</source>
+        <note>Button to complete account creation and start using the app.</note>
+      </trans-unit>
+      <trans-unit id="Lightning Address or LNURL" xml:space="preserve">
+        <source>Lightning Address or LNURL</source>
+        <note>Placeholder text for entry of Lightning Address or LNURL.</note>
+      </trans-unit>
+      <trans-unit id="Lightning Invoice" xml:space="preserve">
+        <source>Lightning Invoice</source>
+        <note>Indicates that the view is for paying a Lightning invoice.</note>
+      </trans-unit>
+      <trans-unit id="Local default" xml:space="preserve">
+        <source>Local default</source>
+        <note>Dropdown option label for system default for Lightning wallet.</note>
+      </trans-unit>
+      <trans-unit id="Login" xml:space="preserve">
+        <source>Login</source>
+        <note>Button to log into account.
+   Button to log into an account.</note>
+      </trans-unit>
+      <trans-unit id="Logout" xml:space="preserve">
+        <source>Logout</source>
+        <note>Alert for logging out the user.
+   Button for logging out the user.
+   Button to logout the user.</note>
+      </trans-unit>
+      <trans-unit id="Make sure your nsec account key is saved before you logout or you will lose access to this account" xml:space="preserve">
+        <source>Make sure your nsec account key is saved before you logout or you will lose access to this account</source>
+        <note>Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out.</note>
+      </trans-unit>
+      <trans-unit id="Muun" xml:space="preserve">
+        <source>Muun</source>
+        <note>Dropdown option label for Lightning wallet, Muun.</note>
+      </trans-unit>
+      <trans-unit id="NIP-05 Verification" xml:space="preserve">
+        <source>NIP-05 Verification</source>
+        <note>Label for NIP-05 Verification section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Nothing to see here. Check back later!" xml:space="preserve">
+        <source>Nothing to see here. Check back later!</source>
+        <note>Indicates that there are no notes in the timeline to view.</note>
+      </trans-unit>
+      <trans-unit id="Notifications" xml:space="preserve">
+        <source>Notifications</source>
+        <note>Navigation title for notifications.</note>
+      </trans-unit>
+      <trans-unit id="Pay" xml:space="preserve">
+        <source>Pay</source>
+        <note>Button to pay a Lightning invoice.</note>
+      </trans-unit>
+      <trans-unit id="Pay the Lightning invoice" xml:space="preserve">
+        <source>Pay the Lightning invoice</source>
+        <note>Navigation bar title for view to pay Lightning invoice.</note>
+      </trans-unit>
+      <trans-unit id="Phoenix" xml:space="preserve">
+        <source>Phoenix</source>
+        <note>Dropdown option label for Lightning wallet, Phoenix.</note>
+      </trans-unit>
+      <trans-unit id="Post" xml:space="preserve">
+        <source>Post</source>
+        <note>Button to post a note.</note>
+      </trans-unit>
+      <trans-unit id="Posts" xml:space="preserve">
+        <source>Posts</source>
+        <note>Label for filter for seeing only posts (instead of posts and replies).</note>
+      </trans-unit>
+      <trans-unit id="Posts &amp; Replies" xml:space="preserve">
+        <source>Posts &amp; Replies</source>
+        <note>Label for filter for seeing posts and replies (instead of only posts).</note>
+      </trans-unit>
+      <trans-unit id="Private" xml:space="preserve">
+        <source>Private</source>
+        <note>Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.</note>
+      </trans-unit>
+      <trans-unit id="Private Key" xml:space="preserve">
+        <source>Private Key</source>
+        <note>Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account.</note>
+      </trans-unit>
+      <trans-unit id="PrivateKey" xml:space="preserve">
+        <source>PrivateKey</source>
+        <note>Title of the secure field that holds the user's private key.</note>
+      </trans-unit>
+      <trans-unit id="Profile" xml:space="preserve">
+        <source>Profile</source>
+        <note>Sidebar menu label for Profile view.</note>
+      </trans-unit>
+      <trans-unit id="Profile Picture" xml:space="preserve">
+        <source>Profile Picture</source>
+        <note>Label for Profile Picture section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Public Account ID" xml:space="preserve">
+        <source>Public Account ID</source>
+        <note>Section title for the user's public account ID.</note>
+      </trans-unit>
+      <trans-unit id="Public Key" xml:space="preserve">
+        <source>Public Key</source>
+        <note>Label indicating that the text is a user's public account key.</note>
+      </trans-unit>
+      <trans-unit id="Public Key?" xml:space="preserve">
+        <source>Public Key?</source>
+        <note>Prompt to ask user if the key they entered is a public key.</note>
+      </trans-unit>
+      <trans-unit id="Public key" xml:space="preserve">
+        <source>Public key</source>
+        <note>Label indicating that the text is a user's public account key.</note>
+      </trans-unit>
+      <trans-unit id="Reactions" xml:space="preserve">
+        <source>Reactions</source>
+        <note>Navigation bar title for Reactions view.</note>
+      </trans-unit>
+      <trans-unit id="Recommended Relays" xml:space="preserve">
+        <source>Recommended Relays</source>
+        <note>Section title for recommend relay servers that could be added as part of configuration</note>
+      </trans-unit>
+      <trans-unit id="Relay" xml:space="preserve">
+        <source>Relay</source>
+        <note>Text field for relay server. Used for testing purposes.</note>
+      </trans-unit>
+      <trans-unit id="Relays" xml:space="preserve">
+        <source>Relays</source>
+        <note>Sidebar menu label for Relay servers view</note>
+      </trans-unit>
+      <trans-unit id="Reply to self" xml:space="preserve">
+        <source>Reply to self</source>
+        <note>Label to indicate that the user is replying to themself.</note>
+      </trans-unit>
+      <trans-unit id="Replying to %@ &amp; %@" xml:space="preserve">
+        <source>Replying to %1$@ &amp; %2$@</source>
+        <note>Label to indicate that the user is replying to 2 users.</note>
+      </trans-unit>
+      <trans-unit id="Replying to:" xml:space="preserve">
+        <source>Replying to:</source>
+        <note>Indicating that the user is replying to the following listed people.</note>
+      </trans-unit>
+      <trans-unit id="Repost" xml:space="preserve">
+        <source>Repost</source>
+        <note>Button to confirm reposting a post.
+   Title of alert for confirming to repost a post.</note>
+      </trans-unit>
+      <trans-unit id="Reposted" xml:space="preserve">
+        <source>Reposted</source>
+        <note>Text indicating that the post was reposted (i.e. re-shared).</note>
+      </trans-unit>
+      <trans-unit id="Reset" xml:space="preserve">
+        <source>Reset</source>
+        <note>Section title for resetting the user</note>
+      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>Button to retry completing account creation after an error occurred.</note>
+      </trans-unit>
+      <trans-unit id="River" xml:space="preserve">
+        <source>River</source>
+        <note>Dropdown option label for Lightning wallet, River</note>
+      </trans-unit>
+      <trans-unit id="Satoshi Nakamoto" xml:space="preserve">
+        <source>Satoshi Nakamoto</source>
+        <note>Name of Bitcoin creator(s).</note>
+      </trans-unit>
+      <trans-unit id="Save" xml:space="preserve">
+        <source>Save</source>
+        <note>Button for saving profile.</note>
+      </trans-unit>
+      <trans-unit id="Save Image" xml:space="preserve">
+        <source>Save Image</source>
+        <note>Context menu option to save an image.</note>
+      </trans-unit>
+      <trans-unit id="Search hashtag: #%@" xml:space="preserve">
+        <source>Search hashtag: #%@</source>
+        <note>Navigation link to search hashtag.</note>
+      </trans-unit>
+      <trans-unit id="Search..." xml:space="preserve">
+        <source>Search...</source>
+        <note>Placeholder text to prompt entry of search query.</note>
+      </trans-unit>
+      <trans-unit id="Secret Account Login Key" xml:space="preserve">
+        <source>Secret Account Login Key</source>
+        <note>Section title for user's secret account login key.</note>
+      </trans-unit>
+      <trans-unit id="Select a Lightning wallet" xml:space="preserve">
+        <source>Select a Lightning wallet</source>
+        <note>Title of section for selecting a Lightning wallet to pay a Lightning invoice.</note>
+      </trans-unit>
+      <trans-unit id="Select default wallet" xml:space="preserve">
+        <source>Select default wallet</source>
+        <note>Prompt selection of user's default wallet</note>
+      </trans-unit>
+      <trans-unit id="Send a message to start the conversation..." xml:space="preserve">
+        <source>Send a message to start the conversation...</source>
+        <note>Text prompt for user to send a message to the other user.</note>
+      </trans-unit>
+      <trans-unit id="Settings" xml:space="preserve">
+        <source>Settings</source>
+        <note>Navigation title for Settings view.
+   Sidebar menu label for accessing the app settings</note>
+      </trans-unit>
+      <trans-unit id="Share" xml:space="preserve">
+        <source>Share</source>
+        <note>Button to share an image.</note>
+      </trans-unit>
+      <trans-unit id="Show" xml:space="preserve">
+        <source>Show</source>
+        <note>Toggle to show or hide user's secret account login key.</note>
+      </trans-unit>
+      <trans-unit id="Show wallet selector" xml:space="preserve">
+        <source>Show wallet selector</source>
+        <note>Toggle to show or hide selection of wallet.</note>
+      </trans-unit>
+      <trans-unit id="Sign out" xml:space="preserve">
+        <source>Sign out</source>
+        <note>Sidebar menu label to sign out of the account.</note>
+      </trans-unit>
+      <trans-unit id="Strike" xml:space="preserve">
+        <source>Strike</source>
+        <note>Dropdown option label for Lightning wallet, Strike.</note>
+      </trans-unit>
+      <trans-unit id="This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective." xml:space="preserve">
+        <source>This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective.</source>
+        <note>Warning that the inputted account key is a public key and the result of what happens because of it.</note>
+      </trans-unit>
+      <trans-unit id="This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." xml:space="preserve">
+        <source>This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key.</source>
+        <note>Warning that the inputted account key for login is an old-style and asking user to verify if it is a public key.</note>
+      </trans-unit>
+      <trans-unit id="This is your account ID, you can give this to your friends so that they can follow you. Click to copy." xml:space="preserve">
+        <source>This is your account ID, you can give this to your friends so that they can follow you. Click to copy.</source>
+        <note>Label to describe that a public key is the user's account ID and what they can do with it.</note>
+      </trans-unit>
+      <trans-unit id="This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" xml:space="preserve">
+        <source>This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!</source>
+        <note>Label to describe that a private key is the user's secret account key and what they should do with it.</note>
+      </trans-unit>
+      <trans-unit id="Thread" xml:space="preserve">
+        <source>Thread</source>
+        <note>Navigation bar title for note thread.
+   Navigation bar title for threaded event detail view.</note>
+      </trans-unit>
+      <trans-unit id="Type your post here..." xml:space="preserve">
+        <source>Type your post here...</source>
+        <note>Text box prompt to ask user to type their post.</note>
+      </trans-unit>
+      <trans-unit id="Unfollow" xml:space="preserve">
+        <source>Unfollow</source>
+        <note>Button to unfollow a user.</note>
+      </trans-unit>
+      <trans-unit id="Unfollowing" xml:space="preserve">
+        <source>Unfollowing</source>
+        <note>Text to indicate that the button next to it is in  a state that indicates that it is in the process of unfollowing a profile.</note>
+      </trans-unit>
+      <trans-unit id="Unfollowing..." xml:space="preserve">
+        <source>Unfollowing...</source>
+        <note>Label to indicate that the user is in the process of unfollowing another user.</note>
+      </trans-unit>
+      <trans-unit id="Unfollows" xml:space="preserve">
+        <source>Unfollows</source>
+        <note>Text to indicate that the button next to it is in a state that will unfollow a profile when tapped.</note>
+      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>Label for Username section of user profile form.
+   Label to prompt username entry.</note>
+      </trans-unit>
+      <trans-unit id="Wallet" xml:space="preserve">
+        <source>Wallet</source>
+        <note>Sidebar menu label for Wallet view.</note>
+      </trans-unit>
+      <trans-unit id="Wallet Of Satoshi" xml:space="preserve">
+        <source>Wallet Of Satoshi</source>
+        <note>Dropdown option label for Lightning wallet, Wallet Of Satoshi.</note>
+      </trans-unit>
+      <trans-unit id="Wallet Selector" xml:space="preserve">
+        <source>Wallet Selector</source>
+        <note>Section title for selection of wallet.</note>
+      </trans-unit>
+      <trans-unit id="Website" xml:space="preserve">
+        <source>Website</source>
+        <note>Label for Website section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Welcome to the social network %@ control." xml:space="preserve">
+        <source>Welcome to the social network %@ control.</source>
+        <note>Welcoming message to the reader. The variable is 'you', the reader.</note>
+      </trans-unit>
+      <trans-unit id="Welcome, %@!" xml:space="preserve">
+        <source>Welcome, %@!</source>
+        <note>Text to welcome user.</note>
+      </trans-unit>
+      <trans-unit id="Your Name" xml:space="preserve">
+        <source>Your Name</source>
+        <note>Label for Your Name section of user profile form.</note>
+      </trans-unit>
+      <trans-unit id="Zebedee" xml:space="preserve">
+        <source>Zebedee</source>
+        <note>Dropdown option label for Lightning wallet, Zebedee.</note>
+      </trans-unit>
+      <trans-unit id="Zeus LN" xml:space="preserve">
+        <source>Zeus LN</source>
+        <note>Dropdown option label for Lightning wallet, Zeus LN.</note>
+      </trans-unit>
+      <trans-unit id="collapsed_event_view_other_notes" translate="no" xml:space="preserve">
+        <source>collapsed_event_view_other_notes</source>
+        <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="followers_count" translate="no" xml:space="preserve">
+        <source>followers_count</source>
+        <note>Part of a larger sentence to describe how many people are following a user. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="https://example.com/pic.jpg" xml:space="preserve">
+        <source>https://example.com/pic.jpg</source>
+        <note>Placeholder example text for profile picture URL.</note>
+      </trans-unit>
+      <trans-unit id="https://jb55.com" xml:space="preserve">
+        <source>https://jb55.com</source>
+        <note>Placeholder example text for website URL for user profile.</note>
+      </trans-unit>
+      <trans-unit id="jb55@jb55.com" xml:space="preserve">
+        <source>jb55@jb55.com</source>
+        <note>Placeholder example text for identifier used for NIP-05 verification.</note>
+      </trans-unit>
+      <trans-unit id="none" xml:space="preserve">
+        <source>none</source>
+        <note>No search results.</note>
+      </trans-unit>
+      <trans-unit id="now" xml:space="preserve">
+        <source>now</source>
+        <note>String indicating that a given timestamp just occurred</note>
+      </trans-unit>
+      <trans-unit id="nsec1..." xml:space="preserve">
+        <source>nsec1...</source>
+        <note>Prompt for user to enter in an account key to login. This text shows the characters the key could start with if it was a private key.</note>
+      </trans-unit>
+      <trans-unit id="optional" xml:space="preserve">
+        <source>optional</source>
+        <note>Label indicating that a form input is optional.</note>
+      </trans-unit>
+      <trans-unit id="reactions_count" translate="no" xml:space="preserve">
+        <source>reactions_count</source>
+        <note>Part of a larger sentence to describe how many reactions there are on a post. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="relays_count" translate="no" xml:space="preserve">
+        <source>relays_count</source>
+        <note>Part of a larger sentence to describe how many relay servers a user is connected. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="replying_to_one_and_others" translate="no" xml:space="preserve">
+        <source>replying_to_one_and_others</source>
+        <note>Label to indicate that the user is replying to 1 user and others. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="replying_to_two_and_others" translate="no" xml:space="preserve">
+        <source>replying_to_two_and_others</source>
+        <note>Label to indicate that the user is replying to 2 users and others. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="reposts_count" translate="no" xml:space="preserve">
+        <source>reposts_count</source>
+        <note>Part of a larger sentence to describe how many reposts there are. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="satoshi" xml:space="preserve">
+        <source>satoshi</source>
+        <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note>
+      </trans-unit>
+      <trans-unit id="tips_count" translate="no" xml:space="preserve">
+        <source>tips_count</source>
+        <note>Part of a larger sentence to describe how many tip payments there are on a post. (Key in .stringsdict)</note>
+      </trans-unit>
+      <trans-unit id="u{00A0}" xml:space="preserve">
+        <source>u{00A0}</source>
+        <note>Non-breaking space character to fill in blank space next to event action button icons.</note>
+      </trans-unit>
+      <trans-unit id="wss://some.relay.com" xml:space="preserve">
+        <source>wss://some.relay.com</source>
+        <note>Placeholder example for relay server address.</note>
+      </trans-unit>
+      <trans-unit id="you" xml:space="preserve">
+        <source>you</source>
+        <note>You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself.</note>
+      </trans-unit>
+    </body>
+  </file>
+  <file original="damus/en-US.lproj/Localizable.stringsdict" source-language="en-US" target-language="es-419" datatype="plaintext">
+    <header>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
+    </header>
+    <body>
+      <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/one:dict/:string" xml:space="preserve">
+        <source>1 other note</source>
+        <target>1 other note</target>
+        <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note>
+      </trans-unit>
+      <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/other:dict/:string" xml:space="preserve">
+        <source>%d other notes</source>
+        <target>%d other notes</target>
+        <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note>
+      </trans-unit>
+      <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/zero:dict/:string" xml:space="preserve">
+        <source>0 other notes</source>
+        <target>0 other notes</target>
+        <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note>
+      </trans-unit>
+      <trans-unit id="/collapsed_event_view_other_notes:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>··· %#@NOTES@ ···</source>
+        <target>··· %#@NOTES@ ···</target>
+        <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note>
+      </trans-unit>
+      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/one:dict/:string" xml:space="preserve">
+        <source>Follower</source>
+        <note>Part of a larger sentence to describe how many people are following a user.</note>
+      </trans-unit>
+      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/other:dict/:string" xml:space="preserve">
+        <source>Followers</source>
+        <note>Part of a larger sentence to describe how many people are following a user.</note>
+      </trans-unit>
+      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/zero:dict/:string" xml:space="preserve">
+        <source>Followers</source>
+        <note>Part of a larger sentence to describe how many people are following a user.</note>
+      </trans-unit>
+      <trans-unit id="/followers_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>%#@FOLLOWERS@</source>
+        <note>Part of a larger sentence to describe how many people are following a user.</note>
+      </trans-unit>
+      <trans-unit id="/reactions_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>%#@REACTIONS@</source>
+        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/reactions_count:dict/REACTIONS:dict/one:dict/:string" xml:space="preserve">
+        <source>Reaction</source>
+        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/reactions_count:dict/REACTIONS:dict/other:dict/:string" xml:space="preserve">
+        <source>Reactions</source>
+        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/reactions_count:dict/REACTIONS:dict/zero:dict/:string" xml:space="preserve">
+        <source>Reactions</source>
+        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/relays_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>%#@RELAYS@</source>
+        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
+      </trans-unit>
+      <trans-unit id="/relays_count:dict/RELAYS:dict/one:dict/:string" xml:space="preserve">
+        <source>Relay</source>
+        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
+      </trans-unit>
+      <trans-unit id="/relays_count:dict/RELAYS:dict/other:dict/:string" xml:space="preserve">
+        <source>Relays</source>
+        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
+      </trans-unit>
+      <trans-unit id="/relays_count:dict/RELAYS:dict/zero:dict/:string" xml:space="preserve">
+        <source>Relays</source>
+        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>Replying to %@%#@OTHERS@</source>
+        <target>Replying to %@%#@OTHERS@</target>
+        <note>Label to indicate that the user is replying to 1 user and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/one:dict/:string" xml:space="preserve">
+        <source> &amp; 1 other</source>
+        <target> &amp; 1 other</target>
+        <note>Label to indicate that the user is replying to 1 user and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/other:dict/:string" xml:space="preserve">
+        <source> &amp; %d others</source>
+        <target> &amp; %d others</target>
+        <note>Label to indicate that the user is replying to 1 user and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/zero:dict/:string" xml:space="preserve">
+        <source/>
+        <target/>
+        <note>Label to indicate that the user is replying to 1 user and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_two_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>Replying to %@, %@%#@OTHERS@</source>
+        <target>Replying to %@, %@%#@OTHERS@</target>
+        <note>Label to indicate that the user is replying to 2 users and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/one:dict/:string" xml:space="preserve">
+        <source> &amp; 1 other</source>
+        <target> &amp; 1 other</target>
+        <note>Label to indicate that the user is replying to 2 users and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/other:dict/:string" xml:space="preserve">
+        <source> &amp; %d others</source>
+        <target> &amp; %d others</target>
+        <note>Label to indicate that the user is replying to 2 users and others.</note>
+      </trans-unit>
+      <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/zero:dict/:string" xml:space="preserve">
+        <source/>
+        <target/>
+        <note>Label to indicate that the user is replying to 2 users and others.</note>
+      </trans-unit>
+      <trans-unit id="/reposts_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>%#@REPOSTS@</source>
+        <note>Part of a larger sentence to describe how many reposts there are.</note>
+      </trans-unit>
+      <trans-unit id="/reposts_count:dict/REPOSTS:dict/one:dict/:string" xml:space="preserve">
+        <source>Repost</source>
+        <note>Part of a larger sentence to describe how many reposts there are.</note>
+      </trans-unit>
+      <trans-unit id="/reposts_count:dict/REPOSTS:dict/other:dict/:string" xml:space="preserve">
+        <source>Reposts</source>
+        <note>Part of a larger sentence to describe how many reposts there are.</note>
+      </trans-unit>
+      <trans-unit id="/reposts_count:dict/REPOSTS:dict/zero:dict/:string" xml:space="preserve">
+        <source>Reposts</source>
+        <note>Part of a larger sentence to describe how many reposts there are.</note>
+      </trans-unit>
+      <trans-unit id="/tips_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
+        <source>%#@TIPS@</source>
+        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/tips_count:dict/TIPS:dict/one:dict/:string" xml:space="preserve">
+        <source>Tip</source>
+        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/tips_count:dict/TIPS:dict/other:dict/:string" xml:space="preserve">
+        <source>Tips</source>
+        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
+      </trans-unit>
+      <trans-unit id="/tips_count:dict/TIPS:dict/zero:dict/:string" xml:space="preserve">
+        <source>Tips</source>
+        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/InfoPlist.strings

@@ -0,0 +1,6 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "Damus";
+/* Bundle name */
+"CFBundleName" = "damus";
+/* Privacy - Photo Library Additions Usage Description */
+"NSPhotoLibraryAddUsageDescription" = "\"Granting Damus access to your photo library allows you to save photos.";

damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict

@@ -2,6 +2,24 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>collapsed_event_view_other_notes</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>··· %#@NOTES@ ···</string>
+		<key>NOTES</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>zero</key>
+			<string>0 other notes</string>
+			<key>one</key>
+			<string>1 other note</string>
+			<key>other</key>
+			<string>%d other notes</string>
+		</dict>
+	</dict>
 	<key>followers_count</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -12,10 +30,12 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Followers</string>
 			<key>one</key>
-			<string>Takipçi</string>
+			<string>Follower</string>
 			<key>other</key>
-			<string>Takipçi</string>
+			<string>Followers</string>
 		</dict>
 	</dict>
 	<key>reactions_count</key>
@@ -28,10 +48,12 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Reactions</string>
 			<key>one</key>
-			<string>Tepki</string>
+			<string>Reaction</string>
 			<key>other</key>
-			<string>Tepki</string>
+			<string>Reactions</string>
 		</dict>
 	</dict>
 	<key>relays_count</key>
@@ -44,42 +66,48 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Relays</string>
 			<key>one</key>
-			<string>Röle</string>
+			<string>Relay</string>
 			<key>other</key>
-			<string>Röle</string>
+			<string>Relays</string>
 		</dict>
 	</dict>
 	<key>replying_to_one_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@OTHERS@</string>
+		<string>Replying to %@%#@OTHERS@</string>
 		<key>OTHERS</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string></string>
 			<key>one</key>
-			<string>%2$@ &amp; %1$d diğer'lara yanıt</string>
+			<string> &amp; 1 other</string>
 			<key>other</key>
-			<string>%2$@ &amp; %1$d ve diğerlerine yanıt</string>
+			<string> &amp; %d others</string>
 		</dict>
 	</dict>
 	<key>replying_to_two_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@OTHERS@</string>
+		<string>Replying to %@, %@%#@OTHERS@</string>
 		<key>OTHERS</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string></string>
 			<key>one</key>
-			<string>%2$@, %3$@ &amp; %1$d diğer'a yanıt</string>
+			<string> &amp; 1 other</string>
 			<key>other</key>
-			<string>%2$@, %3$@ &amp; %1$d ve diğerlerine yanıt</string>
+			<string> &amp; %d others</string>
 		</dict>
 	</dict>
 	<key>reposts_count</key>
@@ -92,42 +120,30 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Reposts</string>
 			<key>one</key>
-			<string>Yineleme</string>
+			<string>Repost</string>
 			<key>other</key>
-			<string>Yineleme</string>
+			<string>Reposts</string>
 		</dict>
 	</dict>
-	<key>sats_count</key>
+	<key>tips_count</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%1$#@SATS@</string>
-		<key>SATS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>@</string>
-			<key>one</key>
-			<string>%2$@ sat</string>
-			<key>other</key>
-			<string>%2$@ sats</string>
-		</dict>
-	</dict>
-	<key>zaps_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@ZAPS@</string>
-		<key>ZAPS</key>
+		<string>%#@TIPS@</string>
+		<key>TIPS</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Tips</string>
 			<key>one</key>
-			<string>Zap</string>
+			<string>Tip</string>
 			<key>other</key>
-			<string>Zaps</string>
+			<string>Tips</string>
 		</dict>
 	</dict>
 </dict>

damus Localizations/es-419.xcloc/contents.json

@@ -0,0 +1,12 @@
+{
+  "developmentRegion" : "en-US",
+  "project" : "damus.xcodeproj",
+  "targetLocale" : "es-419",
+  "toolInfo" : {
+    "toolBuildNumber" : "14C18",
+    "toolID" : "com.apple.dt.xcode",
+    "toolName" : "Xcode",
+    "toolVersion" : "14.2"
+  },
+  "version" : "1.0"
+}

damus-c/bech32.c

@@ -91,12 +91,13 @@ int bech32_encode(char *output, const char *hrp, const uint8_t *data, size_t dat
     return 1;
 }
 
-bech32_encoding bech32_decode_len(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t input_len) {
+bech32_encoding bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t max_input_len) {
     uint32_t chk = 1;
     size_t i;
+    size_t input_len = strlen(input);
     size_t hrp_len;
     int have_lower = 0, have_upper = 0;
-    if (input_len < 8) {
+    if (input_len < 8 || input_len > max_input_len) {
         return BECH32_ENCODING_NONE;
     }
     *data_len = 0;
@@ -153,14 +154,6 @@ bech32_encoding bech32_decode_len(char* hrp, uint8_t *data, size_t *data_len, co
     }
 }
 
-bech32_encoding bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t max_input_len) {
-    size_t len = strlen(input);
-    if (len > max_input_len) {
-        return BECH32_ENCODING_NONE;
-    }
-    return bech32_decode_len(hrp, data, data_len, input, len);
-}
-
 int bech32_convert_bits(uint8_t* out, size_t* outlen, int outbits, const uint8_t* in, size_t inlen, int inbits, int pad) {
     uint32_t val = 0;
     int bits = 0;

damus-c/bech32.h

@@ -118,14 +118,6 @@ bech32_encoding bech32_decode(
     size_t max_input_len
 );
 
-bech32_encoding bech32_decode_len(
-    char *hrp,
-    uint8_t *data,
-    size_t *data_len,
-    const char *input,
-    size_t input_len
-);
-
 /* Helper from bech32: translates inbits-bit bytes to outbits-bit bytes.
  * @outlen is incremented as bytes are added.
  * @pad is true if we're to pad, otherwise truncate last byte if necessary

damus-c/block.h

@@ -1,57 +0,0 @@
-//
-//  block.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef block_h
-#define block_h
-
-#include "nostr_bech32.h"
-#include "str_block.h"
-
-#define MAX_BLOCKS 1024
-
-enum block_type {
-    BLOCK_HASHTAG = 1,
-    BLOCK_TEXT = 2,
-    BLOCK_MENTION_INDEX = 3,
-    BLOCK_MENTION_BECH32 = 4,
-    BLOCK_URL = 5,
-    BLOCK_INVOICE = 6,
-};
-
-
-typedef struct invoice_block {
-    struct str_block invstr;
-    union {
-        struct bolt11 *bolt11;
-    };
-} invoice_block_t;
-
-typedef struct mention_bech32_block {
-    struct str_block str;
-    struct nostr_bech32 bech32;
-} mention_bech32_block_t;
-
-typedef struct note_block {
-    enum block_type type;
-    union {
-        struct str_block str;
-        struct invoice_block invoice;
-        struct mention_bech32_block mention_bech32;
-        int mention_index;
-    } block;
-} block_t;
-
-typedef struct note_blocks {
-    int words;
-    int num_blocks;
-    struct note_block *blocks;
-} blocks_t;
-
-void blocks_init(struct note_blocks *blocks);
-void blocks_free(struct note_blocks *blocks);
-
-#endif /* block_h */

damus-c/cursor.h

@@ -1,703 +0,0 @@
-
-#ifndef JB55_CURSOR_H
-#define JB55_CURSOR_H
-
-#include "typedefs.h"
-#include "varint.h"
-
-#include <stdio.h>
-#include <ctype.h>
-#include <assert.h>
-#include <string.h>
-
-#define unlikely(x) __builtin_expect((x),0)
-#define likely(x)   __builtin_expect((x),1)
-
-struct cursor {
-	unsigned char *start;
-	unsigned char *p;
-	unsigned char *end;
-};
-
-struct array {
-	struct cursor cur;
-	unsigned int elem_size;
-};
-
-static inline void reset_cursor(struct cursor *cursor)
-{
-	cursor->p = cursor->start;
-}
-
-static inline void wipe_cursor(struct cursor *cursor)
-{
-	reset_cursor(cursor);
-	memset(cursor->start, 0, cursor->end - cursor->start);
-}
-
-static inline void make_cursor(u8 *start, u8 *end, struct cursor *cursor)
-{
-	cursor->start = start;
-	cursor->p = start;
-	cursor->end = end;
-}
-
-static inline void make_array(struct array *a, u8* start, u8 *end, unsigned int elem_size)
-{
-	make_cursor(start, end, &a->cur);
-	a->elem_size = elem_size;
-}
-
-static inline int cursor_eof(struct cursor *c)
-{
-	return c->p == c->end;
-}
-
-static inline void *cursor_malloc(struct cursor *mem, unsigned long size)
-{
-	void *ret;
-
-	if (mem->p + size > mem->end) {
-		return NULL;
-	}
-
-	ret = mem->p;
-	mem->p += size;
-
-	return ret;
-}
-
-static inline void *cursor_alloc(struct cursor *mem, unsigned long size)
-{
-	void *ret;
-	if (!(ret = cursor_malloc(mem, size))) {
-		return 0;
-	}
-
-	memset(ret, 0, size);
-	return ret;
-}
-
-static inline int cursor_slice(struct cursor *mem, struct cursor *slice, size_t size)
-{
-	u8 *p;
-	if (!(p = cursor_alloc(mem, size))) {
-		return 0;
-	}
-	make_cursor(p, mem->p, slice);
-	return 1;
-}
-
-
-static inline void copy_cursor(struct cursor *src, struct cursor *dest)
-{
-	dest->start = src->start;
-	dest->p = src->p;
-	dest->end = src->end;
-}
-
-static inline int cursor_skip(struct cursor *cursor, int n)
-{
-    if (cursor->p + n >= cursor->end)
-        return 0;
-
-    cursor->p += n;
-
-    return 1;
-}
-
-static inline int pull_byte(struct cursor *cursor, u8 *c)
-{
-	if (unlikely(cursor->p >= cursor->end))
-		return 0;
-
-	*c = *cursor->p;
-	cursor->p++;
-
-	return 1;
-}
-
-static inline int parse_byte(struct cursor *cursor, u8 *c)
-{
-    if (unlikely(cursor->p >= cursor->end))
-        return 0;
-
-    *c = *cursor->p;
-    //cursor->p++;
-
-    return 1;
-}
-
-static inline int parse_char(struct cursor *cur, char c) {
-    if (cur->p >= cur->end)
-        return 0;
-        
-    if (*cur->p == c) {
-        cur->p++;
-        return 1;
-    }
-    
-    return 0;
-}
-
-static inline int peek_char(struct cursor *cur, int ind) {
-    if ((cur->p + ind < cur->start) || (cur->p + ind >= cur->end))
-        return -1;
-    
-    return *(cur->p + ind);
-}
-
-static inline int cursor_pull_c_str(struct cursor *cursor, const char **str)
-{
-	*str = (const char*)cursor->p;
-
-	for (; cursor->p < cursor->end; cursor->p++) {
-		if (*cursor->p == 0) {
-			cursor->p++;
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-
-static inline int cursor_push_byte(struct cursor *cursor, u8 c)
-{
-	if (unlikely(cursor->p + 1 > cursor->end)) {
-		return 0;
-	}
-
-	*cursor->p = c;
-	cursor->p++;
-
-	return 1;
-}
-
-static inline int cursor_pull(struct cursor *cursor, u8 *data, int len)
-{
-	if (unlikely(cursor->p + len > cursor->end)) {
-		return 0;
-	}
-
-	memcpy(data, cursor->p, len);
-	cursor->p += len;
-
-	return 1;
-}
-
-static inline int pull_data_into_cursor(struct cursor *cursor,
-			  struct cursor *dest,
-			  unsigned char **data,
-			  int len)
-{
-	int ok;
-
-	if (unlikely(dest->p + len > dest->end)) {
-		printf("not enough room in dest buffer\n");
-		return 0;
-	}
-
-	ok = cursor_pull(cursor, dest->p, len);
-	if (!ok) return 0;
-
-	*data = dest->p;
-	dest->p += len;
-
-	return 1;
-}
-
-static inline int cursor_dropn(struct cursor *cur, int size, int n)
-{
-	if (n == 0)
-		return 1;
-
-	if (unlikely(cur->p - size*n < cur->start)) {
-		return 0;
-	}
-
-	cur->p -= size*n;
-	return 1;
-}
-
-static inline int cursor_drop(struct cursor *cur, int size)
-{
-	return cursor_dropn(cur, size, 1);
-}
-
-static inline unsigned char *cursor_topn(struct cursor *cur, int len, int n)
-{
-	n += 1;
-	if (unlikely(cur->p - len*n < cur->start)) {
-		return NULL;
-	}
-	return cur->p - len*n;
-}
-
-static inline unsigned char *cursor_top(struct cursor *cur, int len)
-{
-	if (unlikely(cur->p - len < cur->start)) {
-		return NULL;
-	}
-	return cur->p - len;
-}
-
-static inline int cursor_top_int(struct cursor *cur, int *i)
-{
-	u8 *p;
-	if (unlikely(!(p = cursor_top(cur, sizeof(*i))))) {
-		return 0;
-	}
-	*i = *((int*)p);
-	return 1;
-}
-
-static inline int cursor_pop(struct cursor *cur, u8 *data, int len)
-{
-	if (unlikely(cur->p - len < cur->start)) {
-		return 0;
-	}
-
-	cur->p -= len;
-	memcpy(data, cur->p, len);
-
-	return 1;
-}
-
-static inline int cursor_push(struct cursor *cursor, u8 *data, int len)
-{
-	if (unlikely(cursor->p + len >= cursor->end)) {
-		return 0;
-	}
-
-	if (cursor->p != data)
-		memcpy(cursor->p, data, len);
-
-	cursor->p += len;
-
-	return 1;
-}
-
-static inline int cursor_push_int(struct cursor *cursor, int i)
-{
-	return cursor_push(cursor, (u8*)&i, sizeof(i));
-}
-
-static inline size_t cursor_count(struct cursor *cursor, size_t elem_size)
-{
-	return (cursor->p - cursor->start)/elem_size;
-}
-
-/* TODO: push_varint */
-static inline int push_varint(struct cursor *cursor, int n)
-{
-	int ok, len;
-	unsigned char b;
-	len = 0;
-
-	while (1) {
-		b = (n & 0xFF) | 0x80;
-		n >>= 7;
-		if (n == 0) {
-			b &= 0x7F;
-			ok = cursor_push_byte(cursor, b);
-			len++;
-			if (!ok) return 0;
-			break;
-		}
-
-		ok = cursor_push_byte(cursor, b);
-		len++;
-		if (!ok) return 0;
-	}
-
-	return len;
-}
-
-/* TODO: pull_varint */
-static inline int pull_varint(struct cursor *cursor, int *n)
-{
-	int ok, i;
-	unsigned char b;
-	*n = 0;
-
-	for (i = 0;; i++) {
-		ok = pull_byte(cursor, &b);
-		if (!ok) return 0;
-
-		*n |= ((int)b & 0x7F) << (i * 7);
-
-		/* is_last */
-		if ((b & 0x80) == 0) {
-			return i+1;
-		}
-
-		if (i == 4) return 0;
-	}
-
-	return 0;
-}
-
-static inline int cursor_pull_int(struct cursor *cursor, int *i)
-{
-	return cursor_pull(cursor, (u8*)i, sizeof(*i));
-}
-
-static inline int cursor_push_u32(struct cursor *cursor, uint32_t i) {
-    return cursor_push(cursor, (unsigned char*)&i, sizeof(i));
-}
-
-static inline int cursor_push_u16(struct cursor *cursor, u16 i)
-{
-	return cursor_push(cursor, (u8*)&i, sizeof(i));
-}
-
-static inline void *index_cursor(struct cursor *cursor, unsigned int index, int elem_size)
-{
-	u8 *p;
-	p = &cursor->start[elem_size * index];
-
-	if (unlikely(p >= cursor->end))
-		return NULL;
-
-	return (void*)p;
-}
-
-
-static inline int push_sized_str(struct cursor *cursor, const char *str, int len)
-{
-	return cursor_push(cursor, (u8*)str, len);
-}
-
-static inline int cursor_push_lowercase(struct cursor *cur, const char *str, int len)
-{
-	int i;
-
-	if (unlikely(cur->p + len >= cur->end))
-		return 0;
-
-	for (i = 0; i < len; i++)
-		cur->p[i] = tolower(str[i]);
-
-	cur->p += len;
-	return 1;
-}
-
-static inline int cursor_push_str(struct cursor *cursor, const char *str)
-{
-	return cursor_push(cursor, (u8*)str, (int)strlen(str));
-}
-
-static inline int cursor_push_c_str(struct cursor *cursor, const char *str)
-{
-	return cursor_push_str(cursor, str) && cursor_push_byte(cursor, 0);
-}
-
-/* TODO: push varint size */
-static inline int push_prefixed_str(struct cursor *cursor, const char *str)
-{
-	int ok, len;
-	len = (int)strlen(str);
-	ok = push_varint(cursor, len);
-	if (!ok) return 0;
-	return push_sized_str(cursor, str, len);
-}
-
-static inline int pull_prefixed_str(struct cursor *cursor, struct cursor *dest_buf, const char **str)
-{
-	int len, ok;
-
-	ok = pull_varint(cursor, &len);
-	if (!ok) return 0;
-
-	if (unlikely(dest_buf->p + len > dest_buf->end)) {
-		return 0;
-	}
-
-	ok = pull_data_into_cursor(cursor, dest_buf, (unsigned char**)str, len);
-	if (!ok) return 0;
-
-	ok = cursor_push_byte(dest_buf, 0);
-
-	return 1;
-}
-
-static inline int cursor_remaining_capacity(struct cursor *cursor)
-{
-	return (int)(cursor->end - cursor->p);
-}
-
-
-#define max(a,b) ((a) > (b) ? (a) : (b))
-static inline void cursor_print_around(struct cursor *cur, int range)
-{
-	unsigned char *c;
-
-	printf("[%ld/%ld]\n", cur->p - cur->start, cur->end - cur->start);
-
-	c = max(cur->p - range, cur->start);
-	for (; c < cur->end && c < (cur->p + range); c++) {
-		printf("%02x", *c);
-	}
-	printf("\n");
-
-	c = max(cur->p - range, cur->start);
-	for (; c < cur->end && c < (cur->p + range); c++) {
-		if (c == cur->p) {
-			printf("^");
-			continue;
-		}
-		printf("  ");
-	}
-	printf("\n");
-}
-#undef max
-
-static inline int pull_bytes(struct cursor *cur, int count, const u8 **bytes) {
-    if (cur->p + count > cur->end)
-        return 0;
-    
-    *bytes = cur->p;
-    cur->p += count;
-    return 1;
-}
-
-static inline int parse_str(struct cursor *cur, const char *str) {
-    int i;
-    char c, cs;
-    unsigned long len;
-    
-    len = strlen(str);
-    
-    if (cur->p + len >= cur->end)
-        return 0;
-    
-    for (i = 0; i < len; i++) {
-        c = tolower(cur->p[i]);
-        cs = tolower(str[i]);
-        
-        if (c != cs)
-            return 0;
-    }
-    
-    cur->p += len;
-    
-    return 1;
-}
-
-static inline int is_whitespace(char c) {
-    return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
-}
-
-static inline int is_underscore(char c) {
-    return c == '_';
-}
-
-static inline int is_utf8_byte(u8 c) {
-    return c & 0x80;
-}
-
-static inline int parse_utf8_char(struct cursor *cursor, unsigned int *code_point, unsigned int *utf8_length)
-{
-    u8 first_byte;
-    if (!parse_byte(cursor, &first_byte))
-        return 0; // Not enough data
-
-    // Determine the number of bytes in this UTF-8 character
-    int remaining_bytes = 0;
-    if (first_byte < 0x80) {
-        *code_point = first_byte;
-        return 1;
-    } else if ((first_byte & 0xE0) == 0xC0) {
-        remaining_bytes = 1;
-        *utf8_length = remaining_bytes + 1;
-        *code_point = first_byte & 0x1F;
-    } else if ((first_byte & 0xF0) == 0xE0) {
-        remaining_bytes = 2;
-        *utf8_length = remaining_bytes + 1;
-        *code_point = first_byte & 0x0F;
-    } else if ((first_byte & 0xF8) == 0xF0) {
-        remaining_bytes = 3;
-        *utf8_length = remaining_bytes + 1;
-        *code_point = first_byte & 0x07;
-    } else {
-        remaining_bytes = 0;
-        *utf8_length = 1; // Assume 1 byte length for unrecognized UTF-8 characters
-        // TODO: We need to gracefully handle unrecognized UTF-8 characters
-        printf("Invalid UTF-8 byte: %x\n", *code_point);
-        *code_point = ((first_byte & 0xF0) << 6); // Prevent testing as punctuation
-        return 0; // Invalid first byte
-    }
-
-    // Peek at remaining bytes
-    for (int i = 0; i < remaining_bytes; ++i) {
-        signed char next_byte;
-        if ((next_byte = peek_char(cursor, i+1)) == -1) {
-            *utf8_length = 1;
-            return 0; // Not enough data
-        }
-        
-        // Debugging lines
-        //printf("Cursor: %s\n", cursor->p);
-        //printf("Codepoint: %x\n", *code_point);
-        //printf("Codepoint <<6: %x\n", ((*code_point << 6) | (next_byte & 0x3F)));
-        //printf("Remaining bytes: %x\n", remaining_bytes);
-        //printf("First byte: %x\n", first_byte);
-        //printf("Next byte: %x\n", next_byte);
-        //printf("Bitwise AND result: %x\n", (next_byte & 0xC0));
-        
-        if ((next_byte & 0xC0) != 0x80) {
-            *utf8_length = 1;
-            return 0; // Invalid byte in sequence
-        }
-
-        *code_point = (*code_point << 6) | (next_byte & 0x3F);
-    }
-
-    return 1;
-}
-
-/**
-  * Checks if a given Unicode code point is a punctuation character
-  *
-  * @param codepoint The Unicode code point to check. @return true if the
-  * code point is a punctuation character, false otherwise.
-  */
-static inline int is_punctuation(unsigned int codepoint) {
-
-    // Check for underscore (underscore is not treated as punctuation)
-    if (is_underscore(codepoint))
-        return 0;
-    
-    // Check for ASCII punctuation
-    if (ispunct(codepoint))
-        return 1;
-
-    // Check for Unicode punctuation exceptions (punctuation allowed in hashtags)
-    if (codepoint == 0x301C || codepoint == 0xFF5E) // Japanese Wave Dash / Tilde
-        return 0;
-    
-    // Check for Unicode punctuation
-    // NOTE: We may need to adjust the codepoint ranges in the future,
-    // to include/exclude certain types of Unicode characters in hashtags.
-    // Unicode Blocks Reference: https://www.compart.com/en/unicode/block
-    return (
-        // Latin-1 Supplement No-Break Space (NBSP): U+00A0
-        (codepoint == 0x00A0) ||
-        
-        // Latin-1 Supplement Punctuation: U+00A1 to U+00BF
-        (codepoint >= 0x00A1 && codepoint <= 0x00BF) ||
-
-        // General Punctuation: U+2000 to U+206F
-        (codepoint >= 0x2000 && codepoint <= 0x206F) ||
-
-        // Currency Symbols: U+20A0 to U+20CF
-        (codepoint >= 0x20A0 && codepoint <= 0x20CF) ||
-
-        // Supplemental Punctuation: U+2E00 to U+2E7F
-        (codepoint >= 0x2E00 && codepoint <= 0x2E7F) ||
-
-        // CJK Symbols and Punctuation: U+3000 to U+303F
-        (codepoint >= 0x3000 && codepoint <= 0x303F) ||
-
-        // Ideographic Description Characters: U+2FF0 to U+2FFF
-        (codepoint >= 0x2FF0 && codepoint <= 0x2FFF)
-    );
-}
-
-static inline int is_right_boundary(int c) {
-    return is_whitespace(c) || is_punctuation(c);
-}
-
-static inline int is_left_boundary(char c) {
-    return is_right_boundary(c) || is_utf8_byte(c);
-}
-
-static inline int is_alphanumeric(char c) {
-    return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9');
-}
-
-static inline int consume_until_boundary(struct cursor *cur) {
-    unsigned int c;
-    unsigned int char_length = 1;
-    unsigned int *utf8_char_length = &char_length;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        *utf8_char_length = 1;
-        
-        if (is_whitespace(c))
-            return 1;
-        
-        // Need to check for UTF-8 characters, which can be multiple bytes long
-        if (is_utf8_byte(c)) {
-            if (!parse_utf8_char(cur, &c, utf8_char_length)) {
-                if (!is_right_boundary(c)){
-                    // TODO: We should work towards handling all UTF-8 characters.
-                    printf("Invalid UTF-8 code point: %x\n", c);
-                }
-            }
-        }
-        
-        if (is_right_boundary(c))
-            return 1;
-        
-        // Need to use a variable character byte length for UTF-8 (2-4 bytes)
-        if (cur->p + *utf8_char_length <= cur->end)
-            cur->p += *utf8_char_length;
-        else
-            cur->p++;
-    }
-    
-    return 1;
-}
-
-static inline int consume_until_whitespace(struct cursor *cur, int or_end) {
-    char c;
-    int consumedAtLeastOne = 0;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        if (is_whitespace(c))
-            return consumedAtLeastOne;
-        
-        cur->p++;
-        consumedAtLeastOne = 1;
-    }
-    
-    return or_end;
-}
-
-static inline int consume_until_non_alphanumeric(struct cursor *cur, int or_end) {
-    char c;
-    int consumedAtLeastOne = 0;
-
-    while (cur->p < cur->end) {
-        c = *cur->p;
-
-        if (!is_alphanumeric(c))
-            return consumedAtLeastOne;
-
-        cur->p++;
-        consumedAtLeastOne = 1;
-    }
-
-    return or_end;
-}
-
-
-static inline int cursor_memset(struct cursor *cursor, unsigned char c, int n)
-{
-    if (cursor->p + n >= cursor->end)
-        return 0;
-
-    memset(cursor->p, c, n);
-    cursor->p += n;
-
-    return 1;
-}
-
-
-#endif

damus-c/damus-Bridging-Header.h

@@ -5,9 +5,3 @@
 #include "damus.h"
 #include "bolt11.h"
 #include "amount.h"
-#include "nostr_bech32.h"
-#include "wasm.h"
-#include "nostrscript.h"
-#include "nostrdb.h"
-#include "lmdb.h"
-

damus-c/damus.c

@@ -6,12 +6,63 @@
 //
 
 #include "damus.h"
-#include "cursor.h"
 #include "bolt11.h"
-#include "bech32.h"
 #include <stdlib.h>
 #include <string.h>
 
+typedef unsigned char u8;
+
+struct cursor {
+    const u8 *p;
+    const u8 *start;
+    const u8 *end;
+};
+
+static inline int is_whitespace(char c) {
+    return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
+}
+
+static void make_cursor(struct cursor *c, const u8 *content, size_t len)
+{
+    c->start = content;
+    c->end = content + len;
+    c->p = content;
+}
+
+static int consume_until_whitespace(struct cursor *cur, int or_end) {
+    char c;
+    
+    while (cur->p < cur->end) {
+        c = *cur->p;
+        
+        if (is_whitespace(c))
+            return 1;
+        
+        cur->p++;
+    }
+    
+    return or_end;
+}
+
+static int parse_char(struct cursor *cur, char c) {
+    if (cur->p >= cur->end)
+        return 0;
+        
+    if (*cur->p == c) {
+        cur->p++;
+        return 1;
+    }
+    
+    return 0;
+}
+
+static inline int peek_char(struct cursor *cur, int ind) {
+    if ((cur->p + ind < cur->start) || (cur->p + ind >= cur->end))
+        return -1;
+    
+    return *(cur->p + ind);
+}
+
 static int parse_digit(struct cursor *cur, int *digit) {
     int c;
     if ((c = peek_char(cur, 0)) == -1)
@@ -27,10 +78,32 @@ static int parse_digit(struct cursor *cur, int *digit) {
     return 0;
 }
 
+static int parse_str(struct cursor *cur, const char *str) {
+    int i;
+    char c, cs;
+    unsigned long len;
+    
+    len = strlen(str);
+    
+    if (cur->p + len >= cur->end)
+        return 0;
+    
+    for (i = 0; i < len; i++) {
+        c = tolower(cur->p[i]);
+        cs = tolower(str[i]);
+        
+        if (c != cs)
+            return 0;
+    }
+    
+    cur->p += len;
+    
+    return 1;
+}
 
-static int parse_mention_index(struct cursor *cur, struct note_block *block) {
+static int parse_mention(struct cursor *cur, struct block *block) {
     int d1, d2, d3, ind;
-    u8 *start = cur->p;
+    const u8 *start = cur->p;
     
     if (!parse_str(cur, "#["))
         return 0;
@@ -53,15 +126,15 @@ static int parse_mention_index(struct cursor *cur, struct note_block *block) {
         return 0;
     }
     
-    block->type = BLOCK_MENTION_INDEX;
-    block->block.mention_index = ind;
+    block->type = BLOCK_MENTION;
+    block->block.mention = ind;
     
     return 1;
 }
 
-static int parse_hashtag(struct cursor *cur, struct note_block *block) {
+static int parse_hashtag(struct cursor *cur, struct block *block) {
     int c;
-    u8 *start = cur->p;
+    const u8 *start = cur->p;
     
     if (!parse_char(cur, '#'))
         return 0;
@@ -72,7 +145,7 @@ static int parse_hashtag(struct cursor *cur, struct note_block *block) {
         return 0;
     }
     
-    consume_until_boundary(cur);
+    consume_until_whitespace(cur, 1);
     
     block->type = BLOCK_HASHTAG;
     block->block.str.start = (const char*)(start + 1);
@@ -81,7 +154,7 @@ static int parse_hashtag(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-static int add_block(struct note_blocks *blocks, struct note_block block)
+static int add_block(struct blocks *blocks, struct block block)
 {
     if (blocks->num_blocks + 1 >= MAX_BLOCKS)
         return 0;
@@ -90,9 +163,9 @@ static int add_block(struct note_blocks *blocks, struct note_block block)
     return 1;
 }
 
-static int add_text_block(struct note_blocks *blocks, const u8 *start, const u8 *end)
+static int add_text_block(struct blocks *blocks, const u8 *start, const u8 *end)
 {
-    struct note_block b;
+    struct block b;
     
     if (start == end)
         return 1;
@@ -104,74 +177,8 @@ static int add_text_block(struct note_blocks *blocks, const u8 *start, const u8
     return add_block(blocks, b);
 }
 
-static int consume_url_fragment(struct cursor *cur)
-{
-    int c;
-
-    if ((c = peek_char(cur, 0)) < 0)
-        return 1;
-
-    if (c != '#' && c != '?') {
-        return 1;
-    }
-
-    cur->p++;
-
-    return consume_until_whitespace(cur, 1);
-}
-
-static int consume_url_path(struct cursor *cur)
-{
-    int c;
-
-    if ((c = peek_char(cur, 0)) < 0)
-        return 1;
-
-    if (c != '/') {
-        return 1;
-    }
-
-    while (cur->p < cur->end) {
-        c = *cur->p;
-
-        if (c == '?' || c == '#' || is_whitespace(c)) {
-            return 1;
-        }
-
-        cur->p++;
-    }
-
-    return 1;
-}
-
-static int consume_url_host(struct cursor *cur)
-{
-	char c;
-	int count = 0;
-
-	while (cur->p < cur->end) {
-		c = *cur->p;
-		// TODO: handle IDNs
-        if (is_alphanumeric(c) || c == '.' || c == '-')
-		{
-			count++;
-			cur->p++;
-			continue;
-		}
-
-		return count != 0;
-	}
-
-
-	// this means the end of the URL hostname is the end of the buffer and we finished
-	return count != 0;
-}
-
-static int parse_url(struct cursor *cur, struct note_block *block) {
-    u8 *start = cur->p;
-    u8 *host;
-    int host_len;
-    struct cursor path_cur;
+static int parse_url(struct cursor *cur, struct block *block) {
+    const u8 *start = cur->p;
     
     if (!parse_str(cur, "http"))
         return 0;
@@ -187,58 +194,12 @@ static int parse_url(struct cursor *cur, struct note_block *block) {
             return 0;
         }
     }
-
-    // make sure to save the hostname. We will use this to detect damus.io links
-    host = cur->p;
-
-    if (!consume_url_host(cur)) {
-	    cur->p = start;
-	    return 0;
+    
+    if (!consume_until_whitespace(cur, 1)) {
+        cur->p = start;
+        return 0;
     }
-
-    // get the length of the host string
-    host_len = (int)(cur->p - host);
-
-    // save the current parse state so that we can continue from here when
-    // parsing the bech32 in the damus.io link if we have it
-    copy_cursor(cur, &path_cur);
-
-    // skip leading /
-    cursor_skip(&path_cur, 1);
-
-    if (!consume_url_path(cur)) {
-	    cur->p = start;
-	    return 0;
-    }
-
-    if (!consume_url_fragment(cur)) {
-	    cur->p = start;
-	    return 0;
-    }
-
-    // smart parens
-    if (start - 1 >= 0 &&
-        start < cur->end &&
-        *(start - 1) == '(' &&
-        (cur->p - 1) < cur->end &&
-        *(cur->p - 1) == ')')
-    {
-        cur->p--;
-    }
-
-    // save the bech32 string pos in case we hit a damus.io link
-    block->block.str.start = (const char *)path_cur.p;
-
-    // if we have a damus link, make it a mention
-    if (host_len == 8
-	&& !strncmp((const char *)host, "damus.io", 8)
-	&& parse_nostr_bech32(&path_cur, &block->block.mention_bech32.bech32))
-    {
-	    block->block.str.end = (const char *)path_cur.p;
-	    block->type = BLOCK_MENTION_BECH32;
-	    return 1;
-    }
-
+    
     block->type = BLOCK_URL;
     block->block.str.start = (const char *)start;
     block->block.str.end = (const char *)cur->p;
@@ -246,8 +207,8 @@ static int parse_url(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-static int parse_invoice(struct cursor *cur, struct note_block *block) {
-    u8 *start, *end;
+static int parse_invoice(struct cursor *cur, struct block *block) {
+    const u8 *start, *end;
     char *fail;
     struct bolt11 *bolt11;
     // optional
@@ -285,28 +246,7 @@ static int parse_invoice(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-
-static int parse_mention_bech32(struct cursor *cur, struct note_block *block) {
-    u8 *start = cur->p;
-    
-    parse_char(cur, '@');
-    parse_str(cur, "nostr:");
-
-    block->block.str.start = (const char *)cur->p;
-    
-    if (!parse_nostr_bech32(cur, &block->block.mention_bech32.bech32)) {
-        cur->p = start;
-        return 0;
-    }
-    
-    block->block.str.end = (const char *)cur->p;
-    
-    block->type = BLOCK_MENTION_BECH32;
-
-    return 1;
-}
-
-static int add_text_then_block(struct cursor *cur, struct note_blocks *blocks, struct note_block block, u8 **start, const u8 *pre_mention)
+static int add_text_then_block(struct cursor *cur, struct blocks *blocks, struct block block, const u8 **start, const u8 *pre_mention)
 {
     if (!add_text_block(blocks, *start, pre_mention))
         return 0;
@@ -319,29 +259,23 @@ static int add_text_then_block(struct cursor *cur, struct note_blocks *blocks, s
     return 1;
 }
 
-int damus_parse_content(struct note_blocks *blocks, const char *content) {
+int damus_parse_content(struct blocks *blocks, const char *content) {
     int cp, c;
     struct cursor cur;
-    struct note_block block;
-    u8 *start, *pre_mention;
+    struct block block;
+    const u8 *start, *pre_mention;
     
-    blocks->words = 0;
     blocks->num_blocks = 0;
-    make_cursor((u8*)content, (u8*)content + strlen(content), &cur);
+    make_cursor(&cur, (const u8*)content, strlen(content));
     
     start = cur.p;
     while (cur.p < cur.end && blocks->num_blocks < MAX_BLOCKS) {
         cp = peek_char(&cur, -1);
         c  = peek_char(&cur, 0);
         
-        // new word
-        if (is_whitespace(cp) && !is_whitespace(c)) {
-            blocks->words++;
-        }
-        
         pre_mention = cur.p;
-        if (cp == -1 || is_left_boundary(cp) || c == '#') {
-            if (c == '#' && (parse_mention_index(&cur, &block) || parse_hashtag(&cur, &block))) {
+        if (cp == -1 || is_whitespace(cp)) {
+            if (c == '#' && (parse_mention(&cur, &block) || parse_hashtag(&cur, &block))) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
                 continue;
@@ -353,10 +287,6 @@ int damus_parse_content(struct note_blocks *blocks, const char *content) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
                 continue;
-            } else if ((c == 'n' || c == '@') && parse_mention_bech32(&cur, &block)) {
-                if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
-                    return 0;
-                continue;
             }
         }
         
@@ -371,23 +301,14 @@ int damus_parse_content(struct note_blocks *blocks, const char *content) {
     return 1;
 }
 
-void blocks_init(struct note_blocks *blocks) {
-    blocks->blocks = malloc(sizeof(struct note_block) * MAX_BLOCKS);
+void blocks_init(struct blocks *blocks) {
+    blocks->blocks = malloc(sizeof(struct block) * MAX_BLOCKS);
     blocks->num_blocks = 0;
 }
 
-void blocks_free(struct note_blocks *blocks) {
-    if (!blocks->blocks) {
-        return;
+void blocks_free(struct blocks *blocks) {
+    if (blocks->blocks) {
+        free(blocks->blocks);
+        blocks->num_blocks = 0;
     }
-    
-    for (int i = 0; i < blocks->num_blocks; ++i) {
-        if (blocks->blocks[i].type == BLOCK_MENTION_BECH32) {
-            free(blocks->blocks[i].block.mention_bech32.bech32.buffer);
-            blocks->blocks[i].block.mention_bech32.bech32.buffer = NULL;
-        }
-    }
-
-    free(blocks->blocks);
-    blocks->num_blocks = 0;
 }

damus-c/damus.h

@@ -9,10 +9,45 @@
 #define damus_h
 
 #include <stdio.h>
-#include "block.h"
 
-typedef unsigned char u8;
+#define MAX_BLOCKS 1024
 
-int damus_parse_content(struct note_blocks *blocks, const char *content);
+enum block_type {
+    BLOCK_HASHTAG = 1,
+    BLOCK_TEXT = 2,
+    BLOCK_MENTION = 3,
+    BLOCK_URL = 4,
+    BLOCK_INVOICE = 5,
+};
+
+typedef struct str_block {
+    const char *start;
+    const char *end;
+} str_block_t;
+
+typedef struct invoice_block {
+    struct str_block invstr;
+    union {
+        struct bolt11 *bolt11;
+    };
+} invoice_block_t;
+
+typedef struct block {
+    enum block_type type;
+    union {
+        struct str_block str;
+        struct invoice_block invoice;
+        int mention;
+    } block;
+} block_t;
+
+typedef struct blocks {
+    int num_blocks;
+    struct block *blocks;
+} blocks_t;
+
+void blocks_init(struct blocks *blocks);
+void blocks_free(struct blocks *blocks);
+int damus_parse_content(struct blocks *blocks, const char *content);
 
 #endif /* damus_h */

damus-c/debug.h

@@ -1,15 +0,0 @@
-
-#ifndef PROTOVERSE_DEBUG_H
-#define PROTOVERSE_DEBUG_H
-
-#include <stdio.h>
-
-#define unusual(...) fprintf(stderr, "UNUSUAL: " __VA_ARGS__)
-
-#ifdef DEBUG
-#define debug(...) printf(__VA_ARGS__)
-#else
-#define debug(...)
-#endif
-
-#endif /* PROTOVERSE_DEBUG_H */

damus-c/error.c

@@ -1,34 +0,0 @@
-
-#include "error.h"
-
-#include <stdlib.h>
-#include <stdarg.h>
-
-int note_error_(struct errors *errs_, struct cursor *p, const char *fmt, ...)
-{
-	static char buf[512];
-	struct error err;
-	struct cursor *errs;
-	va_list ap;
-
-	errs = &errs_->cur;
-
-	if (errs_->enabled == 0)
-		return 0;
-
-	va_start(ap, fmt);
-	vsprintf(buf, fmt, ap);
-	va_end(ap);
-
-	err.msg = buf;
-	err.pos = p ? (int)(p->p - p->start) : 0;
-
-	if (!cursor_push_error(errs, &err)) {
-		fprintf(stderr, "arena OOM when recording error, ");
-		fprintf(stderr, "errs->p at %ld, remaining %ld, strlen %ld\n",
-				errs->p - errs->start, errs->end - errs->p, strlen(buf));
-	}
-
-	return 0;
-}
-

damus-c/error.h

@@ -1,33 +0,0 @@
-
-#ifndef PROTOVERSE_ERROR_H
-#define PROTOVERSE_ERROR_H
-
-#include "cursor.h"
-
-struct error {
-	int pos;
-	const char *msg;
-};
-
-struct errors {
-	struct cursor cur;
-	int enabled;
-};
-
-#define note_error(errs, p, fmt, ...) note_error_(errs, p, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__)
-
-static inline int cursor_push_error(struct cursor *cur, struct error *err)
-{
-	return cursor_push_int(cur, err->pos) &&
-	       cursor_push_c_str(cur, err->msg);
-}
-
-static inline int cursor_pull_error(struct cursor *cur, struct error *err)
-{
-	return cursor_pull_int(cur, &err->pos) &&
-	       cursor_pull_c_str(cur, &err->msg);
-}
-
-int note_error_(struct errors *errs, struct cursor *p, const char *fmt, ...);
-
-#endif /* PROTOVERSE_ERROR_H */

damus-c/hex.c

@@ -39,6 +39,15 @@ bool hex_decode(const char *str, size_t slen, void *buf, size_t bufsize)
     return slen == 0 && bufsize == 0;
 }
 
+static char hexchar(unsigned int val)
+{
+    if (val < 10)
+        return '0' + val;
+    if (val < 16)
+        return 'a' + val - 10;
+    abort();
+}
+
 bool hex_encode(const void *buf, size_t bufsize, char *dest, size_t destsize)
 {
     size_t i;

damus-c/hex.h

@@ -26,7 +26,7 @@ bool hex_decode(const char *str, size_t slen, void *buf, size_t bufsize);
 /**
  * hex_encode - Create a nul-terminated hex string
  * @buf: the buffer to read the data from
- * @bufsize: the length of buf
+ * @bufsize: the length of @buf
  * @dest: the string to fill
  * @destsize: the max size of the string
  *
@@ -70,15 +70,4 @@ static inline size_t hex_data_size(size_t strlen)
 {
     return strlen / 2;
 }
-
-static inline char hexchar(unsigned int val)
-{
-    if (val < 10)
-        return '0' + val;
-    if (val < 16)
-        return 'a' + val - 10;
-    abort();
-}
-
-
 #endif /* CCAN_HEX_H */

damus-c/likely.h

@@ -52,13 +52,9 @@
  */
 #define unlikely(cond) __builtin_expect(!!(cond), 0)
 #else
-#ifndef likely
 #define likely(cond) (!!(cond))
-#endif
-#ifndef unlikely
 #define unlikely(cond) (!!(cond))
 #endif
-#endif
 #else /* CCAN_LIKELY_DEBUG versions */
 #include <ccan/str/str.h>
 

damus-c/nostr_bech32.c

@@ -1,306 +0,0 @@
-//
-//  nostr_bech32.c
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#include "nostr_bech32.h"
-#include <stdlib.h>
-#include "cursor.h"
-#include "bech32.h"
-
-#define MAX_TLVS 16
-
-#define TLV_SPECIAL 0
-#define TLV_RELAY 1
-#define TLV_AUTHOR 2
-#define TLV_KIND 3
-#define TLV_KNOWN_TLVS 4
-
-struct nostr_tlv {
-    u8 type;
-    u8 len;
-    const u8 *value;
-};
-
-struct nostr_tlvs {
-    struct nostr_tlv tlvs[MAX_TLVS];
-    int num_tlvs;
-};
-
-static int parse_nostr_tlv(struct cursor *cur, struct nostr_tlv *tlv) {
-    // get the tlv tag
-    if (!pull_byte(cur, &tlv->type))
-        return 0;
-    
-    // unknown, fail!
-    if (tlv->type >= TLV_KNOWN_TLVS)
-        return 0;
-    
-    // get the length
-    if (!pull_byte(cur, &tlv->len))
-        return 0;
-    
-    // is the reported length greater then our buffer? if so fail
-    if (cur->p + tlv->len > cur->end)
-        return 0;
-    
-    tlv->value = cur->p;
-    cur->p += tlv->len;
-    
-    return 1;
-}
-
-static int parse_nostr_tlvs(struct cursor *cur, struct nostr_tlvs *tlvs) {
-    int i;
-    tlvs->num_tlvs = 0;
-    
-    for (i = 0; i < MAX_TLVS; i++) {
-        if (parse_nostr_tlv(cur, &tlvs->tlvs[i])) {
-            tlvs->num_tlvs++;
-        } else {
-            break;
-        }
-    }
-    
-    if (tlvs->num_tlvs == 0)
-        return 0;
-    
-    return 1;
-}
-
-static int find_tlv(struct nostr_tlvs *tlvs, u8 type, struct nostr_tlv **tlv) {
-    *tlv = NULL;
-    
-    for (int i = 0; i < tlvs->num_tlvs; i++) {
-        if (tlvs->tlvs[i].type == type) {
-            *tlv = &tlvs->tlvs[i];
-            return 1;
-        }
-    }
-    
-    return 0;
-}
-
-static int parse_nostr_bech32_type(const char *prefix, enum nostr_bech32_type *type) {
-    // Parse type
-    if (strcmp(prefix, "note") == 0) {
-        *type = NOSTR_BECH32_NOTE;
-        return 1;
-    } else if (strcmp(prefix, "npub") == 0) {
-        *type = NOSTR_BECH32_NPUB;
-        return 1;
-    } else if (strcmp(prefix, "nsec") == 0) {
-        *type = NOSTR_BECH32_NSEC;
-        return 1;
-    } else if (strcmp(prefix, "nprofile") == 0) {
-        *type = NOSTR_BECH32_NPROFILE;
-        return 1;
-    } else if (strcmp(prefix, "nevent") == 0) {
-        *type = NOSTR_BECH32_NEVENT;
-        return 1;
-    } else if (strcmp(prefix, "nrelay") == 0) {
-        *type = NOSTR_BECH32_NRELAY;
-        return 1;
-    } else if (strcmp(prefix, "naddr") == 0) {
-        *type = NOSTR_BECH32_NADDR;
-        return 1;
-    }
-    
-    return 0;
-}
-
-static int parse_nostr_bech32_note(struct cursor *cur, struct bech32_note *note) {
-    return pull_bytes(cur, 32, &note->event_id);
-}
-
-static int parse_nostr_bech32_npub(struct cursor *cur, struct bech32_npub *npub) {
-    return pull_bytes(cur, 32, &npub->pubkey);
-}
-
-static int parse_nostr_bech32_nsec(struct cursor *cur, struct bech32_nsec *nsec) {
-    return pull_bytes(cur, 32, &nsec->nsec);
-}
-
-static int tlvs_to_relays(struct nostr_tlvs *tlvs, struct relays *relays) {
-    struct nostr_tlv *tlv;
-    struct str_block *str;
-    
-    relays->num_relays = 0;
-    
-    for (int i = 0; i < tlvs->num_tlvs; i++) {
-        tlv = &tlvs->tlvs[i];
-        if (tlv->type != TLV_RELAY)
-            continue;
-        
-        if (relays->num_relays + 1 > MAX_RELAYS)
-            break;
-        
-        str = &relays->relays[relays->num_relays++];
-        str->start = (const char*)tlv->value;
-        str->end = (const char*)(tlv->value + tlv->len);
-    }
-    
-    return 1;
-}
-
-static int parse_nostr_bech32_nevent(struct cursor *cur, struct bech32_nevent *nevent) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    if (tlv->len != 32)
-        return 0;
-    
-    nevent->event_id = tlv->value;
-    
-    if (find_tlv(&tlvs, TLV_AUTHOR, &tlv)) {
-        nevent->pubkey = tlv->value;
-    } else {
-        nevent->pubkey = NULL;
-    }
-    
-    return tlvs_to_relays(&tlvs, &nevent->relays);
-}
-
-static int parse_nostr_bech32_naddr(struct cursor *cur, struct bech32_naddr *naddr) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    naddr->identifier.start = (const char*)tlv->value;
-    naddr->identifier.end = (const char*)tlv->value + tlv->len;
-    
-    if (!find_tlv(&tlvs, TLV_AUTHOR, &tlv))
-        return 0;
-    
-    naddr->pubkey = tlv->value;
-    
-    return tlvs_to_relays(&tlvs, &naddr->relays);
-}
-
-static int parse_nostr_bech32_nprofile(struct cursor *cur, struct bech32_nprofile *nprofile) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    if (tlv->len != 32)
-        return 0;
-    
-    nprofile->pubkey = tlv->value;
-    
-    return tlvs_to_relays(&tlvs, &nprofile->relays);
-}
-
-static int parse_nostr_bech32_nrelay(struct cursor *cur, struct bech32_nrelay *nrelay) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    nrelay->relay.start = (const char*)tlv->value;
-    nrelay->relay.end = (const char*)tlv->value + tlv->len;
-    
-    return 1;
-}
-
-int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
-    u8 *start, *end;
-    
-    start = cur->p;
-    
-    if (!consume_until_non_alphanumeric(cur, 1)) {
-        cur->p = start;
-        return 0;
-    }
-    
-    end = cur->p;
-    
-    size_t data_len;
-    size_t input_len = end - start;
-    if (input_len < 10 || input_len > 10000) {
-        return 0;
-    }
-    
-    obj->buffer = malloc(input_len * 2);
-    if (!obj->buffer)
-        return 0;
-    
-    u8 data[input_len];
-    char prefix[input_len];
-    
-    if (bech32_decode_len(prefix, data, &data_len, (const char*)start, input_len) == BECH32_ENCODING_NONE) {
-        cur->p = start;
-        return 0;
-    }
-    
-    obj->buflen = 0;
-    if (!bech32_convert_bits(obj->buffer, &obj->buflen, 8, data, data_len, 5, 0)) {
-        goto fail;
-    }
-    
-    if (!parse_nostr_bech32_type(prefix, &obj->type)) {
-        goto fail;
-    }
-    
-    struct cursor bcur;
-    make_cursor(obj->buffer, obj->buffer + obj->buflen, &bcur);
-    
-    switch (obj->type) {
-        case NOSTR_BECH32_NOTE:
-            if (!parse_nostr_bech32_note(&bcur, &obj->data.note))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NPUB:
-            if (!parse_nostr_bech32_npub(&bcur, &obj->data.npub))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NSEC:
-            if (!parse_nostr_bech32_nsec(&bcur, &obj->data.nsec))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NEVENT:
-            if (!parse_nostr_bech32_nevent(&bcur, &obj->data.nevent))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NADDR:
-            if (!parse_nostr_bech32_naddr(&bcur, &obj->data.naddr))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NPROFILE:
-            if (!parse_nostr_bech32_nprofile(&bcur, &obj->data.nprofile))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NRELAY:
-            if (!parse_nostr_bech32_nrelay(&bcur, &obj->data.nrelay))
-                goto fail;
-            break;
-    }
-    
-    return 1;
-
-fail:
-    free(obj->buffer);
-    cur->p = start;
-    return 0;
-}

damus-c/nostr_bech32.h

@@ -1,84 +0,0 @@
-//
-//  nostr_bech32.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef nostr_bech32_h
-#define nostr_bech32_h
-
-#include <stdio.h>
-#include "str_block.h"
-#include "cursor.h"
-typedef unsigned char u8;
-#define MAX_RELAYS 10
-
-struct relays {
-    struct str_block relays[MAX_RELAYS];
-    int num_relays;
-};
-
-enum nostr_bech32_type {
-    NOSTR_BECH32_NOTE = 1,
-    NOSTR_BECH32_NPUB = 2,
-    NOSTR_BECH32_NPROFILE = 3,
-    NOSTR_BECH32_NEVENT = 4,
-    NOSTR_BECH32_NRELAY = 5,
-    NOSTR_BECH32_NADDR = 6,
-    NOSTR_BECH32_NSEC = 7,
-};
-
-struct bech32_note {
-    const u8 *event_id;
-};
-
-struct bech32_npub {
-    const u8 *pubkey;
-};
-
-struct bech32_nsec {
-    const u8 *nsec;
-};
-
-struct bech32_nevent {
-    struct relays relays;
-    const u8 *event_id;
-    const u8 *pubkey; // optional
-};
-
-struct bech32_nprofile {
-    struct relays relays;
-    const u8 *pubkey;
-};
-
-struct bech32_naddr {
-    struct relays relays;
-    struct str_block identifier;
-    const u8 *pubkey;
-};
-
-struct bech32_nrelay {
-    struct str_block relay;
-};
-
-typedef struct nostr_bech32 {
-    enum nostr_bech32_type type;
-    u8 *buffer; // holds strings and tlv stuff
-    size_t buflen;
-    
-    union {
-        struct bech32_note note;
-        struct bech32_npub npub;
-        struct bech32_nsec nsec;
-        struct bech32_nevent nevent;
-        struct bech32_nprofile nprofile;
-        struct bech32_naddr naddr;
-        struct bech32_nrelay nrelay;
-    } data;
-} nostr_bech32_t;
-
-
-int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj);
-
-#endif /* nostr_bech32_h */

damus-c/parser.h

@@ -1,42 +0,0 @@
-
-#ifndef CURSOR_PARSER
-#define CURSOR_PARSER
-
-#include "cursor.h"
-
-static int consume_bytes(struct cursor *cursor, const unsigned char *match, int len)
-{
-	int i;
-
-	if (cursor->p + len > cursor->end) {
-		fprintf(stderr, "consume_bytes overflow\n");
-		return 0;
-	}
-
-	for (i = 0; i < len; i++) {
-		if (cursor->p[i] != match[i])
-			return 0;
-	}
-
-	cursor->p += len;
-
-	return 1;
-}
-
-static inline int consume_byte(struct cursor *cursor, unsigned char match)
-{
-	if (unlikely(cursor->p >= cursor->end))
-		return 0;
-	if (*cursor->p != match)
-		return 0;
-	cursor->p++;
-	return 1;
-}
-
-static inline int consume_u32(struct cursor *cursor, unsigned int match)
-{
-	return consume_bytes(cursor, (unsigned char*)&match, sizeof(match));
-}
-
-#endif /* CURSOR_PARSER */
-

damus-c/str_block.h

@@ -1,16 +0,0 @@
-//
-//  str_block.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef str_block_h
-#define str_block_h
-
-typedef struct str_block {
-    const char *start;
-    const char *end;
-} str_block_t;
-
-#endif /* str_block_h */

damus-c/typedefs.h

@@ -1,14 +0,0 @@
-
-#ifndef PROTOVERSE_TYPEDEFS_H
-#define PROTOVERSE_TYPEDEFS_H
-
-#include <stdint.h>
-
-typedef unsigned char u8;
-typedef unsigned int u32;
-typedef unsigned short u16;
-typedef uint64_t u64;
-typedef int64_t s64;
-
-
-#endif /* PROTOVERSE_TYPEDEFS_H */

damus-c/varint.h

@@ -1,14 +0,0 @@
-
-#ifndef PROTOVERSE_VARINT_H
-#define PROTOVERSE_VARINT_H
-
-#define VARINT_MAX_LEN 9
-
-#include <stddef.h>
-#include <stdint.h>
-
-size_t varint_put(unsigned char buf[VARINT_MAX_LEN], uint64_t v);
-size_t varint_size(uint64_t v);
-size_t varint_get(const unsigned char *p, size_t max, int64_t *val);
-
-#endif /* PROTOVERSE_VARINT_H */

damus-c/wasm.h

@@ -1,850 +0,0 @@
-
-#ifndef PROTOVERSE_WASM_H
-#define PROTOVERSE_WASM_H
-
-static const unsigned char WASM_MAGIC[] = {0,'a','s','m'};
-
-#define WASM_VERSION 0x01
-#define MAX_U32_LEB128_BYTES 5
-#define MAX_U64_LEB128_BYTES 10
-#define MAX_CUSTOM_SECTIONS 32
-#define MAX_BUILTINS 64
-#define BUILTIN_SUSPEND 42
-
-#define FUNC_TYPE_TAG 0x60
-
-
-#include "cursor.h"
-#include "error.h"
-
-#ifdef NOINLINE
-  #define INLINE __attribute__((noinline))
-#else
-  #define INLINE inline
-#endif
-
-
-#define interp_error(p, fmt, ...) note_error(&((p)->errors), interp_codeptr(p), fmt, ##__VA_ARGS__)
-#define parse_err(p, fmt, ...) note_error(&((p)->errs), &(p)->cur, fmt, ##__VA_ARGS__)
-
-enum valtype {
-	val_i32 = 0x7F,
-	val_i64 = 0x7E,
-	val_f32 = 0x7D,
-	val_f64 = 0x7C,
-	val_ref_null = 0xD0,
-	val_ref_func = 0x70, 
-	val_ref_extern = 0x6F,
-};
-
-enum const_instr {
-	ci_const_i32   = 0x41,
-	ci_const_i64   = 0x42,
-	ci_const_f32   = 0x43,
-	ci_const_f64   = 0x44,
-	ci_ref_null    = 0xD0,
-	ci_ref_func    = 0xD2,
-	ci_global_get  = 0x23,
-	ci_end         = 0x0B,
-};
-
-enum limit_type {
-	limit_min = 0x00,
-	limit_min_max = 0x01,
-};
-
-struct limits {
-	u32 min;
-	u32 max;
-	enum limit_type type;
-};
-
-enum section_tag {
-	section_custom,
-	section_type,
-	section_import,
-	section_function,
-	section_table,
-	section_memory,
-	section_global,
-	section_export,
-	section_start,
-	section_element,
-	section_code,
-	section_data,
-	section_data_count,
-	section_name,
-	num_sections,
-};
-
-enum name_subsection_tag {
-	name_subsection_module,
-	name_subsection_funcs,
-	name_subsection_locals,
-	num_name_subsections,
-};
-
-enum reftype {
-	funcref   = 0x70,
-	externref = 0x6F,
-};
-
-struct resulttype {
-	unsigned char *valtypes; /* enum valtype */
-	u32 num_valtypes;
-};
-
-struct functype {
-	struct resulttype params;
-	struct resulttype result;
-};
-
-struct table {
-	enum reftype reftype;
-	struct limits limits;
-};
-
-struct tablesec {
-	struct table *tables;
-	u32 num_tables;
-};
-
-enum elem_mode {
-	elem_mode_passive,
-	elem_mode_active,
-	elem_mode_declarative,
-};
-
-struct expr {
-	u8 *code;
-	u32 code_len;
-};
-
-struct refval {
-	u32 addr;
-};
-
-struct table_inst {
-	struct refval *refs;
-	enum reftype reftype;
-	u32 num_refs;
-};
-
-struct numval {
-	union {
-		int i32;
-		u32 u32;
-		int64_t i64;
-		uint64_t u64;
-		float f32;
-		double f64;
-	};
-};
-
-struct val {
-	enum valtype type;
-	union {
-		struct numval num;
-		struct refval ref;
-	};
-};
-
-struct elem_inst {
-	struct val val;
-	u16 elem;
-	u16 init;
-};
-
-struct elem {
-	struct expr offset;
-	u32 tableidx;
-	struct expr *inits;
-	u32 num_inits;
-	enum elem_mode mode;
-	enum reftype reftype;
-	struct val val;
-};
-
-struct customsec {
-	const char *name;
-	unsigned char *data;
-	u32 data_len;
-};
-
-struct elemsec {
-	struct elem *elements;
-	u32 num_elements;
-};
-
-struct memsec {
-	struct limits *mems; /* memtype */
-	u32 num_mems;
-};
-
-struct funcsec {
-	u32 *type_indices;
-	u32 num_indices;
-};
-
-enum mut {
-	mut_const,
-	mut_var,
-};
-
-struct globaltype {
-	enum valtype valtype;
-	enum mut mut;
-};
-
-struct globalsec {
-	struct global *globals;
-	u32 num_globals;
-};
-
-struct typesec {
-	struct functype *functypes;
-	u32 num_functypes;
-};
-
-enum import_type {
-	import_func,
-	import_table,
-	import_mem,
-	import_global,
-};
-
-struct importdesc {
-	enum import_type type;
-	union {
-		u32 typeidx;
-		struct limits tabletype;
-		struct limits memtype;
-		struct globaltype globaltype;
-	};
-};
-
-struct import {
-	const char *module_name;
-	const char *name;
-	struct importdesc desc;
-	int resolved_builtin;
-};
-
-struct importsec {
-	struct import *imports;
-	u32 num_imports;
-};
-
-struct global {
-	struct globaltype type;
-	struct expr init;
-	struct val val;
-};
-
-struct local_def {
-	u32 num_types;
-	enum valtype type;
-};
-
-/* "code" */
-struct wasm_func {
-	struct expr code;
-	struct local_def *local_defs;
-	u32 num_local_defs;
-};
-
-enum func_type {
-	func_type_wasm,
-	func_type_builtin,
-};
-
-struct func {
-	union {
-		struct wasm_func *wasm_func;
-		struct builtin *builtin;
-	};
-	u32 num_locals;
-	struct functype *functype;
-	enum func_type type;
-	const char *name;
-	u32 idx;
-};
-
-struct codesec {
-	struct wasm_func *funcs;
-	u32 num_funcs;
-};
-
-enum exportdesc {
-	export_func,
-	export_table,
-	export_mem,
-	export_global,
-};
-
-struct wexport {
-	const char *name;
-	u32 index;
-	enum exportdesc desc;
-};
-
-struct exportsec {
-	struct wexport *exports;
-	u32 num_exports;
-};
-
-struct nameassoc {
-	u32 index;
-	const char *name;
-};
-
-struct namemap {
-	struct nameassoc *names;
-	u32 num_names;
-};
-
-struct namesec {
-	const char *module_name;
-	struct namemap func_names;
-	int parsed;
-};
-
-struct wsection {
-	enum section_tag tag;
-};
-
-enum bulk_tag {
-	i_memory_copy = 10,
-	i_memory_fill = 11,
-	i_table_init  = 12,
-	i_elem_drop   = 13,
-	i_table_copy  = 14,
-	i_table_grow  = 15,
-	i_table_size  = 16,
-	i_table_fill  = 17,
-};
-
-enum instr_tag {
-	/* control instructions */
-	i_unreachable   = 0x00,
-	i_nop           = 0x01,
-	i_block         = 0x02,
-	i_loop          = 0x03,
-	i_if            = 0x04,
-	i_else          = 0x05,
-	i_end           = 0x0B,
-	i_br            = 0x0C,
-	i_br_if         = 0x0D,
-	i_br_table      = 0x0E,
-	i_return        = 0x0F,
-	i_call          = 0x10,
-	i_call_indirect = 0x11,
-
-	/* parametric instructions */
-	i_drop          = 0x1A,
-	i_select        = 0x1B,
-	i_selects       = 0x1C,
-
-	/* variable instructions */
-	i_local_get     = 0x20,
-	i_local_set     = 0x21,
-	i_local_tee     = 0x22,
-	i_global_get    = 0x23,
-	i_global_set    = 0x24,
-	i_table_get     = 0x25,
-	i_table_set     = 0x26,
-
-	/* memory instructions */
-	i_i32_load      = 0x28,
-	i_i64_load      = 0x29,
-	i_f32_load      = 0x2A,
-	i_f64_load      = 0x2B,
-	i_i32_load8_s   = 0x2C,
-	i_i32_load8_u   = 0x2D,
-	i_i32_load16_s  = 0x2E,
-	i_i32_load16_u  = 0x2F,
-	i_i64_load8_s   = 0x30,
-	i_i64_load8_u   = 0x31,
-	i_i64_load16_s  = 0x32,
-	i_i64_load16_u  = 0x33,
-	i_i64_load32_s  = 0x34,
-	i_i64_load32_u  = 0x35,
-	i_i32_store     = 0x36,
-	i_i64_store     = 0x37,
-	i_f32_store     = 0x38,
-	i_f64_store     = 0x39,
-	i_i32_store8    = 0x3A,
-	i_i32_store16   = 0x3B,
-	i_i64_store8    = 0x3C,
-	i_i64_store16   = 0x3D,
-	i_i64_store32   = 0x3E,
-	i_memory_size   = 0x3F,
-	i_memory_grow   = 0x40,
-
-	/* numeric instructions */
-	i_i32_const     = 0x41,
-	i_i64_const     = 0x42,
-	i_f32_const     = 0x43,
-	i_f64_const     = 0x44,
-
-	i_i32_eqz       = 0x45,
-	i_i32_eq        = 0x46,
-	i_i32_ne        = 0x47,
-	i_i32_lt_s      = 0x48,
-	i_i32_lt_u      = 0x49,
-	i_i32_gt_s      = 0x4A,
-	i_i32_gt_u      = 0x4B,
-	i_i32_le_s      = 0x4C,
-	i_i32_le_u      = 0x4D,
-	i_i32_ge_s      = 0x4E,
-	i_i32_ge_u      = 0x4F,
-
-	i_i64_eqz       = 0x50,
-	i_i64_eq        = 0x51,
-	i_i64_ne        = 0x52,
-	i_i64_lt_s      = 0x53,
-	i_i64_lt_u      = 0x54,
-	i_i64_gt_s      = 0x55,
-	i_i64_gt_u      = 0x56,
-	i_i64_le_s      = 0x57,
-	i_i64_le_u      = 0x58,
-	i_i64_ge_s      = 0x59,
-	i_i64_ge_u      = 0x5A,
-
-	i_f32_eq        = 0x5B,
-	i_f32_ne        = 0x5C,
-	i_f32_lt        = 0x5D,
-	i_f32_gt        = 0x5E,
-	i_f32_le        = 0x5F,
-	i_f32_ge        = 0x60,
-
-	i_f64_eq        = 0x61,
-	i_f64_ne        = 0x62,
-	i_f64_lt        = 0x63,
-	i_f64_gt        = 0x64,
-	i_f64_le        = 0x65,
-	i_f64_ge        = 0x66,
-
-	i_i32_clz       = 0x67,
-	i_i32_ctz       = 0x68,
-	i_i32_popcnt    = 0x69,
-
-	i_i32_add       = 0x6A,
-	i_i32_sub       = 0x6B,
-	i_i32_mul       = 0x6C,
-	i_i32_div_s     = 0x6D,
-	i_i32_div_u     = 0x6E,
-	i_i32_rem_s     = 0x6F,
-	i_i32_rem_u     = 0x70,
-	i_i32_and       = 0x71,
-	i_i32_or        = 0x72,
-	i_i32_xor       = 0x73,
-	i_i32_shl       = 0x74,
-	i_i32_shr_s     = 0x75,
-	i_i32_shr_u     = 0x76,
-	i_i32_rotl      = 0x77,
-	i_i32_rotr      = 0x78,
-
-	i_i64_clz       = 0x79,
-	i_i64_ctz       = 0x7A,
-	i_i64_popcnt    = 0x7B,
-	i_i64_add       = 0x7C,
-	i_i64_sub       = 0x7D,
-	i_i64_mul       = 0x7E,
-	i_i64_div_s     = 0x7F,
-	i_i64_div_u     = 0x80,
-	i_i64_rem_s     = 0x81,
-	i_i64_rem_u     = 0x82,
-	i_i64_and       = 0x83,
-	i_i64_or        = 0x84,
-	i_i64_xor       = 0x85,
-	i_i64_shl       = 0x86,
-	i_i64_shr_s     = 0x87,
-	i_i64_shr_u     = 0x88,
-	i_i64_rotl      = 0x89,
-	i_i64_rotr      = 0x8A,
-
-	i_f32_abs = 0x8b,
-	i_f32_neg = 0x8c,
-	i_f32_ceil = 0x8d,
-	i_f32_floor = 0x8e,
-	i_f32_trunc = 0x8f,
-	i_f32_nearest = 0x90,
-	i_f32_sqrt = 0x91,
-	i_f32_add = 0x92,
-	i_f32_sub = 0x93,
-	i_f32_mul = 0x94,
-	i_f32_div = 0x95,
-	i_f32_min = 0x96,
-	i_f32_max = 0x97,
-	i_f32_copysign = 0x98,
-
-	i_f64_abs = 0x99,
-	i_f64_neg = 0x9a,
-	i_f64_ceil = 0x9b,
-	i_f64_floor = 0x9c,
-	i_f64_trunc = 0x9d,
-	i_f64_nearest = 0x9e,
-	i_f64_sqrt = 0x9f,
-	i_f64_add = 0xa0,
-	i_f64_sub = 0xa1,
-	i_f64_mul = 0xa2,
-	i_f64_div = 0xa3,
-	i_f64_min = 0xa4,
-	i_f64_max = 0xa5,
-	i_f64_copysign = 0xa6,
-
-	i_i32_wrap_i64 = 0xa7,
-	i_i32_trunc_f32_s = 0xa8,
-	i_i32_trunc_f32_u = 0xa9,
-	i_i32_trunc_f64_s = 0xaa,
-	i_i32_trunc_f64_u = 0xab,
-	i_i64_extend_i32_s = 0xac,
-	i_i64_extend_i32_u = 0xad,
-	i_i64_trunc_f32_s = 0xae,
-	i_i64_trunc_f32_u = 0xaf,
-	i_i64_trunc_f64_s = 0xb0,
-	i_i64_trunc_f64_u = 0xb1,
-	i_f32_convert_i32_s = 0xb2,
-	i_f32_convert_i32_u = 0xb3,
-	i_f32_convert_i64_s = 0xb4,
-	i_f32_convert_i64_u = 0xb5,
-	i_f32_demote_f64 = 0xb6,
-	i_f64_convert_i32_s = 0xb7,
-	i_f64_convert_i32_u = 0xb8,
-	i_f64_convert_i64_s = 0xb9,
-	i_f64_convert_i64_u = 0xba,
-	i_f64_promote_f32 = 0xbb,
-
-	i_i32_reinterpret_f32 = 0xbc,
-	i_i64_reinterpret_f64 = 0xbd,
-	i_f32_reinterpret_i32 = 0xbe,
-	i_f64_reinterpret_i64 = 0xbf,
-
-	i_i32_extend8_s = 0xc0,
-	i_i32_extend16_s = 0xc1,
-	i_i64_extend8_s = 0xc2,
-	i_i64_extend16_s = 0xc3,
-	i_i64_extend32_s = 0xc4,
-
-	i_ref_null    = 0xD0,
-	i_ref_is_null = 0xD1,
-	i_ref_func    = 0xD2,
-
-	i_bulk_op     = 0xFC,
-	/* TODO: more instrs */
-
-};
-
-enum blocktype_tag {
-	blocktype_empty,
-	blocktype_valtype,
-	blocktype_index,
-};
-
-struct blocktype {
-	enum blocktype_tag tag;
-	union {
-		enum valtype valtype;
-		int type_index;
-	};
-};
-
-struct instrs {
-	unsigned char *data;
-	u32 len;
-};
-
-struct block {
-	struct blocktype type;
-	struct expr instrs;
-};
-
-struct memarg {
-	u32 offset;
-	u32 align;
-};
-
-struct br_table {
-	u32 num_label_indices;
-	u32 label_indices[512];
-	u32 default_label;
-};
-
-struct call_indirect {
-	u32 tableidx;
-	u32 typeidx;
-};
-
-struct table_init {
-	u32 tableidx;
-	u32 elemidx;
-};
-
-struct table_copy {
-	u32 from;
-	u32 to;
-};
-
-struct bulk_op {
-	enum bulk_tag tag;
-	union {
-		struct table_init table_init;
-		struct table_copy table_copy;
-		u32 idx;
-	};
-};
-
-struct select_instr {
-	u8 *valtypes;
-	u32 num_valtypes;
-};
-
-struct instr {
-	enum instr_tag tag;
-	int pos;
-	union {
-		struct br_table br_table;
-		struct bulk_op bulk_op;
-		struct call_indirect call_indirect;
-		struct memarg memarg;
-		struct select_instr select;
-		struct block block;
-		struct expr else_block;
-		double f64;
-		float f32;
-		int i32;
-		u32 u32;
-		int64_t i64;
-		u64 u64;
-		unsigned char memidx;
-		enum reftype reftype;
-	};
-};
-
-enum datamode {
-	datamode_active,
-	datamode_passive,
-};
-
-struct wdata_active {
-	u32 mem_index;
-	struct expr offset_expr;
-};
-
-struct wdata {
-	struct wdata_active active;
-	u8 *bytes;
-	u32 bytes_len;
-	enum datamode mode;
-};
-
-struct datasec {
-	struct wdata *datas;
-	u32 num_datas;
-};
-
-struct startsec {
-	u32 start_fn;
-};
-
-struct module {
-	unsigned int parsed;
-	unsigned int custom_sections;
-
-	struct func *funcs;
-    
-	u32 num_funcs;
-
-	struct customsec custom_section[MAX_CUSTOM_SECTIONS];
-	struct typesec type_section;
-	struct funcsec func_section;
-	struct importsec import_section;
-	struct exportsec export_section;
-	struct codesec code_section;
-	struct tablesec table_section;
-	struct memsec memory_section;
-	struct globalsec global_section;
-	struct startsec start_section;
-	struct elemsec element_section;
-	struct datasec data_section;
-	struct namesec name_section;
-};
-
-// make sure the struct is packed so that 
-struct label {
-	u32 instr_pos; // resolved status is stored in HOB of pos
-	u32 jump;
-};
-
-struct callframe {
-	struct cursor code;
-	struct val *locals;
-	struct func *func;
-	u16 prev_stack_items;
-};
-
-struct resolver {
-	u16 label;
-	u8 end_tag;
-	u8 start_tag;
-};
-
-struct global_inst {
-	struct val val;
-};
-
-struct module_inst {
-	struct table_inst *tables;
-	struct global_inst *globals;
-	struct elem_inst *elements;
-
-	u32 num_tables;
-	u32 num_globals;
-	u32 num_elements;
-
-	int start_fn;
-	unsigned char *globals_init;
-};
-
-struct wasi {
-	int argc;
-	const char **argv;
-
-	int environc;
-	const char **environ;
-};
-
-struct wasm_interp;
-
-struct builtin {
-    const char *name;
-    int (*fn)(struct wasm_interp *);
-    int (*prepare_args)(struct wasm_interp *);
-};
-
-struct wasm_interp {
-	struct module *module;
-	struct module_inst module_inst;
-	struct wasi wasi;
-    void *context;
-    
-    struct builtin builtins[MAX_BUILTINS];
-    int num_builtins;
-    
-	int prev_resolvers, quitting;
-
-	struct errors errors; /* struct error */
-	size_t ops;
-
-	struct cursor callframes; /* struct callframe */
-	struct cursor stack; /* struct val */
-	struct cursor mem; /* u8/mixed */
-
-	struct cursor memory; /* memory pages (65536 blocks) */
-
-	struct cursor locals; /* struct val */
-	struct cursor labels; /* struct labels */
-	struct cursor num_labels;
-
-	// resolve stack for the current function. every time a control
-	// instruction is encountered, the label index is pushed. When an
-	// instruction is popped, we can resolve the label
-	struct cursor resolver_stack; /* struct resolver */
-	struct cursor resolver_offsets; /* int */
-};
-
-struct wasm_parser {
-	struct module module;
-    struct builtin *builtins;
-    u32 num_builtins;
-	struct cursor cur;
-	struct cursor mem;
-	struct errors errs;
-};
-
-
-int run_wasm(unsigned char *wasm, unsigned long len, int argc, const char **argv, char **env, int *retval);
-int parse_wasm(struct wasm_parser *p);
-int wasm_interp_init(struct wasm_interp *interp, struct module *module);
-void wasm_parser_free(struct wasm_parser *parser);
-void wasm_parser_init(struct wasm_parser *p, u8 *wasm, size_t wasm_len, size_t arena_size, struct builtin *, int num_builtins);
-void wasm_interp_free(struct wasm_interp *interp);
-int interp_wasm_module(struct wasm_interp *interp, int *retval);
-int interp_wasm_module_resume(struct wasm_interp *interp, int *retval);
-void print_error_backtrace(struct errors *errors);
-void setup_wasi(struct wasm_interp *interp, int argc, const char **argv, char **env);
-void print_callstack(struct wasm_interp *interp);
-
-// builtin helpers
-int get_params(struct wasm_interp *interp, struct val** vals, u32 num_vals);
-int get_var_params(struct wasm_interp *interp, struct val** vals, u32 *num_vals);
-u8 *interp_mem_ptr(struct wasm_interp *interp, u32 ptr, int size);
-
-static INLINE struct callframe *top_callframe(struct cursor *cur)
-{
-    return (struct callframe*)cursor_top(cur, sizeof(struct callframe));
-}
-
-
-static INLINE struct cursor *interp_codeptr(struct wasm_interp *interp)
-{
-    struct callframe *frame;
-    if (unlikely(!(frame = top_callframe(&interp->callframes))))
-        return 0;
-    return &frame->code;
-}
-
-
-static INLINE int mem_ptr_str(struct wasm_interp *interp, u32 ptr,
-        const char **str)
-{
-    // still technically unsafe if the string runs over the end of memory...
-    if (!(*str = (const char*)interp_mem_ptr(interp, ptr, 1))) {
-        return interp_error(interp, "int memptr");
-    }
-    return 1;
-}
-
-static INLINE int mem_ptr_i32(struct wasm_interp *interp, u32 ptr, int **i)
-{
-    if (!(*i = (int*)interp_mem_ptr(interp, ptr, sizeof(int))))
-        return interp_error(interp, "int memptr");
-    return 1;
-}
-
-static INLINE int cursor_pushval(struct cursor *cur, struct val *val)
-{
-    return cursor_push(cur, (u8*)val, sizeof(*val));
-}
-
-static INLINE int cursor_push_i32(struct cursor *stack, int i)
-{
-    struct val val;
-    val.type = val_i32;
-    val.num.i32 = i;
-
-    return cursor_pushval(stack, &val);
-}
-
-static INLINE int stack_push_i32(struct wasm_interp *interp, int i)
-{
-    return cursor_push_i32(&interp->stack, i);
-}
-
-static INLINE struct callframe *top_callframes(struct cursor *cur, int top)
-{
-    return (struct callframe*)cursor_topn(cur, sizeof(struct callframe), top);
-}
-
-static INLINE int was_section_parsed(struct module *module,
-    enum section_tag section)
-{
-    if (section == section_custom)
-        return module->custom_sections > 0;
-
-    return module->parsed & (1 << section);
-}
-
-
-#endif /* PROTOVERSE_WASM_H */

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

@@ -1,21 +1,12 @@
 {
   "pins" : [
-    {
-      "identity" : "gsplayer",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wxxsw/GSPlayer",
-      "state" : {
-        "revision" : "aa6dad7943d52f5207f7fcc2ad3e4274583443b8",
-        "version" : "0.2.26"
-      }
-    },
     {
       "identity" : "kingfisher",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/onevcat/Kingfisher",
       "state" : {
-        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
-        "version" : "7.6.1"
+        "revision" : "017f94ccfdacabb1ae7f45b75b4217b24c06e6ac",
+        "version" : "7.4.0"
       }
     },
     {
@@ -27,29 +18,21 @@
       }
     },
     {
-      "identity" : "swift-markdown-ui",
+      "identity" : "starscream",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/damus-io/swift-markdown-ui",
+      "location" : "https://github.com/daltoniam/Starscream",
       "state" : {
-        "revision" : "76bb7971da7fbf429de1c84f1244adf657242fee"
+        "revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21",
+        "version" : "4.0.4"
       }
     },
     {
-      "identity" : "swift-snapshot-testing",
+      "identity" : "vault",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
+      "location" : "https://github.com/SparrowTek/Vault",
       "state" : {
-        "revision" : "5b356adceabff6ca027f6574aac79e9fee145d26",
-        "version" : "1.14.1"
-      }
-    },
-    {
-      "identity" : "swift-syntax",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
-      "state" : {
-        "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
-        "version" : "509.0.0"
+        "revision" : "87db56c3c8b6421c65b0745f73e08b0dc56f79d4",
+        "version" : "1.0.3"
       }
     }
   ],

damus.xcodeproj/xcshareddata/xcschemes/DamusNotificationService.xcscheme

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1500"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D79C4C132AFEB061003A41B4"
-               BuildableName = "DamusNotificationService.appex"
-               BlueprintName = "DamusNotificationService"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-               BuildableName = "damus.app"
-               BlueprintName = "damus"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      launchStyle = "0"
-      askForAppToLaunch = "Yes"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "1"
-         BundleIdentifier = "com.jb55.damus2"
-         RemotePath = "/Users/danielnogueira/Library/Developer/CoreSimulator/Devices/99E60B35-CE5D-4B45-AC35-00818C0AF3CB/data/Containers/Bundle/Application/5A083DD0-FDE2-43D7-9172-2F97FAD18F20/damus.app">
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
-      launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

damus.xcodeproj/xcshareddata/xcschemes/Release.xcscheme

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1500"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-               BuildableName = "damus.app"
-               BlueprintName = "damus"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEF227F7A08200C66700"
-               BuildableName = "damusTests.xctest"
-               BlueprintName = "damusTests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEFC27F7A08200C66700"
-               BuildableName = "damusUITests.xctest"
-               BlueprintName = "damusUITests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1500"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-               BuildableName = "damus.app"
-               BlueprintName = "damus"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEF227F7A08200C66700"
-               BuildableName = "damusTests.xctest"
-               BlueprintName = "damusTests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEFC27F7A08200C66700"
-               BuildableName = "damusUITests.xctest"
-               BlueprintName = "damusUITests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

damus/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x43",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusAdaptableBlack.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusAdaptableGrey.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF4",
-          "green" : "0xEE",
-          "red" : "0xEE"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x1C",
-          "red" : "0x1C"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusAdaptableWhite.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusBlack.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusBlue.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0x4D",
+          "red" : "0x4B"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusBrown.colorset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "red" : "0xBE",
-          "green" : "0x5F",
-          "blue" : "0x00"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusDangerBorder.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE3",
-          "green" : "0xD7",
-          "red" : "0xF7"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x20",
-          "green" : "0x13",
-          "red" : "0x61"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusDangerPrimary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x63",
-          "green" : "0x11",
-          "red" : "0xF5"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x6E",
-          "green" : "0x20",
-          "red" : "0xF8"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusDangerQuaternary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xEE",
-          "green" : "0xE8",
-          "red" : "0xF7"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x35",
-          "green" : "0x04",
-          "red" : "0x8B"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusDangerSecondary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x3D",
-          "green" : "0x07",
-          "red" : "0x9C"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x44",
-          "green" : "0x06",
-          "red" : "0xB2"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusDangerTertiary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x2D",
-          "green" : "0x05",
-          "red" : "0x75"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xD8",
-          "green" : "0xC2",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusDarkGrey.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x1E",
+          "green" : "0x1C",
+          "red" : "0x1C"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusDeepPurple.colorset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xED",
-          "green" : "0x26",
-          "red" : "0xBF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusGreen.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4F",
+          "green" : "0xC3",
+          "red" : "0x66"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusLightGrey.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF4",
+          "green" : "0xEE",
+          "red" : "0xEE"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusMediumGrey.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x5F",
+          "green" : "0x5F",
+          "red" : "0x5F"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusNeutral1.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFA",
-          "green" : "0xFA",
-          "red" : "0xF9"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x24",
-          "green" : "0x22",
-          "red" : "0x20"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusNeutral3.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE3",
-          "green" : "0xE1",
-          "red" : "0xDD"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x2A",
-          "green" : "0x26",
-          "red" : "0x23"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusNeutral6.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x59",
-          "green" : "0x53",
-          "red" : "0x4A"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x85",
-          "green" : "0x7A",
-          "red" : "0x6A"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusPurple.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x43",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusSuccessBorder.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE4",
-          "green" : "0xF1",
-          "red" : "0xD6"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x38",
-          "green" : "0x5C",
-          "red" : "0x12"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusSuccessPrimary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x5A",
-          "green" : "0xAB",
-          "red" : "0x04"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x64",
-          "green" : "0xBF",
-          "red" : "0x03"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusSuccessQuaternary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF0",
-          "green" : "0xF7",
-          "red" : "0xE8"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1F",
-          "green" : "0x33",
-          "red" : "0x0A"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusSuccessSecondary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x34",
-          "green" : "0x64",
-          "red" : "0x02"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x3F",
-          "green" : "0x79",
-          "red" : "0x02"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusSuccessTertiary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1F",
-          "green" : "0x3C",
-          "red" : "0x01"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE4",
-          "green" : "0xFF",
-          "red" : "0xAD"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusWarningBorder.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xD1",
-          "green" : "0xEE",
-          "red" : "0xFE"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x12",
-          "green" : "0x43",
-          "red" : "0x5C"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusWarningPrimary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1C",
-          "green" : "0xAD",
-          "red" : "0xF9"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x2C",
-          "green" : "0xB5",
-          "red" : "0xFC"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusWarningQuaternary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE1",
-          "green" : "0xF4",
-          "red" : "0xFE"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x0A",
-          "green" : "0x25",
-          "red" : "0x33"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusWarningSecondary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x06",
-          "green" : "0x85",
-          "red" : "0xC6"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x03",
-          "green" : "0x93",
-          "red" : "0xDD"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusWarningTertiary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x04",
-          "green" : "0x6A",
-          "red" : "0x9F"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xCC",
-          "green" : "0xF5",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusWhite.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Colors/DamusYellow.colorset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x05",
-          "green" : "0xDF",
-          "red" : "0xFA"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Hashtags/Contents.json

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

damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="12.843903"
-   height="17"
-   viewBox="0 0 12.843902 16.999999"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="bitcoin-hashtag.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="namedview2"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="31.12"
-     inkscape:cx="4.2577121"
-     inkscape:cy="7.535347"
-     inkscape:window-width="1526"
-     inkscape:window-height="957"
-     inkscape:window-x="1637"
-     inkscape:window-y="10"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <g
-     id="surface1"
-     transform="matrix(0.94507527,0,0,0.94507527,-4.5943665,-3.2875042)">
-    <path
-       style="fill:#f59119;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40637"
-       d="M 18.388175,10.742602 C 18.668352,8.874761 17.240002,7.8694225 15.295251,7.193703 L 15.927019,4.6611305 14.383304,4.2765743 13.768015,6.7432244 C 13.361486,6.644338 12.943967,6.545453 12.531944,6.4520613 L 13.152726,3.9689298 11.609011,3.584375 10.977241,6.1169476 C 10.642129,6.0400371 10.312509,5.9686201 9.988384,5.886215 L 9.993834,5.880715 7.8623408,5.3478364 7.4558114,6.9959316 c 0,0 1.1426793,0.2636953 1.1207046,0.2801765 0.6207823,0.1538223 0.7361485,0.5658464 0.714174,0.8954659 l -0.7196673,2.889659 c 0.043949,0.01099 0.098885,0.02747 0.1648089,0.04944 L 8.5710227,11.072223 7.5601911,15.11555 c -0.076912,0.192277 -0.26919,0.477948 -0.7031873,0.368073 0.010984,0.02198 -1.1261994,-0.280174 -1.1261994,-0.280174 l -0.7636164,1.76346 2.0106754,0.505417 c 0.3735682,0.0934 0.7361485,0.186784 1.0987301,0.280176 l -0.6427568,2.565534 1.5437155,0.384556 0.6317701,-2.538067 c 0.4230107,0.115364 0.8295407,0.219746 1.2305777,0.318632 l -0.63177,2.527079 1.543716,0.384557 0.637263,-2.560042 c 2.631459,0.499922 4.614667,0.296656 5.444208,-2.082094 0.670226,-1.917284 -0.03296,-3.021507 -1.417363,-3.741176 1.010832,-0.236227 1.768957,-0.895465 1.972221,-2.268877 z m -3.526922,4.944286 c -0.477949,1.917283 -3.702721,0.884477 -4.752008,0.620782 l 0.851514,-3.395075 c 1.043795,0.2582 4.394922,0.774604 3.900494,2.774293 z M 15.3392,10.715134 c -0.433999,1.74698 -3.120394,0.857008 -3.993884,0.642757 l 0.769111,-3.081939 c 0.87349,0.219746 3.675252,0.620784 3.224773,2.439182 z m 0,0"
-       id="path2" />
-  </g>
-</svg>

damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-
-<svg
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 13.999999 18"
-   enable-background="new 0 0 1000 1000"
-   xml:space="preserve"
-   id="svg4"
-   sodipodi:docname="coffee.svg"
-   width="14"
-   height="18"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs4" /><sodipodi:namedview
-   id="namedview4"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="10.680141"
-   inkscape:cx="-17.181421"
-   inkscape:cy="4.07298"
-   inkscape:window-width="1368"
-   inkscape:window-height="947"
-   inkscape:window-x="1764"
-   inkscape:window-y="58"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg4" />
-<metadata
-   id="metadata1"> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g
-   id="g4"
-   transform="matrix(0.01779387,0,0,0.01779387,-1.8340539,0.04465199)"><g
-     transform="matrix(0.1,0,0,-0.1,0,511)"
-     id="g3"><path
-       d="m 4302.6,4870.6 c 149.5,-177.8 240.5,-319.3 347.6,-545.6 119.2,-254.6 169.7,-448.6 183.9,-699.2 22.2,-462.7 -137.4,-778 -539.5,-1060.9 -474.9,-335.4 -685,-739.6 -687,-1315.5 0,-260.7 38.4,-501.1 115.2,-739.6 50.5,-149.5 56.6,-159.6 60.6,-97 18.2,234.4 56.6,476.9 101,626.4 121.2,422.3 305.1,622.4 885.1,959.8 424.3,248.5 575.9,487 575.9,905.3 -2,501.1 -359.7,1295.3 -798.2,1768.1 -82.8,88.9 -198,202.1 -256.6,250.6 l -105.1,86.9 z"
-       id="path1"
-       style="fill:#be5f00;fill-opacity:1" /><path
-       d="m 5981.8,3577.3 c 272.8,-369.8 309.2,-846.7 90.9,-1192.2 -147.5,-232.4 -373.8,-406.2 -822.4,-638.5 -592,-303.1 -854.7,-683 -854.7,-1232.6 0,-276.8 14.2,-343.5 72.7,-343.5 38.4,0 48.5,16.2 68.7,111.1 34.4,167.7 135.4,349.6 262.7,476.9 147.5,145.5 349.6,244.5 838.6,412.2 503.2,171.8 725.4,280.9 846.7,416.3 210.1,232.4 276.8,535.5 202.1,903.2 -76.8,373.8 -216.2,618.3 -537.5,943.7 -155.7,155.6 -214.3,206.1 -167.8,143.4 z"
-       id="path2"
-       style="fill:#be5f00;fill-opacity:1" /><path
-       d="M 2748.7,592.8 C 2158.7,507.9 1732.3,352.3 1542.4,156.3 1415.1,25 1409,-11.4 1427.2,-445.8 c 34.3,-832.5 181.9,-1729.7 462.7,-2829 153.6,-600.1 309.2,-1113.4 351.6,-1159.9 56.6,-62.6 272.8,-157.6 476.9,-210.1 668.8,-173.8 2172.2,-196 2960.3,-42.4 357.7,68.7 604.2,163.7 731.5,278.9 68.7,60.6 84.9,92.9 107.1,198 64.7,335.4 56.6,319.3 131.3,319.3 107.1,0 438.5,92.9 602.2,167.7 220.3,103.1 363.7,202.1 567.8,398.1 470.8,452.6 759.8,1149.8 761.8,1840.8 0,398.1 -72.7,614.3 -274.8,818.4 -220.3,222.3 -466.8,309.2 -937.6,325.4 l -309.2,12.1 14.2,218.2 14.2,218.2 -56.6,52.5 C 6866.9,314 6274.9,499.9 5696.9,582.7 L 5614,594.8 5533.2,457.4 5450.4,322 5565.6,305.8 c 588,-84.9 868.9,-159.6 978,-256.6 56.6,-50.5 60.6,-62.6 44.5,-113.2 -80.8,-226.3 -1000.2,-371.8 -2329.8,-371.8 -1220.5,0 -2097.5,123.3 -2295.5,321.3 -52.5,54.5 -56.6,66.7 -36.4,111.1 48.5,107.1 341.5,206.1 822.4,276.8 143.5,20.2 301.1,38.4 349.6,38.4 46.5,0 84.9,4 84.9,8.1 0,8.1 -175.8,295 -185.9,305.1 -4.2,2.1 -115.3,-12 -248.7,-32.2 z m 4797.1,-1614.5 c 153.6,-26.3 272.8,-82.8 317.2,-153.6 56.6,-84.9 60.6,-400.1 8.1,-652.7 -111.1,-545.6 -404.1,-996.2 -788.1,-1220.5 -139.4,-80.8 -333.4,-151.5 -355.6,-129.3 -8.1,8.1 18.2,216.2 58.6,462.7 78.8,482.9 159.6,1073 202.1,1450.8 l 24.2,232.4 70.7,12.1 c 115.3,20.3 325.4,20.3 462.8,-1.9 z"
-       id="path3"
-       style="fill:#be5f00;fill-opacity:1" /></g></g>
-</svg>

damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.0"
-   width="18pt"
-   height="18.199053pt"
-   viewBox="0 0 18 18.199053"
-   preserveAspectRatio="xMidYMid"
-   id="svg1"
-   sodipodi:docname="nostr-hashtag.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="pt"
-     showgrid="false"
-     inkscape:zoom="5.4017383"
-     inkscape:cx="50.354161"
-     inkscape:cy="-13.514168"
-     inkscape:window-width="1497"
-     inkscape:window-height="866"
-     inkscape:window-x="1747"
-     inkscape:window-y="96"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1" />
-  <metadata
-     id="metadata1">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-</metadata>
-  <g
-     transform="matrix(0.00138509,0,0,-0.00138509,0.3,17.927982)"
-     fill="#000000"
-     stroke="none"
-     id="g1">
-    <path
-       d="m 11315,12756 c -49,-23 -135,-71 -190,-106 -128,-81 -170,-100 -222,-100 -37,0 -43,-3 -43,-22 0,-11 12,-36 26,-55 l 26,-34 -20,-37 c -128,-248 -171,-359 -212,-547 -56,-262 -43,-645 36,-1045 48,-244 104,-451 234,-865 158,-503 280,-942 320,-1145 27,-140 60,-448 60,-559 0,-164 -39,-366 -92,-478 -57,-123 -176,-222 -286,-239 -49,-8 -50,-23 -5,-38 18,-6 34,-14 38,-18 13,-13 -25,-66 -97,-134 -121,-115 -267,-174 -432,-174 -200,0 -327,87 -732,507 -233,240 -541,529 -604,567 -31,18 -32,18 -27,0 3,-11 9,-36 13,-56 8,-49 -5,-49 -65,1 -75,62 -168,118 -250,150 -134,51 -214,63 -481,70 l -245,6 -65,41 c -100,63 -125,68 -295,66 -186,-3 -262,7 -484,64 -279,71 -341,67 -780,-61 -334,-97 -442,-118 -761,-150 -200,-19 -365,-19 -496,1 -58,9 -107,14 -111,11 -3,-4 6,-22 21,-41 l 27,-35 -23,-5 c -13,-3 -61,-8 -106,-11 -113,-9 -157,-26 -219,-87 -50,-49 -54,-51 -140,-64 -60,-10 -108,-25 -153,-48 -304,-157 -331,-166 -471,-166 -48,0 -120,7 -160,15 -40,9 -74,13 -78,10 -3,-3 0,-20 7,-37 6,-18 10,-34 7,-36 -2,-3 -24,0 -47,7 -24,6 -103,16 -176,23 -163,15 -350,1 -521,-40 l -114,-26 51,-23 c 53,-23 76,-50 66,-77 -3,-8 -51,-38 -105,-66 -251,-129 -515,-384 -727,-703 -110,-166 -208,-325 -217,-355 -6,-21 -5,-22 34,-16 36,6 41,4 41,-12 0,-11 -15,-45 -34,-76 -46,-75 -76,-161 -127,-359 -78,-307 -137,-444 -243,-569 -38,-44 -51,-67 -43,-72 7,-4 40,-8 75,-8 37,0 62,-4 62,-11 0,-6 -12,-26 -27,-45 -32,-43 -24,-53 48,-60 108,-11 103,-6 95,-82 -4,-37 -11,-128 -15,-202 -5,-74 -16,-164 -26,-200 -22,-85 -75,-190 -136,-269 -27,-35 -49,-67 -49,-72 0,-4 17,-11 38,-14 20,-3 49,-8 64,-10 64,-10 285,31 408,76 101,37 249,117 348,188 54,38 110,75 126,80 15,6 70,11 123,11 267,0 582,98 766,239 34,26 72,53 83,59 25,13 31,8 58,-46 21,-40 38,-32 57,26 30,93 97,200 141,223 25,14 38,3 98,-86 27,-38 73,-95 104,-125 31,-30 56,-63 56,-75 0,-11 -20,-60 -45,-110 -42,-84 -81,-202 -70,-213 3,-3 27,16 54,41 50,47 81,59 81,34 0,-8 -10,-49 -21,-93 -26,-97 -32,-275 -10,-313 l 14,-25 36,41 c 42,48 118,88 251,131 102,33 185,47 345,57 55,4 159,13 230,21 292,34 285,35 368,-56 66,-72 122,-115 170,-130 20,-6 37,-15 37,-19 0,-12 -22,-35 -75,-77 -27,-21 -151,-133 -275,-248 -424,-394 -462,-415 -864,-486 -65,-12 -145,-29 -177,-39 -191,-60 -348,-213 -554,-541 -103,-165 -162,-241 -292,-383 -176,-190 -332,-333 -778,-711 -497,-422 -750,-737 -895,-1113 -64,-165 -104,-203 -216,-203 -38,0 -94,7 -124,15 -74,20 -244,20 -301,0 -27,-10 -61,-33 -87,-62 -41,-45 -43,-46 -89,-39 -25,3 -67,18 -92,33 C 457,781 369,812 175,813 49,814 0,786 0,713 0,669 31,628 122,557 204,491 254,434 469,153 527,77 549,57 597,33 652,7 662,5 780,6 c 69,0 150,6 180,14 30,7 132,32 225,56 281,72 308,76 511,84 181,6 195,8 247,34 76,37 137,107 231,267 230,392 287,481 394,626 219,293 469,581 756,869 284,284 368,342 641,439 164,59 295,123 410,199 101,68 257,219 295,286 14,24 56,76 93,116 100,106 177,142 437,203 165,40 229,62 390,133 191,85 220,94 460,143 118,24 239,49 267,56 29,7 56,10 59,6 4,-3 15,-50 26,-104 14,-73 21,-159 25,-331 6,-265 -3,-385 -47,-605 -50,-247 -105,-393 -222,-592 -59,-98 -74,-167 -58,-256 23,-126 61,-177 174,-232 95,-47 169,-52 357,-28 125,16 244,22 505,26 667,12 1011,-35 1799,-241 277,-73 308,-86 376,-161 72,-79 113,-170 175,-388 19,-66 42,-130 50,-143 42,-63 155,-112 261,-112 109,0 124,57 54,206 -48,102 -53,149 -17,165 31,15 73,-5 102,-48 12,-18 45,-87 75,-153 57,-132 106,-197 173,-233 35,-18 56,-21 136,-20 73,2 110,-3 159,-19 89,-29 333,-32 403,-5 114,44 140,145 60,231 -23,24 -112,72 -272,143 -71,32 -199,124 -250,179 -71,78 -111,140 -224,343 -132,236 -172,297 -262,391 -58,61 -94,89 -148,115 -113,56 -85,53 -866,85 -223,9 -616,36 -656,45 -11,2 -86,12 -165,20 -179,20 -595,95 -712,130 -145,42 -319,139 -371,208 -32,42 -53,102 -67,187 -22,144 48,316 261,640 125,190 193,317 230,428 31,95 60,282 60,392 0,76 4,102 16,114 20,20 25,18 192,-102 73,-52 168,-114 210,-137 83,-47 132,-82 132,-95 0,-4 -14,-17 -32,-28 l -32,-21 29,-11 c 108,-41 305,-52 707,-39 186,6 345,9 353,5 8,-3 15,-15 15,-27 0,-20 3,-21 54,-15 110,13 266,81 426,187 89,58 99,63 170,69 161,14 229,78 523,495 88,124 143,185 169,185 2,0 2,-27 0,-60 -2,-33 0,-60 5,-60 23,0 140,145 212,263 117,192 165,317 271,712 106,394 111,410 135,410 15,0 22,-10 29,-40 13,-53 12,-52 42,-24 40,36 103,133 154,234 25,50 50,90 55,90 6,0 11,-17 13,-37 2,-21 7,-38 12,-38 19,0 93,101 139,190 29,56 87,206 140,363 50,147 114,318 142,380 132,288 199,526 246,867 25,190 25,756 0,975 -23,195 -53,379 -78,485 -46,194 -152,515 -233,706 -130,306 -218,564 -260,764 -48,228 -48,572 1,770 31,128 82,204 166,246 64,33 118,83 187,174 120,158 184,199 503,321 250,96 347,153 347,204 0,41 -42,57 -174,68 -112,9 -385,70 -439,99 -10,5 -27,29 -37,54 -23,53 -99,137 -159,176 -56,35 -72,36 -40,1 24,-26 23,-26 -13,3 -21,16 -42,41 -47,56 -9,26 -14,28 -60,28 -50,0 -101,16 -101,32 0,4 -42,8 -92,7 -88,0 -98,-3 -183,-43 z m 550,-126 c 10,-11 16,-20 13,-20 -3,0 -13,9 -23,20 -10,11 -16,20 -13,20 3,0 13,-9 23,-20 z"
-       id="path1"
-       style="fill:#cc43c5;fill-opacity:1" />
-  </g>
-</svg>

damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 21.315096 18"
-   width="21.315096"
-   height="18"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="plebchain.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     id="namedview21"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="19.666667"
-     inkscape:cx="12.762712"
-     inkscape:cy="12.991525"
-     inkscape:window-width="1418"
-     inkscape:window-height="883"
-     inkscape:window-x="1745"
-     inkscape:window-y="10"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg21" />
-  <path
-     d="M 18.625339,11.886754 C 17.668676,9.87076 15.553749,8.748431 12.298294,7.531368 12.258627,7.5164347 11.514296,7.2747022 10.649566,6.9942364 9.6532356,6.6713042 8.5682391,6.7520372 7.6316422,7.220569 L 5.7999816,8.136166 13.616623,17.9338 h 4.316652 l 0.703264,-1.662727 c 0.593598,-1.401862 0.641198,-3.009057 -0.0112,-4.384319 z"
-     id="path5"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="M 16.627546,5.1089093 C 16.710146,4.5484447 16.797412,3.95578 16.838479,3.6790475 17.083011,2.0219197 15.937348,0.48005806 14.28022,0.23552546 12.623092,-0.00900704 11.081231,1.1366559 10.836698,2.7937838 c -0.0406,0.2762657 -0.128333,0.8689305 -0.210932,1.4298619 -0.282799,0.058333 -0.513332,0.2851324 -0.558132,0.5870648 -0.0658,0.441465 0.084,1.0145298 0.370999,1.2072625 0.09707,1.4303286 1.118596,2.778524 2.547992,2.989457 1.429395,0.210933 2.796257,-0.785398 3.302589,-2.1265932 0.330399,-0.1021996 0.639331,-0.6071313 0.703731,-1.0490632 0.0434,-0.302399 -0.111533,-0.5856647 -0.365399,-0.7228643 z"
-     id="path10"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="m 21.193864,14.872477 c -0.0392,-0.501665 -0.310799,-0.956663 -0.684131,-1.294529 l -1.900727,-1.723394 c 0,0 0.172666,0.346732 0.332732,1.276796 L 15.53415,11.550288 c -0.878731,-0.405999 -1.835861,-0.616465 -2.804191,-0.616465 h -0.807331 c -0.87733,0 -1.681394,-0.553464 -1.9338602,-1.393928 C 9.8926348,9.220696 9.819835,8.832897 9.7904351,8.363432 V 8.362965 C 10.503966,7.7651672 10.944031,6.8285703 10.968765,5.8700401 11.247364,5.6651742 11.372897,5.0865094 11.28843,4.648311 11.230564,4.3482453 10.990698,4.1317127 10.706032,4.0850462 10.599632,3.5283147 10.487633,2.93985 10.435366,2.6654509 10.121301,1.0199896 8.5327726,-0.05940684 6.8873113,0.25419216 5.2418501,0.56779106 4.1624536,2.1567859 4.4760526,3.8022471 4.5283191,4.0766462 4.6407854,4.665111 4.7467184,5.2218423 4.4989192,5.3697751 4.355653,5.6595742 4.4125861,5.9596399 4.4956525,6.3983051 4.8255848,6.8901701 5.159717,6.9779032 5.2950499,7.2952355 5.4798493,7.5892345 5.7015152,7.8510336 L 5.7999816,8.136166 5.2171168,11.699621 3.2925898,12.11822 C 3.041524,12.177953 2.8109914,12.278752 2.6061254,12.411752 1.8342613,12.912484 1.5458622,13.865414 1.7731282,14.725478 1.8309946,14.943877 2.8833245,17.9338 2.8833245,17.9338 H 15.133284 l 0.408332,-1.691661 3.480855,0.605265 c 1.184397,0.211399 2.267993,-0.748064 2.171393,-1.974927 z"
-     id="path16"
-     style="fill:#f59119;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="m 12.589026,15.06801 -2.251659,-0.776531 c 0,0 0.96693,-0.1106 0.95853,-0.625798 -4.67e-4,-0.03687 -0.01213,-0.240332 -0.307999,-0.210932 -0.0812,0.0079 -0.734064,0.07327 -1.1927962,0.118999 -0.3028657,0.03033 -0.6015314,0.09007 -0.8927304,0.178733 l -0.1591328,0.04853 -3.5256551,-2.101393 c 0,0 0,0 0.3495322,-0.763464 C 6.1779803,9.600561 5.8004482,8.136166 5.8004482,8.136166 L 1.324663,10.373825 C 0.63539857,10.718224 0.2,11.422889 0.2,12.193819 c 0,0.939397 0.64306455,1.756528 1.5558615,1.977727 l 6.4357789,1.371062 2.5834586,0.955731 c 0.167999,0.0532 0.329932,0.0602 0.517065,0.0033 0.187599,-0.05693 0.246399,-0.09847 0.337398,-0.165199 0.2464,-0.180133 0.706065,-0.536665 1.037864,-0.795664 0.170799,-0.133933 0.125533,-0.402266 -0.0784,-0.472732 z"
-     id="path21"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-</svg>

damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="11.106925"
-   height="18"
-   viewBox="0 0 2.9387073 4.7624999"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   sodipodi:docname="zapathon.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="16"
-     inkscape:cx="16.96875"
-     inkscape:cy="9.96875"
-     inkscape:window-width="1406"
-     inkscape:window-height="767"
-     inkscape:window-x="1741"
-     inkscape:window-y="214"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.993855,-8.058313)">
-    <g
-       transform="matrix(0.01604881,0,0,-0.01604881,10.573102,13.422443)"
-       id="g10"
-       inkscape:label="Bolt"
-       style="display:inline">
-      <path
-         id="path14"
-         style="fill:#c98f19;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
-         d="m 94.833712,155.13322 -8.129016,18.00903 -55.167069,-3.59001 18.868958,-24.19503 44.825648,2.77303 z m 83.691438,80.98476 -8.89814,-11.93085 -11.755,-16.519 -1.505,-2.114 -43.191,-60.691 L 63.081111,74.14633 79.705774,38.853232 C 121.34411,95.870625 162.2814,153.39008 203.27601,210.87013 Z m -22.57414,11.14115 12.32197,61.15287 -21.22997,22.33399 -17.432,-69.53486 -7.0256,-30.70796 27.52164,-9.9823 5.84396,26.73826"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path16"
-         style="fill:#fadf05;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
-         d="m 178.78514,236.43412 -5.679,-0.377 -8.065,-0.533 -5.9,-0.389 -33.394,-2.212 6.162,29.388 6.223,29.667 8.95029,38.92409 -54.426393,-75.90909 -61.5969,-86.55 44.1332,2.921 8.9137,0.589 -6.1723,-29.396 -0.9867,-4.71 -1.5106,-7.209 -11.7273,-55.917704 16.3074,22.9175 37.169603,52.234204 43.189,60.693 1.505,2.113 16.907,23.756 h -0.002"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-    </g>
-  </g>
-</svg>

damus/Assets.xcassets/Profile/ic-copy.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "bitcoin-logo.svg",
+      "filename" : "ic-copy.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

damus/Assets.xcassets/Profile/ic-key.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "coffee.svg",
+      "filename" : "ic-key.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "coffee.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "coffee.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }

damus/Assets.xcassets/Profile/ic-message.imageset/Contents.json

@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-message-black.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic-message-white 1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Profile/ic-nipverified.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "zapathon.svg",
+      "filename" : "ic-nipverified.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "zapathon.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "zapathon.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }