Changeset 69dd60c in python-cinema-club-bot for commands/users.py

Timestamp:

Oct 11, 2024, 1:53:24 AM (5 weeks ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

ac7b16a

Parents:

694d823

Message:

Task #30. Allow anyone create or edit upcoming event

File:

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

commands/users.py

@@ -17 +17 @@
     EXPECTED_ONE_USER, USER_SET, USER_REMOVE, ADD_MORE_USERS, \
     NEXT_MOVIE_USER, USER_NOT_FOUND, USER_CHOOSE, NO_USERS, \
-    EVENT_USER_HAD_EVENT, NEXT_MOVIE
-from utils import context_init, create_users_string, choose_next_user
-from predicates import has_finished_event
+    NEXT_MOVIE
+from utils import context_init, create_users_string, choose_next_user, \
+    normalize_username
+from predicates import has_finished_movie, has_event_without_movie
 
 
@@ -61 +62 @@
     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)
+        return
 
-        await update.message.reply_markdown(create_users_string(users))
+    if has_finished_movie(context):
+        users = context.chat_data["users"] = choose_next_user(context)
+
+    await update.message.reply_markdown(create_users_string(users))
 
 
@@ -83 +85 @@
         raise error.TelegramError(ADD_MORE_USERS)
 
-    if has_finished_event(context, users[0]):
-        users = context.chat_data["users"] = choose_next_user(users)
+    if has_finished_movie(context):
+        users = context.chat_data["users"] = choose_next_user(context)
 
     next_user_string = NEXT_MOVIE_USER.format(user=users[0])
 
-    last_movie = context.chat_data["movies"][0] \
+    last_movie = context.chat_data["movies"][-1] \
         if context.chat_data["movies"] != [] else None
 
-    if last_movie and last_movie["user"] == users[0]:
+    if last_movie and last_movie["user"] == normalize_username(users[0]):
         next_user_string += NEXT_MOVIE.format(movie=last_movie["title"])
 
@@ -142 +144 @@
     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)
+    if has_finished_movie(context):
+        users = context.chat_data["users"] = choose_next_user(context)
+
+    if has_event_without_movie(context):
+        context.chat_data["events"][-1]["user"] = users[0]
 
     await update.message.reply_text(USER_CHOOSE.format(user=users[0]))