diff --git a/source/bot.py b/source/bot.py index 74fc5e5..4581c93 100644 --- a/source/bot.py +++ b/source/bot.py @@ -147,11 +147,16 @@ def send_user_info(message): user_id = message.from_user.id user = session.query(User).filter_by(telegram_id=user_id).first() scores = session.query(Score).filter_by(telegram_id=user_id).all() + today_score = session.query(Score).filter_by(date=dt.datetime.now(), telegram_id=user_id).first() # get today's score object for user + today_guess = "not guessed today" + + if today_score is not None: + today_guess = str(today_score.guess) if user is not None: user_name = user.username # tbd: get user name by id from db user_score = sum(score for score in scores) # tbd: get user score by adding all scores related to userid - user_guess = session.query(Score).filter_by(date=dt.datetime.now(), telegram_id=user_id).first().guess or "not guessed today" # tbd: display if user has guessed today and how much + user_guess = today_guess # tbd: display if user has guessed today and how much user_info = (f"Your user info:\n" f"User ID: {user_id}\n" f"Username: {user_name}\n"