From fd5e0b5b222a0e0278a6c74798c543d6d624bb45 Mon Sep 17 00:00:00 2001 From: profitroll Date: Fri, 13 Jan 2023 10:43:27 +0100 Subject: [PATCH] Spoilers on custom filters --- modules/commands/spoiler.py | 2 +- modules/custom_filters.py | 4 ++++ modules/handlers/everything.py | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/commands/spoiler.py b/modules/commands/spoiler.py index 48b203e..44f858b 100644 --- a/modules/commands/spoiler.py +++ b/modules/commands/spoiler.py @@ -10,7 +10,7 @@ from modules.database import col_spoilers from modules import custom_filters # Spoiler command ============================================================================================================== -@app.on_message(custom_filters.member & ~filters.scheduled & filters.private & filters.command(["spoiler"], prefixes=["/"])) +@app.on_message(custom_filters.enabled_spoilers & custom_filters.member & ~filters.scheduled & filters.private & filters.command(["spoiler"], prefixes=["/"])) async def cmd_spoiler(app: Client, msg: Message): try: diff --git a/modules/custom_filters.py b/modules/custom_filters.py index 4fa39fe..529a055 100644 --- a/modules/custom_filters.py +++ b/modules/custom_filters.py @@ -39,6 +39,9 @@ async def enabled_invites_check_func(_, __, msg: Message): async def enabled_dinovoice_func(_, __, msg: Message): return configGet("enabled", "features", "dinovoice") +async def enabled_spoilers_func(_, __, msg: Message): + return configGet("enabled", "features", "spoilers") + async def filling_sponsorship_func(_, __, msg: Message): return True if col_tmp.find_one({"user": msg.from_user.id, "type": "sponsorship"}) is not None else False @@ -52,5 +55,6 @@ enabled_sponsorships = filters.create(enabled_sponsorships_func) enabled_warnings = filters.create(enabled_warnings_func) enabled_invites_check = filters.create(enabled_invites_check_func) enabled_dinovoice = filters.create(enabled_dinovoice_func) +enabled_spoilers = filters.create(enabled_spoilers_func) filling_sponsorship = filters.create(filling_sponsorship_func) \ No newline at end of file diff --git a/modules/handlers/everything.py b/modules/handlers/everything.py index e899f19..01366ff 100644 --- a/modules/handlers/everything.py +++ b/modules/handlers/everything.py @@ -66,6 +66,9 @@ async def any_stage(app: Client, msg: Message): if holo_user.application_state()[0] != "fill" and holo_user.sponsorship_state()[0] != "fill": + if configGet("enabled", "features", "spoilers") is False: + return + spoiler = col_spoilers.find_one( {"user": msg.from_user.id, "completed": False} ) if spoiler is None: