Changeset 0d67456

Timestamp:

Oct 9, 2024, 1:45:08 AM (5 weeks ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

cc34991

Parents:

71efb80

git-author:

Mikhail Kirillov <w96k@…> (10/09/24 01:22:02)

git-committer:

Mikhail Kirillov <w96k@…> (10/09/24 01:45:08)

Message:

Add /remove and /list commands (unfinished)

Files:

• db (added)
• main.py (moved) (moved from app.py ) (2 diffs)
• persistence.py (added)
• strings.py (modified) (1 diff)
• utils.py (added)

main.py

@@ -14 +14 @@
     MessageHandler, filters
 from dotenv import load_dotenv
-from rich import inspect
 import os
 import logging
-from .strings import INVALID_COMMAND
+from rich import inspect
+
+from strings import INVALID_COMMAND, USER_NOT_PROVIDED, USER_ADDED, \
+    USER_REMOVED
+from utils import context_init
+from persistence import Persistence
+
 
 load_dotenv()
@@ -46 +51 @@
 
 
-async def add_choose_cycle(
+async def add(
         update: Update,
         context: ContextTypes.DEFAULT_TYPE
 ) -> None:
-    command = update.message.text
+    context_init(context)
 
-    user = command.replace("/add", "")
+    if context.args == []:
+        await update.message.reply_text(USER_NOT_PROVIDED)
+        raise error.TelegramError(USER_NOT_PROVIDED)
 
-    inspect(user)
+    for user in context.args:
+        context.chat_data["users"].append(user)
+        await update.message.reply_text(USER_ADDED.format(user=user))
 
-    try:
-        if user == "":
-            raise error.TelegramError("User is not provided. Use /add @username")
-    except error.TelegramError as err:
-        await update.message.reply_text(err.message)
-        return
+    await update.message.reply_text(context.chat_data)
 
-    await update.message.reply_text(update.message.text)
+
+async def list(
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE
+) -> None:
+    context_init(context)
+
+    await update.message.reply_text(context.chat_data)
+
+
+async def remove(
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE
+) -> None:
+    context_init(context)
+
+    if context.args == []:
+        await update.message.reply_text(USER_NOT_PROVIDED)
+        raise error.TelegramError(USER_NOT_PROVIDED)
+
+    for user in context.args:
+        if user == "*":
+            context.chat_data["users"] = []
+            break
+        
+        context.chat_data["users"].remove(user)
+        await update.message.reply_text(USER_REMOVED.format(user=user))
+
+    await update.message.reply_text(context.chat_data)
 
 
 async def unknown(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    await context.bot.send_message(chat_id=update.effective_chat.id, text=INVALID_COMMAND)
+    await context.bot.send_message(
+        chat_id=update.effective_chat.id,
+        text=INVALID_COMMAND
+    )
 
-app = ApplicationBuilder().token(
-    os.environ.get('TELEGRAM_TOKEN')
-).build()
 
-app.add_handler(CommandHandler("about", about))
-app.add_handler(CommandHandler("add", add_choose_cycle))
+if __name__ == "__main__":    
+    app = ApplicationBuilder().token(
+        os.environ.get("TELEGRAM_TOKEN")
+    ).persistence(Persistence).build()
 
-app.add_handler(MessageHandler(filters.COMMAND, unknown))
+    app.add_handler(CommandHandler("about", about))
+    app.add_handler(CommandHandler("add", add))
+    app.add_handler(CommandHandler("list", list))
+    app.add_handler(CommandHandler("remove", remove))
 
-app.run_polling()
+
+    app.add_handler(MessageHandler(filters.COMMAND, unknown))
+
+    app.run_polling()

strings.py

@@ -11 +11 @@
 
 INVALID_COMMAND = "Invalid command. Available commands: /add"
+USER_NOT_PROVIDED = "User(s) is not provided"
+USER_ADDED = "User {user} has been added"
+USER_REMOVED = "User {user} has been removed"