适配 mah v2.5.0 其他客户端同步消息;

Author: cyanray

examples/RepeatMessage.cpp

@@ -4,6 +4,8 @@
 // 按需引用头文件
 // 你也可以使用 #include <mirai.h> 引用所有头文件(可能导致编译缓慢)
 #include <mirai/MiraiBot.hpp>
+#include <mirai/events/OtherClientMessage.hpp>
+#include <mirai/events/FriendSyncMessage.hpp>
 using namespace std;
 using namespace Cyan;
 
@@ -55,7 +57,17 @@ int main(int argc, char* argv[])
 		[&](Message m)
 		{
 			cout << int64_t(m.Sender) << " 发来一条消息." << m.MessageChain.ToString() << endl;
-			m.Reply(m.MessageChain);
+			// m.Reply(m.MessageChain);
+		});
+
+	bot.On<OtherClientMessage>([&](OtherClientMessage m)
+		{
+			cout << m.MessageChain.ToString() << endl;
+		});
+
+	bot.On<FriendSyncMessage>([&](FriendSyncMessage m)
+		{
+			cout << m.MessageChain.ToString() << endl;
 		});
 
 	bot.On<LostConnection>([&](LostConnection e)

include/mirai/events/FriendSyncMessage.hpp

@@ -0,0 +1,53 @@
+#pragma once
+#ifndef mirai_cpp_events_FriendSyncMessage_hpp_H_
+#define mirai_cpp_events_FriendSyncMessage_hpp_H_
+
+#include "mirai/third-party/nlohmann/json.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "mirai/defs/MessageChain.hpp"
+#include "mirai/defs/Friend.hpp"
+#include "EventBase.hpp"
+
+namespace Cyan
+{
+	/**
+	 * \brief Bot在其他客户端发送给好友的消息
+	 */
+	class FriendSyncMessage : public EventBase
+	{
+	public:
+		Cyan::MessageChain MessageChain;
+		Friend_t Subject;
+
+		static MiraiEvent GetMiraiEvent()
+		{
+			return MiraiEvent::FriendSyncMessage;
+		}
+
+		MessageId_t MessageId() const
+		{
+			return (this->MessageChain).MessageId();
+		}
+
+		int64_t Timestamp() const
+		{
+			return (this->MessageChain).Timestamp();
+		}
+
+		virtual bool Set(const json& j) override
+		{
+			this->MessageChain.Set(j["messageChain"]);
+			Subject.Set(j["subject"]);
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			json j = json::object();
+			j["messageChain"] = this->MessageChain.ToJson();
+			j["subject"] = this->Subject.ToJson();
+			return j;
+		}
+	};
+}
+
+#endif

include/mirai/events/GroupSyncMessage.hpp

@@ -0,0 +1,53 @@
+#pragma once
+#ifndef mirai_cpp_events_GroupSyncMessage_hpp_H_
+#define mirai_cpp_events_GroupSyncMessage_hpp_H_
+
+#include "mirai/third-party/nlohmann/json.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "mirai/defs/MessageChain.hpp"
+#include "mirai/defs/Group.hpp"
+#include "EventBase.hpp"
+
+namespace Cyan
+{
+	/**
+	 * \brief Bot在其他客户端发送给群组的消息
+	 */
+	class GroupSyncMessage : public EventBase
+	{
+	public:
+		Cyan::MessageChain MessageChain;
+		Group_t Subject;
+
+		static MiraiEvent GetMiraiEvent()
+		{
+			return MiraiEvent::GroupSyncMessage;
+		}
+
+		MessageId_t MessageId() const
+		{
+			return (this->MessageChain).MessageId();
+		}
+
+		int64_t Timestamp() const
+		{
+			return (this->MessageChain).Timestamp();
+		}
+
+		virtual bool Set(const json& j) override
+		{
+			this->MessageChain.Set(j["messageChain"]);
+			Subject.Set(j["subject"]);
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			json j = json::object();
+			j["messageChain"] = this->MessageChain.ToJson();
+			j["subject"] = this->Subject.ToJson();
+			return j;
+		}
+	};
+}
+
+#endif

include/mirai/events/MiraiEvent.hpp

@@ -50,7 +50,11 @@ namespace Cyan
 		MemberSpecialTitleChangeEvent,			// 群头衔改动事件
 		BotGroupPermissionChangeEvent,			// bot 群权限改变事件
 		MemberPermissionChangeEvent,			// 群成员权限改变事件
-		MemberHonorChangeEvent					// 群成员称号改变事件
+		MemberHonorChangeEvent,					// 群成员称号改变事件
+		FriendSyncMessage,						// Bot在其他客户端发送给好友的消息
+		GroupSyncMessage,						// Bot在其他客户端发送给群组的消息
+		TempSyncMessage,						// Bot在其他客户端发送给群成员的临时消息
+		StrangerSyncMessage						// Bot在其他客户端发送给陌生人的消息
 	};
 
 	MiraiEvent MiraiEventStr(const std::string& miraiEvent);

include/mirai/events/StrangerSyncMessage.hpp

@@ -0,0 +1,53 @@
+#pragma once
+#ifndef mirai_cpp_events_StrangerSyncMessage_hpp_H_
+#define mirai_cpp_events_StrangerSyncMessage_hpp_H_
+
+#include "mirai/third-party/nlohmann/json.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "mirai/defs/MessageChain.hpp"
+#include "mirai/defs/Friend.hpp"
+#include "EventBase.hpp"
+
+namespace Cyan
+{
+	/**
+	 * \brief Bot在其他客户端发送给好友的消息
+	 */
+	class StrangerSyncMessage : public EventBase
+	{
+	public:
+		Cyan::MessageChain MessageChain;
+		Friend_t Subject;
+
+		static MiraiEvent GetMiraiEvent()
+		{
+			return MiraiEvent::StrangerSyncMessage;
+		}
+
+		MessageId_t MessageId() const
+		{
+			return (this->MessageChain).MessageId();
+		}
+
+		int64_t Timestamp() const
+		{
+			return (this->MessageChain).Timestamp();
+		}
+
+		virtual bool Set(const json& j) override
+		{
+			this->MessageChain.Set(j["messageChain"]);
+			Subject.Set(j["subject"]);
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			json j = json::object();
+			j["messageChain"] = this->MessageChain.ToJson();
+			j["subject"] = this->Subject.ToJson();
+			return j;
+		}
+	};
+}
+
+#endif

include/mirai/events/TempSyncMessage.hpp

@@ -0,0 +1,53 @@
+#pragma once
+#ifndef mirai_cpp_events_TempSyncMessage_hpp_H_
+#define mirai_cpp_events_TempSyncMessage_hpp_H_
+
+#include "mirai/third-party/nlohmann/json.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "mirai/defs/MessageChain.hpp"
+#include "mirai/defs/GroupMember.hpp"
+#include "EventBase.hpp"
+
+namespace Cyan
+{
+	/**
+	 * \brief Bot在其他客户端发送给群组的消息
+	 */
+	class TempSyncMessage : public EventBase
+	{
+	public:
+		Cyan::MessageChain MessageChain;
+		GroupMember Subject;
+
+		static MiraiEvent GetMiraiEvent()
+		{
+			return MiraiEvent::TempSyncMessage;
+		}
+
+		MessageId_t MessageId() const
+		{
+			return (this->MessageChain).MessageId();
+		}
+
+		int64_t Timestamp() const
+		{
+			return (this->MessageChain).Timestamp();
+		}
+
+		virtual bool Set(const json& j) override
+		{
+			this->MessageChain.Set(j["messageChain"]);
+			Subject.Set(j["subject"]);
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			json j = json::object();
+			j["messageChain"] = this->MessageChain.ToJson();
+			j["subject"] = this->Subject.ToJson();
+			return j;
+		}
+	};
+}
+
+#endif

include/mirai/events/events.hpp

@@ -9,6 +9,10 @@
 #include "TempMessage.hpp"
 #include "StrangerMessage.hpp"
 #include "OtherClientMessage.hpp"
+#include "FriendSyncMessage.hpp"
+#include "GroupSyncMessage.hpp"
+#include "TempSyncMessage.hpp"
+#include "StrangerSyncMessage.hpp"
 // 机器人相关事件
 #include "BotOnlineEvent.hpp"
 #include "BotOfflineEventActive.hpp"