|
|
@ -583,6 +583,7 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G
|
|
|
|
c.ConversationType = constant.GroupChatType
|
|
|
|
c.ConversationType = constant.GroupChatType
|
|
|
|
c.GroupID = req.GroupID
|
|
|
|
c.GroupID = req.GroupID
|
|
|
|
c.IsNotInGroup = false
|
|
|
|
c.IsNotInGroup = false
|
|
|
|
|
|
|
|
c.UpdateUnreadCountTime = utils.GetCurrentTimestampByMill()
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
c.OwnerUserID = conversation.OwnerUserID
|
|
|
|
c.OwnerUserID = conversation.OwnerUserID
|
|
|
|
c.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, constant.GroupChatType)
|
|
|
|
c.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, constant.GroupChatType)
|
|
|
@ -595,7 +596,6 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G
|
|
|
|
c.GroupAtType = conversation.GroupAtType
|
|
|
|
c.GroupAtType = conversation.GroupAtType
|
|
|
|
c.IsNotInGroup = false
|
|
|
|
c.IsNotInGroup = false
|
|
|
|
c.Ex = conversation.Ex
|
|
|
|
c.Ex = conversation.Ex
|
|
|
|
c.UpdateUnreadCountTime = utils.GetCurrentTimestampByMill()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
reqPb.Conversation = &c
|
|
|
|
reqPb.Conversation = &c
|
|
|
|
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
|
|
|
|
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
|
|
|
|