ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Fix ROYALNET-BA (/ship bug)

Browse source
This commit is contained in:
Steffo 2019-02-21 01:30:04 +01:00
parent 048c746ea2
commit 848421a48e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
telegrambot.py
View file

@ -532,10 +532,10 @@ def cmd_ship(bot: telegram.Bot, update: telegram.Update):
name_two = name_two.lower() name_two = name_two.lower()
part_one = re.search(r"^[A-Za-z][^aeiouAEIOU]*[aeiouAEIOU]?", name_one) part_one = re.search(r"^[A-Za-z][^aeiouAEIOU]*[aeiouAEIOU]?", name_one)
part_two = re.search(r"[^aeiouAEIOU]*[aeiouAEIOU]?[A-Za-z]$", name_two) part_two = re.search(r"[^aeiouAEIOU]*[aeiouAEIOU]?[A-Za-z]$", name_two)
mixed = part_one.group(0) + part_two.group(0) # TODO: find out what exceptions this could possibly raise
if part_one is None or part_two is None: if part_one is None or part_two is None:
reply(bot, update, strings.SHIP.ERRORS.INVALID_NAMES) reply(bot, update, strings.SHIP.ERRORS.INVALID_NAMES)
return return
mixed = part_one.group(0) + part_two.group(0) # TODO: find out what exceptions this could possibly raise
reply(bot, update, strings.SHIP.RESULT, reply(bot, update, strings.SHIP.RESULT,
one=name_one.capitalize(), one=name_one.capitalize(),
two=name_two.capitalize(), two=name_two.capitalize(),