warp-beacon 2.3.11__py3-none-any.whl → 2.3.13__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.11"
+__version__ = "2.3.13"
 

warp_beacon/telegram/utils.py

@@ -3,8 +3,7 @@ from typing import Union, Optional
 import re
 
 from pyrogram import Client
-from pyrogram.types import Message
-from pyrogram.types import ChatMember
+from pyrogram.types import Message, ChatMember
 from pyrogram import enums
 
 from warp_beacon.jobs import Origin
@@ -108,19 +107,39 @@ class Utils(object):
 	@staticmethod
 	async def handle_mentions(chat_id: int, client: Client, message: str) -> str:
 		try:
+			logging.info("Processing chat_id: '%s'", str(chat_id))
+			chat = await client.get_chat(chat_id)
+			chat_id = chat.id
+
+			chat_member = await client.get_chat_member(chat_id, client.me.id)
+			if chat_member.status not in (enums.ChatMemberStatus.ADMINISTRATOR, enums.ChatMemberStatus.OWNER):
+				logging.warning("Bot is not an admin in this channel!")
+				return message
+
 			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.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.11.dist-info → warp_beacon-2.3.13.dist-info}/METADATA

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

{warp_beacon-2.3.11.dist-info → warp_beacon-2.3.13.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=BzJRM_mMtiS3niWk0icUZUhWdSnzOpj65xdRKSCSbww,24
+warp_beacon/__version__.py,sha256=SvYyCmpESQQDFw3ipWnDZ2_z5YrFNpHWnKvL17dpQzw,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=2F65YhOgB5MUbRjv4I-NAwULkMDkXZahZDTwpLSrzTY,3636
+warp_beacon/telegram/utils.py,sha256=YoCITXrz5sS-63o_Xtl5dFXZh0W5G9vxI4el961wkkw,4390
 warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.11.dist-info/METADATA,sha256=SOLeAnkO7fAg-VlBg0Sgks5U8Ti1IoHw-dkI0QLTAdQ,21704
-warp_beacon-2.3.11.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.11.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.11.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
-warp_beacon-2.3.11.dist-info/RECORD,,
+warp_beacon-2.3.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.13.dist-info/METADATA,sha256=vj0CPRmTaWO3jAc8jiCWcNFGIv2ySMpDWus02QuCmug,21704
+warp_beacon-2.3.13.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.13.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.13.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
+warp_beacon-2.3.13.dist-info/RECORD,,