From 4a095343621712fcf0b0bcb16742d7d547dbf21e Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 2 Sep 2020 17:52:08 +0200 Subject: [PATCH] . --- src/core.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core.py b/src/core.py index f38a5c7..73b8a1a 100644 --- a/src/core.py +++ b/src/core.py @@ -201,13 +201,11 @@ def handle_private(ev): # refresh user in db now = datetime.now() - was_new_user = False with db_modify_user(ev.chat.id, allow_new=True) as user: if user.id is None: user.defaults() user.id = ev.chat.id assert ev.chat.id == ev.from_user.id - was_new_user = True user.username = ev.from_user.username user.realname = ev.from_user.first_name if ev.from_user.last_name: @@ -264,6 +262,10 @@ def handle_private_command(ev, user, c): ### Helpers +def str_is_printable(s): + NOT_PRINTABLE = (0x20, 0x115f, 0x1160, 0x3164, 0xffa0) + return any((c.isprintable() and ord(c) not in NOT_PRINTABLE) for c in s) + def parse_timedelta(s): if len(s) < 2 or not s[:-1].isdigit(): return @@ -286,7 +288,7 @@ def format_datetime(dt): def format_user_info(user): realname = user.realname - if not any(c.isprintable() for c in realname): + if not str_is_printable(realname): realname = "" s = "User: %s" % ( user.id, escape_html(realname))