cwtch.im
/
cwtch
16
20
Fork 15
Code Issues 10 Pull Requests 1 Releases 163 Wiki Activity

Small Fixups #409

Merged
dan merged 5 commits from p2p-interim-new-storage into master 2021-12-08 01:30:35 +00:00
Conversation 1 Commits 5 Files Changed 9 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 369a0bc809 - Show all commits

7
peer/cwtch_peer.go
View File

@ -421,7 +421,6 @@ func (cp *cwtchPeer) AutoHandleEvents(events []event.Type) {
}
// ImportGroup initializes a group from an imported source rather than a peer invite
// Status: TODO
func (cp *cwtchPeer) ImportGroup(exportedInvite string) (int, error) {
gci, err := model.ValidateInvite(exportedInvite)
if err != nil {
@ -640,7 +639,7 @@ func (cp *cwtchPeer) AddServer(serverSpecification string) (string, error) {
val, exists := conversationInfo.Attributes[k]
if exists {
if val != v {
// this is inconsistent!
// the keybundle is inconsistent!
return "", model.InconsistentKeyBundleError
}
}
@ -761,7 +760,7 @@ func (cp *cwtchPeer) SendInviteToConversation(conversationID int, inviteConversa
return errors.New("server bundle not found")
}
invite = model.MessageWrapper{Overlay: model.OverlayInviteContact, Data: fmt.Sprintf("tofubundle:server:%s||%s", base64.StdEncoding.EncodeToString([]byte(bundle)), groupInvite)}
invite = model.MessageWrapper{Overlay: model.OverlayInviteGroup, Data: fmt.Sprintf("tofubundle:server:%s||%s", base64.StdEncoding.EncodeToString([]byte(bundle)), groupInvite)}
}
inviteBytes, err := json.Marshal(invite)
@ -961,7 +960,7 @@ func (cp *cwtchPeer) eventHandler() {
// it learns nothing else about each connection).
// store the base64 encoded signature for later use
// TODO Server Connections should sent Connection ID
// TODO Server Connections should send Connection ID
ci, err := cp.FetchConversationInfo(ev.Data[event.GroupServer])
if ci == nil || err != nil {
log.Errorf("no server connection count")