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

Merge main into sweep/real-time-status-updates

Browse Source
This commit is contained in:
sweep-ai[bot] 2023-08-21 06:16:38 +00:00 committed by GitHub
commit 0a57d6aa6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/common/convert/msg.go
View File

@ -15,6 +15,7 @@
package convert package convert
import ( import (
"github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/sdkws"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
@ -78,7 +79,9 @@ func MsgDB2Pb(msgModel *unrelation.MsgDataModel) *sdkws.MsgData {
msg.SendTime = msgModel.SendTime msg.SendTime = msgModel.SendTime
msg.CreateTime = msgModel.CreateTime msg.CreateTime = msgModel.CreateTime
msg.Status = msgModel.Status msg.Status = msgModel.Status
msg.IsRead = msgModel.IsRead if msgModel.SessionType == constant.SingleChatType {
msg.IsRead = msgModel.IsRead
}
msg.Options = msgModel.Options msg.Options = msgModel.Options
if msgModel.OfflinePush != nil { if msgModel.OfflinePush != nil {
msg.OfflinePushInfo = &sdkws.OfflinePushInfo{ msg.OfflinePushInfo = &sdkws.OfflinePushInfo{