Experimental Settings #10

Merged
erinn merged 4 commits from settings into trunk 2021-03-16 20:58:29 +00:00
1 changed files with 4 additions and 8 deletions
Showing only changes of commit eb570745a5 - Show all commits

View File

@ -54,19 +54,15 @@ func (gf *GroupFunctionality) HandleImportString(peer peer.CwtchPeer, importStri
gf.HandleImportString(peer, bundle[0][11:])
gf.HandleImportString(peer, bundle[1])
return nil
}
// Server Key Bundles are prefixed with
if strings.HasPrefix(importString, ServerPrefix) {
} else if strings.HasPrefix(importString, ServerPrefix) {
// Server Key Bundles are prefixed with
bundle, err := base64.StdEncoding.DecodeString(importString[7:])
if err == nil {
return peer.AddServer(string(bundle))
}
return err
}
//eg: torv3JFDWkXExBsZLkjvfkkuAxHsiLGZBk0bvoeJID9ItYnU=EsEBCiBhOWJhZDU1OTQ0NWI3YmM2N2YxYTM5YjkzMTNmNTczNRIgpHeNaG+6jy750eDhwLO39UX4f2xs0irK/M3P6mDSYQIaOTJjM2ttb29ibnlnaGoyenc2cHd2N2Q1N3l6bGQ3NTNhdW8zdWdhdWV6enB2ZmFrM2FoYzRiZHlkCiJAdVSSVgsksceIfHe41OJu9ZFHO8Kwv3G6F5OK3Hw4qZ6hn6SiZjtmJlJezoBH0voZlCahOU7jCOg+dsENndZxAA==
if strings.HasPrefix(importString, GroupPrefix) {
} else if strings.HasPrefix(importString, GroupPrefix) {
//eg: torv3JFDWkXExBsZLkjvfkkuAxHsiLGZBk0bvoeJID9ItYnU=EsEBCiBhOWJhZDU1OTQ0NWI3YmM2N2YxYTM5YjkzMTNmNTczNRIgpHeNaG+6jy750eDhwLO39UX4f2xs0irK/M3P6mDSYQIaOTJjM2ttb29ibnlnaGoyenc2cHd2N2Q1N3l6bGQ3NTNhdW8zdWdhdWV6enB2ZmFrM2FoYzRiZHlkCiJAdVSSVgsksceIfHe41OJu9ZFHO8Kwv3G6F5OK3Hw4qZ6hn6SiZjtmJlJezoBH0voZlCahOU7jCOg+dsENndZxAA==
return peer.ImportGroup(importString)
}