Merge branch 'groupimportfix' of cwtch.im/cwtch into master

This commit is contained in:
erinn 2019-02-13 02:49:09 +00:00 committed by Gogs
commit 2ed05dc8cd
1 changed files with 1 additions and 1 deletions

View File

@ -112,7 +112,7 @@ func (cp *cwtchPeer) ImportGroup(exportedInvite string) (groupID string, err err
cpp := &protocol.CwtchPeerPacket{}
err = proto.Unmarshal(data, cpp)
if err == nil {
jsobj, err := json.Marshal(cpp.GetGroupChatInvite())
jsobj, err := proto.Marshal(cpp.GetGroupChatInvite())
if err == nil {
cp.eventBus.Publish(event.NewEvent(event.NewGroupInvite, map[event.Field]string{
event.GroupInvite: string(jsobj),