From 09892709ec193bec96fb893ecab9e4121e447543 Mon Sep 17 00:00:00 2001
From: ycc <yves.cc@laposte.net>
Date: Fri, 5 Apr 2024 18:07:00 +0200
Subject: [PATCH] Fix function name and update file path handling

---
 client/helpers/backgroundHelper.go         | 2 +-
 client/helpers/invitationFinalizeHelper.go | 8 ++++----
 message.go                                 | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/helpers/backgroundHelper.go b/client/helpers/backgroundHelper.go
index 4998bf1..f41c5f1 100644
--- a/client/helpers/backgroundHelper.go
+++ b/client/helpers/backgroundHelper.go
@@ -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 {
diff --git a/client/helpers/invitationFinalizeHelper.go b/client/helpers/invitationFinalizeHelper.go
index 3388960..d9b1120 100644
--- a/client/helpers/invitationFinalizeHelper.go
+++ b/client/helpers/invitationFinalizeHelper.go
@@ -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
 }
diff --git a/message.go b/message.go
index 7c785c3..96cd3b2 100644
--- a/message.go
+++ b/message.go
@@ -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)