From 1500699bcdd2842ddc7c9f70a7cca657e561d0c1 Mon Sep 17 00:00:00 2001 From: Alexandr Date: Sat, 27 Jan 2018 23:03:54 +0100 Subject: [PATCH] Improve return message in case of updating topic. --- updater.py | 9 +++++---- webhook/.index.php.swp | Bin 16384 -> 0 bytes 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 webhook/.index.php.swp diff --git a/updater.py b/updater.py index 9bdfb21..4c0ffd5 100755 --- a/updater.py +++ b/updater.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -# TODO - config file. import pymysql.cursors import urllib.request, json import datetime as dt @@ -42,9 +41,10 @@ def check_updates(id, u_date, cursor): result = cursor.fetchall() for contact in result: print(contact) - msg = "%s has been updated. %s" % ( + msg = "%s has been updated.\n[Open on RuTracker.org](%s)\n`magnet:?xt=urn:%s`" % ( data['result'][id]['topic_title'], - 'https://rutracker.org/forum/viewtopic.php?t='+id) + 'https://rutracker.org/forum/viewtopic.php?t='+id, + data['result'][id]['info_hash']) send(contact['user_id'], msg) @@ -62,7 +62,8 @@ def send(id, msg): post_fields = { 'text': msg, 'chat_id': id, - 'parse_mode': 'Markdown' + 'parse_mode': 'Markdown', + 'disable_web_page_preview': 1 } request = urllib.request.Request(url, urlencode(post_fields).encode()) json = urllib.request.urlopen(request).read().decode() diff --git a/webhook/.index.php.swp b/webhook/.index.php.swp deleted file mode 100644 index 6eab8c45fea6f617e2fe13dfe7542597c19adbef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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