sticker-convert 2.13.3.0__tar.gz → 2.15.0.0__tar.gz

{sticker_convert-2.13.3.0/src/sticker_convert.egg-info → sticker_convert-2.15.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.3.0
+Version: 2.15.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>
@@ -364,11 +364,12 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
-Requires-Dist: anyio~=4.10.0
+Requires-Dist: anyio~=4.11.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.14.2
 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: psutil~=7.0.0
+Requires-Dist: pyoxipng~=9.1.1
+Requires-Dist: python-telegram-bot~=22.5
+Requires-Dist: psutil~=7.1.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 → sticker_convert-2.15.0.0}/README.md

@@ -105,37 +105,29 @@
 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
 
@@ -314,29 +306,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 → sticker_convert-2.15.0.0}/requirements.txt

@@ -1,9 +1,10 @@
 aiolimiter~=1.2.1
-anyio~=4.10.0
+anyio~=4.11.0
 apngasm_python~=1.3.2
-av>=13.1.0
-beautifulsoup4~=4.13.4
+av>=13.1.0,<15
+beautifulsoup4~=4.14.2
 cryptg~=0.5.1
+cryptography~=46.0.1
 rookiepy~=0.5.6
 httpx~=0.28.1
 imagequant~=1.1.4
@@ -11,15 +12,15 @@ memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=11.3.0
-pyoxipng~=9.1.0
-python-telegram-bot~=22.3
-psutil~=7.0.0
+pyoxipng~=9.1.1
+python-telegram-bot~=22.5
+psutil~=7.1.0
 PyMemoryEditor~=1.5.24
 requests~=2.32.4
-rlottie_python~=1.3.7
+rlottie_python~=1.3.8
 signalstickers-client-fork-laggykiller~=3.3.0.post2
 socksio~=1.0.0
-telethon~=1.40.0
+telethon~=1.41.2
 tqdm~=4.67.1
 ttkbootstrap-fork-laggykiller~=1.5.1
 websocket_client~=1.8.0

sticker_convert-2.15.0.0/src/sticker_convert/auth/auth_base.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+from typing import Optional
+
+from sticker_convert.job_option import CredOption
+from sticker_convert.utils.callback import CallbackCli, CallbackProtocol
+
+
+class AuthBase:
+    def __init__(
+        self,
+        opt_cred: CredOption,
+        cb: Optional[CallbackProtocol] = None,
+    ) -> None:
+        self.opt_cred = opt_cred
+        self.cb: CallbackProtocol
+        if cb is None:
+            self.cb = CallbackCli()
+        else:
+            self.cb = cb

sticker_convert-2.13.3.0/src/sticker_convert/utils/auth/get_discord_auth.py → sticker_convert-2.15.0.0/src/sticker_convert/auth/auth_discord.py

@@ -4,23 +4,27 @@ import os
 import platform
 import shutil
 import time
-from typing import Callable, Optional, Tuple
+from pathlib import Path
+from typing import Any, Optional, Tuple
 from urllib.parse import urlparse
 
+from sticker_convert.auth.auth_base import AuthBase
 from sticker_convert.definitions import CONFIG_DIR
 from sticker_convert.utils.chrome_remotedebug import CRD
-from sticker_convert.utils.process import killall
+from sticker_convert.utils.process import find_pid_by_name, killall
 
+OK_MSG = "Got token successfully:\ntoken={token}"
+FAIL_MSG = "Failed to get token"
 
-class GetDiscordAuth:
-    def __init__(self, cb_msg: Callable[..., None] = print) -> None:
+
+class AuthDiscord(AuthBase):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
         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":
@@ -42,6 +46,8 @@ class GetDiscordAuth:
             for discord_dir, discord_bin in discord_win_dirs:
                 app_dir: Optional[str] = None
                 chrome_path: Optional[str] = None
+                if os.path.isdir(discord_dir) is False:
+                    continue
                 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)
@@ -67,6 +73,9 @@ class GetDiscordAuth:
         return None
 
     def get_cred(self) -> Tuple[Optional[str], str]:
+        msg = "Getting Discord authorization token..."
+        self.cb.put(("msg_dynamic", (msg,), None))
+
         using_discord_app = False
         chrome_path = self.get_discord_bin_path()
         if chrome_path is not None:
@@ -74,14 +83,26 @@ class GetDiscordAuth:
         else:
             chrome_path = CRD.get_chromium_path()
         if chrome_path is None:
+            self.cb.put(("msg_dynamic", (None,), None))
             return (
                 None,
                 "Please install Discord Desktop or Chrome/Chromium and try again",
             )
 
         token = None
-        if using_discord_app:
-            killall("discord")
+
+        if find_pid_by_name(Path(chrome_path).name):
+            response = self.cb.put(
+                (
+                    "ask_bool",
+                    (f"All {Path(chrome_path).name} will be closed. Continue?",),
+                    None,
+                )
+            )
+            if response is True:
+                killall(Path(chrome_path).name.lower())
+            else:
+                return None, FAIL_MSG
 
         crd = CRD(chrome_path)
         while True:
@@ -98,9 +119,14 @@ class GetDiscordAuth:
 
         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();"
-                )
+                if using_discord_app:
+                    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();"
+                    )
+                else:
+                    r = crd.exec_js(
+                        "const iframe=document.createElement('iframe');JSON.parse(document.body.appendChild(iframe).contentWindow.localStorage.token);"
+                    )
             except RuntimeError:
                 break
             if (
@@ -112,7 +138,8 @@ class GetDiscordAuth:
             time.sleep(1)
         crd.close()
 
+        self.cb.put(("msg_dynamic", (None,), None))
         if token is None:
-            return None, "Failed to get token"
+            return None, FAIL_MSG
 
-        return token, f"Got token successfully:\ntoken={token}"
+        return token, OK_MSG.format(token=token)