warp-beacon 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.0.0"
+__version__ = "2.0.2"
 

warp_beacon/jobs/upload_job.py

@@ -6,6 +6,7 @@ from warp_beacon.jobs.abstract import AbstractJob, JobSettings
 class UploadJob(AbstractJob):
 	def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
 		super(UploadJob, self).__init__(**kwargs)
+
 	def __del__(self) -> None:
 		pass
 

warp_beacon/scraper/__init__.py

@@ -146,7 +146,7 @@ class AsyncDownloader(object):
 												logging.info("Detected big file. Starting compressing with ffmpeg ...")
 												self.uploader.queue_task(job.to_upload_job(
 													job_warning=True,
-													job_warning_msg="Downloaded file size is bigger than Telegram limits\! Performing video compression\. This may take a while\.")
+													job_warning_msg="Downloaded file size is bigger than Telegram limits! Performing video compression. This may take a while.")
 												)
 												ffmpeg = VideoCompress(file_path=item["local_media_path"])
 												new_filepath = ffmpeg.generate_filepath(base_filepath=item["local_media_path"])

warp_beacon/telegram/bot.py

@@ -8,7 +8,7 @@ from pyrogram import Client, filters
 from pyrogram.enums import ParseMode
 from pyrogram.handlers import MessageHandler
 from pyrogram.types import Message, InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InputMediaDocument, InlineKeyboardButton, InlineKeyboardMarkup
-from pyrogram.errors import RPCError, FloodWait, NetworkMigrate, BadRequest, MultiMediaTooLong
+from pyrogram.errors import RPCError, FloodWait, NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid
 
 from warp_beacon.__version__ import __version__
 from warp_beacon.telegram.handlers import Handlers
@@ -123,14 +123,23 @@ class Bot(object):
 				else:
 					args["video"] = job.tg_file_id.replace(":video", '')
 			else:
-				args["media"] = InputMediaVideo(
-					media=job.local_media_path,
-					supports_streaming=True,
-					width=job.media_info["width"],
-					height=job.media_info["height"],
-					duration=int(job.media_info["duration"]),
-					thumb=job.media_info["thumb"]
-				)
+				if job.placeholder_message_id:
+					args["media"] = InputMediaVideo(
+						media=job.local_media_path,
+						supports_streaming=True,
+						width=job.media_info["width"],
+						height=job.media_info["height"],
+						duration=job.media_info["duration"],
+						thumb=job.media_info["thumb"]
+					)
+				else:
+					args["video"] = job.local_media_path
+					args["supports_streaming"] = True
+					args["width"] = job.media_info["width"]
+					args["height"] = job.media_info["height"]
+					args["duration"] = job.media_info["duration"]
+					args["thumb"] = job.media_info["thumb"]
+
 				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:
@@ -139,9 +148,12 @@ class Bot(object):
 				else:
 					args["photo"] = job.tg_file_id.replace(":image", '')
 			else:
-				args["media"] = InputMediaPhoto(
-					media=job.local_media_path
-				)
+				if job.placeholder_message_id:
+					args["media"] = InputMediaPhoto(
+						media=job.local_media_path
+					)
+				else:
+					args["photo"] = job.local_media_path
 		elif job.media_type == JobType.AUDIO:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -151,13 +163,20 @@ class Bot(object):
 				else:
 					args["audio"] = job.tg_file_id.replace(":audio", '')
 			else:
-				args["media"] = InputMediaAudio(
-					media=job.local_media_path,
-					performer=job.media_info["performer"],
-					thumb=job.media_info["thumb"],
-					duration=job.media_info["duration"],
-					title=job.canonical_name,
-				)
+				if job.placeholder_message_id:
+					args["media"] = InputMediaAudio(
+						media=job.local_media_path,
+						performer=job.media_info["performer"],
+						thumb=job.media_info["thumb"],
+						duration=job.media_info["duration"],
+						title=job.canonical_name,
+					)
+				else:
+					args["audio"] = job.local_media_path
+					args["performer"] = job.media_info["performer"]
+					args["thumb"] = job.media_info["thumb"]
+					args["duration"] = job.media_info["duration"]
+					args["title"] = job.canonical_name
 				#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:
@@ -168,13 +187,20 @@ class Bot(object):
 				else:
 					args["animation"] = job.tg_file_id.replace(":animation", '')
 			else:
-				args["media"] = InputMediaAudio(
-					media=job.local_media_path,
-					performer=job.media_info["performer"],
-					thumb=job.media_info["thumb"],
-					duration=job.media_info["duration"],
-					title=job.canonical_name,
-				)
+				if job.placeholder_message_id:
+					args["media"] = InputMediaAnimation(
+						media=job.local_media_path,
+						thumb=job.media_info["thumb"],
+						duration=job.media_info["duration"],
+						width=job.media_info["width"],
+						height=job.media_info["height"]
+					)
+				else:
+					args["animation"] = job.local_media_path
+					args["width"] = job.media_info["width"]
+					args["height"] = job.media_info["height"]
+					args["duration"] = job.media_info["duration"]
+					args["thumb"] = job.media_info["thumb"]
 		elif job.media_type == JobType.COLLECTION:
 			if job.tg_file_id:
 				args["media"] = []
@@ -219,19 +245,18 @@ class Bot(object):
 		args["chat_id"] = job.chat_id
 
 		# common args
-		if job.placeholder_message_id and job.media_type != JobType.COLLECTION:
+		if job.placeholder_message_id and job.media_type is not JobType.COLLECTION:
 			args["message_id"] = job.placeholder_message_id
 		else:
 			args["disable_notification"] = True
 			args["reply_to_message_id"] = job.message_id
 
-		if os.environ.get("ENABLE_DONATES", None) == "true" and job.media_type != JobType.COLLECTION:
+		if os.environ.get("ENABLE_DONATES", None) == "true" and job.media_type is not JobType.COLLECTION:
 			args["reply_markup"] = InlineKeyboardMarkup([[InlineKeyboardButton("❤ Donate", url=os.environ.get("DONATE_LINK", "https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E"))]])
 
 		return args
 
 	async def upload_job(self, job: UploadJob) -> list[str]:
-		timeout = int(os.environ.get("TG_WRITE_TIMEOUT", default=120))
 		tg_file_ids = []
 		try:
 			retry_amount = 0
@@ -241,7 +266,12 @@ class Bot(object):
 					reply_message = None
 					if job.media_type in (JobType.VIDEO, JobType.IMAGE, JobType.AUDIO):
 						if job.placeholder_message_id:
-							reply_message = await self.client.edit_message_media(**self.build_tg_args(job))
+							try:
+								reply_message = await self.client.edit_message_media(**self.build_tg_args(job))
+							except MessageIdInvalid:
+								logging.warning("Placeholder message not found. Looks like placeholder message was deleted by administrator.")
+								job.placeholder_message_id = None
+								continue
 						else:
 							send_funcs = {
 								JobType.VIDEO: self.client.send_video,
@@ -277,7 +307,7 @@ class Bot(object):
 							sent_messages += messages
 							if job.media_collection:
 								for j, chunk in enumerate(media_chunk):
-									tg_file_id = Utils.extract_file_id(messages[j])
+									tg_file_id = Utils.eƒƒxtract_file_id(messages[j])
 									if tg_file_id:
 										job.media_collection[i][j].tg_file_id = tg_file_id
 							if i == 0 and job.placeholder_message_id:

warp_beacon/telegram/handlers.py

@@ -31,7 +31,14 @@ class Handlers(object):
 		if not d:
 			await message.reply_text("No random content yet. Try to send link first.")
 			return
-		await self.bot.upload_job(UploadJob(tg_file_id=d["tg_file_id"], media_type=d["media_type"], message_id=message.id))
+		await self.bot.upload_job(
+			UploadJob(
+				tg_file_id=d["tg_file_id"],
+				chat_id=message.chat.id,
+				media_type=JobType[d["media_type"].upper()],
+				message_id=message.id
+			)
+		)
 
 	async def start(self, client: Client, message: Message) -> None:
 		bot_name = await self.bot.client.get_me()

warp_beacon/telegram/placeholder_message.py

@@ -177,7 +177,8 @@ class PlaceholderMessage(object):
 			await self.bot.client.edit_message_caption(
 				chat_id=chat_id,
 				message_id=placeholder_message_id,
-				caption=" ⚠️ *%s*" % placeholder_text
+				caption=" ⚠️ **%s**" % placeholder_text,
+				parse_mode=ParseMode.MARKDOWN
 			)
 		except Exception as e:
 			logging.error("Failed to update placeholder message!")

{warp_beacon-2.0.0.dist-info → warp_beacon-2.0.2.dist-info}/METADATA

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

{warp_beacon-2.0.0.dist-info → warp_beacon-2.0.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ etc/warp_beacon/warp_beacon.conf,sha256=xihOuNBqVXGNdmMO14wwYNrqSQ4Z1wlAjp-xJk5S
 lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuwwPfa2mDLUA,372
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/__version__.py,sha256=qOioaGGl5NerFveysRg4FBs-w1ZS2KuRyW5CW5zOmU8,23
+warp_beacon/__version__.py,sha256=XEXLtIQFYJucVx5iyUIJQDghcXS4pP7zm10F2Q_kYTE,23
 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
@@ -10,13 +10,13 @@ warp_beacon/jobs/__init__.py,sha256=ED8_tPle4iL4kqNW0apAVkgNQtRRTnYfAJwBjO1g0JY,
 warp_beacon/jobs/abstract.py,sha256=kvPTxnzf8bYtggJgVZRYV3DVMCpfSia2pFrHLKhn7lY,2358
 warp_beacon/jobs/download_job.py,sha256=5HiPcnJppFMhO14___3eSkoMygM3y-vhpGkMAuNhK7s,854
 warp_beacon/jobs/types.py,sha256=Ae8zINgbs7cOcYkYoOCOACA7duyhnIGMQAJ_SJB1QRQ,176
-warp_beacon/jobs/upload_job.py,sha256=Vaogc4vbpAfyaT4VkIHEPLFRELmM44TDqkmnPYh3Ymc,740
+warp_beacon/jobs/upload_job.py,sha256=_ul4psPej1jLEs-BMcMR80GbXDSmm38jE9yoZtecclY,741
 warp_beacon/mediainfo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/mediainfo/abstract.py,sha256=ZR2JMuRpoh7nDNov9a8YkAfr6BI2HXnXzQtVrLgDxjs,1185
 warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-ZM,651
 warp_beacon/mediainfo/silencer.py,sha256=yn9w1LVHG8JQy_D45_RzrlEWID1zbj3ecx7nYGUP4ZE,1647
 warp_beacon/mediainfo/video.py,sha256=AIRy_op_BvehsjarM1rvT5Qo0QWwf-Q6xVVd_aCnbJ4,2505
-warp_beacon/scraper/__init__.py,sha256=Gv5XxSuvPeJgMTrJrnYAtf3xviXyK6QAX0n6Ml6dIvI,9863
+warp_beacon/scraper/__init__.py,sha256=Ef24SqcD-dV12coPcSJaQC-fN2oOjH47S1nwsKTrtI4,9860
 warp_beacon/scraper/abstract.py,sha256=cxQxt5eQkieCZsgQwz425iF69pgCrWZ69ItlikPsWHc,1036
 warp_beacon/scraper/exceptions.py,sha256=9VJBK5ufokyUpT_q7XVFBYC8lK_BSBfo-S1pd6re9VY,1094
 warp_beacon/scraper/instagram.py,sha256=YDFdrSB1ghw9f43004lFyk2S5QTopFvpyoUYN-qOVdw,8335
@@ -27,14 +27,14 @@ warp_beacon/scraper/youtube/shorts.py,sha256=co4lpNTnncIEScVB9htAT2Hy4fvx56z5xgD
 warp_beacon/scraper/youtube/youtube.py,sha256=xIrGe2ElPo3889_w5128xCnkdgwG1u6lA-QoachMUfc,1104
 warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=W2RuhHTTs7OW1uuDsplhyeRrFauPba0dBTTcrjanshk,10899
-warp_beacon/telegram/handlers.py,sha256=4C0Z-u6Kw-9tYmgXlK92PSV2HzZpl0GMpu5DblZZzM8,5708
-warp_beacon/telegram/placeholder_message.py,sha256=wLMoiDdQGMxRF4R9vbGDjP9awyODheLEasSVKsP4Mvg,6381
+warp_beacon/telegram/bot.py,sha256=PVTXud908Q0f8q33ter6l372Z2EKGeOvk8BbQ9WIcYY,12066
+warp_beacon/telegram/handlers.py,sha256=U6wZdIvZnIugxy98JhgZV51Px_F0NcOXWBH5brGM0Sc,5778
+warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
 warp_beacon/telegram/utils.py,sha256=3MNlRoYvdoiYU7uBWu4x10QynSW_rE6Ei4GDyZxwVFs,1793
 warp_beacon/uploader/__init__.py,sha256=chX9oOrwO05O7DFmUfskTAnoKse66r3sY2s4NFF7bmM,4442
-warp_beacon-2.0.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.0.0.dist-info/METADATA,sha256=GgqPqUtUgZlblRv-shLeO2nTxYa_Cz5V4lX86bGuz0M,18279
-warp_beacon-2.0.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-warp_beacon-2.0.0.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.0.0.dist-info/top_level.txt,sha256=pu6xG8OO_nCGllnOfAZ6QpVfivtmHVxPlYK8SZzUDqA,840
-warp_beacon-2.0.0.dist-info/RECORD,,
+warp_beacon-2.0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.0.2.dist-info/METADATA,sha256=y84HK_a9c_k3QluWxyEusbvdwhL0dYhnec6ZJuHseG0,18279
+warp_beacon-2.0.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+warp_beacon-2.0.2.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.0.2.dist-info/top_level.txt,sha256=pu6xG8OO_nCGllnOfAZ6QpVfivtmHVxPlYK8SZzUDqA,840
+warp_beacon-2.0.2.dist-info/RECORD,,