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

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

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

warp_beacon-2.3.8/warp_beacon/__version__.py

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

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

@@ -138,7 +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)
+			msg_leftover = await Utils.handle_mentions(chat.id, client, msg_leftover)
 			# remove duplicates
 			urls = list(set(urls_raw))
 

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

@@ -71,7 +71,7 @@ class Utils(object):
 		return ''
 
 	@staticmethod
-	async def extract_message_author(message: Message) -> str:
+	def extract_message_author(message: Message) -> str:
 		if message.from_user:
 			if message.from_user.username:
 				return message.from_user.username
@@ -106,21 +106,22 @@ class Utils(object):
 		return ret
 
 	@staticmethod
-	def handle_mentions(chat_id: int, client: Client, message: str) -> str:
+	async 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>')
+			async with client:
+				members = client.get_chat_members(chat_id)
+				mentions = Utils.mention_re.findall(message)
+				async for mention in mentions:
+					username = mention[1:].strip()
+					if username:
+						user_id = 0
+						async 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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: warp_beacon
-Version: 2.3.6
+Version: 2.3.8
 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

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