warp-beacon 2.3.23__tar.gz → 2.3.25__tar.gz

{warp_beacon-2.3.23/warp_beacon.egg-info → warp_beacon-2.3.25}/PKG-INFO

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

warp_beacon-2.3.25/warp_beacon/__version__.py

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

{warp_beacon-2.3.23 → warp_beacon-2.3.25}/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.23 → warp_beacon-2.3.25}/warp_beacon/telegram/bot.py

@@ -417,6 +417,10 @@ 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()
 					break
 				except MultiMediaTooLong as e:
 					logging.error("Failed to upload due telegram limitations :(")

{warp_beacon-2.3.23 → warp_beacon-2.3.25}/warp_beacon/telegram/handlers.py

@@ -243,29 +243,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[:134] + "... \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.23 → warp_beacon-2.3.25/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.23/warp_beacon/__version__.py

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