From fbd1f98b654f9253f64e6f0b865ef454eb887d1c Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Fri, 28 May 2021 01:45:59 -0700 Subject: [PATCH] Refine Start Group Event + Auto Accept Self-created Groups --- model/group.go | 2 +- peer/cwtch_peer.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/model/group.go b/model/group.go index ef4f153..5ee0cfe 100644 --- a/model/group.go +++ b/model/group.go @@ -51,7 +51,7 @@ func NewGroup(server string) (*Group, error) { group := new(Group) group.Version = CurrentGroupVersion group.LocalID = GenerateRandomID() - + group.Accepted = true // we are starting a group, so we assume we want to connect to it... if tor.IsValidHostname(server) == false { return nil, errors.New("Server is not a valid v3 onion") } diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go index c7b4f48..f850510 100644 --- a/peer/cwtch_peer.go +++ b/peer/cwtch_peer.go @@ -20,7 +20,7 @@ const lastKnownSignature = "LastKnowSignature" var autoHandleableEvents = map[event.Type]bool{event.EncryptedGroupMessage: true, event.PeerStateChange: true, event.ServerStateChange: true, event.NewGroupInvite: true, event.NewMessageFromPeer: true, - event.PeerAcknowledgement: true, event.PeerError: true, event.SendMessageToPeerError: true, event.SendMessageToGroupError: true, + event.PeerAcknowledgement: true, event.PeerError: true, event.SendMessageToPeerError: true, event.SendMessageToGroupError: true, event.NewGetValMessageFromPeer: true, event.NewRetValMessageFromPeer: true, event.ProtocolEngineStopped: true, event.RetryServerRequest: true} // DefaultEventsToHandle specifies which events will be subscribed to @@ -250,6 +250,10 @@ func (cp *cwtchPeer) StartGroup(server string) (string, string, error) { jsobj, err := json.Marshal(group) if err == nil { cp.eventBus.Publish(event.NewEvent(event.GroupCreated, map[event.Field]string{ + event.GroupID: groupID, + event.GroupServer: group.GroupServer, + event.GroupInvite: invite, + // Needed for Storage Engine... event.Data: string(jsobj), })) }