From cc4eeac728dff47fc33bc6ab7378d50ce64466a1 Mon Sep 17 00:00:00 2001 From: LamGC Date: Tue, 28 Jul 2020 20:49:52 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=20=E4=BF=AE=E5=A4=8DMirai=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E5=9C=A8=E9=A6=96=E6=AC=A1=E8=AE=BE=E7=BD=AE=E8=A2=AB?= =?UTF-8?q?=E7=A6=81=E8=A8=80=E7=8A=B6=E6=80=81=E5=90=8E=E4=BE=9D=E7=84=B6?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=91=BD=E4=BB=A4=E7=9A=84=E6=BC=8F=E6=B4=9E?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Fix] MiraiMain 修复Mirai框架在首次设置被禁言状态后依然执行命令的漏洞; --- .../net/lamgc/cgj/bot/framework/mirai/MiraiMain.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java index d9f36e5..6ab9c35 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java @@ -92,11 +92,14 @@ public class MiraiMain implements Closeable { private void executeMessageEvent(MessageEvent message) { log.debug("Mirai Message: {}", message); if(message instanceof GroupMessageEvent) { - GroupMessageEvent GroupMessageEvent = (GroupMessageEvent) message; - Boolean muteState = muteManager.isMute(GroupMessageEvent.getGroup().getId(), true); + GroupMessageEvent groupMessageEvent = (GroupMessageEvent) message; + Boolean muteState = muteManager.isMute(groupMessageEvent.getGroup().getId(), true); if(muteState == null) { - muteManager.setMuteState(GroupMessageEvent.getGroup().getId(), - ((GroupMessageEvent) message).getGroup().getBotMuteRemaining() != 0); + boolean mute = groupMessageEvent.getGroup().getBotMuteRemaining() != 0; + muteManager.setMuteState(groupMessageEvent.getGroup().getId(), mute); + if(mute) { + return; + } } else if(muteState) { return; }