Skip to content

Commit 98fc9b2

Browse files
committed
conversation group at type modify
1 parent 81bcf05 commit 98fc9b2

File tree

2 files changed

+250
-256
lines changed

2 files changed

+250
-256
lines changed

Diff for: internal/conversation_msg/conversation_msg.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,12 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
101101
phNewConversationSet := make(map[string]*db.LocalConversation)
102102
log.Info(operationID, "do Msg come here")
103103
for _, v := range allMsg {
104-
log.Error("this test", v.Options, v.ClientMsgID)
105104

106105
isHistory = utils.GetSwitchFromOptions(v.Options, constant.IsHistory)
107106
isUnreadCount = utils.GetSwitchFromOptions(v.Options, constant.IsUnreadCount)
108107
isConversationUpdate = utils.GetSwitchFromOptions(v.Options, constant.IsConversationUpdate)
109108
isNotPrivate = utils.GetSwitchFromOptions(v.Options, constant.IsNotPrivate)
110109
isSenderConversationUpdate = utils.GetSwitchFromOptions(v.Options, constant.IsSenderConversationUpdate)
111-
//if v.ClientMsgID == "a1eb02b43909fbe33e44e80d2b49c87e" {
112-
// log.Error("this test",v.Options,isConversationUpdate)
113-
//}
114110
msg := new(sdk_struct.MsgStruct)
115111
copier.Copy(msg, v)
116112
var tips server_api_params.TipsComm
@@ -268,7 +264,7 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
268264
lc.FaceURL = msg.SenderFaceURL
269265
case constant.GroupChatType:
270266
//Generate At type into Conversation
271-
c.genConversationGroupAtType(&lc, msg)
267+
//c.genConversationGroupAtType(&lc, msg)
272268
lc.GroupID = v.GroupID
273269
lc.ConversationID = utils.GetConversationIDBySessionType(lc.GroupID, constant.GroupChatType)
274270
//faceUrl, name, err := u.getGroupNameAndFaceUrlByUid(c.GroupID)
@@ -387,7 +383,6 @@ func (c *Conversation) diff(local, generated, cc, nc map[string]*db.LocalConvers
387383
for _, v := range generated {
388384
log.Debug("node diff", *v)
389385
if localC, ok := local[v.ConversationID]; ok {
390-
localC.GroupAtType = v.GroupAtType
391386
if v.LatestMsgSendTime > localC.LatestMsgSendTime {
392387
localC.UnreadCount = localC.UnreadCount + v.UnreadCount
393388
localC.LatestMsg = v.LatestMsg
@@ -750,7 +745,6 @@ func (c *Conversation) updateConversation(lc *db.LocalConversation, cs map[strin
750745
if oldC, ok := cs[lc.ConversationID]; !ok {
751746
cs[lc.ConversationID] = lc
752747
} else {
753-
oldC.GroupAtType = lc.GroupAtType
754748
if lc.LatestMsgSendTime > oldC.LatestMsgSendTime {
755749
oldC.UnreadCount = oldC.UnreadCount + lc.UnreadCount
756750
oldC.LatestMsg = lc.LatestMsg

0 commit comments

Comments
 (0)