warp-beacon 2.1.12__tar.gz → 2.1.13__tar.gz

{warp_beacon-2.1.12/warp_beacon.egg-info → warp_beacon-2.1.13}/PKG-INFO

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

warp_beacon-2.1.13/warp_beacon/__version__.py

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

{warp_beacon-2.1.12 → warp_beacon-2.1.13}/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-2.1.12 → warp_beacon-2.1.13}/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-2.1.12 → warp_beacon-2.1.13}/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-2.1.12 → warp_beacon-2.1.13}/warp_beacon/telegram/utils.py

@@ -85,5 +85,10 @@ class Utils(object):
 	def extract_message_author(message: Message) -> str:
 		if message.from_user:
 			return message.from_user
+		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-2.1.12 → warp_beacon-2.1.13}/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 → warp_beacon-2.1.13/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.1.12/warp_beacon/__version__.py

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