warp-beacon 2.8.7__tar.gz → 2.8.9__tar.gz

{warp_beacon-2.8.7/warp_beacon.egg-info → warp_beacon-2.8.9}/PKG-INFO

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

warp_beacon-2.8.9/warp_beacon/__version__.py

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

{warp_beacon-2.8.7 → warp_beacon-2.8.9}/warp_beacon/scheduler/scheduler.py

@@ -156,8 +156,8 @@ class IGScheduler(object):
 				self.state["remaining"] -= elapsed
 
 				if self.running:
-					if self.state["remaining"] <= 0:
-						self.validate_ig_session()
+					#if self.state["remaining"] <= 0:
+					#	self.validate_ig_session()
 					if yt_expires <= time.time() + 60:
 						self.validate_yt_session()
 				self.save_state()

{warp_beacon-2.8.7 → warp_beacon-2.8.9}/warp_beacon/scraper/instagram/instagram.py

@@ -135,6 +135,7 @@ class InstagramScraper(ScraperAbstract):
 		return inst_human.operations_count
 	
 	def scroll_content(self, last_pk: int) -> None:
+		return
 		from warp_beacon.scheduler.instagram_human import InstagramHuman
 		self.load_session()
 		inst_human = InstagramHuman(self)

{warp_beacon-2.8.7 → warp_beacon-2.8.9}/warp_beacon/telegram/bot.py

@@ -195,23 +195,24 @@ class Bot(object):
 
 		return []
 
-	def build_signature_caption(self, job: UploadJob) -> str:
+	def build_signature_caption(self, job: UploadJob, override_canonical_name: str = None) -> str:
 		caption = ""
 		is_group = job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP)
 		is_youtube = job.job_origin in (Origin.YOUTUBE, Origin.YT_SHORTS)
-		if job.canonical_name:
-			if is_group and not is_youtube and CaptionShortner.need_short(job.canonical_name):
-				caption = f"{html.escape(CaptionShortner.smart_truncate_html(job.canonical_name))} ..."
+		effective_canonical_name = override_canonical_name or job.canonical_name
+		if effective_canonical_name:
+			if is_group and not is_youtube and CaptionShortner.need_short(effective_canonical_name):
+				caption = f"{html.escape(CaptionShortner.smart_truncate_html(effective_canonical_name))} ..."
 				job.short_text = True
 			elif is_group:
 				# short enough
-				caption = html.escape(job.canonical_name)
+				caption = html.escape(effective_canonical_name)
 			# Captions only for YouTube in groups; empty otherwise.
 			# Might be too long for Telegram, so we skip them.
 			if is_youtube and is_group:
-				caption = f"<b>{html.escape(job.canonical_name)}</b>"
+				caption = f"<b>{html.escape(effective_canonical_name)}</b>"
 		if is_group:
-			if job.canonical_name:
+			if effective_canonical_name:
 				caption += "\n—\n"
 			if job.message_leftover:
 				caption += job.message_leftover
@@ -371,20 +372,20 @@ class Bot(object):
 								height=j.media_info["height"],
 								duration=round(j.media_info["duration"]),
 								thumb=j.media_info["thumb"],
-								caption=self.build_signature_caption(j)
+								caption=self.build_signature_caption(job, j.canonical_name)
 							)
 							tg_chunk.append(vid)
 						elif j.media_type == JobType.IMAGE:
 							photo = InputMediaPhoto(
 								media=j.local_media_path,
-								caption=self.build_signature_caption(j)
+								caption=self.build_signature_caption(job, j.canonical_name)
 							)
 							tg_chunk.append(photo)
 						elif j.media_type == JobType.ANIMATION:
 							anim = InputMediaAnimation(
 								media=j.local_media_path,
 								thumb=j.media_info["thumb"],
-								caption=self.build_signature_caption(j),
+								caption=self.build_signature_caption(job, j.canonical_name),
 								width=j.media_info["width"],
 								height=j.media_info["height"],
 								duration=round(j.media_info["duration"])

{warp_beacon-2.8.7 → warp_beacon-2.8.9}/warp_beacon/telegram/handlers.py

@@ -99,6 +99,17 @@ class Handlers(object):
 								origin=job.job_origin.value,
 								canonical_name=job.canonical_name
 							)
+				elif job.media_type == JobType.COLLECTION:
+					common_canonical_name = job.canonical_name
+					if not common_canonical_name and job.media_collection:
+						common_canonical_name = job.media_collection[0].canonical_name
+					self.storage.add_media(
+						tg_file_ids=[','.join(tg_file_ids)],
+						media_url=job.url,
+						media_type=job.media_type.value,
+						origin=job.job_origin.value,
+						canonical_name=common_canonical_name
+					)
 				else:
 					self.storage.add_media(
 						tg_file_ids=[','.join(tg_file_ids)],
@@ -196,7 +207,8 @@ class Handlers(object):
 								user_id=message.from_user.id,
 								chat_type=message.chat.type,
 								source_username=Utils.extract_message_author(message),
-								message_leftover=msg_leftover
+								message_leftover=msg_leftover,
+								canonical_name=entities[0]["canonical_name"]
 							)
 						)
 					elif ent_len:

{warp_beacon-2.8.7 → warp_beacon-2.8.9/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.8.7/warp_beacon/__version__.py

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