warp-beacon 2.1.11__py3-none-any.whl → 2.1.12__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.1.11"
+__version__ = "2.1.12"
 

warp_beacon/telegram/bot.py

@@ -146,12 +146,28 @@ class Bot(object):
 
 		return []
 
+	def build_signature_caption(self, job: UploadJob) -> str:
+		caption = ""
+		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
+			if job.source_usename:
+				caption += f"Requested by **@{job.source_usename}**"
+			if job.source_usename and job.url:
+				caption += " | "
+			if job.url:
+				caption += f"[Source link]({job.url})"
+
+		return caption
+
 	def build_tg_args(self, job: UploadJob) -> dict:
 		args = {}
 		if job.media_type == JobType.VIDEO:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
-					args["media"] = InputMediaVideo(media=job.tg_file_id.replace(":video", ''), supports_streaming=True)
+					args["media"] = InputMediaVideo(
+						media=job.tg_file_id.replace(":video", ''),
+						supports_streaming=True,
+						caption=self.build_signature_caption(job)
+					)
 				else:
 					args["video"] = job.tg_file_id.replace(":video", '')
 			else:
@@ -162,7 +178,8 @@ class Bot(object):
 						width=job.media_info["width"],
 						height=job.media_info["height"],
 						duration=round(job.media_info["duration"]),
-						thumb=job.media_info["thumb"]
+						thumb=job.media_info["thumb"],
+						caption=self.build_signature_caption(job)
 					)
 				else:
 					args["video"] = job.local_media_path
@@ -171,18 +188,23 @@ class Bot(object):
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
 					args["thumb"] = job.media_info["thumb"]
+					args["caption"] = self.build_signature_caption(job)
 
 				args["file_name"] = "downloaded_via_warp_beacon_bot%s" % (os.path.splitext(job.local_media_path)[-1])
 		elif job.media_type == JobType.IMAGE:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
-					args["media"] = InputMediaPhoto(media=job.tg_file_id.replace(":image", ''))
+					args["media"] = InputMediaPhoto(
+						media=job.tg_file_id.replace(":image", ''),
+						caption=self.build_signature_caption(job)
+					)
 				else:
 					args["photo"] = job.tg_file_id.replace(":image", '')
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
-						media=job.local_media_path
+						media=job.local_media_path,
+						caption=self.build_signature_caption(job)
 					)
 				else:
 					args["photo"] = job.local_media_path
@@ -190,7 +212,8 @@ class Bot(object):
 			if job.tg_file_id:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAudio(
-						media=job.tg_file_id.replace(":audio", '')
+						media=job.tg_file_id.replace(":audio", ''),
+						caption=self.build_signature_caption(job)
 					)
 				else:
 					args["audio"] = job.tg_file_id.replace(":audio", '')
@@ -202,6 +225,7 @@ class Bot(object):
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
 						title=job.canonical_name,
+						caption=self.build_signature_caption(job)
 					)
 				else:
 					args["audio"] = job.local_media_path
@@ -209,6 +233,7 @@ class Bot(object):
 					args["thumb"] = job.media_info["thumb"]
 					args["duration"] = round(job.media_info["duration"])
 					args["title"] = job.canonical_name
+					args["caption"] = self.build_signature_caption(job)
 				#args["file_name"] = "%s%s" % (job.canonical_name, os.path.splitext(job.local_media_path)[-1]),
 		elif job.media_type == JobType.ANIMATION:
 			if job.tg_file_id:
@@ -225,7 +250,8 @@ class Bot(object):
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
 						width=job.media_info["width"],
-						height=job.media_info["height"]
+						height=job.media_info["height"],
+						caption=self.build_signature_caption(job)
 					)
 				else:
 					args["animation"] = job.local_media_path
@@ -233,6 +259,7 @@ class Bot(object):
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
 					args["thumb"] = job.media_info["thumb"]
+					args["caption"] = self.build_signature_caption(job)
 		elif job.media_type == JobType.COLLECTION:
 			if job.tg_file_id:
 				args["media"] = []
@@ -243,11 +270,11 @@ class Bot(object):
 						ctype = JobType[mtype.upper()]
 						ptr = None
 						if ctype == JobType.VIDEO:
-							ptr = InputMediaVideo(media=tg_id)
+							ptr = InputMediaVideo(media=tg_id, caption=self.build_signature_caption(job))
 						elif ctype == JobType.IMAGE:
-							ptr = InputMediaPhoto(media=tg_id)
+							ptr = InputMediaPhoto(media=tg_id, caption=self.build_signature_caption(job))
 						elif ctype == JobType.ANIMATION:
-							ptr = InputMediaAnimation(media=tg_id)
+							ptr = InputMediaAnimation(media=tg_id, caption=self.build_signature_caption(job))
 						tg_chunk.append(ptr)
 
 					args["media"].append(tg_chunk)
@@ -264,11 +291,13 @@ class Bot(object):
 								height=j.media_info["height"],
 								duration=round(j.media_info["duration"]),
 								thumb=j.media_info["thumb"],
+								caption=self.build_signature_caption(job)
 							)
 							tg_chunk.append(vid)
 						elif j.media_type == JobType.IMAGE:
 							photo = InputMediaPhoto(
-								media=j.local_media_path
+								media=j.local_media_path,
+								caption=self.build_signature_caption(job)
 							)
 							tg_chunk.append(photo)
 					mediafs.append(tg_chunk)
@@ -276,15 +305,6 @@ class Bot(object):
 
 		args["chat_id"] = job.chat_id
 
-		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
-			args["caption"] = ""
-			if job.source_usename:
-				args["caption"] += f"Requested by **@{job.source_usename}**"
-			if job.source_usename and job.url:
-				args["caption"] += " | "
-			if job.url:
-				args["caption"] += f"[Source link]({job.url})"
-
 		# common args
 		if job.placeholder_message_id and job.media_type is not JobType.COLLECTION:
 			args["message_id"] = job.placeholder_message_id
@@ -343,7 +363,7 @@ class Bot(object):
 							messages = await self.client.send_media_group(
 								chat_id=job.chat_id,
 								reply_to_message_id=job.message_id,
-								media=media_chunk,
+								media=media_chunk
 							)
 							sent_messages += messages
 							if job.media_collection:
@@ -390,7 +410,7 @@ class Bot(object):
 
 		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
 			try:
-				self.client.delete_messages(job.chat_id, (job.message_id,))
+				await self.client.delete_messages(job.chat_id, (job.message_id,))
 			except Exception as e:
 				logging.warning("Failed to delete source message. Check bot permissions in Telegram chat settings.")
 				logging.exception(e)

{warp_beacon-2.1.11.dist-info → warp_beacon-2.1.12.dist-info}/METADATA

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

{warp_beacon-2.1.11.dist-info → warp_beacon-2.1.12.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=rKFQM_b9eoDS4mJ1B_SZNolPLXx1SQdQMdY2F_ZcBt8,1523
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=wiW76pTWCmfLdnpKj9UWKrYcKbwp4MO8rkgmyMKEM3Q,24
+warp_beacon/__version__.py,sha256=fvnVLCMKtvzONpqcFCrZo4HrUEtArCwJghjH2toLovk,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
@@ -32,14 +32,14 @@ warp_beacon/scraper/youtube/shorts.py,sha256=pHfvEBau8Zp7Ar3LBuPmjqYq8fmjJUQvzeZ
 warp_beacon/scraper/youtube/youtube.py,sha256=K98n2TSJaDZt-xT7mADZL1UEf2exIYm0Wnenn2GAYfI,2250
 warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=tJh3EbtrOebRG4fj1uh5CiJ8CUzjDywQGoSMlX-AK9s,13965
+warp_beacon/telegram/bot.py,sha256=QTLNeOTMHOMs2W7mAY_ygVzxJu7N-IMBrBvPDHMLCCI,14789
 warp_beacon/telegram/handlers.py,sha256=8MeLgnhaucLc7ptsKV3NXecsGN7kItwrU5xIoJ1Eik8,6645
 warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
 warp_beacon/telegram/utils.py,sha256=LdCU4ChJHyzpCvyG5v3XcUtUgK3v5by_v8D56VsPeI0,2171
 warp_beacon/uploader/__init__.py,sha256=BQ5rli0soLf0FGqCpivVh9w6lyoGM10-ck2mUjnoOLU,4777
-warp_beacon-2.1.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.1.11.dist-info/METADATA,sha256=T9UzGN4gcYl_puYM0KXJGkI9C7C9uxY_FJi54dlyG0E,21251
-warp_beacon-2.1.11.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-warp_beacon-2.1.11.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.1.11.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.1.11.dist-info/RECORD,,
+warp_beacon-2.1.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.1.12.dist-info/METADATA,sha256=QoScSZBGQfB8owQeFNd2Q0XDlcOecc9Kzt-3-Ur34J8,21251
+warp_beacon-2.1.12.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+warp_beacon-2.1.12.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.1.12.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.1.12.dist-info/RECORD,,