warp-beacon 2.3.25__py3-none-any.whl → 2.3.27__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.25"
+__version__ = "2.3.27"
 

warp_beacon/telegram/bot.py

@@ -1,6 +1,8 @@
 import os
 import signal
 
+import logging
+
 import html
 
 import uvloop
@@ -20,12 +22,11 @@ from warp_beacon.storage import Storage
 from warp_beacon.uploader import AsyncUploader
 from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs.types import JobType
+from warp_beacon.jobs import Origin
 from warp_beacon.telegram.utils import Utils
 from warp_beacon.telegram.caption_shortener import CaptionShortner
 from warp_beacon.scheduler.scheduler import IGScheduler
 
-import logging
-
 class Bot(object):
 	storage = None
 	uploader = None
@@ -42,6 +43,8 @@ class Bot(object):
 			format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO
 		)
 
+		logging.getLogger("pyrogram").setLevel(logging.ERROR)
+
 		db_connect = DBClient()
 		self.storage = Storage(db_connect)
 
@@ -107,7 +110,7 @@ class Bot(object):
 		self.client.run()
 
 	def stop(self) -> None:
-		logging.info("Warp Beacon terminating. This may take a while ...")
+		logging.info("Warp Beacon is terminating. This may take a while ...")
 		self.scheduler.stop()
 		self.downloader.stop_all()
 		self.uploader.stop_all()
@@ -162,12 +165,15 @@ class Bot(object):
 	def build_signature_caption(self, job: UploadJob) -> str:
 		caption = ""
 		is_group = job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP)
+		is_youtube = job.job_origin is Origin.YOUTUBE
 		if job.canonical_name:
-			if is_group and CaptionShortner.need_short(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))} ..."
 				job.short_text = True
-			else:
-				caption = f"<b>{html.escape(job.canonical_name)}</b>"
+			# 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>{caption}</b>"
 		if is_group:
 			if job.canonical_name:
 				caption += "\n—\n"
@@ -347,6 +353,7 @@ class Bot(object):
 		if job.media_type is not JobType.COLLECTION:
 			render_donates = os.environ.get("ENABLE_DONATES", None) == "true"
 			keyboard_buttons = [[]]
+			# short_text is True only for groups
 			if job.short_text:
 				keyboard_buttons[0].append(InlineKeyboardButton("📖 Read more", callback_data=f"read_more:{job.job_origin.value}:{job.uniq_id}"))
 			if render_donates:
@@ -417,10 +424,9 @@ class Bot(object):
 							elif msg.photo:
 								tg_file_ids.append(msg.photo.file_id + ':image')
 					logging.info("Uploaded to Telegram")
-					#TODO send message with caption if request from private chat
-					#if job.chat_type not in (ChatType.GROUP, ChatType.SUPERGROUP):
-					#	if job.canonical_name:
-					#		self.client.send_message()
+					if job.chat_type not in (ChatType.GROUP, ChatType.SUPERGROUP):
+						if job.canonical_name:
+							await self.send_text(chat_id=job.user_id, text=job.canonical_name)
 					break
 				except MultiMediaTooLong as e:
 					logging.error("Failed to upload due telegram limitations :(")

warp_beacon/telegram/caption_shortener.py

@@ -3,7 +3,7 @@ from typing import Union
 from bs4 import NavigableString, Tag, Comment
 from bs4 import BeautifulSoup
 
-CAPTION_LENGTH_LIMIT = 85
+CAPTION_LENGTH_LIMIT = 130
 
 class CaptionShortner(object):
 	@staticmethod

warp_beacon/telegram/handlers.py

@@ -38,6 +38,7 @@ class Handlers(object):
 			UploadJob(
 				tg_file_id=d["tg_file_id"],
 				chat_id=message.chat.id,
+				user_id=message.from_user.id,
 				media_type=JobType[d["media_type"].upper()],
 				message_id=message.id,
 				chat_type=message.chat.type,
@@ -179,6 +180,7 @@ class Handlers(object):
 								message_id=effective_message_id,
 								media_type=JobType.COLLECTION,
 								chat_id=chat.id,
+								user_id=message.from_user.id,
 								chat_type=message.chat.type,
 								source_username=Utils.extract_message_author(message),
 								message_leftover=msg_leftover
@@ -196,6 +198,7 @@ class Handlers(object):
 								message_id=effective_message_id,
 								media_type=media_type,
 								chat_id=chat.id,
+								user_id=message.from_user.id,
 								chat_type=message.chat.type,
 								source_username=Utils.extract_message_author(message),
 								canonical_name=canonical_name,
@@ -207,6 +210,7 @@ class Handlers(object):
 							url=url,
 							message_id=effective_message_id,
 							chat_id=chat.id,
+							user_id=message.from_user.id,
 							in_process=self.bot.uploader.is_inprocess(uniq_id),
 							uniq_id=uniq_id,
 							job_origin=origin,

{warp_beacon-2.3.25.dist-info → warp_beacon-2.3.27.dist-info}/METADATA

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

{warp_beacon-2.3.25.dist-info → warp_beacon-2.3.27.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=EfrB-IK8InXfOMc-bwZOXSl4qf9zmhVdhxO5eOKjVPk,24
+warp_beacon/__version__.py,sha256=HscoHU4qFcWrkOvyuw52PtDdKw2LAfH6ZQTQowjSIRg,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
@@ -36,15 +36,15 @@ warp_beacon/scraper/youtube/youtube.py,sha256=fGrbjBngvvNdpzhb1yZVedNW0_tCrLc31V
 warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=5f7StuphFiAaxeOXIyJxccOXwlA6ddspKsw22IikJ9M,16711
-warp_beacon/telegram/caption_shortener.py,sha256=6J4Dp35mOmJEyctiuN8WXM39bkQ13m78HoghsYX3fbU,1548
-warp_beacon/telegram/handlers.py,sha256=Ann_cFWt6WBHSvhJ_zBsZRtNZf20RYj8Uxl3uDeZ_5o,9279
+warp_beacon/telegram/bot.py,sha256=yaibrtwslZnxCHocDvuf0CrExwAw6lWgaX7ts9yz87E,16996
+warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
+warp_beacon/telegram/handlers.py,sha256=XXIfdV_RCj7tyZMPXchuKmGoDdweOaR08ADDaBPWo_U,9426
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
 warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.25.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.25.dist-info/METADATA,sha256=4rie2363GgRD3lSaC39rhYT8a2RU7hg4AMT6c2ZBQMo,21723
-warp_beacon-2.3.25.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.25.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.25.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
-warp_beacon-2.3.25.dist-info/RECORD,,
+warp_beacon-2.3.27.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.27.dist-info/METADATA,sha256=579ruuxb3n9RUt4JTKN-7YSOpBRh2m_GTVmzmm5WjwQ,21723
+warp_beacon-2.3.27.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.27.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.27.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
+warp_beacon-2.3.27.dist-info/RECORD,,