yves/meowlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fill usermessage lookupkey

Browse Source
This commit is contained in:
ycc
2022-12-17 20:17:05 +01:00
parent 20c82d0766
commit 1031529964
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/peer.go
View File

@@ -81,6 +81,7 @@ func (pl *PeerList) GetConversationRequests() []*meowlib.ToServerMessage_Convers
func (p *Peer) BuildSimpleUserMessage(message []byte) (*meowlib.UserMessage, error) { func (p *Peer) BuildSimpleUserMessage(message []byte) (*meowlib.UserMessage, error) {
var msg meowlib.UserMessage var msg meowlib.UserMessage
msg.Destination = p.Contact.LookupPublicKey
msg.From = p.MyIdentity.Public msg.From = p.MyIdentity.Public
msg.Data = message msg.Data = message
msg.Type = "1" msg.Type = "1"
@@ -118,6 +119,7 @@ func (p *Peer) BuildFileMessage(filename string, message []byte) ([]meowlib.User
break break
} }
var msg meowlib.UserMessage var msg meowlib.UserMessage
msg.Destination = p.Contact.LookupPublicKey
msg.From = p.MyIdentity.Public msg.From = p.MyIdentity.Public
msg.File.Filename = fi.Name() msg.File.Filename = fi.Name()
msg.File.Chunk = uint32(chunk) msg.File.Chunk = uint32(chunk)

4
messages.pb.go
View File

@@ -547,8 +547,8 @@ type UserMessage struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` // Lookupkey
From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` // My public key for that contact
Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"` Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
Status *UserMessage_ConversationStatus `protobuf:"bytes,5,opt,name=Status,proto3" json:"Status,omitempty"` Status *UserMessage_ConversationStatus `protobuf:"bytes,5,opt,name=Status,proto3" json:"Status,omitempty"`

4
pb/messages.proto
View File

@@ -85,8 +85,8 @@ message PackedUserMessage {
// structure defining information that might be exchanged between two peers. // structure defining information that might be exchanged between two peers.
message UserMessage { message UserMessage {
string destination = 1; string destination = 1; // Lookupkey
string from = 2; string from = 2; // My public key for that contact
string type = 3; string type = 3;
bytes data = 4; bytes data = 4;
message ConversationStatus { message ConversationStatus {