warp-beacon 2.1.11__tar.gz → 2.1.13__tar.gz

{warp_beacon-2.1.11/warp_beacon.egg-info → warp_beacon-2.1.13}/PKG-INFO

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

warp_beacon-2.1.13/warp_beacon/__version__.py

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

{warp_beacon-2.1.11 → warp_beacon-2.1.13}/warp_beacon/jobs/abstract.py

@@ -65,7 +65,7 @@ class AbstractJob(ABC):
 	canonical_name: str = ""
 	is_message_to_admin: bool = False
 	message_text: str = ""
-	source_usename: str = ""
+	source_username: str = ""
 	unvailable_error_count: int = 0
 	geoblock_error_count: int = 0
 	account_switches: int = 0

{warp_beacon-2.1.11 → warp_beacon-2.1.13}/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_username:
+				caption += f"Requested by **@{job.source_username}**"
+			if job.source_username 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 → warp_beacon-2.1.13}/warp_beacon/telegram/handlers.py

@@ -39,7 +39,7 @@ class Handlers(object):
 				media_type=JobType[d["media_type"].upper()],
 				message_id=message.id,
 				chat_type=message.chat.type,
-				source_username=message.from_user
+				source_username=Utils.extract_message_author(message)
 			)
 		)
 
@@ -100,7 +100,7 @@ class Handlers(object):
 								media_type=JobType.COLLECTION,
 								chat_id=chat.id,
 								chat_type=message.chat.type,
-								source_username=message.from_user
+								source_username=Utils.extract_message_author(message)
 							)
 						)
 					elif ent_len:
@@ -113,7 +113,7 @@ class Handlers(object):
 								media_type=media_type,
 								chat_id=chat.id,
 								chat_type=message.chat.type,
-								source_username=message.from_user
+								source_username=Utils.extract_message_author(message)
 							)
 						)
 				else:
@@ -164,7 +164,7 @@ class Handlers(object):
 							in_process=self.bot.uploader.is_inprocess(uniq_id),
 							uniq_id=uniq_id,
 							job_origin=origin,
-							source_username=message.from_user,
+							source_username=Utils.extract_message_author(message),
 							chat_type=chat.type
 						))
 						self.bot.uploader.set_inprocess(uniq_id)

{warp_beacon-2.1.11 → warp_beacon-2.1.13}/warp_beacon/telegram/utils.py

@@ -85,5 +85,10 @@ class Utils(object):
 	def extract_message_author(message: Message) -> str:
 		if message.from_user:
 			return message.from_user
+		if message.sender_chat:
+			if message.sender_chat.username:
+				return message.sender_chat.username
+			if message.sender_chat.title:
+				return message.sender_chat.title
 		return ''
 

{warp_beacon-2.1.11 → warp_beacon-2.1.13}/warp_beacon/uploader/__init__.py

@@ -2,12 +2,11 @@ import os
 import threading
 import multiprocessing
 from warp_beacon.jobs.upload_job import UploadJob
-#import time
 import logging
 
 import asyncio
 
-from typing import Optional, Callable, Coroutine
+from typing import Callable
 
 from warp_beacon.storage import Storage
 from warp_beacon.jobs.types import JobType

{warp_beacon-2.1.11 → warp_beacon-2.1.13/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.1.11/warp_beacon/__version__.py

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