IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 14:29:19 +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
parent 6135ce0919 fdd765f982
commit 0c5cec8413
3 changed files with 360 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/msg/extend_msg.go
+4 -4
View File
@@ -291,11 +291,11 @@ func (rpc *rpcChat) AddMessageReactionExtensions(ctx context.Context, req *msg.A
if callbackResp.ActionCode != constant.ActionAllow || callbackResp.ErrCode != 0 {
rResp.ErrCode = int32(callbackResp.ErrCode)
rResp.ErrMsg = callbackResp.ErrMsg
for _, value := range req.ReactionExtensionList {
for _, value := range callbackResp.ResultReactionExtensionList {
temp := new(msg.KeyValueResp)
temp.KeyValue = value
temp.ErrMsg = callbackResp.ErrMsg
temp.ErrCode = 100
temp.KeyValue = value.KeyValue
temp.ErrMsg = value.ErrMsg
temp.ErrCode = value.ErrCode
rResp.Result = append(rResp.Result, temp)
}
return &rResp, nil
pkg/proto/sdk_ws/ws.pb.go
+352 -352
View File
File diff suppressed because it is too large Load Diff
pkg/proto/sdk_ws/ws.proto
+4 -3
View File
@@ -266,9 +266,10 @@ message MsgData {
bytes msgDataList = 21;
string attachedInfo = 22;
string ex = 23;
bool isReact = 24;
bool isExternalExtensions = 25;
int64 msgFirstModifyTime = 26;
bool isReact = 40;
bool isExternalExtensions = 41;
int64 msgFirstModifyTime = 42;
}
message OfflinePushInfo{