Changeset 23bddf3 in python-cinema-club-bot for commands/users.py

Timestamp:

Oct 10, 2024, 6:20:52 AM (5 weeks ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

1f94544

Parents:

8d2d5ac

Message:

Task #10. /announce command

File:

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

commands/users.py

@@ -17 +17 @@
     EXPECTED_ONE_USER, USER_SET, USER_ADD, USER_REMOVE, ADD_MORE_USERS, \
     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
+    EVENT_USER_HAD_EVENT, NEXT_MOVIE
+from utils import context_init, create_users_string, choose_next_user
 from predicates import has_finished_event
+
 
 async def set_users(
@@ -87 +87 @@
         users = context.chat_data["users"] = choose_next_user(users)
 
-    await update.message.reply_text(NEXT_MOVIE_USER.format(user=users[0]))
+    next_user_string = NEXT_MOVIE_USER.format(user=users[0])
+
+    last_movie = context.chat_data["movies"][0] \
+        if context.chat_data["movies"] != [] else None
+
+    if last_movie and last_movie["user"] == users[0]:
+        next_user_string += NEXT_MOVIE.format(movie=last_movie["title"])
+
+    await update.message.reply_text(next_user_string)