From cfa20861c52099ff1c714c5beaea9f0d420fc588 Mon Sep 17 00:00:00 2001 From: ycc Date: Wed, 25 Feb 2026 22:05:58 +0100 Subject: [PATCH] reduce storage functions scope --- client/messagestorage.go | 6 +++--- client/messagestorage_test.go | 10 +++++----- client/peer.go | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/messagestorage.go b/client/messagestorage.go index d9184cb..ce3d801 100644 --- a/client/messagestorage.go +++ b/client/messagestorage.go @@ -12,7 +12,7 @@ import ( "google.golang.org/protobuf/proto" ) -func StoreMessage(peer *Peer, usermessage *meowlib.UserMessage, filenames []string, password string) error { +func storeMessage(peer *Peer, usermessage *meowlib.UserMessage, filenames []string, password string) error { var dbid string cfg := GetConfig() identity := cfg.GetIdentity() @@ -106,7 +106,7 @@ func StoreMessage(peer *Peer, usermessage *meowlib.UserMessage, filenames []stri } // Get new messages from a peer -func GetNewMessages(peer *Peer, lastDbId int, password string) ([]*InternalUserMessage, error) { +func loadNewMessages(peer *Peer, lastDbId int, password string) ([]*InternalUserMessage, error) { var messages []*InternalUserMessage cfg := GetConfig() identity := cfg.GetIdentity() @@ -164,7 +164,7 @@ func GetNewMessages(peer *Peer, lastDbId int, password string) ([]*InternalUserM } // Get old messages from a peer -func GetMessagesHistory(peer *Peer, inAppMsgCount int, lastDbId int, wantMore int, password string) ([]InternalUserMessage, error) { +func loadMessagesHistory(peer *Peer, inAppMsgCount int, lastDbId int, wantMore int, password string) ([]InternalUserMessage, error) { var messages []InternalUserMessage // handle no db yet if len(peer.DbIds) == 0 { diff --git a/client/messagestorage_test.go b/client/messagestorage_test.go index b4f525a..651b903 100644 --- a/client/messagestorage_test.go +++ b/client/messagestorage_test.go @@ -22,11 +22,11 @@ func TestStoreMessage(t *testing.T) { if err != nil { log.Fatal(err) } - err = StoreMessage(peers[0], &um, []string{}, password) + err = storeMessage(peers[0], &um, []string{}, password) if err != nil { log.Fatal(err) } - messages, err := GetMessagesHistory(peers[0], 0, 0, 10, password) + messages, err := loadMessagesHistory(peers[0], 0, 0, 10, password) if err != nil { log.Fatal(err) } @@ -56,7 +56,7 @@ func TestManyStoreMessage(t *testing.T) { } peers, err := id.Peers.GetPeers() // test with zero messages - messages, err := GetMessagesHistory(peers[0], 0, 0, 10, password) + messages, err := loadMessagesHistory(peers[0], 0, 0, 10, password) if err != nil { log.Fatal(err) } @@ -64,12 +64,12 @@ func TestManyStoreMessage(t *testing.T) { for i := 1; i < 100; i++ { var um meowlib.UserMessage um.Data = []byte(randomLenString(20, 200)) - err := StoreMessage(peers[0], &um, []string{}, password) + err := storeMessage(peers[0], &um, []string{}, password) if err != nil { log.Fatal(err) } } - messages, err = GetMessagesHistory(peers[0], 0, 0, 10, password) + messages, err = loadMessagesHistory(peers[0], 0, 0, 10, password) if err != nil { log.Fatal(err) } diff --git a/client/peer.go b/client/peer.go index dc31b2b..9ca09a1 100644 --- a/client/peer.go +++ b/client/peer.go @@ -300,7 +300,7 @@ func (p *Peer) StoreMessage(msg *meowlib.UserMessage, filenames []string) error if err != nil { return err } - return StoreMessage(p, msg, filenames, password) + return storeMessage(p, msg, filenames, password) } func (p *Peer) GetFilePreview(filename string) ([]byte, error) { @@ -320,7 +320,7 @@ func (p *Peer) LoadMessagesHistory(alreadyLoadedCount int, oldestMessageId int, if err != nil { return nil, err } - return GetMessagesHistory(p, alreadyLoadedCount, oldestMessageId, qty, password) + return loadMessagesHistory(p, alreadyLoadedCount, oldestMessageId, qty, password) } @@ -329,7 +329,7 @@ func (p *Peer) LoadNewMessages(lastMessageId int) ([]*InternalUserMessage, error if err != nil { return nil, err } - return GetNewMessages(p, lastMessageId, password) + return loadNewMessages(p, lastMessageId, password) } func (p *Peer) LoadMessage(uid string) (*InternalUserMessage, error) {