Add person's name when replying

requirements.txt

@@ -1,34 +1,13 @@
-aiohttp==3.7.3
+aiohttp==3.6.3
-appdirs==1.4.3
 async-timeout==3.0.1
 attrs==20.3.0
-CacheControl==0.12.6
-certifi==2019.11.28
 chardet==3.0.4
-colorama==0.4.3
+idna==3.1
-contextlib2==0.6.0
+idna-ssl==1.1.0
-decorator==4.4.2
+multidict==4.7.6
-distlib==0.3.0
-distro==1.4.0
-html5lib==1.0.1
-idna==2.8
-ipaddr==2.2.0
-lockfile==0.12.2
-msgpack==0.6.2
-multidict==5.1.0
-packaging==20.3
-pep517==0.8.2
-progress==1.5
 pyaes==1.6.1
 pyasn1==0.4.8
-pyparsing==2.4.6
+rsa==4.7.2
-pytoml==0.1.21
+Telethon==1.21.1
-requests==2.22.0
-retrying==1.3.3
-rsa==4.7.1
-six==1.14.0
-Telethon==1.19.5
 typing-extensions==3.7.4.3
-urllib3==1.25.8
+yarl==1.5.1
-webencodings==0.5.1
-yarl==1.6.3

teledynmap.py

@@ -6,7 +6,7 @@ import re
 import settings
 from telethon import TelegramClient, events
 
-bot = TelegramClient('bot', settings.API_ID, settings.API_HASH).start(bot_token=settings.API_TOKEN)
+bot = TelegramClient('data/bot', settings.API_ID, settings.API_HASH).start(bot_token=settings.API_TOKEN)
 web = None
 api = lambda route: settings.DYNMAP_ADDRESS + route
 md5 = lambda name: int(hashlib.md5(name.encode()).hexdigest(), 16)
@@ -20,6 +20,7 @@ logging.info('Bridge initialized')
 async def new_message(event):
     text = event.raw_text
     sender = await event.get_sender()
+    reply_name = ''
 
     if event.chat.id != settings.CHAT_ID:
         logging.info('Wrong chat ID')
@@ -29,6 +30,22 @@ async def new_message(event):
         logging.info('No text found')
         return
 
+    if event.message.is_reply:
+        reply_msg = await event.get_reply_message()
+        reply_text = reply_msg.text
+        reply_name = reply_msg.sender.first_name
+
+        if reply_name == 'protospace_mc_bot':
+            match = re.search(r'<(\w+)>.*', reply_text)
+            if match:
+                reply_name, = match.groups()
+            else:
+                reply_name = ''
+
+    if reply_name:
+        reply_name = settings.CUSTOM_NAMES.get(reply_name, reply_name)
+        text = reply_name + ': ' + text
+
     name = re.sub(r'\W+', '', sender.first_name)
     name = '[TG] ' + settings.CUSTOM_NAMES.get(name, name)