README.md

@@ -8,9 +8,8 @@ MiraiConsolePlugin 自定义戳一戳回复消息
 /jnr add [weight]    # 添加回复消息（权重默认为1）
 /jnr add <message> [weight]    # 添加简单回复消息（权重默认为1）
 /jnr clear    # 清空回复消息列表
-/jnr list [page] [pageSize]   # 列出当前回复消息列表，参数可翻页
+/jnr list    # 列出当前回复消息列表
 /jnr remove <index>    # 删除指定索引的回复消息
-/jnr reload  # 重载配置
 ```
 
 ## 特殊消息
@@ -18,40 +17,7 @@ MiraiConsolePlugin 自定义戳一戳回复消息
 设置回复消息为以下内容，代表特殊含义
 
 - `#nudge` 戳回去
-- `#nudge:戳我干嘛！` 戳回去，并且回复一条消息
 - `#group.mute:30` 禁言30s, 可以自定义禁言时间, 单位秒
-- `#group.mute:60:生气了！禁言你1分钟` 同上，并且回复一条消息
-- `#ignore` 忽略本次戳一戳
-- `#audio:XXX.amr` 回复音频，参数通常为 XXX.amr，服务器要求文件名后缀必须为 ".amr"，但其编码方式也有可能是非
-  AudioCodec.AMR。
-  音频文件保存在 `data/me.jie65535.mirai-console-jnr-plugin/` 目录下，理论上你也可以手工设置音频文件。
-
-## 占位符
-
-- `{name}` 会被替换为群名片或昵称
-- `{botName}` 会被替换为机器人群名片或昵称
-- `{groupName}` 会被替换为群名称
-- 更多欢迎 ISSUE 或者 PR 补充...
-
-## 配置文件
-
-文件位置：`config/me.jie65535.mirai-console-jnr-plugin/jnr.yml`
-
-```yaml
-# 戳一戳回复的消息
-replyMessageList: 
-  - message: 'Hello world'
-    weight: 1
-# 事件优先级 从高到低可选 HIGHEST, HIGH, NORMAL, LOW, LOWEST, MONITOR
-# 设置后需要重启插件生效
-priority: HIGH
-# 是否拦截事件 回复后可阻止其它插件响应戳一戳事件 优先级为MONITOR时拦截无效
-isIntercept: true
-# 群回复间隔（秒），0表示无限制
-groupInterval: 0
-# 用户私聊回复间隔（秒），0表示无限制
-userInterval: 0
-```
 
 ## 用例
 

build.gradle.kts

@@ -1,23 +1,16 @@
 plugins {
-    val kotlinVersion = "1.7.10"
+    val kotlinVersion = "1.6.0"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.16.0"
+    id("net.mamoe.mirai-console") version "2.10.1"
 }
 
 group = "top.jie65535"
-version = "1.5.0"
+version = "1.1.0"
 
 repositories {
     mavenLocal()
     maven("https://maven.aliyun.com/repository/public")
     mavenCentral()
 }
-
-val ktorVersion = "2.2.3"
-
-dependencies {
-    implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
-    implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
+        fi
-    case $MAX_FD in  #(
+        ulimit -n $MAX_FD
-      '' | soft) :;; #(
+        if [ $? -ne 0 ] ; then
-      *)
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        ulimit -n "$MAX_FD" ||
+        fi
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    else
-    esac
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # We build the pattern for arguments to be converted via cygpath
-    for arg do
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-        if
+    SEP=""
-            case $arg in                                #(
+    for dir in $ROOTDIRSRAW ; do
-              -*)   false ;;                            # don't mess with options #(
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+        SEP="|"
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
+# Escape application args
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+save () {
-#     shell script including quotes and variable substitutions, so put them in
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-#     double quotes to make sure that they get re-expanded; and
+    echo " "
-#   * put everything else in single quotes, so that it's not re-expanded.
+}
+APP_ARGS=`save "$@"`
 
-set -- \
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"

src/main/kotlin/top/jie65535/jnr/HttpUtil.kt

@@ -1,17 +0,0 @@
-package top.jie65535.jnr
-
-import io.ktor.client.*
-import io.ktor.client.call.*
-import io.ktor.client.engine.okhttp.*
-import io.ktor.client.request.*
-import java.io.File
-
-object HttpUtil {
-    private val httpClient = HttpClient(OkHttp)
-
-    suspend fun download(url: String, file: File): ByteArray {
-        val data = httpClient.get(url).body<ByteArray>()
-        file.writeBytes(data)
-        return data
-    }
-}

src/main/kotlin/top/jie65535/jnr/JNRCommand.kt

@@ -11,10 +11,9 @@ import net.mamoe.mirai.event.events.MessageEvent
 import net.mamoe.mirai.event.globalEventChannel
 import net.mamoe.mirai.event.nextEvent
 import net.mamoe.mirai.message.code.MiraiCode.deserializeMiraiCode
-import net.mamoe.mirai.message.data.*
+import net.mamoe.mirai.message.data.PlainText
-import net.mamoe.mirai.message.data.Image.Key.queryUrl
+import net.mamoe.mirai.message.data.buildForwardMessage
-import top.jie65535.jnr.JNudgeReply.reload
+import net.mamoe.mirai.message.data.isContentBlank
-import kotlin.math.min
 
 object JNRCommand : CompositeCommand(
     JNudgeReply, "jnr",
@@ -47,32 +46,13 @@ object JNRCommand : CompositeCommand(
         if (isUser()) {
             try {
                 sendMessage("请在${WAIT_REPLY_TIMEOUT_MS / 1000}秒内发送要添加的消息内容，你可以发送空白消息来取消。")
-                val nextEvent = withTimeout(WAIT_REPLY_TIMEOUT_MS) {
+                val msg = withTimeout(WAIT_REPLY_TIMEOUT_MS) {
                     subject.globalEventChannel().nextEvent<MessageEvent>(EventPriority.MONITOR) { it.sender == user }
                 }
-                if (nextEvent.message.isContentBlank()) {
+                if (msg.message.isContentBlank()) {
                     sendMessage("已取消")
                 } else {
-                    // 保存资源
+                    JNRPluginConfig.replyMessageList.add(ReplyMessage(msg.message.serializeToMiraiCode(), weight))
-                    saveResources(nextEvent.message)
-
-                    // 保存音频文件名
-                    val audio = nextEvent.message.findIsInstance<OnlineAudio>()
-                    if (audio != null) {
-                        JNRPluginConfig.replyMessageList.add(
-                            ReplyMessage(
-                                PlainText("#audio:${audio.filename}").serializeToMiraiCode(),
-                                weight
-                            )
-                        )
-                    } else {
-                        JNRPluginConfig.replyMessageList.add(
-                            ReplyMessage(
-                                nextEvent.message.serializeToMiraiCode(),
-                                weight
-                            )
-                        )
-                    }
                     sendMessage("已添加一条消息，权重为$weight")
                 }
             } catch (e: TimeoutCancellationException) {
@@ -83,35 +63,6 @@ object JNRCommand : CompositeCommand(
         }
     }
 
-    /**
-     * 保存消息中的图片和音频
-     */
-    private suspend fun saveResources(message: MessageChain) {
-        for (it in message) {
-            if (it is Image) {
-                val imgDir = JNudgeReply.resolveDataFile("images")
-                if (!imgDir.exists()) {
-                    imgDir.mkdir()
-                }
-                val imgFile = imgDir.resolve(it.imageId)
-                if (!imgFile.exists()) {
-                    JNudgeReply.logger.info("下载图片 ${it.imageId}")
-                    HttpUtil.download(it.queryUrl(), imgFile)
-                }
-            } else if (it is OnlineAudio) {
-                val audioDir = JNudgeReply.resolveDataFile("audios")
-                if (!audioDir.exists()) {
-                    audioDir.mkdir()
-                }
-                val audioFile = audioDir.resolve(it.filename)
-                if (!audioFile.exists()) {
-                    JNudgeReply.logger.info("下载语音 ${it.filename}")
-                    HttpUtil.download(it.urlForDownload, audioFile)
-                }
-            }
-        }
-    }
-
     @SubCommand
     @Description("删除指定索引的回复消息")
     suspend fun CommandSender.remove(index: Int) {
@@ -132,7 +83,7 @@ object JNRCommand : CompositeCommand(
 
     @SubCommand
     @Description("列出当前回复消息列表")
-    suspend fun CommandSender.list(page: Int = 0, pageSize: Int = 50) {
+    suspend fun CommandSender.list() {
         val list = JNRPluginConfig.replyMessageList
         if (list.isEmpty()) {
             sendMessage("当前列表为空")
@@ -145,31 +96,15 @@ object JNRCommand : CompositeCommand(
                 sendMessage(sb.toString())
             }, {
                 if (list.size > 1) {
-                    val begin = page * pageSize
+                    sendMessage(buildForwardMessage(subject) {
-                    val end = min(list.size, (page + 1) * pageSize)
+                        for (i in list.indices) {
-                    if (begin < 0 || end <= begin) {
+                            bot named "[$i] (${list[i].weight})" says list[i].message.deserializeMiraiCode()
-                        sendMessage("翻页参数错误")
+                        }
-                    } else {
+                    })
-                        sendMessage(buildForwardMessage(subject) {
-                            for (i in begin until end) {
-                                bot named "[$i] (${list[i].weight})" says list[i].message.deserializeMiraiCode()
-                            }
-                            if (end < list.size) {
-                                bot says "当前显示 $begin~$end 共 ${list.size}"
-                            }
-                        })
-                    }
                 } else {
                     sendMessage(list[0].message.deserializeMiraiCode())
                 }
             })
         }
     }
-
-    @SubCommand
-    @Description("重载配置")
-    suspend fun CommandSender.reload() {
-        JNRPluginConfig.reload()
-        sendMessage("OK")
-    }
 }

src/main/kotlin/top/jie65535/jnr/JNRPluginConfig.kt

@@ -21,10 +21,8 @@ object JNRPluginConfig : AutoSavePluginConfig("jnr") {
      * 优先级 默认为高
      * @see EventPriority
      */
-    @ValueDescription(
+    @ValueDescription("事件优先级 从高到低可选 HIGHEST, HIGH, NORMAL, LOW, LOWEST, MONITOR\n" +
-        "事件优先级 从高到低可选 HIGHEST, HIGH, NORMAL, LOW, LOWEST, MONITOR\n" +
+            "设置后需要重启插件生效")
-                "设置后需要重启插件生效"
-    )
     var priority: EventPriority by value(EventPriority.HIGH)
 
     /**
@@ -33,23 +31,4 @@ object JNRPluginConfig : AutoSavePluginConfig("jnr") {
      */
     @ValueDescription("是否拦截事件 回复后可阻止其它插件响应戳一戳事件 优先级为MONITOR时拦截无效")
     var isIntercept: Boolean by value(true)
-
+}
-    /**
-     * 群间隔时间（单位秒）
-     * 0 表示无限制
-     */
-    @ValueDescription("群回复间隔（秒），0表示无限制")
-    var groupInterval: Long by value(0L)
-
-    /**
-     * 用户间隔（单位秒）
-     * 0 表示无限制
-     */
-    @ValueDescription("用户私聊回复间隔（秒），0表示无限制")
-    var userInterval: Long by value(0L)
-
-    /**
-     * 是否在间隔期间依然拦截事件，与 [isIntercept] 有关
-     */
-    var interceptAtInterval: Boolean by value(true)
-}

src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt

@@ -3,205 +3,82 @@ package top.jie65535.jnr
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
-import net.mamoe.mirai.contact.AudioSupported
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.contact.nameCardOrNick
 import net.mamoe.mirai.event.EventPriority
 import net.mamoe.mirai.event.events.NudgeEvent
 import net.mamoe.mirai.event.globalEventChannel
 import net.mamoe.mirai.message.code.MiraiCode.deserializeMiraiCode
-import net.mamoe.mirai.message.data.*
-import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource
-import net.mamoe.mirai.utils.ExternalResource.Companion.uploadAsImage
 import net.mamoe.mirai.utils.info
-import java.time.LocalDateTime
 import kotlin.random.Random
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
 
 object JNudgeReply : KotlinPlugin(
     JvmPluginDescription(
         id = "me.jie65535.mirai-console-jnr-plugin",
         name = "J Nudge Reply",
-        version = "1.5.0",
+        version = "1.1.0",
     ) {
         author("jie65535")
         info("""自定义戳一戳回复插件""")
     }
 ) {
-    private val groupLastReply = mutableMapOf<Long, LocalDateTime>()
-    private val userLastReply = mutableMapOf<Long, LocalDateTime>()
-
     override fun onEnable() {
         JNRPluginConfig.reload()
         JNRCommand.register()
-
+        Random.nextInt()
         globalEventChannel().subscribeAlways<NudgeEvent>(priority = JNRPluginConfig.priority) {
             if (target.id == bot.id && target.id != from.id && JNRPluginConfig.replyMessageList.isNotEmpty()) {
                 var replyList: List<ReplyMessage> = JNRPluginConfig.replyMessageList
-                val now = LocalDateTime.now()
+                if(subject !is Group){
-                var isReply = true
-                if (subject !is Group) {
-                    if (JNRPluginConfig.userInterval > 0) {
-                        val t = userLastReply[subject.id]
-                        if (t == null || t.plusSeconds(JNRPluginConfig.userInterval) < now) {
-                            userLastReply[subject.id] = now
-                        } else {
-                            isReply = false
-                        }
-                    }
                     replyList = replyList.filter { !it.message.startsWith("#group") }
-                } else {
+                }else{
-                    if (JNRPluginConfig.groupInterval > 0) {
+                    if((from as Member).permission.level >= (subject as Group).botPermission.level){
-                        val t = groupLastReply[subject.id]
+                        replyList = replyList.filter { !it.message.startsWith("#group.mute:") }
-                        if (t == null || t.plusSeconds(JNRPluginConfig.groupInterval) < now) {
-                            groupLastReply[subject.id] = now
-                        } else {
-                            isReply = false
-                        }
-                    }
-                    if ((from as Member).permission.level >= (subject as Group).botPermission.level) {
-                        replyList = replyList.filter { !it.message.startsWith("#group.mute\\:") }
                     }
                 }
-
+                val totalWeight = replyList.sumOf { it.weight }
-                // 判断间隔
+                var w = Random.nextInt(totalWeight)
-                val isIgnored = if (isReply) {
+                for (msg in replyList) {
-                    val totalWeight = replyList.sumOf { it.weight }
+                    if (w < msg.weight) {
-                    var w = Random.nextInt(totalWeight)
+                        doReply(msg, this)
-                    for (msg in replyList) {
+                        break
-                        if (w < msg.weight) {
+                    } else {
-                            doReply(msg, this)
+                        w -= msg.weight
-                            break
-                        } else {
-                            w -= msg.weight
-                        }
                     }
-                    false
-                } else {
-                    logger.info("正在CD中，本次已忽略")
-                    true
-                }
-
-                // 拦截事件
-                if (JNRPluginConfig.priority != EventPriority.MONITOR && JNRPluginConfig.isIntercept
-                ) {
-                    // 在被忽略的情况下判断是否拦截
-                    if (!isIgnored || JNRPluginConfig.interceptAtInterval)
-                        intercept()
                 }
+                if (JNRPluginConfig.priority != EventPriority.MONITOR && JNRPluginConfig.isIntercept)
+                    intercept()
             }
         }
 
-        logger.info { "Plugin loaded. https://github.com/jie65535/mirai-console-jnr-plugin" }
+        logger.info { "Plugin loaded" }
     }
 
-    private suspend fun doReply(reply: ReplyMessage, event: NudgeEvent) {
+    private suspend fun doReply(message: ReplyMessage, event: NudgeEvent) {
-        val replyMessageChain = reply.message.deserializeMiraiCode()
+        if (message.message.startsWith("#")) {
-        val replyMessage = replyMessageChain.content
-        if (replyMessage.startsWith("#")) {
             when {
-                // 戳回去
+                message.message == "#nudge" -> {
-                replyMessage.startsWith("#nudge") -> {
                     event.from.nudge().sendTo(event.subject)
-                    val replyMsg = replyMessage.substring("#nudge".length).removePrefix(":")
-                    if (replyMsg.isNotBlank()) {
-                        sendRecordMessage(event, messageChainOf(PlainText(replyMsg.trim())))
-                        logger.info("已尝试戳回发送者并回复消息")
-                    } else {
-                        logger.info("已尝试戳回发送者")
-                    }
                 }
-
+                message.message.startsWith("#group.mute:") -> {
-                // 禁言
+                    val duration = message.message.substringAfter(':').toIntOrNull()
-                replyMessage.startsWith("#group.mute:") -> {
+                    if (duration == null) {
-                    val args = replyMessage.substring("#group.mute:".length).split(':')
+                        logger.warning("戳一戳禁言失败：\"${message.message}\" 格式不正确")
-                    val durationS = if (args.isNotEmpty()) args[0].toIntOrNull() else 0
-                    if (durationS == null || durationS < 1) {
-                        logger.warning("戳一戳禁言失败：\"${replyMessage}\" 格式不正确")
                     } else {
                         val member: Member = event.from as Member
                         try {
-                            member.mute(durationS)
+                            member.mute(duration)
-                            val duration = durationS.toDuration(DurationUnit.SECONDS)
-                            if (args.size > 1 && args[1].isNotBlank()) {
-                                val replyMsg = args[1].trim()
-//                                    .replace("{duration}", duration.toString())
-//              如果禁言时间是在消息中设置的，那么用户也可以同时设置回复的内容里带时间，因此无需添加格式化，除非支持随机禁言时间，可以再考虑
-                                sendRecordMessage(event, messageChainOf(PlainText(replyMsg)))
-                            }
-                            logger.info("戳一戳禁言目标 ${member.nameCardOrNick}(${member.id}) $duration")
                         } catch (e: Throwable) {
                             logger.warning("戳一戳禁言失败", e)
                         }
                     }
                 }
-
+                else -> {
-                // 忽略
+                    event.subject.sendMessage(message.message.deserializeMiraiCode())
-                replyMessage == "#ignore" -> {
-                    logger.info("已忽略本次戳一戳回复")
                 }
-
-                // 音频回复
-                replyMessage.startsWith("#audio:") -> {
-                    val filename = replyMessage.substring("#audio:".length)
-                    val audioFile = resolveDataFile("audios/$filename").toExternalResource()
-                    if (event.subject is AudioSupported) {
-                        logger.info("上传并回复语音 $filename")
-                        val messageTemp = (event.subject as AudioSupported).uploadAudio(audioFile)
-                        sendRecordMessage(event, messageTemp.toMessageChain())
-                    } else {
-                        logger.warning("当前上下文不支持回复语音")
-                        sendRecordMessage(event, messageChainOf(PlainText("[语音消息] 当前上下文不支持")))
-                    }
-                }
-
-                // 其它
-                else -> sendRecordMessage(event, replyMessageChain)
             }
         } else {
-            sendRecordMessage(event, replyMessageChain)
+            event.subject.sendMessage(message.message.deserializeMiraiCode())
         }
     }
-
-    private suspend fun sendRecordMessage(event: NudgeEvent, message: MessageChain) {
-        val modifiedChain = MessageChainBuilder()
-        for (it in message) {
-            var innerMessage = it
-            if (it is Image) {
-                val imgFile = resolveDataFile("images/" + it.imageId)
-                if (imgFile.exists()) {
-                    innerMessage = imgFile.uploadAsImage(event.subject)
-                } else {
-                    logger.warning(
-                        "图片的本地缓存已丢失，请重新设置该消息内的图片！" +
-                                "消息内容：" + message.serializeToMiraiCode()
-                    )
-                }
-            } else if (it is PlainText) {
-                /**
-                 * 占位符
-                 * - `{name}` 会被替换为群名片或昵称
-                 * - `{botName}` 会被替换为机器人群名片或昵称
-                 * - `{groupName}` 会被替换为群名称
-                 */
-                val content = it.content
-                    .replace("{name}", event.from.nameCardOrNick)
-                    .replace("{botName}", event.target.nameCardOrNick)
-                    .replace(
-                        "{groupName}",
-                        if (event.subject is Group) {
-                            (event.subject as Group).name
-                        } else {
-                            event.from.nick
-                        }
-                    )
-
-                innerMessage = PlainText(content)
-            }
-            modifiedChain.append(innerMessage)
-        }
-        event.subject.sendMessage(modifiedChain.build())
-    }
 }