Browse Source

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

pull/222/head
erinn Gogs 1 year ago
parent
commit
6ebf8ebc88
2 changed files with 8 additions and 17 deletions
  1. +1
    -1
      event/common.go
  2. +7
    -16
      peer/cwtch_peer.go

+ 1
- 1
event/common.go View File

@@ -22,7 +22,7 @@ const (
// TimestampReceived [eg time.Now().Format(time.RFC3339Nano)]
// RemotePeer: [eg "chpr7qm6op5vfcg2pi4vllco3h6aa7exexc4rqwnlupqhoogx2zgd6qd"]
// GroupInvite: [eg "torv3....."]
NewGroupInvite = Type("NewGroupInvite")
NewGroupInvite = Type("NewGroupInvite")

SendMessageToGroup = Type("SendMessagetoGroup")
EncryptedGroupMessage = Type("EncryptedGroupMessage")


+ 7
- 16
peer/cwtch_peer.go View File

@@ -11,9 +11,7 @@ import (
"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
"git.openprivacy.ca/openprivacy/libricochet-go/identity"
"git.openprivacy.ca/openprivacy/libricochet-go/log"
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
"github.com/golang/protobuf/proto"
"golang.org/x/crypto/ed25519"
"strings"
"sync"
"time"
@@ -114,22 +112,15 @@ func (cp *cwtchPeer) ImportGroup(exportedInvite string) (groupID string, err err
cpp := &protocol.CwtchPeerPacket{}
err = proto.Unmarshal(data, cpp)
if err == nil {
pk, err := base64.StdEncoding.DecodeString(exportedInvite[5 : 5+44])
jsobj, err := json.Marshal(cpp.GetGroupChatInvite())
if err == nil {
edpk := ed25519.PublicKey(pk)
onion := utils.GetTorV3Hostname(edpk)
cp.Profile.AddContact(onion, &model.PublicProfile{Name: "", Ed25519PublicKey: edpk, Trusted: true, Blocked: false, Onion: onion})
cp.Profile.ProcessInvite(cpp.GetGroupChatInvite(), onion)
jsobj, err := json.Marshal(cpp.GetGroupChatInvite())
if err == nil {
cp.eventBus.Publish(event.NewEvent(event.NewGroupInvite, map[event.Field]string{
event.GroupInvite: string(jsobj),
}))
} else {
log.Errorf("error serializing group: %v", err)
}
return cpp.GroupChatInvite.GetGroupName(), nil
cp.eventBus.Publish(event.NewEvent(event.NewGroupInvite, map[event.Field]string{
event.GroupInvite: string(jsobj),
}))
} else {
log.Errorf("error serializing group: %v", err)
}
return cpp.GroupChatInvite.GetGroupName(), nil
}
}
} else {


Loading…
Cancel
Save