Changeset 6623428 in python-cinema-club-bot for commands

Timestamp:

Oct 9, 2024, 10:46:19 PM (5 weeks ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

9be02d9

Parents:

0d48ea2

git-author:

Mikhail Kirillov <w96k@…> (10/09/24 04:53:26)

git-committer:

Mikhail Kirillov <w96k@…> (10/09/24 22:46:19)

Message:

Add movies commands

Location:

commands

Files:

• __init__.py (modified) (1 diff)
• movie.py (added)
• users.py (modified) (3 diffs)

commands/__init__.py

@@ -11 +11 @@
 
 from .meta import about
-from .users import set_users, add_users, list_users, remove_users, chooser_user
+from .users import set_users, add_users, list_users, remove_users, \
+    chooser_user, who_is_next
+from .movie import movie, movies, remove_movies

commands/users.py

@@ -15 +15 @@
 
 from strings import USER_NOT_PROVIDED, USERS_ADDED, USERS_REMOVED, \
-    EXPECTED_ONE_USER, USER_SET, USER_ADD, USER_REMOVE
-from utils import context_init
+    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
 
 
@@ -54 +55 @@
     context_init(context)
 
-    await update.message.reply_text(context.chat_data["users"])
+    users = context.chat_data["users"]
+
+    await update.message.reply_markdown(create_users_string(users))
+
+
+async def who_is_next(
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE
+) -> None:
+    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)
 
 
@@ -92 +109 @@
     users = deque(context.chat_data["users"])
 
-    chooser_index = users.index(chooser)
+    try:
+        chooser_index = users.index(chooser)
+    except ValueError:
+        raise error.TelegramError(USER_NOT_FOUND.format(user=chooser))
+
     users.rotate(-chooser_index)
+    users = list(users)
 
-    context.chat_data["users"] = list(users)
+    context.chat_data["users"] = users
 
-    await update.message.reply_text(context.chat_data["users"])
+    await update.message.reply_text(USER_CHOOSE.format(user=users[0]))
+
+    await update.message.reply_markdown(create_users_string(users))