Merge pull request #85 from cyanray/dev/cyanray

新增: 支持戳一戳事件和发送

Author: cyanray

examples/CMakeLists.txt

@@ -35,4 +35,5 @@ api_exe(GroupNameChange)
 api_exe(GroupConfig)
 api_exe(MemberCardChange)
 api_exe(Command)
-api_exe(VoiceMessage)
+api_exe(VoiceMessage)
+api_exe(NudgeEvent)

examples/NudgeEvent.cpp

@@ -0,0 +1,84 @@
+#include <iostream>
+// 使用静态库必须要在引入 mirai.h 前定义这个宏
+#define MIRAICPP_STATICLIB
+#include <mirai.h>
+
+int main()
+{
+	using namespace std;
+	using namespace Cyan;
+
+	// 源文件使用 UTF-8 编码保存，在 Windows 上需要切换代码页才不会显示乱码
+#if defined(WIN32) || defined(_WIN32)
+	system("chcp 65001");
+#endif	
+
+	// 16 条事件处理线程
+	MiraiBot bot("127.0.0.1", 8762, 16);
+
+	// 检查一下版本
+	try
+	{
+		// 获取 mirai-api-http 插件的版本
+		string mah_version = bot.GetMiraiApiHttpVersion();
+		// 获取 mirai-cpp 的版本
+		string mc_version = bot.GetMiraiCppVersion();
+		cout << "! mirai-api-http 的版本: " << mah_version
+			<< "; 当mirai-cpp 的版本: " << mc_version << "; " << endl;
+		if (mah_version != mc_version)
+		{
+			cout << "! 警告: 你的 mirai-api-http 插件的版本与 mirai-cpp 的版本不同，可能存在兼容性问题。" << endl;
+		}
+	}
+	catch (const std::exception& ex)
+	{
+		cout << ex.what() << endl;
+	}
+
+	// 自动重试地进行 Auth
+	while (true)
+	{
+		try
+		{
+			bot.Auth("AuthKeyASDEWQ", 1589588851_qq);
+			break;
+		}
+		catch (const std::exception& ex)
+		{
+			cout << ex.what() << endl;
+		}
+		MiraiBot::SleepSeconds(1);
+	}
+	cout << "Bot Working..." << endl;
+
+	bot.On<NudgeEvent>(
+		[&](NudgeEvent e)
+		{
+			// 注意: 使用 SendNudge 发送的戳一戳，也会触发该事件,
+			// 注意: 因此必须过滤掉来自bot自己的戳一戳事件，不然会导致死循环
+			if (e.FromId.ToInt64() == bot.GetBotQQ().ToInt64()) return;
+
+			cout << e.FromId.ToInt64() << " " << e.Action << " " << e.Target << " " << e.Suffix;
+			// 如果别人戳机器人，那么就让机器人戳回去
+			if (e.Target.ToInt64() != bot.GetBotQQ().ToInt64()) return;
+			bot.SendNudge(e.FromId, e.SubjectId, e.FromKind);
+			// 如果不喜欢上面这一行代码，也可以用下面的代码代替
+			//if (e.FromKind == NudgeEvent::SubjectKind::Group)
+			//{
+			//	bot.SendNudge(e.FromId, (GID_t)e.SubjectId);
+			//}
+			//else
+			//{
+			//	bot.SendNudge(e.FromId, (QQ_t)e.SubjectId);
+			//}
+		});
+
+
+	// 记录轮询事件时的错误
+	bot.EventLoop([](const char* errMsg)
+		{
+			cout << "获取事件时出错: " << errMsg << endl;
+		});
+
+	return 0;
+}

include/mirai/events/events.hpp

@@ -33,6 +33,8 @@
 #include "bot_leave_kick.hpp"
 #include "bot_invited_join_group_request_event.hpp"
 #include "group_name_change.hpp"
+// 其他事件
+#include "nudge_event.hpp"
 // 一些定义
 #include "event_processer.hpp"
 #include "mirai_event.hpp"

include/mirai/events/mirai_event.hpp

@@ -37,7 +37,8 @@ namespace Cyan
 		Message,								// 通用消息事件
 		BotInvitedJoinGroupRequestEvent,		// Bot被邀请入群申请
 		MemberCardChangeEvent,				// 群成员群名片被修改事件
-		Command								// 指令事件
+		Command,								// 指令事件
+		NudgeEvent							// 戳一戳(头像)事件
 	};
 
 	inline MiraiEvent MiraiEventStr(const std::string& miraiEvent)
@@ -69,6 +70,7 @@ namespace Cyan
 		if (miraiEvent == "BotInvitedJoinGroupRequestEvent") return MiraiEvent::BotInvitedJoinGroupRequestEvent;
 		if (miraiEvent == "MemberCardChangeEvent") return MiraiEvent::MemberCardChangeEvent;
 		if (miraiEvent == "Command") return MiraiEvent::Command;
+		if (miraiEvent == "NudgeEvent") return MiraiEvent::NudgeEvent;
 		return MiraiEvent::Default;
 	}
 
@@ -143,6 +145,9 @@ namespace Cyan
 		case Cyan::MiraiEvent::Command:
 			result = "Command";
 			break;
+		case Cyan::MiraiEvent::NudgeEvent:
+			result = "NudgeEvent";
+			break;
 		default:
 			result = "Default";
 			break;

include/mirai/events/nudge_event.hpp

@@ -0,0 +1,82 @@
+#pragma once
+#ifndef mirai_cpp_events_nudge_event_hpp_H_
+#define mirai_cpp_events_nudge_event_hpp_H_
+
+#include <exception>
+#include "mirai/third-party/nlohmann/json.hpp"
+#include "mirai/defs/qq_types.hpp"
+#include "event_interface.hpp"
+
+namespace Cyan
+{
+	/**
+	 * \brief 戳一戳(头像)事件
+	 */
+	class NudgeEvent : public EventBase
+	{
+	public:
+		enum class SubjectKind
+		{
+			Friend, Group
+		};
+
+		QQ_t FromId;
+		QQ_t Target;
+		int64_t SubjectId;
+		SubjectKind FromKind;
+		string Action;
+		string Suffix;
+
+
+		static MiraiEvent GetMiraiEvent()
+		{
+			return MiraiEvent::NudgeEvent;
+		}
+
+		static string SubjectKindStr(SubjectKind k)
+		{
+			switch (k)
+			{
+			case Cyan::NudgeEvent::SubjectKind::Friend:
+				return "Friend";
+			case Cyan::NudgeEvent::SubjectKind::Group:
+				return "Group";
+			}
+			return "";
+		}
+
+		static SubjectKind SubjectKindStr(const string& k)
+		{
+			if (k == "Friend") return SubjectKind::Friend;
+			if (k == "Group") return SubjectKind::Group;
+			throw std::runtime_error("Unknown SubjectKind.");
+		}
+
+		virtual bool Set(const json& j) override
+		{
+			this->FromId = (QQ_t)(j["fromId"].get<int64_t>());
+			this->Target = (QQ_t)(j["target"].get<int64_t>());
+			this->SubjectId = j["subject"]["id"].get<int64_t>();
+			this->FromKind = SubjectKindStr(j["subject"]["kind"].get<string>());
+			this->Action = j["action"].get<string>();
+			this->Suffix = j["suffix"].get<string>();
+			return true;
+		}
+
+		virtual json ToJson() const override
+		{
+			return
+			{
+				{ "type", "NudgeEvent" },
+				{ "fromId", (int64_t)FromId },
+				{ "target", (int64_t)Target },
+				{ "subject", { {"id", SubjectId }, { "kind", SubjectKindStr(FromKind) } } },
+				{ "action", Action },
+				{ "suffix", Suffix }
+			};
+		}
+	};
+
+}
+
+#endif // !mirai_cpp_events_nudge_event_hpp_H_

include/mirai/mirai_bot.hpp

@@ -25,7 +25,8 @@
 #include "mirai/events/friend_message.hpp"
 #include "mirai/events/group_message.hpp"
 #include "mirai/events/message_event.hpp"
-#include <mirai/events/lost_connection.hpp>
+#include "mirai/events/nudge_event.hpp"
+#include "mirai/events/lost_connection.hpp"
 
 using std::string;
 using std::vector;
@@ -73,7 +74,7 @@ namespace Cyan
 		string GetMiraiCppVersion() const
 		{
 			// mirai-api-http v1.6.5
-			return "1.9.7";
+			return "1.9.10";
 		}
 
 		/**
@@ -128,6 +129,25 @@ namespace Cyan
 		 * \return 用于引用或撤回的消息 ID (MessageId)
 		 */
 		MessageId_t SendMessage(GID_t gid, QQ_t qq, const MessageChain& messageChain, MessageId_t msgId = 0);
+		/**
+		 * @brief 发送戳一戳
+		 * @param target 目标QQ，可以是好友或者Bot的QQ
+		 * @param subject_id 戳一戳接收主体，好友QQ
+		*/
+		void SendNudge(QQ_t target, QQ_t subject_id);
+		/**
+		 * @brief 发送戳一戳
+		 * @param target 目标QQ，可以是好友或者Bot的QQ
+		 * @param subject_id 戳一戳接收主体，群号码
+		*/
+		void SendNudge(QQ_t target, GID_t subject_id);
+		/**
+		 * @brief 发送戳一戳
+		 * @param target 目标QQ，可以是好友或者Bot的QQ
+		 * @param subject_id 戳一戳接收主体，可以是QQ好友或者群号码
+		 * @param kind 需要指定接收主体的类型
+		*/
+		void SendNudge(QQ_t target, int64_t subject_id, NudgeEvent::SubjectKind kind);
 		/**
 		 * \brief 上传可以发送给好友的图片
 		 * \param fileName 文件名
@@ -362,6 +382,7 @@ namespace Cyan
 		void EventLoop(function<void(const char*)> errLogger = nullptr);
 	private:
 		// 私有成员函数
+		void SendNudge(int64_t target, int64_t subject_id, const string& kind);
 		bool SessionVerify();
 		bool SessionRelease();
 		bool SessionConfigure(int cacheSize, bool enableWebsocket);

src/mirai_bot.cpp

@@ -195,6 +195,44 @@ namespace Cyan
 		throw runtime_error(msg);
 	}
 
+	void MiraiBot::SendNudge(int64_t target, int64_t subject_id, const string& kind)
+	{
+		json data =
+		{
+			{ "sessionKey", sessionKey_ },
+			{ "target", target },
+			{ "subject", subject_id },
+			{ "kind" , kind }
+		};
+
+		auto res = http_client_.Post("/sendNudge", data.dump(), "application/json;charset=UTF-8");
+		if (!res)
+			throw std::runtime_error("网络错误");
+		if (res->status != 200)
+			throw std::runtime_error("[mirai-api-http error]: " + res->body);
+		json re_json = json::parse(res->body);
+		int code = re_json["code"].get<int>();
+		if (code != 0)
+		{
+			string msg = re_json["msg"].get<string>();
+			throw runtime_error(msg);
+		}
+	}
+
+	void MiraiBot::SendNudge(QQ_t target, QQ_t subject_id)
+	{
+		SendNudge(target.ToInt64(), subject_id.ToInt64(), "Friend");
+	}
+
+	void MiraiBot::SendNudge(QQ_t target, GID_t subject_id)
+	{
+		SendNudge(target.ToInt64(), subject_id.ToInt64(), "Group");
+	}
+
+	void MiraiBot::SendNudge(QQ_t target, int64_t subject_id, NudgeEvent::SubjectKind kind)
+	{
+		SendNudge(target.ToInt64(), subject_id, NudgeEvent::SubjectKindStr(kind));
+	}
 
 	FriendImage MiraiBot::UploadFriendImage(const string& fileName)
 	{