mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-04-05 20:11:14 +08:00
fix setUserInfoEx (#1635)
* 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 --------- Co-authored-by: Xinwei Xiong <3293172751@qq.com>
This commit is contained in:
AndrewZuo01
GitHub
parent
7ddb84f7fc
commit
c68a61d8c2
4
go.mod
4
go.mod
@ -4,7 +4,7 @@ go 1.19
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
firebase.google.com/go v3.13.0+incompatible
|
firebase.google.com/go v3.13.0+incompatible
|
||||||
github.com/OpenIMSDK/protocol v0.0.41
|
github.com/OpenIMSDK/protocol v0.0.42
|
||||||
github.com/OpenIMSDK/tools v0.0.21
|
github.com/OpenIMSDK/tools v0.0.21
|
||||||
github.com/bwmarrin/snowflake v0.3.0 // indirect
|
github.com/bwmarrin/snowflake v0.3.0 // indirect
|
||||||
github.com/dtm-labs/rockscache v0.1.1
|
github.com/dtm-labs/rockscache v0.1.1
|
||||||
@ -155,4 +155,4 @@ require (
|
|||||||
go.uber.org/zap v1.24.0 // indirect
|
go.uber.org/zap v1.24.0 // indirect
|
||||||
golang.org/x/crypto v0.14.0 // indirect
|
golang.org/x/crypto v0.14.0 // indirect
|
||||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
)
|
)
|
||||||
@ -16,7 +16,6 @@ package user
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
pbuser "github.com/OpenIMSDK/protocol/user"
|
pbuser "github.com/OpenIMSDK/protocol/user"
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
"github.com/OpenIMSDK/tools/utils"
|
||||||
|
|
||||||
@ -67,16 +66,16 @@ func CallbackBeforeUpdateUserInfoEx(ctx context.Context, req *pbuser.UpdateUserI
|
|||||||
cbReq := &cbapi.CallbackBeforeUpdateUserInfoExReq{
|
cbReq := &cbapi.CallbackBeforeUpdateUserInfoExReq{
|
||||||
CallbackCommand: cbapi.CallbackBeforeUpdateUserInfoExCommand,
|
CallbackCommand: cbapi.CallbackBeforeUpdateUserInfoExCommand,
|
||||||
UserID: req.UserInfo.UserID,
|
UserID: req.UserInfo.UserID,
|
||||||
FaceURL: &req.UserInfo.FaceURL,
|
FaceURL: req.UserInfo.FaceURL,
|
||||||
Nickname: &req.UserInfo.Nickname,
|
Nickname: req.UserInfo.Nickname,
|
||||||
}
|
}
|
||||||
resp := &cbapi.CallbackBeforeUpdateUserInfoExResp{}
|
resp := &cbapi.CallbackBeforeUpdateUserInfoExResp{}
|
||||||
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeUpdateUserInfoEx); err != nil {
|
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeUpdateUserInfoEx); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
utils.NotNilReplace(&req.UserInfo.FaceURL, resp.FaceURL)
|
utils.NotNilReplace(req.UserInfo.FaceURL, resp.FaceURL)
|
||||||
utils.NotNilReplace(req.UserInfo.Ex, resp.Ex)
|
utils.NotNilReplace(req.UserInfo.Ex, resp.Ex)
|
||||||
utils.NotNilReplace(&req.UserInfo.Nickname, resp.Nickname)
|
utils.NotNilReplace(req.UserInfo.Nickname, resp.Nickname)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
func CallbackAfterUpdateUserInfoEx(ctx context.Context, req *pbuser.UpdateUserInfoExReq) error {
|
func CallbackAfterUpdateUserInfoEx(ctx context.Context, req *pbuser.UpdateUserInfoExReq) error {
|
||||||
|
|||||||
@ -168,7 +168,7 @@ func (s *userServer) UpdateUserInfoEx(ctx context.Context, req *pbuser.UpdateUse
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if req.UserInfo.Nickname != "" || req.UserInfo.FaceURL != "" {
|
if req.UserInfo.Nickname != nil || req.UserInfo.FaceURL != nil {
|
||||||
if err := s.groupRpcClient.NotificationUserInfoUpdate(ctx, req.UserInfo.UserID); err != nil {
|
if err := s.groupRpcClient.NotificationUserInfoUpdate(ctx, req.UserInfo.UserID); err != nil {
|
||||||
log.ZError(ctx, "NotificationUserInfoUpdate", err)
|
log.ZError(ctx, "NotificationUserInfoUpdate", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,22 +47,22 @@ type CallbackAfterUpdateUserInfoResp struct {
|
|||||||
type CallbackBeforeUpdateUserInfoExReq struct {
|
type CallbackBeforeUpdateUserInfoExReq struct {
|
||||||
CallbackCommand `json:"callbackCommand"`
|
CallbackCommand `json:"callbackCommand"`
|
||||||
UserID string `json:"userID"`
|
UserID string `json:"userID"`
|
||||||
Nickname *string `json:"nickName"`
|
Nickname *wrapperspb.StringValue `json:"nickName"`
|
||||||
FaceURL *string `json:"faceURL"`
|
FaceURL *wrapperspb.StringValue `json:"faceURL"`
|
||||||
Ex *wrapperspb.StringValue `json:"ex"`
|
Ex *wrapperspb.StringValue `json:"ex"`
|
||||||
}
|
}
|
||||||
type CallbackBeforeUpdateUserInfoExResp struct {
|
type CallbackBeforeUpdateUserInfoExResp struct {
|
||||||
CommonCallbackResp
|
CommonCallbackResp
|
||||||
Nickname *string `json:"nickName"`
|
Nickname *wrapperspb.StringValue `json:"nickName"`
|
||||||
FaceURL *string `json:"faceURL"`
|
FaceURL *wrapperspb.StringValue `json:"faceURL"`
|
||||||
Ex *wrapperspb.StringValue `json:"ex"`
|
Ex *wrapperspb.StringValue `json:"ex"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type CallbackAfterUpdateUserInfoExReq struct {
|
type CallbackAfterUpdateUserInfoExReq struct {
|
||||||
CallbackCommand `json:"callbackCommand"`
|
CallbackCommand `json:"callbackCommand"`
|
||||||
UserID string `json:"userID"`
|
UserID string `json:"userID"`
|
||||||
Nickname string `json:"nickName"`
|
Nickname *wrapperspb.StringValue `json:"nickName"`
|
||||||
FaceURL string `json:"faceURL"`
|
FaceURL *wrapperspb.StringValue `json:"faceURL"`
|
||||||
Ex *wrapperspb.StringValue `json:"ex"`
|
Ex *wrapperspb.StringValue `json:"ex"`
|
||||||
}
|
}
|
||||||
type CallbackAfterUpdateUserInfoExResp struct {
|
type CallbackAfterUpdateUserInfoExResp struct {
|
||||||
|
|||||||
@ -79,14 +79,17 @@ func UserPb2DBMapEx(user *sdkws.UserInfoWithEx) map[string]any {
|
|||||||
val := make(map[string]any)
|
val := make(map[string]any)
|
||||||
|
|
||||||
// Map fields from UserInfoWithEx to val
|
// Map fields from UserInfoWithEx to val
|
||||||
val["nickname"] = user.Nickname
|
if user.Nickname != nil {
|
||||||
val["face_url"] = user.FaceURL
|
val["nickname"] = user.Nickname.Value
|
||||||
|
}
|
||||||
|
if user.FaceURL != nil {
|
||||||
|
val["face_url"] = user.FaceURL.Value
|
||||||
|
}
|
||||||
if user.Ex != nil {
|
if user.Ex != nil {
|
||||||
val["ex"] = user.Ex.Value
|
val["ex"] = user.Ex.Value
|
||||||
}
|
}
|
||||||
if user.GlobalRecvMsgOpt != 0 {
|
if user.GlobalRecvMsgOpt != nil {
|
||||||
val["global_recv_msg_opt"] = user.GlobalRecvMsgOpt
|
val["global_recv_msg_opt"] = user.GlobalRecvMsgOpt.Value
|
||||||
}
|
}
|
||||||
|
|
||||||
return val
|
return val
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user