From 3c580eead46688502b4d484324d5b18b350a7482 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 17 Dec 2022 22:36:31 +0000
Subject: [PATCH] [core] Add default implementation for
 `RoamingMessages.getMessagesStream`

---
 .../compatibility-validation/android/api/android.api           | 3 ++-
 mirai-core-api/compatibility-validation/jvm/api/jvm.api        | 3 ++-
 .../src/jvmBaseMain/kotlin/contact/roaming/RoamingMessages.kt  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api
index 6588a8d4e..fcbfaa216 100644
--- a/mirai-core-api/compatibility-validation/android/api/android.api
+++ b/mirai-core-api/compatibility-validation/android/api/android.api
@@ -1074,9 +1074,10 @@ public abstract interface class net/mamoe/mirai/contact/roaming/RoamingMessages
 	public fun getMessagesStream (JJ)Ljava/util/stream/Stream;
 	public fun getMessagesStream (JJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMessagesStream (JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;)Ljava/util/stream/Stream;
-	public abstract fun getMessagesStream (JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getMessagesStream (JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun getMessagesStream$default (Lnet/mamoe/mirai/contact/roaming/RoamingMessages;JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;ILjava/lang/Object;)Ljava/util/stream/Stream;
 	public static synthetic fun getMessagesStream$default (Lnet/mamoe/mirai/contact/roaming/RoamingMessages;JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun getMessagesStream$suspendImpl (Lnet/mamoe/mirai/contact/roaming/RoamingMessages;JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class net/mamoe/mirai/contact/roaming/RoamingSupported : net/mamoe/mirai/contact/Contact {
diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
index 719a03766..5654ef39c 100644
--- a/mirai-core-api/compatibility-validation/jvm/api/jvm.api
+++ b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
@@ -1074,9 +1074,10 @@ public abstract interface class net/mamoe/mirai/contact/roaming/RoamingMessages
 	public fun getMessagesStream (JJ)Ljava/util/stream/Stream;
 	public fun getMessagesStream (JJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMessagesStream (JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;)Ljava/util/stream/Stream;
-	public abstract fun getMessagesStream (JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getMessagesStream (JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun getMessagesStream$default (Lnet/mamoe/mirai/contact/roaming/RoamingMessages;JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;ILjava/lang/Object;)Ljava/util/stream/Stream;
 	public static synthetic fun getMessagesStream$default (Lnet/mamoe/mirai/contact/roaming/RoamingMessages;JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun getMessagesStream$suspendImpl (Lnet/mamoe/mirai/contact/roaming/RoamingMessages;JJLnet/mamoe/mirai/contact/roaming/RoamingMessageFilter;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class net/mamoe/mirai/contact/roaming/RoamingSupported : net/mamoe/mirai/contact/Contact {
diff --git a/mirai-core-api/src/jvmBaseMain/kotlin/contact/roaming/RoamingMessages.kt b/mirai-core-api/src/jvmBaseMain/kotlin/contact/roaming/RoamingMessages.kt
index fc3c85c4e..1946f7783 100644
--- a/mirai-core-api/src/jvmBaseMain/kotlin/contact/roaming/RoamingMessages.kt
+++ b/mirai-core-api/src/jvmBaseMain/kotlin/contact/roaming/RoamingMessages.kt
@@ -17,6 +17,7 @@ import net.mamoe.mirai.contact.Friend
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.MessageSource
 import net.mamoe.mirai.utils.JavaFriendlyAPI
+import net.mamoe.mirai.utils.JdkStreamSupport.toStream
 import java.util.stream.Stream
 
 
@@ -102,7 +103,7 @@ public actual interface RoamingMessages {
         timeStart: Long,
         timeEnd: Long,
         filter: RoamingMessageFilter? = null
-    ): Stream<MessageChain>
+    ): Stream<MessageChain> = getMessagesIn(timeStart, timeEnd, filter).toStream()
 
     /**
      * 查询所有漫游消息记录. Kotlin Flow 版本查看 [getAllMessages].