nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-09-19 11:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reply ids

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin 2022-04-17 11:40:48 -07:00
parent 550f096808
commit 0ac3218952
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
damus/ContentView.swift
View File

@ -121,7 +121,7 @@ struct ContentView: View {
let privkey = "" let privkey = ""
let new_ev = NostrEvent(content: post.content, pubkey: pubkey) let new_ev = NostrEvent(content: post.content, pubkey: pubkey)
for id in post.references { for id in post.references {
var tag = ["e", id.ref_id] var tag = [id.key, id.ref_id]
if let relay_id = id.relay_id { if let relay_id = id.relay_id {
tag.append(relay_id) tag.append(relay_id)
} }

11
damus/Nostr/NostrEvent.swift
View File

@ -22,6 +22,7 @@ struct KeyEvent {
struct ReferencedId { struct ReferencedId {
let ref_id: String let ref_id: String
let relay_id: String? let relay_id: String?
let key: String
} }
struct EventId: Identifiable, CustomStringConvertible { struct EventId: Identifiable, CustomStringConvertible {
@ -59,7 +60,7 @@ class NostrEvent: Codable, Identifiable {
if tag.count >= 3 { if tag.count >= 3 {
relay_id = tag[2] relay_id = tag[2]
} }
acc.append(ReferencedId(ref_id: tag[1], relay_id: relay_id)) acc.append(ReferencedId(ref_id: tag[1], relay_id: relay_id, key: key))
} }
} }
} }
@ -86,9 +87,11 @@ class NostrEvent: Codable, Identifiable {
return false return false
} }
public func reply_ids() -> [ReferencedId] { public func reply_ids(pubkey: String) -> [ReferencedId] {
var ids = self.referenced_ids.first.map { [$0] } ?? [] var ids = self.referenced_ids
ids.append(ReferencedId(ref_id: self.id, relay_id: nil)) ids.append(contentsOf: self.referenced_pubkeys)
ids.append(ReferencedId(ref_id: self.id, relay_id: nil, key: "e"))
ids.append(ReferencedId(ref_id: pubkey, relay_id: nil, key: "p"))
return ids return ids
} }

2
damus/Views/ReplyView.swift
View File

@ -14,7 +14,7 @@ struct ReplyView: View {
VStack { VStack {
Text("Replying to:") Text("Replying to:")
EventView(event: replying_to, highlight: .none, has_action_bar: false) EventView(event: replying_to, highlight: .none, has_action_bar: false)
PostView(references: replying_to.reply_ids()) PostView(references: replying_to.reply_ids(pubkey: replying_to.pubkey))
Spacer() Spacer()
} }