添加其他设备状态事件

添加群特殊头衔变动事件优化分类结构
cnlimiter · Oct 15, 2022 · 7569e84 · 7569e84
1 parent e3a0e11
commit 7569e84
Show file tree

Hide file tree

Showing 31 changed files with 176 additions and 30 deletions.
diff --git a/src/main/java/cn/evolvefield/mirai/onebot/core/MiraiApi.java b/src/main/java/cn/evolvefield/mirai/onebot/core/MiraiApi.java
@@ -11,7 +11,7 @@
 import cn.evolvefield.mirai.onebot.dto.response.group.GroupHonorInfoResp;
 import cn.evolvefield.mirai.onebot.dto.response.group.GroupInfoResp;
 import cn.evolvefield.mirai.onebot.dto.response.group.GroupMemberInfoResp;
-import cn.evolvefield.mirai.onebot.dto.response.msic.*;
+import cn.evolvefield.mirai.onebot.dto.response.misc.*;
 import cn.evolvefield.mirai.onebot.util.BaseUtils;
 import cn.evolvefield.mirai.onebot.util.DataBaseUtils;
 import cn.evolvefield.mirai.onebot.util.OnebotMsgParser;

diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/event/EventMap.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/event/EventMap.java
@@ -2,7 +2,10 @@
 
 import cn.evolvefield.mirai.onebot.OneBotMirai;
 import cn.evolvefield.mirai.onebot.dto.event.message.MessageMap;
-import cn.evolvefield.mirai.onebot.dto.event.notice.*;
+import cn.evolvefield.mirai.onebot.dto.event.notice.friend.FriendAddNoticeEvent;
+import cn.evolvefield.mirai.onebot.dto.event.notice.friend.PrivatePokeNoticeEvent;
+import cn.evolvefield.mirai.onebot.dto.event.notice.group.*;
+import cn.evolvefield.mirai.onebot.dto.event.notice.misc.OtherClientStatusNoticeEvent;
 import cn.evolvefield.mirai.onebot.dto.event.request.FriendAddRequestEvent;
 import cn.evolvefield.mirai.onebot.dto.event.request.GroupAddRequestEvent;
 import cn.evolvefield.mirai.onebot.util.DataBaseUtils;
@@ -353,6 +356,36 @@ else if (botEvent instanceof MemberCardChangeEvent changeEvent){
             event.setTime(currentTimeSeconds);
             return event;
         }
+        else if (botEvent instanceof MemberSpecialTitleChangeEvent changeEvent){
+            var event = new GroupTitleChangeNoticeEvent();
+            event.setPostType("notice");
+            event.setNoticeType("group_title");
+            event.setSelfId(changeEvent.getBot().getId());
+            event.setGroupId(changeEvent.getGroup().getId());
+            event.setUserId(changeEvent.getUser().getId());
+            event.setTitleNew(changeEvent.getNew());
+            event.setTitleOld(changeEvent.getOrigin());
+            event.setTime(currentTimeSeconds);
+            return event;
+        }
+        else if (botEvent instanceof OtherClientEvent clientEvent){
+            var event = new OtherClientStatusNoticeEvent();
+            event.setPostType("notice");
+            event.setNoticeType("client_status");
+            if (clientEvent instanceof OtherClientOfflineEvent offlineEvent){
+                event.setSelfId(offlineEvent.getBot().getId());
+                event.setClient(new OtherClientStatusNoticeEvent.Clients(offlineEvent.getClient().getInfo()));
+                event.setOnline(false);
+                return event;
+            }
+            else if (clientEvent instanceof OtherClientOnlineEvent onlineEvent){
+                event.setSelfId(onlineEvent.getBot().getId());
+                event.setClient(new OtherClientStatusNoticeEvent.Clients(onlineEvent.getClient().getInfo()));
+                event.setOnline(false);
+                return event;
+            }
+            else return new IgnoreEvent();
+        }
         else {
             logger.info(String.format("发生了被插件忽略的事件: %s", botEvent));
             return new IgnoreEvent(botEvent.getBot().getId());

diff --git a/...to/event/notice/FriendAddNoticeEvent.java → ...t/notice/friend/FriendAddNoticeEvent.java b/...to/event/notice/FriendAddNoticeEvent.java → ...t/notice/friend/FriendAddNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.friend;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...t/notice/PrivateMsgDeleteNoticeEvent.java → ...e/friend/PrivateMsgDeleteNoticeEvent.java b/...t/notice/PrivateMsgDeleteNoticeEvent.java → ...e/friend/PrivateMsgDeleteNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.friend;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/.../event/notice/PrivatePokeNoticeEvent.java → ...notice/friend/PrivatePokeNoticeEvent.java b/.../event/notice/PrivatePokeNoticeEvent.java → ...notice/friend/PrivatePokeNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.friend;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...o/event/notice/GroupAdminNoticeEvent.java → ...t/notice/group/GroupAdminNoticeEvent.java b/...o/event/notice/GroupAdminNoticeEvent.java → ...t/notice/group/GroupAdminNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...dto/event/notice/GroupBanNoticeEvent.java → ...ent/notice/group/GroupBanNoticeEvent.java b/...dto/event/notice/GroupBanNoticeEvent.java → ...ent/notice/group/GroupBanNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...nt/notice/GroupCardChangeNoticeEvent.java → ...ice/group/GroupCardChangeNoticeEvent.java b/...nt/notice/GroupCardChangeNoticeEvent.java → ...ice/group/GroupCardChangeNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...vent/notice/GroupDecreaseNoticeEvent.java → ...otice/group/GroupDecreaseNoticeEvent.java b/...vent/notice/GroupDecreaseNoticeEvent.java → ...otice/group/GroupDecreaseNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...event/notice/GroupEssenceNoticeEvent.java → ...notice/group/GroupEssenceNoticeEvent.java b/...event/notice/GroupEssenceNoticeEvent.java → ...notice/group/GroupEssenceNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,7 +19,7 @@
 @AllArgsConstructor
 @SuperBuilder(toBuilder = true)
 @EqualsAndHashCode(callSuper = true)
-public class GroupEssenceNoticeEvent extends NoticeEvent{
+public class GroupEssenceNoticeEvent extends NoticeEvent {
     @JSONField(name = "sub_type")
     private String  subType;//add,delete	添加为add,移出为delete
     @JSONField(name = "sender_id")

diff --git a/...t/notice/GroupHonorChangeNoticeEvent.java → ...ce/group/GroupHonorChangeNoticeEvent.java b/...t/notice/GroupHonorChangeNoticeEvent.java → ...ce/group/GroupHonorChangeNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...vent/notice/GroupIncreaseNoticeEvent.java → ...otice/group/GroupIncreaseNoticeEvent.java b/...vent/notice/GroupIncreaseNoticeEvent.java → ...otice/group/GroupIncreaseNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...ent/notice/GroupLuckyKingNoticeEvent.java → ...tice/group/GroupLuckyKingNoticeEvent.java b/...ent/notice/GroupLuckyKingNoticeEvent.java → ...tice/group/GroupLuckyKingNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...ent/notice/GroupMsgDeleteNoticeEvent.java → ...tice/group/GroupMsgDeleteNoticeEvent.java b/...ent/notice/GroupMsgDeleteNoticeEvent.java → ...tice/group/GroupMsgDeleteNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...to/event/notice/GroupPokeNoticeEvent.java → ...nt/notice/group/GroupPokeNoticeEvent.java b/...to/event/notice/GroupPokeNoticeEvent.java → ...nt/notice/group/GroupPokeNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/.../java/cn/evolvefield/mirai/onebot/dto/event/notice/group/GroupTitleChangeNoticeEvent.java b/.../java/cn/evolvefield/mirai/onebot/dto/event/notice/group/GroupTitleChangeNoticeEvent.java
@@ -0,0 +1,35 @@
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
+
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * Created on 2022/7/8.
+ *
+ * @author cnlimiter
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class GroupTitleChangeNoticeEvent extends NoticeEvent {
+
+    @JSONField(name = "title_new")
+    private String titleNew;
+
+    @JSONField(name = "group_id")
+    private long groupId;
+
+    @JSONField(name = "title_old")
+    private String titleOld;
+
+    @JSONField(name = "user_id")
+    private long userId;
+
+}
diff --git a/.../event/notice/GroupUploadNoticeEvent.java → .../notice/group/GroupUploadNoticeEvent.java b/.../event/notice/GroupUploadNoticeEvent.java → .../notice/group/GroupUploadNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.group;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...ent/notice/ChannelCreatedNoticeEvent.java → ...tice/guild/ChannelCreatedNoticeEvent.java b/...ent/notice/ChannelCreatedNoticeEvent.java → ...tice/guild/ChannelCreatedNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.guild;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import cn.evolvefield.mirai.onebot.dto.response.guild.ChannelInfoResp;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

diff --git a/...t/notice/ChannelDestroyedNoticeEvent.java → ...ce/guild/ChannelDestroyedNoticeEvent.java b/...t/notice/ChannelDestroyedNoticeEvent.java → ...ce/guild/ChannelDestroyedNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.guild;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import cn.evolvefield.mirai.onebot.dto.response.guild.ChannelInfoResp;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

diff --git a/...ent/notice/ChannelUpdatedNoticeEvent.java → ...tice/guild/ChannelUpdatedNoticeEvent.java b/...ent/notice/ChannelUpdatedNoticeEvent.java → ...tice/guild/ChannelUpdatedNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.guild;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import cn.evolvefield.mirai.onebot.dto.response.guild.ChannelInfoResp;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

diff --git a/...e/MessageReactionsUpdatedNoticeEvent.java → ...d/MessageReactionsUpdatedNoticeEvent.java b/...e/MessageReactionsUpdatedNoticeEvent.java → ...d/MessageReactionsUpdatedNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.guild;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/.../java/cn/evolvefield/mirai/onebot/dto/event/notice/misc/OtherClientStatusNoticeEvent.java b/.../java/cn/evolvefield/mirai/onebot/dto/event/notice/misc/OtherClientStatusNoticeEvent.java
@@ -0,0 +1,59 @@
+package cn.evolvefield.mirai.onebot.dto.event.notice.misc;
+
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import net.mamoe.mirai.contact.OtherClientInfo;
+
+import java.util.Objects;
+
+/**
+ * Created on 2022/7/8.
+ *
+ * @author cnlimiter
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class OtherClientStatusNoticeEvent extends NoticeEvent {
+
+    @JSONField(name = "online")
+    private boolean online;
+
+    @JSONField(name = "client")
+    private Clients client;
+
+    /**
+     * 设备对象
+     */
+    @Data
+    public static class Clients {
+
+        public Clients(OtherClientInfo info){
+            this.platform = Objects.requireNonNull(info.getPlatform()).name().toLowerCase();
+            this.appId = info.getAppId();
+            this.deviceName = info.getDeviceName();
+            this.deviceKind = info.getDeviceKind();
+        }
+
+        @JSONField(name = "app_id")
+        private long appId;
+
+        @JSONField(name = "platform")
+        private String platform;
+
+        @JSONField(name = "device_name")
+        private String deviceName;
+
+        @JSONField(name = "device_kind")
+        private String deviceKind;
+
+    }
+
+}
diff --git a/...otice/ReceiveOfflineFilesNoticeEvent.java → .../misc/ReceiveOfflineFilesNoticeEvent.java b/...otice/ReceiveOfflineFilesNoticeEvent.java → .../misc/ReceiveOfflineFilesNoticeEvent.java
@@ -1,5 +1,6 @@
-package cn.evolvefield.mirai.onebot.dto.event.notice;
+package cn.evolvefield.mirai.onebot.dto.event.notice.misc;
 
+import cn.evolvefield.mirai.onebot.dto.event.notice.NoticeEvent;
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...nebot/dto/response/msic/AsyncStarted.java → ...nebot/dto/response/misc/AsyncStarted.java b/...nebot/dto/response/msic/AsyncStarted.java → ...nebot/dto/response/misc/AsyncStarted.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import cn.evolvefield.mirai.onebot.dto.response.ActionData;
 

diff --git a/...bot/dto/response/msic/GeneralSuccess.java → ...bot/dto/response/misc/GeneralSuccess.java b/...bot/dto/response/msic/GeneralSuccess.java → ...bot/dto/response/misc/GeneralSuccess.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import cn.evolvefield.mirai.onebot.dto.response.ActionData;
 

diff --git a/...bot/dto/response/msic/InvalidRequest.java → ...bot/dto/response/misc/InvalidRequest.java b/...bot/dto/response/msic/InvalidRequest.java → ...bot/dto/response/misc/InvalidRequest.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import cn.evolvefield.mirai.onebot.dto.response.ActionData;
 

diff --git a/...nebot/dto/response/msic/MiraiFailure.java → ...nebot/dto/response/misc/MiraiFailure.java b/...nebot/dto/response/msic/MiraiFailure.java → ...nebot/dto/response/misc/MiraiFailure.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import cn.evolvefield.mirai.onebot.dto.response.ActionData;
 

diff --git a/...ebot/dto/response/msic/PluginFailure.java → ...ebot/dto/response/misc/PluginFailure.java b/...ebot/dto/response/msic/PluginFailure.java → ...ebot/dto/response/misc/PluginFailure.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import cn.evolvefield.mirai.onebot.dto.response.ActionData;
 

diff --git a/...t/dto/response/msic/PluginStatusResp.java → ...t/dto/response/misc/PluginStatusResp.java b/...t/dto/response/msic/PluginStatusResp.java → ...t/dto/response/misc/PluginStatusResp.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

diff --git a/...onebot/dto/response/msic/PluginsGood.java → ...onebot/dto/response/misc/PluginsGood.java b/...onebot/dto/response/msic/PluginsGood.java → ...onebot/dto/response/misc/PluginsGood.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

diff --git a/...onebot/dto/response/msic/VersionInfo.java → ...onebot/dto/response/misc/VersionInfo.java b/...onebot/dto/response/msic/VersionInfo.java → ...onebot/dto/response/misc/VersionInfo.java
@@ -1,4 +1,4 @@
-package cn.evolvefield.mirai.onebot.dto.response.msic;
+package cn.evolvefield.mirai.onebot.dto.response.misc;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;