From 42056b91c506af33b0ddef4bd6cdf97d76a533f2 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 21 Jun 2018 16:16:16 +0300
Subject: [PATCH] Fix critical Telethon core rewrite compatibility bugs

---
 mautrix_telegram/portal.py   |  2 +-
 mautrix_telegram/puppet.py   |  2 +-
 mautrix_telegram/tgclient.py | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py
index 3dcdec66..f4baa737 100644
--- a/mautrix_telegram/portal.py
+++ b/mautrix_telegram/portal.py
@@ -32,7 +32,7 @@ from sqlalchemy.orm.exc import FlushError
 
 from telethon.tl.functions.messages import *
 from telethon.tl.functions.channels import *
-from telethon.errors.rpc_error_list import *
+from telethon.errors import *
 from telethon.tl.types import *
 from mautrix_appservice import MatrixRequestError, IntentError
 
diff --git a/mautrix_telegram/puppet.py b/mautrix_telegram/puppet.py
index 4b36e7fa..e954f1e7 100644
--- a/mautrix_telegram/puppet.py
+++ b/mautrix_telegram/puppet.py
@@ -19,7 +19,7 @@ import re
 import logging
 
 from telethon.tl.types import UserProfilePhoto
-from telethon.errors.rpc_error_list import LocationInvalidError
+from telethon.errors import LocationInvalidError
 
 from .db import Puppet as DBPuppet
 from . import util
diff --git a/mautrix_telegram/tgclient.py b/mautrix_telegram/tgclient.py
index 406bd559..34feda84 100644
--- a/mautrix_telegram/tgclient.py
+++ b/mautrix_telegram/tgclient.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from io import BytesIO
 
-from telethon import TelegramClient
+from telethon import TelegramClient, utils
 from telethon.tl.functions.messages import SendMessageRequest, SendMediaRequest
 from telethon.tl.types import *
 from telethon.extensions.markdown import parse as parse_md
@@ -35,7 +35,7 @@ class MautrixTelegramClient(TelegramClient):
             message=message,
             entities=entities,
             no_webpage=not link_preview,
-            reply_to_msg_id=self._get_message_id(reply_to)
+            reply_to_msg_id=utils.get_message_id(reply_to)
         )
         result = await self(request)
         if isinstance(result, UpdateShortSentMessage):
@@ -49,7 +49,7 @@ class MautrixTelegramClient(TelegramClient):
                 entities=result.entities
             )
 
-        return self._get_response_message(request, result)
+        return self._get_response_message(request, result, entity)
 
     async def upload_file(self, file, mime_type=None, attributes=None, file_name=None):
         file_handle = await super().upload_file(file, file_name=file_name, use_cache=False)
@@ -67,10 +67,10 @@ class MautrixTelegramClient(TelegramClient):
 
     async def send_media(self, entity, media, caption=None, entities=None, reply_to=None):
         entity = await self.get_input_entity(entity)
-        reply_to = self._get_message_id(reply_to)
+        reply_to = utils.get_message_id(reply_to)
         request = SendMediaRequest(entity, media, message=caption or "", entities=entities or [],
                                    reply_to_msg_id=reply_to)
-        return self._get_response_message(request, await self(request))
+        return self._get_response_message(request, await self(request), entity)
 
     async def download_file_bytes(self, location):
         if isinstance(location, Document):