sticker-convert 2.12.4__py3-none-any.whl → 2.13.1.0__py3-none-any.whl

sticker_convert/cli.py

@@ -232,6 +232,7 @@ class CLI:
             "telegram": args.download_telegram,
             "telegram_telethon": args.download_telegram_telethon,
             "kakao": args.download_kakao,
+            "band": args.download_band,
             "viber": args.download_viber,
             "discord": args.download_discord,
             "discord_emoji": args.download_discord_emoji,
@@ -550,6 +551,8 @@ class CLI:
                 opt_cred.telethon_api_hash = telethon_api_hash
 
                 self.cb.msg("Telethon setup successful")
+            else:
+                self.cb.msg("Telethon setup failed")
 
         if args.line_get_auth:
             get_line_auth = GetLineAuth()

sticker_convert/converter.py

@@ -19,6 +19,7 @@ from sticker_convert.utils.chrome_remotedebug import CRD
 from sticker_convert.utils.files.cache_store import CacheStore
 from sticker_convert.utils.media.codec_info import CodecInfo, rounding
 from sticker_convert.utils.media.format_verify import FormatVerify
+from sticker_convert.utils.singletons import singletons
 
 if TYPE_CHECKING:
     from av.video.frame import VideoFrame
@@ -435,26 +436,30 @@ class StickerConvert:
         width = self.codec_info_orig.res[0]
         height = self.codec_info_orig.res[1]
 
-        chrome_path: Optional[str]
-        if self.opt_comp.chromium_path:
-            chrome_path = self.opt_comp.chromium_path
-        else:
-            chrome_path = CRD.get_chrome_path()
-        args = [
-            "--headless",
-            "--kiosk",
-            "--disable-extensions",
-            "--disable-infobars",
-            "--disable-gpu",
-            "--disable-gpu-rasterization",
-            "--hide-scrollbars",
-            f"--window-size={width + 200},{height + 200}",
-            "about:blank",
-        ]
-        if chrome_path is None:
-            raise RuntimeError("[F] Chrome/Chromium required for importing svg")
-        self.cb.put("[W] Importing SVG takes long time")
-
+        if singletons.objs.get("crd") is None:
+            chrome_path: Optional[str]
+            if self.opt_comp.chromium_path:
+                chrome_path = self.opt_comp.chromium_path
+            else:
+                chrome_path = CRD.get_chromium_path()
+            args = [
+                "--headless",
+                "--kiosk",
+                "--disable-extensions",
+                "--disable-infobars",
+                "--disable-gpu",
+                "--disable-gpu-rasterization",
+                "--hide-scrollbars",
+                "--force-device-scale-factor=1",
+                "about:blank",
+            ]
+            if chrome_path is None:
+                raise RuntimeError("[F] Chrome/Chromium required for importing svg")
+            self.cb.put("[W] Importing SVG takes long time")
+            singletons.objs["crd"] = CRD(chrome_path, args=args)
+            singletons.objs["crd"].connect(-1)  # type: ignore
+
+        crd = cast(CRD, singletons.objs["crd"])
         if isinstance(self.in_f, bytes):
             svg = self.in_f.decode()
         else:
@@ -469,39 +474,35 @@ class StickerConvert:
             svg_tag["height"] = height
         svg = str(soup)
 
-        crd = None
-        try:
-            crd = CRD(chrome_path, args=args)
-            crd.connect(-1)
-            crd.open_html_str(svg)
-            crd.set_transparent_bg()
-            crd.exec_js('svg = document.getElementsByTagName("svg")[0]')
-            x = json.loads(crd.exec_js("svg.getBoundingClientRect().x"))["result"][
-                "result"
-            ]["value"]
-            y = json.loads(crd.exec_js("svg.getBoundingClientRect().y"))["result"][
-                "result"
-            ]["value"]
-            clip = {"x": x, "y": y, "width": width, "height": height, "scale": 1}
-
-            if self.codec_info_orig.fps > 0:
-                crd.exec_js("svg.pauseAnimations()")
-                for i in range(self.codec_info_orig.frames):
-                    curr_time = (
-                        i
-                        / self.codec_info_orig.frames
-                        * self.codec_info_orig.duration
-                        / 1000
-                    )
-                    crd.exec_js(f"svg.setCurrentTime({curr_time})")
-                    self.frames_raw.append(
-                        np.asarray(crd.screenshot(clip).convert("RGBA"))
-                    )
-            else:
-                self.frames_raw.append(np.asarray(crd.screenshot(clip).convert("RGBA")))
-        finally:
-            if crd is not None:
-                crd.close()
+        crd.open_html_str(svg)
+        crd.set_transparent_bg()
+        init_js = 'svg = document.getElementsByTagName("svg")[0];'
+        if self.codec_info_orig.fps > 0:
+            init_js += "svg.pauseAnimations();"
+        init_js += "JSON.stringify(svg.getBoundingClientRect());"
+        bound = json.loads(
+            json.loads(crd.exec_js(init_js))["result"]["result"]["value"]
+        )
+        clip = {
+            "x": bound["x"],
+            "y": bound["y"],
+            "width": width,
+            "height": height,
+            "scale": 1,
+        }
+
+        if self.codec_info_orig.fps > 0:
+            for i in range(self.codec_info_orig.frames):
+                curr_time = (
+                    i
+                    / self.codec_info_orig.frames
+                    * self.codec_info_orig.duration
+                    / 1000
+                )
+                crd.exec_js(f"svg.setCurrentTime({curr_time})")
+                self.frames_raw.append(np.asarray(crd.screenshot(clip)))
+        else:
+            self.frames_raw.append(np.asarray(crd.screenshot(clip)))
 
     def _frames_import_pillow(self) -> None:
         with Image.open(self.in_f) as im:
@@ -563,7 +564,7 @@ class StickerConvert:
             container = cast(InputContainer, container)
             context = container.streams.video[0].codec_context
             if context.name == "vp8":
-                context = cast(VideoCodecContext, CodecContext.create("libvpx", "r"))
+                context = CodecContext.create("libvpx", "r")
             elif context.name == "vp9":
                 context = cast(
                     VideoCodecContext, CodecContext.create("libvpx-vp9", "r")
@@ -596,7 +597,12 @@ class StickerConvert:
                     else:
                         frame_resized = frame
 
-                    if frame_resized.format.name == "yuv420p":
+                    # yuva420p may cause crash for pyav < 14
+                    # Not safe to directly call frame.to_ndarray(format="rgba")
+                    # https://github.com/PyAV-Org/PyAV/discussions/1510
+                    if int(av.__version__.split(".")[0]) >= 14:
+                        rgba_array = frame_resized.to_ndarray(format="rgba")
+                    elif frame_resized.format.name == "yuv420p":
                         rgb_array = frame_resized.to_ndarray(format="rgb24")
                         rgba_array = np.dstack(
                             (
@@ -608,9 +614,6 @@ class StickerConvert:
                             )
                         )
                     else:
-                        # yuva420p may cause crash
-                        # Not safe to directly call frame.to_ndarray(format="rgba")
-                        # https://github.com/laggykiller/sticker-convert/issues/114
                         frame_resized = frame_resized.reformat(
                             format="yuva420p",
                             dst_colorspace=1,

sticker_convert/downloaders/download_band.py

@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import json
+import zipfile
+from io import BytesIO
+from pathlib import Path
+from typing import Any, Dict, Optional, Tuple
+from urllib.parse import urlparse
+
+import requests
+
+from sticker_convert.downloaders.download_base import DownloadBase
+from sticker_convert.job_option import CredOption, InputOption
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.files.metadata_handler import MetadataHandler
+
+
+class DownloadBand(DownloadBase):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+    def decompress(self, zip_file: bytes) -> int:
+        with zipfile.ZipFile(BytesIO(zip_file)) as zf:
+            self.cb.put("Unzipping...")
+
+            zf_files = zf.namelist()
+            animated = [i for i in zf_files if "animation/" in i]
+            if len(animated) > 0:
+                pack_files = animated
+            else:
+                pack_files = [
+                    i
+                    for i in zf_files
+                    if i.endswith(".meta") is False and "_key" not in i
+                ]
+
+            self.cb.put(
+                (
+                    "bar",
+                    None,
+                    {"set_progress_mode": "determinate", "steps": len(pack_files)},
+                )
+            )
+
+            for num, sticker in enumerate(pack_files):
+                data = zf.read(sticker)
+                self.cb.put(f"Read {sticker}")
+                ext = sticker.split(".")[-1]
+
+                out_path = Path(self.out_dir, str(num).zfill(3) + f".{ext}")
+                with open(out_path, "wb") as f:
+                    f.write(data)
+
+                self.cb.put("update_bar")
+
+        return len(pack_files)
+
+    def get_metadata(self, pack_no: str) -> Optional[Dict[Any, Any]]:
+        r = requests.get(
+            f"https://sapi.band.us/v1.0.0/get_sticker_info?pack_no={pack_no}"
+        )
+        if r.text:
+            return json.loads(r.text)
+        else:
+            return None
+
+    def download_stickers_band(self) -> Tuple[int, int]:
+        if urlparse(self.url).netloc != "www.band.us" and self.url.isnumeric() is False:
+            self.cb.put("Download failed: Unsupported URL format")
+            return 0, 0
+
+        if self.url.isnumeric():
+            pack_no = self.url
+        else:
+            pack_no = urlparse(self.url).path.split("/")[-1]
+        metadata = self.get_metadata(pack_no)
+        if metadata:
+            self.title = metadata["result_data"]["sticker"]["name"]
+        else:
+            self.cb.put("Download failed: Failed to get metadata")
+            return 0, 0
+
+        MetadataHandler.set_metadata(self.out_dir, title=self.title)
+
+        pack_url = f"http://s.cmstatic.net/band/sticker/v2/{pack_no}/shop/pack"
+        zip_file = self.download_file(pack_url)
+
+        if zip_file:
+            self.cb.put(f"Downloaded {pack_url}")
+        else:
+            self.cb.put(f"Cannot download {pack_url}")
+            return 0, 0
+
+        pack_files_no = self.decompress(zip_file)
+
+        cover_url = f"http://s.cmstatic.net/band/sticker/v2/{pack_no}/shop/main"
+        self.download_file(cover_url, self.out_dir / "cover.png")
+
+        return pack_files_no, pack_files_no
+
+    @staticmethod
+    def start(
+        opt_input: InputOption,
+        opt_cred: Optional[CredOption],
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> Tuple[int, int]:
+        downloader = DownloadBand(opt_input, opt_cred, cb, cb_return)
+        return downloader.download_stickers_band()

sticker_convert/downloaders/download_kakao.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import itertools
 import json
 from pathlib import Path
-from typing import Any, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
@@ -17,6 +17,13 @@ from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
 
 
 class MetadataKakao:
+    @staticmethod
+    def share_link_to_public_link(share_link: str) -> str:
+        # Share link redirect to preview link if use desktop headers
+        headers_desktop = {"User-Agent": "Chrome"}
+        r = requests.get(share_link, headers=headers_desktop, allow_redirects=True)
+        return r.url
+
     @staticmethod
     def get_item_code_from_hash(hash: str, auth_token: str) -> Optional[str]:
         headers = {
@@ -40,12 +47,14 @@ class MetadataKakao:
         return item_code
 
     @staticmethod
-    def get_item_code_from_title(title_ko: str, auth_token: str) -> Optional[str]:
+    def get_item_code_from_search(
+        pack_title: str, search_term: str, by_author: bool, auth_token: str
+    ) -> str:
         headers = {
             "Authorization": auth_token,
         }
 
-        data = {"query": title_ko}
+        data = {"query": search_term}
 
         response = requests.post(
             "https://talk-pilsner.kakao.com/emoticon/item_store/instant_search",
@@ -54,12 +63,53 @@ class MetadataKakao:
         )
 
         if response.status_code != 200:
-            return None
+            return "auth_error"
+
+        def check_pack_match(pack_info: Dict[str, Any]) -> bool:
+            share_link = pack_info["itemMetaInfo"]["shareData"]["linkUrl"]
+            public_url = MetadataKakao.share_link_to_public_link(share_link)
+            if pack_title == urlparse(public_url).path.split("/")[-1]:
+                return True
+            return False
 
         response_json = json.loads(response.text)
-        item_code = response_json["emoticons"][0]["item_code"]
+        for emoticon in response_json["emoticons"]:
+            item_code = emoticon["item_code"]
+            pack_info = MetadataKakao.get_pack_info_authed(item_code, auth_token)
+            if pack_info is None:
+                continue
+            if check_pack_match(pack_info):
+                return item_code
+            if by_author:
+                cid = pack_info["itemMetaInfo"]["itemMetaData"]["cid"]
+                for item_code in MetadataKakao.get_items_by_creator(cid, auth_token):
+                    pack_info = MetadataKakao.get_pack_info_authed(
+                        item_code, auth_token
+                    )
+                    if pack_info is None:
+                        continue
+                    if check_pack_match(pack_info):
+                        return item_code
 
-        return item_code
+        return "code_not_found"
+
+    @staticmethod
+    def get_items_by_creator(cid: str, auth_token: str) -> List[str]:
+        headers = {"Authorization": auth_token}
+
+        params = {
+            "itemSort": "NEW",
+            "offset": "0",
+            "size": "30",
+        }
+
+        response = requests.get(
+            f"https://talk-pilsner.kakao.com/emoticon/api/store/v3/creators/{cid}",
+            headers=headers,
+            params=params,
+        )
+
+        return [i["item_id"] for i in json.loads(response.text)["items"]]
 
     @staticmethod
     def get_pack_info_unauthed(
@@ -119,13 +169,8 @@ class DownloadKakao(DownloadBase):
                 hash = urlparse(self.url).path.split("/")[-1]
                 item_code = MetadataKakao.get_item_code_from_hash(hash, self.auth_token)
 
-            # Share link redirect to preview link if use desktop headers
-            # This allows us to find pack author
-            headers_desktop = {"User-Agent": "Chrome"}
-
-            r = requests.get(self.url, headers=headers_desktop, allow_redirects=True)
-
-            self.pack_title = urlparse(r.url).path.split("/")[-1]
+            public_url = MetadataKakao.share_link_to_public_link(self.url)
+            self.pack_title = urlparse(public_url).path.split("/")[-1]
             pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(self.pack_title)
             if pack_info_unauthed is None:
                 self.cb.put(
@@ -184,14 +229,33 @@ class DownloadKakao(DownloadBase):
             thumbnail_urls = self.pack_info_unauthed["result"]["thumbnailUrls"]
 
             if self.auth_token:
-                item_code = MetadataKakao.get_item_code_from_title(
-                    title_ko, self.auth_token
+                item_code = MetadataKakao.get_item_code_from_search(
+                    self.pack_title, title_ko, False, self.auth_token
                 )
-                if item_code:
+                if item_code == "auth_error":
+                    msg = "Warning: Cannot get item code.\n"
+                    msg += "Is auth_token invalid / expired? Try to regenerate it.\n"
+                    msg += "Continue to download static stickers instead?"
+                elif item_code == "code_not_found":
+                    self.cb.put(
+                        "Cannot get item code, trying to search by author name, this may take long time..."
+                    )
+                    self.cb.put(
+                        "Hint: Use share link instead to download more reliably"
+                    )
+                    if self.author is not None:
+                        item_code = MetadataKakao.get_item_code_from_search(
+                            self.pack_title, self.author, True, self.auth_token
+                        )
+                    if item_code == "code_not_found":
+                        msg = "Warning: Cannot get item code.\n"
+                        msg += "Please use share link instead.\n"
+                        msg += "Continue to download static stickers instead?"
+                    else:
+                        return self.download_animated(item_code)
+                else:
                     return self.download_animated(item_code)
-                msg = "Warning: Cannot get item code.\n"
-                msg += "Is auth_token invalid / expired? Try to regenerate it.\n"
-                msg += "Continue to download static stickers instead?"
+
                 self.cb.put(("ask_bool", (msg,), None))
                 if self.cb_return:
                     response = self.cb_return.get_response()
@@ -249,9 +313,7 @@ class DownloadKakao(DownloadBase):
             if not self.pack_info_unauthed:
                 public_url = None
                 if urlparse(self.url).netloc == "emoticon.kakao.com":
-                    r = requests.get(self.url)
-                    # Share url would redirect to public url without headers
-                    public_url = r.url
+                    public_url = MetadataKakao.share_link_to_public_link(self.url)
                 elif urlparse(self.url).netloc == "e.kakao.com":
                     public_url = self.url
                 if public_url:

sticker_convert/downloaders/download_line.py

@@ -77,7 +77,7 @@ class MetadataLine:
     @staticmethod
     def get_metadata_sticon(
         pack_id: str, region: str
-    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool]]:
+    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool, bool]]:
         pack_meta_r = requests.get(
             f"https://stickershop.line-scdn.net/sticonshop/v1/{pack_id}/sticon/iphone/meta.json"
         )
@@ -114,14 +114,15 @@ class MetadataLine:
         files = pack_meta["orders"]
 
         resource_type = pack_meta.get("sticonResourceType")
+        has_animation = True if resource_type == "ANIMATION" else False
         has_sound = False
 
-        return title, author, files, resource_type, has_sound
+        return title, author, files, resource_type, has_animation, has_sound
 
     @staticmethod
     def get_metadata_stickers(
         pack_id: str, region: str
-    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool]]:
+    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool, bool]]:
         pack_meta_r = requests.get(
             f"https://stickershop.line-scdn.net/stickershop/v1/product/{pack_id}/android/productInfo.meta"
         )
@@ -153,9 +154,10 @@ class MetadataLine:
         files = pack_meta["stickers"]
 
         resource_type = pack_meta.get("stickerResourceType")
+        has_animation = pack_meta.get("hasAnimation")
         has_sound = pack_meta.get("hasSound")
 
-        return title, author, files, resource_type, has_sound
+        return title, author, files, resource_type, has_animation, has_sound
 
 
 class DownloadLine(DownloadBase):
@@ -207,6 +209,7 @@ class DownloadLine(DownloadBase):
             if (
                 self.resource_type in ("ANIMATION", "ANIMATION_SOUND", "POPUP")
                 or self.has_sound is True
+                or self.has_animation is True
             ):
                 pack_url = f"https://stickershop.line-scdn.net/stickershop/v1/product/{self.pack_id}/iphone/stickerpack@2x.zip"
             elif self.resource_type == "PER_STICKER_TEXT":
@@ -419,6 +422,7 @@ class DownloadLine(DownloadBase):
                 self.author,
                 self.pack_files,
                 self.resource_type,
+                self.has_animation,
                 self.has_sound,
             ) = metadata
         else:

sticker_convert/gui.py

@@ -714,9 +714,9 @@ class GUI(Window):
             set_progress_mode, steps, update_bar, *args, **kwargs
         )
 
-    def highlight_fields(self):
+    def highlight_fields(self) -> bool:
         if not self.init_done:
-            return
+            return True
 
         input_option = self.get_input_name()
         input_option_display = self.get_input_display_name()
@@ -762,7 +762,8 @@ class GUI(Window):
                 download_option is None
                 or input_option.startswith(download_option) is False
                 and not (
-                    input_option in ("kakao", "line", "discord", "discord_emoji")
+                    input_option
+                    in ("kakao", "band", "line", "discord", "discord_emoji")
                     and url.isnumeric()
                 )
             ):
@@ -866,3 +867,5 @@ class GUI(Window):
         else:
             self.comp_frame.comp_preset_opt.config(bootstyle="secondary")  # type: ignore
             self.output_frame.output_option_opt.config(bootstyle="secondary")  # type: ignore
+
+        return True

sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -609,7 +609,7 @@ class AdvancedCompressionWindow(BaseWindow):
         )[1]
         if color:
             self.gui.bg_color_var.set(color.replace("#", "") + "00")
-        self.lift()
+        self.lift()  # type: ignore
         self.attributes("-topmost", True)  # type: ignore
         self.attributes("-topmost", False)  # type: ignore
 

sticker_convert/gui_components/windows/discord_get_auth_window.py

@@ -11,7 +11,7 @@ from sticker_convert.utils.auth.get_discord_auth import GetDiscordAuth
 
 
 class DiscordGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super(DiscordGetAuthWindow, self).__init__(*args, **kwargs)
 
         self.title("Get Discord token")
@@ -64,10 +64,10 @@ class DiscordGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_login(self):
+    def cb_login(self) -> None:
         Thread(target=self.cb_login_thread, daemon=True).start()
 
-    def cb_login_thread(self, *args: Any):
+    def cb_login_thread(self, *args: Any) -> None:
         m = GetDiscordAuth(cb_msg=self.gui.cb_msg)
         discord_token, msg = m.get_cred()
         if discord_token:

sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import platform
 from functools import partial
 from threading import Thread
 from typing import Any, Optional
@@ -51,6 +52,20 @@ class KakaoGetAuthWindow(BaseWindow):
             justify="left",
             anchor="w",
         )
+        if platform.system() != "Darwin":
+            self.explanation1_4_lbl = Label(
+                self.frame_from_desktop,
+                text="Note: This will download ProcDump and read memory of KakaoTalk Desktop",
+                justify="left",
+                anchor="w",
+            )
+        else:
+            self.explanation1_4_lbl = Label(
+                self.frame_from_desktop,
+                text="Note: This will read memory of KakaoTalk Desktop",
+                justify="left",
+                anchor="w",
+            )
         self.kakao_bin_path_lbl = Label(
             self.frame_from_desktop,
             text="Kakao app path (Optional):",
@@ -85,10 +100,13 @@ class KakaoGetAuthWindow(BaseWindow):
         self.explanation1_3_lbl.grid(
             column=0, row=2, columnspan=2, sticky="w", padx=3, pady=3
         )
-        self.kakao_bin_path_lbl.grid(column=0, row=3, sticky="w", padx=3, pady=3)
-        self.kakao_bin_path_entry.grid(column=1, row=3, sticky="w", padx=3, pady=3)
-        self.launch_desktop_btn.grid(column=0, row=4, columnspan=2, padx=3, pady=3)
-        self.get_auth_desktop_btn.grid(column=0, row=5, columnspan=2, padx=3, pady=3)
+        self.explanation1_4_lbl.grid(
+            column=0, row=3, columnspan=2, sticky="w", padx=3, pady=3
+        )
+        self.kakao_bin_path_lbl.grid(column=0, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_bin_path_entry.grid(column=1, row=4, sticky="w", padx=3, pady=3)
+        self.launch_desktop_btn.grid(column=0, row=5, columnspan=2, padx=3, pady=3)
+        self.get_auth_desktop_btn.grid(column=0, row=6, columnspan=2, padx=3, pady=3)
 
         # Method 2 frame
         self.explanation2_1_lbl = Label(
@@ -277,6 +295,8 @@ class KakaoGetAuthWindow(BaseWindow):
 
     def cb_from_desktop_thread(self, *_: Any) -> None:
         self.gui.save_creds()
+        self.gui.cb_msg("Getting auth_token, this may take a minute...")
+        self.gui.cb_bar("indeterminate")
         m = GetKakaoDesktopAuth(
             cb_ask_str=self.cb_ask_str_kakao,
         )
@@ -298,3 +318,4 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.highlight_fields()
 
         self.cb_msg_block_kakao(msg)
+        self.gui.cb_bar("clear")

sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -11,7 +11,7 @@ from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
 
 
 class SignalGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super(SignalGetAuthWindow, self).__init__(*args, **kwargs)
 
         self.title("Get Signal uuid and password")
@@ -64,10 +64,10 @@ class SignalGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_login(self):
+    def cb_login(self) -> None:
         Thread(target=self.cb_login_thread, daemon=True).start()
 
-    def cb_login_thread(self, *args: Any):
+    def cb_login_thread(self, *args: Any) -> None:
         m = GetSignalAuth(cb_msg=self.gui.cb_msg, cb_ask_str=self.cb_ask_str_signal)
 
         uuid, password = m.get_cred()