warp-beacon 2.2.8__py3-none-any.whl → 2.2.10__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.8"
+__version__ = "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/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/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/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.dist-info → warp_beacon-2.2.10.dist-info}/METADATA

@@ -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.dist-info → warp_beacon-2.2.10.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=rKFQM_b9eoDS4mJ1B_SZNolPLXx1SQdQMdY2F_ZcBt8,1523
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=XDXei5fg61VxVBlT807KOYh3HbXVdl_uehPZ3sl46Gk,23
+warp_beacon/__version__.py,sha256=S4wq6McjHFKGhEU9aBbhNq0ulfsBmI3mryJRkShCF5s,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
@@ -30,16 +30,16 @@ warp_beacon/scraper/youtube/abstract.py,sha256=Wfui5UEN4OV4dnTbRTyYuf_qvUy9sX93r
 warp_beacon/scraper/youtube/music.py,sha256=8TguqXc1BC9Slp09BzCU8dtQ6BnyKwzZSLLFHpqDHtg,1498
 warp_beacon/scraper/youtube/shorts.py,sha256=pHfvEBau8Zp7Ar3LBuPmjqYq8fmjJUQvzeZXujQMpG4,1203
 warp_beacon/scraper/youtube/youtube.py,sha256=K98n2TSJaDZt-xT7mADZL1UEf2exIYm0Wnenn2GAYfI,2250
-warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
+warp_beacon/storage/__init__.py,sha256=m86MDXBMtZZsTPLI2cD-pM5Xkh2g2NYVvp_dtW8eH0Q,3548
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=pvgoAchBq9ZRGkaXAO0PyDSb-NV_5_2rGQhEm0LuQdw,15182
-warp_beacon/telegram/handlers.py,sha256=LWDdJBLuB-ImemPtzldgm9UY42T2mr0yJsHHQZDmQkI,6759
-warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
+warp_beacon/telegram/bot.py,sha256=EOfqhAZN_LDgjJrJCgIKzU1F6rd1t6dHYGmspu0OWas,15387
+warp_beacon/telegram/handlers.py,sha256=xSNG_v4D4FaA5q1_5wXvJkjcDUhy5GaQnfpijJZpnPk,7039
+warp_beacon/telegram/placeholder_message.py,sha256=32U-R_IMPRJd-S5UwlpemLkArJOxCmO7whcynduSbMA,6418
 warp_beacon/telegram/utils.py,sha256=CeWXMwyzv2l4Af6I-wW2ySU490c-5k82sBhkjabv0n4,2452
 warp_beacon/uploader/__init__.py,sha256=rsUkzzmtaeQY-kNkcIiPsrayS9idFKY3hBC71mR19XE,4743
-warp_beacon-2.2.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.8.dist-info/METADATA,sha256=ThDj6dK54k68nfDR8Nv_LKbzTGUdQtLnOvhjpge_jYI,21250
-warp_beacon-2.2.8.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-warp_beacon-2.2.8.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.8.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.8.dist-info/RECORD,,
+warp_beacon-2.2.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.10.dist-info/METADATA,sha256=2xTkO37CWBcbnPRdMdKERDv8hqSSZvJX6ot4R_poCUM,21251
+warp_beacon-2.2.10.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+warp_beacon-2.2.10.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.10.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.10.dist-info/RECORD,,