sticker-convert 2.12.0__py3-none-any.whl → 2.12.2__py3-none-any.whl

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/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/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/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/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/version.py

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

{sticker_convert-2.12.0.dist-info → sticker_convert-2.12.2.dist-info}/METADATA

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

@@ -6,11 +6,11 @@ sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWH
 sticker_convert/gui.py,sha256=D9L-lFif4P4MANglis_wpjkzlUuGPuq8AybWGyPVP8E,33824
 sticker_convert/job.py,sha256=gEd6yF8WPUR1_7q9SVhnwdD5usrDxwowNnR5q9uS8Yc,28011
 sticker_convert/job_option.py,sha256=NysZtKVVG7EzRkLnVaeYJY0uNlYKFmjoststB1cvVrY,8020
-sticker_convert/version.py,sha256=5PwAcytiNCTA-jXWUYxsOwxsKuNWAlGiQx6_QL36xdI,47
+sticker_convert/version.py,sha256=Ny2Dh7an9BvfE99fybKX4G10b6DDlm3tYiK2_Jm2E2A,47
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
 sticker_convert/downloaders/download_discord.py,sha256=6AFpLAYL2hRvVcsqUtzDUC31U66U02ZcnKXDnZRi2jk,3496
-sticker_convert/downloaders/download_kakao.py,sha256=kcWwyid76Db7QR8MqhHJuYONnIY9zOHRUBcNcae1VYI,12465
+sticker_convert/downloaders/download_kakao.py,sha256=-k9uTo_vn5CUjb0XPCKPmtYfftwhUntpyO2kZpeu9Mc,12472
 sticker_convert/downloaders/download_line.py,sha256=c-hTzEarGQP0b-pnPl29NuSKcaZWUeRo_94YpJzz72M,17911
 sticker_convert/downloaders/download_signal.py,sha256=3wv-BLd4qggly4AdtwV8f3vUpCVZ-8GnoPLoWngY3Pk,3728
 sticker_convert/downloaders/download_telegram.py,sha256=iGmOcVjU2Ai19t1lyDY2JhQIc--O5XMyNCGXZAA4DVY,2028
@@ -82,10 +82,10 @@ sticker_convert/uploaders/compress_wastickers.py,sha256=Rgl3WzIDJn7oa00nNqeBFDqI
 sticker_convert/uploaders/upload_base.py,sha256=uQupPn6r4zrlAzpKzzX7CgvZb69ATyrwPKahWOQj0ds,1203
 sticker_convert/uploaders/upload_signal.py,sha256=k9XS6oU0gYCXEph-LzWvUP3IDINAVaQzzzNgDRp_YNM,7443
 sticker_convert/uploaders/upload_telegram.py,sha256=WlUyLJlW83XZz6RhA76jHMXA6TNUIEVbPwhi14RTnds,12482
-sticker_convert/uploaders/upload_viber.py,sha256=E5gXxPF22TyfSyOEe1uxnbonCMgH8ma3WTm0ecJ3yxE,6444
+sticker_convert/uploaders/upload_viber.py,sha256=_vOK0UgP7V7ZeFG6pR3sVf3A744Q6J19qzO-2hDvt5w,6583
 sticker_convert/uploaders/xcode_imessage.py,sha256=iTTT8gDYOTNkKqXeSWUBuWfxu7xeE418t2Z1YQFR5L0,11365
 sticker_convert/utils/callback.py,sha256=spYUGlklOs1yPZAxoqwOWgR1sdimpfM8a27if3TaVYk,6155
-sticker_convert/utils/chrome_remotedebug.py,sha256=jxqH2LktA9UVJW055QeHecVRkc8Hl7KlUcxi_srhDXk,7143
+sticker_convert/utils/chrome_remotedebug.py,sha256=9xdzAbIjs5n5kEOEfOSHCStQit7ABUFuSeJrzOyL9z8,7058
 sticker_convert/utils/emoji.py,sha256=AqB26JY-PkYzNwPLReSnqLiQKe-bR9UXnLclAbgubJ8,367
 sticker_convert/utils/process.py,sha256=EAQZ9WpiKmkvToIv8G1HNY4V7m0jXyyePTmeP2XOZzE,4688
 sticker_convert/utils/url_detect.py,sha256=vCbhQbcW1X_UtdfQlICGY8pMX34KQ6sCtDJZbp0NrSg,876
@@ -95,8 +95,8 @@ sticker_convert/utils/auth/get_kakao_desktop_auth.py,sha256=BBfFI08cVOmi6akenQwM
 sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
 sticker_convert/utils/auth/get_signal_auth.py,sha256=oDTcIUcRM8_zfmR6UoBvzBhIscwLRe7n2zw4aw0j8_Q,4564
 sticker_convert/utils/auth/get_viber_auth.py,sha256=mUTrcxq5bTrzSXEVaeTPqVQIdZdwvIhrbMgBUb7dU30,8173
-sticker_convert/utils/auth/telegram_api.py,sha256=WQi3dat8IZy13nXfyDS25XTS3HKp5BhVzgHimgbPnmw,24169
-sticker_convert/utils/auth/telethon_setup.py,sha256=3hH0KglsotFBxT3gwFjHiDuREyahFIlmx-ZL1_-zM2A,2714
+sticker_convert/utils/auth/telegram_api.py,sha256=Z0lV-WdzSK3LEdEs_tqpbrJlzZuLNiyMJGA1rh_UvLA,24232
+sticker_convert/utils/auth/telethon_setup.py,sha256=QW0RAP3KwnxK9ZHmCo_iGqc1NiskOzsGa1kcmPT9PsQ,2972
 sticker_convert/utils/files/cache_store.py,sha256=etfe614OAhAyrnM5fGeESKq6R88YLNqkqkxSzEmZ0V0,1047
 sticker_convert/utils/files/json_manager.py,sha256=Vr6pZJdLMkrJJWN99210aduVHb0ILyf0SSTaw4TZqgc,541
 sticker_convert/utils/files/json_resources_loader.py,sha256=flZFixUXRTrOAhvRQpuSQgmJ69yXL94sxukcowLT1JQ,1049
@@ -107,9 +107,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=_F_iV3k2GYtb8vYZUSKrWl9E7XEW6LDywbnJ-DM6kbk,16476
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
-sticker_convert-2.12.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.12.0.dist-info/METADATA,sha256=KBvqYSm9HFUCkPrFOqZ3RDVKCI6916VpywSKT1JvwsE,53484
-sticker_convert-2.12.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-sticker_convert-2.12.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.12.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.12.0.dist-info/RECORD,,
+sticker_convert-2.12.2.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.12.2.dist-info/METADATA,sha256=iynMnOEyI6RFdcXwZjEzTD93-zMIiyThJXSHGtRkWz0,53484
+sticker_convert-2.12.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+sticker_convert-2.12.2.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.12.2.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.12.2.dist-info/RECORD,,