Changeset 0d48ea2

Timestamp:

Oct 9, 2024, 3:40:27 AM (5 weeks ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

6623428

Parents:

cc34991

Message:

Add /set command; Add error_handler;

Files:

• commands/__init__.py (modified) (1 diff)
• commands/users.py (modified) (6 diffs)
• main.py (modified) (3 diffs)
• strings.py (modified) (1 diff)

commands/__init__.py

@@ -11 +11 @@
 
 from .meta import about
-from .users import add_users, list_users, remove_users, chooser_user
+from .users import set_users, add_users, list_users, remove_users, chooser_user

commands/users.py

@@ -14 +14 @@
 from collections import deque
 
-from strings import USER_NOT_PROVIDED, USER_ADDED, USER_REMOVED, EXPECTED_ONE_USER
+from strings import USER_NOT_PROVIDED, USERS_ADDED, USERS_REMOVED, \
+    EXPECTED_ONE_USER, USER_SET, USER_ADD, USER_REMOVE
 from utils import context_init
 
-from rich import inspect
 
+async def set_users(
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE
+) -> None:
+    context_init(context)
+
+    if context.args == []:
+        raise error.TelegramError(USER_NOT_PROVIDED)
+
+    context.chat_data["users"] = context.args
+
+    await update.message.reply_text(USER_SET)
 
 async def add_users(
@@ -27 +39 @@
 
     if context.args == []:
-        await update.message.reply_text(USER_NOT_PROVIDED)
         raise error.TelegramError(USER_NOT_PROVIDED)
 
     for user in context.args:
         context.chat_data["users"].append(user)
-        await update.message.reply_text(USER_ADDED.format(user=user))
+        await update.message.reply_text(USER_ADD.format(user=user))
 
-    await update.message.reply_text(context.chat_data["users"])
+    await update.message.reply_text(USERS_ADDED)
 
 
@@ -53 +64 @@
 
     if context.args == []:
-        await update.message.reply_text(USER_NOT_PROVIDED)
         raise error.TelegramError(USER_NOT_PROVIDED)
 
@@ -62 +72 @@
 
         context.chat_data["users"].remove(user)
-        await update.message.reply_text(USER_REMOVED.format(user=user))
+        await update.message.reply_text(USER_REMOVE.format(user=user))
 
-    await update.message.reply_text(context.chat_data["users"])
+    await update.message.reply_text(USERS_REMOVED)
 
 
@@ -74 +84 @@
 
     if context.args == []:
-        await update.message.reply_text(USER_NOT_PROVIDED)
         raise error.TelegramError(USER_NOT_PROVIDED)
 
     if len(context.args) > 1:
-        await update.message.reply_text(EXPECTED_ONE_USER)
         raise error.TelegramError(EXPECTED_ONE_USER)
 
@@ -89 +97 @@
     context.chat_data["users"] = list(users)
 
-    await update.message.reply_text(context.chat_data)
+    await update.message.reply_text(context.chat_data["users"])

main.py

@@ -36 +36 @@
     )
 
+async def error_handler(update: object, context: ContextTypes.DEFAULT_TYPE) -> None:
+    logging.error("Exception:", exc_info=context.error)
+
+    await context.bot.send_message(
+        chat_id=update.effective_chat.id,
+        text=context.error.message
+    )
 
 if __name__ == "__main__":
@@ -42 +49 @@
     ).persistence(Persistence).build()
 
+    # Meta commands
     app.add_handler(CommandHandler("about", commands.about))
+
+    # Movie commands
+    app.add_handler(CommandHandler("set", commands.set_users))
     app.add_handler(CommandHandler("add", commands.add_users))
     app.add_handler(CommandHandler("list", commands.list_users))
@@ -48 +59 @@
     app.add_handler(CommandHandler("chooser", commands.chooser_user))
 
+    app.add_handler(MessageHandler(filters.COMMAND, unknown))
+    app.add_error_handler(error_handler)
 
-    app.add_handler(MessageHandler(filters.COMMAND, unknown))
 
     app.run_polling()
+

strings.py

@@ -10 +10 @@
 # <http://creativecommons.org/publicdomain/zero/1.0/>
 
-INVALID_COMMAND = "Invalid command. Available commands: /add"
+INVALID_COMMAND = "Invalid command. Available commands: /add /list /remove /chooser /about"
 USER_NOT_PROVIDED = "User(s) is not provided"
 EXPECTED_ONE_USER = "Expected only one user"
-USER_ADDED = "User {user} has been added"
-USER_REMOVED = "User {user} has been removed"
+USER_ADD = "User {user} has been added"
+USERS_ADDED = "Users have been added successfully. Use /list to view."
+USER_REMOVE = "User {user} has been removed. Use /list to view."
+USERS_REMOVED = "Users has been removed"
+USER_SET = "Users have been set successfully. Use /list to view."
+