forked from cwtch.im/libcwtch-go
Merge pull request 'fix retVal squash logic so remote vals dont override local vals and get sent up' (#84) from squshRet into trunk
Reviewed-on: cwtch.im/libcwtch-go#84 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
This commit is contained in:
commit
c32d5082e4
|
@ -527,8 +527,7 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
|
||||||
return ""
|
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
|
// we have a locally set override, don't pass this remote set public scope update to UI
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue