sticker-convert 2.12.0__tar.gz → 2.12.2__tar.gz

{sticker_convert-2.12.0/src/sticker_convert.egg-info → sticker_convert-2.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.12.0
+Version: 2.12.2
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>

{sticker_convert-2.12.0 → sticker_convert-2.12.2}/src/sticker_convert/downloaders/download_kakao.py

@@ -146,7 +146,7 @@ class DownloadKakao(DownloadBase):
                         "Warning: auth_token invalid, cannot download animated sticker"
                     )
                 self.cb.put("Downloading static stickers...")
-                self.download_static(thumbnail_urls)
+                return self.download_static(thumbnail_urls)
             else:
                 return self.download_animated(item_code)
 

{sticker_convert-2.12.0 → sticker_convert-2.12.2}/src/sticker_convert/uploaders/upload_viber.py

@@ -25,13 +25,14 @@ class UploadViber(UploadBase):
         self.png_spec = copy.deepcopy(self.base_spec)
         self.png_spec.set_res_max(490)
         self.png_spec.set_format((".png",))
+        self.opt_comp_merged = copy.deepcopy(self.opt_comp)
+        self.opt_comp_merged.merge(self.png_spec)
 
         self.png_cover_spec = copy.deepcopy(self.base_spec)
         self.png_cover_spec.set_res_max(120)
-        self.png_spec.set_format((".png",))
-
-        self.opt_comp_merged = copy.deepcopy(self.opt_comp)
-        self.opt_comp_merged.merge(self.png_spec)
+        self.png_cover_spec.set_format((".png",))
+        self.opt_comp_cover_merged = copy.deepcopy(self.opt_comp)
+        self.opt_comp_cover_merged.merge(self.png_cover_spec)
 
     def upload_stickers_viber(self) -> Tuple[int, int, List[str]]:
         urls: List[str] = []
@@ -83,7 +84,7 @@ class UploadViber(UploadBase):
             _, _, cover_bytes, _ = StickerConvert.convert(  # type: ignore
                 cover_path,
                 Path("bytes.png"),
-                self.opt_comp_merged,
+                self.opt_comp_cover_merged,
                 self.cb,
                 self.cb_return,
             )

{sticker_convert-2.12.0 → sticker_convert-2.12.2}/src/sticker_convert/utils/auth/telegram_api.py

@@ -386,7 +386,10 @@ class TelethonAPI(TelegramAPI):
         if isinstance(msg, str):
             sent_message = await self.client.send_message("Stickers", msg)
         else:
-            sent_message = cast(Message, await self.client.send_file("Stickers", msg))  # type: ignore
+            sent_message = cast(
+                Message,
+                await self.client.send_file("Stickers", msg, force_document=True),
+            )  # type: ignore
 
         for _ in range(5):
             # https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
@@ -426,7 +429,7 @@ class TelethonAPI(TelegramAPI):
     ) -> Tuple[int, int]:
         stickers_ok = 0
         if self.is_emoji:
-            repl = await self._send_and_recv("/newemojipack")
+            repl = await self._send_and_recv("/newpack")
         elif stickers_list[0][3] == "static":
             repl = await self._send_and_recv("/newsticker")
         elif stickers_list[0][3] == "video":

{sticker_convert-2.12.0 → sticker_convert-2.12.2}/src/sticker_convert/utils/auth/telethon_setup.py

@@ -3,6 +3,7 @@ from typing import Callable, Tuple
 
 import anyio
 from telethon import TelegramClient  # type: ignore
+from telethon.errors import SessionPasswordNeededError  # type: ignore
 
 from sticker_convert.definitions import CONFIG_DIR
 from sticker_convert.job_option import CredOption
@@ -38,7 +39,11 @@ class TelethonSetup:
             phone_number = self.cb_ask_str("Enter phone number: ")
             await client.send_code_request(phone_number)
             code = self.cb_ask_str("Enter code: ")
-            await client.sign_in(phone_number, code)
+            try:
+                await client.sign_in(phone_number, code)
+            except SessionPasswordNeededError:
+                password = self.cb_ask_str("Enter password: ")
+                await client.sign_in(password=password)
             authed = await client.is_user_authorized()
 
         return (

{sticker_convert-2.12.0 → sticker_convert-2.12.2}/src/sticker_convert/utils/chrome_remotedebug.py

@@ -38,7 +38,6 @@ class CRD:
         self.port = port
 
         launch_cmd: List[str] = []
-        self.display = None
         if (
             platform.system() == "Linux"
             and os.environ.get("DISPLAY", False) is False
@@ -230,5 +229,3 @@ class CRD:
     def close(self):
         self.ws.close()
         self.chrome_proc.kill()
-        if self.display:
-            self.display.stop()

{sticker_convert-2.12.0 → sticker_convert-2.12.2}/src/sticker_convert/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "2.12.0"
+__version__ = "2.12.2"

{sticker_convert-2.12.0 → sticker_convert-2.12.2/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.12.0
+Version: 2.12.2
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>