blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-26 11:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source
This commit is contained in:
withchao 2023-06-08 19:18:55 +08:00
commit c1975d4bb3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/common/db/cache/msg.go vendored
View File

@ -365,7 +365,7 @@ func (c *msgCache) UserDeleteMsgs(ctx context.Context, conversationID string, se
} }
func (c *msgCache) GetUserDelList(ctx context.Context, userID, conversationID string) (seqs []int64, err error) { func (c *msgCache) GetUserDelList(ctx context.Context, userID, conversationID string) (seqs []int64, err error) {
result, err := c.rdb.SMembers(ctx, c.getUserDelList(userID, conversationID)).Result() result, err := c.rdb.SMembers(ctx, c.getUserDelList(conversationID, userID)).Result()
if err != nil { if err != nil {
return nil, errs.Wrap(err) return nil, errs.Wrap(err)
} }

5
pkg/common/db/controller/msg_test.go
View File

@ -3,13 +3,14 @@ package controller
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"math/rand" "math/rand"
"strconv" "strconv"
"sync" "sync"
"testing" "testing"
"time" "time"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
@ -187,7 +188,7 @@ func Test_Revoke(t *testing.T) {
} }
func Test_FindBySeq(t *testing.T) { func Test_FindBySeq(t *testing.T) {
if err := log.InitFromConfig("", 6, true, false, "", 2); err != nil { if err := log.InitFromConfig("", "", 6, true, false, "", 2); err != nil {
t.Fatal(err) t.Fatal(err)
} }
db := GetDB() db := GetDB()