Fix reposts on macos

damus/Views/ActionBar/EventActionBar.swift

@@ -8,46 +8,26 @@
 import SwiftUI
 import UIKit
 
-enum ActionBarSheet: Identifiable {
-    case reply
-
-    var id: String {
-        switch self {
-        case .reply: return "reply"
-        }
-    }
-}
 
 struct EventActionBar: View {
     let damus_state: DamusState
     let event: NostrEvent
-    let test_lnurl: String?
     let generator = UIImpactFeedbackGenerator(style: .medium)
     
     // just used for previews
-    @State var sheet: ActionBarSheet? = nil
     @State var show_share_sheet: Bool = false
     @State var show_share_action: Bool = false
-    
-    @ObservedObject var bar: ActionBarModel
-    @ObservedObject var settings: UserSettingsStore
+    @State var show_repost_action: Bool = false
+    @State var bar: ActionBarModel = ActionBarModel()
     
     @Environment(\.colorScheme) var colorScheme
     
-    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil, test_lnurl: String? = nil) {
-        self.damus_state = damus_state
-        self.event = event
-        self.test_lnurl = test_lnurl
-        _bar = ObservedObject(wrappedValue: bar ?? make_actionbar_model(ev: event.id, damus: damus_state))
-        _settings = ObservedObject(wrappedValue: damus_state.settings)
-    }
-    
     var lnurl: String? {
-        test_lnurl ?? damus_state.profiles.lookup(id: event.pubkey)?.lnurl
+        damus_state.profiles.lookup(id: event.pubkey)?.lnurl
     }
     
     var show_like: Bool {
-        if settings.onlyzaps_mode {
+        if damus_state.settings.onlyzaps_mode {
             return false
         }
         
@@ -59,7 +39,7 @@ struct EventActionBar: View {
             if damus_state.keypair.privkey != nil {
                 HStack(spacing: 4) {
                     EventActionButton(img: "bubble.left", col: bar.replied ? DamusColors.purple : Color.gray) {
-                        notify(.reply, event)
+                        notify(.compose, PostAction.replying_to(event))
                     }
                     .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
                     Text(verbatim: "\(bar.replies > 0 ? "\(bar.replies)" : "")")
@@ -74,7 +54,7 @@ struct EventActionBar: View {
                     if bar.boosted {
                         notify(.delete, bar.our_boost)
                     } else {
-                        send_boost()
+                        self.show_repost_action = true
                     }
                 }
                 .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
@@ -112,26 +92,35 @@ struct EventActionBar: View {
             }
             .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
         }
-        .sheet(isPresented: $show_share_action) {
+        .onAppear {
+            self.bar.update(damus: damus_state, evid: self.event.id)
+        }
+        .sheet(isPresented: $show_share_action, onDismiss: { self.show_share_action = false }) {
             if #available(iOS 16.0, *) {
-                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share_sheet: $show_share_sheet, show_share_action: $show_share_action)
+                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share: $show_share_sheet)
                     .presentationDetents([.height(300)])
                     .presentationDragIndicator(.visible)
             } else {
-                if let note_id = bech32_note_id(event.id) {
-                    if let url = URL(string: "https://damus.io/" + note_id) {
-                        ShareSheet(activityItems: [url])
-                    }
-                }
+                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share: $show_share_sheet)
             }
         }
-        .sheet(isPresented: $show_share_sheet) {
+        .sheet(isPresented: $show_share_sheet, onDismiss: { self.show_share_sheet = false }) {
             if let note_id = bech32_note_id(event.id) {
                 if let url = URL(string: "https://damus.io/" + note_id) {
                     ShareSheet(activityItems: [url])
                 }
             }
         }
+        .sheet(isPresented: $show_repost_action, onDismiss: { self.show_repost_action = false }) {
+        
+            if #available(iOS 16.0, *) {
+                RepostAction(damus_state: self.damus_state, event: event)
+                    .presentationDetents([.height(300)])
+                    .presentationDragIndicator(.visible)
+            } else {
+                RepostAction(damus_state: self.damus_state, event: event)
+            }
+        }
         .onReceive(handle_notify(.update_stats)) { n in
             let target = n.object as! String
             guard target == self.event.id else { return }
@@ -149,10 +138,6 @@ struct EventActionBar: View {
         }
     }
     
-    func send_boost() {
-        notify(.boost, self.event)
-    }
-    
     func send_like() {
         guard let privkey = damus_state.keypair.privkey else {
             return
@@ -254,8 +239,6 @@ struct EventActionBar_Previews: PreviewProvider {
             EventActionBar(damus_state: ds, event: ev, bar: extra_max_bar)
 
             EventActionBar(damus_state: ds, event: ev, bar: mega_max_bar)
-            
-            EventActionBar(damus_state: ds, event: ev, bar: zapbar, test_lnurl: "lnurl")
         }
         .padding(20)
     }