nip77 nostr-negentropy syncing basics.

nbd-wtf · Sep 12, 2024 · 076e8a1 · 076e8a1
1 parent 775a89a
commit 076e8a1
Show file tree

Hide file tree

Showing 5 changed files with 199 additions and 324 deletions.
diff --git a/envelopes.go b/envelopes.go
@@ -58,11 +58,6 @@ type Envelope interface {
 	String() string
 }
 
-type EventEnvelope struct {
-	SubscriptionID *string
-	Event
-}
-
 var (
 	_ Envelope = (*EventEnvelope)(nil)
 	_ Envelope = (*ReqEnvelope)(nil)
@@ -74,6 +69,11 @@ var (
 	_ Envelope = (*AuthEnvelope)(nil)
 )
 
+type EventEnvelope struct {
+	SubscriptionID *string
+	Event
+}
+
 func (_ EventEnvelope) Label() string { return "EVENT" }
 
 func (v *EventEnvelope) UnmarshalJSON(data []byte) error {
@@ -96,7 +96,7 @@ func (v EventEnvelope) MarshalJSON() ([]byte, error) {
 	if v.SubscriptionID != nil {
 		w.RawString(`"` + *v.SubscriptionID + `",`)
 	}
-	v.MarshalEasyJSON(&w)
+	v.Event.MarshalEasyJSON(&w)
 	w.RawString(`]`)
 	return w.BuildBytes()
 }