Skip to content

Commit

Permalink
правки
Browse files Browse the repository at this point in the history
  • Loading branch information
HamletSargsyan committed Jun 9, 2024
1 parent 2b7b267 commit c994e30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/base/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -737,5 +737,6 @@ def generate_daily_gift(user: UserModel):
items = random.choices(items, k=random.randint(1, 3))
daily_gift.items = [item.name for item in items]
daily_gift.is_claimed = False
daily_gift.next_claimable_at = datetime.utcnow() + timedelta(days=1)
database.daily_gifts.update(**daily_gift.to_dict())
return daily_gift
2 changes: 1 addition & 1 deletion src/bot/callback.py
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ def daily_gift_callback(call: CallbackQuery):
daily_gift.last_claimed_at = now
daily_gift.next_claimable_at = now + timedelta(days=1)
daily_gift.is_claimed = True
database.daily_gifts.update(**daily_gift.to_dict())

mess = f"<b>{get_user_tag(user)} получил ежедневный подарок</b>\n\n"
for item_name in daily_gift.items:
Expand All @@ -827,7 +828,6 @@ def daily_gift_callback(call: CallbackQuery):
user.coin += quantity
mess += f"+{quantity} {item.name} {item.emoji}\n"

database.daily_gifts.update(**daily_gift.to_dict())
markup = InlineMarkup.daily_gift(user, daily_gift)
bot.edit_message_reply_markup(
call.message.chat.id, call.message.id, reply_markup=markup
Expand Down
6 changes: 5 additions & 1 deletion src/bot/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,11 @@ def daily_gift_cmd(message: Message):

mess = "<b>Ежедневный подарок</b>"

if daily_gift.next_claimable_at > datetime.utcnow() + timedelta(days=1):
print(datetime.utcnow())
print(daily_gift.next_claimable_at)
print(daily_gift.next_claimable_at <= datetime.utcnow())

if daily_gift.next_claimable_at <= datetime.utcnow():
daily_gift = generate_daily_gift(user)

markup = InlineMarkup.daily_gift(user, daily_gift)
Expand Down

0 comments on commit c994e30

Please sign in to comment.