warp-beacon 2.3.24__tar.gz → 2.3.26__tar.gz

{warp_beacon-2.3.24/warp_beacon.egg-info → warp_beacon-2.3.26}/PKG-INFO

@@ -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.26/warp_beacon/__version__.py

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

{warp_beacon-2.3.24 → warp_beacon-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-2.3.24 → warp_beacon-2.3.26}/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-2.3.24 → warp_beacon-2.3.26}/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 → warp_beacon-2.3.26/warp_beacon.egg-info}/PKG-INFO

@@ -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/warp_beacon/__version__.py

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