From 86e83f7f1a231f33549bb313c4c62643a8d69c33 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Sun, 15 Jun 2025 12:24:23 +0600
Subject: [PATCH] refactor: expectFlow

---
 .../extensions/behaviour_builder/expectations/Base.kt    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
index c5bb807fca..ae9371896e 100644
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
@@ -58,13 +58,16 @@ fun <T> FlowsUpdatesFilter.expectFlow(
             result.getOrThrow()
         }
     }.flatten()
-    return flow {
-        initRequest ?.also {
+
+    return if (initRequest == null) {
+        flow
+    } else {
+        flow {
             runCatching {
                 bot.execute(initRequest)
             }
+            flow.collect(this)
         }
-        emitAll(flow)
     }
 }