warp-beacon 2.2.32__tar.gz → 2.2.34__tar.gz

{warp_beacon-2.2.32/warp_beacon.egg-info → warp_beacon-2.2.34}/PKG-INFO

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

{warp_beacon-2.2.32 → warp_beacon-2.2.34}/etc/accounts.json

@@ -27,7 +27,8 @@
 					"cpu": "exynos2100",
 					"version_code": "493450264"
 				}
-			}
+			},
+			"account_admins": "@BelisariusCawl"
 		},
 		{
 			"login": "ig_account1",
@@ -55,7 +56,17 @@
 					"cpu": "exynos2100",
 					"version_code": "493450264"
 				}
-			}
+			},
+			"account_admins": "@BelisariusCawl"
+		}
+	],
+	"youtube":
+	[
+		{
+			"account_admins": "@BelisariusCawl"
+		},
+		{
+			"account_admins": "@Lazyteh"
 		}
 	]
 }

warp_beacon-2.2.34/warp_beacon/__version__.py

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

{warp_beacon-2.2.32 → warp_beacon-2.2.34}/warp_beacon/scheduler/scheduler.py

@@ -15,7 +15,7 @@ class IGScheduler(object):
 	running = True
 	thread = None
 	event = None
-	state = {"remaining": randrange(3600, 10800)}
+	state = {"remaining": randrange(6800, 20800)}
 
 	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
 		self.downloader = downloader
@@ -82,7 +82,7 @@ class IGScheduler(object):
 		while self.running:
 			try:
 				if self.state["remaining"] <= 0:
-					self.state["remaining"] = randrange(3600, 10800)
+					self.state["remaining"] = randrange(6800, 20800)
 					logging.info("Next scheduler activity in '%s' seconds", self.state["remaining"])
 
 				start_time = time.time()

{warp_beacon-2.2.32 → warp_beacon-2.2.34}/warp_beacon/scraper/account_selector.py

@@ -45,7 +45,7 @@ class AccountSelector(object):
 		self.accounts["youtube"] = []
 		for f in os.listdir(self.session_dir):
 			if "yt_session" in f and ".json" in f:
-				match = re.search('\d+', f)
+				match = re.search(r'\d+', f)
 				index = 0
 				if match:
 					index = int(match.group(0))
@@ -65,7 +65,7 @@ class AccountSelector(object):
 		self.current_module_name = module_name
 		if self.current is None:
 			self.current = self.accounts[self.current_module_name][self.index.value]
-			self.acc_pools[self.current_module_name] = next(islice(self.acc_pools[self.current_module_name], self.index.value, None))
+			#self.acc_pools[self.current_module_name] = next(islice(self.acc_pools[self.current_module_name], self.index.value, None))
 
 	def next(self) -> dict:
 		self.current = next(self.acc_pools[self.current_module_name])

{warp_beacon-2.2.32 → warp_beacon-2.2.34}/warp_beacon/scraper/youtube/abstract.py

@@ -10,10 +10,10 @@ import json
 import urllib
 import requests
 import http.client
-from PIL import Image, ImageOps
+from PIL import Image
 
 from warp_beacon.scraper.abstract import ScraperAbstract
-from warp_beacon.mediainfo.abstract import MediaInfoAbstract
+#from warp_beacon.mediainfo.abstract import MediaInfoAbstract
 from warp_beacon.scraper.exceptions import TimeOut, Unavailable, extract_exception_message
 
 from pytubefix import YouTube
@@ -50,6 +50,7 @@ def patched_fetch_bearer_token(self) -> None:
 		f"Please open {verification_url} and input code `{user_code}`.\n\n"
 		"Please select a Google account with verified age.\n"
 		"This will allow you to avoid error the **AgeRestrictedError** when accessing some content.",
+		account_admins=self.wb_account.get("account_admins", None),
 		yt_auth=True)
 	self.auth_event.wait()
 
@@ -119,7 +120,7 @@ class YoutubeAbstract(ScraperAbstract):
 
 		if aspect_ratio_height > 4:
 			image = image.resize((image.size[0], image.size[1]+new_image.size[1]))
-			height += new_image.size[1] - 5
+			#height += new_image.size[1] - 5
 
 		paste_position = ((target_width - width) // 2, (target_height - height) // 2)
 		new_image.paste(image, paste_position)
@@ -201,6 +202,7 @@ class YoutubeAbstract(ScraperAbstract):
 	def build_yt(self, url: str) -> YouTube:
 		InnerTube.send_message_to_admin_func = self.send_message_to_admin_func
 		InnerTube.auth_event = self.auth_event
+		InnerTube.wb_account = self.account
 		InnerTube.fetch_bearer_token = patched_fetch_bearer_token
 		_default_clients["ANDROID"]["innertube_context"]["context"]["client"]["clientVersion"] = "19.08.35"
 		_default_clients["ANDROID_MUSIC"] = _default_clients["ANDROID"]

{warp_beacon-2.2.32 → warp_beacon-2.2.34}/warp_beacon/telegram/bot.py

@@ -118,9 +118,13 @@ class Bot(object):
 
 		return 0
 
-	async def send_text_to_admin(self, text: str, yt_auth: bool = False) -> list[int]:
+	async def send_text_to_admin(self, text: str, account_admins: str = None, yt_auth: bool = False) -> list[int]:
 		try:
-			admins = os.environ.get("TG_BOT_ADMINS_USERNAMES", None)
+			admins = None
+			if account_admins:
+				admins = account_admins
+			if not admins:
+				admins = os.environ.get("TG_BOT_ADMINS_USERNAMES", None)
 			if not admins:
 				raise ValueError("Configuration value `TG_BOT_ADMIN_USERNAME` is empty!")
 			

{warp_beacon-2.2.32 → warp_beacon-2.2.34/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.32/warp_beacon/__version__.py

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