From 2ed419713b6c7cece5bc00486f83ba55bc19a067 Mon Sep 17 00:00:00 2001 From: Linus E <75929322+Rripped@users.noreply.github.com> Date: Mon, 25 Apr 2022 19:18:07 +0200 Subject: [PATCH] updated /users --- telegram_bot/bot.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/telegram_bot/bot.py b/telegram_bot/bot.py index f7c6c6a..858e7c6 100644 --- a/telegram_bot/bot.py +++ b/telegram_bot/bot.py @@ -35,8 +35,7 @@ from api_handling.api_handler import API_Handler load_dotenv(dotenv_path='.env') # load environment variables -bot_version = "1.0.1" -user_list = [] +bot_version = "1.0.1" # version of bot #create api handler api_handler = API_Handler("https://gruppe1.testsites.info/api", str(os.getenv("BOT_EMAIL")), str(os.getenv("BOT_PASSWORD"))) # get creds from env vars. @@ -122,15 +121,26 @@ def send_all_users(message): :rtype: none """ - user_id = int(message.from_user.id) + + user_id = int(message.from_user.id) + user_data = api_handler.get_user(user_id) + if(user_data["admin"] == False): # check if user has admin rights + bot.reply_to(message, "You have to be an admin to use this command") + return - # tbd check if user is admin + user_list = api_handler.get_all_users() + user_count = len(user_list) + bot.send_message(chat_id=user_id, text="There are " + str(user_count) + " users in the database:") - answer = 'Current number of users: ' + str(len(user_list)) - bot.send_message(chat_id = user_id, text=answer) - for known_user in user_list: - answer = str(known_user.user_id) + ' : ' + known_user.user_name - bot.send_message(chat_id=user_id, text=answer) + for user in user_list: + + username = user['username'] + email = user['email'] + user_id = user['telegram_user_id'] + cron = user['cron'] + admin = user['admin'] + + bot.send_message(chat_id=user_id, text=f'Username: {username}\nEmail: {email}\nID: {user_id}\nCron: {cron}\nAdmin: {admin}') # format user data into readable message text @bot.message_handler(commands=['me', 'Me']) # /me -> sending user info