更新所有events实现;

cyanray · cyanray · commit 2814a41e7374 · 2020-05-22T21:44:50.000+08:00
diff --git a/include/events/bot_join_group.hpp b/include/events/bot_join_group.hpp
@@ -20,26 +20,19 @@ namespace Cyan
 			return MiraiEvent::BotJoinGroupEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Group.Set(j["group"]);
 			return true;
 		}
+		
 		virtual json ToJson() const override
 		{
 			json j = json::object();
 			j["type"] = "BotJoinGroupEvent";
 			j["group"] = this->Group.ToJson();
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_leave_active.hpp b/include/events/bot_leave_active.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotLeaveEventActive;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Group.Set(j["group"]);
@@ -37,9 +32,6 @@ namespace Cyan
 			j["group"] = this->Group.ToJson();
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_leave_kick.hpp b/include/events/bot_leave_kick.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotLeaveEventKick;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Group.Set(j["group"]);
@@ -38,8 +33,6 @@ namespace Cyan
 			return j;
 		}
 
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_mute_event.hpp b/include/events/bot_mute_event.hpp
@@ -21,11 +21,6 @@ namespace Cyan
 			return MiraiEvent::BotMuteEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->DurationSeconds = j["durationSeconds"].get<int>();
@@ -41,8 +36,6 @@ namespace Cyan
 			return j;
 		}
 
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_offline_active.hpp b/include/events/bot_offline_active.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotOfflineEventActive;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->QQ = (QQ_t)(j["qq"].get<int64_t>());
@@ -37,9 +32,6 @@ namespace Cyan
 			j["qq"] = (int64_t)this->QQ;
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_offline_dropped.hpp b/include/events/bot_offline_dropped.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotOfflineEventDropped;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->QQ = (QQ_t)(j["qq"].get<int64_t>());
@@ -37,9 +32,6 @@ namespace Cyan
 			j["qq"] = (int64_t)this->QQ;
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_offline_force.hpp b/include/events/bot_offline_force.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotOfflineEventForce;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->QQ = (QQ_t)(j["qq"].get<int64_t>());
@@ -37,9 +32,6 @@ namespace Cyan
 			j["qq"] = (int64_t)this->QQ;
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_online_event.hpp b/include/events/bot_online_event.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotOnlineEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->QQ = (QQ_t)(j["qq"].get<int64_t>());
@@ -38,8 +33,6 @@ namespace Cyan
 			return j;
 		}
 
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_relogin_event.hpp b/include/events/bot_relogin_event.hpp
@@ -20,11 +20,6 @@ namespace Cyan
 			return MiraiEvent::BotReloginEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->QQ = (QQ_t)(j["qq"].get<int64_t>());
@@ -37,9 +32,6 @@ namespace Cyan
 			j["qq"] = (int64_t)this->QQ;
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/bot_unmute_event.hpp b/include/events/bot_unmute_event.hpp
@@ -22,11 +22,6 @@ namespace Cyan
 			return MiraiEvent::BotUnmuteEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Operator.Set(j["operator"]);
@@ -40,8 +35,6 @@ namespace Cyan
 			return j;
 		}
 
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/friend_message.hpp b/include/events/friend_message.hpp
@@ -34,11 +34,6 @@ namespace Cyan
 			return this->MessageChain.GetTimestamp();
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		MessageId Reply(const Cyan::MessageChain& mc) const;
 		MessageId QuoteReply(const Cyan::MessageChain& mc) const;
 
@@ -56,9 +51,6 @@ namespace Cyan
 			j["sender"] = this->Sender.ToJson();
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/friend_recall_event.hpp b/include/events/friend_recall_event.hpp
@@ -25,12 +25,6 @@ namespace Cyan
 			return MiraiEvent::FriendRecallEvent;
 		}
 
-
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Time = j["time"].get<int64_t>();
@@ -49,9 +43,6 @@ namespace Cyan
 			j["operator"] = (int64_t)this->Operator;
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/group_message.hpp b/include/events/group_message.hpp
@@ -34,11 +34,6 @@ namespace Cyan
 			return (this->MessageChain).GetTimestamp();
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		MessageId Reply(const Cyan::MessageChain& mc) const;
 		MessageId QuoteReply(const Cyan::MessageChain& mc) const;
 		bool Recall() const;
@@ -57,8 +52,6 @@ namespace Cyan
 			j["sender"] = this->Sender.ToJson();
 			return j;
 		}
-	private:
-		MiraiBot* bot_;
 	};
 }
 
diff --git a/include/events/group_name_change.hpp b/include/events/group_name_change.hpp
@@ -24,11 +24,6 @@ namespace Cyan
 			return MiraiEvent::GroupNameChangeEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		bool OperatorIsBot() const
 		{
 			return operator_is_null_;
@@ -58,7 +53,6 @@ namespace Cyan
 		}
 
 	private:
-		MiraiBot* bot_;
 		bool operator_is_null_ = true;
 	};
 
diff --git a/include/events/group_recall_event.hpp b/include/events/group_recall_event.hpp
@@ -25,11 +25,6 @@ namespace Cyan
 			return MiraiEvent::GroupRecallEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Time = j["time"].get<int64_t>();
@@ -50,9 +45,6 @@ namespace Cyan
 			j["operator"] = this->Operator.ToJson();
 			return j;
 		}
-
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/join_request_event.hpp b/include/events/join_request_event.hpp
@@ -28,11 +28,6 @@ namespace Cyan
 			return MiraiEvent::MemberJoinRequestEvent;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		bool Accept()
 		{
 			return Response(0, "");
@@ -82,7 +77,6 @@ namespace Cyan
 		}
 
 	private:
-		MiraiBot* bot_;
 		bool Response(int operate, const string& message);
 	};
 
diff --git a/include/events/member_join_event.hpp b/include/events/member_join_event.hpp
@@ -22,12 +22,6 @@ namespace Cyan
 			return MiraiEvent::MemberJoinEvent;
 		}
 
-
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->NewMember.Set(j["member"]);
@@ -41,8 +35,6 @@ namespace Cyan
 			return j;
 		}
 
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/member_leave_kick.hpp b/include/events/member_leave_kick.hpp
@@ -22,11 +22,6 @@ namespace Cyan
 			return MiraiEvent::MemberLeaveEventKick;
 		}
 
-		virtual void SetMiraiBot(MiraiBot* bot) override
-		{
-			this->bot_ = bot;
-		}
-
 		virtual bool Set(const json& j) override
 		{
 			this->Member.Set(j["member"]);
@@ -42,8 +37,6 @@ namespace Cyan
 			return j;
 		}
 
-	private:
-		MiraiBot* bot_;
 	};
 
 }
diff --git a/include/events/member_leave_quit.hpp b/include/events/member_leave_quit.hpp
diff --git a/include/events/member_mute_event.hpp b/include/events/member_mute_event.hpp
diff --git a/include/events/member_unmute_event.hpp b/include/events/member_unmute_event.hpp
diff --git a/include/events/message_event.hpp b/include/events/message_event.hpp
diff --git a/include/events/new_friend_event.hpp b/include/events/new_friend_event.hpp
diff --git a/include/events/temp_message.hpp b/include/events/temp_message.hpp

Original file line number	Diff line number	Diff line change
`@@ -20,26 +20,19 @@ namespace Cyan`
`20`	`20`	`return MiraiEvent::BotJoinGroupEvent;`
`21`	`21`	`}`
`22`	`22`
`23`		`- virtual void SetMiraiBot(MiraiBot* bot) override`
`24`		`- {`
`25`		`- this->bot_ = bot;`
`26`		`- }`
`27`		`-`
`28`	`23`	`virtual bool Set(const json& j) override`
`29`	`24`	`{`
`30`	`25`	`this->Group.Set(j["group"]);`
`31`	`26`	`return true;`
`32`	`27`	`}`
	`28`	`+`
`33`	`29`	`virtual json ToJson() const override`
`34`	`30`	`{`
`35`	`31`	`json j = json::object();`
`36`	`32`	`j["type"] = "BotJoinGroupEvent";`
`37`	`33`	`j["group"] = this->Group.ToJson();`
`38`	`34`	`return j;`
`39`	`35`	`}`
`40`		`-`
`41`		`- private:`
`42`		`- MiraiBot* bot_;`
`43`	`36`	`};`
`44`	`37`
`45`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,6 @@ namespace Cyan`
`20`	`20`	`return MiraiEvent::BotLeaveEventActive;`
`21`	`21`	`}`
`22`	`22`
`23`		`- virtual void SetMiraiBot(MiraiBot* bot) override`
`24`		`- {`
`25`		`- this->bot_ = bot;`
`26`		`- }`
`27`		`-`
`28`	`23`	`virtual bool Set(const json& j) override`
`29`	`24`	`{`
`30`	`25`	`this->Group.Set(j["group"]);`
`@@ -37,9 +32,6 @@ namespace Cyan`
`37`	`32`	`j["group"] = this->Group.ToJson();`
`38`	`33`	`return j;`
`39`	`34`	`}`
`40`		`-`
`41`		`- private:`
`42`		`- MiraiBot* bot_;`
`43`	`35`	`};`
`44`	`36`
`45`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,6 @@ namespace Cyan`
`21`	`21`	`return MiraiEvent::BotMuteEvent;`
`22`	`22`	`}`
`23`	`23`
`24`		`- virtual void SetMiraiBot(MiraiBot* bot) override`
`25`		`- {`
`26`		`- this->bot_ = bot;`
`27`		`- }`
`28`		`-`
`29`	`24`	`virtual bool Set(const json& j) override`
`30`	`25`	`{`
`31`	`26`	`this->DurationSeconds = j["durationSeconds"].get<int>();`
`@@ -41,8 +36,6 @@ namespace Cyan`
`41`	`36`	`return j;`
`42`	`37`	`}`
`43`	`38`
`44`		`- private:`
`45`		`- MiraiBot* bot_;`
`46`	`39`	`};`
`47`	`40`
`48`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,6 @@ namespace Cyan`
`22`	`22`	`return MiraiEvent::BotUnmuteEvent;`
`23`	`23`	`}`
`24`	`24`
`25`		`- virtual void SetMiraiBot(MiraiBot* bot) override`
`26`		`- {`
`27`		`- this->bot_ = bot;`
`28`		`- }`
`29`		`-`
`30`	`25`	`virtual bool Set(const json& j) override`
`31`	`26`	`{`
`32`	`27`	`this->Operator.Set(j["operator"]);`
`@@ -40,8 +35,6 @@ namespace Cyan`
`40`	`35`	`return j;`
`41`	`36`	`}`
`42`	`37`
`43`		`- private:`
`44`		`- MiraiBot* bot_;`
`45`	`38`	`};`
`46`	`39`
`47`	`40`	`}`