Update mirai to 2.0-M2

Author: StageGuard

build.gradle.kts

@@ -2,7 +2,7 @@
 plugins {
     kotlin("jvm") version "1.4.20"
     kotlin("plugin.serialization") version "1.4.20"
-    id("net.mamoe.mirai-console") version "2.0-M1-1"
+    id("net.mamoe.mirai-console") version "2.0-M2"
 }
 
 group = "13554"
@@ -20,7 +20,7 @@ val hikariVersion = "3.4.5"
 val mysqlVersion = "8.0.19"
 val yamlKtVersion = "0.7.4"
 val quartzVersion = "2.3.2"
-val miraiSlf4jBridgeVersion = "1.0.1"
+val miraiSlf4jBridgeVersion = "1.1.0"
 
 dependencies {
     testImplementation(kotlin("test-junit5"))

src/main/kotlin/stageguard/sctimetable/PluginMain.kt

@@ -11,6 +11,7 @@ package stageguard.sctimetable
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
+import net.mamoe.mirai.event.GlobalEventChannel
 import net.mamoe.mirai.event.ListeningStatus
 import net.mamoe.mirai.event.events.BotOnlineEvent
 import net.mamoe.mirai.event.subscribe
@@ -41,15 +42,14 @@ object PluginMain : KotlinPlugin(
 
         logger.info { "Waiting target Bot ${PluginConfig.qq} goes online..." }
 
-        subscribe<BotOnlineEvent> {
-            if(this.bot.id == PluginConfig.qq) {
-                targetBotInstance = this.bot
-                TimeProviderService.start()
-                ScheduleListenerService.start()
-                RequestHandlerService.start()
-                BotEventRouteService.start()
-                ListeningStatus.STOPPED
-            } else ListeningStatus.LISTENING
+        GlobalEventChannel.filter {
+            it is BotOnlineEvent && it.bot.id == PluginConfig.qq
+        }.subscribeOnce<BotOnlineEvent> {
+            targetBotInstance = this.bot
+            TimeProviderService.start()
+            ScheduleListenerService.start()
+            RequestHandlerService.start()
+            BotEventRouteService.start()
         }
     }
 

src/main/kotlin/stageguard/sctimetable/service/BotEventRouteService.kt

@@ -34,13 +34,16 @@ import stageguard.sctimetable.utils.Either
 import java.lang.Exception
 import java.lang.management.ManagementFactory
 import com.sun.management.OperatingSystemMXBean
+import java.util.regex.Pattern
 
 object BotEventRouteService : AbstractPluginManagedService() {
 
     override val TAG: String = "BotEventRouteService"
 
+    private val TIME_PERIOD_EXPRESSION = Pattern.compile("(\\d){1,2}[:：](\\d){1,2}-(\\d){1,2}[:：](\\d){1,2}")
+
     override suspend fun main() {
-        subscribe<NewFriendRequestEvent> {
+        PluginMain.targetBotInstance.eventChannel.subscribe<NewFriendRequestEvent> {
             if(this.bot.id == PluginConfig.qq) {
                 this.accept()
                 this@BotEventRouteService.launch(coroutineContext) {
@@ -53,7 +56,7 @@ object BotEventRouteService : AbstractPluginManagedService() {
             }
             ListeningStatus.LISTENING
         }
-        subscribeAlways<FriendMessageEvent> { if(this.bot.id == PluginConfig.qq) {
+        PluginMain.targetBotInstance.eventChannel.subscribeAlways<FriendMessageEvent> { if(this.bot.id == PluginConfig.qq) {
             val plainText = message.firstIsInstanceOrNull<PlainText>()?.content ?: ""
             when {
                 plainText.matches(Regex("^登录超级(课程表|课表)")) -> {
@@ -98,7 +101,17 @@ object BotEventRouteService : AbstractPluginManagedService() {
                                                 RequestHandlerService.sendRequest(Request.SyncSchoolWeekPeriodRequest(sender.id, receive(3) { it.toInt() > 0 }.toInt()))
                                             }
                                             "时间表" -> {
-                                                send("正在修改当前时间表\n请输入一个数字表示当前周数")
+                                                send("正在修改当前时间表\n请输入一个数字表示当前学校一天有几节课\n默认为 8 节课")
+                                                val timetable = mutableListOf<Pair<String, String>>()
+                                                repeat(judge(timeoutLimit = 30000L, tryLimit = 3) { it.toInt() > 2 }.toInt()) { it ->
+                                                    send("请输入第 ${it + 1} 节课的时间${if (it == 0) "\n例如：8:10-8:55\n注意：不要在中间加空格，小时是24小时制！" else ""}")
+                                                    timetable.add(judge(tryLimit = 5, timeoutLimit = 30000L) { res ->
+                                                        TIME_PERIOD_EXPRESSION.matcher(res).find()
+                                                    }.replace("：", ":").split("-").let {
+                                                        it[0] to it[1]
+                                                    })
+                                                }
+                                                RequestHandlerService.sendRequest(Request.SyncSchoolTimetableRequest(sender.id, timetable, forceUpdate = true))
                                             }
                                         }
                                     }
@@ -181,7 +194,6 @@ object BotEventRouteService : AbstractPluginManagedService() {
                                 RequestHandlerService.sendRequest(Request.ChangeUserPasswordRequest(sender.id, it[0]))
                             }
                         } else sender.sendMessage("你还没有登录超级课表，无法修改密码")
-
                     }
                 }
                 plainText.startsWith("修改提前提醒时间") -> {

src/main/kotlin/stageguard/sctimetable/service/RequestHandlerService.kt

@@ -198,7 +198,6 @@ object RequestHandlerService : AbstractPluginManagedService(Dispatchers.IO) {
                             BotEventRouteService.sendMessageNonBlock(request.qq, "成功从服务器同步学校的时间表信息。\n注意：这是首次同步您的学校时间表，若当前周数有误，请发送\"修改时间表\"修改。")
                             sendRequest(Request.SyncSchoolWeekPeriodRequest(request.qq, 1))
                         } else if(request.forceUpdate) {
-                            schoolTimeTable.first().delete()
                             if(request.newTimetable == null) {
                                 //从服务器更新时间表
                                 syncFromServer()
@@ -212,6 +211,9 @@ object RequestHandlerService : AbstractPluginManagedService(Dispatchers.IO) {
                                 ScheduleListenerService.onChangeSchoolTimetable(user.first().schoolId)
                                 info("Sync timetable from user custom list for ${request.qq}'s school successfully, forceUpdate=${request.forceUpdate}.")
                                 BotEventRouteService.sendMessageNonBlock(request.qq, "已修正学校时间表，将影响学校的其他用户。")
+                                User.all().forEach {
+
+                                }
                                 //提醒这个学校的其他人时间表已被手动修改
                             }
                         } else {