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

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

Browse Source
This commit is contained in:
Gordon 2023-07-04 09:40:11 +08:00
commit e416ace264
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/common/db/unrelation/msg.go
View File

@ -338,6 +338,8 @@ func (m *MsgMongoDriver) RangeUserSendCount(ctx context.Context, start time.Time
"$gte": bson.A{ "$gte": bson.A{
"$$item.msg.send_time", start.UnixMilli(), "$$item.msg.send_time", start.UnixMilli(),
}, },
},
bson.M{
"$lt": bson.A{ "$lt": bson.A{
"$$item.msg.send_time", end.UnixMilli(), "$$item.msg.send_time", end.UnixMilli(),
}, },

1
pkg/errs/relation.go
View File

@ -5,7 +5,6 @@ var Relation = &relation{m: make(map[int]map[int]struct{})}
func init() { func init() {
Relation.Add(RecordNotFoundError, UserIDNotFoundError) Relation.Add(RecordNotFoundError, UserIDNotFoundError)
Relation.Add(RecordNotFoundError, GroupIDNotFoundError) Relation.Add(RecordNotFoundError, GroupIDNotFoundError)
Relation.Add(DuplicateKeyError, UserIDExisted)
Relation.Add(DuplicateKeyError, GroupIDExisted) Relation.Add(DuplicateKeyError, GroupIDExisted)
} }