threads working

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-04-16 15:07:26 -07:00
parent 2676dea140
commit b6421bb5e4
10 changed files with 214 additions and 32 deletions

View File

@@ -9,12 +9,62 @@ import SwiftUI
struct EventDetailView: View {
let event: NostrEvent
let profile: Profile?
var body: some View {
let sub_id = UUID().description
@State var events: [NostrEvent] = []
@State var has_event: [String: ()] = [:]
let pool: RelayPool
let profiles: [String: TimestampedProfile]
func unsubscribe_to_thread() {
print("unsubscribing from thread \(event.id) with sub_id \(sub_id)")
self.pool.send(.unsubscribe(sub_id))
self.pool.remove_handler(sub_id: sub_id)
}
func subscribe_to_thread() {
var ref_events = NostrFilter.filter_text
var events = NostrFilter.filter_text
// TODO: add referenced relays
ref_events.referenced_ids = event.referenced_ids.map { $0.ref_id }
ref_events.referenced_ids!.append(event.id)
events.ids = ref_events.referenced_ids!
print("subscribing to thread \(event.id) with sub_id \(sub_id)")
pool.register_handler(sub_id: sub_id, handler: handle_event)
pool.send(.subscribe(.init(filters: [ref_events, events], sub_id: sub_id)))
}
func handle_event(relay_id: String, ev: NostrConnectionEvent) {
switch ev {
case .ws_event:
break
case .nostr_event(let res):
switch res {
case .event(let sub_id, let ev):
if sub_id != self.sub_id || self.has_event[ev.id] != nil {
return
}
self.add_event(ev)
case .notice(_):
// TODO: handle notices in threads?
break
}
}
}
var NoteBody: some View {
HStack {
let profile = profiles[event.pubkey]?.profile
VStack {
ProfilePicView(picture: profile?.picture, size: 64)
ProfilePicView(picture: profile?.picture, size: 64, highlighted: false)
Spacer()
}
@@ -30,20 +80,50 @@ struct EventDetailView: View {
Text(event.content)
.frame(maxWidth: .infinity, alignment: .leading)
Divider()
.padding([.bottom], 10)
EventActionBar(event: event)
Spacer()
Divider()
.padding([.bottom], 10)
}
}
}
var body: some View {
ScrollView {
ForEach(events, id: \.id) { ev in
let evdet = EventDetailView(event: ev, pool: pool, profiles: profiles)
.navigationBarTitle("Note")
NavigationLink(destination: evdet) {
EventView(event: ev, profile: self.profiles[ev.pubkey]?.profile, highlighted: ev.id == event.id)
}
.buttonStyle(PlainButtonStyle())
//EventView(event: ev, profile: self.profiles[ev.pubkey]?.profile, highlighted: ev.id == event.id)
}
}
.padding()
.onDisappear() {
unsubscribe_to_thread()
}
.onAppear() {
self.add_event(event)
subscribe_to_thread()
}
}
func add_event(_ ev: NostrEvent) {
if self.has_event[ev.id] == nil {
self.has_event[ev.id] = ()
self.events.append(ev)
self.events = self.events.sorted { $0.created_at < $1.created_at }
}
}
}
/*
struct EventDetailView_Previews: PreviewProvider {
static var previews: some View {
EventDetailView(event: NostrEvent(content: "Hello", pubkey: "Guy"), profile: nil)
}
}
*/

View File

@@ -12,11 +12,12 @@ import CachedAsyncImage
struct EventView: View {
let event: NostrEvent
let profile: Profile?
let highlighted: Bool
var body: some View {
HStack {
VStack {
ProfilePicView(picture: profile?.picture, size: 64)
ProfilePicView(picture: profile?.picture, size: 64, highlighted: highlighted)
Spacer()
}

View File

@@ -10,8 +10,5 @@ import SwiftUI
func ProfileName(pubkey: String, profile: Profile?) -> some View {
Text(String(profile?.name ?? String(pubkey.prefix(16))))
.bold()
.onTapGesture {
UIPasteboard.general.string = pubkey
}
}

View File

@@ -14,6 +14,7 @@ let CORNER_RADIUS: CGFloat = 32
struct ProfilePicView: View {
let picture: String?
let size: CGFloat
let highlighted: Bool
var body: some View {
if let pic = picture.flatMap({ URL(string: $0) }) {
@@ -23,17 +24,21 @@ struct ProfilePicView: View {
Color.purple.opacity(0.1)
}
.frame(width: PFP_SIZE, height: PFP_SIZE)
.cornerRadius(CORNER_RADIUS)
.clipShape(Circle())
.overlay(Circle().stroke(highlighted ? Color.red : Color.black, lineWidth: highlighted ? 4 : 0))
.padding(2)
} else {
Color.purple.opacity(0.1)
.frame(width: PFP_SIZE, height: PFP_SIZE)
.cornerRadius(CORNER_RADIUS)
.overlay(Circle().stroke(highlighted ? Color.red : Color.black, lineWidth: highlighted ? 4 : 0))
.padding(2)
}
}
}
struct ProfilePicView_Previews: PreviewProvider {
static var previews: some View {
ProfilePicView(picture: "http://cdn.jb55.com/img/red-me.jpg", size: 64)
ProfilePicView(picture: "http://cdn.jb55.com/img/red-me.jpg", size: 64, highlighted: false)
}
}