Compare commits
71 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e49e3475b2 | ||
|
|
4f69dd496c | ||
|
|
a1bdb01cd2 | ||
|
|
a77c47ebf6 | ||
|
|
e2c90d7d12 | ||
|
|
ac29fd654e | ||
|
|
1c751db156 | ||
|
|
ac7e909463 | ||
|
|
dc419794e7 | ||
|
|
729b18d2a2 | ||
|
|
1d7ec29358 | ||
|
|
fc243d321c | ||
|
|
e6fd55555d | ||
|
|
8361e3554e | ||
|
|
9e65261763 | ||
|
|
60383415d7 | ||
|
|
6021080e7b | ||
|
|
8c05b2771a | ||
|
|
975b9ef62b | ||
|
|
d88e77868d | ||
|
|
32a2614039 | ||
|
|
a63fa37ad1 | ||
|
|
05388598c1 | ||
|
|
0721fb75f8 | ||
|
|
74484735f8 | ||
|
|
5b5d6c3318 | ||
|
|
a5c412ceaa | ||
|
|
63c1778ae7 | ||
|
|
014c3b7824 | ||
|
|
cd87175697 | ||
|
|
f4b0c79f70 | ||
|
|
56bcb57b53 | ||
|
|
407dff20f1 | ||
|
|
233c1e3fef | ||
|
|
0cc5125ef6 | ||
|
|
2639ecb7ce | ||
|
|
c7bbe6acc4 | ||
|
|
33f9e28865 | ||
|
|
edc2f79740 | ||
|
|
bd118ba824 | ||
|
|
8744accfa1 | ||
|
|
0af496417c | ||
|
|
89c0dc43a2 | ||
|
|
cdbd4d5240 | ||
|
|
bbb9f85a50 | ||
|
|
3ffbb90d77 | ||
|
|
3b74ad3d9a | ||
|
|
82d7255058 | ||
|
|
a6fd0f95bf | ||
|
|
a99e54de6b | ||
|
|
7eeb3d6792 | ||
|
|
ba6013d352 | ||
|
|
0c1bbd0de5 | ||
|
|
bc70c5bb15 | ||
|
|
177a163d90 | ||
|
|
445c34d9ed | ||
|
|
82e53195c1 | ||
|
|
d4d88d56ad | ||
|
|
49220ccfbf | ||
|
|
ac14dd0249 | ||
|
|
f4c31ea09a | ||
|
|
0ed80222fe | ||
|
|
ce81f6b096 | ||
|
|
4fc70a7815 | ||
|
|
6b1e2015c2 | ||
|
|
be0abddcc4 | ||
|
|
eaeb342b0e | ||
|
|
f0227efa30 | ||
|
|
78daeec424 | ||
|
|
5cc7483a4f | ||
|
|
a99b6a1700 |
11
.github/sync.yml
vendored
11
.github/sync.yml
vendored
@@ -75,17 +75,6 @@ OpenIMSDK/OpenKF:
|
|||||||
dest: .github/.codecov.yml
|
dest: .github/.codecov.yml
|
||||||
replace: false
|
replace: false
|
||||||
|
|
||||||
openim-sigs/openim-docker:
|
|
||||||
- source: ./config
|
|
||||||
dest: ./openim-server/config
|
|
||||||
replace: true
|
|
||||||
- source: ./docs
|
|
||||||
dest: ./openim-server/docs
|
|
||||||
replace: true
|
|
||||||
- source: ./scripts
|
|
||||||
dest: ./openim-server/scripts
|
|
||||||
replace: true
|
|
||||||
|
|
||||||
group:
|
group:
|
||||||
# first group:common to all warehouses
|
# first group:common to all warehouses
|
||||||
# TODO: add the required warehouse here
|
# TODO: add the required warehouse here
|
||||||
|
|||||||
@@ -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{
|
||||||
|
|||||||
Reference in New Issue
Block a user