warp-beacon 2.3.5__py3-none-any.whl → 2.3.7__py3-none-any.whl

warp_beacon/__version__.py

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

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/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/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):
@@ -71,15 +75,17 @@ class Utils(object):
 		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.dist-info → warp_beacon-2.3.7.dist-info}/METADATA

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

{warp_beacon-2.3.5.dist-info → warp_beacon-2.3.7.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=GYHJBA3mHcPUREmuhd1jHfnftqjLPTFLFmRUdDBqHAo,23
+warp_beacon/__version__.py,sha256=Fdm6rnbh0XX1W_9L7tTwDxi3444GXEyAwtL0RR5fzF4,23
 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
@@ -36,14 +36,14 @@ warp_beacon/scraper/youtube/youtube.py,sha256=fGrbjBngvvNdpzhb1yZVedNW0_tCrLc31V
 warp_beacon/storage/__init__.py,sha256=2uvyIR0APIW6gOxwJRvCji7wS2q6I7dghvLyWsRqRxo,3312
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=9HchhsYV_Ky2uTrovp-T6TLx5E8fC65ISZ28UraIcXg,15641
-warp_beacon/telegram/handlers.py,sha256=sefkG9jU85m4oMxkJ8WqA4aiJLLBv98OIgYxY49c1Rs,7627
+warp_beacon/telegram/bot.py,sha256=u3yvXIcqFtVkrf82IXiC4y-UnrEySw49_immBoXIBN4,15725
+warp_beacon/telegram/handlers.py,sha256=WUIZ62JuU9g_bTyV_XzboC487wkt_cTm2Z6eVoQj8Wg,7698
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
-warp_beacon/telegram/utils.py,sha256=6oEOEzyN9fAmUZVbk5sjFyHcsPrrb2IlI3zXnRCwjHU,2403
+warp_beacon/telegram/utils.py,sha256=U6MnHhUv_eI8aghonyBZjWWv0st-N8G2kw6thxx2g0A,3601
 warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.5.dist-info/METADATA,sha256=OjdCEARXpPHBqOnSghv0OMk4ih_n1J64KZA-BIeZuaA,21703
-warp_beacon-2.3.5.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.5.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.5.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
-warp_beacon-2.3.5.dist-info/RECORD,,
+warp_beacon-2.3.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.7.dist-info/METADATA,sha256=-w8ArGjPvsi0eS1MJLjccB6fLNMjxZIR8gZPcbYAt6o,21703
+warp_beacon-2.3.7.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.7.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.7.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
+warp_beacon-2.3.7.dist-info/RECORD,,