warp-beacon 2.3.21__tar.gz → 2.3.22__tar.gz

{warp_beacon-2.3.21/warp_beacon.egg-info → warp_beacon-2.3.22}/PKG-INFO

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

warp_beacon-2.3.22/warp_beacon/__version__.py

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

{warp_beacon-2.3.21 → warp_beacon-2.3.22}/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-2.3.21 → warp_beacon-2.3.22}/warp_beacon/telegram/bot.py

@@ -347,7 +347,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-2.3.21 → warp_beacon-2.3.22}/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())

{warp_beacon-2.3.21 → warp_beacon-2.3.22/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.21/warp_beacon/__version__.py

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