warp-beacon 2.2.44__tar.gz → 2.2.46__tar.gz

{warp_beacon-2.2.44/warp_beacon.egg-info → warp_beacon-2.2.46}/PKG-INFO

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

warp_beacon-2.2.46/warp_beacon/__version__.py

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

{warp_beacon-2.2.44 → warp_beacon-2.2.46}/warp_beacon/scraper/account_selector.py

@@ -81,6 +81,7 @@ class AccountSelector(object):
 		except Exception as e:
 			logging.warning("Failed to record fail stats")
 			logging.exception(e)
+		return 0
 
 	def how_much(self, key: str) -> int:
 		idx = self.account_index[self.current_module_name].value

{warp_beacon-2.2.44 → warp_beacon-2.2.46}/warp_beacon/telegram/bot.py

@@ -153,7 +153,7 @@ class Bot(object):
 	def build_signature_caption(self, job: UploadJob) -> str:
 		caption = ""
 		if job.canonical_name:
-			caption = f"**{job.canonical_name}**"
+			caption = f"**{Utils.escape_markdown(job.canonical_name)}**"
 		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
 			if job.canonical_name:
 				caption += "\n—\n"

{warp_beacon-2.2.44 → warp_beacon-2.2.46}/warp_beacon/telegram/utils.py

@@ -95,3 +95,30 @@ class Utils(object):
 				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)

{warp_beacon-2.2.44 → warp_beacon-2.2.46/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.44/warp_beacon/__version__.py

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