warp-beacon 2.3.24__py3-none-any.whl → 2.3.26__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.24"
+__version__ = "2.3.26"
 

warp_beacon/jobs/abstract.py

@@ -13,6 +13,7 @@ class JobSettings(TypedDict):
 	job_id: uuid.UUID
 	message_id: int
 	chat_id: int
+	user_id: int
 	placeholder_message_id: int
 	local_media_path: str
 	local_compressed_media_path: str
@@ -49,6 +50,7 @@ class JobSettings(TypedDict):
 class AbstractJob(ABC):
 	job_id: uuid.UUID = None
 	message_id: int = 0
+	user_id: int = 0
 	chat_id: int = 0
 	placeholder_message_id: int = 0
 	local_media_path: str = ""

warp_beacon/telegram/bot.py

@@ -1,5 +1,6 @@
 import os
 import signal
+from typing import Optional
 
 import html
 
@@ -167,7 +168,8 @@ class Bot(object):
 				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>"
+				#caption = f"<b>{html.escape(job.canonical_name)}</b>"
+				return "" # may be too long so empty, no needed
 		if is_group:
 			if job.canonical_name:
 				caption += "\n—\n"
@@ -347,6 +349,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,6 +420,9 @@ class Bot(object):
 							elif msg.photo:
 								tg_file_ids.append(msg.photo.file_id + ':image')
 					logging.info("Uploaded to Telegram")
+					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/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,
@@ -243,29 +247,33 @@ class Handlers(object):
 		first_entity = {}
 		if db_results:
 			first_entity = db_results[0]
+		
+		text = first_entity.get("canonical_name", "Failed to fetch data.")
 
 		try:
-			text = first_entity.get("canonical_name", "Failed to fetch data.")
-			if len(text) > 200:
-				text = text[:133] + "... \n\nText exceeds Telegram's limits. Use 'source link' in message."
-			await client.answer_callback_query(
-				callback_query_id=query.id,
-				show_alert=True,
-				text=text
+			await client.send_message(
+				query.from_user.id,
+				text,
+				parse_mode=ParseMode.HTML
 			)
-		except Exception as e:
-			logging.warning("read_more_handler: Failed for uniq_id='%s', origin='%s'", uniq_id, origin)
-			logging.exception(e)
-
+		except Exception as _:
 			try:
-				error_text = str(e)
-				if len(error_text) > 200:
-					error_text = error_text[:197] + "..."
-
 				await client.answer_callback_query(
 					callback_query_id=query.id,
 					show_alert=True,
-					text=error_text
+					text="You haven’t messaged the bot yet. Please start the chat using the /start bot command."
 				)
-			except Exception as _:
-				pass
+			except Exception as e:
+				logging.warning("Failed to return error to user about TG restrictions!")
+				logging.exception(e)
+			return
+
+		try:
+			await client.answer_callback_query(
+				callback_query_id=query.id,
+				show_alert=True,
+				text="Check your private chat — I've sent you the message!"
+			)
+		except Exception as e:
+			logging.error("Failed to report sent message status!")
+			logging.exception(e)

{warp_beacon-2.3.24.dist-info → warp_beacon-2.3.26.dist-info}/METADATA

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

{warp_beacon-2.3.24.dist-info → warp_beacon-2.3.26.dist-info}/RECORD

@@ -4,12 +4,12 @@ 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=bC-AzDIu_QO-kmzQiOhia6-jCOHSKhCqMfQS-03i_lo,24
+warp_beacon/__version__.py,sha256=wev-73bni4Bt8uUVCdcTf6qvQHVHQ7M8RdnMsVpXnB0,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=lYZplMq4Uo9vUB6ziMsC_FPer2NsvhdmFJ_I54L7v7Y,3087
+warp_beacon/jobs/abstract.py,sha256=7DZWGI2KfBmAF9qwftmVBrOa2Szd0vrlp24aQKl95ho,3119
 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
@@ -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=I-KPdeg-LMRb6wRRn2MLHndz9zhgSTBkxOhNQyWZwKI,16511
+warp_beacon/telegram/bot.py,sha256=8CiZPWCW7d7MrF51_AU-xv9HN9Rc56ElpEA8qxHRIKo,16803
 warp_beacon/telegram/caption_shortener.py,sha256=6J4Dp35mOmJEyctiuN8WXM39bkQ13m78HoghsYX3fbU,1548
-warp_beacon/telegram/handlers.py,sha256=pU7EX6AdWZPRryR6gWodUQY3uUiU20lGQ4z-iX0m90U,9165
+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.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.24.dist-info/METADATA,sha256=n4bO4CE_3Nix8Y2TRLziX7MQYMcGWLGYOq5RE9ihzVg,21723
-warp_beacon-2.3.24.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.24.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.24.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
-warp_beacon-2.3.24.dist-info/RECORD,,
+warp_beacon-2.3.26.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.26.dist-info/METADATA,sha256=5RJrfPr8VU7WTEX_8oS2l0wDS_chvS4su8JcqWQktqs,21723
+warp_beacon-2.3.26.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.26.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.26.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
+warp_beacon-2.3.26.dist-info/RECORD,,