plugins/commands/upcoming.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta, timezone
 
+from pymongo.errors import OperationFailure
 from pyrogram import filters
 from pyrogram.types import Message
 from pytz import timezone as pytz_timezone
@@ -33,15 +34,23 @@ async def command_upcoming(app: PyroClient, message: Message):
         + timedelta(days=30)
     ).replace(tzinfo=timezone.utc)
 
-    entries = [
+    try:
-        await GarbageEntry.from_record(entry)
+        entries = [
-        async for entry in col_entries.find(
+            await GarbageEntry.from_record(entry)
-            {
+            async for entry in col_entries.find(
-                "location": {"$in": user.location.id},
+                {
-                "date": {"$gte": date_min, "$lte": date_max},
+                    "location": {"$in": user.location.id},
-            }
+                    "date": {"$gte": date_min, "$lte": date_max},
+                }
+            )
+        ]
+    except OperationFailure:
+        await message.reply_text(
+            app._("upcoming_empty", "messages", locale=user.locale).format(
+                name=user.location.name
+            )
         )
-    ]
+        return
 
     entries_text = "\n\n".join(
         [