sticker-convert 2.13.3.0__py3-none-any.whl → 2.14.0.0__py3-none-any.whl

sticker_convert/cli.py

@@ -15,8 +15,9 @@ from sticker_convert.definitions import CONFIG_DIR, DEFAULT_DIR
 from sticker_convert.job import Job
 from sticker_convert.job_option import CompOption, CredOption, InputOption, OutputOption
 from sticker_convert.utils.auth.get_discord_auth import GetDiscordAuth
-from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
-from sticker_convert.utils.auth.get_kakao_desktop_auth import GetKakaoDesktopAuth
+from sticker_convert.utils.auth.get_kakao_auth_android_login import GetKakaoAuthAndroidLogin
+from sticker_convert.utils.auth.get_kakao_auth_desktop_login import GetKakaoAuthDesktopLogin
+from sticker_convert.utils.auth.get_kakao_auth_desktop_memdump import GetKakaoAuthDesktopMemdump
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
 from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
 from sticker_convert.utils.auth.get_viber_auth import GetViberAuth
@@ -176,8 +177,9 @@ class CLI:
         flags_cred_bool = (
             "signal_get_auth",
             "telethon_setup",
-            "kakao_get_auth",
-            "kakao_get_auth_desktop",
+            "kakao_get_auth_desktop_memdump",
+            "kakao_get_auth_desktop_login",
+            "kakao_get_auth_android_login",
             "line_get_auth",
             "discord_get_auth",
             "save_cred",
@@ -511,28 +513,42 @@ class CLI:
             else creds.get("discord", {}).get("token"),
         )
 
-        if args.kakao_get_auth:
-            get_kakao_auth = GetKakaoAuth(
+        if args.kakao_get_auth_android_login:
+            get_kakao_auth_android_login = GetKakaoAuthAndroidLogin(
                 opt_cred=opt_cred,
                 cb_msg=self.cb.msg,
                 cb_msg_block=self.cb.msg_block,
                 cb_ask_str=self.cb.ask_str,
             )
-            auth_token = get_kakao_auth.get_cred()
+            auth_token = get_kakao_auth_android_login.get_cred()
 
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token
 
                 self.cb.msg(f"Got auth_token successfully: {auth_token}")
 
-        if args.kakao_get_auth_desktop:
-            get_kakao_desktop_auth = GetKakaoDesktopAuth(
+        if args.kakao_get_auth_desktop_memdump:
+            get_kakao_auth_desktop_memdump = GetKakaoAuthDesktopMemdump(
                 cb_ask_str=self.cb.ask_str,
             )
             kakao_bin_path = None
             if args.kakao_bin_path:
                 kakao_bin_path = args.kakao_bin_path
-            auth_token, msg = get_kakao_desktop_auth.get_cred(kakao_bin_path)
+            auth_token, msg = get_kakao_auth_desktop_memdump.get_cred(kakao_bin_path)
+
+            if auth_token:
+                opt_cred.kakao_auth_token = auth_token
+
+            self.cb.msg(msg)
+
+        if args.kakao_get_auth_desktop_login:
+            get_kakao_auth_desktop_login = GetKakaoAuthDesktopLogin(
+                opt_cred=opt_cred,
+                cb_msg=self.cb.msg,
+                cb_msg_block=self.cb.msg_block,
+                cb_ask_str=self.cb.ask_str,
+            )
+            auth_token, msg = get_kakao_auth_desktop_login.get_cred()
 
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token

sticker_convert/converter.py

@@ -111,10 +111,10 @@ def yuva_to_rgba(frame: "VideoFrame") -> "np.ndarray[Any, Any]":
     u = u.repeat(2, axis=0).repeat(2, axis=1)
     v = v.repeat(2, axis=0).repeat(2, axis=1)
 
-    y = y.reshape((y.shape[0], y.shape[1], 1))
-    u = u.reshape((u.shape[0], u.shape[1], 1))
-    v = v.reshape((v.shape[0], v.shape[1], 1))
-    a = a.reshape((a.shape[0], a.shape[1], 1))
+    y = y.reshape((y.shape[0], y.shape[1], 1))  # type: ignore
+    u = u.reshape((u.shape[0], u.shape[1], 1))  # type: ignore
+    v = v.reshape((v.shape[0], v.shape[1], 1))  # type: ignore
+    a = a.reshape((a.shape[0], a.shape[1], 1))  # type: ignore
 
     yuv_array = np.concatenate((y, u, v), axis=2)
 

sticker_convert/gui.py

@@ -163,6 +163,7 @@ class GUI(Window):
         self.kakao_password_var = StringVar(self)
         self.kakao_country_code_var = StringVar(self)
         self.kakao_phone_number_var = StringVar(self)
+        self.kakao_device_uuid_var = StringVar(self)
         self.kakao_bin_path_var = StringVar(self)
         self.line_cookies_var = StringVar(self)
         self.viber_auth_var = StringVar(self)
@@ -427,6 +428,9 @@ class GUI(Window):
         self.kakao_phone_number_var.set(
             self.creds.get("kakao", {}).get("phone_number", "")
         )
+        self.kakao_device_uuid_var.set(
+            self.creds.get("kakao", {}).get("device_uuid", "")
+        )
         self.line_cookies_var.set(self.creds.get("line", {}).get("cookies", ""))
         self.viber_auth_var.set(self.creds.get("viber", {}).get("auth", ""))
         self.discord_token_var.set(self.creds.get("discord", {}).get("token", ""))
@@ -599,6 +603,7 @@ class GUI(Window):
             kakao_password=self.kakao_password_var.get(),
             kakao_country_code=self.kakao_country_code_var.get(),
             kakao_phone_number=self.kakao_phone_number_var.get(),
+            kakao_device_uuid=self.kakao_device_uuid_var.get(),
             line_cookies=self.line_cookies_var.get(),
             viber_auth=self.viber_auth_var.get(),
             discord_token=self.discord_token_var.get(),

sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -9,8 +9,9 @@ from ttkbootstrap import Button, Entry, Frame, Label, LabelFrame  # type: ignore
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
-from sticker_convert.utils.auth.get_kakao_desktop_auth import GetKakaoDesktopAuth
+from sticker_convert.utils.auth.get_kakao_auth_android_login import GetKakaoAuthAndroidLogin
+from sticker_convert.utils.auth.get_kakao_auth_desktop_login import GetKakaoAuthDesktopLogin
+from sticker_convert.utils.auth.get_kakao_auth_desktop_memdump import GetKakaoAuthDesktopMemdump
 
 
 class KakaoGetAuthWindow(BaseWindow):
@@ -22,72 +23,76 @@ class KakaoGetAuthWindow(BaseWindow):
         self.cb_msg_block_kakao = partial(self.gui.cb_msg_block, parent=self)
         self.cb_ask_str_kakao = partial(self.gui.cb_ask_str, parent=self)
 
-        self.frame_from_desktop = LabelFrame(
-            self.scrollable_frame, text="Method 1: From KakaoTalk Desktop"
+        self.frame_desktop_memdump = LabelFrame(
+            self.scrollable_frame, text="Method 1: KakaoTalk Desktop memdump"
         )
-        self.frame_simulate_login = LabelFrame(
-            self.scrollable_frame, text="Method 2: Simulate login"
+        self.frame_desktop_login = LabelFrame(
+            self.scrollable_frame, text="Method 2: Simulate Desktop login"
+        )
+        self.frame_android_login = LabelFrame(
+            self.scrollable_frame, text="Method 3: Simulate Android login"
         )
         self.frame_login_btn = Frame(self.scrollable_frame)
 
-        self.frame_from_desktop.grid(column=0, row=0, sticky="news", padx=3, pady=3)
-        self.frame_simulate_login.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+        self.frame_desktop_memdump.grid(column=0, row=0, sticky="news", padx=3, pady=3)
+        self.frame_desktop_login.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+        self.frame_android_login.grid(column=0, row=2, sticky="news", padx=3, pady=3)
 
         # Method 1 frame
         self.explanation1_1_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="This will get Kakao auth_token from Kakao Desktop",
             justify="left",
             anchor="w",
         )
         self.explanation1_2_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Download Kakao Desktop, login and press 'Get auth_token'",
             justify="left",
             anchor="w",
         )
         self.explanation1_3_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="This can take about a minute.",
             justify="left",
             anchor="w",
         )
         if platform.system() != "Darwin":
             self.explanation1_4_lbl = Label(
-                self.frame_from_desktop,
+                self.frame_desktop_memdump,
                 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,
+                self.frame_desktop_memdump,
                 text="Note: This will read memory of KakaoTalk Desktop",
                 justify="left",
                 anchor="w",
             )
         self.kakao_bin_path_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Kakao app path (Optional):",
             justify="left",
             anchor="w",
         )
         self.kakao_bin_path_entry = Entry(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             textvariable=self.gui.kakao_bin_path_var,
             width=30,
         )
         self.launch_desktop_btn = Button(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Launch Desktop app",
             command=self.cb_launch_desktop,
             width=24,
             bootstyle="secondary",  # type: ignore
         )
         self.get_auth_desktop_btn = Button(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Get auth_token",
-            command=self.cb_from_desktop,
+            command=self.cb_get_auth_desktop_memdump,
             width=24,
         )
 
@@ -110,26 +115,143 @@ class KakaoGetAuthWindow(BaseWindow):
 
         # Method 2 frame
         self.explanation2_1_lbl = Label(
-            self.frame_simulate_login,
-            text="This will simulate login to Android Kakao app",
+            self.frame_desktop_login,
+            text="This will simulate login to Desktop Kakao app",
             justify="left",
             anchor="w",
         )
         self.explanation2_2_lbl = Label(
-            self.frame_simulate_login,
-            text="You will send / receive verification code via SMS",
+            self.frame_desktop_login,
+            text="You may receive verification code from Kakao app on phone",
             justify="left",
             anchor="w",
         )
         self.explanation2_3_lbl = Label(
-            self.frame_simulate_login,
+            self.frame_desktop_login,
+            text="It is not necessary to download Desktop Kakao app",
+            justify="left",
+            anchor="w",
+        )
+
+        self.kakao_username_help_btn2 = Button(
+            self.frame_desktop_login,
+            text="?",
+            width=1,
+            command=lambda: self.cb_msg_block_kakao(
+                self.gui.help["cred"]["kakao_username"]
+            ),
+            bootstyle="secondary",  # type: ignore
+        )
+        self.kakao_username_lbl2 = Label(
+            self.frame_desktop_login,
+            text="Username",
+            width=18,
+            justify="left",
+            anchor="w",
+        )
+        self.kakao_username_entry2 = Entry(
+            self.frame_desktop_login,
+            textvariable=self.gui.kakao_username_var,
+            width=30,
+        )
+        self.kakao_username_entry2.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
+        self.kakao_password_help_btn2 = Button(
+            self.frame_desktop_login,
+            text="?",
+            width=1,
+            command=lambda: self.cb_msg_block_kakao(
+                self.gui.help["cred"]["kakao_password"]
+            ),
+            bootstyle="secondary",  # type: ignore
+        )
+        self.kakao_password_lbl2 = Label(
+            self.frame_desktop_login, text="Password", justify="left", anchor="w"
+        )
+        self.kakao_password_entry2 = Entry(
+            self.frame_desktop_login,
+            textvariable=self.gui.kakao_password_var,
+            width=30,
+        )
+        self.kakao_password_entry2.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
+        self.kakao_device_uuid_help_btn = Button(
+            self.frame_desktop_login,
+            text="?",
+            width=1,
+            command=lambda: self.cb_msg_block_kakao(
+                self.gui.help["cred"]["kakao_device_uuid"]
+            ),
+            bootstyle="secondary",  # type: ignore
+        )
+        self.kakao_device_uuid_lbl = Label(
+            self.frame_desktop_login,
+            text="Device UUID (Optional)",
+            justify="left",
+            anchor="w",
+        )
+        self.kakao_device_uuid_entry = Entry(
+            self.frame_desktop_login,
+            textvariable=self.gui.kakao_device_uuid_var,
+            width=30,
+        )
+        self.kakao_device_uuid_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
+        self.login_btn2 = Button(
+            self.frame_desktop_login,
+            text="Login and get auth_token",
+            command=self.cb_get_auth_desktop_login,
+            width=24,
+        )
+
+        self.explanation2_1_lbl.grid(
+            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_2_lbl.grid(
+            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_3_lbl.grid(
+            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
+        )
+
+        self.kakao_username_help_btn2.grid(column=0, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_lbl2.grid(column=1, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_entry2.grid(column=2, row=3, sticky="w", padx=3, pady=3)
+
+        self.kakao_password_help_btn2.grid(column=0, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_lbl2.grid(column=1, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_entry2.grid(column=2, row=4, sticky="w", padx=3, pady=3)
+
+        self.kakao_device_uuid_help_btn.grid(
+            column=0, row=5, sticky="w", padx=3, pady=3
+        )
+        self.kakao_device_uuid_lbl.grid(column=1, row=5, sticky="w", padx=3, pady=3)
+        self.kakao_device_uuid_entry.grid(column=2, row=5, sticky="w", padx=3, pady=3)
+
+        self.login_btn2.grid(column=0, row=6, columnspan=3, padx=3, pady=3)
+
+        # Method 3 frame
+        self.explanation3_1_lbl = Label(
+            self.frame_android_login,
+            text="This will simulate login to Android Kakao app",
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_2_lbl = Label(
+            self.frame_android_login,
+            text="You will send / receive verification code via SMS",
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_3_lbl = Label(
+            self.frame_android_login,
             text="You will be logged out of existing device",
             justify="left",
             anchor="w",
         )
 
-        self.kakao_username_help_btn = Button(
-            self.frame_simulate_login,
+        self.kakao_username_help_btn3 = Button(
+            self.frame_android_login,
             text="?",
             width=1,
             command=lambda: self.cb_msg_block_kakao(
@@ -137,22 +259,22 @@ class KakaoGetAuthWindow(BaseWindow):
             ),
             bootstyle="secondary",  # type: ignore
         )
-        self.kakao_username_lbl = Label(
-            self.frame_simulate_login,
+        self.kakao_username_lbl3 = Label(
+            self.frame_android_login,
             text="Username",
             width=18,
             justify="left",
             anchor="w",
         )
-        self.kakao_username_entry = Entry(
-            self.frame_simulate_login,
+        self.kakao_username_entry3 = Entry(
+            self.frame_android_login,
             textvariable=self.gui.kakao_username_var,
             width=30,
         )
-        self.kakao_username_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+        self.kakao_username_entry3.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
-        self.kakao_password_help_btn = Button(
-            self.frame_simulate_login,
+        self.kakao_password_help_btn3 = Button(
+            self.frame_android_login,
             text="?",
             width=1,
             command=lambda: self.cb_msg_block_kakao(
@@ -160,18 +282,18 @@ class KakaoGetAuthWindow(BaseWindow):
             ),
             bootstyle="secondary",  # type: ignore
         )
-        self.kakao_password_lbl = Label(
-            self.frame_simulate_login, text="Password", justify="left", anchor="w"
+        self.kakao_password_lbl3 = Label(
+            self.frame_android_login, text="Password", justify="left", anchor="w"
         )
-        self.kakao_password_entry = Entry(
-            self.frame_simulate_login,
+        self.kakao_password_entry3 = Entry(
+            self.frame_android_login,
             textvariable=self.gui.kakao_password_var,
             width=30,
         )
-        self.kakao_password_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+        self.kakao_password_entry3.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
         self.kakao_country_code_help_btn = Button(
-            self.frame_simulate_login,
+            self.frame_android_login,
             text="?",
             width=1,
             command=lambda: self.cb_msg_block_kakao(
@@ -180,17 +302,17 @@ class KakaoGetAuthWindow(BaseWindow):
             bootstyle="secondary",  # type: ignore
         )
         self.kakao_country_code_lbl = Label(
-            self.frame_simulate_login, text="Country code", justify="left", anchor="w"
+            self.frame_android_login, text="Country code", justify="left", anchor="w"
         )
         self.kakao_country_code_entry = Entry(
-            self.frame_simulate_login,
+            self.frame_android_login,
             textvariable=self.gui.kakao_country_code_var,
             width=30,
         )
         self.kakao_country_code_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
         self.kakao_phone_number_help_btn = Button(
-            self.frame_simulate_login,
+            self.frame_android_login,
             text="?",
             width=1,
             command=lambda: self.cb_msg_block_kakao(
@@ -199,39 +321,39 @@ class KakaoGetAuthWindow(BaseWindow):
             bootstyle="secondary",  # type: ignore
         )
         self.kakao_phone_number_lbl = Label(
-            self.frame_simulate_login, text="Phone number", justify="left", anchor="w"
+            self.frame_android_login, text="Phone number", justify="left", anchor="w"
         )
         self.kakao_phone_number_entry = Entry(
-            self.frame_simulate_login,
+            self.frame_android_login,
             textvariable=self.gui.kakao_phone_number_var,
             width=30,
         )
         self.kakao_phone_number_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
-        self.login_btn = Button(
-            self.frame_simulate_login,
+        self.login_btn3 = Button(
+            self.frame_android_login,
             text="Login and get auth_token",
-            command=self.cb_simulate_login,
+            command=self.cb_get_auth_android_login,
             width=24,
         )
 
-        self.explanation2_1_lbl.grid(
+        self.explanation3_1_lbl.grid(
             column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
         )
-        self.explanation2_2_lbl.grid(
+        self.explanation3_2_lbl.grid(
             column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
         )
-        self.explanation2_3_lbl.grid(
+        self.explanation3_3_lbl.grid(
             column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
         )
 
-        self.kakao_username_help_btn.grid(column=0, row=3, sticky="w", padx=3, pady=3)
-        self.kakao_username_lbl.grid(column=1, row=3, sticky="w", padx=3, pady=3)
-        self.kakao_username_entry.grid(column=2, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_help_btn3.grid(column=0, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_lbl3.grid(column=1, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_entry3.grid(column=2, row=3, sticky="w", padx=3, pady=3)
 
-        self.kakao_password_help_btn.grid(column=0, row=4, sticky="w", padx=3, pady=3)
-        self.kakao_password_lbl.grid(column=1, row=4, sticky="w", padx=3, pady=3)
-        self.kakao_password_entry.grid(column=2, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_help_btn3.grid(column=0, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_lbl3.grid(column=1, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_entry3.grid(column=2, row=4, sticky="w", padx=3, pady=3)
 
         self.kakao_country_code_help_btn.grid(
             column=0, row=5, sticky="w", padx=3, pady=3
@@ -244,16 +366,41 @@ class KakaoGetAuthWindow(BaseWindow):
         )
         self.kakao_phone_number_lbl.grid(column=1, row=6, sticky="w", padx=3, pady=3)
         self.kakao_phone_number_entry.grid(column=2, row=6, sticky="w", padx=3, pady=3)
-        self.login_btn.grid(column=0, row=7, columnspan=3, padx=3, pady=3)
+        self.login_btn3.grid(column=0, row=7, columnspan=3, padx=3, pady=3)
 
         GUIUtils.finalize_window(self)
 
-    def cb_simulate_login(self) -> None:
-        Thread(target=self.cb_simulate_login_thread, daemon=True).start()
+    def cb_get_auth_android_login(self) -> None:
+        Thread(target=self.cb_get_auth_android_login_thread, daemon=True).start()
+
+    def cb_get_auth_desktop_login_thread(self, *_: Any) -> None:
+        self.gui.save_creds()
+        m = GetKakaoAuthDesktopLogin(
+            opt_cred=self.gui.get_opt_cred(),
+            cb_msg=self.gui.cb_msg,
+            cb_msg_block=self.cb_msg_block_kakao,
+            cb_ask_str=self.cb_ask_str_kakao,
+        )
+
+        auth_token, msg = m.get_cred()
+
+        if auth_token:
+            if not self.gui.creds.get("kakao"):
+                self.gui.creds["kakao"] = {}
+            self.gui.creds["kakao"]["auth_token"] = auth_token
+            self.gui.kakao_auth_token_var.set(auth_token)
+
+            self.gui.save_creds()
+            self.gui.highlight_fields()
+
+        self.cb_msg_block_kakao(msg)
+
+    def cb_get_auth_desktop_login(self) -> None:
+        Thread(target=self.cb_get_auth_desktop_login_thread, daemon=True).start()
 
-    def cb_simulate_login_thread(self, *_: Any) -> None:
+    def cb_get_auth_android_login_thread(self, *_: Any) -> None:
         self.gui.save_creds()
-        m = GetKakaoAuth(
+        m = GetKakaoAuthAndroidLogin(
             opt_cred=self.gui.get_opt_cred(),
             cb_msg=self.gui.cb_msg,
             cb_msg_block=self.cb_msg_block_kakao,
@@ -275,7 +422,7 @@ class KakaoGetAuthWindow(BaseWindow):
             self.cb_msg_block_kakao("Failed to get auth_token")
 
     def cb_launch_desktop(self) -> None:
-        m = GetKakaoDesktopAuth(
+        m = GetKakaoAuthDesktopMemdump(
             cb_ask_str=self.cb_ask_str_kakao,
         )
         if self.gui.kakao_bin_path_var.get() != "":
@@ -290,14 +437,14 @@ class KakaoGetAuthWindow(BaseWindow):
                 "Error: Cannot launch Kakao Desktop. Is it installed?"
             )
 
-    def cb_from_desktop(self) -> None:
-        Thread(target=self.cb_from_desktop_thread, daemon=True).start()
+    def cb_get_auth_desktop_memdump(self) -> None:
+        Thread(target=self.cb_get_auth_desktop_memdump_thread, daemon=True).start()
 
-    def cb_from_desktop_thread(self, *_: Any) -> None:
+    def cb_get_auth_desktop_memdump_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(
+        m = GetKakaoAuthDesktopMemdump(
             cb_ask_str=self.cb_ask_str_kakao,
         )
 

sticker_convert/job_option.py

@@ -223,6 +223,7 @@ class CredOption(BaseOption):
     kakao_auth_token: str = ""
     kakao_username: str = ""
     kakao_password: str = ""
+    kakao_device_uuid: str = ""
     kakao_country_code: str = ""
     kakao_phone_number: str = ""
     line_cookies: str = ""

sticker_convert/resources/help.json

@@ -66,13 +66,15 @@
         "telegram_userid": "Set Telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.",
         "telethon_setup": "Setup Telethon",
         "kakao_auth_token": "Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx",
-        "kakao_get_auth": "Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.",
-        "kakao_get_auth_desktop": "Get Kakao auth_token from Kakao Desktop application.",
+        "kakao_get_auth_android_login": "Get Kakao auth_token by simulating login from Android. Kakao username, password, country code and phone number required.",
+        "kakao_get_auth_desktop_memdump": "Get Kakao auth_token from installed Kakao Desktop application with memdump.",
+        "kakao_get_auth_desktop_login": "Get Kakao auth_token by simulating login from Desktop application. Kakao username and password required.",
         "kakao_bin_path": "Set Kakao Desktop application path for launching and getting auth_token.\nUseful for portable installation.",
-        "kakao_username": "Set Kakao username, which is email or phone number used for signing up Kakao account\nExample: +447700900142\nRequired for generating Kakao auth_token.",
-        "kakao_password": "Set Kakao password (Password of Kakao account).\nRequired for generating Kakao auth_token.",
-        "kakao_country_code": "Set Kakao country code of phone.\nExample: 82 (For korea), 44 (For UK), 1 (For USA).\nRequired for generating Kakao auth_token.",
-        "kakao_phone_number": "Set Kakao phone number (Phone number associated with your Kakao account)\nDo NOT enter country code\nExample: 7700900142\nUsed for send / receive verification code via SMS.\nRequired for generating Kakao auth_token.",
+        "kakao_username": "Set Kakao username, which is email or phone number used for signing up Kakao account\nExample: +447700900142\nRequired for getting Kakao auth_token by simulating android/desktop login.",
+        "kakao_password": "Set Kakao password (Password of Kakao account).\nRequired for getting Kakao auth_token by simulating android/desktop login.",
+        "kakao_country_code": "Set Kakao country code of phone.\nExample: 82 (For korea), 44 (For UK), 1 (For USA).\nRequired for getting Kakao auth_token by simulating android login.",
+        "kakao_phone_number": "Set Kakao phone number (Phone number associated with your Kakao account)\nDo NOT enter country code\nExample: 7700900142\nUsed for send / receive verification code via SMS.\nRequired for getting Kakao auth_token by simulating android login.",
+        "kakao_device_uuid": "Set Kakao device uuid for desktop login. Defaults to real device uuid.\nOptional for getting Kakao auth_token by simulating desktop login",
         "line_get_auth": "Get Line cookies from browser, which is required to create custom message stickers.",
         "line_cookies": "Set Line cookies, which is required to create custom message stickers.",
         "viber_auth": "Set Viber authentication data.\nRequired for uploading Viber stickers.",

sticker_convert/utils/auth/{get_kakao_auth.py → get_kakao_auth_android_login.py}

@@ -11,7 +11,7 @@ from bs4 import BeautifulSoup
 from sticker_convert.job_option import CredOption
 
 
-class GetKakaoAuth:
+class GetKakaoAuthAndroidLogin:
     def __init__(
         self,
         opt_cred: CredOption,

sticker_convert/utils/auth/get_kakao_auth_desktop_login.py

@@ -0,0 +1,282 @@
+#!/usr/bin/env python3
+import base64
+import hashlib
+import json
+import os
+import platform
+import shutil
+import socket
+import subprocess
+import time
+import uuid
+from typing import Any, Callable, Optional, Tuple
+
+import requests
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+
+from sticker_convert.job_option import CredOption
+
+
+class GetKakaoAuthDesktopLogin:
+    def __init__(
+        self,
+        opt_cred: CredOption,
+        cb_msg: Callable[..., None] = print,
+        cb_msg_block: Callable[..., Any] = input,
+        cb_ask_str: Callable[..., str] = input,
+    ) -> None:
+        self.opt_cred = opt_cred
+        self.username = opt_cred.kakao_username
+        self.password = opt_cred.kakao_password
+
+        self.cb_msg = cb_msg
+        self.cb_msg_block = cb_msg_block
+        self.cb_ask_str = cb_ask_str
+
+        if platform.system() == "Darwin":
+            self.plat = "mac"
+            user_agent_os = "Mc"
+            self.os_version = platform.mac_ver()[0]
+            version = "25.2.0"
+        else:
+            self.plat = "win32"
+            user_agent_os = "Wd"
+            if platform.system() == "Windows":
+                self.os_version = platform.uname().version
+            else:
+                self.os_version = "10.0"
+            version = "25.7.7"
+
+        user_agent = f"KT/{version} {user_agent_os}/{self.os_version} en"
+        self.headers = {
+            "user-agent": user_agent,
+            "a": f"{self.plat}/{version}/en",
+            "accept": "*/*",
+            "accept-encoding": "gzip, deflate, br",
+            "accept-language": "en",
+            "host": "katalk.kakao.com",
+            "Connection": "close",
+        }
+
+        self.device_name = socket.gethostname()
+        self.device_uuid = self.get_device_uuid()
+
+        hash = hashlib.sha512(
+            f"KLEAL|{self.username}|{self.device_uuid}|LCNUE|{user_agent}".encode(
+                "utf-8"
+            )
+        ).hexdigest()
+        xvc = hash[:16]
+
+        self.headers_login = self.headers.copy()
+        self.headers_login["x-vc"] = xvc
+
+    def pkcs7_pad(self, m: str) -> str:
+        return m + chr(16 - len(m) % 16) * (16 - len(m) % 16)
+
+    def windows_get_pragma(self, use_wine: bool = False) -> Optional[str]:
+        sys_uuid = None
+        hdd_model = None
+        hdd_serial = None
+
+        if use_wine and shutil.which("wine") is None:
+            return None
+
+        regkey = "HKEY_CURRENT_USER\\Software\\Kakao\\KakaoTalk\\DeviceInfo"
+        wine = "wine " if use_wine else ""
+        cmd = f"{wine}reg query '{regkey}' /v Last"
+        last_device_info = subprocess.run(
+            cmd, stdout=subprocess.PIPE, shell=True
+        ).stdout.decode()
+        if "REG_SZ" not in last_device_info:
+            return None
+        last_device_info = last_device_info.split("\n")[2].split()[2]
+
+        if self.opt_cred.kakao_device_uuid:
+            sys_uuid = self.opt_cred.kakao_device_uuid
+        else:
+            cmd = f"{wine}reg query '{regkey}\\{last_device_info}' /v sys_uuid"
+            sys_uuid = subprocess.run(
+                cmd, stdout=subprocess.PIPE, shell=True
+            ).stdout.decode()
+            if "REG_SZ" in sys_uuid:
+                sys_uuid = sys_uuid.split("\n")[2].split()[2]
+
+        cmd = f"{wine}reg query '{regkey}\\{last_device_info}' /v hdd_model"
+        hdd_model = subprocess.run(
+            cmd, stdout=subprocess.PIPE, shell=True
+        ).stdout.decode()
+        if "REG_SZ" in hdd_model:
+            hdd_model = hdd_model.split("\n")[2].split()[2]
+
+        cmd = f"{wine}reg query '{regkey}\\{last_device_info}' /v hdd_serial"
+        hdd_serial = subprocess.run(
+            cmd, stdout=subprocess.PIPE, shell=True
+        ).stdout.decode()
+        if "REG_SZ" in hdd_serial:
+            hdd_serial = hdd_serial.split("\n")[2].split()[2]
+
+        if sys_uuid and hdd_model and hdd_serial:
+            return f"{sys_uuid}|{hdd_model}|{hdd_serial}"
+        else:
+            return None
+
+    def get_device_uuid(self) -> str:
+        if platform.system() == "Darwin":
+            cmd = "ioreg -rd1 -c IOPlatformExpertDevice | grep IOPlatformUUID | awk '{print $3}'"
+            result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True, check=True)
+            hwid = result.stdout.decode().strip().replace('"', "")
+
+            hwid_sha1 = bytes.fromhex(hashlib.sha1(hwid.encode()).hexdigest())
+            hwid_sha256 = bytes.fromhex(hashlib.sha256(hwid.encode()).hexdigest())
+
+            return base64.b64encode(hwid_sha1 + hwid_sha256).decode()
+        else:
+            use_wine = True if platform.system != "Windows" else False
+            pragma = self.windows_get_pragma(use_wine=use_wine)
+            if pragma is None:
+                if platform.system == "Windows":
+                    if self.opt_cred.kakao_device_uuid:
+                        sys_uuid = self.opt_cred.kakao_device_uuid
+                    else:
+                        cmd = "wmic csproduct get uuid"
+                        result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+                        sys_uuid = result.stdout.decode().split("\n")[1].strip()
+                    cmd = "wmic diskdrive get Model"
+                    result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+                    hdd_model = result.stdout.decode().split("\n")[1].strip()
+                    cmd = "wmic diskdrive get SerialNumber"
+                    result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+                    hdd_serial = result.stdout.decode().split("\n")[1].strip()
+                else:
+                    if self.opt_cred.kakao_device_uuid:
+                        sys_uuid = self.opt_cred.kakao_device_uuid
+                    else:
+                        product_uuid_path = "/sys/devices/virtual/dmi/id/product_uuid"
+                        sys_uuid = None
+                        if os.access(product_uuid_path, os.R_OK):
+                            cmd = f"cat {product_uuid_path}"
+                            result = subprocess.run(
+                                cmd, stdout=subprocess.PIPE, shell=True
+                            )
+                            if result.returncode == 0:
+                                sys_uuid = result.stdout.decode().strip()
+                        if sys_uuid is None:
+                            sys_uuid = str(uuid.uuid4()).upper()
+                            self.opt_cred.kakao_device_uuid = sys_uuid
+                    hdd_model = "Wine Disk Drive"
+                    hdd_serial = ""
+                pragma = f"{sys_uuid}|{hdd_model}|{hdd_serial}"
+
+            aes_key = bytes.fromhex("9FBAE3118FDE5DEAEB8279D08F1D4C79")
+            aes_iv = bytes.fromhex("00000000000000000000000000000000")
+
+            cipher = Cipher(algorithms.AES(aes_key), modes.CBC(aes_iv))
+            encryptor = cipher.encryptor()
+            padded = self.pkcs7_pad(pragma).encode()
+            encrypted_pragma = encryptor.update(padded) + encryptor.finalize()
+            pragma_hash = hashlib.sha512(encrypted_pragma).digest()
+
+            return base64.b64encode(pragma_hash).decode()
+
+    def login(self, forced: bool = False):
+        data = {
+            "device_name": self.device_name,
+            "device_uuid": self.device_uuid,
+            "email": self.username,
+            "os_version": self.os_version,
+            "password": self.password,
+            "permanent": "1",
+        }
+
+        if forced:
+            data["forced"] = "1"
+
+        headers = self.headers_login.copy()
+        headers["content-type"] = "application/x-www-form-urlencoded"
+        response = requests.post(
+            f"https://katalk.kakao.com/{self.plat}/account/login.json",
+            headers=headers,
+            data=data,
+        )
+
+        return json.loads(response.text)
+
+    def generate_passcode(self):
+        data = {
+            "password": self.password,
+            "permanent": True,
+            "device": {
+                "name": self.device_name,
+                "osVersion": self.os_version,
+                "uuid": self.device_uuid,
+            },
+            "email": self.username,
+        }
+
+        if platform.system() == "Darwin":
+            cmd = "sysctl -n hw.model"
+            result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True, check=True)
+            data["device"]["model"] = result.stdout.decode().strip()  # type: ignore
+
+        headers = self.headers_login.copy()
+        headers["content-type"] = "application/json"
+        response = requests.post(
+            f"https://katalk.kakao.com/{self.plat}/account/passcodeLogin/generate",
+            headers=headers,
+            json=data,
+        )
+
+        return json.loads(response.text)
+
+    def register_device(self):
+        data = {
+            "device": {"uuid": self.device_uuid},
+            "email": self.username,
+            "password": self.password,
+        }
+
+        headers = self.headers_login.copy()
+        headers["content-type"] = "application/json"
+        response = None
+
+        response = requests.post(
+            f"https://katalk.kakao.com/{self.plat}/account/passcodeLogin/registerDevice",
+            headers=headers,
+            json=data,
+        )
+        return json.loads(response.text)
+
+    def get_cred(self) -> Tuple[Optional[str], str]:
+        self.cb_msg("Get authorization token")
+        rjson = self.login()
+        access_token = rjson.get("access_token")
+        if access_token is not None:
+            auth_token = access_token + "-" + self.device_uuid
+            return auth_token, f"Login successful, auth_token: {auth_token}"
+
+        rjson = self.generate_passcode()
+        if rjson.get("status") != 0:
+            return None, f"Failed to generate passcode: {rjson}"
+        passcode = rjson["passcode"]
+
+        start_time = time.time()
+        register_success = False
+        while time.time() - start_time < 60:
+            self.cb_ask_str(f"Please enter passcode within 1 minute: {passcode}")
+            rjson = self.register_device()
+            if rjson["status"] == 0:
+                register_success = True
+                break
+        if register_success is False:
+            return None, f"Failed to register device: {rjson}"
+
+        rjson = self.login()
+        if rjson.get("status") == -101:
+            rjson = self.login(forced=True)
+        access_token = rjson.get("access_token")
+        if access_token is None:
+            return None, f"Failed to login after registering device: {rjson}"
+
+        auth_token = access_token + "-" + self.device_uuid
+        return auth_token, f"Login successful, auth_token: {auth_token}"

sticker_convert/utils/auth/{get_kakao_desktop_auth.py → get_kakao_auth_desktop_memdump.py}

@@ -26,9 +26,13 @@ MSG_LAUNCH_FAIL = "Failed to launch Kakao"
 MSG_PERMISSION_ERROR = "Failed to read Kakao process memory"
 
 
-class GetKakaoDesktopAuth:
+class GetKakaoAuthDesktopMemdump:
     def __init__(self, cb_ask_str: Callable[..., str] = input) -> None:
         self.cb_ask_str = cb_ask_str
+        if platform.system() == "Windows":
+            self.auth_token_length = 64
+        else:
+            self.auth_token_length = 52
 
     def launch_kakao(self, kakao_bin_path: str) -> None:
         if platform.system() == "Windows":
@@ -69,12 +73,11 @@ class GetKakaoDesktopAuth:
                 ):
                     auth_token_addr = cast(int, address) + 15
                     auth_token_bytes = process.read_process_memory(
-                        auth_token_addr, bytes, 200
+                        auth_token_addr, bytes, self.auth_token_length + 1
                     )
-                    auth_token_term = auth_token_bytes.find(b"\x00")
-                    if auth_token_term == -1:
+                    if auth_token_bytes[-1:] != b"\x00":
                         continue
-                    auth_token_candidate = auth_token_bytes[:auth_token_term].decode(
+                    auth_token_candidate = auth_token_bytes[:-1].decode(
                         encoding="ascii"
                     )
                     if len(auth_token_candidate) > 150:
@@ -126,13 +129,12 @@ class GetKakaoDesktopAuth:
         for i in re.finditer(b"authorization: ", s):
             auth_token_addr = i.start() + 15
 
-            auth_token_bytes = s[auth_token_addr : auth_token_addr + 200]
-            auth_token_term = auth_token_bytes.find(b"\x00")
-            if auth_token_term == -1:
+            auth_token_bytes = s[
+                auth_token_addr : auth_token_addr + self.auth_token_length + 1
+            ]
+            if auth_token_bytes[-1:] != b"\x00":
                 return None, MSG_NO_AUTH
-            auth_token_candidate = auth_token_bytes[:auth_token_term].decode(
-                encoding="ascii"
-            )
+            auth_token_candidate = auth_token_bytes[:-1].decode(encoding="ascii")
             if len(auth_token_candidate) > 150:
                 auth_token = auth_token_candidate
                 break

sticker_convert/utils/auth/telegram_api.py

@@ -67,11 +67,12 @@ class BotAPI(TelegramAPI):
             self.cb.put("Token required for downloading from telegram")
             return False
 
-        if opt_cred.telegram_userid.isnumeric():
-            self.telegram_userid = int(opt_cred.telegram_userid)
-        else:
-            self.cb.put("Invalid userid, should contain numbers only")
-            return False
+        if opt_cred.telegram_userid:
+            if opt_cred.telegram_userid.isnumeric():
+                self.telegram_userid = int(opt_cred.telegram_userid)
+            else:
+                self.cb.put("Invalid userid, should contain numbers only")
+                return False
 
         self.application = (  # type: ignore
             ApplicationBuilder()

sticker_convert/version.py

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

{sticker_convert-2.13.3.0.dist-info → sticker_convert-2.14.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.3.0
+Version: 2.14.0.0
 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>
@@ -366,9 +366,10 @@ License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
 Requires-Dist: anyio~=4.10.0
 Requires-Dist: apngasm_python~=1.3.2
-Requires-Dist: av>=13.1.0
-Requires-Dist: beautifulsoup4~=4.13.4
+Requires-Dist: av<15,>=13.1.0
+Requires-Dist: beautifulsoup4~=4.13.5
 Requires-Dist: cryptg~=0.5.1
+Requires-Dist: cryptography~=46.0.1
 Requires-Dist: rookiepy~=0.5.6
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
@@ -376,15 +377,15 @@ Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.3.0
-Requires-Dist: pyoxipng~=9.1.0
-Requires-Dist: python-telegram-bot~=22.3
+Requires-Dist: pyoxipng~=9.1.1
+Requires-Dist: python-telegram-bot~=22.4
 Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.24
 Requires-Dist: requests~=2.32.4
-Requires-Dist: rlottie_python~=1.3.7
+Requires-Dist: rlottie_python~=1.3.8
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
 Requires-Dist: socksio~=1.0.0
-Requires-Dist: telethon~=1.40.0
+Requires-Dist: telethon~=1.41.2
 Requires-Dist: tqdm~=4.67.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 Requires-Dist: websocket_client~=1.8.0
@@ -497,37 +498,29 @@ Dynamic: license-file
 To run in CLI mode, pass on any arguments
 
 ```
-usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress]
-                          [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
+usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress] [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
                           [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-band DOWNLOAD_BAND | --download-ogq DOWNLOAD_OGQ | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-telegram-telethon | --export-telegram-emoji-telethon | --export-viber | --export-whatsapp | --export-imessage]
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}]
-                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX]
-                          [--fps-power FPS_POWER] [--res-min RES_MIN] [--res-max RES_MAX]
-                          [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN]
-                          [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--res-snap-pow2]
-                          [--no-res-snap-pow2] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX]
-                          [--quality-power QUALITY_POWER] [--color-min COLOR_MIN] [--color-max COLOR_MAX]
-                          [--color-power COLOR_POWER] [--duration-min DURATION_MIN]
-                          [--duration-max DURATION_MAX] [--padding-percent PADDING_PERCENT]
-                          [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX]
-                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
-                          [--img-format IMG_FORMAT] [--fake-vid] [--no-fake-vid]
-                          [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
-                          [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH]
-                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
-                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
-                          [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
-                          [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH]
-                          [--kakao-username KAKAO_USERNAME] [--kakao-password KAKAO_PASSWORD]
-                          [--kakao-country-code KAKAO_COUNTRY_CODE]
-                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]
-                          [--line-cookies LINE_COOKIES] [--viber-auth VIBER_AUTH]
-                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH]
-                          [--discord-get-auth] [--discord-token DISCORD_TOKEN] [--save-cred]
+                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--fps-power FPS_POWER]
+                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX]
+                          [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--res-snap-pow2]
+                          [--no-res-snap-pow2] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
+                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER] [--duration-min DURATION_MIN]
+                          [--duration-max DURATION_MAX] [--padding-percent PADDING_PERCENT] [--bg-color BG_COLOR]
+                          [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
+                          [--img-format IMG_FORMAT] [--fake-vid] [--no-fake-vid] [--scale-filter SCALE_FILTER]
+                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
+                          [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID] [--telethon-setup]
+                          [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth-android-login] [--kakao-get-auth-desktop-memdump]
+                          [--kakao-get-auth-desktop-login] [--kakao-bin-path KAKAO_BIN_PATH] [--kakao-username KAKAO_USERNAME]
+                          [--kakao-password KAKAO_PASSWORD] [--kakao-country-code KAKAO_COUNTRY_CODE]
+                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--kakao-device-uuid KAKAO_DEVICE_UUID] [--line-get-auth]
+                          [--line-cookies LINE_COOKIES] [--viber-auth VIBER_AUTH] [--viber-get-auth VIBER_GET_AUTH]
+                          [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth] [--discord-token DISCORD_TOKEN] [--save-cred]
 
 CLI for stickers-convert
 
@@ -706,29 +699,35 @@ Credentials options:
   --telethon-setup      Setup Telethon
   --kakao-auth-token KAKAO_AUTH_TOKEN
                         Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx
-  --kakao-get-auth      Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.
-  --kakao-get-auth-desktop
-                        Get Kakao auth_token from Kakao Desktop application.
+  --kakao-get-auth-android-login
+                        Get Kakao auth_token by simulating login from Android. Kakao username, password, country code and phone number required.
+  --kakao-get-auth-desktop-memdump
+                        Get Kakao auth_token from installed Kakao Desktop application with memdump.
+  --kakao-get-auth-desktop-login
+                        Get Kakao auth_token by simulating login from Desktop application. Kakao username and password required.
   --kakao-bin-path KAKAO_BIN_PATH
                         Set Kakao Desktop application path for launching and getting auth_token.
                         Useful for portable installation.
   --kakao-username KAKAO_USERNAME
                         Set Kakao username, which is email or phone number used for signing up Kakao account
                         Example: +447700900142
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android/desktop login.
   --kakao-password KAKAO_PASSWORD
                         Set Kakao password (Password of Kakao account).
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android/desktop login.
   --kakao-country-code KAKAO_COUNTRY_CODE
                         Set Kakao country code of phone.
                         Example: 82 (For korea), 44 (For UK), 1 (For USA).
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android login.
   --kakao-phone-number KAKAO_PHONE_NUMBER
                         Set Kakao phone number (Phone number associated with your Kakao account)
                         Do NOT enter country code
                         Example: 7700900142
                         Used for send / receive verification code via SMS.
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android login.
+  --kakao-device-uuid KAKAO_DEVICE_UUID
+                        Set Kakao device uuid for desktop login. Defaults to real device uuid.
+                        Optional for getting Kakao auth_token by simulating desktop login
   --line-get-auth       Get Line cookies from browser, which is required to create custom message stickers.
   --line-cookies LINE_COOKIES
                         Set Line cookies, which is required to create custom message stickers.

{sticker_convert-2.13.3.0.dist-info → sticker_convert-2.14.0.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
-sticker_convert/cli.py,sha256=XsP-GE2XxOeseryXukIMR9MVdPOd7nhjO3Bp37WDxBM,22913
-sticker_convert/converter.py,sha256=6Yqq7nt0mYxoiuyF7nhDxuhvrAOOU8qCsiREWE1qf9M,41077
+sticker_convert/cli.py,sha256=AWdcGeMJudYb39Pxi28svPQrNs6pPpa-d-RhQN-Ryz8,23674
+sticker_convert/converter.py,sha256=7-XQbBUAqfc9mLuLTIkjjMeO-UTInldeRD32suFgNJo,41141
 sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWHc,2254
-sticker_convert/gui.py,sha256=4Yz9F57MhPgzODFYikT73aMBevcnEB4dwKvUsJnSJwY,34341
+sticker_convert/gui.py,sha256=kUEIfd7fYtvlGwc29VQV1dpQLn07Gv2WEeXuJDuAlsE,34571
 sticker_convert/job.py,sha256=AJoxWg61ZxQRHzKyGIrQaaCGs-S6NDO6lvWjddYemH8,28543
-sticker_convert/job_option.py,sha256=gWE7oV1azPcMeri-BrKbqMjpL0hbHE8yRPtOosRG580,8190
-sticker_convert/version.py,sha256=zkaUkSx4GNtFkhpch_kcfHX4GwPuBtPB9jxk7EqNaDw,49
+sticker_convert/job_option.py,sha256=unG8kt2cCK-Rmg45xkhD4JFt5ubx6P6JEvLvDeOeX_I,8222
+sticker_convert/version.py,sha256=u8HiSgljvPyJwWtEWrwe5go7kX6hzYxjhPg2UDJ2ssg,49
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_band.py,sha256=JPjwwdxbMXPBM9TXF76wT9mtoDCLssYnrm1iS2C6uVM,3629
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
@@ -32,7 +32,7 @@ sticker_convert/gui_components/windows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 sticker_convert/gui_components/windows/advanced_compression_window.py,sha256=mIkapYo93Kw7oa10in1yH-DwR3hX0D2JYJ7cTAs48bk,33748
 sticker_convert/gui_components/windows/base_window.py,sha256=xBE1peGMPvWsdrFej0CJUVhmQ57GJGvz-cX03nIIhkE,1108
 sticker_convert/gui_components/windows/discord_get_auth_window.py,sha256=a9ptBqtpZslQJ87-ZPotcT6gigouIHWAFijfkWv2rZQ,2786
-sticker_convert/gui_components/windows/kakao_get_auth_window.py,sha256=9YfzuKQE6bjfqFxkpCa4XxMnw2T1UPPI_A6Z8E75J_M,11953
+sticker_convert/gui_components/windows/kakao_get_auth_window.py,sha256=TH4yLi4YmydukTm4K99DficaxBne0tAAvbDzU3EYR0A,17624
 sticker_convert/gui_components/windows/line_get_auth_window.py,sha256=S4ES_lk2-GDvPokZtYALnUc5zW1VbS4WulNqO9K1aSs,3375
 sticker_convert/gui_components/windows/signal_get_auth_window.py,sha256=d9vWMfrD0s-qI-TmB0796LRvDW64Jh2wmA1mZcRubUw,3126
 sticker_convert/gui_components/windows/viber_get_auth_window.py,sha256=DI-RayYAfk6ig7NlGy97ulYgZZs77S8CEDIUJdtGDwI,5787
@@ -68,13 +68,13 @@ sticker_convert/ios-message-stickers-template/stickers.xcodeproj/project.xcworks
 sticker_convert/ios-message-stickers-template/stickers.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist,sha256=36D5u4W5XMupxoEa2t-MtAf7XVIIjonbg-vDCOxEhUI,238
 sticker_convert/ios-message-stickers-template/stickers.xcodeproj/project.xcworkspace/xcuserdata/niklaspeterson.xcuserdatad/UserInterfaceState.xcuserstate,sha256=GB0zcEgI5Ot4Djb1WUSpYFyBomrwM3I-9zlQ0tdonWQ,21835
 sticker_convert/ios-message-stickers-template/stickers.xcodeproj/xcuserdata/niklaspeterson.xcuserdatad/xcschemes/xcschememanagement.plist,sha256=uHJbEexYAQ1YSuNrCh2mYY_h67_OoJGLGlP0Fuo7lls,364
-sticker_convert/resources/NotoColorEmoji.ttf,sha256=Ptd4EMID4aZ3NdwZ05XzLCPy18DDaWaQ9PeOFeV6uBY,10195752
+sticker_convert/resources/NotoColorEmoji.ttf,sha256=cqY1yz0vNSTFFiDN3kBrIXIE6KagbGoJb_jtS1_W4ns,10673480
 sticker_convert/resources/appicon.icns,sha256=FB2DVTOQcFfQNZ9RcyG3z9c9k7eOiI1qw0IJhXMRFg4,5404
 sticker_convert/resources/appicon.ico,sha256=-ldugcl2Yq2pBRTktnhGKWInpKyWzRjCiPvMr3XPTlc,38078
 sticker_convert/resources/appicon.png,sha256=6XBEQz7PnerqS43aRkwpWolFG4WvKMuQ-st1ly-_JPg,5265
 sticker_convert/resources/compression.json,sha256=X3b3KCpf9KdHWjmV9KzXFf8KQYq7MSFk9O8WmzahVZg,16695
 sticker_convert/resources/emoji.json,sha256=q9DRFdVJfm7feZW7ZM6Xa5P1QsMvrn0PbBVU9jKcJKI,422720
-sticker_convert/resources/help.json,sha256=oDg0JghzaNrsVCzQ0BB_XKW3flsWfeQXrUd9WA34IDw,7811
+sticker_convert/resources/help.json,sha256=LpqTOvORlY2pqVjpN1RCRn2PuOzkxuRMCNw2UwEgCOM,8289
 sticker_convert/resources/input.json,sha256=cpLQQ-jwXSHQUd8faLn-e-mAEvJViKs_d7UuqIvF7ZQ,4575
 sticker_convert/resources/memdump_linux.sh,sha256=SFKXiE0ztZyGvpFYPOrdQ0wmY3ndgJuqfiofC7BQon0,625
 sticker_convert/resources/memdump_windows.ps1,sha256=CfyNSSEW3HJOkTu-mKrP3qh5aprN-1VCBfj-R1fELA0,302
@@ -93,12 +93,13 @@ sticker_convert/utils/process.py,sha256=y_W-D9zkxAEfPvYJZTKxNtNHxmuK0NldpDXu-OdG
 sticker_convert/utils/singletons.py,sha256=SiV374FxU68DpysGoj_ytU1ErINkeOBbP4s9QTcexeY,357
 sticker_convert/utils/url_detect.py,sha256=_wmI28hUyngq8TVz1bw7YM90qPLd3bIynawVlbr_lcI,939
 sticker_convert/utils/auth/get_discord_auth.py,sha256=8H9Z0c7pl6JjzkP8lo0-lCFnBAT5Eql-LYc6M92FY_k,4283
-sticker_convert/utils/auth/get_kakao_auth.py,sha256=Wok5sp0GGBgTwwlfYB7lVq82ndBAOGTcqsWEaWAXFNE,10760
-sticker_convert/utils/auth/get_kakao_desktop_auth.py,sha256=GNT-Y0lZwqRHuXfItmxRFC7kH81DuPRMDSfrbS-YSrw,8855
+sticker_convert/utils/auth/get_kakao_auth_android_login.py,sha256=YOyzNvPBUseoZBD8o3IoJsDA207G_sJGfZU3x1aUwTA,10772
+sticker_convert/utils/auth/get_kakao_auth_desktop_login.py,sha256=Lf_AzTzRW-NwYrayL7hwXIfQUYZxc03cnFB8WcyBwuE,10680
+sticker_convert/utils/auth/get_kakao_auth_desktop_memdump.py,sha256=GE4rjVx32zHmQbX8tuO8V_ZhBCcXv-sHdeqHEG5H6HI,8911
 sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
 sticker_convert/utils/auth/get_signal_auth.py,sha256=I6od2aj8yl1eLV8S2TtNQEPM77DC7FpkRKex0pXY2II,4580
 sticker_convert/utils/auth/get_viber_auth.py,sha256=aQiv1JI2RKiPVoo_JjbjcWwsUr2OK2FXMsFLPb3TtGU,8123
-sticker_convert/utils/auth/telegram_api.py,sha256=MAWNFA6Ttn-aO1g_waeIZkc4AMUH_Atds2x8-jhhQIU,24311
+sticker_convert/utils/auth/telegram_api.py,sha256=_DAtxE1vP5eChKyQ53WIdDzojH6YY4hza_LJPF5NZZQ,24368
 sticker_convert/utils/auth/telethon_setup.py,sha256=7VtsSM3n8qrN_VXV8hBaNSmApxgIPCa84Z08fRr43eQ,3309
 sticker_convert/utils/chromiums/linux.py,sha256=voWOxQVNy2icGDQfnZEa-2Nwrv-Qmuvt0v1L65hKnY8,1719
 sticker_convert/utils/chromiums/osx.py,sha256=ET6_uWZDbPCIN-GihMmjNcva0-WAyn0fA2-SzNn5wcU,3255
@@ -113,9 +114,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=HwA6eVh7cLhOlUoR_K9d_wyBRJ_ocGtB3GAyne_iZAU,16483
 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.13.3.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.13.3.0.dist-info/METADATA,sha256=StsXvUrWQSbRtZnrr57V-gKsVo2xB-fIionKSa3g-q4,56034
-sticker_convert-2.13.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sticker_convert-2.13.3.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.13.3.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.13.3.0.dist-info/RECORD,,
+sticker_convert-2.14.0.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.14.0.0.dist-info/METADATA,sha256=lef3juGzbeG_KZ71ntLIhD68ztCclv1_WlsYC5ZHmbU,56527
+sticker_convert-2.14.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sticker_convert-2.14.0.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.14.0.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.14.0.0.dist-info/RECORD,,