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

warp_beacon/__version__.py

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

warp_beacon/scraper/account_selector.py

@@ -1,4 +1,5 @@
 import os
+import time
 import random
 import json
 import re
@@ -55,6 +56,7 @@ class AccountSelector(object):
 						logging.info("Account proxy matched '%s'", proxy)
 						matched_proxy.append(proxy)
 				if matched_proxy:
+					random.seed(random.seed(time.time_ns() ^ int.from_bytes(os.urandom(len(matched_proxy)), "big")))
 					prox_choice = random.choice(matched_proxy)
 					logging.info("Chosen proxy: '%s'", prox_choice)
 					return prox_choice

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,6 +107,15 @@ 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)
@@ -120,7 +128,7 @@ class Utils(object):
 							user_id = member.user.id
 							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}">{username}</a>')
 		except Exception as e:
 			logging.warning("Exception occurred while handling TG mentions!")
 			logging.exception(e)

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

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

{warp_beacon-2.3.10.dist-info → warp_beacon-2.3.12.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=OjvJX3y8oTlKNMSQ1XAyheD1lM7Kl3xWebVKa8CSo7s,24
+warp_beacon/__version__.py,sha256=HHCXIMuXJ0Yf31gOyGYCOxTTABnN-J4hYQaUxkdAToo,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
@@ -22,7 +22,7 @@ warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 warp_beacon/scheduler/scheduler.py,sha256=F9jF6myIHOI0TmC0-rBt2Un8gVvuhBW9zL-nEAEj0Bc,2585
 warp_beacon/scraper/__init__.py,sha256=V_C5SmAmRtjFfVBtTotOHCW3ILMQ8m_ulrBF6ry59_A,16944
 warp_beacon/scraper/abstract.py,sha256=6A6KuBUHZhu8VAyBwLgmnxMPHJcLpgwLapmULy8hpoA,2726
-warp_beacon/scraper/account_selector.py,sha256=LAIZbM5Y7uNPbnPPx5LSOCvX1K7fV-h6zofZx2Hj6JI,4617
+warp_beacon/scraper/account_selector.py,sha256=zYFn9qd5x_BOox5g1iG7QjqaLe_5ezKD_2xFy06fPrk,4731
 warp_beacon/scraper/exceptions.py,sha256=Qkz76yo-X5kucEZIP9tWaK-oYO-kvsPEl8Y0W63oDhU,1300
 warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
@@ -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=xE8iIES56yVBb3EY1J2nVvp5wTZpB4HeUUVoSLlI_UE,3992
 warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.10.dist-info/METADATA,sha256=Psr_yzoxBte3ZwQi6TctmXNOXKNlXp-zf0FST9e6j4U,21704
-warp_beacon-2.3.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.10.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.10.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
-warp_beacon-2.3.10.dist-info/RECORD,,
+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,,