Changeset 6623428

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

Files:

• commands/__init__.py (modified) (1 diff)
• commands/movie.py (added)
• commands/users.py (modified) (3 diffs)
• main.py (modified) (4 diffs)
• requirements.txt (modified) (1 diff)
• strings.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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))

main.py

@@ -17 +17 @@
 import logging
 
-from strings import INVALID_COMMAND
+from strings import INVALID_COMMAND, UNDEFINED_ERROR
 from persistence import Persistence
 import commands
@@ -39 +39 @@
     logging.error("Exception:", exc_info=context.error)
 
+    error_message = context.error.message \
+        if hasattr(context.error, "message") else UNDEFINED_ERROR
+
     await context.bot.send_message(
         chat_id=update.effective_chat.id,
-        text=context.error.message
+        text=error_message
     )
 
@@ -53 +56 @@
 
     # Movie commands
+    app.add_handler(CommandHandler("movie", commands.movie))
+    app.add_handler(CommandHandler("movies", commands.movies))
+    app.add_handler(CommandHandler("movies_remove", commands.remove_movies))
+    
+    # Users commands
     app.add_handler(CommandHandler("set", commands.set_users))
     app.add_handler(CommandHandler("add", commands.add_users))
@@ -58 +66 @@
     app.add_handler(CommandHandler("remove", commands.remove_users))
     app.add_handler(CommandHandler("chooser", commands.chooser_user))
+    app.add_handler(CommandHandler("next", commands.who_is_next))
 
     app.add_handler(MessageHandler(filters.COMMAND, unknown))

requirements.txt

@@ -1 +1 @@
 python-dotenv==0.20.0
 python-telegram-bot==21.6
+cinemagoer==2023.5.1

strings.py

@@ -11 +11 @@
 
 INVALID_COMMAND = "Invalid command. Available commands: /add /list /remove /chooser /about"
+
+MOVIE_ANOTHER_USER = "Movie should choose another user ({user})"
+MOVIE_NOT_PROVIDED = "Movie is not provided"
+MOVIE_NOT_FOUND = "Movie not found on IMDB"
+EXPECTED_ONE_MOVIE = "Expected only one movie"
+FETCHING_MOVIE = "Movie with ID {id} is being fetched: https://imdb.com/title/tt{id}/"
+FETCHING_ERROR = "Couldn't fetch movie or it is not found. Provide IMDB id, for example: 0133093"
+MOVIE_REMOVE = "Movie \"{title}\" with id {id} has been removed"
+MOVIE_SET = "Movie \"{title}\" proposed by {user} is succesfully set as next to watch"
+
+USER_NOT_FOUND = "Provided user ({user}) not found. Check /list"
 USER_NOT_PROVIDED = "User(s) is not provided"
 EXPECTED_ONE_USER = "Expected only one user"
+ADD_MORE_USERS = "There is no users added. You can add people who can choose movies using /add nickname"
+NEXT_MOVIE_USER = "Next movie choice is up to {user}"
+
 USER_ADD = "User {user} has been added"
 USERS_ADDED = "Users have been added successfully. Use /list to view."
+
 USER_REMOVE = "User {user} has been removed. Use /list to view."
 USERS_REMOVED = "Users has been removed"
+
 USER_SET = "Users have been set successfully. Use /list to view."
+USER_CHOOSE = "Next movie should choose: {user}"
 
+UNDEFINED_ERROR = "Exception: something unexpected happened. Check the logs."

utils.py

@@ -14 +14 @@
 
 def context_init(context: ContextTypes.DEFAULT_TYPE):
-    '''
+    """
     Initialize chat context with starting values
-    '''
+    """
 
     if "users" not in context.chat_data:
         context.chat_data["users"]: list[str] = []
 
+    if "movies" not in context.chat_data:
+        context.chat_data["movies"]: list[dict] = []
+
     return context
+
+
+def normalize_username(username: str):
+    return username.replace("@", "")
+
+
+def create_users_string(users: list[str]) -> str:
+    return "`" + ", ".join(users) + "`"