Refactor threaded event tag building and interpreting logic so non-kind-1 events can reuse them #186
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nd-1 events can reuse them
tyiu
force-pushed
the
tyiu/refactor-nip-10-tag-logic
branch
from
254d823 to
d19febd
Compare
tyiu
commented
Oct 18, 2024
| @@ -150,11 +150,160 @@ public struct EventTag: RelayProviding, RelayURLValidating, Equatable { | |||
| } | |||
| } | |||
|
|
|||
| public protocol EventTagInterpreting: NostrEvent {} | |||
|
|
||
| // Add the author "p" tag if it was not already added. | ||
| if !tags.contains(where: { $0.name == TagName.pubkey.rawValue && $0.value == repliedEvent.pubkey }) { | ||
| if let validatedRelayURL { |
There was a problem hiding this comment.
This specific logic around adding a relay to the p-tag is new. Which is why TextNoteEventTests was updated to match the assertion. All the other logic here was copied from TextNoteEvent.
| // NIP-10 states that the first event tag is the root. | ||
| return eventTags.first | ||
| /// Events mentioned in the note content. | ||
| @available(*, deprecated, message: "Deprecated in favor of referencedEventIds. Mention is an overloaded term from NIP-10.") |
There was a problem hiding this comment.
NIP-01 says
- The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>]`
Since this line uses the word refer, I've called the new property referencedEventIds.
| @@ -36,88 +36,26 @@ public final class TextNoteEvent: NostrEvent, CustomEmojiInterpreting { | |||
| try super.init(kind: .textNote, content: content, tags: tags, createdAt: createdAt, signedBy: keypair) | |||
| } | |||
|
|
|||
| /// Pubkeys mentioned in the note content. | |||
| /// Pubkeys referenced in the note content. | |||
| @available(*, deprecated, message: "Deprecated in favor of referencedPubkeys. Mention is an overloaded term from NIP-10.") | |||
There was a problem hiding this comment.
NIP-01 says
- The `p` tag, used to refer to another user: `["p", <32-bytes lowercase hex of a pubkey>, <recommended relay URL, optional>]`
Since this line uses the word refer, I've called the new property referencedPubkeys.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For example, NIP-17 - Private Direct Message uses threading, so this PR unblocks that work from happening.