update

LaoLittle · Feb 11, 2022 · e6b2c0d · e6b2c0d
1 parent 4995625
commit e6b2c0d
Showing 1 changed file with 6 additions and 35 deletions.
diff --git a/src/main/kotlin/IlliteracyAuth.kt b/src/main/kotlin/IlliteracyAuth.kt
@@ -7,7 +7,6 @@ import net.mamoe.mirai.Bot
 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.Contact.Companion.sendImage
 import net.mamoe.mirai.event.EventPriority
 import net.mamoe.mirai.event.broadcast
 import net.mamoe.mirai.event.events.GroupMessageEvent
@@ -20,11 +19,7 @@ import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.MessageSource.Key.quote
 import net.mamoe.mirai.message.data.PlainText
 import net.mamoe.mirai.message.data.content
-import net.mamoe.mirai.utils.error
 import net.mamoe.mirai.utils.info
-import org.laolittle.plugin.joinorquit.AutoConfig
-import org.laolittle.plugin.joinorquit.GroupList.enable
-import org.laolittle.plugin.model.PatPatTool
 import kotlin.random.Random
 
 object IlliteracyAuth : KotlinPlugin(
@@ -46,21 +41,8 @@ object IlliteracyAuth : KotlinPlugin(
         globalEventChannel().subscribeAlways<MemberJoinEvent>(
             priority = EventPriority.LOW
         ) {
-            if (groupId !in AuthPluginData.enabledGroups) {
-                if (!group.enable()) return@subscribeAlways
-                delay(1000)
-                group.sendMessage(AutoConfig.newMemberJoinMessage.random())
-                delay(2547)
-                if (AutoConfig.newMemberJoinPat) {
-                    runCatching {
-                        PatPatTool.getPat(member, 60)
-                        group.sendImage(PatPat.dataFolder.resolve("tmp").resolve("${member.id}_pat.gif"))
-                    }.onFailure {
-                        if (it is ClassNotFoundException) logger.error { "需要前置插件：PatPat, 请前往下载https://mirai.mamoe.net/topic/740" }
-                    }
-                }
-                return@subscribeAlways
-            }
+            if (groupId !in AuthPluginData.enabledGroups) return@subscribeAlways
+
             if (Bot.instances.all { it.id != member.id }) {
                 val bar = Regex("""[。.${if (Random.nextInt(100) > 49) "；;" else ""}！!？?“”"]+""")
                 val question =
@@ -115,7 +97,10 @@ object IlliteracyAuth : KotlinPlugin(
                             if (auth.contains(regex)) {
                                 auth = auth.replace(regex, "")
                                 acc++
-                            } else if (index == lastIndex && auth.substring(0, auth.indexOf(answers[index].last()) + 1) == answers[index]
+                            } else if (index == lastIndex && auth.substring(
+                                    0,
+                                    auth.indexOf(answers[index].last()) + 1
+                                ) == answers[index]
                             ) {
                                 auth = ""
                                 acc++
@@ -138,20 +123,6 @@ object IlliteracyAuth : KotlinPlugin(
                     val result = String.format("%.2f", if (foo < 1) foo * 100 else 100.0)
                     if (foo > 0.8) {
                         group.sendMessage("您的分数为${result}, 已通过验证! ")
-                        run {
-                            if (!group.enable()) return@subscribeAlways
-                            delay(1000)
-                            group.sendMessage(AutoConfig.newMemberJoinMessage.random())
-                            delay(2547)
-                            if (AutoConfig.newMemberJoinPat) {
-                                runCatching {
-                                    PatPatTool.getPat(member, 60)
-                                    group.sendImage(PatPat.dataFolder.resolve("tmp").resolve("${member.id}_pat.gif"))
-                                }.onFailure {
-                                    if (it is ClassNotFoundException) logger.error { "需要前置插件：PatPat, 请前往下载https://mirai.mamoe.net/topic/740" }
-                                }
-                            }
-                        }
                         QuitEvent(member).broadcast()
                         break
                     } else {