Fix bug when user has no first or last name
Fixing: https://github.com/OriginProtocol/telegram-moderator/issues/15 Using `.format()` to handle `None` instead of the conditional check.
This commit is contained in:
parent
a398742b96
commit
92a8426261
13
bot.py
13
bot.py
@ -86,8 +86,9 @@ class TelegramMonitorBot:
|
|||||||
def security_check_username(self, bot, update):
|
def security_check_username(self, bot, update):
|
||||||
""" Test username for security violations """
|
""" Test username for security violations """
|
||||||
|
|
||||||
full_name = (update.message.from_user.first_name + " "
|
full_name = "{} {}".format(
|
||||||
+ update.message.from_user.last_name)
|
update.message.from_user.first_name,
|
||||||
|
update.message.from_user.last_name)
|
||||||
if self.name_ban_re and self.name_ban_re.search(full_name):
|
if self.name_ban_re and self.name_ban_re.search(full_name):
|
||||||
# Logging
|
# Logging
|
||||||
log_message = "❌ 🙅♂️ BAN MATCH FULL NAME: {}".format(full_name.encode('utf-8'))
|
log_message = "❌ 🙅♂️ BAN MATCH FULL NAME: {}".format(full_name.encode('utf-8'))
|
||||||
@ -255,18 +256,22 @@ class TelegramMonitorBot:
|
|||||||
else:
|
else:
|
||||||
print("Something went wrong adding the user {}".format(user.id), file=sys.stderr)
|
print("Something went wrong adding the user {}".format(user.id), file=sys.stderr)
|
||||||
|
|
||||||
|
user_name = (
|
||||||
|
user.username or
|
||||||
|
"{} {}".format(user.first_name, user.last_name) or
|
||||||
|
"<none>").encode('utf-8')
|
||||||
if update.message.text:
|
if update.message.text:
|
||||||
print("{} {} ({}) : {}".format(
|
print("{} {} ({}) : {}".format(
|
||||||
strftime("%Y-%m-%dT%H:%M:%S"),
|
strftime("%Y-%m-%dT%H:%M:%S"),
|
||||||
user.id,
|
user.id,
|
||||||
(user.username or (user.first_name + " " + user.last_name) or "").encode('utf-8'),
|
user_name,
|
||||||
update.message.text.encode('utf-8'))
|
update.message.text.encode('utf-8'))
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
print("{} {} ({}) : non-message".format(
|
print("{} {} ({}) : non-message".format(
|
||||||
strftime("%Y-%m-%dT%H:%M:%S"),
|
strftime("%Y-%m-%dT%H:%M:%S"),
|
||||||
user.id,
|
user.id,
|
||||||
(user.username or (user.first_name + " " + user.last_name) or "").encode('utf-8'))
|
user_name)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Don't check admin activity
|
# Don't check admin activity
|
||||||
|
Loading…
Reference in New Issue
Block a user