WIP: #50

classes/api_client.py

@@ -0,0 +1,21 @@
+from garbage_api_client import Client
+from garbage_api_client.api.default.entry_find_locations_location_entries_get import (
+    asyncio as entry_find,
+)
+from garbage_api_client.api.default.location_find_locations_get import (
+    asyncio as location_find,
+)
+from garbage_api_client.api.default.location_get_locations_id_get import (
+    asyncio as location_get,
+)
+
+
+class APIClient(Client):
+    async def entry_find(self, *args, **kwargs):
+        await entry_find(client=self, *args, **kwargs)
+
+    async def location_find(self, *args, **kwargs):
+        await location_find(client=self, *args, **kwargs)
+
+    async def location_get(self, *args, **kwargs):
+        await location_get(client=self, *args, **kwargs)

classes/callbacks.py

@@ -10,7 +10,7 @@ class CallbackLanguage:
     language: str
 
     @classmethod
-    def from_callback(cls, callback: CallbackQuery) -> "CallbackLanguage":
+    def from_callback(cls, callback: CallbackQuery):
         """Parse callback query and extract language data from it.
 
         ### Args:

classes/garbage_entry.py

@@ -23,7 +23,7 @@ class GarbageEntry:
     date: datetime
 
     @classmethod
-    async def from_dict(cls, data: Mapping[str, Any]) -> "GarbageEntry":
+    async def from_dict(cls, data: Mapping[str, Any]):
         """Generate GarbageEntry object from the mapping provided
 
         ### Args:
@@ -60,7 +60,7 @@ class GarbageEntry:
         )
 
     @classmethod
-    async def from_record(cls, data: Mapping[str, Any]) -> "GarbageEntry":
+    async def from_record(cls, data: Mapping[str, Any]):
         locations = [
             await Location.get(location_id) for location_id in data["locations"]
         ]

classes/location.py

@@ -28,7 +28,7 @@ class Location:
     timezone: Union[BaseTzInfo, DstTzInfo]
 
     @classmethod
-    async def get(cls, id: int) -> "Location":
+    async def get(cls, id: int):
         db_entry = await col_locations.find_one({"id": id})
 
         if db_entry is None:
@@ -40,7 +40,7 @@ class Location:
         return cls(**db_entry)
 
     @classmethod
-    async def find(cls, name: str) -> "Location":
+    async def find(cls, name: str):
         db_entry = await col_locations.find_one({"name": {"$regex": name}})
 
         if db_entry is None:
@@ -52,7 +52,7 @@ class Location:
         return cls(**db_entry)
 
     @classmethod
-    async def nearby(cls, lat: float, lon: float) -> "Location":
+    async def nearby(cls, lat: float, lon: float):
         db_entry = await col_locations.find_one({"location": {"$near": [lon, lat]}})
 
         if db_entry is None:

classes/pyroclient.py

@@ -8,6 +8,7 @@ from libbot.pyrogram.classes import PyroClient as LibPyroClient
 from pymongo import ASCENDING, GEOSPHERE, TEXT
 from pyrogram.types import User
 
+from classes.api_client import APIClient
 from classes.location import Location
 from classes.pyrouser import PyroUser
 from classes.updater import Updater
@@ -19,12 +20,13 @@ logger = logging.getLogger(__name__)
 
 class PyroClient(LibPyroClient):
     def __init__(self, **kwargs):
-        self.__version__ = (0, 1, 3)
+        self.__version__ = (0, 1, 2)
 
         super().__init__(**kwargs)
 
-        self.updater = Updater()
+        self.updater = Updater(ClientSession())
         self.contexts = []
+        self.api_client = APIClient()
 
         if self.scheduler is not None:
             self.scheduler.add_job(
@@ -91,7 +93,6 @@ class PyroClient(LibPyroClient):
         ]
 
     async def check_updates(self) -> None:
-        """Check for updates and send a message to the owner if newer version was found"""
         if await self.updater.check_updates(
             self.__version__, self.config["strings"]["url_updater"]
         ):

classes/pyrouser.py

@@ -1,9 +1,7 @@
 import logging
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from typing import Any, Union
-from typing import Any, Mapping, Tuple, Union
 
-import pytz
 from bson import ObjectId
 
 from classes.location import Location
@@ -44,9 +42,9 @@ class PyroUser:
         enabled: bool = True,
         location_id: int = 0,
         offset: int = 1,
-        time_hour: int = 16,
+        time_hour: int = 18,
         time_minute: int = 0,
-    ) -> "PyroUser":
+    ):
         db_entry = await col_users.find_one({"id": id})
 
         if db_entry is None:
@@ -74,7 +72,7 @@ class PyroUser:
         return cls(**db_entry)
 
     @classmethod
-    async def from_dict(cls, **kwargs) -> "PyroUser":
+    async def from_dict(cls, **kwargs):
         if "location" in kwargs:
             try:
                 kwargs["location"] = await Location.get(kwargs["location"])  # type: ignore
@@ -82,193 +80,48 @@ class PyroUser:
                 kwargs["location"] = None  # type: ignore
         return cls(**kwargs)
 
-    async def update_locale(self, locale: Union[str, None]) -> Union[str, None]:
+    async def update_locale(self, locale: Union[str, None]) -> None:
         """Change user's locale stored in the database.
 
         ### Args:
             * locale (`Union[str, None]`): New locale to be set.
         """
-        logger.info("%s's locale has been set to %s", self.id, locale)
+        logger.debug("%s's locale has been set to %s", self.id, locale)
-
         await col_users.update_one({"_id": self._id}, {"$set": {"locale": locale}})
 
-        self.locale = locale
+    async def update_state(self, enabled: bool = False) -> None:
-
+        logger.debug("%s's state has been set to %s", self.id, enabled)
-        return self.locale
-
-    async def update_state(self, enabled: bool = False) -> bool:
-        """Update user's state (enabled/disabled)
-
-        ### Args:
-            * enabled (`bool`, *optional*): Whether the user is enabled. Defaults to `False`.
-
-        ### Returns:
-            * `bool`: User's current state
-        """
-        logger.info("%s's state has been set to %s", self.id, enabled)
-
         await col_users.update_one({"_id": self._id}, {"$set": {"enabled": enabled}})
 
-        self.enabled = enabled
+    async def update_location(self, location_id: int = 0) -> None:
-
+        logger.debug("%s's location has been set to %s", self.id, location_id)
-        return self.enabled
-
-    async def update_location(self, location_id: int) -> Location:
-        """Update user's location and move their time to the new timezone (if the user had a location set previously)
-
-        ### Args:
-            * location_id (`int`): ID of the location
-
-        ### Returns:
-            `Location`: New location
-        """
-        logger.info("%s's location has been set to %s", self.id, location_id)
-
         await col_users.update_one(
             {"_id": self._id}, {"$set": {"location": location_id}}
         )
 
-        location = await Location.get(location_id)
+    async def update_offset(self, offset: int = 1) -> None:
-
+        logger.debug("%s's offset has been set to %s", self.id, offset)
-        # Execute if timezones of old and new locations are different
-        if self.location and (self.location.timezone.zone != location.timezone.zone):
-            # Get UTC time for selected reminder time
-            now_utc = datetime.now(pytz.utc).replace(
-                hour=self.time_hour, minute=self.time_minute, second=0, microsecond=0
-            )
-
-            # Get the time for the reminder time of old and new location
-            local_old = now_utc.astimezone(self.location.timezone)
-            local_new = (
-                location.timezone.localize(local_old.replace(tzinfo=None))
-            ).astimezone(pytz.utc)
-
-            # Update the time to match the new timezone
-            await self.update_time(hour=local_new.hour, minute=local_new.minute)
-
-        self.location = location
-
-        return self.location
-
-    async def update_offset(self, offset: int = 1) -> int:
-        """Update the offset of the reminder (in days)
-
-        ### Args:
-            * offset (`int`, *optional*): Offset in days. Defaults to `1`.
-
-        ### Returns:
-            * `int`: Offset in days
-        """
-        logger.info("%s's offset has been set to %s", self.id, offset)
-
         await col_users.update_one({"_id": self._id}, {"$set": {"offset": offset}})
 
-        self.offset = offset
+    async def update_time(self, hour: int = 18, minute: int = 0) -> None:
-
+        logger.debug("%s's time has been set to %s h. %s m.", self.id, hour, minute)
-        return offset
-
-    async def update_time(self, hour: int = 16, minute: int = 0) -> Tuple[int, int]:
-        """Update the time of the reminder (hour and minute, for UTC timezone)
-
-        ### Args:
-            * hour (`int`, *optional*): Hour of the reminder. Defaults to `16`.
-            * minute (`int`, *optional*): Minute of the reminder. Defaults to `0`.
-
-        ### Returns:
-            * `Tuple[int, int]`: Hour and minute of the reminder
-        """
-        logger.info("%s's time has been set to %s h. %s m.", self.id, hour, minute)
-
         await col_users.update_one(
             {"_id": self._id}, {"$set": {"time_hour": hour, "time_minute": minute}}
         )
 
-        self.time_hour = hour
-        self.time_minute = minute
-
-        return self.time_hour, self.time_minute
-
     async def delete(self) -> None:
-        """Delete the database record of the user"""
+        logger.debug("%s's data has been deleted", self.id)
-        logger.info("%s's data has been deleted", self.id)
-
         await col_users.delete_one({"_id": self._id})
 
-    async def checkout(self) -> Mapping[str, Any]:
+    async def checkout(self) -> Any:
-        """Checkout the user's database record
+        logger.debug("%s's data has been checked out", self.id)
-
-        ### Raises:
-            * `KeyError`: Database record of the user was not found
-
-        ### Returns:
-            * `Mapping[str, Any]`: Database record
-        """
-        logger.info("%s's data has been checked out", self.id)
-
         db_entry = await col_users.find_one({"_id": self._id})
 
         if db_entry is None:
             raise KeyError(
-                f"DB record with id {self._id} of user {self.id} was not found"
+                f"DB record with id {self._id} of user {self.id} is not found"
             )
 
         del db_entry["_id"]  # type: ignore
 
         return db_entry
-
-    def get_reminder_date(self) -> datetime:
-        """Get next reminder date (year, month and day)
-
-        ### Raises:
-            * `AttributeError`: Some attribute(s) are missing
-
-        ### Returns:
-            * `datetime`: Datetime object of the next reminder date
-        """
-        if self.location is None:
-            logger.warning(
-                "Could not get the reminder date for %s: User does not have some attribute(s) set",
-                self.id,
-            )
-            raise AttributeError(
-                f"Could not get the reminder date for {self.id}: User does not have some attribute(s) set"
-            )
-
-        if not self.location.timezone:
-            logger.warning("Location %s does not have a timezone set", self.location.id)
-
-        return (
-            datetime.now(self.location.timezone or pytz.utc) + timedelta(days=1)
-        ).replace(hour=0, minute=0, second=0, microsecond=0)
-
-    def get_reminder_time(self) -> datetime:
-        """Get reminder time (hour and minute)
-
-        ### Raises:
-            * `AttributeError`: Some attribute(s) are missing
-
-        ### Returns:
-            * `datetime`: Datetime object of the next reminder date
-        """
-        if self.time_hour is None or self.time_minute is None or self.location is None:
-            logger.warning(
-                "Could not get the reminder time for %s: User does not have some attribute(s) set",
-                self.id,
-            )
-            raise AttributeError(
-                f"Could not get the reminder time for {self.id}: User does not have some attribute(s) set"
-            )
-
-        if not self.location.timezone:
-            logger.warning("Location %s does not have a timezone set", self.location.id)
-
-        return (
-            datetime.now(pytz.utc)
-            .replace(
-                hour=self.time_hour,
-                minute=self.time_minute,
-                second=0,
-                microsecond=0,
-            )
-            .astimezone(self.location.timezone or pytz.utc)
-        )

classes/updater.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Dict, Tuple
 
 from aiohttp import ClientSession
 
@@ -7,15 +7,12 @@ logger = logging.getLogger(__name__)
 
 
 class Updater:
-    def __init__(self, client_session: Union[ClientSession, None] = None) -> None:
+    def __init__(self, client_session: ClientSession) -> None:
-        self.client_session: Union[ClientSession, None] = client_session
+        self.client_session: ClientSession = client_session
 
     async def check_updates(
         self, version_current: Tuple[int, int, int], api_url: str
     ) -> bool:
-        if not self.client_session:
-            self.client_session = ClientSession()
-
         response = await self.client_session.get(api_url)
 
         if response.status != 200:
@@ -33,9 +30,6 @@ class Updater:
         )
 
     async def get_latest_release(self, api_url: str) -> Dict[str, Any]:
-        if not self.client_session:
-            self.client_session = ClientSession()
-
         response = await self.client_session.get(api_url)
 
         if response.status != 200:

config_example.json

@@ -9,6 +9,9 @@
         "max_concurrent_transmissions": 1,
         "scoped_commands": true
     },
+    "api": {
+        "url": "https://api.garbagebot.eu"
+    },
     "database": {
         "user": null,
         "password": null,
@@ -16,13 +19,6 @@
         "port": 27017,
         "name": "garbage_bot"
     },
-    "database_api": {
-        "user": null,
-        "password": null,
-        "host": "127.0.0.1",
-        "port": 27017,
-        "name": "garbage_reminder"
-    },
     "search": {
         "radius": 0.1
     },

locale/de.json

@@ -8,7 +8,7 @@
     },
     "bot": {
         "name": "Garbage Reminder",
-        "about": "Nie wieder Müllabfuhrtermin verpassen. Mehr erfahren: https://garbagebot.eu",
+        "about": "Nie wieder Müllabfuhrtermin verpassen. Quellcode: https://garbagebot.eu",
         "description": "Sie können Erinnerungen an die Müllabfuhr für Orte Ihrer Wahl erhalten.\n\nVerwenden Sie /help, um die Funktionsweise des Bots besser zu verstehen, oder verwenden Sie /setup, um Ihre Erinnerungen zu konfigurieren."
     },
     "formats": {

locale/en.json

@@ -8,7 +8,7 @@
     },
     "bot": {
         "name": "Garbage Reminder",
-        "about": "Never forget about garbage collection again. Learn more: https://garbagebot.eu",
+        "about": "Never forget about garbage collection again. Source code: https://garbagebot.eu",
         "description": "You can receive reminders about garbage collection for locations of your choice.\n\nUse /help to better understand how the bot works or use /setup to configure your reminders."
     },
     "formats": {

locale/ru.json

@@ -8,7 +8,7 @@
     },
     "bot": {
         "name": "Garbage Reminder 🇺🇦",
-        "about": "Більше ніколи не забувайте про вивезення сміття. Дізнатись більше: https://garbagebot.eu",
+        "about": "Більше ніколи не забувайте про вивезення сміття. Вихідний код: https://garbagebot.eu",
         "description": "Ви можете отримувати нагадування про вивезення сміття для обраних вами місць.\n\nВикористовуйте /help, щоб краще зрозуміти, як працює бот, або /setup, щоб налаштувати нагадування."
     },
     "formats": {

locale/uk.json

@@ -8,7 +8,7 @@
     },
     "bot": {
         "name": "Garbage Reminder 🇺🇦",
-        "about": "Більше ніколи не забувайте про вивезення сміття. Дізнатись більше: https://garbagebot.eu",
+        "about": "Більше ніколи не забувайте про вивезення сміття. Вихідний код: https://garbagebot.eu",
         "description": "Ви можете отримувати нагадування про вивезення сміття для обраних вами місць.\n\nВикористовуйте /help, щоб краще зрозуміти, як працює бот, або /setup, щоб налаштувати нагадування."
     },
     "formats": {

main.py

@@ -4,7 +4,6 @@ from argparse import ArgumentParser
 from os import getpid
 from pathlib import Path
 
-from aiohttp import ClientSession
 from convopyro import Conversation
 from libbot import sync
 
@@ -42,8 +41,7 @@ def main():
         exit()
 
     client = PyroClient(
-        scheduler=scheduler,
+        scheduler=scheduler, commands_source=sync.json_read(Path("commands.json"))
-        commands_source=sync.json_read(Path("commands.json")),
     )
     Conversation(client)
 

migrations/202405261500.py

@@ -13,4 +13,4 @@ class Migration(BaseMigration):
 
     def downgrade(self):
         sync.config_delete("update_checker", missing_ok=True)
-        sync.config_delete("url_updater", "strings", missing_ok=True)
+        sync.config_delete("url_updater", "strings")

migrations/202405270030.py

@@ -0,0 +1,21 @@
+from libbot import sync
+from mongodb_migrations.base import BaseMigration
+
+
+class Migration(BaseMigration):
+    def upgrade(self):
+        sync.config_set("api", {"url": "https://api.garbagebot.eu"})
+        sync.config_delete("database_api", missing_ok=True)
+
+    def downgrade(self):
+        sync.config_delete("api", missing_ok=True)
+        sync.config_set(
+            "database_api",
+            {
+                "user": None,
+                "password": None,
+                "host": "127.0.0.1",
+                "port": 27017,
+                "name": "garbage_reminder",
+            },
+        )

modules/reminder.py

@@ -1,7 +1,6 @@
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta
 
-import pytz
 from bson import json_util
 from libbot.pyrogram.classes import PyroClient
 
@@ -10,12 +9,13 @@ from classes.location import Location
 from classes.pyrouser import PyroUser
 from modules.database import col_users
 from modules.database_api import col_entries
+from modules.utils import from_utc
 
 logger = logging.getLogger(__name__)
 
 
 async def remind(app: PyroClient) -> None:
-    utcnow = datetime.now(pytz.utc)
+    utcnow = datetime.utcnow()
 
     logger.debug("Performing reminder lookup for %s (UTCNOW)", utcnow)
 
@@ -40,10 +40,12 @@ async def remind(app: PyroClient) -> None:
         try:
             location: Location = await app.get_location(user.location.id)  # type: ignore
         except ValueError:
-            logger.warning("Skipping reminder for %s due to invalid location", user.id)
             continue
 
-        user_date = user.get_reminder_date().replace(tzinfo=None)
+        user_date = from_utc(
+            datetime.utcnow() + timedelta(days=user.offset),
+            user.location.timezone.zone,
+        ).replace(hour=0, minute=0, second=0, microsecond=0)
 
         entries = await col_entries.find(
             {

modules/utils.py

@@ -1,13 +1,12 @@
 from datetime import datetime
 from typing import Union
 
-import pytz
+from pytz import UTC
+from pytz import timezone as pytz_timezone
 
 
 def to_utc(date: datetime, timezone: Union[str, None] = None) -> datetime:
-    """*DEPRECATED AND WILL BE REMOVED IN FUTURE RELEASES*
+    """Move timezone unaware datetime object to UTC timezone and return it.
-
-    Move timezone unaware datetime object to UTC timezone and return it.
 
     ### Args:
         * date (`datetime`): Datetime to be converted.
@@ -17,15 +16,11 @@ def to_utc(date: datetime, timezone: Union[str, None] = None) -> datetime:
         * `datetime`: Timezone unaware datetime in UTC with timezone's offset applied to it.
     """
     timezone = "UTC" if timezone is None else timezone
-    return (
+    return pytz_timezone(timezone).localize(date).astimezone(UTC).replace(tzinfo=None)
-        pytz.timezone(timezone).localize(date).astimezone(pytz.utc).replace(tzinfo=None)
-    )
 
 
 def from_utc(date: datetime, timezone: Union[str, None] = None) -> datetime:
-    """*DEPRECATED AND WILL BE REMOVED IN FUTURE RELEASES*
+    """Move timezone unaware datetime object to the timezone specified and return it.
-
-    Move timezone unaware datetime object to the timezone specified and return it.
 
     ### Args:
         * date (`datetime`): Datetime to be converted.
@@ -36,5 +31,8 @@ def from_utc(date: datetime, timezone: Union[str, None] = None) -> datetime:
     """
     timezone = "UTC" if timezone is None else timezone
     return (
-        pytz.utc.localize(date).astimezone(pytz.timezone(timezone)).replace(tzinfo=None)
+        pytz_timezone("UTC")
+        .localize(date)
+        .astimezone(pytz_timezone(timezone))
+        .replace(tzinfo=None)
     )

plugins/commands/set_offset.py

@@ -1,13 +1,13 @@
 import logging
 from datetime import datetime
 
-import pytz
 from convopyro import listen_message
 from pyrogram import filters
 from pyrogram.types import ForceReply, Message, ReplyKeyboardRemove
 
 from classes.pyroclient import PyroClient
 from modules import custom_filters
+from modules.utils import from_utc
 
 logger = logging.getLogger(__name__)
 
@@ -65,19 +65,18 @@ async def command_set_offset(app: PyroClient, message: Message):
 
     logger.info("User %s has set offset to %s", user.id, offset)
 
-    garbage_time = (
+    garbage_time = from_utc(
-        datetime.now(pytz.utc)
+        datetime(1970, 1, 1, user.time_hour, user.time_minute),
-        .replace(hour=user.time_hour, minute=user.time_minute)
+        None if user.location is None else user.location.timezone.zone,
-        .astimezone(user.location.timezone or pytz.utc)
+    ).strftime(app._("time", "formats"))
-    )
 
     await answer.reply_text(
         app._("set_offset_finished", "messages", locale=user.locale).format(
             offset=offset,
-            time=garbage_time.strftime(app._("time", "formats", locale=user.locale)),
+            time=garbage_time,
-            toggle_notice=(
+            toggle_notice=""
-                "" if user.enabled else app._("toggle", "messages", locale=user.locale)
+            if user.enabled
-            ),
+            else app._("toggle", "messages", locale=user.locale),
         ),
         reply_markup=ReplyKeyboardRemove(),
     )

plugins/commands/set_time.py

@@ -1,13 +1,13 @@
 import logging
 from datetime import datetime
 
-import pytz
 from convopyro import listen_message
 from pyrogram import filters
 from pyrogram.types import ForceReply, Message, ReplyKeyboardRemove
 
 from classes.pyroclient import PyroClient
 from modules import custom_filters
+from modules.utils import to_utc
 
 logger = logging.getLogger(__name__)
 
@@ -55,33 +55,31 @@ async def command_set_time(app: PyroClient, message: Message):
 
         break
 
-    # Time we got from the user
+    now = datetime.now()
-    parsed_time = datetime.strptime(answer.text, "%H:%M")
 
-    # Datetime user means in their timezone
+    parsed_time = datetime.strptime(answer.text, "%H:%M").replace(
-    user_time = datetime.now(user.location.timezone).replace(
+        year=now.year, month=now.month, day=now.day, second=0, microsecond=0
-        hour=parsed_time.hour, minute=parsed_time.minute, second=0, microsecond=0
     )
 
-    # Datetime in user's timezone moved to UTC timezone
+    user_time = to_utc(parsed_time, user.location.timezone.zone)
-    utc_time = user_time.astimezone(pytz.utc)
 
-    await user.update_time(hour=utc_time.hour, minute=utc_time.minute)
+    await user.update_time(hour=user_time.hour, minute=user_time.minute)
 
     logger.info(
-        "User %s has selected notification time of %s (%s UTC)",
+        "User %s has selected notification time of %s",
         user.id,
         user_time.strftime("%H:%M"),
-        utc_time.strftime("%H:%M"),
     )
 
+    garbage_time = parsed_time.strftime(app._("time", "formats"))
+
     await answer.reply_text(
         app._("set_time_finished", "messages", locale=user.locale).format(
             offset=user.offset,
-            time=user_time.strftime(app._("time", "formats", locale=user.locale)),
+            time=garbage_time,
-            toggle_notice=(
+            toggle_notice=""
-                "" if user.enabled else app._("toggle", "messages", locale=user.locale)
+            if user.enabled
-            ),
+            else app._("toggle", "messages", locale=user.locale),
         ),
         reply_markup=ReplyKeyboardRemove(),
     )

plugins/commands/setup.py

@@ -1,4 +1,5 @@
 import logging
+from datetime import datetime
 
 from convopyro import listen_message
 from libbot import i18n
@@ -10,6 +11,7 @@ from classes.pyroclient import PyroClient
 from modules import custom_filters
 from modules.search_name import search_name
 from modules.search_nearby import search_nearby
+from modules.utils import from_utc
 
 logger = logging.getLogger(__name__)
 
@@ -72,9 +74,10 @@ async def command_setup(app: PyroClient, message: Message):
 
     await user.update_location(location.id)
 
-    user_time = user.get_reminder_time().strftime(
+    user_time = from_utc(
-        app._("time", "formats", locale=user.locale)
+        datetime(1970, 1, 1, user.time_hour, user.time_minute),
-    )
+        None if user.location is None else user.location.timezone.zone,
+    ).strftime(app._("time", "formats", locale=user.locale))
 
     await message.reply_text(
         app._("setup_finished", "messages", locale=user.locale).format(

plugins/commands/start.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from convopyro import listen_message
 from pyrogram import filters
 from pyrogram.types import (
@@ -9,6 +11,7 @@ from pyrogram.types import (
 
 from classes.pyroclient import PyroClient
 from modules import custom_filters
+from modules.utils import from_utc
 
 
 @PyroClient.on_message(
@@ -88,15 +91,13 @@ async def command_start(app: PyroClient, message: Message):
 
         await user.update_location(location.id)
 
-        user_time = user.get_reminder_time().strftime(
+        user_time = from_utc(
-            app._("time", "formats", locale=user.locale)
+            datetime(1970, 1, 1, user.time_hour, user.time_minute),
-        )
+            None if user.location is None else user.location.timezone.zone,
-
+        ).strftime(app._("time", "formats", locale=user.locale))
         await answer.reply_text(
             app._("start_selection_yes", "messages", locale=user.locale).format(
-                name=location.name,
+                name=location.name, offset=user.offset, time=user_time
-                offset=user.offset,
-                time=user_time,
             ),
             reply_markup=ReplyKeyboardRemove(),
         )

plugins/commands/toggle.py

@@ -1,8 +1,11 @@
+from datetime import datetime
+
 from pyrogram import filters
 from pyrogram.types import Message
 
 from classes.pyroclient import PyroClient
 from modules import custom_filters
+from modules.utils import from_utc
 
 
 @PyroClient.on_message(
@@ -13,18 +16,16 @@ async def command_toggle(app: PyroClient, message: Message):
 
     await user.update_state(not user.enabled)
 
-    if not user.enabled:
+    if user.enabled:
         await message.reply_text(
             app._("toggle_disabled", "messages", locale=user.locale)
         )
         return
 
-    try:
+    user_time = from_utc(
-        user_time = user.get_reminder_time().strftime(
+        datetime(1970, 1, 1, user.time_hour, user.time_minute),
-            app._("time", "formats", locale=user.locale)
+        None if user.location is None else user.location.timezone.zone,
-        )
+    ).strftime(app._("time", "formats"))
-    except AttributeError:
-        user_time = "N/A"
 
     if user.location is None:
         await message.reply_text(

plugins/commands/upcoming.py

@@ -1,6 +1,5 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
-import pytz
 from pyrogram import filters
 from pyrogram.types import Message
 
@@ -24,11 +23,11 @@ async def command_upcoming(app: PyroClient, message: Message):
 
     date_min = (
         datetime.now(user.location.timezone).replace(second=0, microsecond=0)
-    ).replace(tzinfo=pytz.utc)
+    ).replace(tzinfo=timezone.utc)
     date_max = (
         datetime.now(user.location.timezone).replace(second=0, microsecond=0)
         + timedelta(days=30)
-    ).replace(tzinfo=pytz.utc)
+    ).replace(tzinfo=timezone.utc)
 
     entries = [
         await GarbageEntry.from_record(entry)

requirements.txt

@@ -1,12 +1,13 @@
-aiohttp~=3.10.2
+aiohttp~=3.9.5
 apscheduler~=3.10.4
-async_pymongo==0.1.9
 convopyro==0.5
 mongodb-migrations==1.3.1
-pytz>=2024.1
 tgcrypto==1.2.5
 ujson>=5.0.0
-uvloop==0.20.0
+uvloop==0.19.0
 --extra-index-url https://git.end-play.xyz/api/packages/profitroll/pypi/simple
-libbot[speed,pyrogram]==3.2.3
+async_pymongo==0.1.4
+libbot[speed,pyrogram]==3.2.2
 pykeyboard==0.1.7
+--extra-index-url https://git.end-play.xyz/api/packages/GarbageReminder/pypi/simple
+garbageapi-client==0.1.0

validation/examples/user.json

@@ -4,6 +4,6 @@
     "enabled": true,
     "location": 1,
     "offset": 1,
-    "time_hour": 16,
+    "time_hour": 18,
     "time_minute": 0
 }