From 7732014cbd1a0d72654bdc350c46ad03fd0f4d65 Mon Sep 17 00:00:00 2001
From: AdoptOSS <adoptoss@outlook.com>
Date: Tue, 8 Jun 2021 15:42:37 +0800
Subject: [PATCH] fix: do trimming properly in `startsWith` & `endsWith`, #1282
 (#1314)

Co-authored-by: ArcticLampyrid <arcticlampyrid@outlook.com>
---
 .../kotlin/event/MessageSubscribersBuilder.kt          | 10 ++++++----
 .../internal/event/messageSubscribersInternal.kt       |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mirai-core-api/src/commonMain/kotlin/event/MessageSubscribersBuilder.kt b/mirai-core-api/src/commonMain/kotlin/event/MessageSubscribersBuilder.kt
index ac77455c0..3404d14b2 100644
--- a/mirai-core-api/src/commonMain/kotlin/event/MessageSubscribersBuilder.kt
+++ b/mirai-core-api/src/commonMain/kotlin/event/MessageSubscribersBuilder.kt
@@ -210,8 +210,8 @@ public open class MessageSubscribersBuilder<M : MessageEvent, out Ret, R : RR, R
     /** 如果消息的前缀是 [prefix] */
     @MessageDsl
     public fun startsWith(prefix: String, trim: Boolean = true): ListeningFilter {
-        val toCheck = if (trim) prefix.trim() else prefix
-        return content { (if (trim) it.trim() else it).startsWith(toCheck) }
+        val toCheck = if (trim) prefix.trimStart() else prefix
+        return content { (if (trim) it.trimStart() else it).startsWith(toCheck) }
     }
 
     /** 如果消息的前缀是 [prefix] */
@@ -224,8 +224,10 @@ public open class MessageSubscribersBuilder<M : MessageEvent, out Ret, R : RR, R
     /** 如果消息的结尾是 [suffix] */
     @MessageDsl
     @JvmOverloads // for binary compatibility
-    public fun endsWith(suffix: String, trim: Boolean = true): ListeningFilter =
-        content { if (trim) it.trimEnd().endsWith(suffix) else it.endsWith(suffix) }
+    public fun endsWith(suffix: String, trim: Boolean = true): ListeningFilter {
+        val toCheck = if (trim) suffix.trimEnd() else suffix
+        return content { (if (trim) it.trimEnd() else it).endsWith(toCheck) }
+    }
 
     /** 如果消息的结尾是 [suffix] */
     @MessageDsl
diff --git a/mirai-core-api/src/commonMain/kotlin/internal/event/messageSubscribersInternal.kt b/mirai-core-api/src/commonMain/kotlin/internal/event/messageSubscribersInternal.kt
index 744516783..f77441361 100644
--- a/mirai-core-api/src/commonMain/kotlin/internal/event/messageSubscribersInternal.kt
+++ b/mirai-core-api/src/commonMain/kotlin/internal/event/messageSubscribersInternal.kt
@@ -33,7 +33,7 @@ internal fun <M : MessageEvent, Ret, R : RR, RR> MessageSubscribersBuilder<M, Re
     onEvent: @MessageDsl suspend M.(String) -> R
 ): Ret {
     return if (trim) {
-        val toCheck = suffix.trim()
+        val toCheck = suffix.trimEnd()
         content({ it.trimEnd().endsWith(toCheck) }) {
             if (removeSuffix) this.onEvent(this.message.contentToString().removeSuffix(toCheck).trim())
             else onEvent(this, this.message.contentToString().trim())
@@ -53,7 +53,7 @@ internal fun <M : MessageEvent, Ret, R : RR, RR> MessageSubscribersBuilder<M, Re
     onEvent: @MessageDsl suspend M.(String) -> R
 ): Ret {
     return if (trim) {
-        val toCheck = prefix.trim()
+        val toCheck = prefix.trimStart()
         content({ it.trimStart().startsWith(toCheck) }) {
             if (removePrefix) this.onEvent(this.message.contentToString().substringAfter(toCheck).trim())
             else onEvent(this, this.message.contentToString().trim())