Changeset 23bddf3

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

Files:

• commands/__init__.py (modified) (1 diff)
• commands/event.py (modified) (1 diff)
• commands/meta.py (modified) (1 diff)
• commands/users.py (modified) (2 diffs)
• db (deleted)
• main.py (modified) (2 diffs)
• predicates.py (modified) (1 diff)
• strings.py (modified) (4 diffs)

commands/__init__.py

@@ -15 +15 @@
 from .movie import movie, movies, remove_movies
 from .event import create_event, list_events
+from .announce import create_announcement
+

commands/event.py

@@ -76 +76 @@
     if events == [] or is_past(events[-1]["when"]):
         events.append(event_dict)
-        await update.message.reply_text(EVENT_CREATED.format(when=event_when))
+        await update.message.reply_text(
+            EVENT_CREATED.format(
+                when=event_when,
+                movie=event_dict["movie"],
+            )
+        )
     else:
+        old_when = events[-1]["when"]
+        old_where = events[-1]["where"]
         events[-1] = event_dict
-        await update.message.reply_text(EVENT_EDITED.format(when=event_when))
+
+        await update.message.reply_text(
+            EVENT_EDITED.format(
+                old_when=old_when,
+                old_where=old_where,
+                when=event_when,
+                where=event_where,
+                movie=event_dict["movie"],
+            )
+        )
 
 

commands/meta.py

@@ -12 +12 @@
 from telegram import Update
 from telegram.ext import ContextTypes
+from subprocess import check_output
+
+from strings import ABOUT
+
+
+VERSION="0.1"
+
+
+def _get_commit_hash() -> str:
+    return check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
+
+
+def _get_commit_short_hash() -> str:
+    return check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()
 
 
 async def about(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    await update.message.reply_text('''
-Version InDev
-
-python-cinema-club-bot is a bot for Telegram specialized for managing cinema club activities. This software is released as Public Domain using CC0 license.
-
-Project information: http://57.129.46.169/trac/wiki/python-cinema-club-bot
-Source code: http://57.129.46.169/cgit/python-cinema-club-bot/
-
-Contributed in 2024 by Mikhail Kirillov (~w96k) <w96k@runbox.com>
-
-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
-
-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see:
-<http://creativecommons.org/publicdomain/zero/1.0/>
-
-    ''')
+    await update.message.reply_text(
+        ABOUT.format(
+            version=VERSION,
+            commit=_get_commit_short_hash(),
+        )
+    )

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)
 
 

main.py

@@ -59 +59 @@
     app.add_handler(CommandHandler("event", commands.create_event))
     app.add_handler(CommandHandler("events", commands.list_events))
+    app.add_handler(CommandHandler("announce", commands.create_announcement))
 
     # Movie commands
@@ -70 +71 @@
     app.add_handler(CommandHandler("list", commands.list_users))
     app.add_handler(CommandHandler("users", commands.list_users))
+    app.add_handler(CommandHandler("queue", commands.list_users))
     app.add_handler(CommandHandler("remove", commands.remove_users))
     app.add_handler(CommandHandler("chooser", commands.chooser_user))

predicates.py

@@ -30 +30 @@
         last_event["user"] == normalize_username(username) and \
         is_past(last_event["when"])
+
+
+def has_unfinished_event(context: ContextTypes.DEFAULT_TYPE) -> bool:
+    events = context.chat_data["events"]
+    last_event = events[-1] if events != [] else None
+
+    return False if last_event is None else not is_past(last_event["when"])

strings.py

@@ -21 +21 @@
 MOVIE_SET = "Movie \"{title}\" proposed by {user} is succesfully set as next to watch"
 MOVIES_LIST = "\"{title}\" IMDB:{id} by {user} \n"
-NO_MOVIES = "No movies"
+NO_MOVIES = "No movies.  You can add movie if you are next to choose (see /next). Too add a movie use /movie <imdb_id>"
 
 USER_NOT_FOUND = "Provided user ({user}) not found. Check /list"
@@ -28 +28 @@
 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}"
+NEXT_MOVIE = " and they have choosen to watch \"{movie}\""
 
 USER_ADD = "User {user} has been added"
@@ -41 +42 @@
 /event 1.08.2024/18:00 <where>
 """
-EVENT_CANT_BE_IN_PAST = "Event can't happen in the past. You set {when}, but today is {today}"
+EVENT_CANT_BE_IN_PAST = "Event can't happen in the past. You set {when}, but now is {today}"
 EVENT_ARGS_NOT_PROVIDED = """
 Event commands need arguments provided:
@@ -53 +54 @@
 """
 
-EVENT_CREATED = "Event at {when} was created"
-EVENT_EDITED = "Event at {when} was modified"
+EVENT_CREATED = "Event \"{movie}\" at {when} was created"
+EVENT_EDITED = "Event \"{movie}\" at {old_when} in {old_where} was modified to {when} in {where}"
 EVENTS_LIST = "[{finished}] \"{movie}\" by {user} at {when} in {where}\n"
 EVENT_MOVIE_NOT_CHOOSEN = "You should choose a film first using /movie <imdb_id>"
 EVENT_MOVIE_NOT_SET = "<None>"
 EVENT_USER_HAD_EVENT = "User {user} have already finished event, so he can't choose twice. See /next or /list"
-NO_EVENTS = "No events"
+NO_EVENTS = "No events."
 
 UNDEFINED_ERROR = "Exception: something unexpected happened. Check the logs."
+
+ANNOUNCEMENT_FINISHED_EVENT = "There is no planned events. Create one using /event <when> <where>"
+ANNOUNCEMENT_TEMPLATE = """
+{intro}
+
+Movie: {movie_title}
+Choosen by: @{user}
+Runtime: {movie_runtime} minutes
+
+When: {when}
+Where: {where}
+
+Rating: {rating}
+Genres: {genres}
+
+https://imdb.com/title/tt{movie_id}/
+"""
+
+ABOUT = """
+v{version} #{commit}
+
+python-cinema-club-bot is a bot for Telegram specialized for managing cinema club activities. This software is released as Public Domain using CC0 license.
+
+Project information: http://57.129.46.169/trac/wiki/python-cinema-club-bot
+Source code: http://57.129.46.169/cgit/python-cinema-club-bot/
+
+Contributed in 2024 by Mikhail Kirillov (~w96k) <w96k@runbox.com>
+
+To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
+
+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see: <http://creativecommons.org/publicdomain/zero/1.0/>
+    """