warp-beacon 2.2.8__tar.gz → 2.2.10__tar.gz

{warp_beacon-2.2.8/warp_beacon.egg-info → warp_beacon-2.2.10}/PKG-INFO

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

warp_beacon-2.2.10/warp_beacon/__version__.py

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

{warp_beacon-2.2.8 → warp_beacon-2.2.10}/warp_beacon/storage/__init__.py

@@ -65,7 +65,13 @@ class Storage(object):
 			logging.debug("uniq_id to search is '%s'", uniq_id)
 			cursor = self.db.find({"uniq_id": uniq_id})
 			for document in cursor:
-				ret.append({"uniq_id": document["uniq_id"], "tg_file_id": document["tg_file_id"], "media_type": document["media_type"]})
+				ret.append(
+				{
+					"uniq_id": document["uniq_id"],
+					"tg_file_id": document["tg_file_id"],
+					"media_type": document["media_type"],
+					"canonical_name": document.get("canonical_name")
+				})
 		except Exception as e:
 			logging.error("Error occurred while trying to read from the database!")
 			logging.exception(e)
@@ -79,7 +85,7 @@ class Storage(object):
 	def db_lookup_id(self, uniq_id: str) -> list[dict]:
 		return self.db_find(uniq_id)
 	
-	def add_media(self, tg_file_ids: list[str], media_url: str, media_type: str, origin: str) -> list[int]:
+	def add_media(self, tg_file_ids: list[str], media_url: str, media_type: str, origin: str, canonical_name: str = "") -> list[int]:
 		uniq_id = self.compute_uniq(media_url)
 		media_ids = []
 		for tg_file_id in tg_file_ids:
@@ -89,7 +95,14 @@ class Storage(object):
 			if self.db_lookup_id(uniq_id):
 				logging.info("Detected existing uniq_id, skipping storage write operation")
 				continue
-			media_ids += str(self.db.insert_one({"uniq_id": uniq_id, "media_type": media_type, "tg_file_id": tg_file_id, "origin": origin}).inserted_id)
+			media_ids += str(self.db.insert_one(
+			{
+				"uniq_id": uniq_id,
+				"media_type": media_type,
+				"tg_file_id": tg_file_id,
+				"origin": origin,
+				"canonical_name": canonical_name
+			}).inserted_id)
 
 		return media_ids
 	

{warp_beacon-2.2.8 → warp_beacon-2.2.10}/warp_beacon/telegram/bot.py

@@ -152,7 +152,7 @@ class Bot(object):
 			caption = f"**{job.canonical_name}**"
 		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
 			if job.canonical_name:
-				caption += "\n"
+				caption += "\n—\n"
 			if job.source_username:
 				caption += f"Requested by **@{job.source_username}**"
 			if job.source_username and job.url:
@@ -320,6 +320,7 @@ class Bot(object):
 		else:
 			args["disable_notification"] = True
 			#args["reply_to_message_id"] = job.message_id
+			args["reply_to_message_id"] = None
 
 		if os.environ.get("ENABLE_DONATES", None) == "true" and job.media_type is not JobType.COLLECTION:
 			args["reply_markup"] = InlineKeyboardMarkup([[InlineKeyboardButton("❤ Donate", url=os.environ.get("DONATE_LINK", "https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E"))]])
@@ -368,12 +369,12 @@ class Bot(object):
 					elif job.media_type == JobType.COLLECTION:
 						col_job_args = self.build_tg_args(job)
 						sent_messages = []
+						snd_grp_options = {"chat_id": job.chat_id, "reply_to_message_id": job.message_id}
+						if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
+							snd_grp_options["reply_to_message_id"] = None
 						for i, media_chunk in enumerate(col_job_args["media"]):
-							messages = await self.client.send_media_group(
-								chat_id=job.chat_id,
-								reply_to_message_id=job.message_id,
-								media=media_chunk
-							)
+							snd_grp_options["media"] = media_chunk
+							messages = await self.client.send_media_group(**snd_grp_options)
 							sent_messages += messages
 							if job.media_collection:
 								for j, _ in enumerate(media_chunk):

{warp_beacon-2.2.8 → warp_beacon-2.2.10}/warp_beacon/telegram/handlers.py

@@ -105,8 +105,8 @@ class Handlers(object):
 							)
 						)
 					elif ent_len:
-						logging.info(entities[0])
 						media_type = JobType[entities[0]["media_type"].upper()]
+						canonical_name = entities[0]["canonical_name"]
 						await self.bot.upload_job(
 							UploadJob(
 								url=url,
@@ -115,7 +115,8 @@ class Handlers(object):
 								media_type=media_type,
 								chat_id=chat.id,
 								chat_type=message.chat.type,
-								source_username=Utils.extract_message_author(message)
+								source_username=Utils.extract_message_author(message),
+								canonical_name=canonical_name
 							)
 						)
 				else:
@@ -132,9 +133,21 @@ class Handlers(object):
 								if job.media_type == JobType.COLLECTION and job.save_items:
 									for chunk in job.media_collection:
 										for i in chunk:
-											self.storage.add_media(tg_file_ids=[i.tg_file_id], media_url=i.effective_url, media_type=i.media_type.value, origin=origin.value)
+											self.storage.add_media(
+												tg_file_ids=[i.tg_file_id],
+												media_url=i.effective_url,
+												media_type=i.media_type.value,
+												origin=job.job_origin.value,
+												canonical_name=job.canonical_name
+											)
 								else:
-									self.storage.add_media(tg_file_ids=[','.join(tg_file_ids)], media_url=job.url, media_type=job.media_type.value, origin=origin.value)
+									self.storage.add_media(
+										tg_file_ids=[','.join(tg_file_ids)],
+										media_url=job.url,
+										media_type=job.media_type.value,
+										origin=job.job_origin.value,
+										canonical_name=job.canonical_name
+									)
 						except Exception as e:
 							logging.error("Exception occurred while performing upload callback!")
 							logging.exception(e)

{warp_beacon-2.2.8 → warp_beacon-2.2.10}/warp_beacon/telegram/placeholder_message.py

@@ -42,8 +42,8 @@ class PlaceholderMessage(object):
 			chat_id=chat_id,
 			animation=self.placeholder.tg_file_id,
 			caption=text,
-			parse_mode=ParseMode.MARKDOWN,
-			reply_to_message_id=reply_id
+			reply_to_message_id=reply_id,
+			parse_mode=ParseMode.MARKDOWN
 		)
 
 		return reply
@@ -53,8 +53,8 @@ class PlaceholderMessage(object):
 			chat_id=chat_id,
 			photo=self.placeholder.tg_file_id,
 			caption=text,
-			parse_mode=ParseMode.MARKDOWN,
-			reply_to_message_id=reply_id
+			reply_to_message_id=reply_id,
+			parse_mode=ParseMode.MARKDOWN
 		)
 
 		return reply
@@ -64,8 +64,8 @@ class PlaceholderMessage(object):
 			chat_id=chat_id,
 			document=self.placeholder.tg_file_id,
 			caption=text,
-			parse_mode=ParseMode.MARKDOWN,
-			reply_to_message_id=reply_id
+			reply_to_message_id=reply_id,
+			parse_mode=ParseMode.MARKDOWN
 		)
 
 		return reply
@@ -110,8 +110,8 @@ class PlaceholderMessage(object):
 								chat_id=chat_id,
 								animation="https://bagrintsev.me/warp_beacon/placeholder_that_we_deserve.mp4",
 								caption=text,
-								parse_mode=ParseMode.MARKDOWN,
-								reply_to_message_id=reply_id
+								reply_to_message_id=reply_id,
+								parse_mode=ParseMode.MARKDOWN
 							)
 							self.placeholder = PlaceHolder(PlaceholderType.ANIMATION, Utils.extract_file_id(reply))
 						except Exception as e:
@@ -119,7 +119,7 @@ class PlaceholderMessage(object):
 							logging.exception(e)
 							img = self.create_default_placeholder_img("Loading, this may take a moment ...")
 							reply = await self.bot.client.send_photo(
-								chat_id=chat.id,
+								chat_id=chat_id,
 								parse_mode=ParseMode.MARKDOWN,
 								reply_to_message_id=reply_id,
 								photo=img

{warp_beacon-2.2.8 → warp_beacon-2.2.10/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.8/warp_beacon/__version__.py

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