Merge branch 'master' of dan/cwtch into master

This commit is contained in:
Sarah Jamie Lewis 2019-02-04 19:54:54 +00:00 committed by Gogs
commit c4d55aee59
1 changed files with 1 additions and 0 deletions

View File

@ -277,6 +277,7 @@ func (p *Profile) GetGroupByGroupID(groupID string) (g *Group) {
func (p *Profile) ProcessInvite(gci *protocol.GroupChatInvite, peerHostname string) { func (p *Profile) ProcessInvite(gci *protocol.GroupChatInvite, peerHostname string) {
group := new(Group) group := new(Group)
group.GroupID = gci.GetGroupName() group.GroupID = gci.GetGroupName()
group.LocalID = generateRandomID()
group.SignedGroupID = gci.GetSignedGroupId() group.SignedGroupID = gci.GetSignedGroupId()
copy(group.GroupKey[:], gci.GetGroupSharedKey()[:]) copy(group.GroupKey[:], gci.GetGroupSharedKey()[:])
group.GroupServer = gci.GetServerHost() group.GroupServer = gci.GetServerHost()