diff --git a/bot.py b/bot.py
index ee29d5b..5a08d57 100644
--- a/bot.py
+++ b/bot.py
@@ -134,9 +134,7 @@ def handle_text(message):
admins = db.all_admins()
text = "All admins:\n\n"
for admin in admins:
- if str(admin[0]) == 'none':
- pass
- else:
+ if str(admin[0]) != 'none':
text += "@%s\n" % (str(admin[0]))
bot.send_message(message.from_user.id, text, parse_mode='HTML')
@@ -200,17 +198,19 @@ def del_warning(message):
@bot.message_handler(commands=['allwarnings'])
def handle_text(message):
- if message.chat.type == "private" and message.from_user.id in superadmins:
- warnings = db.all_warnings()
- text = "All warnings:\n\n"
- for warning in warnings:
- if str(warning[0]) == 'none':
- pass
- else:
- text += "@%s: %s\n" % (str(warning[0]), str(warning[1]))
- splitted_text = util.split_string(text, 3000)
- for text in splitted_text:
- bot.send_message(message.chat.id, text, parse_mode='HTML')
+ if (
+ message.chat.type != "private"
+ or message.from_user.id not in superadmins
+ ):
+ return
+ warnings = db.all_warnings()
+ text = "All warnings:\n\n"
+ for warning in warnings:
+ if str(warning[0]) != 'none':
+ text += "@%s: %s\n" % (str(warning[0]), str(warning[1]))
+ splitted_text = util.split_string(text, 3000)
+ for text in splitted_text:
+ bot.send_message(message.chat.id, text, parse_mode='HTML')
# ============================================= #
diff --git a/dbhelper.py b/dbhelper.py
index 5037fad..9960b6b 100644
--- a/dbhelper.py
+++ b/dbhelper.py
@@ -108,12 +108,10 @@ def del_warning(self, insta_username):
def all_warnings(self):
self.c.execute("SELECT insta_user, warnings FROM data")
- warnings = self.c.fetchall()
- return warnings
+ return self.c.fetchall()
def all_admins(self):
self.c.execute("SELECT insta_user FROM data WHERE admin=1")
- admins = self.c.fetchall()
- return admins
+ return self.c.fetchall()