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

reduce storage functions scope

Browse Source
This commit is contained in:
ycc
2026-02-25 22:05:58 +01:00
parent e9cc5b9c76
commit cfa20861c5
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/messagestorage.go
View File

@@ -12,7 +12,7 @@ import (
"google.golang.org/protobuf/proto" "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 var dbid string
cfg := GetConfig() cfg := GetConfig()
identity := cfg.GetIdentity() identity := cfg.GetIdentity()
@@ -106,7 +106,7 @@ func StoreMessage(peer *Peer, usermessage *meowlib.UserMessage, filenames []stri
} }
// Get new messages from a peer // 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 var messages []*InternalUserMessage
cfg := GetConfig() cfg := GetConfig()
identity := cfg.GetIdentity() identity := cfg.GetIdentity()
@@ -164,7 +164,7 @@ func GetNewMessages(peer *Peer, lastDbId int, password string) ([]*InternalUserM
} }
// Get old messages from a peer // 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 var messages []InternalUserMessage
// handle no db yet // handle no db yet
if len(peer.DbIds) == 0 { if len(peer.DbIds) == 0 {

10
client/messagestorage_test.go
View File

@@ -22,11 +22,11 @@ func TestStoreMessage(t *testing.T) {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
err = StoreMessage(peers[0], &um, []string{}, password) err = storeMessage(peers[0], &um, []string{}, password)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
messages, err := GetMessagesHistory(peers[0], 0, 0, 10, password) messages, err := loadMessagesHistory(peers[0], 0, 0, 10, password)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@@ -56,7 +56,7 @@ func TestManyStoreMessage(t *testing.T) {
} }
peers, err := id.Peers.GetPeers() peers, err := id.Peers.GetPeers()
// test with zero messages // 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 { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@@ -64,12 +64,12 @@ func TestManyStoreMessage(t *testing.T) {
for i := 1; i < 100; i++ { for i := 1; i < 100; i++ {
var um meowlib.UserMessage var um meowlib.UserMessage
um.Data = []byte(randomLenString(20, 200)) um.Data = []byte(randomLenString(20, 200))
err := StoreMessage(peers[0], &um, []string{}, password) err := storeMessage(peers[0], &um, []string{}, password)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
messages, err = GetMessagesHistory(peers[0], 0, 0, 10, password) messages, err = loadMessagesHistory(peers[0], 0, 0, 10, password)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

6
client/peer.go
View File

@@ -300,7 +300,7 @@ func (p *Peer) StoreMessage(msg *meowlib.UserMessage, filenames []string) error
if err != nil { if err != nil {
return err return err
} }
return StoreMessage(p, msg, filenames, password) return storeMessage(p, msg, filenames, password)
} }
func (p *Peer) GetFilePreview(filename string) ([]byte, error) { func (p *Peer) GetFilePreview(filename string) ([]byte, error) {
@@ -320,7 +320,7 @@ func (p *Peer) LoadMessagesHistory(alreadyLoadedCount int, oldestMessageId int,
if err != nil { if err != nil {
return nil, err 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 { if err != nil {
return nil, err return nil, err
} }
return GetNewMessages(p, lastMessageId, password) return loadNewMessages(p, lastMessageId, password)
} }
func (p *Peer) LoadMessage(uid string) (*InternalUserMessage, error) { func (p *Peer) LoadMessage(uid string) (*InternalUserMessage, error) {