Merge pull request #118 from cyanray/dev/cyanray

适配 mirai-api-http v2.1.0;
cyanray · Sep 22, 2021 · 546fbbb · 546fbbb
2 parents e62c380 + 4c836c1
commit 546fbbb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/include/mirai/mirai_bot.hpp b/include/mirai/mirai_bot.hpp
@@ -410,6 +410,12 @@ namespace Cyan
 		*/
 		void SendCommand(const vector<string>& command);
 
+		/**
+		 * @brief 获取 Session 信息
+		 * @return 关于 Bot 的信息
+		*/
+		Friend_t GetSessionInfo();
+
 		/**
 		 * \brief 监听事件
 		 * \tparam T 事件类型

diff --git a/src/mirai_bot.cpp b/src/mirai_bot.cpp
@@ -184,16 +184,23 @@ namespace Cyan
 		pmem->sessionOptions = std::make_shared<SessionOptions>(opts);
 		pmem->threadPool = std::make_unique<ThreadPool>(opts.ThreadPoolSize.Get());
 		pmem->httpClient = std::make_shared<httplib::Client>(opts.HttpHostname.Get(), opts.HttpPort.Get());
-		pmem->botQQ = opts.BotQQ.Get();
+
 		string& sessionKey = pmem->sessionKey;
 		if (opts.EnableVerify.Get())
 		{
 			sessionKey = pmem->Verify(opts.VerifyKey.Get());
 		}
 		if (!opts.SingleMode.Get())
 		{
+			pmem->botQQ = opts.BotQQ.Get();
 			pmem->SessionBind(sessionKey, opts.BotQQ.Get());
 		}
+		else
+		{
+			auto info = GetSessionInfo();
+			pmem->sessionOptions->BotQQ = info.QQ;
+			pmem->botQQ = info.QQ;
+		}
 
 		pmem->eventClient.Connect(
 			opts.WebSocketHostname.Get(),
@@ -970,4 +977,15 @@ namespace Cyan
 		auto res = pmem->httpClient->Post("/cmd/execute", data.dump(), CONTENT_TYPE.c_str());
 		ParseOrThrowException(res);
 	}
+
+	Friend_t MiraiBot::GetSessionInfo()
+	{
+		auto res = pmem->httpClient->Get("/sessionInfo?sessionKey="s.append(pmem->sessionKey).data());
+		json re_json = ParseOrThrowException(res);
+		Friend_t result;
+		result.Set(re_json["data"]["qq"]);
+		return result;
+
+	}
+
 } // namespace Cyan