From 6e4547c8bb044cbf61a15aaa1df41035e63c8d8d Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 16 Mar 2021 15:05:44 -0700 Subject: [PATCH 1/2] unwrap eventprofileenvelope --- utils/eventHandler.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/utils/eventHandler.go b/utils/eventHandler.go index b3cd71d..c7b85fc 100644 --- a/utils/eventHandler.go +++ b/utils/eventHandler.go @@ -246,10 +246,16 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string { */ } - json, _ := json.Marshal(ev) + json, _ := json.Marshal(downgrade(ev)) return string(json) } +func downgrade(original *EventProfileEnvelope) *event.Event { + unwrapped := &original.Event + unwrapped.Data["ProfileOnion"] = original.Profile + return unwrapped +} + func (eh *EventHandler) startHandlingPeer(onion string) { eventBus := eh.app.GetEventBus(onion) q := event.NewQueue() From 1902944bc7707eae9a69ae1166ca4485f90f53a6 Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 16 Mar 2021 15:16:04 -0700 Subject: [PATCH 2/2] unwrap eventprofileenvelope --- utils/eventHandler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/eventHandler.go b/utils/eventHandler.go index c7b85fc..8c8e92a 100644 --- a/utils/eventHandler.go +++ b/utils/eventHandler.go @@ -246,11 +246,11 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string { */ } - json, _ := json.Marshal(downgrade(ev)) + json, _ := json.Marshal(unwrap(ev)) return string(json) } -func downgrade(original *EventProfileEnvelope) *event.Event { +func unwrap(original *EventProfileEnvelope) *event.Event { unwrapped := &original.Event unwrapped.Data["ProfileOnion"] = original.Profile return unwrapped