warp-beacon 2.3.12__py3-none-any.whl → 2.3.14__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.12"
+__version__ = "2.3.14"
 

warp_beacon/telegram/utils.py

@@ -71,19 +71,19 @@ class Utils(object):
 
 	@staticmethod
 	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.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 ''
+		#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.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:
@@ -107,6 +107,10 @@ class Utils(object):
 	@staticmethod
 	async def handle_mentions(chat_id: int, client: Client, message: str) -> str:
 		try:
+			mentions = Utils.mention_re.findall(message)
+			if not mentions:
+				return message
+
 			logging.info("Processing chat_id: '%s'", str(chat_id))
 			chat = await client.get_chat(chat_id)
 			chat_id = chat.id
@@ -118,17 +122,27 @@ class Utils(object):
 
 			username = ''
 			members = [member async for member in 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
+					user_id = None
+					display_name = username
+
 					for member in members:
-						if member.user.username == username:
+						if member.user.username and member.user.username.lower() == username.lower():
 							user_id = member.user.id
+							display_name = member.user.first_name or member.user.last_name or username
 							break
+
+					if user_id is None:
+						for member in members:
+							if member.user.first_name and member.user.first_name.lower() == username.lower():
+								user_id = member.user.id
+								display_name = member.user.first_name
+								break
+
 					if user_id:
-						message = message.replace(f"@{username}", f'<a href="tg://user?id={user_id}">{username}</a>')
+						message = message.replace(f"@{username}", f'<a href="tg://user?id={user_id}">{display_name}</a>')
 		except Exception as e:
 			logging.warning("Exception occurred while handling TG mentions!")
 			logging.exception(e)

{warp_beacon-2.3.12.dist-info → warp_beacon-2.3.14.dist-info}/METADATA

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

{warp_beacon-2.3.12.dist-info → warp_beacon-2.3.14.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=HHCXIMuXJ0Yf31gOyGYCOxTTABnN-J4hYQaUxkdAToo,24
+warp_beacon/__version__.py,sha256=iJ-Q1BLOe6hox693J7orVPTRwodzQ-BF6JHxjBKJRBs,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
@@ -39,11 +39,11 @@ warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 warp_beacon/telegram/bot.py,sha256=u3yvXIcqFtVkrf82IXiC4y-UnrEySw49_immBoXIBN4,15725
 warp_beacon/telegram/handlers.py,sha256=7gldKrX-CTDQNfD1NQ08cC31uPR-95mhN59OujAEqZg,7704
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
-warp_beacon/telegram/utils.py,sha256=xE8iIES56yVBb3EY1J2nVvp5wTZpB4HeUUVoSLlI_UE,3992
+warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
 warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.12.dist-info/METADATA,sha256=v8auapnpNJlFqLnsUi-7LWTTUj8RPLf9GU_E3UFMKTY,21704
-warp_beacon-2.3.12.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.12.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.12.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
-warp_beacon-2.3.12.dist-info/RECORD,,
+warp_beacon-2.3.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.14.dist-info/METADATA,sha256=pePZ8lNGtYb8zk8jQERG5QtOkogr_MlshyE976i-xsU,21704
+warp_beacon-2.3.14.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.14.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.14.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
+warp_beacon-2.3.14.dist-info/RECORD,,