新增: 支持发送戳一戳.

Author: cyanray

examples/NudgeEvent.cpp

@@ -54,16 +54,23 @@ int main()
 	bot.On<NudgeEvent>(
 		[&](NudgeEvent e)
 		{
-			stringstream ss;
-			ss << e.FromId.ToInt64() << " " << e.Action << " " << e.Target << " " << e.Suffix;
-			if (e.FromKind == NudgeEvent::SubjectKind::Group)
-			{
-				bot.SendMessage(GID_t(e.SubjectId), MessageChain().Plain(ss.str()));
-			}
-			else
-			{
-				bot.SendMessage(QQ_t(e.SubjectId), MessageChain().Plain(ss.str()));
-			}
+			// 注意: 使用 SendNudge 发送的戳一戳，也会触发该事件,
+			// 注意: 因此必须过滤掉来自bot自己的戳一戳事件，不然会导致死循环
+			if (e.FromId.ToInt64() == bot.GetBotQQ().ToInt64()) return;
+
+			cout << e.FromId.ToInt64() << " " << e.Action << " " << e.Target << " " << e.Suffix;
+			// 如果别人戳机器人，那么就让机器人戳回去
+			if (e.Target.ToInt64() != bot.GetBotQQ().ToInt64()) return;
+			bot.SendNudge(e.FromId, e.SubjectId, e.FromKind);
+			// 如果不喜欢上面这一行代码，也可以用下面的代码代替
+			//if (e.FromKind == NudgeEvent::SubjectKind::Group)
+			//{
+			//	bot.SendNudge(e.FromId, (GID_t)e.SubjectId);
+			//}
+			//else
+			//{
+			//	bot.SendNudge(e.FromId, (QQ_t)e.SubjectId);
+			//}
 		});
 
 

include/mirai/mirai_bot.hpp

@@ -25,7 +25,8 @@
 #include "mirai/events/friend_message.hpp"
 #include "mirai/events/group_message.hpp"
 #include "mirai/events/message_event.hpp"
-#include <mirai/events/lost_connection.hpp>
+#include "mirai/events/nudge_event.hpp"
+#include "mirai/events/lost_connection.hpp"
 
 using std::string;
 using std::vector;
@@ -73,7 +74,7 @@ namespace Cyan
 		string GetMiraiCppVersion() const
 		{
 			// mirai-api-http v1.6.5
-			return "1.9.7";
+			return "1.9.10";
 		}
 
 		/**
@@ -128,6 +129,25 @@ namespace Cyan
 		 * \return 用于引用或撤回的消息 ID (MessageId)
 		 */
 		MessageId_t SendMessage(GID_t gid, QQ_t qq, const MessageChain& messageChain, MessageId_t msgId = 0);
+		/**
+		 * @brief 发送戳一戳
+		 * @param target 目标QQ，可以是好友或者Bot的QQ
+		 * @param subject_id 戳一戳接收主体，好友QQ
+		*/
+		void SendNudge(QQ_t target, QQ_t subject_id);
+		/**
+		 * @brief 发送戳一戳
+		 * @param target 目标QQ，可以是好友或者Bot的QQ
+		 * @param subject_id 戳一戳接收主体，群号码
+		*/
+		void SendNudge(QQ_t target, GID_t subject_id);
+		/**
+		 * @brief 发送戳一戳
+		 * @param target 目标QQ，可以是好友或者Bot的QQ
+		 * @param subject_id 戳一戳接收主体，可以是QQ好友或者群号码
+		 * @param kind 需要指定接收主体的类型
+		*/
+		void SendNudge(QQ_t target, int64_t subject_id, NudgeEvent::SubjectKind kind);
 		/**
 		 * \brief 上传可以发送给好友的图片
 		 * \param fileName 文件名
@@ -362,6 +382,7 @@ namespace Cyan
 		void EventLoop(function<void(const char*)> errLogger = nullptr);
 	private:
 		// 私有成员函数
+		void SendNudge(int64_t target, int64_t subject_id, const string& kind);
 		bool SessionVerify();
 		bool SessionRelease();
 		bool SessionConfigure(int cacheSize, bool enableWebsocket);

src/mirai_bot.cpp

@@ -195,6 +195,44 @@ namespace Cyan
 		throw runtime_error(msg);
 	}
 
+	void MiraiBot::SendNudge(int64_t target, int64_t subject_id, const string& kind)
+	{
+		json data =
+		{
+			{ "sessionKey", sessionKey_ },
+			{ "target", target },
+			{ "subject", subject_id },
+			{ "kind" , kind }
+		};
+
+		auto res = http_client_.Post("/sendNudge", data.dump(), "application/json;charset=UTF-8");
+		if (!res)
+			throw std::runtime_error("网络错误");
+		if (res->status != 200)
+			throw std::runtime_error("[mirai-api-http error]: " + res->body);
+		json re_json = json::parse(res->body);
+		int code = re_json["code"].get<int>();
+		if (code != 0)
+		{
+			string msg = re_json["msg"].get<string>();
+			throw runtime_error(msg);
+		}
+	}
+
+	void MiraiBot::SendNudge(QQ_t target, QQ_t subject_id)
+	{
+		SendNudge(target.ToInt64(), subject_id.ToInt64(), "Friend");
+	}
+
+	void MiraiBot::SendNudge(QQ_t target, GID_t subject_id)
+	{
+		SendNudge(target.ToInt64(), subject_id.ToInt64(), "Group");
+	}
+
+	void MiraiBot::SendNudge(QQ_t target, int64_t subject_id, NudgeEvent::SubjectKind kind)
+	{
+		SendNudge(target.ToInt64(), subject_id, NudgeEvent::SubjectKindStr(kind));
+	}
 
 	FriendImage MiraiBot::UploadFriendImage(const string& fileName)
 	{