mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-05-02 08:05:58 +08:00
fix(main): add more cases for get_users api, so it accept users in older version. feat(main): also add search functionality (#1751)
* update set pin friends
* update set pin friends
* update set pin friends
* update set pin friends
* update set pin friends
* update set pin friends
* fix bugs
* fix bugs
* debug
* debug
* debug
* debug
* debug
* debug
* debug
* debug
* debug
* debug
* debug
* debug
* Update go.mod
* Update friend.go
* debug
* debug
* debug
* add pin friend test
* add pin friend test
* add pin friend test
* add pin friend test
* add pin friend test
* add pin friend test
* add pin friend test
* add pin friend test
* add pin friend test
* I cannot solve todo in test.sh
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* update user command
* Update go.mod
* fix group notification
* fix group notification
* update openimsdk tools
* update openim server remove duplicate code
* update openim server remove duplicate code
* update user command get
* update user command get
* update response of callback response error
* update black ex
* update join group ex
* update user pb2map
* update go sum
* update go sum
* update updateUserInfoEx
* update updateUserInfoEx
* update updateUserInfoEx add callback functions
* fix dismiss group function
* fix dismiss group function
* fix dismiss group function
* fix dismiss group function
* update pin friend to update friend
* fix go mod
* fix err golangci-lint
* fix UserPb2DBMap
* update comments, update go.mod check for register username
* update comments, update go.mod check for register username
* update comments, update go.mod check for register username
* update comments, update go.mod check for register username
* fix callback
* fix go.mod
* fix debug
* fix bugs
* update notification
* update notification
* update notification
* update notification
* update notification
* update notification
* update notification
* update notification
* fix updateUserInfoEx
* fix updateUserInfoEx
* modify go.mod
* fix updateUserInfoEx
* fix updateUserInfoEx
* fix: fix the bug
* fix: fix the imAdmin permission and searchNoficitaion resp
* fix updateUserInfoEx
* 2023 Annual Summary Reflections and Aspirations
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
* fix: dissmissGroup and lack of keyword bug (#1678)
* Update docker-start-all.sh
* Update env-template.yaml
* update user command notification
* Update docker-start-all.sh
* fix openim config mongo passwd env
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
* update user command get all notification
* update user command get all notification
* fix type = 0
* fix type = 0
* fix type = 0
* fix type = 0
* fix type = 0
* fix type = 0
* fix typing cause callback
* add ex to usercommand
* add ex to usercommand
* update updatefriends
* fix updatefriend map
* fix updatefriend FriendsInfoUpdateNotification
* fix push online and offline user, but why typing trigger callback push?
* fix push online and offline user, but why typing trigger callback push?
* update user command record not found and user access check
* update user command get all user access check
* update go.mod
* fix callback name and place
* fix: fix some bug
* fix: group messages sync failed.
* upadtae callback test
* fix callback typing
* fix callback typing
* fix callback typing
* fix callback typing
* fix lint on processusercommand
* fix: fix the valiable name
* fix: fix the getSortedConversation api
* fix: fix the mongo search error
* fix: GroupApplicationAcceptedNotification
(cherry picked from commit 4c3c4555a3)
* fix: GroupApplicationAcceptedNotification
* fix update friends
* fix pageFindUser
* fix pageFindUser
* fix pageFindUser
* fix pageFindUser
* Delete .devcontainer directory
* revert
* more powerful PageFindUserWithKeyword
* more powerful PageFindUserWithKeyword
* more powerful PageFindUserWithKeyword
---------
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Co-authored-by: Xinwei Xiong <3293172751@qq.com>
Co-authored-by: luhaoling <2198702716@qq.com>
Co-authored-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Co-authored-by: Brabem <69128477+luhaoling@users.noreply.github.com>
Co-authored-by: OpenIM Bot <124379614+kubbot@users.noreply.github.com>
Co-authored-by: OpenIM Robot <139873238+openimbot@users.noreply.github.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: withchao <993506633@qq.com>
This commit is contained in:
@@ -48,10 +48,12 @@ type UserDatabase interface {
|
||||
//Update(ctx context.Context, user *relation.UserModel) (err error)
|
||||
// UpdateByMap update (zero value) external guarantee userID exists
|
||||
UpdateByMap(ctx context.Context, userID string, args map[string]any) (err error)
|
||||
// FindUser
|
||||
PageFindUser(ctx context.Context, level1 int64, level2 int64, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error)
|
||||
//FindUser with keyword
|
||||
PageFindUserWithKeyword(ctx context.Context, level1 int64, level2 int64, userID string, userName string, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error)
|
||||
// Page If not found, no error is returned
|
||||
Page(ctx context.Context, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error)
|
||||
// FindUser
|
||||
PageFindUser(ctx context.Context, level int64, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error)
|
||||
// IsExist true as long as one exists
|
||||
IsExist(ctx context.Context, userIDs []string) (exist bool, err error)
|
||||
// GetAllUserID Get all user IDs
|
||||
@@ -185,8 +187,11 @@ func (u *userDatabase) Page(ctx context.Context, pagination pagination.Paginatio
|
||||
return u.userDB.Page(ctx, pagination)
|
||||
}
|
||||
|
||||
func (u *userDatabase) PageFindUser(ctx context.Context, level int64, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error) {
|
||||
return u.userDB.PageFindUser(ctx, level, pagination)
|
||||
func (u *userDatabase) PageFindUser(ctx context.Context, level1 int64, level2 int64, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error) {
|
||||
return u.userDB.PageFindUser(ctx, level1, level2, pagination)
|
||||
}
|
||||
func (u *userDatabase) PageFindUserWithKeyword(ctx context.Context, level1 int64, level2 int64, userID, userName string, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error) {
|
||||
return u.userDB.PageFindUserWithKeyword(ctx, level1, level2, userID, userName, pagination)
|
||||
}
|
||||
|
||||
// IsExist Does userIDs exist? As long as there is one, it will be true.
|
||||
|
||||
Reference in New Issue
Block a user