IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-05 01:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	pkg/proto/sdkws/sdkws.pb.go
This commit is contained in:
withchao
2023-05-29 19:12:54 +08:00
parent b6a0c32fdd f4c51d1377
commit efac87fbcf
16 changed files with 1669 additions and 1447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/cache/msg.go
Vendored
+1 -1
View File
@@ -170,7 +170,7 @@ func (c *msgCache) GetMinSeq(ctx context.Context, conversationID string) (int64,
}
func (c *msgCache) getConversationUserMinSeqKey(conversationID, userID string) string {
return conversationUserMinSeq + "g:" + conversationID + "u:" + userID
return conversationUserMinSeq + conversationID + "u:" + userID
}
func (c *msgCache) GetConversationUserMinSeq(ctx context.Context, conversationID string, userID string) (int64, error) {
pkg/common/db/unrelation/mongo.go
+1 -1
View File
@@ -99,7 +99,7 @@ func (m *Mongo) createMongoIndex(collection string, isUnique bool, keys ...strin
index := mongo.IndexModel{
Keys: keysDoc,
}
if isUnique == true {
if isUnique {
index.Options = options.Index().SetUnique(true)
}
result, err := indexView.CreateOne(