warp-beacon 2.2.9__tar.gz → 2.2.11__tar.gz

{warp_beacon-2.2.9/warp_beacon.egg-info → warp_beacon-2.2.11}/PKG-INFO

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

warp_beacon-2.2.11/warp_beacon/__version__.py

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

{warp_beacon-2.2.9 → warp_beacon-2.2.11}/warp_beacon/scraper/youtube/abstract.py

@@ -107,9 +107,9 @@ class YoutubeAbstract(ScraperAbstract):
 			logging.info("Youtube thumbnail url '%s'", url)
 			with urllib.request.urlopen(url, timeout=timeout) as f:
 				image = Image.open(io.BytesIO(f.read()))
-				image = MediaInfoAbstract.shrink_image_to_fit(image)
+				image = MediaInfoAbstract.shrink_image_to_fit(image, size=(320, 240))
 				io_buf = io.BytesIO()
-				image.save(io_buf, format='JPEG', subsampling=0, quality=100)
+				image.save(io_buf, format='JPEG', subsampling=0, quality=100, progressive=True, optimize=False, icc_profile=image.info.get('icc_profile'))
 				io_buf.seek(0)
 				return io_buf
 		except Exception as e:

{warp_beacon-2.2.9 → warp_beacon-2.2.11}/warp_beacon/telegram/bot.py

@@ -320,6 +320,7 @@ class Bot(object):
 		else:
 			args["disable_notification"] = True
 			#args["reply_to_message_id"] = job.message_id
+			args["reply_to_message_id"] = None
 
 		if os.environ.get("ENABLE_DONATES", None) == "true" and job.media_type is not JobType.COLLECTION:
 			args["reply_markup"] = InlineKeyboardMarkup([[InlineKeyboardButton("❤ Donate", url=os.environ.get("DONATE_LINK", "https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E"))]])
@@ -368,12 +369,12 @@ class Bot(object):
 					elif job.media_type == JobType.COLLECTION:
 						col_job_args = self.build_tg_args(job)
 						sent_messages = []
+						snd_grp_options = {"chat_id": job.chat_id, "reply_to_message_id": job.message_id}
+						if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
+							snd_grp_options["reply_to_message_id"] = None
 						for i, media_chunk in enumerate(col_job_args["media"]):
-							messages = await self.client.send_media_group(
-								chat_id=job.chat_id,
-								#reply_to_message_id=job.message_id,
-								media=media_chunk
-							)
+							snd_grp_options["media"] = media_chunk
+							messages = await self.client.send_media_group(**snd_grp_options)
 							sent_messages += messages
 							if job.media_collection:
 								for j, _ in enumerate(media_chunk):

{warp_beacon-2.2.9 → warp_beacon-2.2.11}/warp_beacon/telegram/placeholder_message.py

@@ -42,8 +42,8 @@ class PlaceholderMessage(object):
 			chat_id=chat_id,
 			animation=self.placeholder.tg_file_id,
 			caption=text,
-			parse_mode=ParseMode.MARKDOWN,
-			reply_to_message_id=reply_id
+			reply_to_message_id=reply_id,
+			parse_mode=ParseMode.MARKDOWN
 		)
 
 		return reply
@@ -53,8 +53,8 @@ class PlaceholderMessage(object):
 			chat_id=chat_id,
 			photo=self.placeholder.tg_file_id,
 			caption=text,
-			parse_mode=ParseMode.MARKDOWN,
-			reply_to_message_id=reply_id
+			reply_to_message_id=reply_id,
+			parse_mode=ParseMode.MARKDOWN
 		)
 
 		return reply
@@ -64,8 +64,8 @@ class PlaceholderMessage(object):
 			chat_id=chat_id,
 			document=self.placeholder.tg_file_id,
 			caption=text,
-			parse_mode=ParseMode.MARKDOWN,
-			reply_to_message_id=reply_id
+			reply_to_message_id=reply_id,
+			parse_mode=ParseMode.MARKDOWN
 		)
 
 		return reply
@@ -110,8 +110,8 @@ class PlaceholderMessage(object):
 								chat_id=chat_id,
 								animation="https://bagrintsev.me/warp_beacon/placeholder_that_we_deserve.mp4",
 								caption=text,
-								parse_mode=ParseMode.MARKDOWN,
-								reply_to_message_id=reply_id
+								reply_to_message_id=reply_id,
+								parse_mode=ParseMode.MARKDOWN
 							)
 							self.placeholder = PlaceHolder(PlaceholderType.ANIMATION, Utils.extract_file_id(reply))
 						except Exception as e:
@@ -119,7 +119,7 @@ class PlaceholderMessage(object):
 							logging.exception(e)
 							img = self.create_default_placeholder_img("Loading, this may take a moment ...")
 							reply = await self.bot.client.send_photo(
-								chat_id=chat.id,
+								chat_id=chat_id,
 								parse_mode=ParseMode.MARKDOWN,
 								reply_to_message_id=reply_id,
 								photo=img

{warp_beacon-2.2.9 → warp_beacon-2.2.11/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.9/warp_beacon/__version__.py

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