From b990f3eec86ecb67531919b6f14d17b67dddb7f6 Mon Sep 17 00:00:00 2001 From: Alexandr Date: Thu, 10 Jan 2019 23:05:54 +0300 Subject: [PATCH] Prettify alert message. --- database.py | 2 +- worker.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/database.py b/database.py index 47db761..a44b78d 100755 --- a/database.py +++ b/database.py @@ -146,7 +146,7 @@ class DataBase: def all_conf_users(self, conf_id): sql = """ - SELECT DISTINCT(u.username) FROM relations r + SELECT DISTINCT(u.username), u.first_name, u.id FROM relations r LEFT JOIN user u ON u.id = r.user_id LEFT JOIN conf c diff --git a/worker.py b/worker.py index 24aaaf3..d7bc8c9 100755 --- a/worker.py +++ b/worker.py @@ -310,7 +310,7 @@ class MessageWorker: users = self.db.all_conf_users(conf_id=alert[0]) msg = "" for user in users: - msg += ' @%s ' % (user[0]) - msg += "Hey all!\n %s" % alert[4] - self.send(id=alert[0], msg=msg, parse_mode='HTML') + msg += ' [%s](tg://user?id=%s) ' % (user[1], user[2]) + msg += "\nHey all!\n%s" % alert[4] + self.send(id=alert[0], msg=msg) threading.Timer(30, self.cron_timer).start()