mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2025-09-04 15:49:41 +00:00
fix in build?:)
This commit is contained in:
@@ -46,24 +46,25 @@ internal inline fun <BC : BehaviourContext, reified T : DataCallbackQuery> BC.on
|
|||||||
noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
|
noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
|
||||||
): Job = launchInNewSubContext {
|
): Job = launchInNewSubContext {
|
||||||
val newInitialFilter = SimpleFilter<DataCallbackQuery> {
|
val newInitialFilter = SimpleFilter<DataCallbackQuery> {
|
||||||
it is T && initialFilter?.invoke(it) ?: true
|
it is T && (initialFilter ?.invoke(it) ?: true)
|
||||||
}::invoke
|
}
|
||||||
|
val newInitialFilterInvoke = newInitialFilter::invoke
|
||||||
runCatching {
|
runCatching {
|
||||||
onCallbackQuery(
|
this@launchInNewSubContext.onCallbackQuery(
|
||||||
initialFilter,
|
newInitialFilter,
|
||||||
subcontextUpdatesFilter,
|
subcontextUpdatesFilter,
|
||||||
markerFactory,
|
markerFactory,
|
||||||
additionalSubcontextInitialAction,
|
additionalSubcontextInitialAction,
|
||||||
scenarioReceiver
|
scenarioReceiver
|
||||||
)
|
)
|
||||||
}.onFailure {
|
}.onFailure {
|
||||||
triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilter)
|
this@launchInNewSubContext.triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilterInvoke)
|
||||||
}.onSuccess {
|
}.onSuccess {
|
||||||
triggersHolder.handleableCallbackQueriesDataHolder.registerHandleable(newInitialFilter)
|
this@launchInNewSubContext.triggersHolder.handleableCallbackQueriesDataHolder.registerHandleable(newInitialFilterInvoke)
|
||||||
it.invokeOnCompletion {
|
it.invokeOnCompletion {
|
||||||
runCatching {
|
runCatching {
|
||||||
launchSafelyWithoutExceptions {
|
launchSafelyWithoutExceptions {
|
||||||
triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilter)
|
this@launchInNewSubContext.triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilterInvoke)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -89,7 +90,7 @@ fun <BC : BehaviourContext> BC.onDataCallbackQuery(
|
|||||||
markerFactory: MarkerFactory<in DataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
|
markerFactory: MarkerFactory<in DataCallbackQuery, Any>? = ByUserCallbackQueryMarkerFactory,
|
||||||
additionalSubcontextInitialAction: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, Update, DataCallbackQuery>? = null,
|
additionalSubcontextInitialAction: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, Update, DataCallbackQuery>? = null,
|
||||||
scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
|
scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
|
||||||
) = onDataCallbackQueryCounted(
|
): Job = onDataCallbackQueryCounted(
|
||||||
initialFilter,
|
initialFilter,
|
||||||
subcontextUpdatesFilter,
|
subcontextUpdatesFilter,
|
||||||
markerFactory,
|
markerFactory,
|
||||||
|
Reference in New Issue
Block a user