blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-14 17:31:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

Browse Source
This commit is contained in:
wangchuxiao 2023-02-20 10:25:06 +08:00
commit 0c5cec8413
3 changed files with 360 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/rpc/msg/extend_msg.go
View File

@ -291,11 +291,11 @@ func (rpc *rpcChat) AddMessageReactionExtensions(ctx context.Context, req *msg.A
if callbackResp.ActionCode != constant.ActionAllow || callbackResp.ErrCode != 0 { if callbackResp.ActionCode != constant.ActionAllow || callbackResp.ErrCode != 0 {
rResp.ErrCode = int32(callbackResp.ErrCode) rResp.ErrCode = int32(callbackResp.ErrCode)
rResp.ErrMsg = callbackResp.ErrMsg rResp.ErrMsg = callbackResp.ErrMsg
for _, value := range req.ReactionExtensionList { for _, value := range callbackResp.ResultReactionExtensionList {
temp := new(msg.KeyValueResp) temp := new(msg.KeyValueResp)
temp.KeyValue = value temp.KeyValue = value.KeyValue
temp.ErrMsg = callbackResp.ErrMsg temp.ErrMsg = value.ErrMsg
temp.ErrCode = 100 temp.ErrCode = value.ErrCode
rResp.Result = append(rResp.Result, temp) rResp.Result = append(rResp.Result, temp)
} }
return &rResp, nil return &rResp, nil

704
pkg/proto/sdk_ws/ws.pb.go
View File

File diff suppressed because it is too large Load Diff

7
pkg/proto/sdk_ws/ws.proto
View File

@ -266,9 +266,10 @@ message MsgData {
bytes msgDataList = 21; bytes msgDataList = 21;
string attachedInfo = 22; string attachedInfo = 22;
string ex = 23; string ex = 23;
bool isReact = 24;
bool isExternalExtensions = 25; bool isReact = 40;
int64 msgFirstModifyTime = 26; bool isExternalExtensions = 41;
int64 msgFirstModifyTime = 42;
} }
message OfflinePushInfo{ message OfflinePushInfo{