sticker-convert 2.9.3__py3-none-any.whl → 2.10.0__py3-none-any.whl

sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 from functools import partial
-from pathlib import Path
-from subprocess import Popen
-from tkinter import filedialog
+from threading import Thread
 from typing import Any
 
-from ttkbootstrap import Button, Entry, Frame, Label  # type: ignore
+from ttkbootstrap import Button, Frame, Label  # type: ignore
 
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.gui_components.windows.base_window import BaseWindow
@@ -13,8 +11,8 @@ from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
 
 
 class SignalGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any):
+        super(SignalGetAuthWindow, self).__init__(*args, **kwargs)
 
         self.title("Get Signal uuid and password")
 
@@ -22,79 +20,57 @@ class SignalGetAuthWindow(BaseWindow):
         self.cb_ask_str_signal = partial(self.gui.cb_ask_str, parent=self)
 
         self.frame_info = Frame(self.scrollable_frame)
-        self.frame_btns = Frame(self.scrollable_frame)
-        self.frame_config = Frame(self.scrollable_frame)
+        self.frame_start_btn = Frame(self.scrollable_frame)
 
         self.frame_info.grid(column=0, row=0, sticky="news", padx=3, pady=3)
-        self.frame_btns.grid(column=0, row=1, sticky="news", padx=3, pady=3)
-        self.frame_config.grid(column=0, row=2, sticky="news", padx=3, pady=3)
+        self.frame_start_btn.grid(column=0, row=1, sticky="news", padx=3, pady=3)
 
         # Info frame
-        self.explanation_lbl = Label(
+        self.explanation1_lbl = Label(
             self.frame_info,
-            text="Please install Signal Desktop and login first.",
+            text="Please install Signal Desktop",
             justify="left",
             anchor="w",
         )
-
-        self.explanation_lbl.grid(column=0, row=0, sticky="w", padx=3, pady=3)
-
-        # Start button frame
-        self.launch_btn = Button(
-            self.frame_btns,
-            text="Launch Signal Desktop",
-            command=self.cb_launch_signal,
-            bootstyle="secondary",  # type: ignore
-        )
-
-        self.get_cred_btn = Button(
-            self.frame_btns,
-            text="Get uuid and password",
-            command=self.cb_get_cred,
-            bootstyle="default",  # type: ignore
+        self.explanation2_lbl = Label(
+            self.frame_info,
+            text="After installation, you need to login to Signal Desktop",
+            justify="left",
+            anchor="w",
         )
-
-        self.launch_btn.pack()
-        self.get_cred_btn.pack()
-
-        # Config frame
-        self.setdir_lbl = Label(
-            self.frame_config,
-            text=self.gui.help["cred"]["signal_data_dir"],
+        self.explanation3_lbl = Label(
+            self.frame_info,
+            text="uuid and password will be automatically fetched",
             justify="left",
             anchor="w",
         )
 
-        self.setdir_entry = Entry(
-            self.frame_config,
-            textvariable=self.gui.signal_data_dir_var,
-            width=32,
+        self.explanation1_lbl.grid(
+            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
         )
-        self.setdir_btn = Button(
-            self.frame_config,
-            text="Choose",
-            command=self.cb_setdir,
-            width=8,
-            bootstyle="secondary",  # type: ignore
+        self.explanation2_lbl.grid(
+            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation3_lbl.grid(
+            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
         )
 
-        self.setdir_lbl.grid(column=0, row=0, columnspan=2, sticky="w", padx=3, pady=3)
-        self.setdir_entry.grid(column=0, row=1, sticky="w", padx=3, pady=3)
-        self.setdir_btn.grid(column=1, row=1, sticky="e", padx=3, pady=3)
+        # Start button frame
+        self.login_btn = Button(
+            self.frame_start_btn, text="Get uuid and password", command=self.cb_login
+        )
 
-        GUIUtils.finalize_window(self)
+        self.login_btn.pack()
 
-    def cb_get_cred(self) -> None:
-        m = GetSignalAuth()
+        GUIUtils.finalize_window(self)
 
-        signal_bin_path = None
-        signal_user_data_dir = None
-        if self.gui.signal_data_dir_var.get():
-            signal_bin_path = "(User specified)"
-            signal_user_data_dir = self.gui.signal_data_dir_var.get()
+    def cb_login(self):
+        Thread(target=self.cb_login_thread, daemon=True).start()
 
-        uuid, password, msg = m.get_cred(signal_bin_path, signal_user_data_dir)
+    def cb_login_thread(self, *args: Any):
+        m = GetSignalAuth(cb_msg=self.gui.cb_msg, cb_ask_str=self.cb_ask_str_signal)
 
+        uuid, password = m.get_cred()
         if uuid and password:
             if not self.gui.creds.get("signal"):
                 self.gui.creds["signal"] = {}
@@ -103,33 +79,11 @@ class SignalGetAuthWindow(BaseWindow):
             self.gui.signal_uuid_var.set(uuid)
             self.gui.signal_password_var.set(password)
 
+            self.cb_msg_block_signal(
+                f"Got uuid and password successfully:\nuuid={uuid}\npassword={password}"
+            )
             self.gui.save_creds()
             self.gui.highlight_fields()
+            return
 
-        self.cb_msg_block_signal(msg)
-
-    def cb_launch_signal(self) -> None:
-        m = GetSignalAuth()
-        signal_bin_path, signal_user_data_dir = m.get_signal_desktop()
-
-        if self.gui.signal_data_dir_var.get():
-            signal_user_data_dir = self.gui.signal_data_dir_var.get()
-
-        if signal_bin_path:
-            Popen(
-                [
-                    signal_bin_path,
-                    "--no-sandbox",
-                    f"--user-data-dir={signal_user_data_dir}",
-                ]
-            )
-        else:
-            self.cb_msg_block_signal("Error: Signal Desktop not installed.")
-
-    def cb_setdir(self) -> None:
-        orig_input_dir = self.gui.signal_data_dir_var.get()
-        if not Path(orig_input_dir).is_dir():
-            orig_input_dir = ""
-        input_dir = filedialog.askdirectory(initialdir=orig_input_dir)
-        if input_dir:
-            self.gui.signal_data_dir_var.set(input_dir)
+        self.cb_msg_block_signal("Failed to get uuid and password")

sticker_convert/job.py

@@ -12,6 +12,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
 from urllib.parse import urlparse
 
 from sticker_convert.converter import StickerConvert
+from sticker_convert.downloaders.download_discord import DownloadDiscord
 from sticker_convert.downloaders.download_kakao import DownloadKakao
 from sticker_convert.downloaders.download_line import DownloadLine
 from sticker_convert.downloaders.download_signal import DownloadSignal
@@ -295,6 +296,12 @@ class Job:
             )
             error_msg += save_to_local_tip
 
+        if (
+            self.opt_input.option.startswith("discord")
+            and not self.opt_cred.discord_token
+        ):
+            error_msg += "[X] Downloading from Discord requires token.\n"
+
         if self.opt_output.option == "telegram" and not self.opt_cred.telegram_userid:
             error_msg += "[X] Uploading to telegram requires user_id \n"
             error_msg += "    (From real account, not bot account).\n"
@@ -536,6 +543,9 @@ class Job:
         if self.opt_input.option == "viber":
             downloaders.append(DownloadViber.start)
 
+        if self.opt_input.option.startswith("discord"):
+            downloaders.append(DownloadDiscord.start)
+
         if len(downloaders) > 0:
             self.executor.cb("Downloading...")
         else:
@@ -547,7 +557,7 @@ class Job:
         for downloader in downloaders:
             self.executor.add_work(
                 work_func=downloader,
-                work_args=(self.opt_input.url, self.opt_input.dir, self.opt_cred),
+                work_args=(self.opt_input, self.opt_cred),
             )
 
         self.executor.join_workers()

sticker_convert/job_option.py

@@ -223,6 +223,7 @@ class CredOption(BaseOption):
     kakao_phone_number: str = ""
     line_cookies: str = ""
     viber_auth: str = ""
+    discord_token: str = ""
 
     def to_dict(self) -> Dict[Any, Any]:
         return {
@@ -237,4 +238,5 @@ class CredOption(BaseOption):
             },
             "line": {"cookies": self.line_cookies},
             "viber": {"auth": self.viber_auth},
+            "discord": {"token": self.discord_token},
         }

sticker_convert/resources/compression.json

@@ -375,6 +375,100 @@
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
+    "discord": {
+        "size_max": {
+            "img": 512000,
+            "vid": 512000
+        },
+        "format": {
+            "img": ".png",
+            "vid": ".png"
+        },
+        "fps": {
+            "min": 1,
+            "max": 60,
+            "power": -0.3
+        },
+        "res": {
+            "w": {
+                "min": 320,
+                "max": 320
+            },
+            "h": {
+                "min": 320,
+                "max": 320
+            },
+            "power": 1
+        },
+        "quality": {
+            "min": 10,
+            "max": 95,
+            "power": 5
+        },
+        "color": {
+            "min": 32,
+            "max": 257,
+            "power": 3
+        },
+        "duration": {
+            "min": 0,
+            "max": 5000
+        },
+        "padding_percent": 0,
+        "bg_color": "",
+        "steps": 16,
+        "fake_vid": false,
+        "scale_filter": "bicubic",
+        "quantize_method": "imagequant",
+        "default_emoji": "😀"
+    },
+    "discord_emoji": {
+        "size_max": {
+            "img": 256000,
+            "vid": 256000
+        },
+        "format": {
+            "img": ".png",
+            "vid": ".gif"
+        },
+        "fps": {
+            "min": 1,
+            "max": 60,
+            "power": -0.3
+        },
+        "res": {
+            "w": {
+                "min": 32,
+                "max": 128
+            },
+            "h": {
+                "min": 32,
+                "max": 128
+            },
+            "power": 1
+        },
+        "quality": {
+            "min": 10,
+            "max": 95,
+            "power": 5
+        },
+        "color": {
+            "min": 32,
+            "max": 257,
+            "power": 3
+        },
+        "duration": {
+            "min": 0,
+            "max": 5000
+        },
+        "padding_percent": 0,
+        "bg_color": "",
+        "steps": 16,
+        "fake_vid": false,
+        "scale_filter": "bicubic",
+        "quantize_method": "imagequant",
+        "default_emoji": "😀"
+    },
     "imessage_small": {
         "size_max": {
             "img": 500000,

sticker_convert/resources/help.json

@@ -58,7 +58,6 @@
         "signal_uuid": "Set Signal uuid. Required for uploading Signal stickers.",
         "signal_password": "Set Signal password. Required for uploading Signal stickers.",
         "signal_get_auth": "Generate Signal uuid and password.",
-        "signal_data_dir": "Optionally specify Signal data directory\nfor getting uuid and password. Useful for portable Signal.",
         "telegram_token": "Set Telegram token. Required for uploading and downloading Telegram stickers.",
         "telegram_userid": "Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.",
         "kakao_auth_token": "Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx",
@@ -72,6 +71,8 @@
         "viber_auth": "Set Viber authentication data.\nRequired for uploading Viber stickers.",
         "viber_get_auth": "Generate Viber authentication data.",
         "viber_bin_path": "Specify location of Viber Desktop application.\nUseful for portable installation.",
+        "discord_get_auth": "Get Discord token.",
+        "discord_token": "Set Discord token. Required for downloading Discord stickers and emojis.",
         "save_cred": "Save Signal and Telegram credentials."
     }
 }

sticker_convert/resources/input.json

@@ -59,6 +59,26 @@
             "author": false
         }
     },
+    "discord": {
+        "full_name": "Download from Discord",
+        "help": "Download discord stickers from a channel URL / ID as input",
+        "example": "Example: https://discord.com/channels/169256939211980800/@home\nOR 169256939211980800",
+        "address_lbls": "URL address / ID",
+        "metadata_provides": {
+            "title": true,
+            "author": true
+        }
+    },
+    "discord_emoji": {
+        "full_name": "Download from Discord (emoji)",
+        "help": "Download discord emojis from a channel URL / ID as input",
+        "example": "Example: https://discord.com/channels/169256939211980800/@home\nOR 169256939211980800",
+        "address_lbls": "URL address / ID",
+        "metadata_provides": {
+            "title": true,
+            "author": true
+        }
+    },
     "local": {
         "full_name": "From local directory",
         "help": "Load files from local directory on computer",

sticker_convert/uploaders/upload_signal.py

@@ -12,6 +12,7 @@ from sticker_convert.converter import StickerConvert
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
 from sticker_convert.uploaders.upload_base import UploadBase
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.emoji import extract_emojis
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 from sticker_convert.utils.media.format_verify import FormatVerify
@@ -55,12 +56,12 @@ class UploadSignal(UploadBase):
             sticker = Sticker()
             sticker.id = pack.nb_stickers
 
-            emoji = emoji_dict.get(Path(src).stem, None)
-            if not emoji:
+            emoji = extract_emojis(emoji_dict.get(Path(src).stem, ""))
+            if emoji == "":
                 self.cb.put(
-                    f"Warning: Cannot find emoji for file {Path(src).name}, skip uploading this file..."
+                    f"Warning: Cannot find emoji for file {Path(src).name}, using default emoji..."
                 )
-                continue
+                emoji = self.opt_comp.default_emoji
             sticker.emoji = emoji[:1]
 
             if Path(src).suffix == ".webp":

sticker_convert/uploaders/upload_telegram.py

@@ -13,6 +13,7 @@ from sticker_convert.converter import StickerConvert
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
 from sticker_convert.uploaders.upload_base import UploadBase
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.emoji import extract_emojis
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.format_verify import FormatVerify
 
@@ -158,18 +159,18 @@ class UploadTelegram(UploadBase):
             for count, src in enumerate(stickers):
                 self.cb.put(f"Verifying {src} for uploading to telegram")
 
-                emoji = emoji_dict.get(Path(src).stem, None)
-                if emoji:
-                    if len(emoji) > 20:
-                        self.cb.put(
-                            f"Warning: {len(emoji)} emoji for file {Path(src).name}, exceeding limit of 20, keep first 20 only..."
-                        )
-                    emoji_list = [*emoji][:20]
-                else:
+                emoji = extract_emojis(emoji_dict.get(Path(src).stem, ""))
+                if emoji == "":
+                    self.cb.put(
+                        f"Warning: Cannot find emoji for file {Path(src).name}, using default emoji..."
+                    )
+                    emoji_list = [self.opt_comp.default_emoji]
+
+                if len(emoji) > 20:
                     self.cb.put(
-                        f"Warning: Cannot find emoji for file {Path(src).name}, skip uploading this file..."
+                        f"Warning: {len(emoji)} emoji for file {Path(src).name}, exceeding limit of 20, keep first 20 only..."
                     )
-                    continue
+                emoji_list = [*emoji][:20]
 
                 ext = Path(src).suffix
                 if ext == ".tgs":

sticker_convert/utils/auth/get_discord_auth.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+import json
+import os
+import platform
+import shutil
+import time
+from typing import Callable, Optional, Tuple
+from urllib.parse import urlparse
+
+from sticker_convert.definitions import CONFIG_DIR
+from sticker_convert.utils.chrome_remotedebug import CRD
+from sticker_convert.utils.process import killall
+
+
+class GetDiscordAuth:
+    def __init__(self, cb_msg: Callable[..., None] = print):
+        chromedriver_download_dir = CONFIG_DIR / "bin"
+        os.makedirs(chromedriver_download_dir, exist_ok=True)
+
+        self.chromedriver_download_dir = chromedriver_download_dir
+
+        self.cb_msg = cb_msg
+
+    def get_discord_bin_path(self) -> Optional[str]:
+        discord_bin: Optional[str]
+        if platform.system() == "Windows":
+            discord_win_dirs: Tuple[Tuple[str, str], ...]
+            discord_win_dirs = (
+                (
+                    os.path.expandvars("%localappdata%/Discord"),
+                    "Discord.exe",
+                ),
+                (
+                    os.path.expandvars("%localappdata%/DiscordCanary"),
+                    "DiscordCanary.exe",
+                ),
+                (
+                    os.path.expandvars("%localappdata%/DiscordPTB"),
+                    "DiscordPTB.exe",
+                ),
+            )
+            for discord_dir, discord_bin in discord_win_dirs:
+                app_dir: Optional[str] = None
+                chrome_path: Optional[str] = None
+                for i in [j for j in os.listdir(discord_dir) if j.startswith("app-")]:
+                    app_dir = os.path.join(discord_dir, i)
+                    chrome_path = os.path.join(app_dir, discord_bin)
+                    if os.path.isfile(chrome_path):
+                        return chrome_path
+        else:
+            discord_dirs: Tuple[Optional[str], ...]
+            if platform.system() == "Darwin":
+                discord_dirs = (
+                    "/Applications/Discord.app/Contents/MacOS/Discord",
+                    "/Applications/Discord Canary.app/Contents/MacOS/Discord Canary",
+                    "/Applications/Discord PTB.app/Contents/MacOS/Discord PTB",
+                )
+            else:
+                discord_dirs = (
+                    shutil.which("discord"),
+                    shutil.which("discord-canary"),
+                    shutil.which("discord-ptb"),
+                )
+            for discord_bin in discord_dirs:
+                if discord_bin is not None and os.path.isfile(discord_bin):
+                    return discord_bin
+        return None
+
+    def get_cred(self) -> Tuple[Optional[str], str]:
+        using_discord_app = False
+        chrome_path = self.get_discord_bin_path()
+        if chrome_path is not None:
+            using_discord_app = True
+        else:
+            chrome_path = CRD.get_chrome_path()
+        if chrome_path is None:
+            return None, "Please install Discord Desktop or Chrome and try again"
+
+        token = None
+        if using_discord_app:
+            killall("discord")
+
+        crd = CRD(chrome_path)
+        while True:
+            crd.connect()
+            if using_discord_app is False:
+                crd.navigate("https://discord.com/channels/@me")
+                break
+            else:
+                curr_url = crd.get_curr_url()
+                netloc = urlparse(curr_url).netloc
+                if netloc in ("discordapp.com", "discord.com"):
+                    break
+                time.sleep(1)
+
+        while True:
+            try:
+                r = crd.exec_js(
+                    "(webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken();"
+                )
+            except RuntimeError:
+                break
+            if (
+                json.loads(r).get("result", {}).get("result", {}).get("type", "")
+                == "string"
+            ):
+                token = json.loads(r)["result"]["result"]["value"]
+                break
+            time.sleep(1)
+        crd.close()
+
+        if token is None:
+            return None, "Failed to get token"
+
+        return token, f"Got token successfully:\ntoken={token}"