Skip to content

Commit 50cff06

Browse files
delivrancedelivrance
committed
Fix send_* methods sending the incorrect Telegram media message type
This makes Pyrogram consistent with the official Bot API behaviour.
1 parent 69f347d commit 50cff06

File tree

8 files changed

+11
-19
lines changed

8 files changed

+11
-19
lines changed

‎pyrogram/client/methods/messages/edit_message_media.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -122,7 +121,7 @@ def edit_message_media(self,
122121
functions.messages.UploadMedia(
123122
peer=self.resolve_peer(chat_id),
124123
media=types.InputMediaUploadedDocument(
125-
mime_type=mimetypes.types_map[".mp4"],
124+
mime_type="video/mp4",
126125
thumb=None if media.thumb is None else self.save_file(media.thumb),
127126
file=self.save_file(media.media),
128127
attributes=[
@@ -179,7 +178,7 @@ def edit_message_media(self,
179178
functions.messages.UploadMedia(
180179
peer=self.resolve_peer(chat_id),
181180
media=types.InputMediaUploadedDocument(
182-
mime_type=mimetypes.types_map.get("." + media.media.split(".")[-1], "audio/mpeg"),
181+
mime_type="audio/mpeg",
183182
thumb=None if media.thumb is None else self.save_file(media.thumb),
184183
file=self.save_file(media.media),
185184
attributes=[
@@ -235,7 +234,7 @@ def edit_message_media(self,
235234
functions.messages.UploadMedia(
236235
peer=self.resolve_peer(chat_id),
237236
media=types.InputMediaUploadedDocument(
238-
mime_type=mimetypes.types_map[".mp4"],
237+
mime_type="video/mp4",
239238
thumb=None if media.thumb is None else self.save_file(media.thumb),
240239
file=self.save_file(media.media),
241240
attributes=[
@@ -293,7 +292,7 @@ def edit_message_media(self,
293292
functions.messages.UploadMedia(
294293
peer=self.resolve_peer(chat_id),
295294
media=types.InputMediaUploadedDocument(
296-
mime_type=mimetypes.types_map.get("." + media.media.split(".")[-1], "text/plain"),
295+
mime_type="application/zip",
297296
thumb=None if media.thumb is None else self.save_file(media.thumb),
298297
file=self.save_file(media.media),
299298
attributes=[

‎pyrogram/client/methods/messages/send_animation.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -132,7 +131,7 @@ def send_animation(self,
132131
thumb = None if thumb is None else self.save_file(thumb)
133132
file = self.save_file(animation, progress=progress, progress_args=progress_args)
134133
media = types.InputMediaUploadedDocument(
135-
mime_type=mimetypes.types_map[".mp4"],
134+
mime_type="video/mp4",
136135
file=file,
137136
thumb=thumb,
138137
attributes=[

‎pyrogram/client/methods/messages/send_audio.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -134,7 +133,7 @@ def send_audio(self,
134133
thumb = None if thumb is None else self.save_file(thumb)
135134
file = self.save_file(audio, progress=progress, progress_args=progress_args)
136135
media = types.InputMediaUploadedDocument(
137-
mime_type=mimetypes.types_map.get("." + audio.split(".")[-1], "audio/mpeg"),
136+
mime_type="audio/mpeg",
138137
file=file,
139138
thumb=thumb,
140139
attributes=[

‎pyrogram/client/methods/messages/send_document.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -120,7 +119,7 @@ def send_document(self,
120119
thumb = None if thumb is None else self.save_file(thumb)
121120
file = self.save_file(document, progress=progress, progress_args=progress_args)
122121
media = types.InputMediaUploadedDocument(
123-
mime_type=mimetypes.types_map.get("." + document.split(".")[-1], "text/plain"),
122+
mime_type="application/zip",
124123
file=file,
125124
thumb=thumb,
126125
attributes=[

‎pyrogram/client/methods/messages/send_media_group.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import binascii
2020
import logging
21-
import mimetypes
2221
import os
2322
import struct
2423
import time
@@ -130,7 +129,7 @@ def send_media_group(self,
130129
media=types.InputMediaUploadedDocument(
131130
file=self.save_file(i.media),
132131
thumb=None if i.thumb is None else self.save_file(i.thumb),
133-
mime_type=mimetypes.types_map[".mp4"],
132+
mime_type="video/mp4",
134133
attributes=[
135134
types.DocumentAttributeVideo(
136135
supports_streaming=i.supports_streaming or None,

‎pyrogram/client/methods/messages/send_video.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -136,7 +135,7 @@ def send_video(self,
136135
thumb = None if thumb is None else self.save_file(thumb)
137136
file = self.save_file(video, progress=progress, progress_args=progress_args)
138137
media = types.InputMediaUploadedDocument(
139-
mime_type=mimetypes.types_map[".mp4"],
138+
mime_type="video/mp4",
140139
file=file,
141140
thumb=thumb,
142141
attributes=[

‎pyrogram/client/methods/messages/send_video_note.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -117,7 +116,7 @@ def send_video_note(self,
117116
thumb = None if thumb is None else self.save_file(thumb)
118117
file = self.save_file(video_note, progress=progress, progress_args=progress_args)
119118
media = types.InputMediaUploadedDocument(
120-
mime_type=mimetypes.types_map[".mp4"],
119+
mime_type="video/mp4",
121120
file=file,
122121
thumb=thumb,
123122
attributes=[

‎pyrogram/client/methods/messages/send_voice.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

1919
import binascii
20-
import mimetypes
2120
import os
2221
import struct
2322
from typing import Union
@@ -116,7 +115,7 @@ def send_voice(self,
116115
if os.path.exists(voice):
117116
file = self.save_file(voice, progress=progress, progress_args=progress_args)
118117
media = types.InputMediaUploadedDocument(
119-
mime_type=mimetypes.types_map.get("." + voice.split(".")[-1], "audio/mpeg"),
118+
mime_type="audio/mpeg",
120119
file=file,
121120
attributes=[
122121
types.DocumentAttributeAudio(

0 commit comments

Comments
 (0)