warp-beacon 2.8.12__tar.gz → 2.8.13__tar.gz

{warp_beacon-2.8.12/warp_beacon.egg-info → warp_beacon-2.8.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.8.12
+Version: 2.8.13
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

warp_beacon-2.8.13/warp_beacon/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "2.8.13"
+

{warp_beacon-2.8.12 → warp_beacon-2.8.13}/warp_beacon/telegram/bot.py

@@ -11,7 +11,7 @@ from pyrogram import Client, filters
 from pyrogram.enums import ParseMode, ChatType
 from pyrogram.handlers import MessageHandler, CallbackQueryHandler
 from pyrogram.types import InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InlineKeyboardButton, InlineKeyboardMarkup
-from pyrogram.errors import NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid
+from pyrogram.errors import NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid, FloodWait
 
 import warp_beacon
 from warp_beacon.__version__ import __version__
@@ -443,7 +443,13 @@ class Bot(object):
 								JobType.ANIMATION: self.client.send_animation
 							}
 							try:
-								reply_message = await send_funcs[job.media_type](**self.build_tg_args(job))
+								while True:
+									try:
+										reply_message = await send_funcs[job.media_type](**self.build_tg_args(job))
+										break
+									except FloodWait as e:
+										logging.warning("FloodWait occurred, waiting '%d' seconds before retry", int(e.value))
+										asyncio.sleep(e.value)
 							except ValueError as e:
 								err_text = str(e)
 								if "Expected" in err_text:
@@ -464,7 +470,14 @@ class Bot(object):
 						snd_grp_options = {"chat_id": job.chat_id, "reply_to_message_id": job.message_id}
 						for i, media_chunk in enumerate(col_job_args["media"]):
 							snd_grp_options["media"] = media_chunk
-							messages = await self.client.send_media_group(**snd_grp_options)
+							messages = []
+							while True:
+								try:
+									messages = await self.client.send_media_group(**snd_grp_options)
+									break
+								except FloodWait as e:
+									logging.warning("FloodWait occurred, waiting '%d' seconds before retry", int(e.value))
+									asyncio.sleep(e.value)
 							sent_messages += messages
 							if job.media_collection:
 								for j, _ in enumerate(media_chunk):

{warp_beacon-2.8.12 → warp_beacon-2.8.13}/warp_beacon/telegram/edit_message.py

@@ -1,9 +1,13 @@
+import asyncio
 import re
 
+import logging
+
 from pyrogram.client import Client
 from pyrogram.types import InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InlineKeyboardMarkup
 from pyrogram import raw
 from pyrogram import types
+from pyrogram.errors import FloodWait
 
 from warp_beacon.telegram.progress_bar import ProgressBar
 from warp_beacon.telegram.types import ReportType
@@ -124,23 +128,30 @@ class EditMessage(object):
 				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_animation(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 
-		peer = await self.client.resolve_peer(chat_id)
-
-		r = await self.client.invoke(
-			raw.functions.messages.EditMessage(
-				peer=peer,
-				id=message_id,
-				media=raw_media,
-				reply_markup=await reply_markup.write(self.client) if reply_markup else None,
-				message=message,
-				entities=entities
-			)
-		)
+		peer, r = None, None
+		while True:
+			try:
+				peer = await self.client.resolve_peer(chat_id)
+				r = await self.client.invoke(
+					raw.functions.messages.EditMessage(
+						peer=peer,
+						id=message_id,
+						media=raw_media,
+						reply_markup=await reply_markup.write(self.client) if reply_markup else None,
+						message=message,
+						entities=entities
+					)
+				)
+				break
+			except FloodWait as e:
+				logging.warning("FloodWait occurred, waiting '%d' seconds before retry", int(e.value))
+				asyncio.sleep(e.value)
 
-		for i in r.updates:
-			if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
-				return await types.Message._parse(
-					self.client, i.message,
-					{i.id: i for i in r.users},
-					{i.id: i for i in r.chats}
-				)
+		if r:
+			for i in r.updates:
+				if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
+					return await types.Message._parse(
+						self.client, i.message,
+						{i.id: i for i in r.users},
+						{i.id: i for i in r.chats}
+					)

{warp_beacon-2.8.12 → warp_beacon-2.8.13/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.8.12
+Version: 2.8.13
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

warp_beacon-2.8.12/warp_beacon/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "2.8.12"
-