From 27e62c9cd0a34ca51099917d2ee6f5b5c79499ae Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Wed, 13 Mar 2024 16:28:18 +0800
Subject: [PATCH] fix: getConversationInfo

---
 internal/rpc/conversation/conversaion.go | 26 ++++++++++++++++--------
 tools/component/component.go             |  5 +++--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go
index 81b4d9d45..d8cece012 100644
--- a/internal/rpc/conversation/conversaion.go
+++ b/internal/rpc/conversation/conversaion.go
@@ -506,19 +506,27 @@ func (c *conversationServer) getConversationInfo(
 		switch chatLog.SessionType {
 		case constant.SingleChatType:
 			if chatLog.SendID == userID {
-				msgInfo.FaceURL = sendMap[chatLog.RecvID].FaceURL
-				msgInfo.SenderName = sendMap[chatLog.RecvID].Nickname
+				if recv, ok := sendMap[chatLog.RecvID]; ok {
+					msgInfo.FaceURL = recv.FaceURL
+					msgInfo.SenderName = recv.Nickname
+				}
 				break
 			}
-			msgInfo.FaceURL = sendMap[chatLog.SendID].FaceURL
-			msgInfo.SenderName = sendMap[chatLog.SendID].Nickname
+			if send, ok := sendMap[chatLog.SendID]; ok {
+				msgInfo.FaceURL = send.FaceURL
+				msgInfo.SenderName = send.Nickname
+			}
 		case constant.GroupChatType, constant.SuperGroupChatType:
-			msgInfo.GroupName = groupMap[chatLog.GroupID].GroupName
-			msgInfo.GroupFaceURL = groupMap[chatLog.GroupID].FaceURL
-			msgInfo.GroupMemberCount = groupMap[chatLog.GroupID].MemberCount
 			msgInfo.GroupID = chatLog.GroupID
-			msgInfo.GroupType = groupMap[chatLog.GroupID].GroupType
-			msgInfo.SenderName = sendMap[chatLog.SendID].Nickname
+			if group, ok := groupMap[chatLog.GroupID]; ok {
+				msgInfo.GroupName = group.GroupName
+				msgInfo.GroupFaceURL = group.FaceURL
+				msgInfo.GroupMemberCount = group.MemberCount
+				msgInfo.GroupType = group.GroupType
+			}
+			if send, ok := sendMap[chatLog.SendID]; ok {
+				msgInfo.SenderName = send.Nickname
+			}
 		}
 		pbchatLog.ConversationID = conversationID
 		msgInfo.LatestMsgRecvTime = chatLog.SendTime
diff --git a/tools/component/component.go b/tools/component/component.go
index f926f5e40..4459a055f 100644
--- a/tools/component/component.go
+++ b/tools/component/component.go
@@ -98,13 +98,14 @@ func main() {
 	}
 
 	checks := []checkFunc{
-		//{name: "Mysql", function: checkMysql},
 		{name: "Mongo", function: checkMongo, config: conf},
 		{name: "Redis", function: checkRedis, config: conf},
-		{name: "Minio", function: checkMinio, config: conf},
 		{name: "Zookeeper", function: checkZookeeper, config: conf},
 		{name: "Kafka", function: checkKafka, config: conf},
 	}
+	if conf.Object.Enable == "minio" {
+		checks = append(checks, checkFunc{name: "Minio", function: checkMinio, config: conf})
+	}
 
 	for i := 0; i < maxRetry; i++ {
 		if i != 0 {