From d07e8fc4071c5cd5a4c4ee5fe7e4b2002fe4cb7a Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sat, 4 Feb 2023 20:14:15 +0200 Subject: [PATCH] Extended logic filter arguments --- aiogram/filters/logic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aiogram/filters/logic.py b/aiogram/filters/logic.py index b9c95de1..7cd2503c 100644 --- a/aiogram/filters/logic.py +++ b/aiogram/filters/logic.py @@ -59,16 +59,16 @@ class _OrFilter(_LogicFilter): return False -def and_f(target1: "CallbackType", target2: "CallbackType") -> _AndFilter: +def and_f(*targets: "CallbackType") -> _AndFilter: from aiogram.dispatcher.event.handler import FilterObject - return _AndFilter(FilterObject(target1), FilterObject(target2)) + return _AndFilter(*(FilterObject(target) for target in targets)) -def or_f(target1: "CallbackType", target2: "CallbackType") -> _OrFilter: +def or_f(*targets: "CallbackType") -> _OrFilter: from aiogram.dispatcher.event.handler import FilterObject - return _OrFilter(FilterObject(target1), FilterObject(target2)) + return _OrFilter(*(FilterObject(target) for target in targets)) def invert_f(target: "CallbackType") -> _InvertFilter: