warp-beacon 2.0.1__tar.gz → 2.0.3__tar.gz

{warp_beacon-2.0.1/warp_beacon.egg-info → warp_beacon-2.0.3}/PKG-INFO

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

warp_beacon-2.0.3/warp_beacon/__version__.py

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

{warp_beacon-2.0.1 → warp_beacon-2.0.3}/warp_beacon/scraper/__init__.py

@@ -146,7 +146,7 @@ class AsyncDownloader(object):
 												logging.info("Detected big file. Starting compressing with ffmpeg ...")
 												self.uploader.queue_task(job.to_upload_job(
 													job_warning=True,
-													job_warning_msg="Downloaded file size is bigger than Telegram limits\! Performing video compression\. This may take a while\.")
+													job_warning_msg="Downloaded file size is bigger than Telegram limits! Performing video compression. This may take a while.")
 												)
 												ffmpeg = VideoCompress(file_path=item["local_media_path"])
 												new_filepath = ffmpeg.generate_filepath(base_filepath=item["local_media_path"])

{warp_beacon-2.0.1 → warp_beacon-2.0.3}/warp_beacon/telegram/handlers.py

@@ -17,6 +17,7 @@ import logging
 class Handlers(object):
 	storage = None
 	bot = None
+	url_extractor = URLExtract()
 
 	def __init__(self, bot: "Bot") -> None:
 		self.bot = bot
@@ -55,10 +56,14 @@ class Handlers(object):
 		)
 
 	async def handler(self, client: Client, message: Message) -> None:
+		if message is None:
+			return
+		message_text = Utils.extract_message_text(message)
+		if not message_text:
+			return
 		chat = message.chat
 		effective_message_id = message.id
-		extractor = URLExtract()
-		urls = extractor.find_urls(message.text)
+		urls = self.url_extractor.find_urls(message_text)
 
 		reply_text = "Wut?"
 		if not urls:

{warp_beacon-2.0.1 → warp_beacon-2.0.3}/warp_beacon/telegram/placeholder_message.py

@@ -177,7 +177,8 @@ class PlaceholderMessage(object):
 			await self.bot.client.edit_message_caption(
 				chat_id=chat_id,
 				message_id=placeholder_message_id,
-				caption=" ⚠️ *%s*" % placeholder_text
+				caption=" ⚠️ **%s**" % placeholder_text,
+				parse_mode=ParseMode.MARKDOWN
 			)
 		except Exception as e:
 			logging.error("Failed to update placeholder message!")

{warp_beacon-2.0.1 → warp_beacon-2.0.3}/warp_beacon/telegram/utils.py

@@ -71,3 +71,12 @@ class Utils(object):
 	@staticmethod
 	def chunker(seq: list, size: int) -> list:
 		return (seq[pos:pos + size] for pos in range(0, len(seq), size))
+
+	@staticmethod
+	def extract_message_text(message: "Message") -> str:
+		if hasattr(message, "text") and message.text:
+			return message.text
+		if hasattr(message, "caption") and message.caption:
+			return message.caption
+
+		return ''

{warp_beacon-2.0.1 → warp_beacon-2.0.3/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.0.1/warp_beacon/__version__.py

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