chore(deps): update dependency gradle to v8.14.3

docs: make buildEntities usage more obvious to anyone not familiar with Telegram Bot API or ktgbotapi

CHANGELOG.md

@@ -1,6 +1,24 @@
 # TelegramBotAPI changelog
 
-## 25.0.0
+## 26.0.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES IN BEHAVIOUR BUILDER AND CORE. BE CAREFUL ON UPDATE**
+
+* `Version`:
+  * `Serialization`: `1.8.0` -> `1.8.1`
+  * `Coroutines`: `1.10.1` -> `1.10.2`
+  * `Ktor`: `3.1.1` -> `3.1.3`
+  * `MicroUtils`: `0.25.3` -> `0.25.7`
+* `Core`:
+  * **POTENTIALLY BREAKING CHANGE** Long polling has been reworked a bit
+  * **BREAKING CHANGE** `RequestsExecutor` got property `RequestsExecutor.Log: KSLog`
+* `BehaviourContext`:
+  * **BREAKING CHANGE** All triggers and waiters become non-suspend functions
+  * **BREAKING CHANGE** Behaviour of counted extensions (commands, data callback queries, etc.) has been changed a bit: now each one will
+  create subcontext and work in it
+  * New extension `BehaviourContext.launchInNewSubContext` which will launch some job in subcontext of receiver
+
+## 25.0.1
 
 **THIS UPDATE CONTAINS ADDING SUPPORT OF [Telegram Bots API 9.0](https://core.telegram.org/bots/api-changelog#april-11-2025)**
 

README.md

@@ -1,4 +1,4 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-9.0-blue)](https://core.telegram.org/bots/api-changelog#april-11-2025)
+# TelegramBotAPI [![Maven Central Version](https://img.shields.io/maven-central/v/dev.inmo/tgbotapi)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-9.0-blue)](https://core.telegram.org/bots/api-changelog#april-11-2025)
 
 |          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
 |:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     repositories {
-        mavenLocal()
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
+        mavenLocal()
     }
 
     dependencies {
@@ -18,15 +18,30 @@ plugins {
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.versions)
     alias(libs.plugins.validator)
+    alias(libs.plugins.nmcp.aggregation)
+}
+
+
+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    nmcpAggregation {
+        centralPortal {
+            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            verificationTimeout = Duration.ofSeconds(0)
+            publishingType = "USER_MANAGED"
+        }
+
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
 }
 
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
 allprojects {
     repositories {
-        mavenLocal()
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
         mavenCentral()
         google()
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
+        mavenLocal()
     }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=25.0.0
+library_version=26.0.0

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
 
 kotlin = "2.1.20"
-kotlin-serialization = "1.8.0"
-kotlin-coroutines = "1.10.1"
+kotlin-serialization = "1.8.1"
+kotlin-coroutines = "1.10.2"
 
 javax-activation = "1.1.1"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
-ktor = "3.1.1"
+ktor = "3.1.3"
 
 ksp = "2.1.20-1.0.31"
 kotlin-poet = "1.18.1"
 
-microutils = "0.25.3"
+microutils = "0.25.7"
 kslog = "1.4.1"
 
 versions = "0.51.0"
@@ -22,6 +22,7 @@ github-release-plugin = "2.5.2"
 dokka = "2.0.0"
 
 validator = "0.17.0"
+nmcp = "0.1.5"
 
 [libraries]
 
@@ -86,3 +87,4 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
 validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "validator" }
+nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/templates/mpp_publish.gradle

@@ -1,54 +1,4 @@
-import java.nio.charset.StandardCharsets
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse
-
 apply plugin: 'maven-publish'
-// This script work based on https://ossrh-staging-api.central.sonatype.com/swagger-ui/#/default/manual_upload_repository
-// and getting available open repos and just uploading them
-def uploadTaskName = "uploadSonatypePublication"
-String getBearer() {
-    def username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-    def password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-    return Base64.getEncoder().encodeToString("$username:$password".getBytes(StandardCharsets.UTF_8))
-}
-if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-    if (rootProject.tasks.names.contains(uploadTaskName) == false) {
-        rootProject.tasks.register(uploadTaskName) {
-            doLast {
-                def bearer = getBearer()
-    
-                def client = HttpClient.newHttpClient()
-                def request = HttpRequest.newBuilder()
-                        .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/search/repositories?state=open"))
-                        .GET()
-                        .header("Content-Type", "application/json")
-                        .header("Authorization", "Bearer $bearer")
-                        .build()
-    
-                def response = client.send(request, HttpResponse.BodyHandlers.ofString())
-                def keys = new ArrayList<String>()
-                response.body().findAll("\"key\"[\\s]*:[\\s]*\"[^\"]+\"").forEach {
-                    def key = it.find("[^\"]+\"\$").find("[^\"]+")
-                    keys.add(key)
-                }
-                keys.forEach {
-                    println("Start uploading $it")
-                    def uploadRequest = HttpRequest.newBuilder()
-                            .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/$it?publishing_type=user_managed"))
-                            .POST(HttpRequest.BodyPublishers.ofString(""))
-                            .header("Content-Type", "application/json")
-                            .header("Authorization", "Bearer $bearer")
-                            .build()
-                    def uploadResponse = client.send(uploadRequest, HttpResponse.BodyHandlers.ofString())
-                    if (uploadResponse.statusCode() != 200) {
-                        println("Faced error of uploading for repo with key $it. Response: $uploadResponse. Check https://central.sonatype.com/publishing/deployments for info or repo with key $it. Response: $uploadResponse")
-                    }
-                }
-            }
-        }
-    }
-}
 
 task javadocsJar(type: Jar) {
     archiveClassifier = 'javadoc'

gradle/templates/mpp_publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/ktgbotapi","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.UsernameAndPassword","usernameProperty":"GITHUB_USER","passwordProperty":"GITHUB_TOKEN"}},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":true}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/ktgbotapi","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.UsernameAndPassword","usernameProperty":"GITHUB_USER","passwordProperty":"GITHUB_TOKEN"}},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":false}}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save ( ) {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,25 +27,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
+
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

publish_all_script

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-function send_notification() {
-    echo "$1"
-}
-
-function assert_success() {
-    "${@}"
-    local status=${?}
-    if [ ${status} -ne 0 ]; then
-        send_notification "### Error ${status} at: ${BASH_LINENO[*]} ###"
-        exit ${status}
-    fi
-}
-
-readarray -t projects <<< "`./gradlew getPublishableModules --quiet`"
-for project in "${projects[@]}"; do
-    echo "Start publishing of $project"
-    assert_success ./gradlew "$project:publishAllPublicationsToSonatypeRepository" --no-parallel --quiet
-    echo "Complete publishing of $project"
-    echo "Start uploading of $project"
-    assert_success ./gradlew uploadSonatypePublication --quiet
-    echo "Complete uploading of $project"
-done
-

tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api

@@ -24,6 +24,7 @@ public final class dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourConte
 	public static fun getEditedChannelPostMediaGroupsFlow (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;)Lkotlinx/coroutines/flow/Flow;
 	public static fun getEditedMessageMediaGroupsFlow (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;)Lkotlinx/coroutines/flow/Flow;
 	public static fun getFlowsUpdatesFilter (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;)Ldev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter;
+	public static fun getLog (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;)Ldev/inmo/kslog/common/KSLog;
 	public static fun getMessageMediaGroupsFlow (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;)Lkotlinx/coroutines/flow/Flow;
 	public static fun getScope (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;)Lkotlinx/coroutines/CoroutineScope;
 	public static fun launchStateHandling (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;Ldev/inmo/micro_utils/fsm/common/State;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -102,6 +103,7 @@ public final class dev/inmo/tgbotapi/extensions/behaviour_builder/DefaultBehavio
 	public fun getEditedMessagesFlow ()Lkotlinx/coroutines/flow/Flow;
 	public fun getFlowsUpdatesFilter ()Ldev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter;
 	public fun getInlineQueriesFlow ()Lkotlinx/coroutines/flow/Flow;
+	public fun getLog ()Ldev/inmo/kslog/common/KSLog;
 	public fun getMessageMediaGroupsFlow ()Lkotlinx/coroutines/flow/Flow;
 	public fun getMessagesFlow ()Lkotlinx/coroutines/flow/Flow;
 	public fun getMyChatMemberUpdatesFlow ()Lkotlinx/coroutines/flow/Flow;

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt

@@ -2,6 +2,7 @@
 
 package dev.inmo.tgbotapi.extensions.behaviour_builder
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar.TriggersHolder
@@ -153,12 +154,14 @@ fun <BC : BehaviourContext> BC.createSubContext(
     scope: CoroutineScope = LinkedSupervisorScope(),
     triggersHolder: TriggersHolder = this.triggersHolder,
     updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
-    subcontextInitialAction: CustomBehaviourContextAndTypeReceiver<BehaviourContext, Unit, Update> = this.subcontextInitialAction,
+    subcontextInitialAction: CustomBehaviourContextAndTypeReceiver<BC, Unit, Update> = this.subcontextInitialAction,
 ) = copy(
     scope = scope,
     upstreamUpdatesFlow = updatesUpstreamFlow,
     triggersHolder = triggersHolder,
-    subcontextInitialAction = subcontextInitialAction
+    subcontextInitialAction = {
+        (this as BC).subcontextInitialAction(it)
+    }
 ) as BC
 
 /**
@@ -174,6 +177,52 @@ suspend fun <T, BC : BehaviourContext> BC.doInContext(
     }
 }
 
+/**
+ * Launch [behaviourContextReceiver] in context of [this] as [BehaviourContext] and as [kotlin.coroutines.CoroutineContext]
+ *
+ * [this] [BehaviourContext] will **NOT** be closed automatically
+ */
+suspend fun <T, BC : BehaviourContext> BC.doInNewSubContext(
+    scope: CoroutineScope = LinkedSupervisorScope(),
+    triggersHolder: TriggersHolder = this.triggersHolder,
+    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
+    subcontextInitialAction: CustomBehaviourContextAndTypeReceiver<BC, Unit, Update> = this.subcontextInitialAction,
+    behaviourContextReceiver: CustomBehaviourContextReceiver<BC, T>
+): T {
+    return createSubContext(
+        scope = scope,
+        triggersHolder = triggersHolder,
+        updatesUpstreamFlow = updatesUpstreamFlow,
+        subcontextInitialAction = subcontextInitialAction
+    ).run {
+        behaviourContextReceiver()
+    }
+}
+
+/**
+ * Launch [behaviourContextReceiver] in context of [this] as [BehaviourContext] and as [kotlin.coroutines.CoroutineContext]
+ *
+ * [this] [BehaviourContext] will **NOT** be closed automatically
+ */
+fun <T, BC : BehaviourContext> BC.launchInNewSubContext(
+    scope: CoroutineScope = LinkedSupervisorScope(),
+    triggersHolder: TriggersHolder = this.triggersHolder,
+    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
+    subcontextInitialAction: CustomBehaviourContextAndTypeReceiver<BC, Unit, Update> = this.subcontextInitialAction,
+    behaviourContextReceiver: CustomBehaviourContextReceiver<BC, T>
+): Job {
+    return createSubContext(
+        scope = scope,
+        triggersHolder = triggersHolder,
+        updatesUpstreamFlow = updatesUpstreamFlow,
+        subcontextInitialAction = subcontextInitialAction
+    ).apply {
+        this@apply.launchLoggingDropExceptions(logger = Log) {
+            behaviourContextReceiver()
+        }
+    }.coroutineContext.job
+}
+
 /**
  * Creates new one [BehaviourContext] using [createSubContext] and launches [behaviourContextReceiver] in a new context
  * using [doInContext].

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/CombinedSubcontextInitialAction.kt

@@ -40,7 +40,7 @@ class CombinedSubcontextInitialAction(
                     runCatching {
                         invoke(update)
                     }.onFailure {
-                        logger.error(it) {
+                        Log.error(it) {
                             "Unable to execute $subaction for update $update. Will try on next round"
                         }
                     }.onSuccess {
@@ -50,7 +50,7 @@ class CombinedSubcontextInitialAction(
             }
             leftSubActions.removeAll(successSubActions)
             if (successSubActions.isEmpty()) {
-                logger.error {
+                Log.error {
                     "Some SubActions have been unable to complete successfully:${leftSubActions.joinToString("\n") { it.toString() }}"
                 }
                 break

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt

@@ -29,7 +29,7 @@ typealias NullableRequestBuilder<T> = suspend (Update) -> Request<T>?
  * will be called too), [errorFactory] and then will be returned null
  */
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend fun <T> FlowsUpdatesFilter.expectFlow(
+fun <T> FlowsUpdatesFilter.expectFlow(
     bot: TelegramBot,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
@@ -58,12 +58,17 @@ suspend fun <T> FlowsUpdatesFilter.expectFlow(
             result.getOrThrow()
         }
     }.flatten()
-    initRequest ?.also {
-        runCatching {
-            bot.execute(initRequest)
+
+    return if (initRequest == null) {
+        flow
+    } else {
+        flow {
+            runCatching {
+                bot.execute(initRequest)
+            }
+            flow.collect(this)
         }
     }
-    return flow
 }
 
 /**
@@ -77,7 +82,7 @@ suspend fun <T> FlowsUpdatesFilter.expectFlow(
  * will be called too), [errorFactory] and then will be returned null
  */
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend fun <T> BehaviourContext.expectFlow(
+fun <T> BehaviourContext.expectFlow(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
     cancelRequestFactory: NullableRequestBuilder<*> = { null },

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitBusinessConnection.kt

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.types.business_connection.BusinessConnection
 import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import kotlinx.coroutines.flow.Flow
 
-suspend fun BehaviourContext.waitBusinessConnection(
+fun BehaviourContext.waitBusinessConnection(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<BusinessConnection> = expectFlow(
@@ -20,7 +20,7 @@ suspend fun BehaviourContext.waitBusinessConnection(
     (it.businessConnectionUpdateOrNull() ?.data).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitBusinessConnectionEnabled(
+fun BehaviourContext.waitBusinessConnectionEnabled(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<BusinessConnection> = expectFlow(
@@ -30,7 +30,7 @@ suspend fun BehaviourContext.waitBusinessConnectionEnabled(
     (it.businessConnectionUpdateOrNull() ?.data ?.enabledOrNull()).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitBusinessConnectionDisabled(
+fun BehaviourContext.waitBusinessConnectionDisabled(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<BusinessConnection> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.Flow
 typealias CallbackQueryMapper<T> = suspend T.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O> BehaviourContext.waitCallbackQueries(
+inline fun <reified O> BehaviourContext.waitCallbackQueries(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -24,39 +24,39 @@ suspend inline fun <reified O> BehaviourContext.waitCallbackQueries(
 }
 
 
-suspend fun BehaviourContext.waitDataCallbackQuery(
+fun BehaviourContext.waitDataCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<DataCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGameShortNameCallbackQuery(
+fun BehaviourContext.waitGameShortNameCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<GameShortNameCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitInlineMessageIdCallbackQuery(
+fun BehaviourContext.waitInlineMessageIdCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<InlineMessageIdCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitInlineMessageIdDataCallbackQuery(
+fun BehaviourContext.waitInlineMessageIdDataCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<InlineMessageIdDataCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitInlineMessageIdGameShortNameCallbackQuery(
+fun BehaviourContext.waitInlineMessageIdGameShortNameCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<InlineMessageIdGameShortNameCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitMessageCallbackQuery(
+fun BehaviourContext.waitMessageCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<MessageCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitMessageDataCallbackQuery(
+fun BehaviourContext.waitMessageDataCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<MessageDataCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitMessageGameShortNameCallbackQuery(
+fun BehaviourContext.waitMessageGameShortNameCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<MessageGameShortNameCallbackQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitUnknownCallbackQuery(
+fun BehaviourContext.waitUnknownCallbackQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCallbackQueries<UnknownCallbackQueryType>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatBoostRemoved.kt

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.boosts.ChatBoostRemoved
 import kotlinx.coroutines.flow.Flow
 
-suspend fun BehaviourContext.waitChatBoostRemoved(
+fun BehaviourContext.waitChatBoostRemoved(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<ChatBoostRemoved> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatBoostUpdated.kt

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.boosts.ChatBoostUpdated
 import kotlinx.coroutines.flow.Flow
 
-suspend fun BehaviourContext.waitChatBoostUpdated(
+fun BehaviourContext.waitChatBoostUpdated(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<ChatBoostUpdated> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatJoinRequest.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 typealias ChatJoinRequestsMapper = suspend ChatJoinRequest.() -> ChatJoinRequest?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O> BehaviourContext.internalWaitChatJoinRequests(
+inline fun <reified O> BehaviourContext.internalWaitChatJoinRequests(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -22,7 +22,7 @@ suspend inline fun <reified O> BehaviourContext.internalWaitChatJoinRequests(
 }
 
 
-suspend fun BehaviourContext.waitChatJoinRequests(
+fun BehaviourContext.waitChatJoinRequests(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) : Flow<ChatJoinRequest> = internalWaitChatJoinRequests(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMemberUpdated.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.filter
 typealias ChatMemberUpdatedMapper<T> = suspend T.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : ChatMemberUpdatedUpdate> BehaviourContext.waitChatMemberUpdatedWithFilter(
+inline fun <reified O : ChatMemberUpdatedUpdate> BehaviourContext.waitChatMemberUpdatedWithFilter(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<ChatMemberUpdated> = expectFlow(
@@ -31,227 +31,227 @@ suspend inline fun <reified O : ChatMemberUpdatedUpdate> BehaviourContext.waitCh
     (it as? O) ?.data.let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitChatMemberUpdated(
+fun BehaviourContext.waitChatMemberUpdated(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitChatMemberUpdatedWithFilter<ChatMemberUpdatedUpdate>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitCommonChatMemberUpdated(
+fun BehaviourContext.waitCommonChatMemberUpdated(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitChatMemberUpdatedWithFilter<CommonChatMemberUpdatedUpdate>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitMyChatMemberUpdated(
+fun BehaviourContext.waitMyChatMemberUpdated(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdatedWithFilter<MyChatMemberUpdatedUpdate>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatMemberJoined(
+fun BehaviourContext.waitChatMemberJoined(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberJoinedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberLeft(
+fun BehaviourContext.waitChatMemberLeft(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberLeftFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberSubscribed(
+fun BehaviourContext.waitChatMemberSubscribed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberSubscribedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberSubscriptionChanged(
+fun BehaviourContext.waitChatMemberSubscriptionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberSubscriptionChangedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberUnsubscribed(
+fun BehaviourContext.waitChatMemberUnsubscribed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberUnsubscribedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberGotPromoted(
+fun BehaviourContext.waitChatMemberGotPromoted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotPromotedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberGotPromotionChanged(
+fun BehaviourContext.waitChatMemberGotPromotionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotPromotionChangedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberGotDemoted(
+fun BehaviourContext.waitChatMemberGotDemoted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotDemotedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberBecameOwner(
+fun BehaviourContext.waitChatMemberBecameOwner(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberBecameOwnerFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberCeasedOwnership(
+fun BehaviourContext.waitChatMemberCeasedOwnership(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberCeasedOwnershipFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberGotRestricted(
+fun BehaviourContext.waitChatMemberGotRestricted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotRestrictedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberGotRestrictionChanged(
+fun BehaviourContext.waitChatMemberGotRestrictionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotRestrictionsChangedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberGotUnrestricted(
+fun BehaviourContext.waitChatMemberGotUnrestricted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotUnrestrictedFilter(it) };
 
-suspend fun BehaviourContext.waitChatMemberKicked(
+fun BehaviourContext.waitChatMemberKicked(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMemberUpdated(initRequest, errorFactory).filter { chatMemberKickedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberJoined(
+fun BehaviourContext.waitCommonChatMemberJoined(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberJoinedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberLeft(
+fun BehaviourContext.waitCommonChatMemberLeft(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberLeftFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberSubscribed(
+fun BehaviourContext.waitCommonChatMemberSubscribed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberSubscribedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberSubscriptionChanged(
+fun BehaviourContext.waitCommonChatMemberSubscriptionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberSubscriptionChangedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberUnsubscribed(
+fun BehaviourContext.waitCommonChatMemberUnsubscribed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberUnsubscribedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberGotPromoted(
+fun BehaviourContext.waitCommonChatMemberGotPromoted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotPromotedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberGotPromotionChanged(
+fun BehaviourContext.waitCommonChatMemberGotPromotionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotPromotionChangedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberGotDemoted(
+fun BehaviourContext.waitCommonChatMemberGotDemoted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotDemotedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberBecameOwner(
+fun BehaviourContext.waitCommonChatMemberBecameOwner(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberBecameOwnerFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberCeasedOwnership(
+fun BehaviourContext.waitCommonChatMemberCeasedOwnership(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberCeasedOwnershipFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberGotRestricted(
+fun BehaviourContext.waitCommonChatMemberGotRestricted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotRestrictedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberGotRestrictionChanged(
+fun BehaviourContext.waitCommonChatMemberGotRestrictionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotRestrictionsChangedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberGotUnrestricted(
+fun BehaviourContext.waitCommonChatMemberGotUnrestricted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotUnrestrictedFilter(it) };
 
-suspend fun BehaviourContext.waitCommonChatMemberKicked(
+fun BehaviourContext.waitCommonChatMemberKicked(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommonChatMemberUpdated(initRequest, errorFactory).filter { chatMemberKickedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberJoined(
+fun BehaviourContext.waitMyChatMemberJoined(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberJoinedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberLeft(
+fun BehaviourContext.waitMyChatMemberLeft(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberLeftFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberSubscribed(
+fun BehaviourContext.waitMyChatMemberSubscribed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberSubscribedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberSubscriptionChanged(
+fun BehaviourContext.waitMyChatMemberSubscriptionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberSubscriptionChangedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberUnsubscribed(
+fun BehaviourContext.waitMyChatMemberUnsubscribed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberUnsubscribedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberGotPromoted(
+fun BehaviourContext.waitMyChatMemberGotPromoted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotPromotedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberGotPromotionChanged(
+fun BehaviourContext.waitMyChatMemberGotPromotionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotPromotionChangedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberGotDemoted(
+fun BehaviourContext.waitMyChatMemberGotDemoted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotDemotedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberBecameOwner(
+fun BehaviourContext.waitMyChatMemberBecameOwner(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberBecameOwnerFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberCeasedOwnership(
+fun BehaviourContext.waitMyChatMemberCeasedOwnership(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberCeasedOwnershipFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberGotRestricted(
+fun BehaviourContext.waitMyChatMemberGotRestricted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotRestrictedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberGotRestrictionChanged(
+fun BehaviourContext.waitMyChatMemberGotRestrictionChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotRestrictionsChangedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberGotUnrestricted(
+fun BehaviourContext.waitMyChatMemberGotUnrestricted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberGotUnrestrictedFilter(it) };
 
-suspend fun BehaviourContext.waitMyChatMemberKicked(
+fun BehaviourContext.waitMyChatMemberKicked(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitMyChatMemberUpdated(initRequest, errorFactory).filter { chatMemberKickedFilter(it) };

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMessageReactionUpdatedUpdates.kt

@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.flow.Flow
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : ChatMessageReactionUpdated> BehaviourContext.waitChatMessageReactionUpdated(
+inline fun <reified O : ChatMessageReactionUpdated> BehaviourContext.waitChatMessageReactionUpdated(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -19,13 +19,13 @@ suspend inline fun <reified O : ChatMessageReactionUpdated> BehaviourContext.wai
     (it.chatMessageReactionUpdatedUpdateOrNull() ?.data as? O).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitChatMessageReactionUpdatedByUser(
+fun BehaviourContext.waitChatMessageReactionUpdatedByUser(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMessageReactionUpdated<ChatMessageReactionUpdated.ByUser>(initRequest, errorFactory)
 
 
-suspend fun BehaviourContext.waitChatMessageReactionUpdatedByChat(
+fun BehaviourContext.waitChatMessageReactionUpdatedByChat(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChatMessageReactionUpdated<ChatMessageReactionUpdated.ByChat>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatMessageReactionsCountUpdatedUpdates.kt

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.flow.Flow
 
-suspend inline fun BehaviourContext.waitChatMessageReactionsCountUpdated(
+inline fun BehaviourContext.waitChatMessageReactionsCountUpdated(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<ChatMessageReactionsCountUpdated> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChosenInlineResult.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 typealias ChosenInlineResultMapper<T> = suspend T.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O> BehaviourContext.waitChosenInlineResults(
+inline fun <reified O> BehaviourContext.waitChosenInlineResults(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -21,17 +21,17 @@ suspend inline fun <reified O> BehaviourContext.waitChosenInlineResults(
     (it.chosenInlineResultUpdateOrNull() ?.data as? O).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitChosenInlineResult(
+fun BehaviourContext.waitChosenInlineResult(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChosenInlineResults<ChosenInlineResult>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitLocationChosenInlineResult(
+fun BehaviourContext.waitLocationChosenInlineResult(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChosenInlineResults<LocationChosenInlineResult>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitBaseChosenInlineResult(
+fun BehaviourContext.waitBaseChosenInlineResult(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitChosenInlineResults<BaseChosenInlineResult>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCommandsMessages.kt

@@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.*
  * * In case you wish to exclude messages with more than one command, you may use [requireSingleCommand]
  * * In case you wish to exclude messages with commands params, you may use [requireCommandsWithoutParams]
  */
-suspend fun BehaviourContext.waitCommandMessage(
+fun BehaviourContext.waitCommandMessage(
     commandRegex: Regex,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
@@ -38,13 +38,13 @@ suspend fun BehaviourContext.waitCommandMessage(
     }
 }
 
-suspend fun BehaviourContext.waitCommandMessage(
+fun BehaviourContext.waitCommandMessage(
     command: String,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitCommandMessage(Regex(command), initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitCommandMessage(
+fun BehaviourContext.waitCommandMessage(
     botCommand: BotCommand,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt

@@ -16,146 +16,146 @@ import kotlinx.coroutines.flow.mapNotNull
 typealias CommonMessageToContentMapper<T> = suspend CommonMessage<T>.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun BehaviourContext.waitContent(
+fun BehaviourContext.waitContent(
     initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null }
+    errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<MessageContent> = waitContentMessage(initRequest, errorFactory).map { it.content }
 
 inline fun <reified T : MessageContent> Flow<MessageContent>.mapContent() = mapNotNull { it as? T }
 
-suspend fun BehaviourContext.waitAnyContent(
+fun BehaviourContext.waitAnyContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory)
-suspend fun BehaviourContext.waitTextedContent(
+fun BehaviourContext.waitTextedContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<TextedContent>()
-suspend fun BehaviourContext.waitContact(
+fun BehaviourContext.waitContact(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<ContactContent>()
-suspend fun BehaviourContext.waitDice(
+fun BehaviourContext.waitDice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<DiceContent>()
-suspend fun BehaviourContext.waitGame(
+fun BehaviourContext.waitGame(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<GameContent>()
-suspend fun BehaviourContext.waitLocation(
+fun BehaviourContext.waitLocation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<LocationContent>()
-suspend fun BehaviourContext.waitLiveLocation(
+fun BehaviourContext.waitLiveLocation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<LiveLocationContent>()
-suspend fun BehaviourContext.waitStaticLocation(
+fun BehaviourContext.waitStaticLocation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<StaticLocationContent>()
-suspend fun BehaviourContext.waitPoll(
+fun BehaviourContext.waitPoll(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<PollContent>()
-suspend fun BehaviourContext.waitText(
+fun BehaviourContext.waitText(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<TextContent>()
-suspend fun BehaviourContext.waitStory(
+fun BehaviourContext.waitStory(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<StoryContent>()
-suspend fun BehaviourContext.waitVenue(
+fun BehaviourContext.waitVenue(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<VenueContent>()
-suspend fun BehaviourContext.waitAudioMediaGroupContent(
+fun BehaviourContext.waitAudioMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<AudioMediaGroupPartContent>()
-suspend fun BehaviourContext.waitDocumentMediaGroupContent(
+fun BehaviourContext.waitDocumentMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<DocumentMediaGroupPartContent>()
-suspend fun BehaviourContext.waitMedia(
+fun BehaviourContext.waitMedia(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<MediaContent>()
-suspend fun BehaviourContext.waitAnyMediaGroupContent(
+fun BehaviourContext.waitAnyMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<MediaGroupPartContent>()
-suspend fun BehaviourContext.waitVisualMediaGroupContent(
+fun BehaviourContext.waitVisualMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<VisualMediaGroupPartContent>()
-suspend fun BehaviourContext.waitTextedMediaContent(
+fun BehaviourContext.waitTextedMediaContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<TextedMediaContent>()
-suspend fun BehaviourContext.waitAnimation(
+fun BehaviourContext.waitAnimation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<AnimationContent>()
-suspend fun BehaviourContext.waitAudio(
+fun BehaviourContext.waitAudio(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<AudioContent>()
-suspend fun BehaviourContext.waitDocument(
+fun BehaviourContext.waitDocument(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<DocumentContent>()
-suspend fun BehaviourContext.waitPhoto(
+fun BehaviourContext.waitPhoto(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent(initRequest, errorFactory).mapContent<PhotoContent>()
-suspend fun BehaviourContext.waitSticker(
+fun BehaviourContext.waitSticker(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<StickerContent>()
-suspend fun BehaviourContext.waitVideo(
+fun BehaviourContext.waitVideo(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<VideoContent>()
-suspend fun BehaviourContext.waitVideoNote(
+fun BehaviourContext.waitVideoNote(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<VideoNoteContent>()
-suspend fun BehaviourContext.waitVoice(
+fun BehaviourContext.waitVoice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<VoiceContent>()
-suspend fun BehaviourContext.waitInvoice(
+fun BehaviourContext.waitInvoice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<InvoiceContent>()
-suspend fun BehaviourContext.waitVisualContent(
+fun BehaviourContext.waitVisualContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<VisualMediaGroupPartContent>()
-suspend fun BehaviourContext.waitMediaContent(
+fun BehaviourContext.waitMediaContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<MediaContent>()
 
-suspend fun BehaviourContext.waitGiveawayContent(
+fun BehaviourContext.waitGiveawayContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<GiveawayContent>()
 
-suspend fun BehaviourContext.waitGiveawayPublicResultsContent(
+fun BehaviourContext.waitGiveawayPublicResultsContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<GiveawayPublicResultsContent>()
 
-suspend fun BehaviourContext.waitGiveawayWinners(
+fun BehaviourContext.waitGiveawayWinners(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitGiveawayPublicResultsContent(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitPaidMediaInfoContent(
+fun BehaviourContext.waitPaidMediaInfoContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<PaidMediaInfoContent>()

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt

@@ -16,9 +16,9 @@ import kotlinx.coroutines.flow.mapNotNull
 typealias CommonMessageToCommonMessageMapper<T> = suspend CommonMessage<T>.() -> CommonMessage<T>?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun BehaviourContext.waitContentMessage(
+fun BehaviourContext.waitContentMessage(
     initRequest: Request<*>? = null,
-    noinline errorFactory: NullableRequestBuilder<*> = { null }
+    errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<CommonMessage<MessageContent>> = expectFlow(
     initRequest,
     errorFactory
@@ -31,141 +31,141 @@ suspend inline fun BehaviourContext.waitContentMessage(
 
 inline fun <reified T : MessageContent> Flow<CommonMessage<MessageContent>>.mapWithContent() = mapNotNull { it.withContentOrNull<T>() }
 
-suspend fun BehaviourContext.waitAnyContentMessage(
+fun BehaviourContext.waitAnyContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContentMessage(initRequest, errorFactory)
-suspend fun BehaviourContext.waitTextedContentMessage(
+fun BehaviourContext.waitTextedContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<TextedContent>()
-suspend fun BehaviourContext.waitContactMessage(
+fun BehaviourContext.waitContactMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<ContactContent>()
-suspend fun BehaviourContext.waitDiceMessage(
+fun BehaviourContext.waitDiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<DiceContent>()
-suspend fun BehaviourContext.waitGameMessage(
+fun BehaviourContext.waitGameMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<GameContent>()
-suspend fun BehaviourContext.waitLocationMessage(
+fun BehaviourContext.waitLocationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<LocationContent>()
-suspend fun BehaviourContext.waitLiveLocationMessage(
+fun BehaviourContext.waitLiveLocationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<LiveLocationContent>()
-suspend fun BehaviourContext.waitStaticLocationMessage(
+fun BehaviourContext.waitStaticLocationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<StaticLocationContent>()
-suspend fun BehaviourContext.waitPollMessage(
+fun BehaviourContext.waitPollMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<PollContent>()
-suspend fun BehaviourContext.waitTextMessage(
+fun BehaviourContext.waitTextMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<TextContent>()
-suspend fun BehaviourContext.waitStoryMessage(
+fun BehaviourContext.waitStoryMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<StoryContent>()
-suspend fun BehaviourContext.waitVenueMessage(
+fun BehaviourContext.waitVenueMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<VenueContent>()
-suspend fun BehaviourContext.waitAudioMediaGroupContentMessage(
+fun BehaviourContext.waitAudioMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<AudioMediaGroupPartContent>()
-suspend fun BehaviourContext.waitDocumentMediaGroupContentMessage(
+fun BehaviourContext.waitDocumentMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<DocumentMediaGroupPartContent>()
-suspend fun BehaviourContext.waitMediaMessage(
+fun BehaviourContext.waitMediaMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<MediaContent>()
-suspend fun BehaviourContext.waitAnyMediaGroupContentMessage(
+fun BehaviourContext.waitAnyMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<MediaGroupPartContent>()
-suspend fun BehaviourContext.waitVisualMediaGroupContentMessage(
+fun BehaviourContext.waitVisualMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<VisualMediaGroupPartContent>()
-suspend fun BehaviourContext.waitTextedMediaContentMessage(
+fun BehaviourContext.waitTextedMediaContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<TextedMediaContent>()
-suspend fun BehaviourContext.waitAnimationMessage(
+fun BehaviourContext.waitAnimationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<AnimationContent>()
-suspend fun BehaviourContext.waitAudioMessage(
+fun BehaviourContext.waitAudioMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<AudioContent>()
-suspend fun BehaviourContext.waitDocumentMessage(
+fun BehaviourContext.waitDocumentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<DocumentContent>()
-suspend fun BehaviourContext.waitPhotoMessage(
+fun BehaviourContext.waitPhotoMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<PhotoContent>()
-suspend fun BehaviourContext.waitStickerMessage(
+fun BehaviourContext.waitStickerMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<StickerContent>()
-suspend fun BehaviourContext.waitVideoMessage(
+fun BehaviourContext.waitVideoMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<VideoContent>()
-suspend fun BehaviourContext.waitVideoNoteMessage(
+fun BehaviourContext.waitVideoNoteMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<VideoNoteContent>()
-suspend fun BehaviourContext.waitVoiceMessage(
+fun BehaviourContext.waitVoiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<VoiceContent>()
-suspend fun BehaviourContext.waitInvoiceMessage(
+fun BehaviourContext.waitInvoiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<InvoiceContent>()
 
-suspend fun BehaviourContext.waitVisualContentMessage(
+fun BehaviourContext.waitVisualContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<VisualMediaGroupPartContent>()
 
-suspend fun BehaviourContext.waitMediaContentMessage(
+fun BehaviourContext.waitMediaContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<MediaContent>()
 
-suspend fun BehaviourContext.waitGiveawayContentMessage(
+fun BehaviourContext.waitGiveawayContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<GiveawayContent>()
 
-suspend fun BehaviourContext.waitGiveawayPublicResultsContentMessage(
+fun BehaviourContext.waitGiveawayPublicResultsContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<GiveawayPublicResultsContent>()
 
-suspend fun BehaviourContext.waitGiveawayWinnersMessage(
+fun BehaviourContext.waitGiveawayWinnersMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitGiveawayPublicResultsContentMessage(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitPaidMediaInfoContentMessage(
+fun BehaviourContext.waitPaidMediaInfoContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<PaidMediaInfoContent>()

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitDeepLinks.kt

@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.message.textsources.RegularTextSource
 import kotlinx.coroutines.flow.*
 
-suspend fun BehaviourContext.waitDeepLinks(
+fun BehaviourContext.waitDeepLinks(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ): Flow<Pair<CommonMessage<TextContent>, String>> = waitCommandMessage(
@@ -22,7 +22,7 @@ suspend fun BehaviourContext.waitDeepLinks(
         it.first to (it.second.second.singleOrNull() ?.regularTextSourceOrNull() ?.source ?.removePrefix(" ") ?: return@mapNotNull null)
     }
 
-suspend fun BehaviourContext.waitDeepLinks(
+fun BehaviourContext.waitDeepLinks(
     regex: Regex,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
@@ -30,7 +30,7 @@ suspend fun BehaviourContext.waitDeepLinks(
     regex.matches(it.second)
 }
 
-suspend fun BehaviourContext.waitDeepLinks(
+fun BehaviourContext.waitDeepLinks(
     deepLink: String,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitDeletedBusinessMessages.kt

@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.types.business_connection.BusinessMessagesDeleted
 import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import kotlinx.coroutines.flow.Flow
 
-suspend fun BehaviourContext.waitDeletedBusinessMessages(
+fun BehaviourContext.waitDeletedBusinessMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<BusinessMessagesDeleted> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEditedContent.kt

@@ -11,119 +11,119 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : MessageContent> BehaviourContext.waitEditedContent(
+inline fun <reified O : MessageContent> BehaviourContext.waitEditedContent(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = waitEditedContentMessage<O>(initRequest, errorFactory).map { it.content }
 
-suspend fun BehaviourContext.waitEditedMessageContent(
+fun BehaviourContext.waitEditedMessageContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<MessageContent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitEditedContentMessage(
+fun BehaviourContext.waitEditedContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<MessageContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedContact(
+fun BehaviourContext.waitEditedContact(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<ContactContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedDice(
+fun BehaviourContext.waitEditedDice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<DiceContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedGame(
+fun BehaviourContext.waitEditedGame(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<GameContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedLocation(
+fun BehaviourContext.waitEditedLocation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<LocationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedLiveLocation(
+fun BehaviourContext.waitEditedLiveLocation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<LiveLocationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedStaticLocation(
+fun BehaviourContext.waitEditedStaticLocation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<StaticLocationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedText(
+fun BehaviourContext.waitEditedText(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<TextContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVenue(
+fun BehaviourContext.waitEditedVenue(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<VenueContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAudioMediaGroupContent(
+fun BehaviourContext.waitEditedAudioMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<AudioMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedDocumentMediaGroupContent(
+fun BehaviourContext.waitEditedDocumentMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<DocumentMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedMedia(
+fun BehaviourContext.waitEditedMedia(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<MediaContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAnyMediaGroupContent(
+fun BehaviourContext.waitEditedAnyMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<MediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVisualMediaGroupContent(
+fun BehaviourContext.waitEditedVisualMediaGroupContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<VisualMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedTextedMediaContent(
+fun BehaviourContext.waitEditedTextedMediaContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<TextedMediaContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAnimation(
+fun BehaviourContext.waitEditedAnimation(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<AnimationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAudio(
+fun BehaviourContext.waitEditedAudio(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<AudioContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedDocument(
+fun BehaviourContext.waitEditedDocument(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<DocumentContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedPhoto(
+fun BehaviourContext.waitEditedPhoto(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<PhotoContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedSticker(
+fun BehaviourContext.waitEditedSticker(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<StickerContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVideo(
+fun BehaviourContext.waitEditedVideo(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContent<VideoContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVideoNote(
+fun BehaviourContext.waitEditedVideoNote(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<VideoNoteContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVoice(
+fun BehaviourContext.waitEditedVoice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<VoiceContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedInvoice(
+fun BehaviourContext.waitEditedInvoice(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<InvoiceContent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitEditedGiveawayContent(
+fun BehaviourContext.waitEditedGiveawayContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<GiveawayContent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitEditedGiveawayPublicResultsContent(
+fun BehaviourContext.waitEditedGiveawayPublicResultsContent(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContent<GiveawayPublicResultsContent>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEditedContentMessage.kt

@@ -14,7 +14,7 @@ import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.flow.Flow
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : MessageContent> BehaviourContext.waitEditedContentMessage(
+inline fun <reified O : MessageContent> BehaviourContext.waitEditedContentMessage(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<CommonMessage<O>> = expectFlow(
@@ -33,110 +33,110 @@ suspend inline fun <reified O : MessageContent> BehaviourContext.waitEditedConte
     }
 }
 
-suspend fun BehaviourContext.waitEditedMessageContentMessage(
+fun BehaviourContext.waitEditedMessageContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<MessageContent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitEditedContactMessage(
+fun BehaviourContext.waitEditedContactMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<ContactContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedDiceMessage(
+fun BehaviourContext.waitEditedDiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<DiceContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedGameMessage(
+fun BehaviourContext.waitEditedGameMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<GameContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedLocationMessage(
+fun BehaviourContext.waitEditedLocationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<LocationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedLiveLocationMessage(
+fun BehaviourContext.waitEditedLiveLocationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<LiveLocationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedStaticLocationMessage(
+fun BehaviourContext.waitEditedStaticLocationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<StaticLocationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedTextMessage(
+fun BehaviourContext.waitEditedTextMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<TextContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVenueMessage(
+fun BehaviourContext.waitEditedVenueMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<VenueContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAudioMediaGroupContentMessage(
+fun BehaviourContext.waitEditedAudioMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<AudioMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedDocumentMediaGroupContentMessage(
+fun BehaviourContext.waitEditedDocumentMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<DocumentMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedMediaMessage(
+fun BehaviourContext.waitEditedMediaMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContentMessage<MediaContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAnyMediaGroupContentMessage(
+fun BehaviourContext.waitEditedAnyMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<MediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVisualMediaGroupContentMessage(
+fun BehaviourContext.waitEditedVisualMediaGroupContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<VisualMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedTextedMediaContentMessage(
+fun BehaviourContext.waitEditedTextedMediaContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<TextedMediaContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAnimationMessage(
+fun BehaviourContext.waitEditedAnimationMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<AnimationContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedAudioMessage(
+fun BehaviourContext.waitEditedAudioMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContentMessage<AudioContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedDocumentMessage(
+fun BehaviourContext.waitEditedDocumentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContentMessage<DocumentContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedPhotoMessage(
+fun BehaviourContext.waitEditedPhotoMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContentMessage<PhotoContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedStickerMessage(
+fun BehaviourContext.waitEditedStickerMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<StickerContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVideoMessage(
+fun BehaviourContext.waitEditedVideoMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitEditedContentMessage<VideoContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVideoNoteMessage(
+fun BehaviourContext.waitEditedVideoNoteMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<VideoNoteContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedVoiceMessage(
+fun BehaviourContext.waitEditedVoiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<VoiceContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitEditedInvoiceMessage(
+fun BehaviourContext.waitEditedInvoiceMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<InvoiceContent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitEditedGiveawayContentMessage(
+fun BehaviourContext.waitEditedGiveawayContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<GiveawayContent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitEditedGiveawayPublicResultsContentMessage(
+fun BehaviourContext.waitEditedGiveawayPublicResultsContentMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEditedContentMessage<GiveawayPublicResultsContent>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt

@@ -34,7 +34,7 @@ import kotlinx.coroutines.flow.filter
 typealias EventMessageToEventMapper<T> = suspend ChatEventMessage<T>.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : ChatEvent> BehaviourContext.waitEvents(
+inline fun <reified O : ChatEvent> BehaviourContext.waitEvents(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -44,223 +44,223 @@ suspend inline fun <reified O : ChatEvent> BehaviourContext.waitEvents(
     it.baseSentMessageUpdateOrNull() ?.data ?.chatEventMessageOrNull() ?.withEvent<O>() ?.chatEvent.let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitChannelEvents(
+fun BehaviourContext.waitChannelEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChannelEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitPrivateEvents(
+fun BehaviourContext.waitPrivateEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<PrivateEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatEvents(
+fun BehaviourContext.waitChatEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChatEvent>(initRequest, errorFactory)
 
 
-suspend fun BehaviourContext.waitVideoChatEvents(
+fun BehaviourContext.waitVideoChatEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<VideoChatEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoChatStartedEvents(
+fun BehaviourContext.waitVideoChatStartedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<VideoChatStarted>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoChatEndedEvents(
+fun BehaviourContext.waitVideoChatEndedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<VideoChatEnded>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoChatParticipantsInvitedEvents(
+fun BehaviourContext.waitVideoChatParticipantsInvitedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<VideoChatParticipantsInvited>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitMessageAutoDeleteTimerChangedEvents(
+fun BehaviourContext.waitMessageAutoDeleteTimerChangedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<MessageAutoDeleteTimerChanged>(initRequest, errorFactory)
 
 
-suspend fun BehaviourContext.waitPublicChatEvents(
+fun BehaviourContext.waitPublicChatEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<PublicChatEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitCommonEvents(
+fun BehaviourContext.waitCommonEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<CommonEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitGroupEvents(
+fun BehaviourContext.waitGroupEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GroupEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitSupergroupEvents(
+fun BehaviourContext.waitSupergroupEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<SupergroupEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChannelChatCreatedEvents(
+fun BehaviourContext.waitChannelChatCreatedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChannelChatCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitDeleteChatPhotoEvents(
+fun BehaviourContext.waitDeleteChatPhotoEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<DeleteChatPhoto>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGroupChatCreatedEvents(
+fun BehaviourContext.waitGroupChatCreatedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GroupChatCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitLeftChatMemberEvents(
+fun BehaviourContext.waitLeftChatMemberEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<LeftChatMemberEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitNewChatPhotoEvents(
+fun BehaviourContext.waitNewChatPhotoEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<NewChatPhoto>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitNewChatMembersEvents(
+fun BehaviourContext.waitNewChatMembersEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<NewChatMembers>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitNewChatTitleEvents(
+fun BehaviourContext.waitNewChatTitleEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<NewChatTitle>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitPinnedMessageEvents(
+fun BehaviourContext.waitPinnedMessageEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<PinnedMessage>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitProximityAlertTriggeredEvents(
+fun BehaviourContext.waitProximityAlertTriggeredEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ProximityAlertTriggered>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitSupergroupChatCreatedEvents(
+fun BehaviourContext.waitSupergroupChatCreatedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<SupergroupChatCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitSuccessfulPaymentEvents(
+fun BehaviourContext.waitSuccessfulPaymentEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<SuccessfulPaymentEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitRefundedPaymentEvents(
+fun BehaviourContext.waitRefundedPaymentEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<RefundedPaymentEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitUserLoggedInEvents(
+fun BehaviourContext.waitUserLoggedInEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<UserLoggedIn>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWebAppDataEvents(
+fun BehaviourContext.waitWebAppDataEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WebAppData>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicClosed(
+fun BehaviourContext.waitForumTopicClosed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ForumTopicClosed>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicCreated(
+fun BehaviourContext.waitForumTopicCreated(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ForumTopicCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicReopened(
+fun BehaviourContext.waitForumTopicReopened(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ForumTopicReopened>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicEdited(
+fun BehaviourContext.waitForumTopicEdited(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ForumTopicEdited>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGeneralForumTopicHidden(
+fun BehaviourContext.waitGeneralForumTopicHidden(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GeneralForumTopicHidden>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGeneralForumTopicUnhidden(
+fun BehaviourContext.waitGeneralForumTopicUnhidden(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GeneralForumTopicUnhidden>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowed(
+fun BehaviourContext.waitWriteAccessAllowed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WriteAccessAllowed>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowedFromRequest(
+fun BehaviourContext.waitWriteAccessAllowedFromRequest(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WriteAccessAllowed.FromRequest>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitWriteAccessAllowedFromAttachmentMenu(
+fun BehaviourContext.waitWriteAccessAllowedFromAttachmentMenu(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WriteAccessAllowed.FromAttachmentMenu>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitWriteAccessAllowedFromWebAppLink(
+fun BehaviourContext.waitWriteAccessAllowedFromWebAppLink(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WriteAccessAllowed.FromWebAppLink>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitWriteAccessAllowedOther(
+fun BehaviourContext.waitWriteAccessAllowedOther(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WriteAccessAllowed.Other>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatSharedRequest(
+fun BehaviourContext.waitChatSharedRequest(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChatSharedRequest>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitUsersShared(
+fun BehaviourContext.waitUsersShared(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<UsersShared>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitUserShared(
+fun BehaviourContext.waitUserShared(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitUsersShared(initRequest, errorFactory).filter { it.userIds.size == 1 }
 
-suspend fun BehaviourContext.waitChatShared(
+fun BehaviourContext.waitChatShared(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChatShared>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatBoostAdded(
+fun BehaviourContext.waitChatBoostAdded(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChatBoostAdded>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatBackgroundSet(
+fun BehaviourContext.waitChatBackgroundSet(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<ChatBackground>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitGiveawayCreated(
+fun BehaviourContext.waitGiveawayCreated(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GiveawayCreated>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitGiveawayCompleted(
+fun BehaviourContext.waitGiveawayCompleted(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GiveawayPrivateResults>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitGiveawayCompletedWithPrivateWinners(
+fun BehaviourContext.waitGiveawayCompletedWithPrivateWinners(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitGiveawayCompleted(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitPaidMessagePriceChanged(
+fun BehaviourContext.waitPaidMessagePriceChanged(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<PaidMessagePriceChanged>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitRegularGiftSentOrReceived(
+fun BehaviourContext.waitRegularGiftSentOrReceived(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GiftSentOrReceived.Regular>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitUniqueGiftSentOrReceived(
+fun BehaviourContext.waitUniqueGiftSentOrReceived(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<GiftSentOrReceived.Unique>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventActionMessages.kt

@@ -30,7 +30,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : ChatEvent> BehaviourContext.waitEventsMessages(
+inline fun <reified O : ChatEvent> BehaviourContext.waitEventsMessages(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<ChatEventMessage<O>> = expectFlow(
@@ -40,204 +40,204 @@ suspend inline fun <reified O : ChatEvent> BehaviourContext.waitEventsMessages(
     it.baseSentMessageUpdateOrNull() ?.data ?.chatEventMessageOrNull() ?.withEvent<O>().let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitChannelEventsMessages(
+fun BehaviourContext.waitChannelEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChannelEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitPrivateEventsMessages(
+fun BehaviourContext.waitPrivateEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<PrivateEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatEventsMessages(
+fun BehaviourContext.waitChatEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChatEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitVideoChatEventsMessages(
+fun BehaviourContext.waitVideoChatEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<VideoChatEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoChatStartedEventsMessages(
+fun BehaviourContext.waitVideoChatStartedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<VideoChatStarted>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoChatEndedEventsMessages(
+fun BehaviourContext.waitVideoChatEndedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<VideoChatEnded>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoChatParticipantsInvitedEventsMessages(
+fun BehaviourContext.waitVideoChatParticipantsInvitedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<VideoChatParticipantsInvited>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitMessageAutoDeleteTimerChangedEventsMessages(
+fun BehaviourContext.waitMessageAutoDeleteTimerChangedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<MessageAutoDeleteTimerChanged>(initRequest, errorFactory)
 
 
-suspend fun BehaviourContext.waitPublicChatEventsMessages(
+fun BehaviourContext.waitPublicChatEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<PublicChatEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitCommonEventsMessages(
+fun BehaviourContext.waitCommonEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<CommonEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitGroupEventsMessages(
+fun BehaviourContext.waitGroupEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<GroupEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitSupergroupEventsMessages(
+fun BehaviourContext.waitSupergroupEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<SupergroupEvent>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChannelChatCreatedEventsMessages(
+fun BehaviourContext.waitChannelChatCreatedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChannelChatCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitDeleteChatPhotoEventsMessages(
+fun BehaviourContext.waitDeleteChatPhotoEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<DeleteChatPhoto>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGroupChatCreatedEventsMessages(
+fun BehaviourContext.waitGroupChatCreatedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<GroupChatCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitLeftChatMemberEventsMessages(
+fun BehaviourContext.waitLeftChatMemberEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<LeftChatMemberEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitNewChatPhotoEventsMessages(
+fun BehaviourContext.waitNewChatPhotoEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<NewChatPhoto>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitNewChatMembersEventsMessages(
+fun BehaviourContext.waitNewChatMembersEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<NewChatMembers>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitNewChatTitleEventsMessages(
+fun BehaviourContext.waitNewChatTitleEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<NewChatTitle>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitPinnedMessageEventsMessages(
+fun BehaviourContext.waitPinnedMessageEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<PinnedMessage>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitProximityAlertTriggeredEventsMessages(
+fun BehaviourContext.waitProximityAlertTriggeredEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ProximityAlertTriggered>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitSupergroupChatCreatedEventsMessages(
+fun BehaviourContext.waitSupergroupChatCreatedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<SupergroupChatCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitSuccessfulPaymentEventsMessages(
+fun BehaviourContext.waitSuccessfulPaymentEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<SuccessfulPaymentEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitRefundedPaymentEventsMessages(
+fun BehaviourContext.waitRefundedPaymentEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<RefundedPaymentEvent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitUserLoggedInEventsMessages(
+fun BehaviourContext.waitUserLoggedInEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<UserLoggedIn>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWebAppDataEventsMessages(
+fun BehaviourContext.waitWebAppDataEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WebAppData>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicClosedEventsMessages(
+fun BehaviourContext.waitForumTopicClosedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ForumTopicClosed>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicCreatedEventsMessages(
+fun BehaviourContext.waitForumTopicCreatedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ForumTopicCreated>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicReopenedEventsMessages(
+fun BehaviourContext.waitForumTopicReopenedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ForumTopicReopened>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitForumTopicEditedEventsMessages(
+fun BehaviourContext.waitForumTopicEditedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ForumTopicEdited>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGeneralForumTopicHiddenEventsMessages(
+fun BehaviourContext.waitGeneralForumTopicHiddenEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<GeneralForumTopicHidden>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitGeneralForumTopicUnhiddenEventsMessages(
+fun BehaviourContext.waitGeneralForumTopicUnhiddenEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<GeneralForumTopicUnhidden>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowedEventsMessages(
+fun BehaviourContext.waitWriteAccessAllowedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WriteAccessAllowed>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowedFromRequestEventsMessages(
+fun BehaviourContext.waitWriteAccessAllowedFromRequestEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WriteAccessAllowed.FromRequest>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowedFromAttachmentMenuEventsMessages(
+fun BehaviourContext.waitWriteAccessAllowedFromAttachmentMenuEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WriteAccessAllowed.FromAttachmentMenu>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowedFromWebAppLinkEventsMessages(
+fun BehaviourContext.waitWriteAccessAllowedFromWebAppLinkEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WriteAccessAllowed.FromWebAppLink>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitWriteAccessAllowedOtherEventsMessages(
+fun BehaviourContext.waitWriteAccessAllowedOtherEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WriteAccessAllowed.Other>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatSharedRequestEventsMessages(
+fun BehaviourContext.waitChatSharedRequestEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChatSharedRequest>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitUsersSharedEventsMessages(
+fun BehaviourContext.waitUsersSharedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<UsersShared>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitUserSharedEventsMessages(
+fun BehaviourContext.waitUserSharedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitUsersSharedEventsMessages(initRequest, errorFactory).filter { it.chatEvent.userIds.size == 1 }
 
-suspend fun BehaviourContext.waitChatSharedEventsMessages(
+fun BehaviourContext.waitChatSharedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChatShared>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatBoostAddedEventsMessages(
+fun BehaviourContext.waitChatBoostAddedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChatBoostAdded>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitChatBackgroundSetEventsMessages(
+fun BehaviourContext.waitChatBackgroundSetEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<ChatBackground>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitPaidMessagePriceChangedMessages(
+fun BehaviourContext.waitPaidMessagePriceChangedMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<PaidMessagePriceChanged>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitRegularGiftSentOrReceivedMessages(
+fun BehaviourContext.waitRegularGiftSentOrReceivedMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<GiftSentOrReceived.Regular>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitUniqueGiftSentOrReceivedMessages(
+fun BehaviourContext.waitUniqueGiftSentOrReceivedMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<GiftSentOrReceived.Unique>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 typealias InlineQueryMapper<T> = suspend T.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : InlineQuery> BehaviourContext.waitInlineQueries(
+inline fun <reified O : InlineQuery> BehaviourContext.waitInlineQueries(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -21,16 +21,16 @@ suspend inline fun <reified O : InlineQuery> BehaviourContext.waitInlineQueries(
     (it.inlineQueryUpdateOrNull() ?.data as? O).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitAnyInlineQuery(
+fun BehaviourContext.waitAnyInlineQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitInlineQueries<InlineQuery>(initRequest, errorFactory)
 
-suspend fun BehaviourContext.waitBaseInlineQuery(
+fun BehaviourContext.waitBaseInlineQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitInlineQueries<BaseInlineQuery>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitLocationInlineQuery(
+fun BehaviourContext.waitLocationInlineQuery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitInlineQueries<LocationInlineQuery>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.flow.Flow
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified T : MediaGroupPartContent> BehaviourContext.buildMediaGroupWaiter(
+inline fun <reified T : MediaGroupPartContent> BehaviourContext.buildMediaGroupWaiter(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<MediaGroupContent<T>> = flowsUpdatesFilter.expectFlow(bot, initRequest, errorFactory) { update ->
@@ -25,27 +25,27 @@ suspend inline fun <reified T : MediaGroupPartContent> BehaviourContext.buildMed
     } ?: emptyList()
 }
 
-suspend fun BehaviourContext.waitMediaGroup(
+fun BehaviourContext.waitMediaGroup(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupWaiter<MediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitPlaylist(
+fun BehaviourContext.waitPlaylist(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupWaiter<AudioMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitDocumentsGroup(
+fun BehaviourContext.waitDocumentsGroup(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupWaiter<DocumentMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVisualGallery(
+fun BehaviourContext.waitVisualGallery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupWaiter<VisualMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitPhotoGallery(
+fun BehaviourContext.waitPhotoGallery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupWaiter<PhotoContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoGallery(
+fun BehaviourContext.waitVideoGallery(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupWaiter<VideoContent>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroupMessages.kt

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.flow.Flow
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified T : MediaGroupPartContent> BehaviourContext.buildMediaGroupMessagesWaiter(
+inline fun <reified T : MediaGroupPartContent> BehaviourContext.buildMediaGroupMessagesWaiter(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<MediaGroupMessage<T>> = flowsUpdatesFilter.expectFlow(bot, initRequest, errorFactory) { update ->
@@ -25,27 +25,27 @@ suspend inline fun <reified T : MediaGroupPartContent> BehaviourContext.buildMed
     } ?: emptyList()
 }
 
-suspend fun BehaviourContext.waitMediaGroupMessages(
+fun BehaviourContext.waitMediaGroupMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupMessagesWaiter<MediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitPlaylistMessages(
+fun BehaviourContext.waitPlaylistMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupMessagesWaiter<AudioMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitDocumentsGroupMessages(
+fun BehaviourContext.waitDocumentsGroupMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupMessagesWaiter<DocumentMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVisualGalleryMessages(
+fun BehaviourContext.waitVisualGalleryMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupMessagesWaiter<VisualMediaGroupPartContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitPhotoGalleryMessages(
+fun BehaviourContext.waitPhotoGalleryMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupMessagesWaiter<PhotoContent>(initRequest, errorFactory)
-suspend fun BehaviourContext.waitVideoGalleryMessages(
+fun BehaviourContext.waitVideoGalleryMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = buildMediaGroupMessagesWaiter<VideoContent>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMention.kt

@@ -74,7 +74,7 @@ fun Flow<TextedContent>.filterMentions(user: User) = filter {
  * @see filterMentions
  * @see filterTextMentions
  */
-suspend fun BehaviourContext.waitContentWithMentions (
+fun BehaviourContext.waitContentWithMentions (
     username: Username,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
@@ -87,7 +87,7 @@ suspend fun BehaviourContext.waitContentWithMentions (
  * @see filterMentions
  * @see dev.inmo.tgbotapi.types.message.textsources.TextMentionTextSource
  */
-suspend fun BehaviourContext.waitContentWithTextMentions (
+fun BehaviourContext.waitContentWithTextMentions (
     userId: UserId,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
@@ -100,7 +100,7 @@ suspend fun BehaviourContext.waitContentWithTextMentions (
  * @see filterMentions
  * @see filterTextMentions
  */
-suspend fun BehaviourContext.waitContentWithMentions (
+fun BehaviourContext.waitContentWithMentions (
     user: User,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMentionMessage.kt

@@ -49,7 +49,7 @@ fun Flow<CommonMessage<TextedContent>>.filterMentionsMessages(user: User) = filt
  * @see filterMentions
  * @see filterTextMentions
  */
-suspend fun BehaviourContext.waitContentMessageWithMentions (
+fun BehaviourContext.waitContentMessageWithMentions (
     username: Username,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
@@ -62,7 +62,7 @@ suspend fun BehaviourContext.waitContentMessageWithMentions (
  * @see filterMentions
  * @see dev.inmo.tgbotapi.types.message.textsources.TextMentionTextSource
  */
-suspend fun BehaviourContext.waitContentMessageWithTextMentions (
+fun BehaviourContext.waitContentMessageWithTextMentions (
     userId: UserId,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
@@ -75,7 +75,7 @@ suspend fun BehaviourContext.waitContentMessageWithTextMentions (
  * @see filterMentions
  * @see filterTextMentions
  */
-suspend fun BehaviourContext.waitContentMessageWithMentions (
+fun BehaviourContext.waitContentMessageWithMentions (
     user: User,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPaidMediaPurchased.kt

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.types.business_connection.BusinessConnection
 import dev.inmo.tgbotapi.types.message.payments.PaidMediaPurchased
 import kotlinx.coroutines.flow.Flow
 
-suspend fun BehaviourContext.waitPaidMediaPurchased(
+fun BehaviourContext.waitPaidMediaPurchased(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<PaidMediaPurchased> = expectFlow(
@@ -21,7 +21,7 @@ suspend fun BehaviourContext.waitPaidMediaPurchased(
     (it.paidMediaPurchasedUpdateOrNull() ?.data).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitPaidMediaPurchased(
+fun BehaviourContext.waitPaidMediaPurchased(
     paidMediaPayloadRegex: Regex,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
@@ -32,7 +32,7 @@ suspend fun BehaviourContext.waitPaidMediaPurchased(
     (it.paidMediaPurchasedUpdateOrNull() ?.data ?.takeIf { paidMediaPayloadRegex.matches(it.payload.string) }).let(::listOfNotNull)
 }
 
-suspend fun BehaviourContext.waitPaidMediaPurchased(
+fun BehaviourContext.waitPaidMediaPurchased(
     paidMediaPayload: PaidMediaPayload,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPassportData.kt

@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.Flow
 typealias PassportMessageMapper = suspend PassportMessage.() -> PassportData
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : EncryptedPassportElement> BehaviourContext.waitPassportMessagesWith(
+inline fun <reified O : EncryptedPassportElement> BehaviourContext.waitPassportMessagesWith(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -24,7 +24,7 @@ suspend inline fun <reified O : EncryptedPassportElement> BehaviourContext.waitP
     it.messageUpdateOrNull() ?.data ?.passportMessageOrNull() ?.passportData ?.data ?.filterIsInstance<O>() ?: emptyList()
 }
 
-suspend fun BehaviourContext.waitAnyPassportMessages(
+fun BehaviourContext.waitAnyPassportMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitPassportMessagesWith<EncryptedPassportElement>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollAnswers.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 
 typealias PollAnswerMapper = suspend PollAnswer.() -> PollAnswer?
 
-suspend fun BehaviourContext.waitPollAnswers(
+fun BehaviourContext.waitPollAnswers(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<PollAnswer> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollUpdates.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 typealias PollMapper<T> = suspend T.() -> T?
 
 @RiskFeature(lowLevelRiskFeatureMessage)
-suspend inline fun <reified O : Poll> BehaviourContext.waitPolls(
+inline fun <reified O : Poll> BehaviourContext.waitPolls(
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<O> = expectFlow(
@@ -24,7 +24,7 @@ suspend inline fun <reified O : Poll> BehaviourContext.waitPolls(
 /**
  * This wait will be triggered only for stopped polls and polls, which are sent by the bot
  */
-suspend fun BehaviourContext.waitPollUpdates(
+fun BehaviourContext.waitPollUpdates(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitPolls<Poll>(initRequest, errorFactory)
@@ -32,7 +32,7 @@ suspend fun BehaviourContext.waitPollUpdates(
 /**
  * This wait will be triggered only for stopped polls and polls, which are sent by the bot
  */
-suspend fun BehaviourContext.waitQuizPollUpdates(
+fun BehaviourContext.waitQuizPollUpdates(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitPolls<QuizPoll>(initRequest, errorFactory)
@@ -40,7 +40,7 @@ suspend fun BehaviourContext.waitQuizPollUpdates(
 /**
  * This wait will be triggered only for stopped polls and polls, which are sent by the bot
  */
-suspend fun BehaviourContext.waitRegularPollUpdates(
+fun BehaviourContext.waitRegularPollUpdates(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitPolls<RegularPoll>(initRequest, errorFactory)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPreCheckoutQuery.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 
 typealias PreCheckoutQueryMapper = suspend PreCheckoutQuery.() -> PreCheckoutQuery?
 
-suspend fun BehaviourContext.waitPreCheckoutQueries(
+fun BehaviourContext.waitPreCheckoutQueries(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<PreCheckoutQuery> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitShippingQuery.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 
 typealias ShippingQueryMapper = suspend ShippingQuery.() -> ShippingQuery?
 
-suspend fun BehaviourContext.waitShippingQueries(
+fun BehaviourContext.waitShippingQueries(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ): Flow<ShippingQuery> = expectFlow(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/BusinessConnectionTriggers.kt

@@ -25,7 +25,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onBusinessConnection(
+fun <BC : BehaviourContext> BC.onBusinessConnection(
     initialFilter: SimpleFilter<BusinessConnection>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BusinessConnection, Update>? = null,
     markerFactory: MarkerFactory<in BusinessConnection, Any>? = ByUserBusinessConnectionUpdatedMarkerFactory,
@@ -48,7 +48,7 @@ suspend fun <BC : BehaviourContext> BC.onBusinessConnection(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onBusinessConnectionEnabled(
+fun <BC : BehaviourContext> BC.onBusinessConnectionEnabled(
     initialFilter: SimpleFilter<BusinessConnection.Enabled>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BusinessConnection.Enabled, Update>? = null,
     markerFactory: MarkerFactory<in BusinessConnection.Enabled, Any>? = ByUserBusinessConnectionUpdatedMarkerFactory,
@@ -70,7 +70,7 @@ suspend fun <BC : BehaviourContext> BC.onBusinessConnectionEnabled(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onBusinessConnectionDisabled(
+fun <BC : BehaviourContext> BC.onBusinessConnectionDisabled(
     initialFilter: SimpleFilter<BusinessConnection.Disabled>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BusinessConnection.Disabled, Update>? = null,
     markerFactory: MarkerFactory<in BusinessConnection.Disabled, Any>? = ByUserBusinessConnectionUpdatedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt

@@ -15,7 +15,7 @@ import dev.inmo.tgbotapi.types.queries.callback.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import kotlinx.coroutines.Job
 
-internal suspend inline fun <BC : BehaviourContext, reified T : CallbackQuery> BC.onCallbackQuery(
+internal inline fun <BC : BehaviourContext, reified T : CallbackQuery> BC.onCallbackQuery(
     initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in T, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -38,32 +38,33 @@ internal suspend inline fun <BC : BehaviourContext, reified T : CallbackQuery> B
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-internal suspend inline fun <BC : BehaviourContext, reified T : DataCallbackQuery> BC.onDataCallbackQueryCounted(
+internal inline fun <BC : BehaviourContext, reified T : DataCallbackQuery> BC.onDataCallbackQueryCounted(
     initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in T, Any>? = ByUserCallbackQueryMarkerFactory,
     noinline additionalSubcontextInitialAction: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, Update, T>? = null,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
-): Job {
+): Job = launchInNewSubContext {
     val newInitialFilter = SimpleFilter<DataCallbackQuery> {
-        it is T && initialFilter ?.invoke(it) ?: true
-    }::invoke
-    return runCatchingSafely {
-        onCallbackQuery (
-            initialFilter,
+        it is T && (initialFilter ?.invoke(it) ?: true)
+    }
+    val newInitialFilterInvoke = newInitialFilter::invoke
+    runCatching {
+        this@launchInNewSubContext.onCallbackQuery(
+            newInitialFilter,
             subcontextUpdatesFilter,
             markerFactory,
             additionalSubcontextInitialAction,
             scenarioReceiver
         )
     }.onFailure {
-        triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilter)
+        this@launchInNewSubContext.triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilterInvoke)
     }.onSuccess {
-        triggersHolder.handleableCallbackQueriesDataHolder.registerHandleable(newInitialFilter)
+        this@launchInNewSubContext.triggersHolder.handleableCallbackQueriesDataHolder.registerHandleable(newInitialFilterInvoke)
         it.invokeOnCompletion {
             runCatching {
                 launchSafelyWithoutExceptions {
-                    triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilter)
+                    this@launchInNewSubContext.triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilterInvoke)
                 }
             }
         }
@@ -83,13 +84,13 @@ internal suspend inline fun <BC : BehaviourContext, reified T : DataCallbackQuer
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onDataCallbackQuery(
     initialFilter: SimpleFilter<DataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in DataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
     additionalSubcontextInitialAction: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, Update, DataCallbackQuery>? = null,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
-) = onDataCallbackQueryCounted(
+): Job = onDataCallbackQueryCounted(
     initialFilter,
     subcontextUpdatesFilter,
     markerFactory,
@@ -112,7 +113,7 @@ suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onDataCallbackQuery(
     dataRegex: Regex,
     initialFilter: SimpleFilter<DataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
@@ -143,7 +144,7 @@ suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onDataCallbackQuery(
     data: String,
     initialFilter: SimpleFilter<DataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
@@ -172,7 +173,7 @@ suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGameShortNameCallbackQuery(
+fun <BC : BehaviourContext> BC.onGameShortNameCallbackQuery(
     initialFilter: SimpleFilter<GameShortNameCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameShortNameCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in GameShortNameCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -199,7 +200,7 @@ suspend fun <BC : BehaviourContext> BC.onGameShortNameCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdCallbackQuery(
+fun <BC : BehaviourContext> BC.onInlineMessageIdCallbackQuery(
     initialFilter: SimpleFilter<InlineMessageIdCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in InlineMessageIdCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -226,7 +227,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
     initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -255,7 +256,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
     dataRegex: Regex,
     initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
@@ -286,7 +287,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
     data: String,
     initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
@@ -315,7 +316,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdGameShortNameCallbackQuery(
+fun <BC : BehaviourContext> BC.onInlineMessageIdGameShortNameCallbackQuery(
     initialFilter: SimpleFilter<InlineMessageIdGameShortNameCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdGameShortNameCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in InlineMessageIdGameShortNameCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -342,7 +343,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdGameShortNameCallbackQue
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMessageCallbackQuery(
+fun <BC : BehaviourContext> BC.onMessageCallbackQuery(
     initialFilter: SimpleFilter<MessageCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in MessageCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -369,7 +370,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
     initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -398,7 +399,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
     dataRegex: Regex,
     initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
@@ -429,7 +430,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
     data: String,
     initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
@@ -458,7 +459,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMessageGameShortNameCallbackQuery(
+fun <BC : BehaviourContext> BC.onMessageGameShortNameCallbackQuery(
     initialFilter: SimpleFilter<MessageGameShortNameCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageGameShortNameCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in MessageGameShortNameCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -485,7 +486,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageGameShortNameCallbackQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onUnknownCallbackQueryType(
+fun <BC : BehaviourContext> BC.onUnknownCallbackQueryType(
     initialFilter: SimpleFilter<UnknownCallbackQueryType>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, UnknownCallbackQueryType, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in UnknownCallbackQueryType, Any>? = ByUserCallbackQueryMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggersUnhandled.kt

@@ -25,7 +25,7 @@ import dev.inmo.tgbotapi.utils.PreviewFeature
  * data
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.onUnhandledDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onUnhandledDataCallbackQuery(
     initialFilter: SimpleFilter<DataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in DataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -53,7 +53,7 @@ suspend fun <BC : BehaviourContext> BC.onUnhandledDataCallbackQuery(
  * data
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.onUnhandledInlineMessageIdDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onUnhandledInlineMessageIdDataCallbackQuery(
     initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
@@ -81,7 +81,7 @@ suspend fun <BC : BehaviourContext> BC.onUnhandledInlineMessageIdDataCallbackQue
  * data
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.onUnhandledMessageDataCallbackQuery(
+fun <BC : BehaviourContext> BC.onUnhandledMessageDataCallbackQuery(
     initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatBoostRemovedTriggers.kt

@@ -25,7 +25,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatBoostRemoved(
+fun <BC : BehaviourContext> BC.onChatBoostRemoved(
     initialFilter: SimpleFilter<ChatBoostRemoved>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatBoostRemoved, Update>? = null,
     markerFactory: MarkerFactory<ChatBoostRemoved, Any>? = ByIdChatBoostRemovedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatBoostUpdatedTriggers.kt

@@ -25,7 +25,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatBoostUpdated(
+fun <BC : BehaviourContext> BC.onChatBoostUpdated(
     initialFilter: SimpleFilter<ChatBoostUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatBoostUpdated, Update>? = null,
     markerFactory: MarkerFactory<ChatBoostUpdated, Any>? = ByIdChatBoostUpdatedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatJoinRequestTriggers.kt

@@ -23,7 +23,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatJoinRequest(
+fun <BC : BehaviourContext> BC.onChatJoinRequest(
     initialFilter: SimpleFilter<ChatJoinRequest>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatJoinRequest, Update>? = null,
     markerFactory: MarkerFactory<in ChatJoinRequest, Any>? = ByChatChatJoinRequestMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMemberUpdatedTriggers.kt

@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.types.update.MyChatMemberUpdatedUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified U : ChatMemberUpdatedUpdate> BC.onChatMemberUpdatedInternal(
+internal inline fun <BC : BehaviourContext, reified U : ChatMemberUpdatedUpdate> BC.onChatMemberUpdatedInternal(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -37,7 +37,7 @@ internal suspend inline fun <BC : BehaviourContext, reified U : ChatMemberUpdate
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberUpdated(
+fun <BC : BehaviourContext> BC.onChatMemberUpdated(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -64,7 +64,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberUpdated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberUpdated(
+fun <BC : BehaviourContext> BC.onCommonChatMemberUpdated(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -91,7 +91,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberUpdated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberUpdated(
+fun <BC : BehaviourContext> BC.onMyChatMemberUpdated(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -118,7 +118,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberUpdated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberJoined(
+fun <BC : BehaviourContext> BC.onChatMemberJoined(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -145,7 +145,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberJoined(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberLeft(
+fun <BC : BehaviourContext> BC.onChatMemberLeft(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -172,7 +172,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberLeft(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberSubscribed(
+fun <BC : BehaviourContext> BC.onChatMemberSubscribed(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -199,7 +199,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberSubscribed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberSubscriptionChanged(
+fun <BC : BehaviourContext> BC.onChatMemberSubscriptionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -226,7 +226,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberSubscriptionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberUnsubscribed(
+fun <BC : BehaviourContext> BC.onChatMemberUnsubscribed(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -253,7 +253,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberUnsubscribed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberGotPromoted(
+fun <BC : BehaviourContext> BC.onChatMemberGotPromoted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -280,7 +280,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberGotPromoted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberGotPromotionChanged(
+fun <BC : BehaviourContext> BC.onChatMemberGotPromotionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -307,7 +307,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberGotPromotionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberGotDemoted(
+fun <BC : BehaviourContext> BC.onChatMemberGotDemoted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -334,7 +334,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberGotDemoted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberBecameOwner(
+fun <BC : BehaviourContext> BC.onChatMemberBecameOwner(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -361,7 +361,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberBecameOwner(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberCeasedOwnership(
+fun <BC : BehaviourContext> BC.onChatMemberCeasedOwnership(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -388,7 +388,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberCeasedOwnership(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberGotRestricted(
+fun <BC : BehaviourContext> BC.onChatMemberGotRestricted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -415,7 +415,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberGotRestricted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberGotRestrictionChanged(
+fun <BC : BehaviourContext> BC.onChatMemberGotRestrictionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -442,7 +442,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberGotRestrictionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberGotUnrestricted(
+fun <BC : BehaviourContext> BC.onChatMemberGotUnrestricted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -469,7 +469,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberGotUnrestricted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMemberKicked(
+fun <BC : BehaviourContext> BC.onChatMemberKicked(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -496,7 +496,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMemberKicked(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberJoined(
+fun <BC : BehaviourContext> BC.onCommonChatMemberJoined(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -523,7 +523,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberJoined(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberLeft(
+fun <BC : BehaviourContext> BC.onCommonChatMemberLeft(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -550,7 +550,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberLeft(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberSubscribed(
+fun <BC : BehaviourContext> BC.onCommonChatMemberSubscribed(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -577,7 +577,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberSubscribed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberSubscriptionChanged(
+fun <BC : BehaviourContext> BC.onCommonChatMemberSubscriptionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -604,7 +604,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberSubscriptionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberUnsubscribed(
+fun <BC : BehaviourContext> BC.onCommonChatMemberUnsubscribed(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -631,7 +631,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberUnsubscribed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotPromoted(
+fun <BC : BehaviourContext> BC.onCommonChatMemberGotPromoted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -658,7 +658,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotPromoted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotPromotionChanged(
+fun <BC : BehaviourContext> BC.onCommonChatMemberGotPromotionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -685,7 +685,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotPromotionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotDemoted(
+fun <BC : BehaviourContext> BC.onCommonChatMemberGotDemoted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -712,7 +712,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotDemoted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberBecameOwner(
+fun <BC : BehaviourContext> BC.onCommonChatMemberBecameOwner(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -739,7 +739,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberBecameOwner(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberCeasedOwnership(
+fun <BC : BehaviourContext> BC.onCommonChatMemberCeasedOwnership(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -766,7 +766,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberCeasedOwnership(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotRestricted(
+fun <BC : BehaviourContext> BC.onCommonChatMemberGotRestricted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -793,7 +793,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotRestricted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotRestrictionChanged(
+fun <BC : BehaviourContext> BC.onCommonChatMemberGotRestrictionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -820,7 +820,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotRestrictionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotUnrestricted(
+fun <BC : BehaviourContext> BC.onCommonChatMemberGotUnrestricted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -847,7 +847,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberGotUnrestricted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonChatMemberKicked(
+fun <BC : BehaviourContext> BC.onCommonChatMemberKicked(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -874,7 +874,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonChatMemberKicked(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberJoined(
+fun <BC : BehaviourContext> BC.onMyChatMemberJoined(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -901,7 +901,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberJoined(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberLeft(
+fun <BC : BehaviourContext> BC.onMyChatMemberLeft(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -928,7 +928,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberLeft(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberSubscribed(
+fun <BC : BehaviourContext> BC.onMyChatMemberSubscribed(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -955,7 +955,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberSubscribed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberSubscriptionChanged(
+fun <BC : BehaviourContext> BC.onMyChatMemberSubscriptionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -982,7 +982,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberSubscriptionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberUnsubscribed(
+fun <BC : BehaviourContext> BC.onMyChatMemberUnsubscribed(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1009,7 +1009,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberUnsubscribed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotPromoted(
+fun <BC : BehaviourContext> BC.onMyChatMemberGotPromoted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1036,7 +1036,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotPromoted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotPromotionChanged(
+fun <BC : BehaviourContext> BC.onMyChatMemberGotPromotionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1063,7 +1063,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotPromotionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotDemoted(
+fun <BC : BehaviourContext> BC.onMyChatMemberGotDemoted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1090,7 +1090,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotDemoted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberBecameOwner(
+fun <BC : BehaviourContext> BC.onMyChatMemberBecameOwner(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1117,7 +1117,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberBecameOwner(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberCeasedOwnership(
+fun <BC : BehaviourContext> BC.onMyChatMemberCeasedOwnership(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1144,7 +1144,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberCeasedOwnership(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotRestricted(
+fun <BC : BehaviourContext> BC.onMyChatMemberGotRestricted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1171,7 +1171,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotRestricted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotRestrictionChanged(
+fun <BC : BehaviourContext> BC.onMyChatMemberGotRestrictionChanged(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1198,7 +1198,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotRestrictionChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotUnrestricted(
+fun <BC : BehaviourContext> BC.onMyChatMemberGotUnrestricted(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,
@@ -1225,7 +1225,7 @@ suspend fun <BC : BehaviourContext> BC.onMyChatMemberGotUnrestricted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMyChatMemberKicked(
+fun <BC : BehaviourContext> BC.onMyChatMemberKicked(
     initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any>? = ByChatChatMemberUpdatedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMessageReactionCountUpdatedUpdatesTriggers.kt

@@ -29,7 +29,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMessageReactionsCountUpdated(
+fun <BC : BehaviourContext> BC.onChatMessageReactionsCountUpdated(
     initialFilter: SimpleFilter<ChatMessageReactionsCountUpdated>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMessageReactionsCountUpdated, Update>? = null,
     markerFactory: MarkerFactory<ChatMessageReactionsCountUpdated, Any>? = ByChatIdChatMessageReactionsCountUpdatedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatMessageReactionUpdatedUpdatesTriggers.kt

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.chat.ChatMessageReactionUpdated
 import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : ChatMessageReactionUpdated> BC.onChatMessageReactionUpdated(
+internal inline fun <BC : BehaviourContext, reified T : ChatMessageReactionUpdated> BC.onChatMessageReactionUpdated(
     initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
     markerFactory: MarkerFactory<in T, Any>? = ByChatIdChatMessageReactionUpdatedMarkerFactory,
@@ -35,7 +35,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : ChatMessageReact
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedByUser(
+fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedByUser(
     initialFilter: SimpleFilter<ChatMessageReactionUpdated.ByUser>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMessageReactionUpdated.ByUser, Update>? = null,
     markerFactory: MarkerFactory<in ChatMessageReactionUpdated.ByUser, Any>? = ByChatIdChatMessageReactionUpdatedMarkerFactory,
@@ -62,7 +62,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedByUser(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedByChat(
+fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedByChat(
     initialFilter: SimpleFilter<ChatMessageReactionUpdated.ByChat>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMessageReactionUpdated.ByChat, Update>? = null,
     markerFactory: MarkerFactory<in ChatMessageReactionUpdated.ByChat, Any>? = ByChatIdChatMessageReactionUpdatedMarkerFactory,
@@ -89,7 +89,7 @@ suspend fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedByChat(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedUnknown(
+fun <BC : BehaviourContext> BC.onChatMessageReactionUpdatedUnknown(
     initialFilter: SimpleFilter<ChatMessageReactionUpdated.Unknown>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMessageReactionUpdated.Unknown, Update>? = null,
     markerFactory: MarkerFactory<in ChatMessageReactionUpdated.Unknown, Any>? = ByChatIdChatMessageReactionUpdatedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChosenInlineResultTriggers.kt

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.extensions.utils.chosenInlineResultUpdateOrNull
 import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : ChosenInlineResult> BC.onChosenInlineResultBase(
+internal inline fun <BC : BehaviourContext, reified T : ChosenInlineResult> BC.onChosenInlineResultBase(
     initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
     markerFactory: MarkerFactory<in T, Any>? = ByUserIdChosenInlineResultMarkerFactory,
@@ -33,7 +33,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : ChosenInlineResu
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChosenInlineResult(
+fun <BC : BehaviourContext> BC.onChosenInlineResult(
     initialFilter: SimpleFilter<ChosenInlineResult>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChosenInlineResult, Update>? = null,
     markerFactory: MarkerFactory<in ChosenInlineResult, Any>? = ByUserIdChosenInlineResultMarkerFactory,
@@ -60,7 +60,7 @@ suspend fun <BC : BehaviourContext> BC.onChosenInlineResult(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onLocationChosenInlineResult(
+fun <BC : BehaviourContext> BC.onLocationChosenInlineResult(
     initialFilter: SimpleFilter<LocationChosenInlineResult>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationChosenInlineResult, Update>? = null,
     markerFactory: MarkerFactory<in LocationChosenInlineResult, Any>? = ByUserIdChosenInlineResultMarkerFactory,
@@ -87,7 +87,7 @@ suspend fun <BC : BehaviourContext> BC.onLocationChosenInlineResult(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onBaseChosenInlineResult(
+fun <BC : BehaviourContext> BC.onBaseChosenInlineResult(
     initialFilter: SimpleFilter<BaseChosenInlineResult>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BaseChosenInlineResult, Update>? = null,
     markerFactory: MarkerFactory<in BaseChosenInlineResult, Any>? = ByUserIdChosenInlineResultMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt

@@ -2,6 +2,8 @@
 
 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
 import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
@@ -19,8 +21,9 @@ import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.message.content.TextMessage
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.job
 
-internal suspend fun <BC : BehaviourContext> BC.commandUncounted(
+internal fun <BC : BehaviourContext> BC.commandUncounted(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -49,7 +52,7 @@ internal suspend fun <BC : BehaviourContext> BC.commandUncounted(
     scenarioReceiver
 )
 
-suspend fun <BC : BehaviourContext> BC.command(
+fun <BC : BehaviourContext> BC.command(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -57,35 +60,37 @@ suspend fun <BC : BehaviourContext> BC.command(
     markerFactory: MarkerFactory<in TextMessage, Any>? = ByChatMessageMarkerFactory,
     additionalSubcontextInitialAction: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, Update, TextMessage>? = null,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
-): Job = runCatchingSafely {
-    commandUncounted(
-        commandRegex,
-        requireOnlyCommandInMessage,
-        initialFilter,
-        subcontextUpdatesFilter,
-        markerFactory,
-        additionalSubcontextInitialAction,
-        scenarioReceiver
-    )
-}.onFailure {
-    triggersHolder.handleableCommandsHolder.unregisterHandleable(commandRegex)
-}.onSuccess {
-    triggersHolder.handleableCommandsHolder.registerHandleable(commandRegex)
-    it.invokeOnCompletion {
-        runCatching {
-            launchSafelyWithoutExceptions {
-                triggersHolder.handleableCommandsHolder.unregisterHandleable(commandRegex)
+): Job = launchInNewSubContext {
+    runCatching {
+       this@launchInNewSubContext.commandUncounted(
+            commandRegex,
+            requireOnlyCommandInMessage,
+            initialFilter,
+            subcontextUpdatesFilter,
+            markerFactory,
+            additionalSubcontextInitialAction,
+            scenarioReceiver
+        )
+    }.onFailure {
+        triggersHolder.handleableCommandsHolder.unregisterHandleable(commandRegex)
+    }.onSuccess {
+        triggersHolder.handleableCommandsHolder.registerHandleable(commandRegex)
+        it.invokeOnCompletion {
+            runCatching {
+                launchSafelyWithoutExceptions {
+                    triggersHolder.handleableCommandsHolder.unregisterHandleable(commandRegex)
+                }
             }
         }
-    }
-}.getOrThrow()
+    }.getOrThrow()
+}
 
 /**
  * @param [markerFactory] **Pass null to handle requests fully parallel**. Will be used to identify different "stream".
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.command(
+fun <BC : BehaviourContext> BC.command(
     command: String,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -100,7 +105,7 @@ suspend fun <BC : BehaviourContext> BC.command(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.command(
+fun <BC : BehaviourContext> BC.command(
     botCommand: BotCommand,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -115,7 +120,7 @@ suspend fun <BC : BehaviourContext> BC.command(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommand(
+fun <BC : BehaviourContext> BC.onCommand(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -130,7 +135,7 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommand(
+fun <BC : BehaviourContext> BC.onCommand(
     command: String,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -145,7 +150,7 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommand(
+fun <BC : BehaviourContext> BC.onCommand(
     botCommand: BotCommand,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -160,7 +165,7 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.commandWithArgs(
+fun <BC : BehaviourContext> BC.commandWithArgs(
     commandRegex: Regex,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -187,7 +192,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.commandWithArgs(
+fun <BC : BehaviourContext> BC.commandWithArgs(
     command: String,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -209,7 +214,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.commandWithArgs(
+fun <BC : BehaviourContext> BC.commandWithArgs(
     botCommand: BotCommand,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -231,7 +236,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
+fun <BC : BehaviourContext> BC.commandWithNamedArgs(
     commandRegex: Regex,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -259,7 +264,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
+fun <BC : BehaviourContext> BC.commandWithNamedArgs(
     command: String,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -283,7 +288,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
+fun <BC : BehaviourContext> BC.commandWithNamedArgs(
     botCommand: BotCommand,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -307,7 +312,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
+fun <BC : BehaviourContext> BC.onCommandWithArgs(
     commandRegex: Regex,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -329,7 +334,7 @@ suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
+fun <BC : BehaviourContext> BC.onCommandWithArgs(
     command: String,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -351,7 +356,7 @@ suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
+fun <BC : BehaviourContext> BC.onCommandWithArgs(
     botCommand: BotCommand,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -373,7 +378,7 @@ suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
+fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
     commandRegex: Regex,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -397,7 +402,7 @@ suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
+fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
     command: String,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -421,7 +426,7 @@ suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
+fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
     botCommand: BotCommand,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandlingUnhandled.kt

@@ -22,7 +22,7 @@ import kotlinx.coroutines.Job
  * "stream"
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.unhandledCommand(
+fun <BC : BehaviourContext> BC.unhandledCommand(
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -57,7 +57,7 @@ suspend fun <BC : BehaviourContext> BC.unhandledCommand(
  * "stream"
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.onUnhandledCommand(
+fun <BC : BehaviourContext> BC.onUnhandledCommand(
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
@@ -72,7 +72,7 @@ suspend fun <BC : BehaviourContext> BC.onUnhandledCommand(
  * "stream"
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
+fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any>? = ByChatMessageMarkerFactory,
@@ -96,7 +96,7 @@ suspend fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
  * "stream"
  */
 @PreviewFeature
-suspend fun <BC : BehaviourContext> BC.onUnhandledCommandWithArgs(
+fun <BC : BehaviourContext> BC.onUnhandledCommandWithArgs(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any>? = ByChatMessageMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt

@@ -20,7 +20,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 typealias CommonMessageFilter<T> = SimpleFilter<CommonMessage<T>>
 
-internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onContentMessageWithType(
+internal inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onContentMessageWithType(
     initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<T>, Any>? = ByChatMessageMarkerFactory,
@@ -49,7 +49,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent>
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onContentMessage(
+fun <BC : BehaviourContext> BC.onContentMessage(
     initialFilter: CommonMessageFilter<MessageContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any>? = ByChatMessageMarkerFactory,
@@ -76,7 +76,7 @@ suspend fun <BC : BehaviourContext> BC.onContentMessage(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onContact(
+fun <BC : BehaviourContext> BC.onContact(
     initialFilter: CommonMessageFilter<ContactContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ContactMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ContactMessage, Any>? = ByChatMessageMarkerFactory,
@@ -103,7 +103,7 @@ suspend fun <BC : BehaviourContext> BC.onContact(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDice(
+fun <BC : BehaviourContext> BC.onDice(
     initialFilter: CommonMessageFilter<DiceContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DiceMessage, Any>? = ByChatMessageMarkerFactory,
@@ -130,7 +130,7 @@ suspend fun <BC : BehaviourContext> BC.onDice(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGame(
+fun <BC : BehaviourContext> BC.onGame(
     initialFilter: CommonMessageFilter<GameContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in GameMessage, Any>? = ByChatMessageMarkerFactory,
@@ -157,7 +157,7 @@ suspend fun <BC : BehaviourContext> BC.onGame(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onLocation(
+fun <BC : BehaviourContext> BC.onLocation(
     initialFilter: CommonMessageFilter<LocationContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in LocationMessage, Any>? = ByChatMessageMarkerFactory,
@@ -184,7 +184,7 @@ suspend fun <BC : BehaviourContext> BC.onLocation(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onLiveLocation(
+fun <BC : BehaviourContext> BC.onLiveLocation(
     initialFilter: CommonMessageFilter<LiveLocationContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LiveLocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in LiveLocationMessage, Any>? = ByChatMessageMarkerFactory,
@@ -211,7 +211,7 @@ suspend fun <BC : BehaviourContext> BC.onLiveLocation(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onStaticLocation(
+fun <BC : BehaviourContext> BC.onStaticLocation(
     initialFilter: CommonMessageFilter<StaticLocationContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StaticLocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StaticLocationMessage, Any>? = ByChatMessageMarkerFactory,
@@ -238,7 +238,7 @@ suspend fun <BC : BehaviourContext> BC.onStaticLocation(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPoll(
+fun <BC : BehaviourContext> BC.onPoll(
     initialFilter: CommonMessageFilter<PollContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PollMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PollMessage, Any>? = ByChatMessageMarkerFactory,
@@ -265,7 +265,7 @@ suspend fun <BC : BehaviourContext> BC.onPoll(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onText(
+fun <BC : BehaviourContext> BC.onText(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any>? = ByChatMessageMarkerFactory,
@@ -292,7 +292,7 @@ suspend fun <BC : BehaviourContext> BC.onText(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onStory(
+fun <BC : BehaviourContext> BC.onStory(
     initialFilter: CommonMessageFilter<StoryContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StoryMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StoryMessage, Any>? = ByChatMessageMarkerFactory,
@@ -319,7 +319,7 @@ suspend fun <BC : BehaviourContext> BC.onStory(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onTextedContent(
+fun <BC : BehaviourContext> BC.onTextedContent(
     initialFilter: CommonMessageFilter<TextedContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextedMessage, Any>? = ByChatMessageMarkerFactory,
@@ -346,7 +346,7 @@ suspend fun <BC : BehaviourContext> BC.onTextedContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVenue(
+fun <BC : BehaviourContext> BC.onVenue(
     initialFilter: CommonMessageFilter<VenueContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VenueMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VenueMessage, Any>? = ByChatMessageMarkerFactory,
@@ -373,7 +373,7 @@ suspend fun <BC : BehaviourContext> BC.onVenue(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onAudioMediaGroup(
+fun <BC : BehaviourContext> BC.onAudioMediaGroup(
     initialFilter: CommonMessageFilter<AudioMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMediaGroupMessage, Any>? = ByChatMessageMarkerFactory,
@@ -400,7 +400,7 @@ suspend fun <BC : BehaviourContext> BC.onAudioMediaGroup(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
+fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
     initialFilter: CommonMessageFilter<DocumentMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMediaGroupMessage, Any>? = ByChatMessageMarkerFactory,
@@ -427,7 +427,7 @@ suspend fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onTextedMediaContent(
+fun <BC : BehaviourContext> BC.onTextedMediaContent(
     initialFilter: CommonMessageFilter<TextedMediaContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextedMediaMessage, Any>? = ByChatMessageMarkerFactory,
@@ -454,7 +454,7 @@ suspend fun <BC : BehaviourContext> BC.onTextedMediaContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMediaCollection(
+fun <BC : BehaviourContext> BC.onMediaCollection(
     initialFilter: CommonMessageFilter<MediaCollectionContent<TelegramMediaFile>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaCollectionMessage<TelegramMediaFile>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaCollectionMessage<TelegramMediaFile>, Any>? = ByChatMessageMarkerFactory,
@@ -481,7 +481,7 @@ suspend fun <BC : BehaviourContext> BC.onMediaCollection(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMedia(
+fun <BC : BehaviourContext> BC.onMedia(
     initialFilter: CommonMessageFilter<MediaContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaMessage, Any>? = ByChatMessageMarkerFactory,
@@ -508,7 +508,7 @@ suspend fun <BC : BehaviourContext> BC.onMedia(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onAnimation(
+fun <BC : BehaviourContext> BC.onAnimation(
     initialFilter: CommonMessageFilter<AnimationContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AnimationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AnimationMessage, Any>? = ByChatMessageMarkerFactory,
@@ -535,7 +535,7 @@ suspend fun <BC : BehaviourContext> BC.onAnimation(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onAudio(
+fun <BC : BehaviourContext> BC.onAudio(
     initialFilter: CommonMessageFilter<AudioContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMessage, Any>? = ByChatMessageMarkerFactory,
@@ -562,7 +562,7 @@ suspend fun <BC : BehaviourContext> BC.onAudio(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDocument(
+fun <BC : BehaviourContext> BC.onDocument(
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMessage, Any>? = ByChatMessageMarkerFactory,
@@ -589,7 +589,7 @@ suspend fun <BC : BehaviourContext> BC.onDocument(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPhoto(
+fun <BC : BehaviourContext> BC.onPhoto(
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PhotoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PhotoMessage, Any>? = ByChatMessageMarkerFactory,
@@ -616,7 +616,7 @@ suspend fun <BC : BehaviourContext> BC.onPhoto(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onSticker(
+fun <BC : BehaviourContext> BC.onSticker(
     initialFilter: CommonMessageFilter<StickerContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StickerMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StickerMessage, Any>? = ByChatMessageMarkerFactory,
@@ -643,7 +643,7 @@ suspend fun <BC : BehaviourContext> BC.onSticker(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideo(
+fun <BC : BehaviourContext> BC.onVideo(
     initialFilter: CommonMessageFilter<VideoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoMessage, Any>? = ByChatMessageMarkerFactory,
@@ -670,7 +670,7 @@ suspend fun <BC : BehaviourContext> BC.onVideo(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoNote(
+fun <BC : BehaviourContext> BC.onVideoNote(
     initialFilter: CommonMessageFilter<VideoNoteContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoNoteMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoNoteMessage, Any>? = ByChatMessageMarkerFactory,
@@ -697,7 +697,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoNote(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVoice(
+fun <BC : BehaviourContext> BC.onVoice(
     initialFilter: CommonMessageFilter<VoiceContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VoiceMessage, Any>? = ByChatMessageMarkerFactory,
@@ -724,7 +724,7 @@ suspend fun <BC : BehaviourContext> BC.onVoice(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onInvoice(
+fun <BC : BehaviourContext> BC.onInvoice(
     initialFilter: CommonMessageFilter<InvoiceContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InvoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in InvoiceMessage, Any>? = ByChatMessageMarkerFactory,
@@ -751,7 +751,7 @@ suspend fun <BC : BehaviourContext> BC.onInvoice(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVisualContent(
+fun <BC : BehaviourContext> BC.onVisualContent(
     initialFilter: CommonMessageFilter<VisualMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VisualMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VisualMediaGroupMessage, Any>? = ByChatMessageMarkerFactory,
@@ -778,7 +778,7 @@ suspend fun <BC : BehaviourContext> BC.onVisualContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMediaContent(
+fun <BC : BehaviourContext> BC.onMediaContent(
     initialFilter: CommonMessageFilter<MediaContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaMessage, Any>? = ByChatMessageMarkerFactory,
@@ -805,7 +805,7 @@ suspend fun <BC : BehaviourContext> BC.onMediaContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGiveawayContent(
+fun <BC : BehaviourContext> BC.onGiveawayContent(
     initialFilter: CommonMessageFilter<GiveawayContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ScheduledGiveawayContentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ScheduledGiveawayContentMessage, Any>? = ByChatMessageMarkerFactory,
@@ -833,7 +833,7 @@ suspend fun <BC : BehaviourContext> BC.onGiveawayContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGiveawayPublicResultsContent(
+fun <BC : BehaviourContext> BC.onGiveawayPublicResultsContent(
     initialFilter: CommonMessageFilter<GiveawayPublicResultsContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GiveawayPublicResultsContentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in GiveawayPublicResultsContentMessage, Any>? = ByChatMessageMarkerFactory,
@@ -862,7 +862,7 @@ suspend fun <BC : BehaviourContext> BC.onGiveawayPublicResultsContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGiveawayWinners(
+fun <BC : BehaviourContext> BC.onGiveawayWinners(
     initialFilter: CommonMessageFilter<GiveawayPublicResultsContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GiveawayPublicResultsContentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in GiveawayPublicResultsContentMessage, Any>? = ByChatMessageMarkerFactory,
@@ -886,7 +886,7 @@ suspend fun <BC : BehaviourContext> BC.onGiveawayWinners(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPaidMediaInfoContent(
+fun <BC : BehaviourContext> BC.onPaidMediaInfoContent(
     initialFilter: CommonMessageFilter<PaidMediaInfoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PaidMediaInfoContentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PaidMediaInfoContentMessage, Any>? = ByChatMessageMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/DeepLinkHandling.kt

@@ -19,30 +19,32 @@ import io.ktor.http.decodeURLQueryComponent
 import kotlinx.coroutines.Job
 
 private val startRegex = Regex("start")
-suspend fun <BC : BehaviourContext> BC.onDeepLink(
+fun <BC : BehaviourContext> BC.onDeepLink(
     initialFilter: SimpleFilter<Pair<TextMessage, String>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update>? = { (message, _), update -> MessageFilterByChat(this, message, update) },
     markerFactory: MarkerFactory<Pair<TextMessage, String>, Any>? = MarkerFactory { (message, _) -> ByChatMessageMarkerFactory(message) },
     additionalSubcontextInitialAction: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, Update, Pair<TextMessage, String>>? = null,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, Pair<TextMessage, String>>
-): Job = on(
-    markerFactory,
-    SimpleFilter<Pair<TextMessage, String>> { (message, _) ->
-        message.content.textSources.size == 2
-            && message.content.textSources.firstOrNull() ?.asBotCommandTextSource() ?.command == "start"
-            && message.content.textSources.getOrNull(1) is RegularTextSource
-    } * initialFilter,
-    subcontextUpdatesFilter,
-    additionalSubcontextInitialAction,
-    scenarioReceiver,
-) {
-    (it.messageUpdateOrNull()) ?.data ?.commonMessageOrNull() ?.withContentOrNull<TextContent>() ?.let { message ->
-        message to (message.content.textSources.getOrNull(1) ?.source ?.removePrefix(" ") ?.decodeURLQueryComponent() ?: return@let null)
-    } ?.let(::listOfNotNull)
-}.also {
-    triggersHolder.handleableCommandsHolder.registerHandleable(startRegex)
-    it.invokeOnCompletion {
-        this@onDeepLink.launchSafelyWithoutExceptions { triggersHolder.handleableCommandsHolder.unregisterHandleable(startRegex) }
+): Job = launchInNewSubContext {
+    on(
+        markerFactory,
+        SimpleFilter<Pair<TextMessage, String>> { (message, _) ->
+            message.content.textSources.size == 2
+                    && message.content.textSources.firstOrNull() ?.asBotCommandTextSource() ?.command == "start"
+                    && message.content.textSources.getOrNull(1) is RegularTextSource
+        } * initialFilter,
+        subcontextUpdatesFilter,
+        additionalSubcontextInitialAction,
+        scenarioReceiver,
+    ) {
+        (it.messageUpdateOrNull()) ?.data ?.commonMessageOrNull() ?.withContentOrNull<TextContent>() ?.let { message ->
+            message to (message.content.textSources.getOrNull(1) ?.source ?.removePrefix(" ") ?.decodeURLQueryComponent() ?: return@let null)
+        } ?.let(::listOfNotNull)
+    }.also {
+        triggersHolder.handleableCommandsHolder.registerHandleable(startRegex)
+        it.invokeOnCompletion {
+            this@onDeepLink.launchSafelyWithoutExceptions { triggersHolder.handleableCommandsHolder.unregisterHandleable(startRegex) }
+        }
     }
 }
 
@@ -51,7 +53,7 @@ suspend fun <BC : BehaviourContext> BC.onDeepLink(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onDeepLink(
+fun <BC : BehaviourContext> BC.onDeepLink(
     regex: Regex,
     initialFilter: SimpleFilter<Pair<TextMessage, String>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update>? = { (message, _), update -> MessageFilterByChat(this, message, update) },
@@ -70,7 +72,7 @@ suspend fun <BC : BehaviourContext> BC.onDeepLink(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onDeepLink(
+fun <BC : BehaviourContext> BC.onDeepLink(
     deepLink: String,
     initialFilter: SimpleFilter<Pair<TextMessage, String>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update>? = { (message, _), update -> MessageFilterByChat(this, message, update) },

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/DeletedBusinessMessagesTriggers.kt

@@ -28,7 +28,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onBusinessMessagesDeleted(
+fun <BC : BehaviourContext> BC.onBusinessMessagesDeleted(
     initialFilter: SimpleFilter<BusinessMessagesDeleted>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BusinessMessagesDeleted, Update>? = null,
     markerFactory: MarkerFactory<in BusinessMessagesDeleted, Any>? = ByBusinessConnectionIdBusinessMessagesDeletedMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt

@@ -14,7 +14,7 @@ import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onEditedContent(
+internal inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onEditedContent(
     initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<T>, Any>? = ByChatMessageMarkerFactory,
@@ -38,7 +38,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent>
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedContentMessage(
+fun <BC : BehaviourContext> BC.onEditedContentMessage(
     initialFilter: CommonMessageFilter<MessageContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any>? = ByChatMessageMarkerFactory,
@@ -65,7 +65,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedContentMessage(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedContact(
+fun <BC : BehaviourContext> BC.onEditedContact(
     initialFilter: CommonMessageFilter<ContactContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ContactMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ContactMessage, Any>? = ByChatMessageMarkerFactory,
@@ -92,7 +92,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedContact(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedDice(
+fun <BC : BehaviourContext> BC.onEditedDice(
     initialFilter: CommonMessageFilter<DiceContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DiceMessage, Any>? = ByChatMessageMarkerFactory,
@@ -119,7 +119,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedDice(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedGame(
+fun <BC : BehaviourContext> BC.onEditedGame(
     initialFilter: CommonMessageFilter<GameContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in GameMessage, Any>? = ByChatMessageMarkerFactory,
@@ -146,7 +146,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedGame(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedLocation(
+fun <BC : BehaviourContext> BC.onEditedLocation(
     initialFilter: CommonMessageFilter<LocationContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in LocationMessage, Any>? = ByChatMessageMarkerFactory,
@@ -173,7 +173,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedLocation(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedText(
+fun <BC : BehaviourContext> BC.onEditedText(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any>? = ByChatMessageMarkerFactory,
@@ -200,7 +200,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedText(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedVenue(
+fun <BC : BehaviourContext> BC.onEditedVenue(
     initialFilter: CommonMessageFilter<VenueContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VenueMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VenueMessage, Any>? = ByChatMessageMarkerFactory,
@@ -227,7 +227,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVenue(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedAudioMediaGroup(
+fun <BC : BehaviourContext> BC.onEditedAudioMediaGroup(
     initialFilter: CommonMessageFilter<AudioMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMediaGroupMessage, Any>? = ByChatMessageMarkerFactory,
@@ -254,7 +254,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedAudioMediaGroup(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
+fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
     initialFilter: CommonMessageFilter<DocumentMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMediaGroupMessage, Any>? = ByChatMessageMarkerFactory,
@@ -281,7 +281,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedTextedMediaContent(
+fun <BC : BehaviourContext> BC.onEditedTextedMediaContent(
     initialFilter: CommonMessageFilter<TextedMediaContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextedMediaMessage, Any>? = ByChatMessageMarkerFactory,
@@ -308,7 +308,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedTextedMediaContent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedMediaCollection(
+fun <BC : BehaviourContext> BC.onEditedMediaCollection(
     initialFilter: CommonMessageFilter<MediaCollectionContent<TelegramMediaFile>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaCollectionMessage<TelegramMediaFile>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaCollectionMessage<TelegramMediaFile>, Any>? = ByChatMessageMarkerFactory,
@@ -335,7 +335,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedMediaCollection(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedMedia(
+fun <BC : BehaviourContext> BC.onEditedMedia(
     initialFilter: CommonMessageFilter<MediaContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaMessage, Any>? = ByChatMessageMarkerFactory,
@@ -362,7 +362,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedMedia(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedAnimation(
+fun <BC : BehaviourContext> BC.onEditedAnimation(
     initialFilter: CommonMessageFilter<AnimationContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AnimationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AnimationMessage, Any>? = ByChatMessageMarkerFactory,
@@ -389,7 +389,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedAnimation(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedAudio(
+fun <BC : BehaviourContext> BC.onEditedAudio(
     initialFilter: CommonMessageFilter<AudioContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMessage, Any>? = ByChatMessageMarkerFactory,
@@ -416,7 +416,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedAudio(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedDocument(
+fun <BC : BehaviourContext> BC.onEditedDocument(
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMessage, Any>? = ByChatMessageMarkerFactory,
@@ -443,7 +443,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedDocument(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedPhoto(
+fun <BC : BehaviourContext> BC.onEditedPhoto(
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PhotoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PhotoMessage, Any>? = ByChatMessageMarkerFactory,
@@ -470,7 +470,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedPhoto(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedSticker(
+fun <BC : BehaviourContext> BC.onEditedSticker(
     initialFilter: CommonMessageFilter<StickerContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StickerMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StickerMessage, Any>? = ByChatMessageMarkerFactory,
@@ -497,7 +497,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedSticker(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedVideo(
+fun <BC : BehaviourContext> BC.onEditedVideo(
     initialFilter: CommonMessageFilter<VideoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoMessage, Any>? = ByChatMessageMarkerFactory,
@@ -524,7 +524,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVideo(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedVideoNote(
+fun <BC : BehaviourContext> BC.onEditedVideoNote(
     initialFilter: CommonMessageFilter<VideoNoteContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoNoteMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoNoteMessage, Any>? = ByChatMessageMarkerFactory,
@@ -551,7 +551,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVideoNote(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedVoice(
+fun <BC : BehaviourContext> BC.onEditedVoice(
     initialFilter: CommonMessageFilter<VoiceContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VoiceMessage, Any>? = ByChatMessageMarkerFactory,
@@ -578,7 +578,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVoice(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onEditedInvoice(
+fun <BC : BehaviourContext> BC.onEditedInvoice(
     initialFilter: CommonMessageFilter<InvoiceContent>? = CommonMessageFilterExcludeMediaGroups,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InvoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in InvoiceMessage, Any>? = ByChatMessageMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt

@@ -35,7 +35,7 @@ import dev.inmo.tgbotapi.types.request.ChatSharedRequest
 import dev.inmo.tgbotapi.types.request.UsersShared
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : ChatEvent> BC.onEvent(
+internal inline fun <BC : BehaviourContext, reified T : ChatEvent> BC.onEvent(
     initialFilter: SimpleFilter<ChatEventMessage<T>>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<T>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<T>, Any>? = ByChatMessageMarkerFactory,
@@ -46,7 +46,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : ChatEvent> BC.on
     (it.baseSentMessageUpdateOrNull() ?.data ?.chatEventMessageOrNull() ?.takeIf { it.chatEvent is T } as? ChatEventMessage<T>) ?.let(::listOfNotNull)
 }
 
-internal suspend inline fun <BC : BehaviourContext, reified T : ChatEvent, reified CEM : ChatEventMessage<T>> BC.onEventWithCustomChatEventMessage(
+internal inline fun <BC : BehaviourContext, reified T : ChatEvent, reified CEM : ChatEventMessage<T>> BC.onEventWithCustomChatEventMessage(
     initialFilter: SimpleFilter<CEM>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CEM, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CEM, Any>? = ByChatMessageMarkerFactory,
@@ -70,7 +70,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : ChatEvent, reifi
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChannelEvent(
+fun <BC : BehaviourContext> BC.onChannelEvent(
     initialFilter: SimpleFilter<ChatEventMessage<ChannelEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChannelEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChannelEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -91,7 +91,7 @@ suspend fun <BC : BehaviourContext> BC.onChannelEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPrivateEvent(
+fun <BC : BehaviourContext> BC.onPrivateEvent(
     initialFilter: SimpleFilter<ChatEventMessage<PrivateEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PrivateEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<PrivateEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -112,7 +112,7 @@ suspend fun <BC : BehaviourContext> BC.onPrivateEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatEvent(
+fun <BC : BehaviourContext> BC.onChatEvent(
     initialFilter: SimpleFilter<ChatEventMessage<ChatEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChatEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChatEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -133,7 +133,7 @@ suspend fun <BC : BehaviourContext> BC.onChatEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoChatEvent(
+fun <BC : BehaviourContext> BC.onVideoChatEvent(
     initialFilter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -154,7 +154,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoChatEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoChatStartedEvent(
+fun <BC : BehaviourContext> BC.onVideoChatStartedEvent(
     initialFilter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatStarted>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<VideoChatStarted>, Any>? = ByChatMessageMarkerFactory,
@@ -175,7 +175,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoChatStartedEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoChatEndedEvent(
+fun <BC : BehaviourContext> BC.onVideoChatEndedEvent(
     initialFilter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEnded>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEnded>, Any>? = ByChatMessageMarkerFactory,
@@ -196,7 +196,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoChatEndedEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoChatParticipantsInvitedEvent(
+fun <BC : BehaviourContext> BC.onVideoChatParticipantsInvitedEvent(
     initialFilter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatParticipantsInvited>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<VideoChatParticipantsInvited>, Any>? = ByChatMessageMarkerFactory,
@@ -217,7 +217,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoChatParticipantsInvitedEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMessageAutoDeleteTimerChangedEvent(
+fun <BC : BehaviourContext> BC.onMessageAutoDeleteTimerChangedEvent(
     initialFilter: SimpleFilter<ChatEventMessage<MessageAutoDeleteTimerChanged>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<MessageAutoDeleteTimerChanged>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<MessageAutoDeleteTimerChanged>, Any>? = ByChatMessageMarkerFactory,
@@ -238,7 +238,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageAutoDeleteTimerChangedEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPublicChatEvent(
+fun <BC : BehaviourContext> BC.onPublicChatEvent(
     initialFilter: SimpleFilter<ChatEventMessage<PublicChatEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PublicChatEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<PublicChatEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -259,7 +259,7 @@ suspend fun <BC : BehaviourContext> BC.onPublicChatEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onCommonEvent(
+fun <BC : BehaviourContext> BC.onCommonEvent(
     initialFilter: SimpleFilter<ChatEventMessage<CommonEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<CommonEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<CommonEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -280,7 +280,7 @@ suspend fun <BC : BehaviourContext> BC.onCommonEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGroupEvent(
+fun <BC : BehaviourContext> BC.onGroupEvent(
     initialFilter: SimpleFilter<ChatEventMessage<GroupEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GroupEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GroupEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -301,7 +301,7 @@ suspend fun <BC : BehaviourContext> BC.onGroupEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onSupergroupEvent(
+fun <BC : BehaviourContext> BC.onSupergroupEvent(
     initialFilter: SimpleFilter<ChatEventMessage<SupergroupEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<SupergroupEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<SupergroupEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -322,7 +322,7 @@ suspend fun <BC : BehaviourContext> BC.onSupergroupEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChannelChatCreated(
+fun <BC : BehaviourContext> BC.onChannelChatCreated(
     initialFilter: SimpleFilter<ChatEventMessage<ChannelChatCreated>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChannelChatCreated>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChannelChatCreated>, Any>? = ByChatMessageMarkerFactory,
@@ -343,7 +343,7 @@ suspend fun <BC : BehaviourContext> BC.onChannelChatCreated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDeleteChatPhoto(
+fun <BC : BehaviourContext> BC.onDeleteChatPhoto(
     initialFilter: SimpleFilter<ChatEventMessage<DeleteChatPhoto>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<DeleteChatPhoto>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<DeleteChatPhoto>, Any>? = ByChatMessageMarkerFactory,
@@ -364,7 +364,7 @@ suspend fun <BC : BehaviourContext> BC.onDeleteChatPhoto(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGroupChatCreated(
+fun <BC : BehaviourContext> BC.onGroupChatCreated(
     initialFilter: SimpleFilter<ChatEventMessage<GroupChatCreated>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GroupChatCreated>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GroupChatCreated>, Any>? = ByChatMessageMarkerFactory,
@@ -385,7 +385,7 @@ suspend fun <BC : BehaviourContext> BC.onGroupChatCreated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onLeftChatMember(
+fun <BC : BehaviourContext> BC.onLeftChatMember(
     initialFilter: SimpleFilter<ChatEventMessage<LeftChatMemberEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<LeftChatMemberEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<LeftChatMemberEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -406,7 +406,7 @@ suspend fun <BC : BehaviourContext> BC.onLeftChatMember(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onNewChatMembers(
+fun <BC : BehaviourContext> BC.onNewChatMembers(
     initialFilter: SimpleFilter<ChatEventMessage<NewChatMembers>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<NewChatMembers>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<NewChatMembers>, Any>? = ByChatMessageMarkerFactory,
@@ -427,7 +427,7 @@ suspend fun <BC : BehaviourContext> BC.onNewChatMembers(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onNewChatPhoto(
+fun <BC : BehaviourContext> BC.onNewChatPhoto(
     initialFilter: SimpleFilter<ChatEventMessage<NewChatPhoto>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<NewChatPhoto>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<NewChatPhoto>, Any>? = ByChatMessageMarkerFactory,
@@ -448,7 +448,7 @@ suspend fun <BC : BehaviourContext> BC.onNewChatPhoto(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onNewChatTitle(
+fun <BC : BehaviourContext> BC.onNewChatTitle(
     initialFilter: SimpleFilter<ChatEventMessage<NewChatTitle>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<NewChatTitle>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<NewChatTitle>, Any>? = ByChatMessageMarkerFactory,
@@ -469,7 +469,7 @@ suspend fun <BC : BehaviourContext> BC.onNewChatTitle(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPinnedMessage(
+fun <BC : BehaviourContext> BC.onPinnedMessage(
     initialFilter: SimpleFilter<ChatEventMessage<PinnedMessage>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PinnedMessage>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<PinnedMessage>, Any>? = ByChatMessageMarkerFactory,
@@ -490,7 +490,7 @@ suspend fun <BC : BehaviourContext> BC.onPinnedMessage(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onProximityAlertTriggered(
+fun <BC : BehaviourContext> BC.onProximityAlertTriggered(
     initialFilter: SimpleFilter<ChatEventMessage<ProximityAlertTriggered>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ProximityAlertTriggered>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ProximityAlertTriggered>, Any>? = ByChatMessageMarkerFactory,
@@ -511,7 +511,7 @@ suspend fun <BC : BehaviourContext> BC.onProximityAlertTriggered(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onSupergroupChatCreated(
+fun <BC : BehaviourContext> BC.onSupergroupChatCreated(
     initialFilter: SimpleFilter<ChatEventMessage<SupergroupChatCreated>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<SupergroupChatCreated>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<SupergroupChatCreated>, Any>? = ByChatMessageMarkerFactory,
@@ -535,7 +535,7 @@ suspend fun <BC : BehaviourContext> BC.onSupergroupChatCreated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onSuccessfulPayment(
+fun <BC : BehaviourContext> BC.onSuccessfulPayment(
     initialFilter: SimpleFilter<ChatEventMessage<SuccessfulPaymentEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<SuccessfulPaymentEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<SuccessfulPaymentEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -556,7 +556,7 @@ suspend fun <BC : BehaviourContext> BC.onSuccessfulPayment(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onRefundedPayment(
+fun <BC : BehaviourContext> BC.onRefundedPayment(
     initialFilter: SimpleFilter<ChatEventMessage<RefundedPaymentEvent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<RefundedPaymentEvent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<RefundedPaymentEvent>, Any>? = ByChatMessageMarkerFactory,
@@ -577,7 +577,7 @@ suspend fun <BC : BehaviourContext> BC.onRefundedPayment(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onUserLoggedIn(
+fun <BC : BehaviourContext> BC.onUserLoggedIn(
     initialFilter: SimpleFilter<ChatEventMessage<UserLoggedIn>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<UserLoggedIn>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<UserLoggedIn>, Any>? = ByChatMessageMarkerFactory,
@@ -598,7 +598,7 @@ suspend fun <BC : BehaviourContext> BC.onUserLoggedIn(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onWebAppData(
+fun <BC : BehaviourContext> BC.onWebAppData(
     initialFilter: SimpleFilter<PrivateEventMessage<WebAppData>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<WebAppData>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WebAppData>, Any>? = ByChatMessageMarkerFactory,
@@ -619,7 +619,7 @@ suspend fun <BC : BehaviourContext> BC.onWebAppData(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onForumTopicClosed(
+fun <BC : BehaviourContext> BC.onForumTopicClosed(
     initialFilter: SimpleFilter<SupergroupEventMessage<ForumTopicClosed>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<ForumTopicClosed>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ForumTopicClosed>, Any>? = ByChatMessageMarkerFactory,
@@ -640,7 +640,7 @@ suspend fun <BC : BehaviourContext> BC.onForumTopicClosed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onForumTopicCreated(
+fun <BC : BehaviourContext> BC.onForumTopicCreated(
     initialFilter: SimpleFilter<SupergroupEventMessage<ForumTopicCreated>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<ForumTopicCreated>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ForumTopicCreated>, Any>? = ByChatMessageMarkerFactory,
@@ -661,7 +661,7 @@ suspend fun <BC : BehaviourContext> BC.onForumTopicCreated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onForumTopicReopened(
+fun <BC : BehaviourContext> BC.onForumTopicReopened(
     initialFilter: SimpleFilter<SupergroupEventMessage<ForumTopicReopened>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<ForumTopicReopened>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ForumTopicReopened>, Any>? = ByChatMessageMarkerFactory,
@@ -683,7 +683,7 @@ suspend fun <BC : BehaviourContext> BC.onForumTopicReopened(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onForumTopicEdited(
+fun <BC : BehaviourContext> BC.onForumTopicEdited(
     initialFilter: SimpleFilter<SupergroupEventMessage<ForumTopicEdited>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<ForumTopicEdited>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ForumTopicEdited>, Any>? = ByChatMessageMarkerFactory,
@@ -704,7 +704,7 @@ suspend fun <BC : BehaviourContext> BC.onForumTopicEdited(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGeneralForumTopicHidden(
+fun <BC : BehaviourContext> BC.onGeneralForumTopicHidden(
     initialFilter: SimpleFilter<SupergroupEventMessage<GeneralForumTopicHidden>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<GeneralForumTopicHidden>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GeneralForumTopicHidden>, Any>? = ByChatMessageMarkerFactory,
@@ -725,7 +725,7 @@ suspend fun <BC : BehaviourContext> BC.onGeneralForumTopicHidden(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGeneralForumTopicUnhidden(
+fun <BC : BehaviourContext> BC.onGeneralForumTopicUnhidden(
     initialFilter: SimpleFilter<SupergroupEventMessage<GeneralForumTopicUnhidden>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<GeneralForumTopicUnhidden>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GeneralForumTopicUnhidden>, Any>? = ByChatMessageMarkerFactory,
@@ -747,7 +747,7 @@ suspend fun <BC : BehaviourContext> BC.onGeneralForumTopicUnhidden(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowed(
+fun <BC : BehaviourContext> BC.onWriteAccessAllowed(
     initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed>, Any>? = ByChatMessageMarkerFactory,
@@ -769,7 +769,7 @@ suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowed(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromRequest(
+fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromRequest(
     initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.FromRequest>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.FromRequest>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.FromRequest>, Any>? = ByChatMessageMarkerFactory,
@@ -791,7 +791,7 @@ suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromRequest(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromAttachmentMenu(
+fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromAttachmentMenu(
     initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>, Any>? = ByChatMessageMarkerFactory,
@@ -813,7 +813,7 @@ suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromAttachmentMenu(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedOther(
+fun <BC : BehaviourContext> BC.onWriteAccessAllowedOther(
     initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.Other>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.Other>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.Other>, Any>? = ByChatMessageMarkerFactory,
@@ -835,7 +835,7 @@ suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedOther(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromWebAppLink(
+fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromWebAppLink(
     initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.FromWebAppLink>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.FromWebAppLink>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.FromWebAppLink>, Any>? = ByChatMessageMarkerFactory,
@@ -858,7 +858,7 @@ suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromWebAppLink(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatSharedRequest(
+fun <BC : BehaviourContext> BC.onChatSharedRequest(
     initialFilter: SimpleFilter<PrivateEventMessage<ChatSharedRequest>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<ChatSharedRequest>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChatSharedRequest>, Any>? = ByChatMessageMarkerFactory,
@@ -880,7 +880,7 @@ suspend fun <BC : BehaviourContext> BC.onChatSharedRequest(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onUsersShared(
+fun <BC : BehaviourContext> BC.onUsersShared(
     initialFilter: SimpleFilter<PrivateEventMessage<UsersShared>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<UsersShared>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<UsersShared>, Any>? = ByChatMessageMarkerFactory,
@@ -902,7 +902,7 @@ suspend fun <BC : BehaviourContext> BC.onUsersShared(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onUserShared(
+fun <BC : BehaviourContext> BC.onUserShared(
     initialFilter: SimpleFilter<PrivateEventMessage<UsersShared>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<UsersShared>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<UsersShared>, Any>? = ByChatMessageMarkerFactory,
@@ -925,7 +925,7 @@ suspend fun <BC : BehaviourContext> BC.onUserShared(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatShared(
+fun <BC : BehaviourContext> BC.onChatShared(
     initialFilter: SimpleFilter<PrivateEventMessage<ChatShared>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<ChatShared>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChatShared>, Any>? = ByChatMessageMarkerFactory,
@@ -948,7 +948,7 @@ suspend fun <BC : BehaviourContext> BC.onChatShared(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatBoostAdded(
+fun <BC : BehaviourContext> BC.onChatBoostAdded(
     initialFilter: SimpleFilter<ChatEventMessage<ChatBoostAdded>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChatBoostAdded>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChatBoostAdded>, Any>? = ByChatMessageMarkerFactory,
@@ -970,7 +970,7 @@ suspend fun <BC : BehaviourContext> BC.onChatBoostAdded(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onChatBackgroundSet(
+fun <BC : BehaviourContext> BC.onChatBackgroundSet(
     initialFilter: SimpleFilter<ChatEventMessage<ChatBackground>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<ChatBackground>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<ChatBackground>, Any>? = ByChatMessageMarkerFactory,
@@ -992,7 +992,7 @@ suspend fun <BC : BehaviourContext> BC.onChatBackgroundSet(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGiveawayCreated(
+fun <BC : BehaviourContext> BC.onGiveawayCreated(
     initialFilter: SimpleFilter<ChatEventMessage<GiveawayCreated>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GiveawayCreated>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GiveawayCreated>, Any>? = ByChatMessageMarkerFactory,
@@ -1015,7 +1015,7 @@ suspend fun <BC : BehaviourContext> BC.onGiveawayCreated(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGiveawayCompleted(
+fun <BC : BehaviourContext> BC.onGiveawayCompleted(
     initialFilter: SimpleFilter<ChatEventMessage<GiveawayPrivateResults>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GiveawayPrivateResults>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GiveawayPrivateResults>, Any>? = ByChatMessageMarkerFactory,
@@ -1039,7 +1039,7 @@ suspend fun <BC : BehaviourContext> BC.onGiveawayCompleted(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onGiveawayCompletedWithPrivateWinners(
+fun <BC : BehaviourContext> BC.onGiveawayCompletedWithPrivateWinners(
     initialFilter: SimpleFilter<ChatEventMessage<GiveawayPrivateResults>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GiveawayPrivateResults>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GiveawayPrivateResults>, Any>? = ByChatMessageMarkerFactory,
@@ -1061,7 +1061,7 @@ suspend fun <BC : BehaviourContext> BC.onGiveawayCompletedWithPrivateWinners(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPaidMessagePriceChanged(
+fun <BC : BehaviourContext> BC.onPaidMessagePriceChanged(
     initialFilter: SimpleFilter<ChatEventMessage<PaidMessagePriceChanged>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<PaidMessagePriceChanged>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<PaidMessagePriceChanged>, Any>? = ByChatMessageMarkerFactory,
@@ -1083,7 +1083,7 @@ suspend fun <BC : BehaviourContext> BC.onPaidMessagePriceChanged(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onRegularGiftSentOrReceived(
+fun <BC : BehaviourContext> BC.onRegularGiftSentOrReceived(
     initialFilter: SimpleFilter<ChatEventMessage<GiftSentOrReceived.Regular>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GiftSentOrReceived.Regular>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GiftSentOrReceived.Regular>, Any>? = ByChatMessageMarkerFactory,
@@ -1105,7 +1105,7 @@ suspend fun <BC : BehaviourContext> BC.onRegularGiftSentOrReceived(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onUniqueGiftSentOrReceived(
+fun <BC : BehaviourContext> BC.onUniqueGiftSentOrReceived(
     initialFilter: SimpleFilter<ChatEventMessage<GiftSentOrReceived.Unique>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<GiftSentOrReceived.Unique>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<GiftSentOrReceived.Unique>, Any>? = ByChatMessageMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt

@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.extensions.utils.inlineQueryUpdateOrNull
 import dev.inmo.tgbotapi.types.InlineQueries.query.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : InlineQuery> BC.onInlineQuery(
+internal inline fun <BC : BehaviourContext, reified T : InlineQuery> BC.onInlineQuery(
     initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = InlineQueryFilterByUser,
     markerFactory: MarkerFactory<in T, Any>? = ByUserInlineQueryMarkerFactory,
@@ -32,7 +32,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : InlineQuery> BC.
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onAnyInlineQuery(
+fun <BC : BehaviourContext> BC.onAnyInlineQuery(
     initialFilter: SimpleFilter<InlineQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineQuery, Update>? = InlineQueryFilterByUser,
     markerFactory: MarkerFactory<in InlineQuery, Any>? = ByUserInlineQueryMarkerFactory,
@@ -54,7 +54,7 @@ suspend fun <BC : BehaviourContext> BC.onAnyInlineQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onBaseInlineQuery(
+fun <BC : BehaviourContext> BC.onBaseInlineQuery(
     initialFilter: SimpleFilter<BaseInlineQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, BaseInlineQuery, Update>? = InlineQueryFilterByUser,
     markerFactory: MarkerFactory<in BaseInlineQuery, Any>? = ByUserInlineQueryMarkerFactory,
@@ -76,7 +76,7 @@ suspend fun <BC : BehaviourContext> BC.onBaseInlineQuery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onLocationInlineQuery(
+fun <BC : BehaviourContext> BC.onLocationInlineQuery(
     initialFilter: SimpleFilter<LocationInlineQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationInlineQuery, Update>? = InlineQueryFilterByUser,
     markerFactory: MarkerFactory<in LocationInlineQuery, Any>? = ByUserInlineQueryMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MainTrigger.kt

@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flatMapLatest
 
-internal suspend fun <BC : BehaviourContext, T> BC.on(
+internal fun <BC : BehaviourContext, T> BC.on(
     markerFactory: MarkerFactory<in T, Any>?,
     initialFilter: SimpleFilter<T>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupMessagesTriggers.kt

@@ -15,7 +15,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature
-internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupPartContent> BC.buildMediaGroupMessagesTrigger(
+internal inline fun <BC : BehaviourContext, reified T : MediaGroupPartContent> BC.buildMediaGroupMessagesTrigger(
     initialFilter: SimpleFilter<MediaGroupMessage<T>>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<T>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<T>, Any>? = ByChatMessageMarkerFactory,
@@ -44,7 +44,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupPartCo
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMediaGroupMessages(
+fun <BC : BehaviourContext> BC.onMediaGroupMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<MediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<MediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<MediaGroupPartContent>, Any>? = ByChatMessageMarkerFactory,
@@ -65,7 +65,7 @@ suspend fun <BC : BehaviourContext> BC.onMediaGroupMessages(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPlaylistMessages(
+fun <BC : BehaviourContext> BC.onPlaylistMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<AudioMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<AudioMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<AudioMediaGroupPartContent>, Any>? = ByChatMessageMarkerFactory,
@@ -86,7 +86,7 @@ suspend fun <BC : BehaviourContext> BC.onPlaylistMessages(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDocumentsGroupMessages(
+fun <BC : BehaviourContext> BC.onDocumentsGroupMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<DocumentMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<DocumentMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<DocumentMediaGroupPartContent>, Any>? = ByChatMessageMarkerFactory,
@@ -107,7 +107,7 @@ suspend fun <BC : BehaviourContext> BC.onDocumentsGroupMessages(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVisualGalleryMessages(
+fun <BC : BehaviourContext> BC.onVisualGalleryMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<VisualMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<VisualMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<VisualMediaGroupPartContent>, Any>? = ByChatMessageMarkerFactory,
@@ -128,7 +128,7 @@ suspend fun <BC : BehaviourContext> BC.onVisualGalleryMessages(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVisualMediaGroupMessages(
+fun <BC : BehaviourContext> BC.onVisualMediaGroupMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<VisualMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<VisualMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<VisualMediaGroupPartContent>, Any>? = ByChatMessageMarkerFactory,
@@ -149,7 +149,7 @@ suspend fun <BC : BehaviourContext> BC.onVisualMediaGroupMessages(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPhotoGalleryMessages(
+fun <BC : BehaviourContext> BC.onPhotoGalleryMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<PhotoContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<PhotoContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<PhotoContent>, Any>? = ByChatMessageMarkerFactory,
@@ -170,7 +170,7 @@ suspend fun <BC : BehaviourContext> BC.onPhotoGalleryMessages(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoGalleryMessages(
+fun <BC : BehaviourContext> BC.onVideoGalleryMessages(
     initialFilter: SimpleFilter<MediaGroupMessage<VideoContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupMessage<VideoContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupMessage<VideoContent>, Any>? = ByChatMessageMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt

@@ -15,7 +15,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature
-internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupPartContent> BC.buildMediaGroupTrigger(
+internal inline fun <BC : BehaviourContext, reified T : MediaGroupPartContent> BC.buildMediaGroupTrigger(
     initialFilter: SimpleFilter<MediaGroupContent<T>>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<T>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<T>, Any>? = AnyMarkerFactory(),
@@ -44,7 +44,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupPartCo
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onMediaGroup(
+fun <BC : BehaviourContext> BC.onMediaGroup(
     initialFilter: SimpleFilter<MediaGroupContent<MediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<MediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<MediaGroupPartContent>, Any>? = AnyMarkerFactory(),
@@ -65,7 +65,7 @@ suspend fun <BC : BehaviourContext> BC.onMediaGroup(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPlaylist(
+fun <BC : BehaviourContext> BC.onPlaylist(
     initialFilter: SimpleFilter<MediaGroupContent<AudioMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<AudioMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<AudioMediaGroupPartContent>, Any>? = AnyMarkerFactory(),
@@ -86,7 +86,7 @@ suspend fun <BC : BehaviourContext> BC.onPlaylist(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onDocumentsGroup(
+fun <BC : BehaviourContext> BC.onDocumentsGroup(
     initialFilter: SimpleFilter<MediaGroupContent<DocumentMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<DocumentMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<DocumentMediaGroupPartContent>, Any>? = AnyMarkerFactory(),
@@ -107,7 +107,7 @@ suspend fun <BC : BehaviourContext> BC.onDocumentsGroup(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVisualGallery(
+fun <BC : BehaviourContext> BC.onVisualGallery(
     initialFilter: SimpleFilter<MediaGroupContent<VisualMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<VisualMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<VisualMediaGroupPartContent>, Any>? = AnyMarkerFactory(),
@@ -128,7 +128,7 @@ suspend fun <BC : BehaviourContext> BC.onVisualGallery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVisualMediaGroup(
+fun <BC : BehaviourContext> BC.onVisualMediaGroup(
     initialFilter: SimpleFilter<MediaGroupContent<VisualMediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<VisualMediaGroupPartContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<VisualMediaGroupPartContent>, Any>? = AnyMarkerFactory(),
@@ -149,7 +149,7 @@ suspend fun <BC : BehaviourContext> BC.onVisualMediaGroup(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPhotoGallery(
+fun <BC : BehaviourContext> BC.onPhotoGallery(
     initialFilter: SimpleFilter<MediaGroupContent<PhotoContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<PhotoContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<PhotoContent>, Any>? = AnyMarkerFactory(),
@@ -170,7 +170,7 @@ suspend fun <BC : BehaviourContext> BC.onPhotoGallery(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onVideoGallery(
+fun <BC : BehaviourContext> BC.onVideoGallery(
     initialFilter: SimpleFilter<MediaGroupContent<VideoContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaGroupContent<VideoContent>, Update>? = null,
     markerFactory: MarkerFactory<in MediaGroupContent<VideoContent>, Any>? = AnyMarkerFactory(),

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MentionTriggers.kt

@@ -25,7 +25,7 @@ import dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
 import dev.inmo.tgbotapi.types.message.content.VoiceContent
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : TextedContent> BC.onMention(
+internal inline fun <BC : BehaviourContext, reified T : TextedContent> BC.onMention(
     username: Username,
     initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = null,
@@ -42,7 +42,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : TextedContent> B
     scenarioReceiver
 )
 
-internal suspend inline fun <BC : BehaviourContext, reified T : TextedContent> BC.onTextMention(
+internal inline fun <BC : BehaviourContext, reified T : TextedContent> BC.onTextMention(
     userId: UserId,
     initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = null,
@@ -59,7 +59,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : TextedContent> B
     scenarioReceiver
 )
 
-internal suspend inline fun <BC : BehaviourContext, reified T : TextedContent> BC.onMention(
+internal inline fun <BC : BehaviourContext, reified T : TextedContent> BC.onMention(
     user: User,
     initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = null,
@@ -82,7 +82,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : TextedContent> B
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithAnyContent(
+fun <BC : BehaviourContext> BC.onMentionWithAnyContent(
     username: Username,
     initialFilter: CommonMessageFilter<TextedContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextedContent>, Update>? = null,
@@ -96,7 +96,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithAnyContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithAnyContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithAnyContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<TextedContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextedContent>, Update>? = null,
@@ -110,7 +110,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithAnyContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithAnyContent(
+fun <BC : BehaviourContext> BC.onMentionWithAnyContent(
     user: User,
     initialFilter: CommonMessageFilter<TextedContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextedContent>, Update>? = null,
@@ -126,7 +126,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithAnyContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithVoiceContent(
+fun <BC : BehaviourContext> BC.onMentionWithVoiceContent(
     username: Username,
     initialFilter: CommonMessageFilter<VoiceContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VoiceContent>, Update>? = null,
@@ -140,7 +140,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithVoiceContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithVoiceContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithVoiceContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<VoiceContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VoiceContent>, Update>? = null,
@@ -154,7 +154,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithVoiceContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithVoiceContent(
+fun <BC : BehaviourContext> BC.onMentionWithVoiceContent(
     user: User,
     initialFilter: CommonMessageFilter<VoiceContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VoiceContent>, Update>? = null,
@@ -170,7 +170,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithVoiceContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
+fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
     username: Username,
     initialFilter: CommonMessageFilter<MediaGroupContent<MediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupContent<MediaGroupPartContent>>, Update>? = null,
@@ -184,7 +184,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithMediaGroupContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithMediaGroupContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<MediaGroupContent<MediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupContent<MediaGroupPartContent>>, Update>? = null,
@@ -198,7 +198,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithMediaGroupContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
+fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
     user: User,
     initialFilter: CommonMessageFilter<MediaGroupContent<MediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupContent<MediaGroupPartContent>>, Update>? = null,
@@ -214,7 +214,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupPartContent(
+fun <BC : BehaviourContext> BC.onMentionWithMediaGroupPartContent(
     username: Username,
     initialFilter: CommonMessageFilter<MediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupPartContent>, Update>? = null,
@@ -228,7 +228,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupPartContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithMediaGroupPartContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithMediaGroupPartContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<MediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupPartContent>, Update>? = null,
@@ -242,7 +242,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithMediaGroupPartContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupPartContent(
+fun <BC : BehaviourContext> BC.onMentionWithMediaGroupPartContent(
     user: User,
     initialFilter: CommonMessageFilter<MediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupPartContent>, Update>? = null,
@@ -258,7 +258,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupPartContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithAudioContent(
+fun <BC : BehaviourContext> BC.onMentionWithAudioContent(
     username: Username,
     initialFilter: CommonMessageFilter<AudioContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioContent>, Update>? = null,
@@ -272,7 +272,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithAudioContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithAudioContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithAudioContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<AudioContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioContent>, Update>? = null,
@@ -286,7 +286,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithAudioContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithAudioContent(
+fun <BC : BehaviourContext> BC.onMentionWithAudioContent(
     user: User,
     initialFilter: CommonMessageFilter<AudioContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioContent>, Update>? = null,
@@ -302,7 +302,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithAudioContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithDocumentContent(
+fun <BC : BehaviourContext> BC.onMentionWithDocumentContent(
     username: Username,
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentContent>, Update>? = null,
@@ -316,7 +316,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithDocumentContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithDocumentContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithDocumentContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentContent>, Update>? = null,
@@ -330,7 +330,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithDocumentContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithDocumentContent(
+fun <BC : BehaviourContext> BC.onMentionWithDocumentContent(
     user: User,
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentContent>, Update>? = null,
@@ -346,7 +346,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithDocumentContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithVisualMediaGroupPartContent(
+fun <BC : BehaviourContext> BC.onMentionWithVisualMediaGroupPartContent(
     username: Username,
     initialFilter: CommonMessageFilter<VisualMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VisualMediaGroupPartContent>, Update>? = null,
@@ -360,7 +360,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithVisualMediaGroupPartContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithVisualMediaGroupPartContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithVisualMediaGroupPartContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<VisualMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VisualMediaGroupPartContent>, Update>? = null,
@@ -374,7 +374,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithVisualMediaGroupPartCont
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithVisualMediaGroupPartContent(
+fun <BC : BehaviourContext> BC.onMentionWithVisualMediaGroupPartContent(
     user: User,
     initialFilter: CommonMessageFilter<VisualMediaGroupPartContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VisualMediaGroupPartContent>, Update>? = null,
@@ -390,7 +390,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithVisualMediaGroupPartContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithVideoContent(
+fun <BC : BehaviourContext> BC.onMentionWithVideoContent(
     username: Username,
     initialFilter: CommonMessageFilter<VideoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoContent>, Update>? = null,
@@ -404,7 +404,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithVideoContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithVideoContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithVideoContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<VideoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoContent>, Update>? = null,
@@ -418,7 +418,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithVideoContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithVideoContent(
+fun <BC : BehaviourContext> BC.onMentionWithVideoContent(
     user: User,
     initialFilter: CommonMessageFilter<VideoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoContent>, Update>? = null,
@@ -434,7 +434,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithVideoContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithPhotoContent(
+fun <BC : BehaviourContext> BC.onMentionWithPhotoContent(
     username: Username,
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PhotoContent>, Update>? = null,
@@ -448,7 +448,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithPhotoContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithPhotoContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithPhotoContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PhotoContent>, Update>? = null,
@@ -462,7 +462,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithPhotoContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithPhotoContent(
+fun <BC : BehaviourContext> BC.onMentionWithPhotoContent(
     user: User,
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PhotoContent>, Update>? = null,
@@ -478,7 +478,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithPhotoContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithAnimationContent(
+fun <BC : BehaviourContext> BC.onMentionWithAnimationContent(
     username: Username,
     initialFilter: CommonMessageFilter<AnimationContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AnimationContent>, Update>? = null,
@@ -492,7 +492,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithAnimationContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithAnimationContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithAnimationContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<AnimationContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AnimationContent>, Update>? = null,
@@ -506,7 +506,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithAnimationContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithAnimationContent(
+fun <BC : BehaviourContext> BC.onMentionWithAnimationContent(
     user: User,
     initialFilter: CommonMessageFilter<AnimationContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AnimationContent>, Update>? = null,
@@ -522,7 +522,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithAnimationContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithTextContent(
+fun <BC : BehaviourContext> BC.onMentionWithTextContent(
     username: Username,
     initialFilter: CommonMessageFilter<TextContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update>? = null,
@@ -536,7 +536,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithTextContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onTextMentionWithTextContent(
+fun <BC : BehaviourContext> BC.onTextMentionWithTextContent(
     userId: UserId,
     initialFilter: CommonMessageFilter<TextContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update>? = null,
@@ -550,7 +550,7 @@ suspend fun <BC : BehaviourContext> BC.onTextMentionWithTextContent(
  * [scenarioReceiver] will be called synchronously in one "stream". Output of [markerFactory] will be used as a key for
  * "stream"
  */
-suspend fun <BC : BehaviourContext> BC.onMentionWithTextContent(
+fun <BC : BehaviourContext> BC.onMentionWithTextContent(
     user: User,
     initialFilter: CommonMessageFilter<TextContent>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update>? = null,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PaidMediaPurchasedTriggers.kt

@@ -30,7 +30,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
+fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
     initialFilter: SimpleFilter<PaidMediaPurchased>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PaidMediaPurchased, Update>? = null,
     markerFactory: MarkerFactory<in PaidMediaPurchased, Any>? = ByUserPaidMediaPurchasedMarkerFactory,
@@ -54,7 +54,7 @@ suspend fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
+fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
     paidMediaPayloadRegex: Regex,
     initialFilter: SimpleFilter<PaidMediaPurchased>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PaidMediaPurchased, Update>? = null,
@@ -83,7 +83,7 @@ suspend fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
+fun <BC : BehaviourContext> BC.onPaidMediaPurchased(
     paidMediaPayload: PaidMediaPayload,
     initialFilter: SimpleFilter<PaidMediaPurchased>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PaidMediaPurchased, Update>? = null,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PassportTriggers.kt

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElement
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : EncryptedPassportElement> BC.onPassportMessageWith(
+internal inline fun <BC : BehaviourContext, reified T : EncryptedPassportElement> BC.onPassportMessageWith(
     initialFilter: SimpleFilter<PassportMessage>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PassportMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PassportMessage, Any>? = ByChatMessageMarkerFactory,
@@ -35,7 +35,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : EncryptedPasspor
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPassportMessage(
+fun <BC : BehaviourContext> BC.onPassportMessage(
     initialFilter: SimpleFilter<PassportMessage>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PassportMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PassportMessage, Any>? = ByChatMessageMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PollAnswersTriggers.kt

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.extensions.utils.pollAnswerUpdateOrNull
 import dev.inmo.tgbotapi.types.polls.PollAnswer
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext> BC.onPollAnswered(
+internal inline fun <BC : BehaviourContext> BC.onPollAnswered(
     initialFilter: SimpleFilter<PollAnswer>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PollAnswer, Update>? = null,
     markerFactory: MarkerFactory<in PollAnswer, Any>? = ByIdPollAnswerMarkerFactory,
@@ -33,7 +33,7 @@ internal suspend inline fun <BC : BehaviourContext> BC.onPollAnswered(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPollAnswer(
+fun <BC : BehaviourContext> BC.onPollAnswer(
     initialFilter: SimpleFilter<PollAnswer>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PollAnswer, Update>? = null,
     markerFactory: MarkerFactory<in PollAnswer, Any>? = ByIdPollAnswerMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PollUpdatesTriggers.kt

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.extensions.utils.pollUpdateOrNull
 import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
-internal suspend inline fun <BC : BehaviourContext, reified T : Poll> BC.onPollUpdatedBase(
+internal inline fun <BC : BehaviourContext, reified T : Poll> BC.onPollUpdatedBase(
     initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
     markerFactory: MarkerFactory<in T, Any>? = ByIdPollMarkerFactory,
@@ -33,7 +33,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : Poll> BC.onPollU
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPollUpdates(
+fun <BC : BehaviourContext> BC.onPollUpdates(
     initialFilter: SimpleFilter<Poll>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Poll, Update>? = null,
     markerFactory: MarkerFactory<in Poll, Any>? = ByIdPollMarkerFactory,
@@ -60,7 +60,7 @@ suspend fun <BC : BehaviourContext> BC.onPollUpdates(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onRegularPollUpdates(
+fun <BC : BehaviourContext> BC.onRegularPollUpdates(
     initialFilter: SimpleFilter<RegularPoll>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, RegularPoll, Update>? = null,
     markerFactory: MarkerFactory<in RegularPoll, Any>? = ByIdPollMarkerFactory,
@@ -87,7 +87,7 @@ suspend fun <BC : BehaviourContext> BC.onRegularPollUpdates(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onQuizPollUpdates(
+fun <BC : BehaviourContext> BC.onQuizPollUpdates(
     initialFilter: SimpleFilter<QuizPoll>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, QuizPoll, Update>? = null,
     markerFactory: MarkerFactory<in QuizPoll, Any>? = ByIdPollMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PreCheckoutQueryTriggers.kt

@@ -26,7 +26,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onPreCheckoutQuery(
+fun <BC : BehaviourContext> BC.onPreCheckoutQuery(
     initialFilter: SimpleFilter<PreCheckoutQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PreCheckoutQuery, Update>? = PreCheckoutQueryFilterByUser,
     markerFactory: MarkerFactory<in PreCheckoutQuery, Any>? = ByUserPreCheckoutQueryMarkerFactory,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ShippingQueryTriggers.kt

@@ -26,7 +26,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
-suspend fun <BC : BehaviourContext> BC.onShippingQuery(
+fun <BC : BehaviourContext> BC.onShippingQuery(
     initialFilter: SimpleFilter<ShippingQuery>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ShippingQuery, Update>? = ShippingQueryFilterByUser,
     markerFactory: MarkerFactory<in ShippingQuery, Any>? = ByUserShippingQueryMarkerFactory,

tgbotapi.core/api/tgbotapi.core.api

@@ -241,11 +241,17 @@ public final class dev/inmo/tgbotapi/abstracts/types/WithReplyParameters$Default
 
 public abstract class dev/inmo/tgbotapi/bot/BaseRequestsExecutor : dev/inmo/tgbotapi/bot/RequestsExecutor {
 	public fun <init> (Ldev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper;)V
+	public fun getLog ()Ldev/inmo/kslog/common/KSLog;
 	protected final fun getTelegramAPIUrlsKeeper ()Ldev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper;
 }
 
 public abstract interface class dev/inmo/tgbotapi/bot/RequestsExecutor : java/io/Closeable {
 	public abstract fun execute (Ldev/inmo/tgbotapi/requests/abstracts/Request;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getLog ()Ldev/inmo/kslog/common/KSLog;
+}
+
+public final class dev/inmo/tgbotapi/bot/RequestsExecutor$DefaultImpls {
+	public static fun getLog (Ldev/inmo/tgbotapi/bot/RequestsExecutor;)Ldev/inmo/kslog/common/KSLog;
 }
 
 public abstract class dev/inmo/tgbotapi/bot/exceptions/BotException : java/io/IOException, kotlinx/coroutines/CopyableThrowable {
@@ -416,6 +422,7 @@ public final class dev/inmo/tgbotapi/bot/ktor/base/AbstractRequestCallFactoryKt
 public final class dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor : dev/inmo/tgbotapi/bot/BaseRequestsExecutor {
 	public fun close ()V
 	public fun execute (Ldev/inmo/tgbotapi/requests/abstracts/Request;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getLog ()Ldev/inmo/kslog/common/KSLog;
 }
 
 public final class dev/inmo/tgbotapi/bot/ktor/base/DownloadFileChannelRequestCallFactory : dev/inmo/tgbotapi/bot/ktor/KtorCallFactory {
@@ -439,6 +446,7 @@ public final class dev/inmo/tgbotapi/bot/ktor/base/MultipleClientKtorRequestsExe
 	public fun <init> (Ldev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper;Ljava/util/List;ZLdev/inmo/tgbotapi/bot/settings/limiters/RequestLimiter;Lkotlinx/serialization/json/Json;Ldev/inmo/tgbotapi/bot/ktor/TelegramBotPipelinesHandler;ILdev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function0;)V
 	public fun close ()V
 	public fun execute (Ldev/inmo/tgbotapi/requests/abstracts/Request;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getLog ()Ldev/inmo/kslog/common/KSLog;
 }
 
 public final class dev/inmo/tgbotapi/bot/ktor/base/SimpleRequestCallFactory : dev/inmo/tgbotapi/bot/ktor/base/AbstractRequestCallFactory {
@@ -541,6 +549,7 @@ public final class dev/inmo/tgbotapi/bot/multiserver/SimpleMultiServerRequestsEx
 	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
 	public fun execute (Ldev/inmo/tgbotapi/requests/abstracts/Request;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getLog ()Ldev/inmo/kslog/common/KSLog;
 }
 
 public final class dev/inmo/tgbotapi/bot/multiserver/SimpleMultiServerRequestsExecutor$Companion {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/RequestsExecutor.kt

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.bot
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import io.ktor.utils.io.core.Closeable
 
 /**
@@ -11,6 +13,8 @@ import io.ktor.utils.io.core.Closeable
  * @see dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutor
  */
 interface RequestsExecutor : Closeable {
+    val Log: KSLog
+        get() = DefaultKTgBotAPIKSLog
     /**
      * Unsafe execution of incoming [request]. Can throw almost any exception. So, it is better to use
      * something like [dev.inmo.tgbotapi.extensions.utils.shortcuts.executeAsync] or

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutor.kt

@@ -29,6 +29,7 @@ expect class KtorRequestsExecutor internal constructor(
     logger: KSLog,
     diff: Unit // just a diff property to know where constructor and where calling function with defaults
 ) : BaseRequestsExecutor {
+    override val Log: KSLog
     override suspend fun <T : Any> execute(request: Request<T>): T
     override fun close()
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt

@@ -30,6 +30,7 @@ class DefaultKtorRequestsExecutor internal constructor(
     private val logger: KSLog,
     diff: Unit
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
+    override val Log: KSLog = logger
     private val callsFactories: List<KtorCallFactory> = callsFactories.run {
         if (!excludeDefaultFactories) {
             this@DefaultKtorRequestsExecutor.logger.v { "Installing default factories" }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/MultipleClientKtorRequestsExecutor.kt

@@ -49,6 +49,7 @@ class MultipleClientKtorRequestsExecutor(
     logger: KSLog,
     clientFactory: () -> HttpClient,
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
+    override val Log: KSLog = logger
     private val requestExecutors = (0 until requestExecutorsCount).map {
         DefaultKtorRequestsExecutor(
             telegramAPIUrlsKeeper,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/multiserver/SimpleMultiServerRequestsExecutor.kt

@@ -1,10 +1,12 @@
 package dev.inmo.tgbotapi.bot.multiserver
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import kotlinx.coroutines.*
 import kotlin.js.JsName
@@ -29,6 +31,8 @@ class SimpleMultiServerRequestsExecutor(
         bots.forEach(TelegramBot::close)
     }
 ) : RequestsExecutor {
+    override val Log: KSLog
+        get() = bots.firstNotNullOfOrNull { it.Log } ?: DefaultKTgBotAPIKSLog
     override suspend fun <T : Any> execute(request: Request<T>): T {
         var currentBot = bots.botSelector(-1, null)
         while (currentCoroutineContext().isActive) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/EntitiesBuilder.kt

@@ -12,7 +12,56 @@ import dev.inmo.tgbotapi.types.message.textsources.*
 typealias EntitiesBuilderBody = EntitiesBuilder.() -> Unit
 val newLine = regularTextSource("\n")
 
+/**
+ * Documentation: [DSL text](https://docs.inmo.dev/tgbotapi/dsls/text.html)
+ *
+ * Example: [PollsBot](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/blob/master/PollsBot/src/main/kotlin/PollsBot.kt)
+ *
+ * @see dev.inmo.tgbotapi.utils.bold
+ * @see dev.inmo.tgbotapi.utils.blockquote
+ * @see dev.inmo.tgbotapi.utils.expandableBlockquote
+ * @see dev.inmo.tgbotapi.utils.spoiler
+ * @see dev.inmo.tgbotapi.utils.botCommand
+ * @see dev.inmo.tgbotapi.utils.cashTag
+ * @see dev.inmo.tgbotapi.utils.code
+ * @see dev.inmo.tgbotapi.utils.email
+ * @see dev.inmo.tgbotapi.utils.hashtag
+ * @see dev.inmo.tgbotapi.utils.italic
+ * @see dev.inmo.tgbotapi.utils.mention
+ * @see dev.inmo.tgbotapi.utils.phone
+ * @see dev.inmo.tgbotapi.utils.pre
+ * @see dev.inmo.tgbotapi.utils.regular
+ * @see dev.inmo.tgbotapi.utils.strikethrough
+ * @see dev.inmo.tgbotapi.utils.link
+ * @see dev.inmo.tgbotapi.utils.underline
+ * @see dev.inmo.tgbotapi.utils.customEmoji
+ */
 inline fun buildEntities(separator: TextSource? = null, init: EntitiesBuilderBody): TextSourcesList = EntitiesBuilder(separator).apply(init).build()
+
+/**
+ * Documentation: [DSL text](https://docs.inmo.dev/tgbotapi/dsls/text.html)
+ *
+ * Example: [PollsBot](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/blob/master/PollsBot/src/main/kotlin/PollsBot.kt)
+ *
+ * @see dev.inmo.tgbotapi.utils.bold
+ * @see dev.inmo.tgbotapi.utils.blockquote
+ * @see dev.inmo.tgbotapi.utils.expandableBlockquote
+ * @see dev.inmo.tgbotapi.utils.spoiler
+ * @see dev.inmo.tgbotapi.utils.botCommand
+ * @see dev.inmo.tgbotapi.utils.cashTag
+ * @see dev.inmo.tgbotapi.utils.code
+ * @see dev.inmo.tgbotapi.utils.email
+ * @see dev.inmo.tgbotapi.utils.hashtag
+ * @see dev.inmo.tgbotapi.utils.italic
+ * @see dev.inmo.tgbotapi.utils.mention
+ * @see dev.inmo.tgbotapi.utils.phone
+ * @see dev.inmo.tgbotapi.utils.pre
+ * @see dev.inmo.tgbotapi.utils.regular
+ * @see dev.inmo.tgbotapi.utils.strikethrough
+ * @see dev.inmo.tgbotapi.utils.link
+ * @see dev.inmo.tgbotapi.utils.underline
+ * @see dev.inmo.tgbotapi.utils.customEmoji
+ */
 inline fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regularTextSource(separator), init)
 
 /**

tgbotapi.utils/api/tgbotapi.utils.api

@@ -3609,20 +3609,21 @@ public final class dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPol
 }
 
 public final class dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluderKt {
-	public static final fun updateHandlerWithMediaGroupsAdaptation (Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlin/jvm/functions/Function2;
-	public static final fun updateHandlerWithMediaGroupsAdaptation (Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;J)Lkotlin/jvm/functions/Function2;
-	public static synthetic fun updateHandlerWithMediaGroupsAdaptation$default (Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JILjava/lang/Object;)Lkotlin/jvm/functions/Function2;
+	public static final fun updateHandlerWithMediaGroupsAdaptation (Lkotlinx/coroutines/CoroutineScope;Ldev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;)Lkotlin/jvm/functions/Function2;
+	public static final fun updateHandlerWithMediaGroupsAdaptation (Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLdev/inmo/kslog/common/KSLog;)Lkotlin/jvm/functions/Function2;
+	public static synthetic fun updateHandlerWithMediaGroupsAdaptation$default (Lkotlinx/coroutines/CoroutineScope;Ldev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlin/jvm/functions/Function2;
+	public static synthetic fun updateHandlerWithMediaGroupsAdaptation$default (Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLdev/inmo/kslog/common/KSLog;ILjava/lang/Object;)Lkotlin/jvm/functions/Function2;
 }
 
 public final class dev/inmo/tgbotapi/extensions/utils/updates/retrieving/WebhookKt {
-	public static final fun includeWebhookHandlingInRoute (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLkotlin/jvm/functions/Function2;)V
-	public static synthetic fun includeWebhookHandlingInRoute$default (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
-	public static final fun includeWebhookHandlingInRouteWithFlows (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLkotlin/jvm/functions/Function1;)V
-	public static synthetic fun includeWebhookHandlingInRouteWithFlows$default (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public static final fun setWebhookInfoAndStartListenWebhooks (Ldev/inmo/tgbotapi/bot/RequestsExecutor;ILio/ktor/server/engine/ApplicationEngineFactory;Ldev/inmo/tgbotapi/requests/webhook/SetWebhookRequest;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun setWebhookInfoAndStartListenWebhooks$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;ILio/ktor/server/engine/ApplicationEngineFactory;Ldev/inmo/tgbotapi/requests/webhook/SetWebhookRequest;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun startListenWebhooks (ILio/ktor/server/engine/ApplicationEngineFactory;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lio/ktor/server/engine/EmbeddedServer;
-	public static synthetic fun startListenWebhooks$default (ILio/ktor/server/engine/ApplicationEngineFactory;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lio/ktor/server/engine/EmbeddedServer;
+	public static final fun includeWebhookHandlingInRoute (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLdev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;)V
+	public static synthetic fun includeWebhookHandlingInRoute$default (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLdev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+	public static final fun includeWebhookHandlingInRouteWithFlows (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLdev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function1;)V
+	public static synthetic fun includeWebhookHandlingInRouteWithFlows$default (Lio/ktor/server/routing/Route;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JLdev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+	public static final fun setWebhookInfoAndStartListenWebhooks (Ldev/inmo/tgbotapi/bot/RequestsExecutor;ILio/ktor/server/engine/ApplicationEngineFactory;Ldev/inmo/tgbotapi/requests/webhook/SetWebhookRequest;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ldev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun setWebhookInfoAndStartListenWebhooks$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;ILio/ktor/server/engine/ApplicationEngineFactory;Ldev/inmo/tgbotapi/requests/webhook/SetWebhookRequest;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ldev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun startListenWebhooks (ILio/ktor/server/engine/ApplicationEngineFactory;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ldev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;)Lio/ktor/server/engine/EmbeddedServer;
+	public static synthetic fun startListenWebhooks$default (ILio/ktor/server/engine/ApplicationEngineFactory;Lkotlin/jvm/functions/Function2;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/updateshandlers/webhook/WebhookPrivateKeyConfig;Lkotlinx/coroutines/CoroutineScope;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ldev/inmo/kslog/common/KSLog;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lio/ktor/server/engine/EmbeddedServer;
 }
 
 public final class dev/inmo/tgbotapi/types/files/PathedFileAsStreamKt {

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt

@@ -14,6 +14,7 @@ import dev.inmo.tgbotapi.types.update.*
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.*
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import io.ktor.client.plugins.HttpRequestTimeoutException
 import io.ktor.utils.io.CancellationException
 import kotlinx.coroutines.*
@@ -33,20 +34,20 @@ fun TelegramBot.longPollingFlow(
     mediaGroupsDebounceTimeMillis: Long? = 1000L,
 ): Flow<Update> = channelFlow {
     if (autoDisableWebhooks) {
-        runCatchingSafely {
+        runCatchingLogging(logger = Log) {
             execute(DeleteWebhook())
         }
     }
 
-    val contextSafelyExceptionHandler = coroutineContext[ContextSafelyExceptionHandlerKey]
-    val contextToWork = if (contextSafelyExceptionHandler == null || !autoSkipTimeoutExceptions) {
+    val contextSafelyExceptionHandler = coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?: defaultSafelyExceptionHandler
+    val contextToWork = if (!autoSkipTimeoutExceptions) {
         coroutineContext
     } else {
         coroutineContext + ContextSafelyExceptionHandler { e ->
             if (e is HttpRequestTimeoutException || (e is CommonBotException && e.cause is HttpRequestTimeoutException)) {
                 return@ContextSafelyExceptionHandler
             } else {
-                contextSafelyExceptionHandler.handler(e)
+                contextSafelyExceptionHandler(e)
             }
         }
     }
@@ -61,7 +62,8 @@ fun TelegramBot.longPollingFlow(
                     send(it)
                 }
             },
-            mediaGroupsDebounceTimeMillis
+            mediaGroupsDebounceTimeMillis,
+            logger = Log
         );
         { originalUpdates: List<Update> ->
             originalUpdates.forEach {
@@ -72,6 +74,13 @@ fun TelegramBot.longPollingFlow(
     } else {
         { originalUpdates: List<Update> ->
             val converted = originalUpdates.convertWithMediaGroupUpdates()
+
+            /**
+             * Dirty hack for cases when the media group was retrieved not fully:
+             *
+             * We are throw out the last media group and will reretrieve it again in the next get updates
+             * and it will guarantee that it is full
+             */
             /**
              * Dirty hack for cases when the media group was retrieved not fully:
              *
@@ -80,14 +89,14 @@ fun TelegramBot.longPollingFlow(
              */
             val updates = if (
                 originalUpdates.size == getUpdatesLimit.last
-                && ((converted.last() as? BaseSentMessageUpdate) ?.data as? CommonMessage<*>) ?.content is MediaGroupContent<*>
+                && ((converted.last() as? BaseSentMessageUpdate)?.data as? CommonMessage<*>)?.content is MediaGroupContent<*>
             ) {
                 converted - converted.last()
             } else {
                 converted
             }
 
-            safelyWithResult {
+            runCatching {
                 for (update in updates) {
                     send(update)
 
@@ -96,25 +105,16 @@ fun TelegramBot.longPollingFlow(
                     }
                 }
             }.onFailure {
-                cancel(it as? CancellationException ?: return@onFailure)
+                if (it is CancellationException) {
+                    cancel(it)
+                }
             }
         }
     }
 
     withContext(contextToWork) {
         while (isActive) {
-            safely(
-                { e ->
-                    val isHttpRequestTimeoutException = e is HttpRequestTimeoutException || (e is CommonBotException && e.cause is HttpRequestTimeoutException)
-                    if (isHttpRequestTimeoutException && autoSkipTimeoutExceptions) {
-                        return@safely
-                    }
-                    exceptionsHandler ?.invoke(e)
-                    if (e is RequestException) {
-                        delay(1000L)
-                    }
-                }
-            ) {
+            runCatching {
                 execute(
                     GetUpdates(
                         offset = lastUpdateIdentifier?.plus(1),
@@ -124,6 +124,16 @@ fun TelegramBot.longPollingFlow(
                 ).let { originalUpdates ->
                     updatesHandler(originalUpdates)
                 }
+            }.onFailure { e ->
+                val isHttpRequestTimeoutException =
+                    e is HttpRequestTimeoutException || (e is CommonBotException && e.cause is HttpRequestTimeoutException)
+                if (isHttpRequestTimeoutException && autoSkipTimeoutExceptions) {
+                    return@onFailure
+                }
+                exceptionsHandler?.invoke(e)
+                if (e is RequestException) {
+                    delay(1000L)
+                }
             }
         }
     }

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt

@@ -1,11 +1,14 @@
 package dev.inmo.tgbotapi.extensions.utils.updates.retrieving
 
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
 import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.extensions.accumulateByKey
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
@@ -19,7 +22,8 @@ import kotlinx.coroutines.launch
  */
 fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
     output: UpdateReceiver<Update>,
-    debounceTimeMillis: Long = 1000L
+    debounceTimeMillis: Long = 1000L,
+    logger: KSLog = DefaultKTgBotAPIKSLog
 ): UpdateReceiver<Update> {
     val updatesChannel = Channel<Update>(Channel.UNLIMITED)
     val mediaGroupChannel = Channel<Pair<String, BaseMessageUpdate>>(Channel.UNLIMITED)
@@ -29,7 +33,7 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
     )
 
     launch {
-        launchSafelyWithoutExceptions {
+        launchLoggingDropExceptions(logger = logger) {
             for (update in updatesChannel) {
                 val data = update.data
                 when {
@@ -40,7 +44,7 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
                 }
             }
         }
-        launchSafelyWithoutExceptions {
+        launchLoggingDropExceptions(logger = logger) {
             for ((_, mediaGroup) in mediaGroupAccumulatedChannel) {
                 mediaGroup.convertWithMediaGroupUpdates().forEach {
                     output(it)
@@ -59,5 +63,6 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
  * @see UpdateReceiver
  */
 fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
+    logger: KSLog = DefaultKTgBotAPIKSLog,
     output: UpdateReceiver<Update>
-) = updateHandlerWithMediaGroupsAdaptation(output, 1000L)
+) = updateHandlerWithMediaGroupsAdaptation(output, 1000L, logger = logger)

tgbotapi.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.extensions.utils.updates.retrieving
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.micro_utils.coroutines.ExceptionHandler
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
@@ -12,6 +13,7 @@ import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
 import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver
 import dev.inmo.tgbotapi.updateshandlers.UpdatesFilter
 import dev.inmo.tgbotapi.updateshandlers.webhook.WebhookPrivateKeyConfig
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import io.ktor.http.*
 import io.ktor.server.engine.*
 import io.ktor.server.request.*
@@ -40,9 +42,10 @@ fun Route.includeWebhookHandlingInRoute(
     scope: CoroutineScope,
     exceptionsHandler: ExceptionHandler<Unit>? = null,
     mediaGroupsDebounceTimeMillis: Long = 1000L,
+    logger: KSLog = DefaultKTgBotAPIKSLog,
     block: UpdateReceiver<Update>,
 ) {
-    val transformer = scope.updateHandlerWithMediaGroupsAdaptation(block, mediaGroupsDebounceTimeMillis)
+    val transformer = scope.updateHandlerWithMediaGroupsAdaptation(block, mediaGroupsDebounceTimeMillis, logger = logger)
     post {
         try {
             runCatchingSafely {
@@ -71,11 +74,13 @@ fun Route.includeWebhookHandlingInRouteWithFlows(
     scope: CoroutineScope,
     exceptionsHandler: ExceptionHandler<Unit>? = null,
     mediaGroupsDebounceTimeMillis: Long = 1000L,
+    logger: KSLog = DefaultKTgBotAPIKSLog,
     block: FlowsUpdatesFilter.() -> Unit,
 ) = includeWebhookHandlingInRoute(
     scope,
     exceptionsHandler,
     mediaGroupsDebounceTimeMillis,
+    logger,
     flowsUpdatesFilter(block = block).asUpdateReceiver
 )
 
@@ -105,6 +110,7 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
     mediaGroupsDebounceTimeMillis: Long = 1000L,
     additionalApplicationEnvironmentConfigurator: ApplicationEnvironmentBuilder.() -> Unit = {},
     additionalEngineConfigurator: TConfiguration.() -> Unit = {},
+    logger: KSLog = DefaultKTgBotAPIKSLog,
     block: UpdateReceiver<Update>,
 ): EmbeddedServer<TEngine, TConfiguration> =
     embeddedServer(
@@ -134,12 +140,19 @@ fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configurati
             routing {
                 listenRoute?.also {
                     createRouteFromPath(it).includeWebhookHandlingInRoute(
-                        scope,
-                        exceptionsHandler,
-                        mediaGroupsDebounceTimeMillis,
-                        block
+                        scope = scope,
+                        exceptionsHandler = exceptionsHandler,
+                        mediaGroupsDebounceTimeMillis = mediaGroupsDebounceTimeMillis,
+                        logger = logger,
+                        block = block
                     )
-                } ?: includeWebhookHandlingInRoute(scope, exceptionsHandler, mediaGroupsDebounceTimeMillis, block)
+                } ?: includeWebhookHandlingInRoute(
+                    scope = scope,
+                    exceptionsHandler = exceptionsHandler,
+                    mediaGroupsDebounceTimeMillis = mediaGroupsDebounceTimeMillis,
+                    logger = logger,
+                    block = block
+                )
             }
         }
     ).also {
@@ -173,21 +186,23 @@ suspend fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Con
     mediaGroupsDebounceTimeMillis: Long = 1000L,
     additionalApplicationEnvironmentConfigurator: ApplicationEnvironmentBuilder.() -> Unit = {},
     additionalEngineConfigurator: TConfiguration.() -> Unit = {},
+    logger: KSLog = Log,
     block: UpdateReceiver<Update>,
 ): EmbeddedServer<TEngine, TConfiguration> = try {
     execute(setWebhookRequest)
     startListenWebhooks(
-        listenPort,
-        engineFactory,
-        exceptionsHandler,
-        listenHost,
-        listenRoute,
-        privateKeyConfig,
-        scope,
-        mediaGroupsDebounceTimeMillis,
-        additionalApplicationEnvironmentConfigurator,
-        additionalEngineConfigurator,
-        block
+        listenPort = listenPort,
+        engineFactory = engineFactory,
+        exceptionsHandler = exceptionsHandler,
+        listenHost = listenHost,
+        listenRoute = listenRoute,
+        privateKeyConfig = privateKeyConfig,
+        scope = scope,
+        mediaGroupsDebounceTimeMillis = mediaGroupsDebounceTimeMillis,
+        additionalApplicationEnvironmentConfigurator = additionalApplicationEnvironmentConfigurator,
+        additionalEngineConfigurator = additionalEngineConfigurator,
+        logger = logger,
+        block = block
     )
 } catch (e: Exception) {
     throw e