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

Fix event encoding issue

Browse Source
This commit is contained in:
William Casarin
2023-02-06 11:10:23 -08:00
parent 140b0e4fc4
commit eae844e081
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
damus/Nostr/NostrEvent.swift
View File

@@ -370,6 +370,7 @@ func decode_nostr_event(txt: String) -> NostrResponse? {
func encode_json<T: Encodable>(_ val: T) -> String? { func encode_json<T: Encodable>(_ val: T) -> String? {
let encoder = JSONEncoder() let encoder = JSONEncoder()
encoder.outputFormatting = .withoutEscapingSlashes
return (try? encoder.encode(val)).map { String(decoding: $0, as: UTF8.self) } return (try? encoder.encode(val)).map { String(decoding: $0, as: UTF8.self) }
} }

7
damus/Nostr/RelayConnection.swift
View File

@@ -118,10 +118,9 @@ func make_nostr_req(_ req: NostrRequest) -> String? {
} }
func make_nostr_push_event(ev: NostrEvent) -> String? { func make_nostr_push_event(ev: NostrEvent) -> String? {
let encoder = JSONEncoder() guard let event = encode_json(ev) else {
encoder.outputFormatting = .withoutEscapingSlashes return nil
let event_data = try! encoder.encode(ev) }
let event = String(decoding: event_data, as: UTF8.self)
let encoded = "[\"EVENT\",\(event)]" let encoded = "[\"EVENT\",\(event)]"
print(encoded) print(encoded)
return encoded return encoded

1
damus/Util/Zap.swift
View File

@@ -296,6 +296,7 @@ func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent, amount: In
if zappable { if zappable {
if let json = encode_json(zapreq) { if let json = encode_json(zapreq) {
print("zapreq json: \(json)")
query.append(URLQueryItem(name: "nostr", value: json)) query.append(URLQueryItem(name: "nostr", value: json))
} }
} }