DM Message Requests

Put strangers in a different tab

Changelog-Added: Add DM Message Requests

damus/Views/DirectMessagesView.swift

@@ -7,15 +7,26 @@
 
 import SwiftUI
 
+enum DMType: Hashable {
+    case rando
+    case friend
+}
+
 struct DirectMessagesView: View {
     let damus_state: DamusState
     
+    @State var dm_type: DMType = .friend
     @State var open_dm: Bool = false
     @State var pubkey: String = ""
-    @State var active_model: DirectMessageModel = DirectMessageModel()
     @EnvironmentObject var model: DirectMessagesModel
+    @State var active_model: DirectMessageModel
     
-    var MainContent: some View {
+    init(damus_state: DamusState) {
+        self.damus_state = damus_state
+        self._active_model = State(initialValue: DirectMessageModel(our_pubkey: damus_state.pubkey))
+    }
+    
+    func MainContent(requests: Bool) -> some View {
         ScrollView {
             let chat = DMChatView(damus_state: damus_state, pubkey: pubkey)
                 .environmentObject(active_model)
@@ -26,13 +37,12 @@ struct DirectMessagesView: View {
                 if model.dms.isEmpty, !model.loading {
                     EmptyTimelineView()
                 } else {
-                    ForEach(model.dms, id: \.0) { tup in
+                    let dms = requests ? model.message_requests : model.friend_dms
+                    ForEach(dms, id: \.0) { tup in
                         MaybeEvent(tup)
                     }
                 }
             }
-            .padding(.horizontal)
-            .padding(.top)
         }
     }
     
@@ -52,8 +62,29 @@ struct DirectMessagesView: View {
     }
     
     var body: some View {
-        MainContent
-            .navigationTitle(NSLocalizedString("Encrypted DMs", comment: "Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message."))
+        VStack {
+            Picker(NSLocalizedString("DM Type", comment: "DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet."), selection: $dm_type) {
+                Text("DMs")
+                    .tag(DMType.friend)
+                
+                Text("Requests")
+                    .tag(DMType.rando)
+                
+            }
+            .pickerStyle(.segmented)
+            
+            TabView(selection: $dm_type) {
+                MainContent(requests: false)
+                    .tag(DMType.friend)
+                
+                MainContent(requests: true)
+                    .tag(DMType.rando)
+            }
+            .tabViewStyle(.page(indexDisplayMode: .never))
+        }
+        .padding(.horizontal)
+        .padding(.top)
+        .navigationTitle(NSLocalizedString("Encrypted DMs", comment: "Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message."))
     }
 }
 
@@ -63,8 +94,9 @@ struct DirectMessagesView_Previews: PreviewProvider {
                                pubkey: "pubkey",
                                kind: 4,
                                tags: [])
-        let model = DirectMessageModel(events: [ev])
-        DirectMessagesView(damus_state: test_damus_state())
+        let ds = test_damus_state()
+        let model = DirectMessageModel(events: [ev], our_pubkey: ds.pubkey)
+        DirectMessagesView(damus_state: ds)
             .environmentObject(model)
     }
 }