warp-beacon 2.0.2__py3-none-any.whl → 2.0.4__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.0.2"
+__version__ = "2.0.4"
 

warp_beacon/telegram/bot.py

@@ -307,7 +307,7 @@ class Bot(object):
 							sent_messages += messages
 							if job.media_collection:
 								for j, chunk in enumerate(media_chunk):
-									tg_file_id = Utils.eƒƒxtract_file_id(messages[j])
+									tg_file_id = Utils.extract_file_id(messages[j])
 									if tg_file_id:
 										job.media_collection[i][j].tg_file_id = tg_file_id
 							if i == 0 and job.placeholder_message_id:

warp_beacon/telegram/handlers.py

@@ -17,6 +17,7 @@ import logging
 class Handlers(object):
 	storage = None
 	bot = None
+	url_extractor = URLExtract()
 
 	def __init__(self, bot: "Bot") -> None:
 		self.bot = bot
@@ -55,10 +56,14 @@ class Handlers(object):
 		)
 
 	async def handler(self, client: Client, message: Message) -> None:
+		if message is None:
+			return
+		message_text = Utils.extract_message_text(message)
+		if not message_text:
+			return
 		chat = message.chat
 		effective_message_id = message.id
-		extractor = URLExtract()
-		urls = extractor.find_urls(message.text)
+		urls = self.url_extractor.find_urls(message_text)
 
 		reply_text = "Wut?"
 		if not urls:

warp_beacon/telegram/utils.py

@@ -71,3 +71,12 @@ class Utils(object):
 	@staticmethod
 	def chunker(seq: list, size: int) -> list:
 		return (seq[pos:pos + size] for pos in range(0, len(seq), size))
+
+	@staticmethod
+	def extract_message_text(message: "Message") -> str:
+		if hasattr(message, "text") and message.text:
+			return message.text
+		if hasattr(message, "caption") and message.caption:
+			return message.caption
+
+		return ''

{warp_beacon-2.0.2.dist-info → warp_beacon-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 2.0.2
+Version: 2.0.4
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -237,10 +237,17 @@ Requires-Dist: instagrapi ==2.0.0
 
 # warp_beacon [![Upload Python Package](https://github.com/sb0y/warp_beacon/actions/workflows/python-publish.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/python-publish.yml) [![Docker Image CI](https://github.com/sb0y/warp_beacon/actions/workflows/docker-image.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/docker-image.yml) [![Build DEB package](https://github.com/sb0y/warp_beacon/actions/workflows/build-deb.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/build-deb.yml)
 
-Telegram bot for external social networks media scrapling.
-Works with links in personal messages and also with group chats.
+Telegram bot for external social networks media links expanding.
+Works with a links in personal messages and also with group chats.
 
-Just send to bot media link and get video.
+Just send a media link to the chat with bot and get a video or audio reply.
+
+<img width="549" alt="image" src="https://github.com/user-attachments/assets/6d1cf0d8-4aa9-4852-90c9-6817974a7dd9">
+
+In order to setup your own instance, you will need:
+
+1. Obtain your own brand new `TG_TOKEN`. To do that, write to [@BotFather](https://t.me/BotFather).
+2. Obtain `TG_API_ID`, `TG_API_HASH`, `TG_BOT_NAME`. Learn more [here](https://core.telegram.org/api/obtaining_api_id).
 
 All bot configuration stored in [warp_beacon.conf](https://github.com/sb0y/warp_beacon/blob/main/etc/warp_beacon.conf) file.
 
@@ -248,6 +255,13 @@ All bot configuration stored in [warp_beacon.conf](https://github.com/sb0y/warp_
 
 ```env
 TG_TOKEN="you telegram token received from @BotFather"
+# these 3 settings should be obtained at https://my.telegram.org/apps
+# learn more: https://core.telegram.org/api/obtaining_api_id
+###
+TG_API_ID=""
+TG_API_HASH=""
+TG_BOT_NAME=""
+###
 INSTAGRAM_LOGIN="instagram login (email or cell phone)"
 INSTAGRAM_PASSWORD="instgram password"
 INSTAGRAM_VERIFICATION_CODE="instagram 2FA if required, default empty"
@@ -256,7 +270,13 @@ MONGODB_PORT="27017"
 MONGODB_USER="root"
 MONGODB_PASSWORD="changeme"
 VIDEO_STORAGE_DIR="/var/warp_beacon/videos"
-WORKERS_POOL_SIZE=3
+# workers settings
+# default: min(32, os.cpu_count() + 4)
+#TG_WORKERS_POOL_SIZE=3
+#UPLOAD_POOL_SIZE=3
+#WORKERS_POOL_SIZE=3
+ENABLE_DONATES=true
+DONATE_LINK="your donate link which will be shown if ENABLE_DONATES where set"
 ```
 ## Deployed example bot ##
 [Try it 🚀](https://t.me/anus_sebe_zablokiruy_bot)
@@ -355,3 +375,7 @@ build deb file
 ```bash
 dpkg-buildpackage -us -uc -b
 ```
+
+# Support Warp Beacon project
+
+[<img src="https://cdn.cryptocloud.plus/brand/cc-group-black.png" alt="CryptoCloud Accepted" width="250px">](https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E)

{warp_beacon-2.0.2.dist-info → warp_beacon-2.0.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ etc/warp_beacon/warp_beacon.conf,sha256=xihOuNBqVXGNdmMO14wwYNrqSQ4Z1wlAjp-xJk5S
 lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuwwPfa2mDLUA,372
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/__version__.py,sha256=XEXLtIQFYJucVx5iyUIJQDghcXS4pP7zm10F2Q_kYTE,23
+warp_beacon/__version__.py,sha256=xiJvazFqLHY3NrizxeBtVSpbJqQHaThFbXg5e2xEE48,23
 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
@@ -27,14 +27,14 @@ warp_beacon/scraper/youtube/shorts.py,sha256=co4lpNTnncIEScVB9htAT2Hy4fvx56z5xgD
 warp_beacon/scraper/youtube/youtube.py,sha256=xIrGe2ElPo3889_w5128xCnkdgwG1u6lA-QoachMUfc,1104
 warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=PVTXud908Q0f8q33ter6l372Z2EKGeOvk8BbQ9WIcYY,12066
-warp_beacon/telegram/handlers.py,sha256=U6wZdIvZnIugxy98JhgZV51Px_F0NcOXWBH5brGM0Sc,5778
+warp_beacon/telegram/bot.py,sha256=Jvude0RxL_-muB4uQtapeE2kNKxtWPdOuGgmBE7qSuA,12062
+warp_beacon/telegram/handlers.py,sha256=7-uaRuUgOPAE0fX-fSbn0N02Pv5uELnEIBFxHPj3tTs,5908
 warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
-warp_beacon/telegram/utils.py,sha256=3MNlRoYvdoiYU7uBWu4x10QynSW_rE6Ei4GDyZxwVFs,1793
+warp_beacon/telegram/utils.py,sha256=1tm_DH1F2snDxSqwZnKD4ijvTrobv_kscgt3w-bWa6g,2027
 warp_beacon/uploader/__init__.py,sha256=chX9oOrwO05O7DFmUfskTAnoKse66r3sY2s4NFF7bmM,4442
-warp_beacon-2.0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.0.2.dist-info/METADATA,sha256=y84HK_a9c_k3QluWxyEusbvdwhL0dYhnec6ZJuHseG0,18279
-warp_beacon-2.0.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-warp_beacon-2.0.2.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.0.2.dist-info/top_level.txt,sha256=pu6xG8OO_nCGllnOfAZ6QpVfivtmHVxPlYK8SZzUDqA,840
-warp_beacon-2.0.2.dist-info/RECORD,,
+warp_beacon-2.0.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.0.4.dist-info/METADATA,sha256=qLdBuZvEXCGX0a3ru-m965kk9rMxsQBFQg2N6RlZmBM,19287
+warp_beacon-2.0.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+warp_beacon-2.0.4.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.0.4.dist-info/top_level.txt,sha256=pu6xG8OO_nCGllnOfAZ6QpVfivtmHVxPlYK8SZzUDqA,840
+warp_beacon-2.0.4.dist-info/RECORD,,