Merge pull request #59 from cyanray/dev/cyanray

修复: Group_t 对象 json解析不对称

Author: cyanray

examples/BotEvents.cpp

@@ -1,17 +1,17 @@
 #include <iostream>
 // 使用静态库必须要在引入 mirai.h 前定义这个宏
 #define MIRAICPP_STATICLIB
-#include <mirai_bot.hpp>
-#include <events/bot_join_group.hpp>
-#include <events/bot_mute_event.hpp>
-#include <events/bot_unmute_event.hpp>
-#include <events/bot_leave_kick.hpp>
-#include <events/bot_online_event.hpp>
-#include <events/bot_offline_active.hpp>
-#include <events/bot_offline_force.hpp>
-#include <events/bot_offline_dropped.hpp>
-#include <events/bot_relogin_event.hpp>
-#include <events/bot_invited_join_group_request_event.hpp>
+#include <mirai/mirai_bot.hpp>
+#include <mirai/events/bot_join_group.hpp>
+#include <mirai/events/bot_mute_event.hpp>
+#include <mirai/events/bot_unmute_event.hpp>
+#include <mirai/events/bot_leave_kick.hpp>
+#include <mirai/events/bot_online_event.hpp>
+#include <mirai/events/bot_offline_active.hpp>
+#include <mirai/events/bot_offline_force.hpp>
+#include <mirai/events/bot_offline_dropped.hpp>
+#include <mirai/events/bot_relogin_event.hpp>
+#include <mirai/events/bot_invited_join_group_request_event.hpp>
 
 int main()
 {

include/mirai/defs/group.hpp

@@ -27,8 +27,8 @@ namespace Cyan
 		{
 			json j = json::object();
 			j["id"] = int64_t(GID);
-			j["nickname"] = Name;
-			j["remark"] = GroupPermissionStr(Permission);
+			j["name"] = Name;
+			j["permission"] = GroupPermissionStr(Permission);
 			return j;
 		}
 	};