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

warp_beacon/__version__.py

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

warp_beacon/jobs/abstract.py

@@ -1,9 +1,11 @@
 import os
-from abc import ABC, abstractmethod
+from abc import ABC
 from typing import TypedDict
 from typing_extensions import Unpack
 import uuid
 
+from pyrogram.enums import ChatType
+
 from warp_beacon.jobs import Origin
 from warp_beacon.jobs.types import JobType
 
@@ -37,6 +39,7 @@ class JobSettings(TypedDict):
 	account_switches: int
 	yt_auth: bool
 	session_validation: bool
+	chat_type: ChatType
 
 class AbstractJob(ABC):
 	job_id: uuid.UUID = None
@@ -68,6 +71,7 @@ class AbstractJob(ABC):
 	account_switches: int = 0
 	yt_auth: bool = False
 	session_validation: bool = False
+	chat_type: ChatType = None
 
 	def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
 		if kwargs:

warp_beacon/scheduler/scheduler.py

@@ -11,7 +11,7 @@ class IGScheduler(object):
 	thread = None
 	event = None
 
-	def __init__(self, downloader: "warp_beacon.scraper.AsyncDownloader") -> None:
+	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
 		self.downloader = downloader
 		self.event = threading.Event()
 
@@ -24,6 +24,7 @@ class IGScheduler(object):
 
 	def stop(self) -> None:
 		self.running = False
+		self.event.set()
 		if self.thread:
 			t_id = self.thread.native_id
 			logging.info("Stopping scheduler thread #'%s'", t_id)

warp_beacon/scraper/__init__.py

@@ -15,7 +15,6 @@ from warp_beacon.jobs.download_job import DownloadJob
 from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.account_selector import AccountSelector
-from warp_beacon.scheduler.scheduler import IGScheduler
 
 import logging
 
@@ -37,8 +36,6 @@ class AsyncDownloader(object):
 		self.uploader = uploader
 		self.workers_count = workers_count
 		self.acc_selector = AccountSelector(ACC_FILE)
-		self.scheduler = IGScheduler(self)
-		self.scheduler.start()
 
 	def __del__(self) -> None:
 		self.stop_all()
@@ -329,7 +326,6 @@ class AsyncDownloader(object):
 
 	def stop_all(self) -> None:
 		self.allow_loop.value = 0
-		self.scheduler.stop()
 		for proc in self.workers:
 			if proc.is_alive():
 				logging.info("stopping process #%d", proc.pid)

warp_beacon/scraper/account_selector.py

@@ -80,4 +80,6 @@ class AccountSelector(object):
 	
 	def count_service_accounts(self, mod_name: Origin) -> int:
 		module_name = 'youtube' if next((s for s in ("yt", "youtube", "youtu_be") if s in mod_name.value), None) else 'instagram'
+		if module_name not in self.accounts_meta_data:
+			return 0
 		return len(self.accounts_meta_data[module_name])

warp_beacon/telegram/bot.py

@@ -4,7 +4,7 @@ import signal
 import uvloop
 
 from pyrogram import Client, filters
-from pyrogram.enums import ParseMode
+from pyrogram.enums import ParseMode, ChatType
 from pyrogram.handlers import MessageHandler, CallbackQueryHandler
 from pyrogram.types import Message, InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InputMediaDocument, InlineKeyboardButton, InlineKeyboardMarkup
 from pyrogram.errors import RPCError, FloodWait, NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid
@@ -18,6 +18,7 @@ from warp_beacon.uploader import AsyncUploader
 from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs.types import JobType
 from warp_beacon.telegram.utils import Utils
+from warp_beacon.scheduler.scheduler import IGScheduler
 
 import logging
 
@@ -29,6 +30,7 @@ class Bot(object):
 	client = None
 	handlers = None
 	placeholder = None
+	scheduler = None
 
 	def __init__(self, tg_bot_name: str, tg_token: str, tg_api_id: str, tg_api_hash: str) -> None:
 		# Enable logging
@@ -70,8 +72,11 @@ class Bot(object):
 			uploader=self.uploader
 		)
 
+		self.scheduler = IGScheduler(self.downloader)
+
 		self.downloader.start()
 		self.uploader.start()
+		self.scheduler.start()
 
 		self.handlers = Handlers(self)
 
@@ -94,9 +99,9 @@ class Bot(object):
 
 	def stop(self) -> None:
 		logging.info("Warp Beacon terminating. This may take a while ...")
+		self.scheduler.stop()
 		self.downloader.stop_all()
 		self.uploader.stop_all()
-		#self.client.stop()
 
 	async def send_text(self, chat_id: int, text: str, reply_id: int = None) -> int:
 		try:
@@ -271,6 +276,15 @@ 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
@@ -333,7 +347,7 @@ class Bot(object):
 							)
 							sent_messages += messages
 							if job.media_collection:
-								for j, chunk in enumerate(media_chunk):
+								for j, _ in enumerate(media_chunk):
 									tg_file_id = Utils.extract_file_id(messages[j])
 									if tg_file_id:
 										job.media_collection[i][j].tg_file_id = tg_file_id
@@ -360,7 +374,7 @@ class Bot(object):
 					if retry_amount+1 >= max_retries:
 						msg = ""
 						if hasattr(e, "MESSAGE") and e.MESSAGE:
-							msg = "Telegram error: %s" % str(e.MESSAGE)
+							msg = f"Telegram error: {str(e.MESSAGE)}"
 						else:
 							msg = (f"Unknown Telegram error. Known information:\n```python\n{traceback.format_exc().strip()}```"
 									"\nPlease [create issue](https://github.com/sb0y/warp_beacon/issues) with this info and service logs.")
@@ -374,4 +388,11 @@ class Bot(object):
 		finally:
 			job.remove_files()
 
+		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
+			try:
+				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)
+
 		return tg_file_ids

warp_beacon/telegram/handlers.py

@@ -1,7 +1,7 @@
 from pyrogram import Client
 from pyrogram.types import Message, CallbackQuery
 from pyrogram.enums import ChatType, ParseMode
-from pyrogram.types import Chat, BotCommand
+from pyrogram.types import BotCommand
 
 from urlextract import URLExtract
 
@@ -37,7 +37,9 @@ class Handlers(object):
 				tg_file_id=d["tg_file_id"],
 				chat_id=message.chat.id,
 				media_type=JobType[d["media_type"].upper()],
-				message_id=message.id
+				message_id=message.id,
+				chat_type=message.chat.type,
+				source_username=message.from_user
 			)
 		)
 
@@ -96,7 +98,9 @@ class Handlers(object):
 								tg_file_id=",".join(tg_file_ids),
 								message_id=effective_message_id,
 								media_type=JobType.COLLECTION,
-								chat_id=chat.id
+								chat_id=chat.id,
+								chat_type=message.chat.type,
+								source_username=message.from_user
 							)
 						)
 					elif ent_len:
@@ -107,7 +111,9 @@ class Handlers(object):
 								tg_file_id=tg_file_ids.pop(),
 								message_id=effective_message_id,
 								media_type=media_type,
-								chat_id=chat.id
+								chat_id=chat.id,
+								chat_type=message.chat.type,
+								source_username=message.from_user
 							)
 						)
 				else:
@@ -141,7 +147,7 @@ class Handlers(object):
 						if not placeholder_message_id:
 							await self.bot.send_text(
 								chat_id=chat.id,
-								reply_id=effective_message_id, 
+								reply_id=effective_message_id,
 								text="Failed to create message placeholder. Please check your bot Internet connection.")
 							return
 
@@ -157,7 +163,9 @@ class Handlers(object):
 							chat_id=chat.id,
 							in_process=self.bot.uploader.is_inprocess(uniq_id),
 							uniq_id=uniq_id,
-							job_origin=origin
+							job_origin=origin,
+							source_username=message.from_user,
+							chat_type=chat.type
 						))
 						self.bot.uploader.set_inprocess(uniq_id)
 					except Exception as e:

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

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

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

@@ -3,12 +3,12 @@ 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=a4u6mxTcPUb2hogL2j1xkLTocLb-UOcPeNHzDSs-Pr0,24
+warp_beacon/__version__.py,sha256=wiW76pTWCmfLdnpKj9UWKrYcKbwp4MO8rkgmyMKEM3Q,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
 warp_beacon/jobs/__init__.py,sha256=ED8_tPle4iL4kqNW0apAVkgNQtRRTnYfAJwBjO1g0JY,180
-warp_beacon/jobs/abstract.py,sha256=lXU9c5LOb1jXmew1IBoFO3k-MChHm0Y8SUX8OsESJGk,2779
+warp_beacon/jobs/abstract.py,sha256=5jCkCTNVeoO55a-q2VmcY_94VMQfR1UPokK1tUDiQ4g,2849
 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=_ul4psPej1jLEs-BMcMR80GbXDSmm38jE9yoZtecclY,741
@@ -18,10 +18,10 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=MgUc9Ibbhjhg9GbJMNfJqrdDkMsQShZkQ1sCwvW_-qI,1647
 warp_beacon/mediainfo/video.py,sha256=AIRy_op_BvehsjarM1rvT5Qo0QWwf-Q6xVVd_aCnbJ4,2505
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/scheduler.py,sha256=LTLkR1dKKtGjYELUF-6WRBIHb-bBaG4wEAuE0YRDoRk,1519
-warp_beacon/scraper/__init__.py,sha256=I3hO77dyaXb0olw0uEkd-89msjUCAFVnC_yIhXMW5OE,14876
+warp_beacon/scheduler/scheduler.py,sha256=BO9nzJ2oKK877527HrzztBBOSClt5cAK1jGmO7gv38c,1536
+warp_beacon/scraper/__init__.py,sha256=0ZxLxzXweg1LJ1qBRJ1s3EOKe7xpUrp9Nj26gjsLMOQ,14734
 warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_iIw,2708
-warp_beacon/scraper/account_selector.py,sha256=9P4Pg4BEJpklWZPZqdQkAloSdJ3geBjQN4hPB7uUNSA,2820
+warp_beacon/scraper/account_selector.py,sha256=RYBmLDhE-fqaLqQiQ6zVd13q-1pqQ3F3nYJu2Gx3gV4,2881
 warp_beacon/scraper/exceptions.py,sha256=lHsPrYy5iYnHsIdUHqRxZmzlqrkNj_TS4TkiTJfWhTs,1326
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=iT66IM7nsbVDWQzBW-CJUWDBjoBbRZH4BHx6TJw3oqo,13517
@@ -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=YS2zwS-cEICEpHjHMwJV5zXQfUxJi5-JV3Xj0zgPnvA,13211
-warp_beacon/telegram/handlers.py,sha256=MTcHZmWe8RAcZdicnqQewy_SkwujhnaoqJgWHpebfVs,6350
+warp_beacon/telegram/bot.py,sha256=tJh3EbtrOebRG4fj1uh5CiJ8CUzjDywQGoSMlX-AK9s,13965
+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.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.1.10.dist-info/METADATA,sha256=KTtY_OjnvrR2Kf9IX_3ERSndTC8wnC6tRnzn8-btQtM,21251
-warp_beacon-2.1.10.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-warp_beacon-2.1.10.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.1.10.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.1.10.dist-info/RECORD,,
+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,,