diff --git a/pyrogram/methods/messages/send_audio.py b/pyrogram/methods/messages/send_audio.py index 0267d56aa..d4a3001b0 100644 --- a/pyrogram/methods/messages/send_audio.py +++ b/pyrogram/methods/messages/send_audio.py @@ -197,7 +197,9 @@ async def progress(current, total): try: if isinstance(audio, str): if os.path.isfile(audio): - mime_type = utils.voiceAudioUrlFuxUps(self, audio, 1) + mime_type = self.guess_mime_type(audio) or "audio/mpeg" + if mime_type == "audio/ogg": + mime_type = "audio/opus" thumb = await self.save_file(thumb) file = await self.save_file(audio, progress=progress, progress_args=progress_args) media = raw.types.InputMediaUploadedDocument( @@ -220,7 +222,9 @@ async def progress(current, total): else: media = utils.get_input_media_from_file_id(audio, FileType.AUDIO) else: - mime_type = utils.voiceAudioUrlFuxUps(self, file_name or audio.name, 1) + mime_type = self.guess_mime_type(audio.name) or "audio/mpeg" + if mime_type == "audio/ogg": + mime_type = "audio/opus" thumb = await self.save_file(thumb) file = await self.save_file(audio, progress=progress, progress_args=progress_args) media = raw.types.InputMediaUploadedDocument( diff --git a/pyrogram/methods/messages/send_voice.py b/pyrogram/methods/messages/send_voice.py index 6e090b523..ee8c4f454 100644 --- a/pyrogram/methods/messages/send_voice.py +++ b/pyrogram/methods/messages/send_voice.py @@ -176,7 +176,9 @@ async def send_voice( try: if isinstance(voice, str): if os.path.isfile(voice): - mime_type = utils.voiceAudioUrlFuxUps(self, voice, 2) + mime_type = self.guess_mime_type(voice) or "audio/ogg" + if mime_type == "audio/mpeg": + mime_type = "audio/ogg" file = await self.save_file(voice, progress=progress, progress_args=progress_args) media = raw.types.InputMediaUploadedDocument( mime_type=mime_type, @@ -196,7 +198,9 @@ async def send_voice( else: media = utils.get_input_media_from_file_id(voice, FileType.VOICE) else: - mime_type = utils.voiceAudioUrlFuxUps(self, voice.name, 2) + mime_type = self.guess_mime_type(voice.name) or "audio/ogg" + if mime_type == "audio/mpeg": + mime_type = "audio/ogg" file = await self.save_file(voice, progress=progress, progress_args=progress_args) media = raw.types.InputMediaUploadedDocument( mime_type=mime_type, diff --git a/pyrogram/utils.py b/pyrogram/utils.py index 7d65ff7f5..acfc4dbcf 100644 --- a/pyrogram/utils.py +++ b/pyrogram/utils.py @@ -472,24 +472,3 @@ def get_first_url(text): matches = re.findall(r"(https?):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])", text) return f"{matches[0][0]}://{matches[0][1]}{matches[0][2]}" if matches else None - - -def voiceAudioUrlFuxUps( - client: "pyroram.Client", - file_name: str, - dinxe: int -) -> str: - un_posi_mt = [ - "application/zip", # 0 - # https://t.me/c/1220993104/1360174 - "audio/mpeg", # 1 - "audio/ogg", # 2 - ] - mime_type = client.guess_mime_type(file_name) or un_posi_mt[dinxe] - # BEWARE: https://t.me/c/1279877202/31475 - if dinxe == 1 and mime_type == "audio/ogg": - mime_type = "audio/opus" - elif dinxe == 2 and mime_type == "audio/mpeg": - mime_type = "audio/ogg" - # BEWARE: https://t.me/c/1279877202/74 - return mime_type