From 260cfe3dd0e5043507750e9fc6929ec1b230e4d8 Mon Sep 17 00:00:00 2001 From: LamGC Date: Fri, 17 Apr 2020 18:29:59 +0800 Subject: [PATCH] =?UTF-8?q?[Delete]=20MessageEvent=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7=E9=99=8D=E4=BD=8E=E7=9A=84=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95;=20[Delete]=20MiraiMessageEvent,=20SpringCQM?= =?UTF-8?q?essageEvent=20=E9=80=82=E9=85=8D=20MessageEvent=20=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 --- src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java | 6 ------ .../java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java | 5 ----- .../java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java | 6 ------ 3 files changed, 17 deletions(-) diff --git a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java index d72ff66..0e896c0 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java +++ b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java @@ -28,12 +28,6 @@ public abstract class MessageEvent implements EventObject { */ public abstract String getImageUrl(String image); - /** - * 获取原始消息对象.(不推荐使用) - * @return 消息对象 - */ - public abstract Object getRawMessage(); - /** * 获取来源群组号 * @return 如非群组消息, 返回0 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 68cb489..c65fd9a 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java +++ b/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java @@ -59,11 +59,6 @@ public class MiraiMessageEvent extends MessageEvent { return messageObject.getBot().queryImageUrl(MessageUtils.newImage(imageId)); } - @Override - public Object getRawMessage() { - return messageObject; - } - private final static Pattern cqCodePattern = Pattern.compile("\\[.*?:.*?]"); private Message processMessage(final String message) { Matcher matcher = cqCodePattern.matcher(message); 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 a3ff50a..05423d7 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java +++ b/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java @@ -17,7 +17,6 @@ public class SpringCQMessageEvent extends MessageEvent { private final CoolQ cq; private final int type; - private final CQMessageEvent messageEvent; public SpringCQMessageEvent(CoolQ cq, CQMessageEvent messageEvent) { super(messageEvent instanceof CQGroupMessageEvent ? ( @@ -33,7 +32,6 @@ public class SpringCQMessageEvent extends MessageEvent { } else { type = TYPE_PRIVATE; } - this.messageEvent = messageEvent; } @Override @@ -70,8 +68,4 @@ public class SpringCQMessageEvent extends MessageEvent { } } - @Override - public Object getRawMessage() { - return messageEvent; - } }