From 6b55ac4da0acfb4648cfb0c7054a669202d2debc Mon Sep 17 00:00:00 2001 From: 95478 <954787484@qq.com> Date: Thu, 27 Jun 2024 14:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8F=AA=E8=A6=81?= =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=E8=BF=9D=E7=A6=81=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=B0=B1=E4=BC=9A=E5=A2=9E=E5=8A=A0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- robot-data/cache/account.secrets | Bin 3600 -> 3568 bytes robot-data/cache/servers.json | 38 ++++++++---------- .../qqbot/Listener/RecallMessageListener.java | 17 ++++---- .../java/com/mtz/qqbot/QqBotApplication.java | 6 +-- 4 files changed, 28 insertions(+), 33 deletions(-) diff --git a/robot-data/cache/account.secrets b/robot-data/cache/account.secrets index 2aa29c3efd90051b925b0a9005e26061ecab2f1a..30e38cc4990c1d3648265833fb66be8b6da316bf 100644 GIT binary patch literal 3568 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 diff --git a/robot-data/cache/servers.json b/robot-data/cache/servers.json index 0745108..3111db3 100644 --- a/robot-data/cache/servers.json +++ b/robot-data/cache/servers.json @@ -1,42 +1,38 @@ [ { - "host": "111.30.182.254", + "host": "111.30.169.83", "port": 443 }, - { - "host": "36.155.187.225", - "port": 8080 - }, { "host": "msfwifi.3g.qq.com", "port": 8080 }, { - "host": "39.156.126.178", + "host": "111.30.182.254", "port": 443 }, { - "host": "39.156.140.102", + "host": "36.155.207.230", "port": 443 }, { - "host": "111.31.206.48", - "port": 80 - }, - { - "host": "36.155.205.230", + "host": "120.232.31.239", "port": 8080 }, { - "host": "36.155.245.16", - "port": 80 - }, - { - "host": "120.233.17.147", - "port": 8080 - }, - { - "host": "120.232.27.24", + "host": "120.241.130.195", "port": 14000 + }, + { + "host": "36.155.163.25", + "port": 80 + }, + { + "host": "39.156.126.178", + "port": 80 + }, + { + "host": "36.155.163.117", + "port": 8080 } ] \ No newline at end of file diff --git a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java index 95a17fe..91a6548 100644 --- a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java +++ b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java @@ -25,28 +25,27 @@ public class RecallMessageListener extends MessageListener { super(List.of("原神", "OP"), true);//自定义违禁词 } - public void recall(GroupMessageEvent event) throws InterruptedException {//当有人发违禁词自动撤回并禁言一分钟 + public int recall(GroupMessageEvent event, int groupInvalidCount, Map groupMemberInvalidedCountList, List groupInvalidMember) throws InterruptedException {//当有人发违禁词自动撤回并禁言一分钟 String message = event.getMessage().contentToString(); if (this.invalidText(message)) { event.getSender().mute(60);//禁言60秒 Thread.sleep(500);//半秒后撤回方便演示 this.recallMessage(event.getMessage()); + groupInvalidCount++; + invalidMember.invalidCountList(groupMemberInvalidedCountList, event); + invalidMember.invalidMemberList(groupInvalidMember, groupMemberInvalidedCountList, event); + return groupInvalidCount; } + return groupInvalidCount; } @RobotListenerHandler(contactId = 518909220)//监控增加群聊1 public void recallGroup1Message(GroupMessageEvent event) throws InterruptedException { - recall(event); - group1InvalidCount++; - invalidMember.invalidCountList(group1MemberInvalidedCountList, event); - invalidMember.invalidMemberList(group1InvalidMember, group1MemberInvalidedCountList, event); + group1InvalidCount = recall(event, group1InvalidCount, group1MemberInvalidedCountList, group1InvalidMember); } @RobotListenerHandler(contactId = 1033597003)//监控增加群聊2 public void recallGroup2Message(GroupMessageEvent event) throws InterruptedException { - recall(event); - group2InvalidCount++; - invalidMember.invalidCountList(group2MemberInvalidedCountList, event); - invalidMember.invalidMemberList(group2InvalidMember, group2MemberInvalidedCountList, event); + group2InvalidCount = recall(event, group2InvalidCount, group2MemberInvalidedCountList, group2InvalidMember); } } diff --git a/src/main/java/com/mtz/qqbot/QqBotApplication.java b/src/main/java/com/mtz/qqbot/QqBotApplication.java index cc2d805..476095d 100644 --- a/src/main/java/com/mtz/qqbot/QqBotApplication.java +++ b/src/main/java/com/mtz/qqbot/QqBotApplication.java @@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class QqBotApplication { - public static void main(String[] args) { - SpringApplication.run(QqBotApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(QqBotApplication.class, args); + } }