tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add screen to select individual relays when posting/broadcasting"

Browse Source 
This reverts commit 04759107a2.
This commit is contained in:
William Casarin
2023-02-06 14:40:54 -08:00
parent 04759107a2
commit ae6608cf7d
7 changed files with 40 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/ContentView.swift
View File

@@ -28,14 +28,12 @@ enum Sheets: Identifiable {
case post
case report(ReportTarget)
case reply(NostrEvent)
case broadcast(NostrEvent)
var id: String {
switch self {
case .report: return "report"
case .post: return "post"
case .reply(let ev): return "reply-" + ev.id
case .broadcast(let ev): return "broadcast-" + ev.id
}
}
}
@@ -300,8 +298,6 @@ struct ContentView: View {
PostView(replying_to: nil, references: [], damus_state: damus_state!)
case .reply(let event):
ReplyView(replying_to: event, damus: damus_state!)
case .broadcast(let event):
BroadcastToRelaysView(state: .init(state: damus_state!), broadCastEvent: event)
}
}
.onOpenURL { url in
@@ -359,7 +355,7 @@ struct ContentView: View {
}
.onReceive(handle_notify(.broadcast_event)) { obj in
let ev = obj.object as! NostrEvent
self.active_sheet = .broadcast(ev)
self.damus_state?.pool.send(.event(ev))
}
.onReceive(handle_notify(.unfollow)) { notif in
guard let privkey = self.privkey else {
@@ -419,10 +415,10 @@ struct ContentView: View {
let post_res = obj.object as! NostrPostResult
switch post_res {
case .post(let post, onlyToRelayIds: let relayIds):
case .post(let post):
print("post \(post.content)")
let new_ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
self.damus_state?.pool.send(.event(new_ev), to: relayIds)
self.damus_state?.pool.send(.event(new_ev))
case .cancel:
active_sheet = nil
print("post cancelled")