mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-01-10 06:06:57 +08:00
fix: solve conversations bug.
This commit is contained in:
parent
ee80099da0
commit
0551d46ade
@ -247,6 +247,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
|
|||||||
}
|
}
|
||||||
conv = *cs[0]
|
conv = *cs[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
var conversation dbModel.Conversation
|
var conversation dbModel.Conversation
|
||||||
conversation.ConversationID = req.Conversation.ConversationID
|
conversation.ConversationID = req.Conversation.ConversationID
|
||||||
conversation.ConversationType = req.Conversation.ConversationType
|
conversation.ConversationType = req.Conversation.ConversationType
|
||||||
@ -259,12 +260,14 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
|
|||||||
unequal++
|
unequal++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Conversation.AttachedInfo != nil {
|
if req.Conversation.AttachedInfo != nil {
|
||||||
m["attached_info"] = req.Conversation.AttachedInfo.Value
|
m["attached_info"] = req.Conversation.AttachedInfo.Value
|
||||||
if req.Conversation.AttachedInfo.Value != conv.AttachedInfo {
|
if req.Conversation.AttachedInfo.Value != conv.AttachedInfo {
|
||||||
unequal++
|
unequal++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Conversation.Ex != nil {
|
if req.Conversation.Ex != nil {
|
||||||
m["ex"] = req.Conversation.Ex.Value
|
m["ex"] = req.Conversation.Ex.Value
|
||||||
if req.Conversation.Ex.Value != conv.Ex {
|
if req.Conversation.Ex.Value != conv.Ex {
|
||||||
@ -277,24 +280,48 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
|
|||||||
unequal++
|
unequal++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Conversation.GroupAtType != nil {
|
if req.Conversation.GroupAtType != nil {
|
||||||
m["group_at_type"] = req.Conversation.GroupAtType.Value
|
m["group_at_type"] = req.Conversation.GroupAtType.Value
|
||||||
if req.Conversation.GroupAtType.Value != conv.GroupAtType {
|
if req.Conversation.GroupAtType.Value != conv.GroupAtType {
|
||||||
unequal++
|
unequal++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Conversation.MsgDestructTime != nil {
|
if req.Conversation.MsgDestructTime != nil {
|
||||||
m["msg_destruct_time"] = req.Conversation.MsgDestructTime.Value
|
m["msg_destruct_time"] = req.Conversation.MsgDestructTime.Value
|
||||||
if req.Conversation.MsgDestructTime.Value != conv.MsgDestructTime {
|
if req.Conversation.MsgDestructTime.Value != conv.MsgDestructTime {
|
||||||
unequal++
|
unequal++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Conversation.IsMsgDestruct != nil {
|
if req.Conversation.IsMsgDestruct != nil {
|
||||||
m["is_msg_destruct"] = req.Conversation.IsMsgDestruct.Value
|
m["is_msg_destruct"] = req.Conversation.IsMsgDestruct.Value
|
||||||
if req.Conversation.IsMsgDestruct.Value != conv.IsMsgDestruct {
|
if req.Conversation.IsMsgDestruct.Value != conv.IsMsgDestruct {
|
||||||
unequal++
|
unequal++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.Conversation.BurnDuration != nil {
|
||||||
|
m["burn_duration"] = req.Conversation.BurnDuration.Value
|
||||||
|
if req.Conversation.BurnDuration.Value != conv.BurnDuration {
|
||||||
|
unequal++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(m) != 0 {
|
||||||
|
if err := c.conversationDatabase.SetUsersConversationFieldTx(ctx, req.UserIDs, &conversation, m); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if unequal > 0 {
|
||||||
|
for _, v := range req.UserIDs {
|
||||||
|
c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
|
||||||
|
}
|
||||||
|
return &pbconversation.SetConversationsResp{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
if req.Conversation.IsPrivateChat != nil && req.Conversation.ConversationType != constant.ReadGroupChatType {
|
if req.Conversation.IsPrivateChat != nil && req.Conversation.ConversationType != constant.ReadGroupChatType {
|
||||||
var conversations []*dbModel.Conversation
|
var conversations []*dbModel.Conversation
|
||||||
for _, ownerUserID := range req.UserIDs {
|
for _, ownerUserID := range req.UserIDs {
|
||||||
@ -313,23 +340,6 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Conversation.BurnDuration != nil {
|
|
||||||
m["burn_duration"] = req.Conversation.BurnDuration.Value
|
|
||||||
if req.Conversation.BurnDuration.Value != conv.BurnDuration {
|
|
||||||
unequal++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := c.conversationDatabase.SetUsersConversationFieldTx(ctx, req.UserIDs, &conversation, m); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if unequal > 0 {
|
|
||||||
for _, v := range req.UserIDs {
|
|
||||||
c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return &pbconversation.SetConversationsResp{}, nil
|
return &pbconversation.SetConversationsResp{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user