Remove custom download_file_bytes() function
This commit is contained in:
@@ -14,8 +14,6 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
from io import BytesIO
|
|
||||||
|
|
||||||
from telethon import TelegramClient, utils
|
from telethon import TelegramClient, utils
|
||||||
from telethon.tl.functions.messages import SendMediaRequest
|
from telethon.tl.functions.messages import SendMediaRequest
|
||||||
from telethon.tl.types import *
|
from telethon.tl.types import *
|
||||||
@@ -42,18 +40,3 @@ class MautrixTelegramClient(TelegramClient):
|
|||||||
request = SendMediaRequest(entity, media, message=caption or "", entities=entities or [],
|
request = SendMediaRequest(entity, media, message=caption or "", entities=entities or [],
|
||||||
reply_to_msg_id=reply_to)
|
reply_to_msg_id=reply_to)
|
||||||
return self._get_response_message(request, await self(request), entity)
|
return self._get_response_message(request, await self(request), entity)
|
||||||
|
|
||||||
async def download_file_bytes(self, location):
|
|
||||||
if isinstance(location, Document):
|
|
||||||
location = InputDocumentFileLocation(location.id, location.access_hash,
|
|
||||||
location.version)
|
|
||||||
elif not isinstance(location, (InputFileLocation, InputDocumentFileLocation)):
|
|
||||||
location = InputFileLocation(location.volume_id, location.local_id, location.secret)
|
|
||||||
|
|
||||||
file = BytesIO()
|
|
||||||
|
|
||||||
await self.download_file(location, file)
|
|
||||||
|
|
||||||
data = file.getvalue()
|
|
||||||
file.close()
|
|
||||||
return data
|
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ async def transfer_thumbnail_to_matrix(client, intent, thumbnail_loc, video, mim
|
|||||||
return None
|
return None
|
||||||
mime_type = "image/png"
|
mime_type = "image/png"
|
||||||
else:
|
else:
|
||||||
file = await client.download_file_bytes(thumbnail_loc)
|
file = await client.download_file(thumbnail_loc)
|
||||||
width, height = None, None
|
width, height = None, None
|
||||||
mime_type = magic.from_buffer(file, mime=True)
|
mime_type = magic.from_buffer(file, mime=True)
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ async def _unlocked_transfer_file_to_matrix(db, client, intent, id, location, th
|
|||||||
return db_file
|
return db_file
|
||||||
|
|
||||||
try:
|
try:
|
||||||
file = await client.download_file_bytes(location)
|
file = await client.download_file(location)
|
||||||
except LocationInvalidError:
|
except LocationInvalidError:
|
||||||
return None
|
return None
|
||||||
except (AuthBytesInvalidError, AuthKeyInvalidError, SecurityError) as e:
|
except (AuthBytesInvalidError, AuthKeyInvalidError, SecurityError) as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user