Merge branch 'master' into dev/cyanray

Author: cyanray

CMakeLists.txt

@@ -21,7 +21,17 @@ endif()
 
 aux_source_directory(./src SRCS)
 
-add_library(${PROJECT_NAME} ${LIBRARY_TYPE} ${SRCS})
+add_library(
+    ${PROJECT_NAME} 
+    ${LIBRARY_TYPE} 
+    src/EventHelperFunctions.cpp
+    src/MemberHonorChangeEvent.cpp
+    src/MessageChain.cpp
+    src/MiraiEvent.cpp
+    src/MiraiBot.cpp
+    src/MusicShareKind.cpp
+    src/SessionOptions.cpp
+)
 target_include_directories(${PROJECT_NAME} PUBLIC 
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>

CMakePresets.json

@@ -1,4 +1,4 @@
-{
+{
   "version": 2,
   "configurePresets": [
     {

README.md

@@ -170,5 +170,6 @@ mirai-cpp 目前还有许多不足，欢迎提出 issues 或 pull requests。
 
 > 如果你愿意分享你开发的程序，欢迎提出 issues 或 pull requests 在下方分享你的程序
 
-1. [MocliaParseBot](https://github.com/Moclia-Developer-Team/MocliaParseBot) : 基于Mirai-Api-Http和Mirai-cpp的全平台网络服务群QQ解析项目
+1. [MocliaParseBot](https://github.com/Moclia-Developer-Team/MocliaParseBot): 基于Mirai-Api-Http和Mirai-cpp的全平台网络服务群QQ解析项目
+2. [LGTBot-Mirai](https://github.com/Slontia/lgtbot-mirai): 基于mirai-cpp的游戏裁判机器人，可以在聊天室中开展游戏
 

doc/Documentation.md

@@ -43,7 +43,7 @@
 
 如果你更喜欢按需引用头文件，或者要参与到 mirai-cpp 的开发中，那么我先介绍 mirai-cpp 的项目结构。
 
-**MiraiBot 类**的声明位于 **mirai/mirai_bot.hpp** 文件中。
+**MiraiBot 类**的声明位于 **mirai/MiraiBot.hpp** 文件中。
 
 mirai-cpp 各种**类型**(比如 QQ_t、GID_t、Group_t、GroupFile 等类型)的声明和定义在 **mirai/defs/** 目录下。
 

examples/BotEvents.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 // 使用静态库必须要在引入 mirai.h 前定义这个宏
 #define MIRAICPP_STATICLIB
-#include <mirai/mirai_bot.hpp>
+#include <mirai/MiraiBot.hpp>
 #include <mirai/events/BotJoinGroupEvent.hpp>
 #include <mirai/events/BotMuteEvent.hpp>
 #include <mirai/events/BotUnmuteEvent.hpp>

examples/CMakeLists.txt

@@ -7,7 +7,7 @@ if(MSVC)
     message(STATUS "optional: /UTF-8")   
 endif(MSVC)
 
-macro(api_exe target)
+function(api_exe target)
     add_executable(${target} ${target}.cpp)
     target_link_libraries(${target} mirai-cpp)
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -16,10 +16,10 @@ macro(api_exe target)
         # 静态链接 libgcc 和 libstdc++
         target_link_libraries(${target} -static-libgcc -static-libstdc++)
     endif()
-endmacro()
+endfunction()
 
 api_exe(RepeatMessage)
-api_exe(SendImageMessage)
+api_exe(ImageMessage)
 api_exe(GetFriendList)
 api_exe(GetGroupList)
 api_exe(NewFriendEvent)

examples/SendImageMessage.cpp renamed to examples/ImageMessage.cpp

@@ -3,7 +3,7 @@
 #define MIRAICPP_STATICLIB
 // 按需引用头文件
 // 你也可以使用 #include <mirai.h> 引用所有头文件(可能导致编译缓慢)
-#include <mirai/mirai_bot.hpp>
+#include <mirai/MiraiBot.hpp>
 using namespace std;
 using namespace Cyan;
 

examples/RepeatMessage.cpp

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #ifndef mirai_cpp__mirai_bot_hpp_H_
 #define mirai_cpp__mirai_bot_hpp_H_
 // std libraries
@@ -13,7 +13,7 @@
 // mirai header files
 #include "mirai/exported.h"
 #include "mirai/defs/defs.hpp"
-#include "mirai/events/event_processer.hpp"
+#include "mirai/events/EventCallback.hpp"
 #include "mirai/events/FriendMessage.hpp"
 #include "mirai/events/GroupMessage.hpp"
 #include "mirai/events/Message.hpp"
@@ -48,7 +48,7 @@ namespace Cyan
 		 */
 		inline string GetMiraiCppVersion() const
 		{
-			return "2.3.3";
+			return "2.4.0";
 		}
 
 		std::shared_ptr<httplib::Client> GetHttpClient();
@@ -280,6 +280,13 @@ namespace Cyan
 		*/
 		Profile GetGroupMemberProfile(const GID_t& gid, const QQ_t& memberQQ);
 
+		/**
+		 * @brief 获取QQ用户的个人简介
+		 * @param qq 用户QQ
+		 * @return Profile
+		*/
+		Profile GetUserProfile(const QQ_t& qq);
+
 		/**
 		 * \brief 设置群成员的群名片
 		 * \param gid 群组(GID_t)

include/mirai/mirai_bot.hpp renamed to include/mirai/MiraiBot.hpp

@@ -3,7 +3,7 @@
 #define mirai_cpp__SessionOptions_hpp_H_
 
 #include <string>
-#include "mirai/defs/qq_types.hpp"
+#include "mirai/defs/QQType.hpp"
 #include "mirai/Property.hpp"
 
 using std::string;

include/mirai/SessionOptions.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_defs_file_download_info_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "serializable.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "ISerializable.hpp"
 
 namespace Cyan
 {

include/mirai/defs/FileDownloadInfo.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_defs_friend_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "qq_types.hpp"
-#include "serializable.hpp"
+#include "QQType.hpp"
+#include "ISerializable.hpp"
 
 namespace Cyan
 {

include/mirai/defs/friend.hpp renamed to include/mirai/defs/Friend.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_defs_group_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "qq_types.hpp"
-#include "serializable.hpp"
+#include "QQType.hpp"
+#include "ISerializable.hpp"
 
 namespace Cyan
 {

include/mirai/defs/group.hpp renamed to include/mirai/defs/Group.hpp

@@ -3,7 +3,7 @@
 #define mirai_cpp_defs_group_config_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "serializable.hpp"
+#include "ISerializable.hpp"
 
 namespace Cyan
 {

include/mirai/defs/group_config.hpp renamed to include/mirai/defs/GroupConfig.hpp

@@ -4,8 +4,8 @@
 #include <memory>
 #include <optional>
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "serializable.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "ISerializable.hpp"
 #include "FileDownloadInfo.hpp"
 using std::shared_ptr;
 

include/mirai/defs/group_file.hpp renamed to include/mirai/defs/GroupFile.hpp

@@ -3,9 +3,9 @@
 #define mirai_cpp_defs_group_member_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "qq_types.hpp"
-#include "serializable.hpp"
-#include "group.hpp"
+#include "QQType.hpp"
+#include "ISerializable.hpp"
+#include "Group.hpp"
 
 namespace Cyan
 {

include/mirai/defs/group_member.hpp renamed to include/mirai/defs/GroupMember.hpp

@@ -3,7 +3,7 @@
 #define mirai_cpp_defs_message_interface_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "serializable.hpp"
+#include "ISerializable.hpp"
 
 namespace Cyan
 {

include/mirai/defs/message_interface.hpp renamed to include/mirai/defs/IMessage.hpp

@@ -7,9 +7,9 @@
 #include <vector>
 #include <memory>
 #include "mirai/exported.h"
-#include "qq_types.hpp"
-#include "serializable.hpp"
-#include "message_interface.hpp"
+#include "QQType.hpp"
+#include "ISerializable.hpp"
+#include "IMessage.hpp"
 #include "mirai/messages/PlainMessage.hpp"
 #include "mirai/messages/ImageMessage.hpp"
 #include "mirai/messages/FlashImageMessage.hpp"

include/mirai/defs/serializable.hpp renamed to include/mirai/defs/ISerializable.hpp

@@ -4,7 +4,7 @@
 
 #include <string>
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "serializable.hpp"
+#include "ISerializable.hpp"
 
 
 namespace Cyan

include/mirai/defs/message_chain.hpp renamed to include/mirai/defs/MessageChain.hpp

@@ -5,7 +5,7 @@
 #include <exception>
 #include <iostream>
 #include <functional>
-#include "serializable.hpp"
+#include "ISerializable.hpp"
 #include "mirai/exported.h"
 
 namespace Cyan

include/mirai/defs/profile.hpp renamed to include/mirai/defs/Profile.hpp

@@ -2,16 +2,15 @@
 #ifndef mirai_cpp_defs_defs_hpp_H_
 #define mirai_cpp_defs_defs_hpp_H_
 
-// 基础定义
-#include "serializable.hpp"
-#include "qq_types.hpp"
-#include "group.hpp"
-#include "friend.hpp"
-#include "group_member.hpp"
-#include "message_chain.hpp"
-#include "profile.hpp"
-#include "group_config.hpp"
-#include "group_file.hpp"
+#include "ISerializable.hpp"
+#include "QQType.hpp"
+#include "Friend.hpp"
+#include "Group.hpp"
+#include "GroupMember.hpp"
+#include "GroupConfig.hpp"
+#include "GroupFile.hpp"
+#include "MessageChain.hpp"
+#include "Profile.hpp"
 #include "FileDownloadInfo.hpp"
 
 #endif // !mirai_cpp_defs_defs_hpp_H_

include/mirai/defs/qq_types.hpp renamed to include/mirai/defs/QQType.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotGroupPermissionChangeEvent_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "event_interface.hpp"
-#include "mirai/defs/group.hpp"
+#include "EventBase.hpp"
+#include "mirai/defs/Group.hpp"
 
 namespace Cyan
 {

include/mirai/defs/simple_reflect.hpp renamed to include/mirai/defs/SimpleReflect.hpp

@@ -3,9 +3,9 @@
 #define mirai_cpp_events_BotInvitedJoinGroupRequestEvent_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
+#include "mirai/defs/QQType.hpp"
 #include "mirai/exported.h"
-#include "event_interface.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/defs/defs.hpp

@@ -4,9 +4,9 @@
 
 #include <optional>
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "event_interface.hpp"
-#include "mirai/defs/group.hpp"
-#include "mirai/defs/group_member.hpp"
+#include "EventBase.hpp"
+#include "mirai/defs/Group.hpp"
+#include "mirai/defs/GroupMember.hpp"
 using std::optional;
 
 namespace Cyan

include/mirai/events/BotGroupPermissionChangeEvent.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotLeaveEventActive_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/group.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/Group.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotInvitedJoinGroupRequestEvent.hpp

@@ -4,9 +4,9 @@
 
 #include <optional>
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/group.hpp"
-#include "mirai/defs/group_member.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/Group.hpp"
+#include "mirai/defs/GroupMember.hpp"
+#include "EventBase.hpp"
 using std::optional;
 
 namespace Cyan

include/mirai/events/BotJoinGroupEvent.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotMuteEvent_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/group_member.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/GroupMember.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotLeaveEventActive.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotOfflineEventActive_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotLeaveEventKick.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotOfflineEventDropped_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotMuteEvent.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotOfflineEventForce_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotOfflineEventActive.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotOnlineEvent_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotOfflineEventDropped.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotReloginEvent_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/qq_types.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/QQType.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {

include/mirai/events/BotOfflineEventForce.hpp

@@ -3,8 +3,8 @@
 #define mirai_cpp_events_BotUnmuteEvent_hpp_H_
 
 #include "mirai/third-party/nlohmann/json.hpp"
-#include "mirai/defs/group_member.hpp"
-#include "event_interface.hpp"
+#include "mirai/defs/GroupMember.hpp"
+#include "EventBase.hpp"
 
 namespace Cyan
 {