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

Fixing small lints
continuous-integration/drone/push Build is pending Details
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Sarah Jamie Lewis 2021-11-19 14:10:51 -08:00
parent 4f5b1fa106
commit 824cb3b951
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
peer/cwtch_peer.go
View File

@ -620,9 +620,8 @@ func (cp *cwtchPeer) AddServer(serverSpecification string) (string, error) {
}
cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(string(model.BundleType))), serverSpecification)
return onion, err
} else {
return "", err
}
return "", err
}
return "", model.InconsistentKeyBundleError
}
@ -750,9 +749,8 @@ func (cp *cwtchPeer) ImportBundle(importString string) error {
_, err := cp.NewContactConversation(importString, model.DefaultP2PAccessControl(), true)
if err == nil {
return ConstructResponse(importBundlePrefix, "success")
} else {
return ConstructResponse(importBundlePrefix, err.Error())
}
return ConstructResponse(importBundlePrefix, err.Error())
} else if strings.HasPrefix(importString, tofuBundlePrefix) {
bundle := strings.Split(importString, "||")
if len(bundle) == 2 {