BotLeaveEventKick 事件可获取操作的管理员信息; 修复编译错误;

Author: cyanray

include/mirai/events/BotJoinGroupEvent.hpp

@@ -6,6 +6,7 @@
 #include "mirai/third-party/nlohmann/json.hpp"
 #include "event_interface.hpp"
 #include "mirai/defs/group.hpp"
+#include "mirai/defs/group_member.hpp"
 std::optional;
 
 namespace Cyan

include/mirai/events/BotLeaveEventKick.hpp

@@ -2,9 +2,12 @@
 #ifndef mirai_cpp_events_BotLeaveEventKick_hpp_H_
 #define mirai_cpp_events_BotLeaveEventKick_hpp_H_
 
+#include <optional>
 #include "mirai/third-party/nlohmann/json.hpp"
 #include "mirai/defs/group.hpp"
+#include "mirai/defs/group_member.hpp"
 #include "event_interface.hpp"
+using std::optional;
 
 namespace Cyan
 {
@@ -16,6 +19,7 @@ namespace Cyan
 	{
 	public:
 		Group_t Group;
+		std::optional<GroupMember> Inviter;
 
 		static MiraiEvent GetMiraiEvent()
 		{
@@ -25,13 +29,21 @@ namespace Cyan
 		virtual bool Set(const json& j) override
 		{
 			this->Group.Set(j["group"]);
+			if (!j["invitor"].is_null())
+			{
+				GroupMember tmp;
+				tmp.Set(j["invitor"]);
+				this->Inviter = tmp;
+			}
 			return true;
 		}
 		virtual json ToJson() const override
 		{
 			json j = json::object();
 			j["type"] = "BotLeaveEventKick";
 			j["group"] = this->Group.ToJson();
+			// Not a typo, MAH made a typo.
+			j["invitor"] = (Inviter ? this->Inviter->ToJson() : json(nullptr));
 			return j;
 		}