File Sharing MVP #384

Merged
sarah merged 52 commits from filesharing into master 2021-09-30 00:57:14 +00:00
1 changed files with 6 additions and 4 deletions
Showing only changes of commit 9bff4cef26 - Show all commits

View File

@ -6,6 +6,7 @@ import (
"cwtch.im/cwtch/model/attr"
"cwtch.im/cwtch/peer"
"cwtch.im/cwtch/protocol/files"
"encoding/hex"
"encoding/json"
"errors"
"fmt"
@ -32,8 +33,8 @@ func FunctionalityGate(experimentMap map[string]bool) (*Functionality, error) {
// This is the format that the UI will parse to display the message
type OverlayMessage struct {
Name string `json:"f"`
Hash []byte `json:"h"`
Nonce []byte `json:"n"`
Hash string `json:"h"`
Nonce string `json:"n"`
Size uint64 `json:"s"`
}
@ -58,10 +59,11 @@ func (f *Functionality) ShareFile(filepath string, profile peer.CwtchPeer, handl
return err
}
message := OverlayMessage{
Name: path.Base(manifest.FileName),
Hash: manifest.RootHash,
Nonce: nonce[:],
Hash: hex.EncodeToString(manifest.RootHash),
Nonce: hex.EncodeToString(nonce[:]),
Size: manifest.FileSizeInBytes,
}