重构 event_func.cpp; message_chain.hpp;

cyanray · cyanray · commit f981256e3e2e · 2020-05-09T18:21:57.000+08:00
diff --git a/include/defs/message_chain.hpp b/include/defs/message_chain.hpp
@@ -279,7 +279,7 @@ namespace Cyan
 			return res;
 		}
 
-		vector<QQ_t> GetAt()
+		vector<QQ_t> GetAt() const
 		{
 			vector<QQ_t> res;
 			for (const auto& ele : messages_)
@@ -294,7 +294,7 @@ namespace Cyan
 			return res;
 		}
 
-		vector<int> GetFace()
+		vector<int> GetFace() const
 		{
 			vector<int> res;
 			for (const auto& ele : messages_)
@@ -322,7 +322,7 @@ namespace Cyan
 		virtual bool Set(const json& j) override
 		{
 			messages_ = j;
-			if (j.size() >= 1)
+			if (!j.empty())
 			{
 				try
 				{
diff --git a/include/events/group_message.hpp b/include/events/group_message.hpp
@@ -41,8 +41,8 @@ namespace Cyan
 
 		MessageId Reply(const Cyan::MessageChain& mc) const;
 		MessageId QuoteReply(const Cyan::MessageChain& mc) const;
-		bool Recall();
-		bool AtMe();
+		bool Recall() const;
+		bool AtMe() const;
 
 		virtual bool Set(const json& j) override
 		{
diff --git a/include/events/join_request_event.hpp b/include/events/join_request_event.hpp
@@ -35,27 +35,27 @@ namespace Cyan
 
 		bool Accept()
 		{
-			return Respose(0, "");
+			return Response(0, "");
 		}
 
 		bool Reject(const string& message = "")
 		{
-			return Respose(1, message);
+			return Response(1, message);
 		}
 
 		bool Ignore(const string& message = "")
 		{
-			return Respose(2, message);
+			return Response(2, message);
 		}
 
 		bool RejectAndBlock(const string& message = "")
 		{
-			return Respose(3, message);
+			return Response(3, message);
 		}
 
 		bool IgnoreAndBlock(const string& message = "")
 		{
-			return Respose(4, message);
+			return Response(4, message);
 		}
 
 		virtual bool Set(const json& j) override
@@ -83,7 +83,7 @@ namespace Cyan
 
 	private:
 		MiraiBot* bot_;
-		bool Respose(int operate, const string& message);
+		bool Response(int operate, const string& message);
 	};
 
 }
diff --git a/include/events/new_friend_event.hpp b/include/events/new_friend_event.hpp
@@ -34,17 +34,17 @@ namespace Cyan
 
 		bool Accept()
 		{
-			return Respose(0, "");
+			return Response(0, "");
 		}
 
 		bool Reject(const string& message = "")
 		{
-			return Respose(1, message);
+			return Response(1, message);
 		}
 
 		bool RejectAndBlock(const string& message = "")
 		{
-			return Respose(2, message);
+			return Response(2, message);
 		}
 
 		virtual bool Set(const json& j) override
@@ -70,7 +70,7 @@ namespace Cyan
 
 	private:
 		MiraiBot* bot_;
-		bool Respose(int operate, const string& message);
+		bool Response(int operate, const string& message);
 	};
 
 }
diff --git a/src/event_func.cpp b/src/event_func.cpp
@@ -38,27 +38,27 @@ namespace Cyan
 		return bot_->SendMessage(Sender.Group.GID, mc, GetMessageId());
 	}
 
-	bool GroupMessage::Recall()
+	bool GroupMessage::Recall() const
 	{
 		return bot_->Recall(GetMessageId());
 	}
 
-	bool GroupMessage::AtMe()
+	bool GroupMessage::AtMe() const
 	{
 		auto at = MessageChain.GetAt();
 		auto it = std::find(at.begin(), at.end(), bot_->GetBotQQ());
 		if (it != at.end()) return true;
 		else return false;
 	}
 
-	bool NewFriendRequestEvent::Respose(int operate, const string& message)
+	bool NewFriendRequestEvent::Response(int operate, const string& message)
 	{
 		json data =
 		{
 			{ "sessionKey",  bot_->GetSessionKey() },
 			{ "eventId", this->EventId},
-			{ "fromId",  (int64_t)this->FromId},
-			{ "groupId", (int64_t)this->GroupId},
+			{ "fromId",  int64_t(this->FromId)},
+			{ "groupId", int64_t(this->GroupId)},
 			{ "operate", operate},
 			{ "message", message},
 		};
@@ -72,15 +72,15 @@ namespace Cyan
 		return true;
 	}
 
-	bool MemberJoinRequestEvent::Respose(int operate, const string& message)
+	bool MemberJoinRequestEvent::Response(int operate, const string& message)
 	{
 
 		json data =
 		{
 			{ "sessionKey",  bot_->GetSessionKey() },
 			{ "eventId", this->EventId},
-			{ "fromId",  (int64_t)this->FromId},
-			{ "groupId", (int64_t)this->GroupId},
+			{ "fromId",  int64_t(this->FromId)},
+			{ "groupId", int64_t(this->GroupId)},
 			{ "operate", operate},
 			{ "message", message},
 		};

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ namespace Cyan`
`279`	`279`	`return res;`
`280`	`280`	`}`
`281`	`281`
`282`		`- vector<QQ_t> GetAt()`
	`282`	`+ vector<QQ_t> GetAt() const`
`283`	`283`	`{`
`284`	`284`	`vector<QQ_t> res;`
`285`	`285`	`for (const auto& ele : messages_)`
`@@ -294,7 +294,7 @@ namespace Cyan`
`294`	`294`	`return res;`
`295`	`295`	`}`
`296`	`296`
`297`		`- vector<int> GetFace()`
	`297`	`+ vector<int> GetFace() const`
`298`	`298`	`{`
`299`	`299`	`vector<int> res;`
`300`	`300`	`for (const auto& ele : messages_)`
`@@ -322,7 +322,7 @@ namespace Cyan`
`322`	`322`	`virtual bool Set(const json& j) override`
`323`	`323`	`{`
`324`	`324`	`messages_ = j;`
`325`		`- if (j.size() >= 1)`
	`325`	`+ if (!j.empty())`
`326`	`326`	`{`
`327`	`327`	`try`
`328`	`328`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ namespace Cyan`
`41`	`41`
`42`	`42`	`MessageId Reply(const Cyan::MessageChain& mc) const;`
`43`	`43`	`MessageId QuoteReply(const Cyan::MessageChain& mc) const;`
`44`		`- bool Recall();`
`45`		`- bool AtMe();`
	`44`	`+ bool Recall() const;`
	`45`	`+ bool AtMe() const;`
`46`	`46`
`47`	`47`	`virtual bool Set(const json& j) override`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,27 +35,27 @@ namespace Cyan`
`35`	`35`
`36`	`36`	`bool Accept()`
`37`	`37`	`{`
`38`		`- return Respose(0, "");`
	`38`	`+ return Response(0, "");`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`bool Reject(const string& message = "")`
`42`	`42`	`{`
`43`		`- return Respose(1, message);`
	`43`	`+ return Response(1, message);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`bool Ignore(const string& message = "")`
`47`	`47`	`{`
`48`		`- return Respose(2, message);`
	`48`	`+ return Response(2, message);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`bool RejectAndBlock(const string& message = "")`
`52`	`52`	`{`
`53`		`- return Respose(3, message);`
	`53`	`+ return Response(3, message);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`bool IgnoreAndBlock(const string& message = "")`
`57`	`57`	`{`
`58`		`- return Respose(4, message);`
	`58`	`+ return Response(4, message);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`virtual bool Set(const json& j) override`
`@@ -83,7 +83,7 @@ namespace Cyan`
`83`	`83`
`84`	`84`	`private:`
`85`	`85`	`MiraiBot* bot_;`
`86`		`- bool Respose(int operate, const string& message);`
	`86`	`+ bool Response(int operate, const string& message);`
`87`	`87`	`};`
`88`	`88`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,17 @@ namespace Cyan`
`34`	`34`
`35`	`35`	`bool Accept()`
`36`	`36`	`{`
`37`		`- return Respose(0, "");`
	`37`	`+ return Response(0, "");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`bool Reject(const string& message = "")`
`41`	`41`	`{`
`42`		`- return Respose(1, message);`
	`42`	`+ return Response(1, message);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`bool RejectAndBlock(const string& message = "")`
`46`	`46`	`{`
`47`		`- return Respose(2, message);`
	`47`	`+ return Response(2, message);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`virtual bool Set(const json& j) override`
`@@ -70,7 +70,7 @@ namespace Cyan`
`70`	`70`
`71`	`71`	`private:`
`72`	`72`	`MiraiBot* bot_;`
`73`		`- bool Respose(int operate, const string& message);`
	`73`	`+ bool Response(int operate, const string& message);`
`74`	`74`	`};`
`75`	`75`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,27 +38,27 @@ namespace Cyan`
`38`	`38`	`return bot_->SendMessage(Sender.Group.GID, mc, GetMessageId());`
`39`	`39`	`}`
`40`	`40`
`41`		`- bool GroupMessage::Recall()`
	`41`	`+ bool GroupMessage::Recall() const`
`42`	`42`	`{`
`43`	`43`	`return bot_->Recall(GetMessageId());`
`44`	`44`	`}`
`45`	`45`
`46`		`- bool GroupMessage::AtMe()`
	`46`	`+ bool GroupMessage::AtMe() const`
`47`	`47`	`{`
`48`	`48`	`auto at = MessageChain.GetAt();`
`49`	`49`	`auto it = std::find(at.begin(), at.end(), bot_->GetBotQQ());`
`50`	`50`	`if (it != at.end()) return true;`
`51`	`51`	`else return false;`
`52`	`52`	`}`
`53`	`53`
`54`		`- bool NewFriendRequestEvent::Respose(int operate, const string& message)`
	`54`	`+ bool NewFriendRequestEvent::Response(int operate, const string& message)`
`55`	`55`	`{`
`56`	`56`	`json data =`
`57`	`57`	`{`
`58`	`58`	`{ "sessionKey", bot_->GetSessionKey() },`
`59`	`59`	`{ "eventId", this->EventId},`
`60`		`- { "fromId", (int64_t)this->FromId},`
`61`		`- { "groupId", (int64_t)this->GroupId},`
	`60`	`+ { "fromId", int64_t(this->FromId)},`
	`61`	`+ { "groupId", int64_t(this->GroupId)},`
`62`	`62`	`{ "operate", operate},`
`63`	`63`	`{ "message", message},`
`64`	`64`	`};`
`@@ -72,15 +72,15 @@ namespace Cyan`
`72`	`72`	`return true;`
`73`	`73`	`}`
`74`	`74`
`75`		`- bool MemberJoinRequestEvent::Respose(int operate, const string& message)`
	`75`	`+ bool MemberJoinRequestEvent::Response(int operate, const string& message)`
`76`	`76`	`{`
`77`	`77`
`78`	`78`	`json data =`
`79`	`79`	`{`
`80`	`80`	`{ "sessionKey", bot_->GetSessionKey() },`
`81`	`81`	`{ "eventId", this->EventId},`
`82`		`- { "fromId", (int64_t)this->FromId},`
`83`		`- { "groupId", (int64_t)this->GroupId},`
	`82`	`+ { "fromId", int64_t(this->FromId)},`
	`83`	`+ { "groupId", int64_t(this->GroupId)},`
`84`	`84`	`{ "operate", operate},`
`85`	`85`	`{ "message", message},`
`86`	`86`	`};`