From 09fa1bd2e82ec387db221c735e32cfd7586b0167 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sun, 19 Apr 2020 01:34:45 +0800
Subject: [PATCH] =?UTF-8?q?[Add]=20MessageSource=20=E5=B0=86MiraiMessageEv?=
 =?UTF-8?q?ent=E7=9A=84MessageSource=E5=88=86=E7=A6=BB=E6=88=90=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8B=E7=9A=84=E7=B1=BB;=20[Change]=20SpringCQMessageEvent,?=
 =?UTF-8?q?=20MiraiMessageEvent=20=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgj/bot/event/MiraiMessageEvent.java      | 24 +------------------
 .../cgj/bot/event/SpringCQMessageEvent.java   | 22 ++++++++---------
 .../lamgc/cgj/bot/message/MessageSource.java  | 23 ++++++++++++++++++
 3 files changed, 34 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/net/lamgc/cgj/bot/message/MessageSource.java

diff --git a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
index ca73639..fc8f790 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
@@ -6,6 +6,7 @@ import net.lamgc.cgj.bot.cache.CacheStore;
 import net.lamgc.cgj.bot.cache.HotDataCacheStore;
 import net.lamgc.cgj.bot.cache.LocalHashCacheStore;
 import net.lamgc.cgj.bot.cache.StringRedisCacheStore;
+import net.lamgc.cgj.bot.message.MessageSource;
 import net.mamoe.mirai.message.ContactMessage;
 import net.mamoe.mirai.message.FriendMessage;
 import net.mamoe.mirai.message.GroupMessage;
@@ -197,27 +198,4 @@ public class MiraiMessageEvent extends MessageEvent {
         }
     }
 
-    /**
-     * 消息来源
-     */
-    public enum MessageSource {
-        /**
-         * 私聊消息
-         */
-        Private,
-        /**
-         * 群组消息
-         */
-        Group,
-        /**
-         * 讨论组消息
-         * @deprecated 已被QQ取消
-         */
-        Discuss,
-        /**
-         * 未知来源
-         */
-        Unknown
-    }
-
 }
diff --git a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
index 05423d7..8c99083 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
@@ -1,6 +1,7 @@
 package net.lamgc.cgj.bot.event;
 
 import net.lamgc.cgj.bot.BotCode;
+import net.lamgc.cgj.bot.message.MessageSource;
 import net.lz1998.cq.event.message.CQDiscussMessageEvent;
 import net.lz1998.cq.event.message.CQGroupMessageEvent;
 import net.lz1998.cq.event.message.CQMessageEvent;
@@ -11,12 +12,8 @@ import java.util.Objects;
 
 public class SpringCQMessageEvent extends MessageEvent {
 
-    private final static int TYPE_PRIVATE = 0;
-    private final static int TYPE_GROUP = 1;
-    private final static int TYPE_DISCUSS = 2;
-
     private final CoolQ cq;
-    private final int type;
+    private final MessageSource source;
 
     public SpringCQMessageEvent(CoolQ cq, CQMessageEvent messageEvent) {
         super(messageEvent instanceof CQGroupMessageEvent ? (
@@ -26,22 +23,23 @@ public class SpringCQMessageEvent extends MessageEvent {
               messageEvent.getUserId(), messageEvent.getMessage());
         this.cq = Objects.requireNonNull(cq);
         if(messageEvent instanceof CQGroupMessageEvent) {
-            type = TYPE_GROUP;
+            source = MessageSource.Group;
         } else if (messageEvent instanceof CQDiscussMessageEvent) {
-            type = TYPE_DISCUSS;
+            source = MessageSource.Discuss;
         } else {
-            type = TYPE_PRIVATE;
+            source = MessageSource.Private;
         }
     }
 
     @Override
     public int sendMessage(final String message) {
-        switch(type) {
-            case TYPE_PRIVATE:
+        switch(source) {
+            case Private:
                 return cq.sendPrivateMsg(getFromQQ(), message, false).getData().getMessageId();
-            case TYPE_GROUP:
-            case TYPE_DISCUSS:
+            case Group:
                 return cq.sendGroupMsg(getFromGroup(), message, false).getData().getMessageId();
+            case Discuss:
+                return cq.sendDiscussMsg(getFromGroup(), message, false).getData().getMessageId();
             default:
                 return -1;
         }
diff --git a/src/main/java/net/lamgc/cgj/bot/message/MessageSource.java b/src/main/java/net/lamgc/cgj/bot/message/MessageSource.java
new file mode 100644
index 0000000..4beb53f
--- /dev/null
+++ b/src/main/java/net/lamgc/cgj/bot/message/MessageSource.java
@@ -0,0 +1,23 @@
+package net.lamgc.cgj.bot.message;
+
+/**
+ * 消息来源
+ */
+public enum MessageSource {
+    /**
+     * 私聊消息
+     */
+    Private,
+    /**
+     * 群组消息
+     */
+    Group,
+    /**
+     * 讨论组消息
+     */
+    Discuss,
+    /**
+     * 未知来源
+     */
+    Unknown
+}
\ No newline at end of file