warp-beacon 2.2.47__py3-none-any.whl → 2.2.48__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.47"
+__version__ = "2.2.48"
 

warp_beacon/scraper/__init__.py

@@ -133,7 +133,7 @@ class AsyncDownloader(object):
 									logging.warning("Not found error occurred!")
 									logging.exception(e)
 									self.send_message_to_admin(
-										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**NotFound**'."
+										f"Task <code>{job.job_id}</code> failed. URL: {job.url}'. Reason: '<b>NotFound</b>'."
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
@@ -158,7 +158,7 @@ class AsyncDownloader(object):
 									logging.warning("Timeout error occurred!")
 									logging.exception(e)
 									self.send_message_to_admin(
-										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**TimeOut**'."
+										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>TimeOut</b>'."
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
@@ -169,7 +169,7 @@ class AsyncDownloader(object):
 									logging.warning("Telegram limits exceeded :(")
 									logging.exception(e)
 									self.send_message_to_admin(
-										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**FileTooBig**'."
+										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>FileTooBi</b>'."
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
@@ -208,14 +208,14 @@ class AsyncDownloader(object):
 										job_failed_msg="Youtube Age Restricted error. Check your bot Youtube account settings.")
 									)
 									self.send_message_to_admin(
-										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**YotubeAgeRestrictedError**'."
+										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>YotubeAgeRestrictedError</b>'."
 									)
 									break
 								except AllAccountsFailed as e:
 									logging.error("All accounts failed!")
 									logging.exception(e)
 									self.send_message_to_admin(
-										f"Task `{e.job.job_id}` failed. URL: '{e.job.url}'. Reason: '**AllAccountsFailed**'."
+										f"Task <code>{e.job.job_id}</code> failed. URL: '{e.job.url}'. Reason: '<b>AllAccountsFailed</b>'."
 									)
 									self.uploader.queue_task(e.job.to_upload_job(
 										job_failed=True,
@@ -237,7 +237,7 @@ class AsyncDownloader(object):
 									if "geoblock_required" in exception_msg:
 										if job.geoblock_error_count > self.acc_selector.count_service_accounts(job.job_origin):
 											self.send_message_to_admin(
-												f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**geoblock_required**'."
+												f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>geoblock_required</b>'."
 											)
 											self.uploader.queue_task(job.to_upload_job(
 												job_failed=True,
@@ -250,12 +250,12 @@ class AsyncDownloader(object):
 										self.job_queue.put(job)
 										break
 									self.send_message_to_admin(
-										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**UnknownError**'."
-										f"Exception:\n```\n{exception_msg}\n```"
+										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>UnknownError</b>'."
+										f"Exception:\n<pre code=\"python\">\n{exception_msg}\n</pre>"
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
-										job_failed_msg="WOW, unknown error occured! Please [create issue](https://github.com/sb0y/warp_beacon/issues) with service logs.")
+										job_failed_msg="WOW, unknown error occured! Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.")
 									)
 									break
 

warp_beacon/scraper/youtube/abstract.py

@@ -47,9 +47,9 @@ def patched_fetch_bearer_token(self) -> None:
 
 	logging.warning("Please open %s and input code '%s'", verification_url, user_code)
 	self.send_message_to_admin_func(
-		f"Please open {verification_url} and input code `{user_code}`.\n\n"
+		f"Please open {verification_url} and input code <code>{user_code}</code>.\n\n"
 		"Please select a Google account with verified age.\n"
-		"This will allow you to avoid error the **AgeRestrictedError** when accessing some content.",
+		"This will allow you to avoid error the <b>AgeRestrictedError</b> when accessing some content.",
 		account_admins=self.wb_account.get("account_admins", None),
 		yt_auth=True)
 	self.auth_event.wait()

warp_beacon/telegram/bot.py

@@ -1,6 +1,8 @@
-import os, io
+import os
 import signal
 
+import html
+
 import uvloop
 
 from pyrogram import Client, filters
@@ -108,7 +110,7 @@ class Bot(object):
 			message_reply = await self.client.send_message(
 				chat_id=chat_id,
 				text=text,
-				parse_mode=ParseMode.MARKDOWN,
+				parse_mode=ParseMode.HTML,
 				reply_to_message_id=reply_id
 			)
 			return message_reply.id
@@ -132,7 +134,7 @@ class Bot(object):
 			admins_array = admins.split(',')
 			for adm in admins_array:
 				adm = adm.strip()
-				msg_opts = {"chat_id": adm, "text": text, "parse_mode": ParseMode.MARKDOWN}
+				msg_opts = {"chat_id": adm, "text": text, "parse_mode": ParseMode.HTML}
 				if yt_auth:
 					msg_opts["reply_markup"] = InlineKeyboardMarkup(
 						[
@@ -153,16 +155,16 @@ class Bot(object):
 	def build_signature_caption(self, job: UploadJob) -> str:
 		caption = ""
 		if job.canonical_name:
-			caption = f"**{Utils.escape_markdown(job.canonical_name)}**"
+			caption = f"<b>{html.escape(job.canonical_name)}</b>"
 		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
 			if job.canonical_name:
 				caption += "\n—\n"
 			if job.source_username:
-				caption += f"Requested by **@{job.source_username}**"
+				caption += f"Requested by <b>@{job.source_username}</b>"
 			if job.source_username and job.url:
 				caption += " | "
 			if job.url:
-				caption += f"[source link]({job.url})"
+				caption += f'<a href="{job.url}">source link</a>'
 
 		return caption
 
@@ -408,8 +410,8 @@ class Bot(object):
 						if hasattr(e, "MESSAGE") and e.MESSAGE:
 							msg = f"Telegram error: {str(e.MESSAGE)}"
 						else:
-							msg = (f"Unknown Telegram error. Known information:\n```python\n{traceback.format_exc().strip()}```"
-									"\nPlease [create issue](https://github.com/sb0y/warp_beacon/issues) with this info and service logs.")
+							msg = (f"Unknown Telegram error. Known information:\n<pre language=\"python\">\n{traceback.format_exc().strip()}</pre>"
+									"\nPlease <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with this info and service logs.")
 						await self.placeholder.remove(job.chat_id, job.placeholder_message_id)
 						await self.send_text(job.chat_id, msg, job.message_id)
 						break

warp_beacon/telegram/handlers.py

@@ -26,6 +26,7 @@ class Handlers(object):
 	async def help(self, client: Client, message: Message) -> None:
 		"""Send a message when the command /help is issued."""
 		await self.bot.send_text(text="Send me a link to remote media", reply_id=message.id, chat_id=message.chat.id)
+		#await message.reply_text("<code>test</code>\n<b>bold</b>\n<pre code=\"python\">print('hello')</pre> @BelisariusCawl", parse_mode=ParseMode.HTML)
 
 	async def random(self, client: Client, message: Message) -> None:
 		d = self.storage.get_random()
@@ -51,7 +52,7 @@ class Handlers(object):
 			BotCommand("random", "Get random media")
 		])
 		await message.reply_text(
-			parse_mode=ParseMode.MARKDOWN,
+			parse_mode=ParseMode.HTML,
 			text=f"Welcome to @{bot_name.username}!\n"
 			"Send link to external social network with content and I'll reply to it.\n"
 			"Currently supported: Instagram, YouTube Shorts and YouTube Music."

warp_beacon/telegram/placeholder_message.py

@@ -43,7 +43,7 @@ class PlaceholderMessage(object):
 			animation=self.placeholder.tg_file_id,
 			caption=text,
 			reply_to_message_id=reply_id,
-			parse_mode=ParseMode.MARKDOWN
+			parse_mode=ParseMode.HTML
 		)
 
 		return reply
@@ -54,7 +54,7 @@ class PlaceholderMessage(object):
 			photo=self.placeholder.tg_file_id,
 			caption=text,
 			reply_to_message_id=reply_id,
-			parse_mode=ParseMode.MARKDOWN
+			parse_mode=ParseMode.HTML
 		)
 
 		return reply
@@ -65,7 +65,7 @@ class PlaceholderMessage(object):
 			document=self.placeholder.tg_file_id,
 			caption=text,
 			reply_to_message_id=reply_id,
-			parse_mode=ParseMode.MARKDOWN
+			parse_mode=ParseMode.HTMLCalendar(firstweekday=0)
 		)
 
 		return reply
@@ -75,7 +75,7 @@ class PlaceholderMessage(object):
 		max_retries = int(os.environ.get("TG_MAX_RETRIES", default=5))
 		while not retry_amount >= max_retries:
 			try:
-				text = "**Loading, this may take a moment ...** ⏱️ "
+				text = "<b>Loading, this may take a moment ...</b> ⏱️ "
 				reply = None
 				if self.placeholder.tg_file_id is None:
 					ph_found = False
@@ -90,7 +90,7 @@ class PlaceholderMessage(object):
 								document=ph,
 								force_document=False,
 								caption=text,
-								parse_mode=ParseMode.MARKDOWN,
+								parse_mode=ParseMode.HTML,
 								reply_to_message_id=reply_id,
 								file_name=os.path.basename(ph),
 								#width=pl_resolution["width"],
@@ -111,7 +111,7 @@ class PlaceholderMessage(object):
 								animation="https://bagrintsev.me/warp_beacon/placeholder_that_we_deserve.mp4",
 								caption=text,
 								reply_to_message_id=reply_id,
-								parse_mode=ParseMode.MARKDOWN
+								parse_mode=ParseMode.HTML
 							)
 							self.placeholder = PlaceHolder(PlaceholderType.ANIMATION, Utils.extract_file_id(reply))
 						except Exception as e:
@@ -120,7 +120,7 @@ class PlaceholderMessage(object):
 							img = self.create_default_placeholder_img("Loading, this may take a moment ...")
 							reply = await self.bot.client.send_photo(
 								chat_id=chat_id,
-								parse_mode=ParseMode.MARKDOWN,
+								parse_mode=ParseMode.HTML,
 								reply_to_message_id=reply_id,
 								photo=img
 							)
@@ -177,8 +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,
-				parse_mode=ParseMode.MARKDOWN
+				caption=" ⚠️ <b>%s</b>" % placeholder_text,
+				parse_mode=ParseMode.HTML
 			)
 		except Exception as e:
 			logging.error("Failed to update placeholder message!")

warp_beacon/telegram/utils.py

@@ -93,32 +93,4 @@ class Utils(object):
 				return message.sender_chat.username
 			if message.sender_chat.title:
 				return message.sender_chat.title
-		return ''
-
-	@staticmethod
-	def escape_markdown(text: str, version: int = 1, entity_type: str = None) -> str:
-		"""
-		Helper function to escape telegram markup symbols.
-
-		Args:
-			text (:obj:`str`): The text.
-			version (:obj:`int` | :obj:`str`): Use to specify the version of telegrams Markdown.
-				Either ``1`` or ``2``. Defaults to ``1``.
-			entity_type (:obj:`str`, optional): For the entity types ``PRE``, ``CODE`` and the link
-				part of ``TEXT_LINKS``, only certain characters need to be escaped in ``MarkdownV2``.
-				See the official API documentation for details. Only valid in combination with
-				``version=2``, will be ignored else.
-		"""
-		if int(version) == 1:
-			escape_chars = r'_*`['
-		elif int(version) == 2:
-			if entity_type in ['pre', 'code']:
-				escape_chars = r'\`'
-			elif entity_type == 'text_link':
-				escape_chars = r'\)'
-			else:
-				escape_chars = r'_*[]()~`>#+-=|{}.!'
-		else:
-			raise ValueError('Markdown version must be either 1 or 2!')
-
-		return re.sub(f'([{re.escape(escape_chars)}])', r'\\\\\1', text)
+		return ''

{warp_beacon-2.2.47.dist-info → warp_beacon-2.2.48.dist-info}/METADATA

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

{warp_beacon-2.2.47.dist-info → warp_beacon-2.2.48.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=2QQMS9N_Z-TnfZq4U1vSUe4IKyZGmTFdgo8BoF4hQ7E,1710
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=SWPlqKCukT_MyWGDqNRNEulaDsmsTYjOUf8rE9rxTtg,24
+warp_beacon/__version__.py,sha256=kwZwUmdEd7n4PzIqjrSJ5OgN-EIm9Fz-bsiTqy9r-As,24
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -19,27 +19,27 @@ warp_beacon/mediainfo/silencer.py,sha256=MgUc9Ibbhjhg9GbJMNfJqrdDkMsQShZkQ1sCwvW
 warp_beacon/mediainfo/video.py,sha256=DXHiWAOyJPSVXQ0OP7uOBikUFT7noFmMaMSIx04Mhs4,2506
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/scheduler.py,sha256=F9jF6myIHOI0TmC0-rBt2Un8gVvuhBW9zL-nEAEj0Bc,2585
-warp_beacon/scraper/__init__.py,sha256=58zSy74g1LY02HLEwP497a3ABg7f_LGxR6peKSt8dpI,15808
+warp_beacon/scraper/__init__.py,sha256=Nc-wdqu1KLLQkf3kkhl7jXzDWiv6vzKPudJdwL9sb24,15938
 warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_iIw,2708
 warp_beacon/scraper/account_selector.py,sha256=YUzLxfGGBvdTR9sJVcx9SDkYK4tWo3iRkGiPIg6IRn4,3649
 warp_beacon/scraper/exceptions.py,sha256=fHywTm2-y2RkgM6hVz12CkDMBgHcEoN2a1TBLaVM2t4,1300
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=m2bAqLu-_HchlF5CVZDlytB9cFGxrN7EEbQW-G1f5u4,12857
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=4Le9xA0OF7yidpGXnhwT4bVdW04zlNUIDFPOgEgFjbo,7858
+warp_beacon/scraper/youtube/abstract.py,sha256=ZLLbxKuYq4nwvDP7yL3zVYqP0p70IiQbYGhvXHoCzwM,7872
 warp_beacon/scraper/youtube/music.py,sha256=nbTDFdgXGbTNqttE828DEgvSc8-SuAsQAHeqUwU6yFM,1484
 warp_beacon/scraper/youtube/shorts.py,sha256=RqMYDq4XHChtp-LdlxXyHej4h3NI3Qi9T8USxwk-pIk,1177
 warp_beacon/scraper/youtube/youtube.py,sha256=JvN5pVz0jtxCY9FGMl1dIg5Ccr2Kulaoxtym0Vb1QwQ,2224
 warp_beacon/storage/__init__.py,sha256=m86MDXBMtZZsTPLI2cD-pM5Xkh2g2NYVvp_dtW8eH0Q,3548
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=1s7-tqhjy0bYvBpSuBSdPXKS9hEHDCwxkiq3_nXJKKQ,15406
-warp_beacon/telegram/handlers.py,sha256=xSNG_v4D4FaA5q1_5wXvJkjcDUhy5GaQnfpijJZpnPk,7039
-warp_beacon/telegram/placeholder_message.py,sha256=32U-R_IMPRJd-S5UwlpemLkArJOxCmO7whcynduSbMA,6418
-warp_beacon/telegram/utils.py,sha256=K3SVcFZDGj1blfipl3eisnPaWOlxQkhqXQ10YF4BLNU,3483
+warp_beacon/telegram/bot.py,sha256=MONqsxLMJk3jnLFpn1Nfj5w-FSxPNS2Fx9QfaK2S5lw,15446
+warp_beacon/telegram/handlers.py,sha256=SyYSDYbHnMpXDqockHTN-8Rg_YimLDfJAOhuubQfyUo,7183
+warp_beacon/telegram/placeholder_message.py,sha256=ToEwC7wG_WeJE8eYyEmhOtkXLhoUR-qE_jUNS510Z6c,6420
+warp_beacon/telegram/utils.py,sha256=wSyJJsv1chaK4hqnBP-dDiY1hYD7wFhzBzw5H_AwE88,2450
 warp_beacon/uploader/__init__.py,sha256=rbfsm_eYcfsBRkiaG0glVgBNtQCEe7cVQTWEIAHz5aw,4763
-warp_beacon-2.2.47.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.47.dist-info/METADATA,sha256=NFXrRX6WAJEqFNhm6F-aToFlFeWf_QZsMB9fico5_Ps,21251
-warp_beacon-2.2.47.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-warp_beacon-2.2.47.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.47.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.47.dist-info/RECORD,,
+warp_beacon-2.2.48.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.48.dist-info/METADATA,sha256=a4xEyrn7IctdbA90GRWJMEE_HQOpi97DDOuelFTBk2Y,21251
+warp_beacon-2.2.48.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+warp_beacon-2.2.48.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.48.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.48.dist-info/RECORD,,