Changeset 9be02d9 in python-cinema-club-bot for commands/users.py

Timestamp:

Oct 10, 2024, 4:12:00 AM (5 weeks ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

8d2d5ac

Parents:

6623428

Message:

Fix #9. Add events commands

File:

• commands/users.py (modified) (5 diffs)

commands/users.py

@@ -16 +16 @@
 from strings import USER_NOT_PROVIDED, USERS_ADDED, USERS_REMOVED, \
     EXPECTED_ONE_USER, USER_SET, USER_ADD, USER_REMOVE, ADD_MORE_USERS, \
-    NEXT_MOVIE_USER, USER_NOT_FOUND, USER_CHOOSE
-from utils import context_init, create_users_string
-
+    NEXT_MOVIE_USER, USER_NOT_FOUND, USER_CHOOSE, NO_USERS, \
+    EVENT_USER_HAD_EVENT
+from utils import context_init, create_users_string, normalize_username, \
+    choose_next_user
+from predicates import has_finished_event
 
 async def set_users(
@@ -32 +34 @@
 
     await update.message.reply_text(USER_SET)
+
 
 async def add_users(
@@ -57 +60 @@
     users = context.chat_data["users"]
 
-    await update.message.reply_markdown(create_users_string(users))
+    if users == []:
+        await update.message.reply_text(NO_USERS)
+    else:
+        if has_finished_event(context, users[0]):
+            users = context.chat_data["users"] = choose_next_user(users)
+
+        await update.message.reply_markdown(create_users_string(users))
 
 
@@ -64 +73 @@
         context: ContextTypes.DEFAULT_TYPE
 ) -> None:
+    """
+    This commands sets the next chooser if needed and shows current
+    """
+
     context_init(context)
 
     users = context.chat_data["users"]
 
-    if len(users) > 0:
-        await update.message.reply_text(NEXT_MOVIE_USER.format(user=users[0]))
-    else:
-        await update.message.reply_text(ADD_MORE_USERS)
+    if users == []:
+        raise error.TelegramError(ADD_MORE_USERS)
+
+    if has_finished_event(context, users[0]):
+        users = context.chat_data["users"] = choose_next_user(users)
+
+    await update.message.reply_text(NEXT_MOVIE_USER.format(user=users[0]))
 
 
@@ -119 +135 @@
     context.chat_data["users"] = users
 
+    if has_finished_event(context, users[0]):
+        await update.message.reply_text(
+            EVENT_USER_HAD_EVENT.format(user=users[0])
+        )
+        users = context.chat_data["users"] = choose_next_user(users)
+
     await update.message.reply_text(USER_CHOOSE.format(user=users[0]))