fool's day rollback

This commit is contained in:
2019-04-02 09:17:25 +03:00
parent 4ba890277e
commit de15a932fa
2 changed files with 2 additions and 83 deletions
+2 -8
View File
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
import logging
import random
import traceback
from html import escape
from queue import Queue, Empty
@@ -144,12 +143,8 @@ def _sign_text(text, m: Message, limit):
sign = ''
if text.startswith('!sign') or text.startswith('/sign'):
text = text[5:]
# sign = f'\n\n____________\n' \
# f'by <a href="tg://user?id={m.from_user.id}">{escape(m.from_user.full_name)}</a>'
subs = conn.root.subscribers
random_user = subs[random.choice(list(subs.keys()))]
sign = f'\n\n____________\n' \
f'by <a href="https://telegra.ph/C-pervym-aprelya-04-01">{escape(random_user.name)}</a>'
f'by <a href="tg://user?id={m.from_user.id}">{escape(m.from_user.full_name)}</a>'
return text[:limit - len(sign)] + sign
@@ -289,8 +284,7 @@ def _process_message(bot: Bot, m: Message):
r = bot.send_venue(uid, l.latitude, l.longitude, v.title, v.address, v.foursquare_id,
reply_to_message_id=reply_to_message_id)
elif hasattr(m, 'text') and m.text:
r = bot.send_message(uid, text, 'html', reply_to_message_id=reply_to_message_id,
disable_web_page_preview=True)
r = bot.send_message(uid, text, 'html', reply_to_message_id=reply_to_message_id)
if r:
user.update_from_message(r)
user.messages_forward[r.message_id] = conn.root.counter