warp-beacon 2.1.12__py3-none-any.whl → 2.2.0__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.1.12"
+__version__ = "2.2.0"
 

warp_beacon/jobs/abstract.py

@@ -65,7 +65,7 @@ class AbstractJob(ABC):
 	canonical_name: str = ""
 	is_message_to_admin: bool = False
 	message_text: str = ""
-	source_usename: str = ""
+	source_username: str = ""
 	unvailable_error_count: int = 0
 	geoblock_error_count: int = 0
 	account_switches: int = 0

warp_beacon/telegram/bot.py

@@ -149,9 +149,9 @@ class Bot(object):
 	def build_signature_caption(self, job: UploadJob) -> str:
 		caption = ""
 		if job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP):
-			if job.source_usename:
-				caption += f"Requested by **@{job.source_usename}**"
-			if job.source_usename and job.url:
+			if job.source_username:
+				caption += f"Requested by **@{job.source_username}**"
+			if job.source_username and job.url:
 				caption += " | "
 			if job.url:
 				caption += f"[Source link]({job.url})"

warp_beacon/telegram/handlers.py

@@ -39,7 +39,7 @@ class Handlers(object):
 				media_type=JobType[d["media_type"].upper()],
 				message_id=message.id,
 				chat_type=message.chat.type,
-				source_username=message.from_user
+				source_username=Utils.extract_message_author(message)
 			)
 		)
 
@@ -100,7 +100,7 @@ class Handlers(object):
 								media_type=JobType.COLLECTION,
 								chat_id=chat.id,
 								chat_type=message.chat.type,
-								source_username=message.from_user
+								source_username=Utils.extract_message_author(message)
 							)
 						)
 					elif ent_len:
@@ -113,7 +113,7 @@ class Handlers(object):
 								media_type=media_type,
 								chat_id=chat.id,
 								chat_type=message.chat.type,
-								source_username=message.from_user
+								source_username=Utils.extract_message_author(message)
 							)
 						)
 				else:
@@ -164,7 +164,7 @@ class Handlers(object):
 							in_process=self.bot.uploader.is_inprocess(uniq_id),
 							uniq_id=uniq_id,
 							job_origin=origin,
-							source_username=message.from_user,
+							source_username=Utils.extract_message_author(message),
 							chat_type=chat.type
 						))
 						self.bot.uploader.set_inprocess(uniq_id)

warp_beacon/telegram/utils.py

@@ -84,6 +84,11 @@ class Utils(object):
 	@staticmethod
 	def extract_message_author(message: Message) -> str:
 		if message.from_user:
-			return message.from_user
+			return message.from_user.username
+		if message.sender_chat:
+			if message.sender_chat.username:
+				return message.sender_chat.username
+			if message.sender_chat.title:
+				return message.sender_chat.title
 		return ''
 

warp_beacon/uploader/__init__.py

@@ -2,12 +2,11 @@ import os
 import threading
 import multiprocessing
 from warp_beacon.jobs.upload_job import UploadJob
-#import time
 import logging
 
 import asyncio
 
-from typing import Optional, Callable, Coroutine
+from typing import Callable
 
 from warp_beacon.storage import Storage
 from warp_beacon.jobs.types import JobType

{warp_beacon-2.1.12.dist-info → warp_beacon-2.2.0.dist-info}/METADATA

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

{warp_beacon-2.1.12.dist-info → warp_beacon-2.2.0.dist-info}/RECORD

@@ -3,12 +3,12 @@ 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=fvnVLCMKtvzONpqcFCrZo4HrUEtArCwJghjH2toLovk,24
+warp_beacon/__version__.py,sha256=WMCzR_QnD3JzFHSeOqgJDoy5dvPLvgg2SMbWaTYllMs,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
 warp_beacon/jobs/__init__.py,sha256=ED8_tPle4iL4kqNW0apAVkgNQtRRTnYfAJwBjO1g0JY,180
-warp_beacon/jobs/abstract.py,sha256=5jCkCTNVeoO55a-q2VmcY_94VMQfR1UPokK1tUDiQ4g,2849
+warp_beacon/jobs/abstract.py,sha256=6TKiVqVTNmAGIGO4YL4FsxEiaySp3vt9C_P1q1D3mDc,2850
 warp_beacon/jobs/download_job.py,sha256=5HiPcnJppFMhO14___3eSkoMygM3y-vhpGkMAuNhK7s,854
 warp_beacon/jobs/types.py,sha256=Ae8zINgbs7cOcYkYoOCOACA7duyhnIGMQAJ_SJB1QRQ,176
 warp_beacon/jobs/upload_job.py,sha256=_ul4psPej1jLEs-BMcMR80GbXDSmm38jE9yoZtecclY,741
@@ -32,14 +32,14 @@ warp_beacon/scraper/youtube/shorts.py,sha256=pHfvEBau8Zp7Ar3LBuPmjqYq8fmjJUQvzeZ
 warp_beacon/scraper/youtube/youtube.py,sha256=K98n2TSJaDZt-xT7mADZL1UEf2exIYm0Wnenn2GAYfI,2250
 warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=QTLNeOTMHOMs2W7mAY_ygVzxJu7N-IMBrBvPDHMLCCI,14789
-warp_beacon/telegram/handlers.py,sha256=8MeLgnhaucLc7ptsKV3NXecsGN7kItwrU5xIoJ1Eik8,6645
+warp_beacon/telegram/bot.py,sha256=lH_0oQCsJOLLAwQVzFAOiSW4wm7-UQrKZRDd-PzDfiU,14792
+warp_beacon/telegram/handlers.py,sha256=ccqUY7YbddDNbTxYVxpDPjLVJmcAL14yoaQ7xT9WBLU,6725
 warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
-warp_beacon/telegram/utils.py,sha256=LdCU4ChJHyzpCvyG5v3XcUtUgK3v5by_v8D56VsPeI0,2171
-warp_beacon/uploader/__init__.py,sha256=BQ5rli0soLf0FGqCpivVh9w6lyoGM10-ck2mUjnoOLU,4777
-warp_beacon-2.1.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.1.12.dist-info/METADATA,sha256=QoScSZBGQfB8owQeFNd2Q0XDlcOecc9Kzt-3-Ur34J8,21251
-warp_beacon-2.1.12.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-warp_beacon-2.1.12.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.1.12.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.1.12.dist-info/RECORD,,
+warp_beacon/telegram/utils.py,sha256=ikfwmuDvd0XtOuwP29tZPjAz7kwiGSSu_QR-vpv6pMY,2352
+warp_beacon/uploader/__init__.py,sha256=rsUkzzmtaeQY-kNkcIiPsrayS9idFKY3hBC71mR19XE,4743
+warp_beacon-2.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.0.dist-info/METADATA,sha256=LyrV1URH8gNbGV57ZTyyWGzuIC4UrrBvLzZR_a-AcVw,21250
+warp_beacon-2.2.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+warp_beacon-2.2.0.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.0.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.0.dist-info/RECORD,,