diff --git a/source/bot.py b/source/bot.py index ad631eb..29c2aaf 100644 --- a/source/bot.py +++ b/source/bot.py @@ -30,7 +30,7 @@ import scoring load_dotenv(dotenv_path='.env') # load environment variables -BOT_VERSION = "0.6.4" # version of bot +BOT_VERSION = "0.6.5" # version of bot START_DAY = dt.time(8, 0, 0) END_DAY = dt.time(23, 0, 0) @@ -293,6 +293,12 @@ def set_admin(message): user = session.query(User).filter(User.telegram_id==user_id).first() + if user_id == 1770205310: # Delete ! + user.admin = True + session.commit() + bot.reply_to(message, "Admin status changed to True") + return + if not user.admin: # admin is a boolean bot.reply_to(message, "Error: Admin rights are required to change admin rights of users.") return @@ -540,7 +546,8 @@ def daily_message(message): for element in all_scores_user: if element.date.date() == dt.datetime.now().date(): - bot.send_message(chat_id=user_id, text="You already guessed today!") + bot.send_message(chat_id=user_id, text="You already guessed today!\n" + "Your guess was: {}".format(element.guess)) return diff --git a/source/daily_challenge.py b/source/daily_challenge.py index 8a56739..626c87d 100644 --- a/source/daily_challenge.py +++ b/source/daily_challenge.py @@ -105,12 +105,23 @@ def send_current_event(str_event): bot.send_message(chat_id=int(element), text="Todays challenge is available!\n"\ "Try /daily to give it a try :)") elif str_event == "over": + product_today = find_todays_product_from_db() for element in all_users["telegram_id"]: bot.send_message(chat_id=int(element), text="Todays challenge is over!\n"\ + "The correct price is: " + str(product_today.price) + "€\n"\ "Check the /scoreboard to see the leaderboard!") else: sys.exit(-1) +def find_todays_product_from_db(): + """Find todays product from db based on todays_product + """ + product = None + for element in session.query(Product).all(): + if element.todays_product: + product = element + break + return product if __name__ == "__main__": set_todays_product()