Merge branch 'master' of github.com:cyanray/mirai-cpp

Author: cyanray

README.md

@@ -43,6 +43,7 @@
 | FetchEventsViaHTTP.cpp| 设置通过 HTTP 短轮询获取事件和消息 |
 | GroupMemberInfo.cpp  | 获取/设置群成员的群名片与群头衔 |
 | Command.cpp          | 指令系统相关的操作           |
+| NudgeEvent.cpp       | 戳一戳事件和发送相关的操作    |
 
 ## 0x03 如何使用
 

doc/使用说明.md

@@ -116,6 +116,7 @@ MiraiBot 类提供了 On 方法和 OnEventReceived 方法，这两个方法是
 | BotLeaveEventActive             | 机器人主动退群       |
 | BotOfflineEventActive           | 机器人主动下线       |
 | MemberCardChangeEvent           | 群昵称改变（不可靠） |
+| NudgeEvent                      | 戳一戳事件           |
 
 
 
@@ -379,7 +380,7 @@ a += b;
 // 或者
 MessageChain c = a + b;
 
-// MessageChain 特别处理了 Plain 消息，你可以做到：
+// MessageChain 特别处理了 Plain 消息，你可以做到将字符串和 MessageChain 直接相加：
 MessageChain c = "早安!" + b;
 ```
 
@@ -501,4 +502,5 @@ bot.On<GroupMessage>(
 | RichMessage.cpp      | 发送 JSON、闪照等类型的消息  |
 | FetchEventsViaHTTP.cpp| 设置通过 HTTP 短轮询获取事件和消息 |
 | GroupMemberInfo.cpp  | 获取/设置群成员的群名片与群头衔 |
-| Command.cpp          | 指令系统相关的操作           |
+| Command.cpp          | 指令系统相关的操作           |
+| NudgeEvent.cpp       | 戳一戳事件和发送相关的操作    |

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/defs/qq_types.hpp

@@ -3,43 +3,73 @@
 #define mirai_cpp_defs_qq_types_hpp_H_
 
 #include <exception>
+#include <iostream>
 #include "serializable.hpp"
 #include "mirai/exported.h"
 
 namespace Cyan
 {
-	// QQ 号码类型
-	class QQ_t
+	// QQ_t 和 GID_t 的基类型
+	class UID_t
 	{
 	public:
-		QQ_t() :QQ(-1) {}
-		explicit  QQ_t(int64_t qq) :QQ(qq) {}
-		operator int64_t() const { return QQ; }
-		int64_t ToInt64() const { return QQ; }
-	private:
-		int64_t QQ;
+		int64_t ToInt64() const
+		{
+			return data_;
+		}
+		explicit operator int64_t() const
+		{
+			return data_;
+		}
+		bool operator==(const UID_t& a) const
+		{
+			return this->data_ == a.data_;
+		}
+		bool operator!=(const UID_t& a) const
+		{
+			return !operator==(a);
+		}
+		virtual ~UID_t() = default;
+	protected:
+		explicit UID_t(int64_t id) : data_(id) {}
+		virtual void __avoiding_object_slicing() const = 0;
+		int64_t data_;
 	};
-
-	inline QQ_t operator "" _qq(unsigned long long int v)
+	
+	// 储存 QQ 号码的类型
+	class QQ_t : public UID_t
 	{
-		return QQ_t(int64_t(v));
-	}
+	public:
+		QQ_t() : UID_t(-1) {}
+		explicit QQ_t(int64_t id) : UID_t(id) {}
+	private:
+		virtual void __avoiding_object_slicing() const override {}
+	};
 
-	// 群号码类型
-	class GID_t
+	// 储存群号码的类型
+	class GID_t : public UID_t
 	{
 	public:
-		GID_t() :GID(-1) {}
-		explicit GID_t(int64_t gid) :GID(gid) {}
-		operator int64_t() const { return GID; }
-		int64_t ToInt64() const { return GID; }
+		GID_t() : UID_t(-1) {}
+		explicit GID_t(int64_t id) : UID_t(id) {}
 	private:
-		int64_t GID;
+		virtual void __avoiding_object_slicing() const override {}
 	};
 
-	inline GID_t operator "" _gid(unsigned long long int v)
+	inline GID_t operator ""_gid(unsigned long long int id)
+	{
+		return (GID_t)(id);
+	}
+
+	inline QQ_t operator ""_qq(unsigned long long int id)
+	{
+		return (QQ_t)(id);
+	}
+
+	inline std::ostream& operator<<(std::ostream& o, const UID_t& uid)
 	{
-		return GID_t(int64_t(v));
+		o << (int64_t)(uid);
+		return o;
 	}
 
 	// 消息 ID

include/mirai/events/command_event.hpp

@@ -40,7 +40,7 @@ namespace Cyan
 		{
 			CommandName = j["name"].get<string>();
 			Sender = (QQ_t)(j["friend"].get<int64_t>());
-			GroupId = (GID_t)(QQ_t)(j["group"].get<int64_t>());
+			GroupId = (GID_t)(j["group"].get<int64_t>());
 			Args = j["args"].get<vector<string>>();
 			return true;
 		}

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_