Daniel D’Aquino
63b0661728
This commit fixes the ambiguity in tags used in highlights with comments, by adding specifiers to help clients understand: - If a URL reference is the source of the highlight or just a URL mentioned in the comment - If a pubkey reference is the author of the highlighted content, or just a generic mention in the comment This tries to be backwards compatible with previous versions of NIP-84. Testing -------- PASS Device: iPhone 15 simulator iOS: 17.5 Damus: This commit Steps: 1. Create a new highlight from a webpage using the extension. Tag a user and attach an image 2. Check the newly-created highlight: 1. Highlight description line should just say "Highlighted", not "Highlighted <username>" 2. Highlight source link preview should present the URL of the highlighted page, NOT the image URL 3. Inspect the JSON for the newly-created highlight: 1. "r" tags should include specifiers in the 3rd slot, such as "source" or "mention" 2. "p" tags should include specifiers in the 3rd slot, such as "mention" 4. Go to an older, generic highlight (without comment) to another nostr event and check the view. 1. Highlight description line should say "Highlighted <author_name_of_other_event>" 2. Clicking on the highlight should lead to the highlighted event itself. Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
35 lines
1.1 KiB
Swift
35 lines
1.1 KiB
Swift
//
|
|
// ReplyPart.swift
|
|
// damus
|
|
//
|
|
// Created by William Casarin on 2023-06-01.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct ReplyPart: View {
|
|
let events: EventCache
|
|
let event: NostrEvent
|
|
let keypair: Keypair
|
|
let ndb: Ndb
|
|
|
|
var body: some View {
|
|
Group {
|
|
if event.known_kind == .highlight {
|
|
let highlighted_note = event.highlighted_note_id().flatMap { events.lookup($0) }
|
|
let highlight_note = HighlightEvent.parse(from: event)
|
|
HighlightDescription(highlight_event: highlight_note, highlighted_event: highlighted_note, ndb: ndb)
|
|
} else if let reply_ref = event.thread_reply()?.reply {
|
|
let replying_to = events.lookup(reply_ref.note_id)
|
|
ReplyDescription(event: event, replying_to: replying_to, ndb: ndb)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ReplyPart_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
ReplyPart(events: test_damus_state.events, event: test_note, keypair: Keypair(pubkey: .empty, privkey: nil), ndb: test_damus_state.ndb)
|
|
}
|
|
}
|