Changeset 69dd60c in python-cinema-club-bot for predicates.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:

• predicates.py (modified) (2 diffs)

predicates.py

@@ -12 +12 @@
 from telegram.ext import ContextTypes
 from datetime import datetime
-
-from utils import normalize_username
+from typing import Optional
 
 
-def is_past(dt: datetime) -> bool:
+def is_past(dt: Optional[datetime]) -> bool:
+    if dt is None:
+        return False
+
     return dt < datetime.today()
 
 
-def has_finished_event(
-        context: ContextTypes.DEFAULT_TYPE,
-        username: str
-) -> bool:
+def has_finished_movie(context: ContextTypes.DEFAULT_TYPE) -> bool:
+    events = context.chat_data["events"]
+    movies = context.chat_data["movies"]
+
+    last_event = events[-1] if events != [] else None
+    last_movie = movies[-1] if movies != [] else None
+
+    return last_event is not None and last_movie is not None and \
+        last_event["user"] == last_movie["user"] and \
+        is_past(last_event["when"])
+
+
+def has_event_without_movie(context: ContextTypes.DEFAULT_TYPE) -> bool:
     events = context.chat_data["events"]
     last_event = events[-1] if events != [] else None
 
-    return last_event is not None and \
-        last_event["user"] == normalize_username(username) and \
-        is_past(last_event["when"])
+    return last_event and last_event["movie"] is None
 
 
@@ -36 +45 @@
     last_event = events[-1] if events != [] else None
 
-    return False if last_event is None else not is_past(last_event["when"])
+    if last_event is None:
+        return False
+
+    if last_event["movie"] is None:
+        return False
+
+    return not is_past(last_event["when"])
+