新增 好友消息撤回事件; (但是没有效果)

Author: cyanray

examples/RecallEvent.cpp

@@ -37,6 +37,20 @@ int main()
 			}
 		});
 
+	bot.On<FriendRecallEvent>(
+		[&](FriendRecallEvent gm)
+		{
+			try
+			{
+				auto mc = "刚刚有人撤回了: " + bot.GetFriendMessageFromId(gm.MessageId).MessageChain;
+				bot.SendMessage(gm.AuthorQQ, mc);
+			}
+			catch (const std::exception& ex)
+			{
+				cout << ex.what() << endl;
+			}
+		});
+
 
 	bot.EventLoop();
 	try

include/events/events.hpp

@@ -8,6 +8,7 @@
 #include "temp_message.hpp"
 // 好友相关事件
 #include "new_friend_event.hpp"
+#include "friend_recall_event.hpp"
 // 群组相关事件
 #include "group_recall_event.hpp"
 #include "join_request_event.hpp"

include/events/events_name.hpp

@@ -50,6 +50,7 @@ namespace Cyan
 		if (miraiEvent == "MemberLeaveEventKick") return MiraiEvent::MemberLeaveEventKick;
 		if (miraiEvent == "MemberLeaveEventQuit") return MiraiEvent::MemberLeaveEventQuit;
 		if (miraiEvent == "GroupRecallEvent") return MiraiEvent::GroupRecallEvent;
+		if (miraiEvent == "FriendRecallEvent") return MiraiEvent::FriendRecallEvent;
 		return MiraiEvent::Default;
 	}
 
@@ -97,6 +98,9 @@ namespace Cyan
 		case Cyan::MiraiEvent::GroupRecallEvent:
 			result = "GroupRecallEvent";
 			break;
+		case Cyan::MiraiEvent::FriendRecallEvent:
+			result = "FriendRecallEvent";
+			break;
 		default:
 			result = "Default";
 			break;
@@ -189,6 +193,12 @@ namespace Cyan
 		return MiraiEvent::GroupRecallEvent;
 	}
 
+	template<>
+	MiraiEvent GetEventType<FriendRecallEvent>()
+	{
+		return MiraiEvent::FriendRecallEvent;
+	}
+
 }
 
 

include/events/friend_recall_event.hpp

@@ -0,0 +1,71 @@
+#pragma once
+#ifndef mirai_cpp_events_friend_recall_event_hpp_H_
+#define mirai_cpp_events_friend_recall_event_hpp_H_
+
+#include <nlohmann/json.hpp>
+#include "CURLWrapper.h"
+#include "defs/qq_types.hpp"
+#include "defs/serializable.hpp"
+#include "defs/group_member.hpp"
+
+namespace Cyan
+{
+	// ºÃÓÑÏûÏ¢³·»Øʼþ
+	class FriendRecallEvent : public Serializable
+	{
+	public:
+		int64_t Time = 0;
+		QQ_t AuthorQQ;
+		Cyan::MessageId MessageId;
+		QQ_t Operator;
+
+		FriendRecallEvent() = default;
+		FriendRecallEvent(const FriendRecallEvent& gm)
+		{
+			Time = gm.Time;
+			AuthorQQ = gm.AuthorQQ;
+			MessageId = gm.MessageId;
+			Operator = gm.Operator;
+		}
+		FriendRecallEvent& operator=(const FriendRecallEvent& t)
+		{
+			FriendRecallEvent tmp(t);
+			std::swap(this->Time, tmp.Time);
+			std::swap(this->AuthorQQ, tmp.AuthorQQ);
+			std::swap(this->MessageId, tmp.MessageId);
+			std::swap(this->Operator, tmp.Operator);
+			return *this;
+		}
+
+		void SetMiraiBot(MiraiBot* bot)
+		{
+			this->bot_ = bot;
+		}
+
+		virtual ~FriendRecallEvent() = default;
+		virtual bool Set(const json& j) override
+		{
+			this->Time = j["time"].get<int64_t>();
+			this->AuthorQQ = (QQ_t)j["authorId"].get<int64_t>();
+			this->MessageId = j["messageId"].get<int64_t>();
+			this->Operator = (QQ_t)j["operator"].get<int64_t>();
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			json j = json::object();
+			j["type"] = "GroupRecallEvent";
+			j["time"] = this->Time;
+			j["authorId"] = (int64_t)this->AuthorQQ;
+			j["messageId"] = this->MessageId;
+			j["operator"] = (int64_t)this->Operator;
+			return j;
+		}
+
+	private:
+		MiraiBot* bot_;
+	};
+
+}
+
+#endif // !mirai_cpp_events_friend_recall_event_hpp_H_

include/mirai_bot.hpp

@@ -810,6 +810,13 @@ namespace Cyan
 				tm->Set(json_);
 				return std::dynamic_pointer_cast<Serializable>(tm);
 			}
+			if (mirai_event == MiraiEvent::FriendRecallEvent)
+			{
+				std::shared_ptr<FriendRecallEvent> tm = std::make_shared<FriendRecallEvent>();
+				tm->SetMiraiBot(this);
+				tm->Set(json_);
+				return std::dynamic_pointer_cast<Serializable>(tm);
+			}
 		}
 
 		QQ_t qq_;