forked from cwtch.im/cwtch
Merge pull request 'Refine Start Group Event + Auto Accept Self-created Groups' (#360) from peer_fixes into master
Reviewed-on: cwtch.im/cwtch#360
This commit is contained in:
commit
77e5eda0b5
|
@ -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")
|
||||
}
|
||||
|
|
|
@ -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),
|
||||
}))
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue