Changeset 69dd60c in python-cinema-club-bot for commands/movie.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/movie.py (modified) (5 diffs)

commands/movie.py

@@ -14 +14 @@
 from imdb import Cinemagoer
 
-from utils import context_init, choose_next_user
-from predicates import has_finished_event
+from utils import context_init, choose_next_user, normalize_username, \
+    init_new_event
+from predicates import has_finished_movie
 from strings import MOVIE_NOT_PROVIDED, EXPECTED_ONE_MOVIE, \
     MOVIE_ANOTHER_USER, FETCHING_MOVIE, FETCHING_ERROR, \
@@ -38 +39 @@
     username = update.message.from_user.username
 
-    if has_finished_event(context, chooser):
-        users = context.chat_data["users"] = choose_next_user(users)
-        raise error.TelegramError(MOVIE_ANOTHER_USER.format(users[0]))
+    if has_finished_movie(context):
+        users = context.chat_data["users"] = choose_next_user(context)
 
     if "@"+username != chooser:
@@ -64 +64 @@
         id=movie.getID(),
         user=update.effective_user.username,
-        poster=movie.data.get("cover url"),
         rating=movie.data.get("rating"),
         genres=movie.data.get("genres"),
@@ -81 +80 @@
             context.chat_data["events"][-1] = last_event
     else:
+        init_new_event(context, users[0], movie_dict["title"])
         context.chat_data["movies"].append(movie_dict)
 
@@ -101 +101 @@
         movies_formatted += MOVIES_LIST.format(
             title=movie["title"],
-            id=movie["id"],
             user=movie["user"]
         )