diff --git a/src/base/player.py b/src/base/player.py index 5119758..4241925 100644 --- a/src/base/player.py +++ b/src/base/player.py @@ -194,9 +194,7 @@ def generate_exchanger(user: UserModel): try: old_exchanger = database.exchangers.get(**{"owner": user._id}) database.exchangers.delete(**old_exchanger.to_dict()) - print(1) except NoResult: - print(2) pass allowed_items: List[Item] = [] diff --git a/src/bot/handlers.py b/src/bot/handlers.py index 78fb926..5930fda 100644 --- a/src/bot/handlers.py +++ b/src/bot/handlers.py @@ -776,9 +776,10 @@ def exchanger_cmd(message: Message): exchanger = generate_exchanger(user) database.exchangers.update(**exchanger.to_dict()) - if (datetime.utcnow() - exchanger.last_update) >= timedelta(days=1): + if exchanger.expires <= datetime.utcnow(): exchanger = generate_exchanger(user) database.exchangers.update(**exchanger.to_dict()) + mess = ( "Обменник 🔄\n\n" diff --git a/src/config.py b/src/config.py index 45f9599..77a2681 100644 --- a/src/config.py +++ b/src/config.py @@ -10,7 +10,7 @@ load_dotenv() -DEBUG = True +DEBUG = False TOKEN = os.getenv("BOT_TOKEN", "") DB_URL = os.getenv("DB_URL", "") diff --git a/src/database/models.py b/src/database/models.py index 67324e9..16ff253 100644 --- a/src/database/models.py +++ b/src/database/models.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, timedelta from typing import Union from bson import ObjectId @@ -67,7 +67,7 @@ def __init__(self, **kwargs) -> None: class ExchangerModel(BaseModel): def __init__(self, **kwargs) -> None: self._id: ObjectId - self.last_update: datetime = datetime.utcnow() + self.expires: datetime = datetime.utcnow() + timedelta(days=1) self.item: str self.price: int self.owner: ObjectId