Change spaces to newlines in new posts to provide cleaner separation between text, uploaded media, and quoted notes

Changelog-Changed: Changed spaces to newlines in new posts to provide cleaner separation between text, uploaded media, and quoted notes
Signed-off-by: Terry Yiu <git@tyiu.xyz>

.github/pull_request_template.md

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

TODO

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

damus/Models/ContentFilters.swift

@@ -10,8 +10,9 @@ import Foundation
 
 /// Simple filter to determine whether to show posts or all posts and replies.
 enum FilterState : Int {
-    case posts_and_replies = 1
     case posts = 0
+    case posts_and_replies = 1
+    case conversations = 2
 
     func filter(ev: NostrEvent) -> Bool {
         switch self {
@@ -19,6 +20,8 @@ enum FilterState : Int {
             return ev.known_kind == .boost || ev.known_kind == .highlight || !ev.is_reply()
         case .posts_and_replies:
             return true
+        case .conversations:
+            return true
         }
     }
 }

damus/Models/ProfileModel.swift

@@ -22,8 +22,10 @@ class ProfileModel: ObservableObject, Equatable {
     var seen_event: Set<NoteId> = Set()
     var sub_id = UUID().description
     var prof_subid = UUID().description
+    var conversations_subid = UUID().description
     var findRelay_subid = UUID().description
-    
+    var conversation_events: Set<NoteId> = Set()
+
     init(pubkey: Pubkey, damus: DamusState) {
         self.pubkey = pubkey
         self.damus = damus
@@ -59,6 +61,9 @@ class ProfileModel: ObservableObject, Equatable {
         print("unsubscribing from profile \(pubkey) with sub_id \(sub_id)")
         damus.pool.unsubscribe(sub_id: sub_id)
         damus.pool.unsubscribe(sub_id: prof_subid)
+        if pubkey != damus.pubkey {
+            damus.pool.unsubscribe(sub_id: conversations_subid)
+        }
     }
 
     func subscribe() {
@@ -69,13 +74,29 @@ class ProfileModel: ObservableObject, Equatable {
         
         text_filter.authors = [pubkey]
         text_filter.limit = 500
-        
-        print("subscribing to profile \(pubkey) with sub_id \(sub_id)")
+
+        print("subscribing to textlike events from profile \(pubkey) with sub_id \(sub_id)")
         //print_filters(relay_id: "profile", filters: [[text_filter], [profile_filter]])
         damus.pool.subscribe(sub_id: sub_id, filters: [text_filter], handler: handle_event)
         damus.pool.subscribe(sub_id: prof_subid, filters: [profile_filter], handler: handle_event)
+
+        subscribe_to_conversations()
     }
-    
+
+    private func subscribe_to_conversations() {
+        // Only subscribe to conversation events if the profile is not us.
+        guard pubkey != damus.pubkey else {
+            return
+        }
+
+        let conversation_kinds: [NostrKind] = [.text, .longform, .highlight]
+        let limit: UInt32 = 500
+        let conversations_filter_them = NostrFilter(kinds: conversation_kinds, pubkeys: [damus.pubkey], limit: limit, authors: [pubkey])
+        let conversations_filter_us = NostrFilter(kinds: conversation_kinds, pubkeys: [pubkey], limit: limit, authors: [damus.pubkey])
+        print("subscribing to conversation events from and to profile \(pubkey) with sub_id \(conversations_subid)")
+        damus.pool.subscribe(sub_id: conversations_subid, filters: [conversations_filter_them, conversations_filter_us], handler: handle_event)
+    }
+
     func handle_profile_contact_event(_ ev: NostrEvent) {
         process_contact_event(state: damus, ev: ev)
         
@@ -90,15 +111,8 @@ class ProfileModel: ObservableObject, Equatable {
         self.following = count_pubkeys(ev.tags)
         self.relays = decode_json_relays(ev.content)
     }
-    
-    func add_event(_ ev: NostrEvent) {
-        guard ev.should_show_event else {
-            return
-        }
 
-        if seen_event.contains(ev.id) {
-            return
-        }
+    private func add_event(_ ev: NostrEvent) {
         if ev.is_textlike || ev.known_kind == .boost {
             if self.events.insert(ev) {
                 self.objectWillChange.send()
@@ -109,24 +123,57 @@ class ProfileModel: ObservableObject, Equatable {
         seen_event.insert(ev.id)
     }
 
+    // Ensure the event public key matches the public key(s) we are querying.
+    // This is done to protect against a relay not properly filtering events by the pubkey
+    // See https://github.com/damus-io/damus/issues/1846 for more information
+    private func relay_filtered_correctly(_ ev: NostrEvent, subid: String?) -> Bool {
+        if subid == self.conversations_subid {
+            switch ev.pubkey {
+            case self.pubkey:
+                return ev.referenced_pubkeys.contains(damus.pubkey)
+            case damus.pubkey:
+                return ev.referenced_pubkeys.contains(self.pubkey)
+            default:
+                return false
+            }
+        }
+
+        return self.pubkey == ev.pubkey
+    }
+
     private func handle_event(relay_id: RelayURL, ev: NostrConnectionEvent) {
         switch ev {
         case .ws_event:
             return
         case .nostr_event(let resp):
-            guard resp.subid == self.sub_id || resp.subid == self.prof_subid else {
+            guard resp.subid == self.sub_id || resp.subid == self.prof_subid || resp.subid == self.conversations_subid else {
                 return
             }
             switch resp {
             case .ok:
                 break
             case .event(_, let ev):
-                // Ensure the event public key matches this profiles public key
-                // This is done to protect against a relay not properly filtering events by the pubkey
-                // See https://github.com/damus-io/damus/issues/1846 for more information
-                guard self.pubkey == ev.pubkey else { break }
+                guard ev.should_show_event else {
+                    break
+                }
 
-                add_event(ev)
+                if !seen_event.contains(ev.id) {
+                    guard relay_filtered_correctly(ev, subid: resp.subid) else {
+                        break
+                    }
+
+                    add_event(ev)
+
+                    if resp.subid == self.conversations_subid {
+                        conversation_events.insert(ev.id)
+                    }
+                } else if resp.subid == self.conversations_subid && !conversation_events.contains(ev.id) {
+                    guard relay_filtered_correctly(ev, subid: resp.subid) else {
+                        break
+                    }
+
+                    conversation_events.insert(ev.id)
+                }
             case .notice:
                 break
                 //notify(.notice, notice)

damus/Views/Notifications/NotificationsView.swift

@@ -60,21 +60,8 @@ struct NotificationsView: View {
     
     @Environment(\.colorScheme) var colorScheme
     
-    var mystery: some View {
-        let profile_txn = state.profiles.lookup(id: state.pubkey)
-        let profile = profile_txn?.unsafeUnownedValue
-        return VStack(spacing: 20) {
-            Text("Wake up, \(Profile.displayName(profile: profile, pubkey: state.pubkey).displayName.truncate(maxLength: 50))", comment: "Text telling the user to wake up, where the argument is their display name.")
-            Text("You are dreaming...", comment: "Text telling the user that they are dreaming.")
-        }
-        .id("what")
-    }
-    
     var body: some View {
         TabView(selection: $filter_state) {
-            // This is needed or else there is a bug when switching from the 3rd or 2nd tab to first. no idea why.
-            mystery
-            
             NotificationTab(
                 NotificationFilter(
                     state: .all,

damus/Views/PostView.swift

@@ -865,33 +865,29 @@ func build_post(state: DamusState, post: NSAttributedString, action: PostAction,
 
 
     var content = post.string
-        .trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+        .trimmingCharacters(in: .whitespacesAndNewlines)
 
-    let imagesString = uploadedMedias.map { $0.uploadedURL.absoluteString }.joined(separator: " ")
+    let imagesString = uploadedMedias.map { $0.uploadedURL.absoluteString }.joined(separator: "\n")
 
     if !imagesString.isEmpty {
-        content.append(" " + imagesString + " ")
+        content.append("\n\n" + imagesString)
     }
 
     var tags: [[String]] = []
 
     switch action {
-        case .replying_to(let replying_to):
-            // start off with the reply tags
-            tags = nip10_reply_tags(replying_to: replying_to, keypair: state.keypair)
+    case .replying_to(let replying_to):
+        // start off with the reply tags
+        tags = nip10_reply_tags(replying_to: replying_to, keypair: state.keypair)
 
-        case .quoting(let ev):
-            content.append(" nostr:" + bech32_note_id(ev.id))
+    case .quoting(let ev):
+        content.append("\n\nnostr:" + bech32_note_id(ev.id))
 
-            if let quoted_ev = state.events.lookup(ev.id) {
-                tags.append(["p", quoted_ev.pubkey.hex()])
-            }
-        case .posting(let postTarget):
-            break
-        case .highlighting(let draft):
-            break
-        case .sharing(_):
-            break
+        if let quoted_ev = state.events.lookup(ev.id) {
+            tags.append(["p", quoted_ev.pubkey.hex()])
+        }
+    case .posting, .highlighting, .sharing:
+        break
     }
 
     // append additional tags
@@ -913,7 +909,7 @@ func build_post(state: DamusState, post: NSAttributedString, action: PostAction,
             }
     }
 
-    return NostrPost(content: content, kind: .text, tags: tags)
+    return NostrPost(content: content.trimmingCharacters(in: .whitespacesAndNewlines), kind: .text, tags: tags)
 }
 
 func isSupportedVideo(url: URL?) -> Bool {

damus/Views/Profile/ProfileView.swift

@@ -122,6 +122,9 @@ struct ProfileView: View {
     func content_filter(_ fstate: FilterState) -> ((NostrEvent) -> Bool) {
         var filters = ContentFilters.defaults(damus_state: damus_state)
         filters.append(fstate.filter)
+        if fstate == .conversations {
+            filters.append({ profile.conversation_events.contains($0.id) } )
+        }
         return ContentFilters(filters: filters).filter
     }
 
@@ -429,6 +432,17 @@ struct ProfileView: View {
         .padding(.horizontal)
     }
 
+    var tabs: [(String, FilterState)] {
+        var tabs = [
+            (NSLocalizedString("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies)."), FilterState.posts),
+            (NSLocalizedString("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes)."), FilterState.posts_and_replies)
+        ]
+        if profile.pubkey != damus_state.pubkey && !profile.conversation_events.isEmpty {
+            tabs.append((NSLocalizedString("Conversations", comment: "Label for filter for seeing notes and replies that involve conversations between the signed in user and the current profile."), FilterState.conversations))
+        }
+        return tabs
+    }
+
     var body: some View {
         ZStack {
             ScrollView(.vertical) {
@@ -440,10 +454,7 @@ struct ProfileView: View {
                         aboutSection
 
                         VStack(spacing: 0) {
-                            CustomPicker(tabs: [
-                                (NSLocalizedString("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies)."), FilterState.posts),
-                                (NSLocalizedString("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes)."), FilterState.posts_and_replies)
-                            ], selection: $filter_state)
+                            CustomPicker(tabs: tabs, selection: $filter_state)
                             Divider()
                                 .frame(height: 1)
                         }
@@ -455,6 +466,9 @@ struct ProfileView: View {
                         if filter_state == FilterState.posts_and_replies {
                             InnerTimelineView(events: profile.events, damus: damus_state, filter: content_filter(FilterState.posts_and_replies))
                         }
+                        if filter_state == FilterState.conversations && !profile.conversation_events.isEmpty {
+                            InnerTimelineView(events: profile.events, damus: damus_state, filter: content_filter(FilterState.conversations))
+                        }
                     }
                     .padding(.horizontal, Theme.safeAreaInsets?.left)
                     .zIndex(-yOffset > navbarHeight ? 0 : 1)

damus/Views/Timeline/PostingTimelineView.swift

@@ -25,11 +25,6 @@ struct PostingTimelineView: View {
     @State var headerHeight: CGFloat = 0
     @Binding var headerOffset: CGFloat
     @SceneStorage("PostingTimelineView.filter_state") var filter_state : FilterState = .posts_and_replies
-    
-    var mystery: some View {
-        Text("Are you lost?", comment: "Text asking the user if they are lost in the app.")
-        .id("what")
-    }
 
     func content_filter(_ fstate: FilterState) -> ((NostrEvent) -> Bool) {
         var filters = ContentFilters.defaults(damus_state: damus_state)
@@ -95,9 +90,6 @@ struct PostingTimelineView: View {
         VStack {
             ZStack {
                 TabView(selection: $filter_state) {
-                    // This is needed or else there is a bug when switching from the 3rd or 2nd tab to first. no idea why.
-                    mystery
-                    
                     contentTimelineView(filter: content_filter(.posts))
                         .tag(FilterState.posts)
                         .id(FilterState.posts)