Release: 2.1

Muska-Ami · Jan 7, 2023 · ebf7e42 · ebf7e42
2 parents 44cb60c + 7e7858e
commit ebf7e42
Show file tree

Hide file tree

Showing 24 changed files with 241 additions and 51 deletions.
diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin
diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -326,6 +326,45 @@ qwhitelist:
 
 </details>
 
+#### extra-configs/trchat.yml
+
+<details>
+<summary>点此展开/收起</summary>
+
+```yaml
+# 聊天转发
+chat-forward:
+  # 需要转发的频道
+  channel:
+    - Normal
+```
+
+</details>
+
+#### extra-configs/command-alias.yml
+
+<details>
+<summary>点此展开/收起</summary>
+
+```yaml
+# CatSero QQ CommandAlias Config
+# Generate by CatSero [email protected]@
+
+# 功能开关
+# true | false
+enable: false
+
+# 别名列表
+tps:
+  - ctps
+list:
+  - clist
+whitelist:
+  - cwl
+```
+
+</details>
+
 #### Bot & Group & QQOp配置指南
 
 <details>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "moe.xmcn.catsero"
-version = "2.1-beta-2"
+version = "2.1"
 
 repositories {
     mavenCentral()

diff --git a/config.groovy b/config.groovy
@@ -1,7 +1,7 @@
 environments {
     prod {
         plugin {
-            version = "2.1-beta-2"
+            version = "2.1"
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/moe/xmcn/catsero/Configuration.java b/src/main/java/moe/xmcn/catsero/Configuration.java
@@ -95,6 +95,9 @@ static void saveFiles() {
         if (!new File(plugin.getDataFolder(), "extra-configs/trchat.yml").exists()) {
             plugin.saveResource("extra-configs/trchat.yml", false);
         }
+        if (!new File(plugin.getDataFolder(), "extra-configs/command-alias.yml").exists()) {
+            plugin.saveResource("extra-configs/command-alias.yml", false);
+        }
         Logger.logLoader("Saved.");
 
         Logger.logLoader("Saving default locale...");
@@ -608,6 +611,8 @@ class CFI {
         static final FileConfiguration qqop_config = YamlConfiguration.loadConfiguration(mirai_qqop_file);
         static final File ext_trchat_file = new File(plugin.getDataFolder(), "extra-configs/trchat.yml");
         static final FileConfiguration ext_trchat_config = YamlConfiguration.loadConfiguration(ext_trchat_file);
+        static final File command_alias_file = new File(plugin.getDataFolder(), "extra-configs/command-alias.yml");
+        public static final FileConfiguration command_alias_config = YamlConfiguration.loadConfiguration(command_alias_file);
     }
 
 }
diff --git a/src/main/java/moe/xmcn/catsero/listeners/getonlinelist/OnGroupMessageRequestList.java b/src/main/java/moe/xmcn/catsero/listeners/getonlinelist/OnGroupMessageRequestList.java
@@ -43,13 +43,12 @@ public class OnGroupMessageRequestList implements Listener {
     @EventHandler
     public void onGroupMessage(MiraiGroupMessageEvent e) {
         try {
-            String[] args = QPS.parse(e.getMessage());
+            String[] args = QPS.parse(e.getMessage(), "list");
 
             if (args != null) {
                 // 条件
                 if (
                         Configuration.USES_CONFIG.GET_ONLINE_LIST.ENABLE
-                                && args[0].equalsIgnoreCase("list")
                                 && e.getBotID() == Configuration.Interface.getBotCode(Configuration.USES_CONFIG.GET_ONLINE_LIST.MIRAI.BOT)
                                 && e.getGroupID() == Configuration.Interface.getGroupCode(Configuration.USES_CONFIG.GET_ONLINE_LIST.MIRAI.GROUP)
                 ) {

diff --git a/src/main/java/moe/xmcn/catsero/listeners/gettps/OnGroupMessageRequestTPS.java b/src/main/java/moe/xmcn/catsero/listeners/gettps/OnGroupMessageRequestTPS.java
@@ -38,23 +38,22 @@ public class OnGroupMessageRequestTPS implements Listener {
 
     @EventHandler
     public void onGroupMessageEvent(MiraiGroupMessageEvent e) {
-        String[] args = QPS.parse(e.getMessage());
+        String[] args = QPS.parse(e.getMessage(), "tps");
 
         if (args != null) {
             // 条件
             if (
                     Configuration.USES_CONFIG.GET_TPS.ENABLE
-                            && args[0].equalsIgnoreCase("tps")
                             && e.getBotID() == Configuration.Interface.getBotCode(Configuration.USES_CONFIG.GET_ONLINE_LIST.MIRAI.BOT)
                             && e.getGroupID() == Configuration.Interface.getGroupCode(Configuration.USES_CONFIG.GET_ONLINE_LIST.MIRAI.GROUP)
 
             ) {
-                if (args.length == 2) {
+                if (args.length == 1) {
                     // 处理TPS
                     double tps = TPSCalculator.getTPS();
                     BigDecimal around_tps = BigDecimal.valueOf(tps).setScale(1, RoundingMode.HALF_UP);
 
-                    switch (args[1]) {
+                    switch (args[0]) {
                         case "accurate":
                             // 精确
                             MessageSender.sendGroup("TPS: " + tps, Configuration.USES_CONFIG.GET_TPS.MIRAI.BOT, Configuration.USES_CONFIG.GET_TPS.MIRAI.GROUP);