Update BotCommandTextSource.kt

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

@@ -40,7 +40,7 @@ suspend fun BehaviourContext.waitCommandMessage(
 ) = waitCommandMessage(Regex(command), initRequest, errorFactory)
 
 fun Flow<CommonMessage<TextContent>>.requireCommandAtStart() = filter {
-    (it.content.textSources.firstOrNull() as? BotCommandTextSource) != null
+    it.content.textSources.firstOrNull() is BotCommandTextSource
 }
 
 /**
@@ -61,7 +61,7 @@ fun Flow<CommonMessage<TextContent>>.requireSingleCommand() = filter {
         }
     }
 
-    true
+    count == 1
 }
 
 /**

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/textsources/BotCommandTextSource.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.message.textsources
 
 import dev.inmo.tgbotapi.types.usernameRegex
+import dev.inmo.tgbotapi.types.Username
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@@ -17,8 +18,8 @@ data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstru
     val command: String by lazy {
         commandRegex.find(source) ?.value ?.substring(1) ?: source.substring(1)// skip first symbol like "/" or "!"
     }
-    val username: String? by lazy {
-        usernameRegex.find(source) ?.value ?.substring(1) ?: source.substring(1)// skip first symbol "@"
+    val username: Username? by lazy {
+        Username(usernameRegex.find(source) ?.value ?: return@lazy null)
     }
 
     override val markdown: String by lazy { source.commandMarkdown() }