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

New Storage Refactor #404

Merged
sarah merged 33 commits from p2p-interim-new-storage into master 2021-11-25 23:56:51 +00:00
Conversation 17 Commits 33 Files Changed 55 +3 -12
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 781f4a919b - Show all commits

12
app/app.go
View File

@ -1,15 +1,14 @@
package app
import (
"crypto/rand"
"cwtch.im/cwtch/app/plugins"
"cwtch.im/cwtch/event"
"cwtch.im/cwtch/model"
"cwtch.im/cwtch/model/attr"
"cwtch.im/cwtch/model/constants"
"cwtch.im/cwtch/peer"
"cwtch.im/cwtch/protocol/connections"
"cwtch.im/cwtch/storage"
"encoding/hex"
"fmt"
"git.openprivacy.ca/openprivacy/connectivity"
"git.openprivacy.ca/openprivacy/log"
@ -85,18 +84,11 @@ func (ac *applicationCore) DeletePeer(onion string) {
delete(ac.eventBuses, onion)
}
// GenerateRandomID generates a random 16 byte hex id code
func GenerateRandomID() string {
randBytes := make([]byte, 16)
rand.Read(randBytes)
return path.Join(hex.EncodeToString(randBytes))
}
func (app *application) CreateTaggedPeer(name string, password string, tag string) {
app.appmutex.Lock()
defer app.appmutex.Unlock()
profileDirectory := path.Join(app.directory, "profiles", GenerateRandomID())
profileDirectory := path.Join(app.directory, "profiles", model.GenerateRandomID())
sarah marked this conversation as resolved
erinn commented 2021-11-19 21:56:58 +00:00
Review
Copy Link

uhhh

uhhh
profile, err := peer.CreateEncryptedStorePeer(profileDirectory, name, password)
if err != nil {

3
model/profile.go
View File

@ -6,7 +6,6 @@ import (
"encoding/json"
"golang.org/x/crypto/ed25519"
"io"
"path/filepath"
"sync"
)
@ -67,7 +66,7 @@ func getRandomness(arr *[]byte) {
func GenerateRandomID() string {
randBytes := make([]byte, 16)
dan marked this conversation as resolved
dan commented 2021-11-19 20:12:02 +00:00
Review
Copy Link

dup? it's also in app

dup? it's also in app
dan commented 2021-11-23 20:40:56 +00:00
Review
Copy Link

GenerateRandomID is still dupped in model/profile and app/app

GenerateRandomID is still dupped in model/profile and app/app
rand.Read(randBytes)
return filepath.Join(hex.EncodeToString(randBytes))
return hex.EncodeToString(randBytes)
}
// GetCopy returns a full deep copy of the Profile struct and its members (timeline inclusion control by arg)