warp-beacon 2.3.5__tar.gz → 2.3.6__tar.gz

{warp_beacon-2.3.5/warp_beacon.egg-info → warp_beacon-2.3.6}/PKG-INFO

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

warp_beacon-2.3.6/warp_beacon/__version__.py

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

{warp_beacon-2.3.5 → warp_beacon-2.3.6}/warp_beacon/telegram/bot.py

@@ -167,7 +167,10 @@ class Bot(object):
 				caption += job.message_leftover
 				caption += "\n—\n"
 			if job.source_username:
-				caption += f"Requested by <b>@{job.source_username}</b>"
+				if job.source_username.startswith("<a href="):
+					caption += f"Requested by <b>{job.source_username}</b>"
+				else:
+					caption += f"Requested by <b>@{job.source_username}</b>"
 			if job.source_username and job.url:
 				caption += " | "
 			if job.url:
@@ -333,7 +336,6 @@ 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"))]])

{warp_beacon-2.3.5 → warp_beacon-2.3.6}/warp_beacon/telegram/handlers.py

@@ -138,6 +138,7 @@ class Handlers(object):
 		urls, msg_leftover = [], ''
 		if urls_raw:
 			msg_leftover = Utils.compute_leftover(urls_raw, message_text)
+			msg_leftover = Utils.handle_mentions(chat.id, client, msg_leftover)
 			# remove duplicates
 			urls = list(set(urls_raw))
 

{warp_beacon-2.3.5 → warp_beacon-2.3.6}/warp_beacon/telegram/utils.py

@@ -1,8 +1,11 @@
-from typing import Union
+from typing import Union, Optional
 
 import re
 
+from pyrogram import Client
 from pyrogram.types import Message
+from pyrogram.types import ChatMember
+from pyrogram import enums
 
 from warp_beacon.jobs import Origin
 from warp_beacon.jobs.types import JobType
@@ -11,9 +14,10 @@ import logging
 
 class Utils(object):
 	expected_patronum_compiled_re = re.compile(r'Expected ([A-Z]+), got ([A-Z]+) file id instead')
+	mention_re = re.compile(r'@[A-Za-z0-9_.]{4,}')
 
 	@staticmethod
-	def extract_file_id(message: Message) -> Union[None, str]:
+	def extract_file_id(message: Message) -> Optional[str]:
 		possible_attrs = ("video", "photo", "audio", "animation", "document")
 		for attr in possible_attrs:
 			if hasattr(message, attr):
@@ -67,19 +71,21 @@ class Utils(object):
 		return ''
 
 	@staticmethod
-	def extract_message_author(message: Message) -> str:
+	async def extract_message_author(message: Message) -> str:
 		if message.from_user:
 			if message.from_user.username:
 				return message.from_user.username
+			if message.from_user.first_name:
+				return message.from_user.first_name
 			if message.from_user.id:
-				return str(message.from_user.id)
+				return str(message.from_user.mention(style=enums.ParseMode.HTML))
 		if message.sender_chat:
 			if message.sender_chat.username:
 				return message.sender_chat.username
 			if message.sender_chat.title:
 				return message.sender_chat.title
 		return ''
-	
+
 	@staticmethod
 	def compute_leftover(urls: list, message: str) -> str:
 		msg_leftover = ""
@@ -88,3 +94,34 @@ class Utils(object):
 			for u in urls:
 				msg_leftover = msg_leftover.replace(u, '')
 		return msg_leftover.strip()
+	
+	@staticmethod
+	async def find_chat_user_by_id(client: Client, chat_id: int, user_id: int) -> Optional[ChatMember]:
+		ret = None
+		async for member in client.get_chat_members(chat_id):
+			user_id = 0
+			if member.user.id == user_id:
+				ret = member.user
+				break
+		return ret
+
+	@staticmethod
+	def handle_mentions(chat_id: int, client: Client, message: str) -> str:
+		try:
+			username = ''
+			members = client.get_chat_members(chat_id)
+			mentions = Utils.mention_re.findall(message)
+			for mention in mentions:
+				username = mention[1:].strip()
+				if username:
+					user_id = 0
+					for member in members:
+						if member.user.username == username:
+							user_id = member.user.id
+							break
+					if user_id:
+						message.replace(f"@{username}", f'<a href="tg://user?id={user_id}">{username}</a>')
+		except Exception as e:
+			logging.warning("Exception occurred while handling TG mentions!")
+			logging.exception(e)
+		return message

{warp_beacon-2.3.5 → warp_beacon-2.3.6/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.5/warp_beacon/__version__.py

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