warp-beacon 2.3.21__py3-none-any.whl → 2.3.23__py3-none-any.whl

warp_beacon/__version__.py

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

warp_beacon/storage/__init__.py

@@ -116,7 +116,4 @@ class Storage(object):
 		except Exception as e:
 			logging.error("Error occurred while trying to read from the database!")
 			logging.exception(e)
-		return ret
-
-
-
+		return ret

warp_beacon/telegram/bot.py

@@ -91,6 +91,7 @@ class Bot(object):
 		self.client.add_handler(MessageHandler(self.handlers.help, filters.command("help")))
 		self.client.add_handler(MessageHandler(self.handlers.random, filters.command("random")))
 		self.client.add_handler(MessageHandler(self.handlers.handler))
+		#TODO refactor to callback router
 		self.client.add_handler(CallbackQueryHandler(self.handlers.simple_button_handler, filters=filters.create(lambda _, __, q: not q.data.startswith("read_more:"))))
 		self.client.add_handler(CallbackQueryHandler(self.handlers.read_more_handler, filters=filters.create(lambda _, __, q: q.data.startswith("read_more:"))))
 
@@ -347,7 +348,7 @@ class Bot(object):
 			render_donates = os.environ.get("ENABLE_DONATES", None) == "true"
 			keyboard_buttons = [[]]
 			if job.short_text:
-				keyboard_buttons[0].append(InlineKeyboardButton("📖 Read more", callback_data=f"read_more:{job.job_origin}:{job.uniq_id}"))
+				keyboard_buttons[0].append(InlineKeyboardButton("📖 Read more", callback_data=f"read_more:{job.job_origin.value}:{job.uniq_id}"))
 			if render_donates:
 				keyboard_buttons[0].append(InlineKeyboardButton("❤ Donate", url=os.environ.get("DONATE_LINK", "https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E")))
 

warp_beacon/telegram/handlers.py

@@ -41,6 +41,8 @@ class Handlers(object):
 				media_type=JobType[d["media_type"].upper()],
 				message_id=message.id,
 				chat_type=message.chat.type,
+				uniq_id=d["uniq_id"],
+				job_origin=Origin(d["origin"]),
 				source_username=Utils.extract_message_author(message)
 			)
 		)
@@ -171,6 +173,8 @@ class Handlers(object):
 						await self.bot.upload_job(
 							UploadJob(
 								url=url,
+								uniq_id=uniq_id,
+								job_origin=origin,
 								tg_file_id=",".join(tg_file_ids),
 								message_id=effective_message_id,
 								media_type=JobType.COLLECTION,
@@ -186,6 +190,8 @@ class Handlers(object):
 						await self.bot.upload_job(
 							UploadJob(
 								url=url,
+								uniq_id=uniq_id,
+								job_origin=origin,
 								tg_file_id=tg_file_ids.pop(),
 								message_id=effective_message_id,
 								media_type=media_type,
@@ -230,7 +236,7 @@ class Handlers(object):
 			parts = query.data.split(':')
 			if len(parts) == 3:
 				_, origin, uniq_id = parts
-		logging.info("Handling read_more request: uniq_id='%s', origin='%s", uniq_id, origin)
+		logging.info("Handling read_more request: uniq_id='%s', origin='%s'", uniq_id, origin)
 		db_results = []
 		if uniq_id and origin:
 			db_results = self.storage.db_find(uniq_id=uniq_id.strip(), origin=origin.strip())
@@ -239,11 +245,27 @@ class Handlers(object):
 			first_entity = db_results[0]
 
 		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=first_entity.get("canonical_name", "Failed to fetch data.")
+				text=text
 			)
 		except Exception as e:
-			logging.warning("read_more_handler: Failed for uniq_id='%s', origin='%s", uniq_id, origin)
-			logging.exception(e)
+			logging.warning("read_more_handler: Failed for uniq_id='%s', origin='%s'", uniq_id, origin)
+			logging.exception(e)
+
+			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
+				)
+			except Exception as _:
+				pass

{warp_beacon-2.3.21.dist-info → warp_beacon-2.3.23.dist-info}/METADATA

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

{warp_beacon-2.3.21.dist-info → warp_beacon-2.3.23.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=6UhT1nd_TkHwjXTkZNK_C-VHrZtCaOZ_dAuJOK8O9iU,24
+warp_beacon/__version__.py,sha256=UXTGdNzHbVz-t0lUkxpvpPc5wkOHbaYl5uqcE8KcgE4,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
@@ -33,18 +33,18 @@ warp_beacon/scraper/youtube/abstract.py,sha256=cBtExei2Cb3o4YBtHqi8If_FdmE6NyJqN
 warp_beacon/scraper/youtube/music.py,sha256=qbijpSv54fsrIYHeY-nfmw4vo6oBmedQHsVG8pXNfrc,1380
 warp_beacon/scraper/youtube/shorts.py,sha256=ujGEV7ILXHqBRa99SyITsnR7ulAHJDtumAh51kVX880,1231
 warp_beacon/scraper/youtube/youtube.py,sha256=fGrbjBngvvNdpzhb1yZVedNW0_tCrLc31VSYMSHzcQY,2135
-warp_beacon/storage/__init__.py,sha256=xEzexwWZTMtjVesQ73BLhS0VkWoqRXSUmuXS4h5HOvY,3402
+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=-XUD8oKgDs3EZHVMZYbg4cZMslkG5e9FwcK7aWoVyEs,16469
+warp_beacon/telegram/bot.py,sha256=I-KPdeg-LMRb6wRRn2MLHndz9zhgSTBkxOhNQyWZwKI,16511
 warp_beacon/telegram/caption_shortener.py,sha256=6J4Dp35mOmJEyctiuN8WXM39bkQ13m78HoghsYX3fbU,1548
-warp_beacon/telegram/handlers.py,sha256=PhhsLmGES-NACwRojQI0yrTsfZaHP-ZnSuRUYHEViBc,8599
+warp_beacon/telegram/handlers.py,sha256=6uyyU4dbRyIYHTnCl1grO95cU7INECfoAEZ84kmelXs,9163
 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.21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.21.dist-info/METADATA,sha256=_bV50KTjywdi2oLJGTRf3z4EtIb0duoNX4_BOPIjXrc,21723
-warp_beacon-2.3.21.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.21.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.21.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
-warp_beacon-2.3.21.dist-info/RECORD,,
+warp_beacon-2.3.23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.23.dist-info/METADATA,sha256=jROYnnpf4BMQ2CqcvjDA2c9q1CxHKZrNzpGvF0tA6V4,21723
+warp_beacon-2.3.23.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.23.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.23.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
+warp_beacon-2.3.23.dist-info/RECORD,,