From 89f8ec025396e185b80f592dfed9c97663e9723a Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 18 Apr 2022 09:47:39 -0700 Subject: [PATCH] fix retVal squash logic so remote vals dont override local vals and get sent up --- utils/eventHandler.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/eventHandler.go b/utils/eventHandler.go index 61bff1e..dd35c14 100644 --- a/utils/eventHandler.go +++ b/utils/eventHandler.go @@ -527,8 +527,7 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string { return "" } } - - if val, err := profile.GetConversationAttribute(conversation.ID, attr.LocalScope.ConstructScopedZonedPath(zone.ConstructZonedPath(path))); err != nil && val != "" { + if val, err := profile.GetConversationAttribute(conversation.ID, attr.LocalScope.ConstructScopedZonedPath(zone.ConstructZonedPath(path))); err == nil || val != "" { // we have a locally set override, don't pass this remote set public scope update to UI return "" }