Vine proof of concept view + upload/record

.beads/metadata.json

@@ -0,0 +1,4 @@
+{
+  "database": "beads.db",
+  "jsonl_export": "issues.jsonl"
+}

.gitignore

@@ -7,3 +7,6 @@ TODO.bak
 tags
 build-git-hash.txt
 .build
+.beads/*.db
+.beads/*.db-shm
+.beads/*.db-wal

AGENTS.md

@@ -44,4 +44,30 @@ Damus is an iOS client built around a local relay model ([damus-io/damus#3204](h
 7. Review and follow `pull_request_template.md` when creating PRs for iOS Damus.
 8. Ensure nevernesting: favor early returns and guard clauses over deeply nested conditionals; simplify control flow by exiting early instead of wrapping logic in multiple layers of `if` statements.
 9. Before proposing changes, please **review and analyze if a change or upgrade to nostrdb** is beneficial to the change at hand.
-10. **Never block the main thread**: All network requests, database queries, and expensive computations must run on background threads/queues. Use `Task { }`, `DispatchQueue.global()`, or Swift concurrency (`async/await`) appropriately. UI updates must dispatch back to `@MainActor`. Test for hangs and freezes before submitting.      
+10. **Never block the main thread**: All network requests, database queries, and expensive computations must run on background threads/queues. Use `Task { }`, `DispatchQueue.global()`, or Swift concurrency (`async/await`) appropriately. UI updates must dispatch back to `@MainActor`. Test for hangs and freezes before submitting.
+
+## Landing the Plane (Session Completion)
+
+**When ending a work session**, you MUST complete ALL steps below. Work is NOT complete until `git push` succeeds.
+
+**MANDATORY WORKFLOW:**
+
+1. **File issues for remaining work** - Create issues for anything that needs follow-up
+2. **Run quality gates** (if code changed) - Tests, linters, builds
+3. **Update issue status** - Close finished work, update in-progress items
+4. **PUSH TO REMOTE** - This is MANDATORY:
+   ```bash
+   git pull --rebase
+   bd sync
+   git push
+   git status  # MUST show "up to date with origin"
+   ```
+5. **Clean up** - Clear stashes, prune remote branches
+6. **Verify** - All changes committed AND pushed
+7. **Hand off** - Provide context for next session
+
+**CRITICAL RULES:**
+- Work is NOT complete until `git push` succeeds
+- NEVER stop before pushing - that leaves work stranded locally
+- NEVER say "ready to push when you are" - YOU must push
+- If push fails, resolve and retry until it succeeds

damus/Assets.xcassets/iconography/vine.fill.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images": [
+    {
+      "filename": "vine.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "vine.fill.svg"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "vine.fill.svg"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "properties": {
+    "template-rendering-intent": "template"
+  }
+}

damus/Assets.xcassets/iconography/vine.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images": [
+    {
+      "filename": "vine.svg",
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "vine.svg"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "vine.svg"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "properties": {
+    "template-rendering-intent": "template"
+  }
+}

damus/ContentView.swift

@@ -162,7 +162,8 @@ struct ContentView: View {
     }
 
     func MainContent(damus: DamusState) -> some View {
-        VStack {
+        let immersiveTimeline = selected_timeline == .home || selected_timeline == .vines
+        return VStack {
             switch selected_timeline {
             case .search:
                 if #available(iOS 16.0, *) {
@@ -176,6 +177,13 @@ struct ContentView: View {
             case .home:
                 PostingTimelineView(damus_state: damus_state!, home: home, homeEvents: home.events, isSideBarOpened: $isSideBarOpened, active_sheet: $active_sheet, headerOffset: $headerOffset)
 
+            case .vines:
+                if damus_state.settings.vines_feature_enabled {
+                    VineTimelineView(damus_state: damus_state!)
+                } else {
+                    PostingTimelineView(damus_state: damus_state!, home: home, homeEvents: home.events, isSideBarOpened: $isSideBarOpened, active_sheet: $active_sheet, headerOffset: $headerOffset)
+                }
+
             case .notifications:
                 NotificationsView(state: damus, notifications: home.notifications, subtitle: $menu_subtitle)
 
@@ -184,9 +192,9 @@ struct ContentView: View {
             }
         }
         .background(DamusColors.adaptableWhite)
-        .edgesIgnoringSafeArea(selected_timeline != .home ? [] : [.top, .bottom])
+        .edgesIgnoringSafeArea(immersiveTimeline ? [.top, .bottom] : [])
         .navigationBarTitle(timeline_name(selected_timeline), displayMode: .inline)
-        .toolbar(selected_timeline != .home ? .visible : .hidden)
+        .toolbar(immersiveTimeline ? .hidden : .visible)
         .toolbar {
             ToolbarItem(placement: .principal) {
                 VStack {
@@ -199,6 +207,18 @@ struct ContentView: View {
         .onAppear {
             notify(.display_tabbar(true))
         }
+        .onChange(of: damus.settings.vines_feature_enabled) { enabled in
+            // Fall back to home timeline if vines are disabled while viewing vines
+            if !enabled && selected_timeline == .vines {
+                selected_timeline = .home
+            }
+        }
+        .onChange(of: selected_timeline) { timeline in
+            // Fall back to home timeline if switching to vines when feature is disabled
+            if timeline == .vines && !damus.settings.vines_feature_enabled {
+                selected_timeline = .home
+            }
+        }
     }
 
     func MaybeReportView(target: ReportTarget) -> some View {
@@ -233,7 +253,9 @@ struct ContentView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
+        let immersiveTimeline = selected_timeline == .home || selected_timeline == .vines
+
+        return VStack(alignment: .leading, spacing: 0) {
             if let damus = self.damus_state {
                 NavigationStack(path: $navigationCoordinator.path) {
                     TabView { // Prevents navbar appearance change on scroll
@@ -262,7 +284,7 @@ struct ContentView: View {
                             }
                     }
                     .background(DamusColors.adaptableWhite)
-                    .edgesIgnoringSafeArea(selected_timeline != .home ? [] : [.top, .bottom])
+                    .edgesIgnoringSafeArea(immersiveTimeline ? [.top, .bottom] : [])
                     .tabViewStyle(.page(indexDisplayMode: .never))
                     .overlay(
                         SideMenuView(damus_state: damus_state!, isSidebarVisible: $isSideBarOpened.animation(), selected: $selected_timeline)
@@ -283,7 +305,7 @@ struct ContentView: View {
                         if !isSideBarOpened {
                             TabBar(nstatus: home.notification_status, navIsAtRoot: navIsAtRoot(), selected: $selected_timeline, headerOffset: $headerOffset, settings: damus.settings, action: switch_timeline)
                                 .padding([.bottom], 8)
-                                .background(selected_timeline != .home || (selected_timeline == .home && !self.navIsAtRoot()) ? DamusColors.adaptableWhite : DamusColors.adaptableWhite.opacity(abs(1.25 - (abs(headerOffset/100.0)))))
+                                .background(!immersiveTimeline || !self.navIsAtRoot() ? DamusColors.adaptableWhite : DamusColors.adaptableWhite.opacity(abs(1.25 - (abs(headerOffset/100.0)))))
                                 .anchorPreference(key: HeaderBoundsKey.self, value: .bounds){$0}
                                 .overlayPreferenceValue(HeaderBoundsKey.self) { value in
                                     GeometryReader{ proxy in
@@ -1005,6 +1027,8 @@ func timeline_name(_ timeline: Timeline?) -> String {
     switch timeline {
     case .home:
         return NSLocalizedString("Home", comment: "Navigation bar title for Home view where notes and replies appear from those who the user is following.")
+    case .vines:
+        return NSLocalizedString("Vines", comment: "Navigation bar title for Vine video feed.")
     case .notifications:
         return NSLocalizedString("Notifications", comment: "Toolbar label for Notifications view.")
     case .search:

damus/Core/Networking/NostrNetworkManager/NostrNetworkManager.swift

@@ -44,6 +44,11 @@ class NostrNetworkManager {
     private var connectionContinuations: [UUID: CheckedContinuation<Void, Never>] = [:]
     /// A lock to ensure thread-safe access to the continuations dictionary and connection state
     private let continuationsLock = NSLock()
+
+    /// Tracks relays that were added by features (not user-configured) so we can safely remove them
+    /// without deleting user's relay configuration.
+    /// Isolated to `@MainActor` for thread-safe access without locks.
+    @MainActor private var featureManagedRelays: Set<RelayURL> = []
 
     init(delegate: Delegate, addNdbToRelayPool: Bool = true) {
         self.delegate = delegate
@@ -264,6 +269,48 @@ class NostrNetworkManager {
             .filter { !filters.is_filtered(timeline: .search, relay_id: $0) }
     }
 
+    /// Ensures the relay pool is connected to a specific relay, adding it if necessary.
+    ///
+    /// Used by feature-specific code (e.g., Vines) to connect to relays that are
+    /// not part of the user's configured relay list. Tracks the relay so that
+    /// ``disconnectRelay(_:)`` can safely remove it later.
+    func ensureRelayConnected(_ relayURL: RelayURL) async {
+        if await pool.get_relay(relayURL) != nil {
+            await MainActor.run { featureManagedRelays.insert(relayURL) }
+            return
+        }
+
+        let descriptor = RelayPool.RelayDescriptor(url: relayURL, info: .readWrite)
+        do {
+            try await pool.add_relay(descriptor)
+        } catch {
+            // If the relay already exists we can still connect to it;
+            // for any other error, log and bail out.
+            let isAlreadyAdded = await pool.get_relay(relayURL) != nil
+            if !isAlreadyAdded {
+                Log.debug("Failed to add relay %s: %s", for: .networking, relayURL.id as CVarArg, error.localizedDescription)
+                return
+            }
+        }
+        await MainActor.run { featureManagedRelays.insert(relayURL) }
+        await pool.connect(to: [relayURL])
+    }
+
+    /// Disconnects and removes a relay that was previously added via ``ensureRelayConnected(_:)``.
+    ///
+    /// Only removes relays tracked as feature-managed — user-configured relays are left untouched.
+    func disconnectRelay(_ relayURL: RelayURL) async {
+        let isFeatureManaged = await MainActor.run { featureManagedRelays.contains(relayURL) }
+        guard isFeatureManaged else {
+            Log.debug("Skipping removal of relay %s - not feature-managed", for: .networking, relayURL.id as CVarArg)
+            return
+        }
+
+        guard await pool.get_relay(relayURL) != nil else { return }
+        await pool.remove_relay(relayURL)
+        await MainActor.run { featureManagedRelays.remove(relayURL) }
+    }
+
     // MARK: NWC
     // TODO: Move this to NWCManager
 

damus/Core/Nostr/NostrKind.swift

@@ -25,6 +25,7 @@ enum NostrKind: UInt32, Codable {
     case list_deprecated = 30000
     case draft = 31234
     case longform = 30023
+    case vine_short = 34236
     case zap = 9735
     case zap_request = 9734
     case highlight = 9802

damus/Core/Nostr/RelayURL.swift

@@ -88,6 +88,11 @@ public struct RelayURL: Hashable, Equatable, Codable, CodingKeyRepresentable, Id
 
 }
 
+extension RelayURL {
+    /// Shared relay used by the Vine short-video feed.
+    static let vineRelay = RelayURL("wss://relay.divine.video")!
+}
+
 private struct StringKey: CodingKey {
     var stringValue: String
     init(stringValue: String) {

damus/Features/Events/Models/LoadableNostrEventView.swift

@@ -93,7 +93,7 @@ class LoadableNostrEventViewModel: ObservableObject {
             case .zap, .zap_request:
                 guard let zap = await get_zap(from: ev, state: damus_state) else { return .not_found }
                 return .loaded(route: Route.Zaps(target: zap.target))
-            case .contacts, .metadata, .delete, .boost, .chat, .mute_list, .list_deprecated, .draft, .nwc_request, .nwc_response, .http_auth, .status, .relay_list, .follow_list, .interest_list, .contact_card, .live, .live_chat:
+            case .contacts, .metadata, .delete, .boost, .chat, .mute_list, .list_deprecated, .draft, .nwc_request, .nwc_response, .http_auth, .status, .relay_list, .follow_list, .interest_list, .contact_card, .live, .live_chat, .vine_short:
                 return .unknown_or_unsupported_kind
             }
         case .naddr(let naddr):

damus/Features/Follows/Models/Contacts.swift

@@ -30,8 +30,8 @@ class Contacts {
     func remove_friend(_ pubkey: Pubkey) {
         friends.remove(pubkey)
 
-        pubkey_to_our_friends.forEach {
-            pubkey_to_our_friends[$0.key]?.remove(pubkey)
+        for key in pubkey_to_our_friends.keys {
+            pubkey_to_our_friends[key]?.remove(pubkey)
         }
     }
 
@@ -56,7 +56,7 @@ class Contacts {
     func add_friend_pubkey(_ pubkey: Pubkey) {
         friends.insert(pubkey)
     }
-    
+
     func add_friend_contact(_ contact: NostrEvent) {
         friends.insert(contact.pubkey)
         for pk in contact.referenced_pubkeys {
@@ -76,7 +76,7 @@ class Contacts {
     func is_friend_of_friend(_ pubkey: Pubkey) -> Bool {
         return friend_of_friends.contains(pubkey)
     }
-    
+
     func is_in_friendosphere(_ pubkey: Pubkey) -> Bool {
         return friends.contains(pubkey) || friend_of_friends.contains(pubkey)
     }

damus/Features/Labs/Views/DamusLabsExperiments.swift

@@ -13,9 +13,13 @@ struct DamusLabsExperiments: View {
     @ObservedObject var settings: UserSettingsStore
     @State var show_live_explainer: Bool = false
     @State var show_favorites_explainer: Bool = false
+    @State private var show_vines_explainer: Bool = false
+    @State private var show_vine_prefetch_explainer: Bool = false
 
     let live_label = NSLocalizedString("Live", comment: "Label for a toggle that enables an experimental feature")
     let favorites_label = NSLocalizedString("Favorites", comment: "Label for a toggle that enables an experimental feature")
+    let vines_label = NSLocalizedString("Vines", comment: "Label for a toggle that enables an experimental feature")
+    let vines_prefetch_label = NSLocalizedString("Prefetch vines on cellular", comment: "Label for a toggle that allows vine prefetching on cellular.")
 
     var body: some View {
         ScrollView {
@@ -44,6 +48,10 @@ struct DamusLabsExperiments: View {
 
                 LabsToggleView(toggleName: live_label, systemImage: "record.circle", isOn: $settings.live, showInfo: $show_live_explainer)
                 LabsToggleView(toggleName: favorites_label, systemImage: "heart.fill", isOn: $settings.enable_favourites_feature, showInfo: $show_favorites_explainer)
+                LabsToggleView(toggleName: vines_label, systemImage: "video", isOn: $settings.enable_vine_feature, showInfo: $show_vines_explainer)
+                if settings.enable_vine_feature {
+                    LabsToggleView(toggleName: vines_prefetch_label, systemImage: "antenna.radiowaves.left.and.right", isOn: $settings.prefetch_vines_on_cellular, showInfo: $show_vine_prefetch_explainer)
+                }
 
             }
             .padding([.trailing, .leading], 20)
@@ -67,6 +75,18 @@ struct DamusLabsExperiments: View {
                 systemImage: "heart.fill",
                 labDescription: NSLocalizedString("This will allow you to pick users to be part of your favorites list. You can also switch your profile timeline to only see posts from your favorite contacts.", comment: "Damus Labs feature explanation"))
         }
+        .sheet(isPresented: $show_vines_explainer) {
+            LabsExplainerView(
+                labName: vines_label,
+                systemImage: "video",
+                labDescription: NSLocalizedString("Enables the Vines tab so you can browse short Divine videos inside Damus. This is still experimental and requires the Divine relay.", comment: "Damus Labs feature explanation"))
+        }
+        .sheet(isPresented: $show_vine_prefetch_explainer) {
+            LabsExplainerView(
+                labName: vines_prefetch_label,
+                systemImage: "antenna.radiowaves.left.and.right",
+                labDescription: NSLocalizedString("Prefetches upcoming Vines even on cellular connections. This may use additional mobile data.", comment: "Explainer for Vine cellular prefetch toggle."))
+        }
     }
 }
 

damus/Features/Posting/Views/PostView.swift

@@ -604,7 +604,7 @@ struct PostView: View {
                         // initiate asynchronous uploading Task for multiple-images
                         let task = Task {
                             for media in preUploadedMedia {
-                                if let mediaToUpload = generateMediaUpload(media) {
+                                if let mediaToUpload = await generateMediaUpload(media) {
                                     await self.handle_upload(media: mediaToUpload)
                                 }
                             }
@@ -626,10 +626,11 @@ struct PostView: View {
             // This alert seeks confirmation about Image-upload when user taps Paste option
             .alert(NSLocalizedString("Are you sure you want to upload this media?", comment: "Alert message asking if the user wants to upload media."), isPresented: $imageUploadConfirmPasteboard) {
                 Button(NSLocalizedString("Upload", comment: "Button to proceed with uploading."), role: .none) {
-                    if let image = imagePastedFromPasteboard,
-                       let mediaToUpload = generateMediaUpload(image) {
+                    if let image = imagePastedFromPasteboard {
                         let task = Task {
-                            _ = await self.handle_upload(media: mediaToUpload)
+                            if let mediaToUpload = await generateMediaUpload(image) {
+                                _ = await self.handle_upload(media: mediaToUpload)
+                            }
                         }
                         uploadTasks.append(task)
                     }
@@ -641,7 +642,7 @@ struct PostView: View {
                 Button(NSLocalizedString("Upload", comment: "Button to proceed with uploading."), role: .none) {
                     let task = Task {
                         for media in preUploadedMedia {
-                            if let mediaToUpload = generateMediaUpload(media) {
+                            if let mediaToUpload = await generateMediaUpload(media) {
                                 await self.handle_upload(media: mediaToUpload)
                             }
                         }