Fix function name and update file path handling
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
ycc 2024-04-05 18:07:00 +02:00
parent 3ac6b02e56
commit 09892709ec
3 changed files with 7 additions and 6 deletions

View File

@ -125,7 +125,7 @@ func ReadMessage(messageFilename string) ([]string, []string, string, error) {
}
// check if invitation answer
if fromServerMessage.Invitation != nil {
InvitationGetAnswerReadResponse(fromServerMessage.Invitation)
invitationGetAnswerReadResponse(fromServerMessage.Invitation)
}
// Chat messages
if len(fromServerMessage.Chat) > 0 {

View File

@ -9,11 +9,11 @@ import (
// Got it by the message background check
// => noInvitationGetAnswer
// InvitationGetAnswerReadResponse
// Called by the invitation initiator
// invitationGetAnswerReadResponse
// Called by the initiator's background service only
// invitationAnswerData: the data received from the server
// invitationServerUid: the uid of the server holding the invitation
func InvitationGetAnswerReadResponse(invitation *meowlib.Invitation) (*client.Peer, string, error) {
func invitationGetAnswerReadResponse(invitation *meowlib.Invitation) (*client.Peer, string, error) {
// decode the payload
var invitationAnswer meowlib.PackedUserMessage
@ -47,7 +47,7 @@ func InvitationGetAnswerReadResponse(invitation *meowlib.Invitation) (*client.Pe
peer.ContactPullServers = append(peer.ContactPullServers, server.GetUid())
}
client.GetConfig().GetIdentity().Save()
// cc, err := id.FinalizeInvitation(serverMsg.Invitation.)
}
return peer, "", nil
}

View File

@ -3,6 +3,7 @@ package meowlib
import (
"errors"
"os"
"path/filepath"
"github.com/google/uuid"
)
@ -30,7 +31,7 @@ func (msg *UserMessage) AddFile(filename string, maxMessageSize int64) error {
}
var file File
file.Filename = filename
file.Filename = filepath.Base(filename)
file.Size = uint64(fi.Size())
file.Data = data
msg.Files = append(msg.Files, &file)