This commit closes #17

modules/commands/cancel.py

@@ -7,7 +7,7 @@ from modules.database import col_tmp, col_spoilers, col_applications
 from modules import custom_filters
 
 # Cancel command ===============================================================================================================
-@app.on_message((custom_filters.enabled_applications | custom_filters.enabled_sponsorships) & ~filters.scheduled & filters.command("cancel", prefixes=["/"]))
+@app.on_message((custom_filters.enabled_applications | custom_filters.enabled_sponsorships) & ~filters.scheduled & filters.command("cancel", prefixes=["/"]) & ~custom_filters.banned)
 async def command_cancel(app: Client, msg: Message):
     col_tmp.delete_many( {"user": msg.from_user.id, "sent": False} )
     col_spoilers.delete_many( {"user": msg.from_user.id, "completed": False} )

modules/commands/issue.py

@@ -9,7 +9,7 @@ from classes.holo_user import HoloUser
 
 
 # Issue command ================================================================================================================
-@app.on_message(custom_filters.enabled_general & ~filters.scheduled & filters.private & filters.command(["issue"], prefixes=["/"]))
+@app.on_message(custom_filters.enabled_general & ~filters.scheduled & filters.private & filters.command(["issue"], prefixes=["/"]) & ~custom_filters.banned)
 async def cmd_issue(app: Client, msg: Message):
     await msg.reply_text(locale("issue", "message", locale=msg.from_user), disable_web_page_preview=True, reply_markup=InlineKeyboardMarkup(
             [

modules/commands/nearby.py

@@ -11,7 +11,7 @@ from modules.database import col_applications, col_users
 from classes.errors.geo import PlaceNotFoundError
 
 # Nearby command ===============================================================================================================
-@app.on_message(custom_filters.enabled_applications & ~filters.scheduled & (filters.private | (filters.chat(configGet("admin", "groups")) | filters.chat(configGet("users", "groups")))) & filters.command(["nearby"], prefixes=["/"]) & (custom_filters.allowed | custom_filters.admin))
+@app.on_message(custom_filters.enabled_applications & ~filters.scheduled & (filters.private | (filters.chat(configGet("admin", "groups")) | filters.chat(configGet("users", "groups")))) & filters.command(["nearby"], prefixes=["/"]) & (custom_filters.allowed | custom_filters.admin) & ~custom_filters.banned)
 async def cmd_nearby(app: Client, msg: Message):
 
     holo_user = HoloUser(msg.from_user)

modules/commands/reapply.py

@@ -10,7 +10,7 @@ from modules.database import col_tmp, col_applications
 from modules import custom_filters
 
 # Reapply command ==============================================================================================================
-@app.on_message(custom_filters.enabled_applications & ~filters.scheduled & filters.private & filters.command(["reapply"], prefixes=["/"]))
+@app.on_message(custom_filters.enabled_applications & ~filters.scheduled & filters.private & filters.command(["reapply"], prefixes=["/"]) & ~custom_filters.banned)
 async def cmd_reapply(app: Client, msg: Message):
 
     holo_user = HoloUser(msg.from_user)

modules/commands/rules.py

@@ -36,7 +36,7 @@ class DefaultRulesMarkup(list):
 
 
 # Rules command =============================================================================================================
-@app.on_message(custom_filters.enabled_general & ~filters.scheduled & filters.private & filters.command(["rules"], prefixes=["/"]))
+@app.on_message(custom_filters.enabled_general & ~filters.scheduled & filters.private & ~custom_filters.banned & filters.command(["rules"], prefixes=["/"]))
 async def cmd_rules(app: Client, msg: Message):
     await msg.reply_text(locale("rules_msg", locale=msg.from_user), disable_web_page_preview=True, reply_markup=DefaultRulesMarkup(msg.from_user).keyboard)
 # ==============================================================================================================================

modules/commands/spoiler.py

@@ -10,7 +10,7 @@ from modules.database import col_spoilers, col_applications
 from modules import custom_filters
 
 # Spoiler command ==============================================================================================================
-@app.on_message(custom_filters.enabled_spoilers & ~filters.scheduled & filters.private & filters.command(["spoiler"], prefixes=["/"]))
+@app.on_message(custom_filters.enabled_spoilers & ~filters.scheduled & filters.private & ~custom_filters.banned & filters.command(["spoiler"], prefixes=["/"]))
 async def cmd_spoiler(app: Client, msg: Message):
 
     try:

modules/commands/sponsorship.py

@@ -8,7 +8,7 @@ from modules.utils import locale, should_quote
 from modules.database import col_applications
 
 # Sponsorship command ==========================================================================================================
-@app.on_message(custom_filters.enabled_sponsorships & ~filters.scheduled & filters.command(["sponsorship"], prefixes=["/"]) & (custom_filters.allowed | custom_filters.admin))
+@app.on_message(custom_filters.enabled_sponsorships & ~filters.scheduled & filters.command(["sponsorship"], prefixes=["/"]) & ~custom_filters.banned & (custom_filters.allowed | custom_filters.admin))
 async def cmd_sponsorship(app: Client, msg: Message):
     holo_user = HoloUser(msg.from_user)
     if holo_user.application_state()[0] == "fill":

modules/commands/start.py

@@ -9,7 +9,7 @@ from bson.objectid import ObjectId
 from bson.errors import InvalidId
 
 # Start command ================================================================================================================
-@app.on_message(custom_filters.enabled_applications & ~filters.scheduled & filters.private & filters.command(["start"], prefixes=["/"]))
+@app.on_message(custom_filters.enabled_applications & ~filters.scheduled & filters.private & filters.command(["start"], prefixes=["/"]) & ~custom_filters.banned)
 async def cmd_start(app: Client, msg: Message):
 
     user = col_users.find_one({"user": msg.from_user.id})