warp-beacon 2.2.24__tar.gz → 2.2.26__tar.gz

{warp_beacon-2.2.24/warp_beacon.egg-info → warp_beacon-2.2.26}/PKG-INFO

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

warp_beacon-2.2.26/warp_beacon/__version__.py

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

{warp_beacon-2.2.24 → warp_beacon-2.2.26}/warp_beacon/scraper/account_selector.py

@@ -12,7 +12,7 @@ import logging
 
 class AccountSelector(object):
 	accounts = []
-	acc_pool = None
+	acc_pools = {}
 	current = None
 	current_module_name = None
 	index = None
@@ -30,6 +30,8 @@ class AccountSelector(object):
 			if self.accounts:
 				self.__init_meta_data()
 				self.load_yt_sessions()
+				for acc_type, _ in self.accounts.items():
+					self.acc_pools[acc_type] = cycle(self.accounts[acc_type])
 		else:
 			raise ValueError("Accounts file not found")
 
@@ -61,14 +63,13 @@ class AccountSelector(object):
 	def set_module(self, module_origin: Origin) -> None:
 		module_name = 'youtube' if next((s for s in ("yt", "youtube", "youtu_be") if s in module_origin.value), None) else 'instagram'
 		self.current_module_name = module_name
-		self.acc_pool = cycle(self.accounts[module_name])
-		self.current = next(self.acc_pool)
-		self.index.value = self.accounts[module_name].index(self.current)
+		if self.current is None:
+			self.next()
 
 	def next(self) -> dict:
-		self.current = next(self.acc_pool)
+		self.current = next(self.acc_pools[self.current_module_name])
 		self.index.value = self.accounts[self.current_module_name].index(self.current)
-		logging.info("Next account index is '%d'", self.index.value)
+		logging.info("Selected account index is '%d'", self.index.value)
 		return self.current
 	
 	def bump_acc_fail(self, key: str, amount: int = 1) -> int:

{warp_beacon-2.2.24 → warp_beacon-2.2.26}/warp_beacon/scraper/youtube/abstract.py

@@ -119,7 +119,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] - 10
+			height += new_image.size[1] - 5
 
 		paste_position = ((target_width - width) // 2, (target_height - height) // 2)
 		new_image.paste(image, paste_position)

{warp_beacon-2.2.24 → warp_beacon-2.2.26}/warp_beacon/telegram/bot.py

@@ -370,8 +370,6 @@ class Bot(object):
 						col_job_args = self.build_tg_args(job)
 						sent_messages = []
 						snd_grp_options = {"chat_id": job.chat_id, "reply_to_message_id": job.message_id}
-						if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
-							snd_grp_options["reply_to_message_id"] = None
 						for i, media_chunk in enumerate(col_job_args["media"]):
 							snd_grp_options["media"] = media_chunk
 							messages = await self.client.send_media_group(**snd_grp_options)

{warp_beacon-2.2.24 → warp_beacon-2.2.26/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.24/warp_beacon/__version__.py

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