MessageChain 增加 operator+ 操作符

Author: cyanray

examples/sendFriendMessage.cpp

@@ -21,37 +21,29 @@ int main()
 	}
 	cout << "成功登录 bot。" << endl;
 
-	GroupImage gImg = bot.UploadGroupImage("D:/QQ20200223215250.jpg");
 
-	MessageChain messageChain;
-	messageChain
-		.Face(4)
-		.Plain("\n")
-		.Plain("群消息测试")
-		.Plain("🤣🤣🤣")
-		.Image(gImg);
-
-	cout << messageChain.ToString() << endl;
+	bot.OnFriendMessageReceived(
+		[&](FriendMessage fm)
+		{
+			bot.SendFriendMessage(fm.Sender.QQ, fm.MessageChain);
+		});
 
 	bot.OnGroupMessageReceived(
 		[&](GroupMessage gm)
 		{
+			gm.MessageChain = MessageChain().Plain("为什么要 ") + gm.MessageChain;
 			bot.SendGroupMessage(gm.Sender.Group.GID, gm.MessageChain);
 		});
 
 	try
 	{
 		bot.EventLoop();
-		//bot.SendFriendMessage(484599279ll, messageChain);
-		//bot.UnMute(1013323391ll, 484599279ll);
-		//bot.SendGroupMessage(1013323391ll, messageChain);
 	}
 	catch (const std::exception & ex)
 	{
 		cout << ex.what() << endl;
 	}
 
-
 	bot.Release();
 	return 0;
 }

include/FriendMessage.h

@@ -0,0 +1,50 @@
+#pragma once
+#ifndef mirai_cpp__FriendMessage_h_H_
+#define mirai_cpp__FriendMessage_h_H_
+
+#include "typedef.hpp"
+#include "message_chain.hpp"
+namespace Cyan
+{
+
+	class FriendMessage : public Serializable
+	{
+	public:
+		MessageChain MessageChain;
+		Friend_t Sender;
+
+		FriendMessage() = default;
+		FriendMessage(const FriendMessage& gm)
+		{
+			MessageChain = gm.MessageChain;
+			Sender = gm.Sender;
+		}
+		FriendMessage& operator=(const FriendMessage& t)
+		{
+			FriendMessage tmp(t);
+			std::swap(this->MessageChain, tmp.MessageChain);
+			std::swap(this->Sender, tmp.Sender);
+			return *this;
+		}
+		virtual ~FriendMessage() = default;
+		virtual bool Set(const json& j) override
+		{
+			this->MessageChain.Set(j["messageChain"]);
+			Sender.Set(j["sender"]);
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			json j = json::object();
+			j["messageChain"] = this->MessageChain.ToJson();
+			j["sender"] = this->Sender.ToJson();
+			return j;
+		}
+		virtual string ToString() const override
+		{
+			return ToJson().dump();
+		}
+	};
+} // namespace Cyan
+
+#endif // !mirai_cpp__GroupMessage_h_H_

include/GroupMessage.h

@@ -1,4 +1,7 @@
 #pragma once
+#ifndef mirai_cpp__GroupMessage_h_H_
+#define mirai_cpp__GroupMessage_h_H_
+
 #include "typedef.hpp"
 #include "message_chain.hpp"
 namespace Cyan
@@ -42,4 +45,6 @@ namespace Cyan
 			return ToJson().dump();
 		}
 	};
-} // namespace Cyan
+} // namespace Cyan
+
+#endif // !mirai_cpp__GroupMessage_h_H_

include/message_chain.hpp

@@ -21,12 +21,26 @@ namespace Cyan
 		{
 			messages_ = mc.messages_;
 		}
+		MessageChain(MessageChain&& mc)
+		{
+			std::swap(messages_, mc.messages_);
+		}
 		MessageChain& operator=(const MessageChain& mc)
 		{
 			MessageChain tmp(mc);
 			std::swap(messages_, tmp.messages_);
 			return *this;
 		}
+		MessageChain& operator=(MessageChain&& mc)
+		{
+			std::swap(messages_, mc.messages_);
+			return *this;
+		}
+		MessageChain& operator+(const MessageChain& mc)
+		{
+			messages_.insert(messages_.end(), mc.messages_.begin(), mc.messages_.end());
+			return *this;
+		}
 		virtual ~MessageChain() = default;
 		MessageChain& At(const QQ_t qq)
 		{

include/mirai.hpp

@@ -10,9 +10,9 @@
 #include <functional>
 #include <nlohmann/json.hpp>
 #include "typedef.hpp"
+#include "FriendMessage.h"
 #include "GroupMessage.h"
 #include "message_chain.hpp"
-#include <iostream>
 using std::string;
 using std::runtime_error;
 using std::vector;
@@ -22,16 +22,13 @@ using nlohmann::json;
 
 namespace Cyan
 {
-
+	typedef std::function<void(FriendMessage)> FriendMessageProcesser;
 	typedef std::function<void(GroupMessage)> GroupMessageProcesser;
 
 	class MiraiBot
 	{
 	public:
-		MiraiBot()
-		{
-			groupMessageProcesser_ = [](GroupMessage) {};
-		}
+		MiraiBot() = default;
 		~MiraiBot() = default;
 		bool Auth(const string& authKey, QQ_t qq)
 		{
@@ -400,15 +397,18 @@ namespace Cyan
 
 		}
 
-		void OnFriendMessageReceived();
+		void OnFriendMessageReceived(FriendMessageProcesser friendMessageProcesser)
+		{
+			friendMessageProcesser_ = friendMessageProcesser;
+		}
 		void OnGroupMessageReceived(GroupMessageProcesser groupMessageProcesser)
 		{
 			groupMessageProcesser_ = groupMessageProcesser;
 		}
 
 		void EventLoop()
 		{
-			unsigned count_per_loop = 10;
+			unsigned count_per_loop = 20;
 			unsigned time_interval = 100;
 			while (true)
 			{
@@ -476,9 +476,6 @@ namespace Cyan
 			return false;
 		}
 
-
-
-
 		unsigned int FetchMessagesAndEvents(unsigned int count = 10)
 		{
 			stringstream api_url;
@@ -501,13 +498,20 @@ namespace Cyan
 				for (const auto& ele : reJson)
 				{
 					MiraiEvent type = MiraiEventStr(ele["type"].get<string>());
-					if (type == MiraiEvent::GroupMessage)
+					if (groupMessageProcesser_ && type == MiraiEvent::GroupMessage)
 					{
 						GroupMessage gm;
 						gm.Set(ele);
 						std::async(std::launch::async, [&]() { groupMessageProcesser_(gm); });
 						continue;
 					}
+					if (friendMessageProcesser_ && type == MiraiEvent::FriendMessage)
+					{
+						FriendMessage fm;
+						fm.Set(ele);
+						std::async(std::launch::async, [&]() { friendMessageProcesser_(fm); });
+						continue;
+					}
 
 					received_count++;
 				}
@@ -521,6 +525,7 @@ namespace Cyan
 		string sessionKey_;
 		string api_url_prefix_ = "http://127.0.0.1:8080";
 		GroupMessageProcesser groupMessageProcesser_;
+		FriendMessageProcesser friendMessageProcesser_;
 
 	};
 } // namespace Cyan

include/typedef.hpp

@@ -18,7 +18,6 @@ namespace Cyan
 	// 消息源 ID
 	typedef int64_t MessageSourceID;
 
-
 	enum class GroupPermission
 	{
 		Member,