sticker-convert 2.11.8__tar.gz → 2.11.9__tar.gz

{sticker_convert-2.11.8/src/sticker_convert.egg-info → sticker_convert-2.11.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.11.8
+Version: 2.11.9
 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>
@@ -374,7 +374,6 @@ Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
-Requires-Dist: mini-racer~=0.12.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
 Requires-Dist: pyoxipng~=9.0.0
@@ -437,7 +436,7 @@ Dynamic: license-file
 | [Telegram](docs/guide_telegram.md)    | ✅ (Require `token` or telethon)    | ✅ (Require `token` & `user_id` or telethon or manually) |
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker)       |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
-| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)                  |
+| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -462,7 +461,7 @@ Dynamic: license-file
         - For more information: https://github.com/doubleplusc/Line-sticker-downloader
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Kakao
-    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
+    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx`  OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
@@ -550,7 +549,7 @@ Input options:
                          OR https://line.me/S/sticker/1234/?lang=en OR line://shop/detail/1234 OR 1234)
   --download-kakao DOWNLOAD_KAKAO
                         Download kakao stickers from a URL / ID as input
-                        (Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400
+                        (Example: https://e.kakao.com/t/xxxxx 
                         OR https://emoticon.kakao.com/items/xxxxx OR 4404400)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/README.md

@@ -44,7 +44,7 @@
 | [Telegram](docs/guide_telegram.md)    | ✅ (Require `token` or telethon)    | ✅ (Require `token` & `user_id` or telethon or manually) |
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker)       |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
-| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)                  |
+| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -69,7 +69,7 @@
         - For more information: https://github.com/doubleplusc/Line-sticker-downloader
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Kakao
-    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
+    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx`  OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
@@ -157,7 +157,7 @@ Input options:
                          OR https://line.me/S/sticker/1234/?lang=en OR line://shop/detail/1234 OR 1234)
   --download-kakao DOWNLOAD_KAKAO
                         Download kakao stickers from a URL / ID as input
-                        (Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400
+                        (Example: https://e.kakao.com/t/xxxxx 
                         OR https://emoticon.kakao.com/items/xxxxx OR 4404400)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/requirements.txt

@@ -9,7 +9,6 @@ httpx~=0.28.1
 imagequant~=1.1.4
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
-mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=11.1.0
 pyoxipng~=9.0.0

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert/downloaders/download_kakao.py

@@ -4,12 +4,10 @@ from __future__ import annotations
 import itertools
 import json
 from pathlib import Path
-from typing import Any, List, Optional, Tuple, cast
+from typing import Any, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
-from bs4 import BeautifulSoup
-from py_mini_racer import MiniRacer
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption, InputOption
@@ -17,34 +15,32 @@ from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
 
-JSINJECT = """
-class osclass {
-    android = true;
-}
-class uaclass {
-    os = new osclass();
-}
-class util {
-    static userAgent() {
-        return new uaclass();
-    }
-}
-class daumtools {
-    static web2app(dataDict) {
-        return dataDict['urlScheme'];
-    }
-}
-class document {
-    static querySelectorAll(selectors) {
-        return [];
-    }
-}
-"""
-
 
 class MetadataKakao:
     @staticmethod
-    def get_item_code(title_ko: str, auth_token: str) -> Optional[str]:
+    def get_item_code_from_hash(hash: str, auth_token: str) -> Optional[str]:
+        headers = {
+            "Authorization": auth_token,
+        }
+
+        data = {"hashedItemCode": hash}
+
+        response = requests.post(
+            "https://talk-pilsner.kakao.com/emoticon/api/store/v3/item-code-by-hash",
+            headers=headers,
+            data=data,
+        )
+
+        if response.status_code != 200:
+            return None
+
+        response_json = json.loads(response.text)
+        item_code = response_json["itemCode"]
+
+        return item_code
+
+    @staticmethod
+    def get_item_code_from_title(title_ko: str, auth_token: str) -> Optional[str]:
         headers = {
             "Authorization": auth_token,
         }
@@ -112,66 +108,47 @@ class DownloadKakao(DownloadBase):
         self.pack_info_unauthed: Optional[dict[str, Any]] = None
         self.pack_info_authed: Optional[dict[str, Any]] = None
 
-    def get_info_from_share_link(self, url: str) -> Tuple[Optional[str], Optional[str]]:
-        headers = {"User-Agent": "Android"}
-
-        response = requests.get(url, headers=headers)
-        soup = BeautifulSoup(response.content.decode("utf-8", "ignore"), "html.parser")
-
-        pack_title_tag = soup.find("title")  # type: ignore
-        if not pack_title_tag:
-            return None, None
-
-        pack_title: str = pack_title_tag.string  # type: ignore
-
-        js = ""
-        for script_tag in soup.find_all("script"):
-            js = script_tag.string
-            if js and "daumtools.web2app" in js:
-                break
-        if "daumtools.web2app" not in js:
-            return None, None
-
-        js = JSINJECT + js
-
-        ctx = MiniRacer()
-        kakao_url = cast(str, ctx.eval(js))
-        item_code = urlparse(kakao_url).path.split("/")[2]
-
-        # Share link redirect to preview link if use desktop headers
-        # This allows us to find pack author
-        headers_desktop = {"User-Agent": "Chrome"}
-
-        response = requests.get(url, headers=headers_desktop, allow_redirects=True)
-        response.url
-
-        pack_title_url = urlparse(response.url).path.split("/")[-1]
-        pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(pack_title_url)
-        if pack_info_unauthed:
-            self.author = pack_info_unauthed["result"]["artist"]
-
-        return pack_title, item_code
-
     def download_stickers_kakao(self) -> Tuple[int, int]:
         self.auth_token = None
         if self.opt_cred:
             self.auth_token = self.opt_cred.kakao_auth_token
 
         if urlparse(self.url).netloc == "emoticon.kakao.com":
-            self.pack_title, item_code = self.get_info_from_share_link(self.url)
+            item_code = None
+            if self.auth_token is not None:
+                hash = urlparse(self.url).path.split("/")[-1]
+                item_code = MetadataKakao.get_item_code_from_hash(hash, self.auth_token)
 
-            if item_code:
-                return self.download_animated(item_code)
-            self.cb.put("Download failed: Cannot download metadata for sticker pack")
-            return 0, 0
+            # Share link redirect to preview link if use desktop headers
+            # This allows us to find pack author
+            headers_desktop = {"User-Agent": "Chrome"}
+
+            r = requests.get(self.url, headers=headers_desktop, allow_redirects=True)
+
+            self.pack_title = urlparse(r.url).path.split("/")[-1]
+            pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(self.pack_title)
+            if pack_info_unauthed is None:
+                self.cb.put("Download failed: Cannot download metadata for sticker pack")
+                return 0, 0
+
+            self.author = pack_info_unauthed["result"]["artist"]
+            thumbnail_urls = pack_info_unauthed["result"]["thumbnailUrls"]
 
-        if self.url.isnumeric() or self.url.startswith("kakaotalk://store/emoticon/"):
-            item_code = self.url.replace("kakaotalk://store/emoticon/", "")
+            if item_code is None:
+                if self.auth_token is None:
+                    self.cb.put("Warning: Downloading animated sticker requires auth_token")
+                else:
+                    self.cb.put("Warning: auth_token invalid, cannot download animated sticker")
+                self.cb.put("Downloading static stickers...")
+                self.download_static(thumbnail_urls)
+            else:
+                return self.download_animated(item_code)
 
+        if self.url.isnumeric():
             self.pack_title = None
             if self.auth_token:
                 self.pack_info_authed = MetadataKakao.get_pack_info_authed(
-                    item_code, self.auth_token
+                    self.url, self.auth_token
                 )
                 if self.pack_info_authed:
                     self.pack_title = self.pack_info_authed["itemUnitInfo"][0]["title"]
@@ -182,7 +159,7 @@ class DownloadKakao(DownloadBase):
                     )
                     self.cb.put("Continuing without getting pack_title")
 
-            return self.download_animated(item_code)
+            return self.download_animated(self.url)
 
         if urlparse(self.url).netloc == "e.kakao.com":
             self.pack_title = urlparse(self.url).path.split("/")[-1]
@@ -201,7 +178,9 @@ class DownloadKakao(DownloadBase):
             thumbnail_urls = self.pack_info_unauthed["result"]["thumbnailUrls"]
 
             if self.auth_token:
-                item_code = MetadataKakao.get_item_code(title_ko, self.auth_token)
+                item_code = MetadataKakao.get_item_code_from_title(
+                    title_ko, self.auth_token
+                )
                 if item_code:
                     return self.download_animated(item_code)
                 msg = "Warning: Cannot get item code.\n"

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert/resources/input.json

@@ -52,7 +52,7 @@
     "kakao": {
         "full_name": "Download from Kakao",
         "help": "Download kakao stickers from a URL / ID as input",
-        "example": "Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400\nOR https://emoticon.kakao.com/items/xxxxx OR 4404400",
+        "example": "Example: https://e.kakao.com/t/xxxxx \nOR https://emoticon.kakao.com/items/xxxxx OR 4404400",
         "address_lbls": "URL address / ID",
         "metadata_provides": {
             "title": true,

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert/utils/auth/get_kakao_auth.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, Dict, Optional
 from urllib.parse import parse_qs, urlparse
 
 import requests
+from bs4 import BeautifulSoup
 
 from sticker_convert.job_option import CredOption
 
@@ -32,10 +33,10 @@ class GetKakaoAuth:
         self.uuid_c = str(uuid.uuid4())
         self.device_info = (
             f"android/30; uuid={self.device_uuid}; ssaid={self.device_ssaid}; "
-            + 'model=ANDROID-SDK-BUILT-FOR-X86; screen_resolution=1080x1920; sim=310260/1/us; onestore=false; uvc2={"volume":5,"network_operator":"310260","is_roaming":"false","va":[],"brightness":102,"totalMemory":30866040,"batteryPct":1,"webviewVersion":"83.0.4103.106"}'
+            + "model=SDK_GPHONE_X86_64; screen_resolution=1080x1920; sim=310260/1/us; onestore=false; uvc3=null"
         )
         self.app_platform = "android"
-        self.app_version_number = "10.0.3"
+        self.app_version_number = self.get_version()
         self.app_language = "en"
         self.app_version = (
             f"{self.app_platform}/{self.app_version_number}/{self.app_language}"
@@ -44,7 +45,7 @@ class GetKakaoAuth:
         self.headers = {
             "Host": "katalk.kakao.com",
             "Accept-Language": "en",
-            "User-Agent": "KT/10.0.3 An/11 en",
+            "User-Agent": f"KT/{self.app_version_number} An/11 en",
             "Device-Info": self.device_info,
             "A": self.app_version,
             "C": self.uuid_c,
@@ -52,6 +53,20 @@ class GetKakaoAuth:
             "Connection": "close",
         }
 
+    def get_version(self) -> str:
+        # It is difficult to get app version number from Google Play
+        r = requests.get(
+            "https://apkpure.net/kakaotalk-messenger/com.kakao.talk/versions"
+        )
+        soup = BeautifulSoup(r.text, "html.parser")
+        for li in soup.find_all("li"):
+            a = li.find("a", class_="dt-version-icon")
+            if a is None:
+                continue
+            if "/kakaotalk-messenger/com.kakao.talk/download/" in a.get("href", ""):
+                return a.get("href").split("/")[-1]
+        return "25.2.1"
+
     def login(self) -> bool:
         self.cb_msg("Logging in")
 
@@ -96,7 +111,6 @@ class GetKakaoAuth:
             "countryCode": self.country_code,
             "countryIso": self.country_iso,
             "phoneNumber": self.phone_number,
-            "method": "sms",
             "termCodes": [],
             "simPhoneNumber": f"+{self.country_code}{self.phone_number}",
         }
@@ -244,6 +258,21 @@ class GetKakaoAuth:
             self.cb_msg_block(f"Failed at passcode callback: {response.text}")
             return False
 
+        return True
+
+    def skip_restoration(self) -> bool:
+        self.cb_msg("Skip restoration")
+
+        response = requests.post(
+            "https://katalk.kakao.com/android/account2/skip-restoration",
+            headers=self.headers,
+        )
+        response_json = json.loads(response.text)
+
+        if response_json["status"] != 0:
+            self.cb_msg_block(f"Failed at skip restoration: {response.text}")
+            return False
+
         self.nickname = response_json.get("viewData", {}).get("nickname")
 
         if self.nickname is None:
@@ -288,6 +317,7 @@ class GetKakaoAuth:
             self.enter_phone,
             self.confirm_device_change,
             self.passcode_callback,
+            self.skip_restoration,
             self.get_profile,
         )
 

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert/utils/auth/get_kakao_desktop_auth.py

@@ -105,7 +105,7 @@ class GetKakaoDesktopAuth:
             return None, msg
 
         auth_token = None
-        for i in re.finditer(b"\x00authorization\x00", s):
+        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]

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert/utils/url_detect.py

@@ -22,9 +22,7 @@ class UrlDetect:
         ):
             return "line"
 
-        if domain in ("e.kakao.com", "emoticon.kakao.com") or url.startswith(
-            "kakaotalk://store/emoticon/"
-        ):
+        if domain in ("e.kakao.com", "emoticon.kakao.com"):
             return "kakao"
 
         if domain == "stickers.viber.com":

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert/version.py

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

{sticker_convert-2.11.8 → sticker_convert-2.11.9/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.11.8
+Version: 2.11.9
 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>
@@ -374,7 +374,6 @@ Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
-Requires-Dist: mini-racer~=0.12.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
 Requires-Dist: pyoxipng~=9.0.0
@@ -437,7 +436,7 @@ Dynamic: license-file
 | [Telegram](docs/guide_telegram.md)    | ✅ (Require `token` or telethon)    | ✅ (Require `token` & `user_id` or telethon or manually) |
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker)       |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
-| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)                  |
+| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -462,7 +461,7 @@ Dynamic: license-file
         - For more information: https://github.com/doubleplusc/Line-sticker-downloader
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Kakao
-    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
+    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx`  OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
@@ -550,7 +549,7 @@ Input options:
                          OR https://line.me/S/sticker/1234/?lang=en OR line://shop/detail/1234 OR 1234)
   --download-kakao DOWNLOAD_KAKAO
                         Download kakao stickers from a URL / ID as input
-                        (Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400
+                        (Example: https://e.kakao.com/t/xxxxx 
                         OR https://emoticon.kakao.com/items/xxxxx OR 4404400)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input

{sticker_convert-2.11.8 → sticker_convert-2.11.9}/src/sticker_convert.egg-info/requires.txt

@@ -9,7 +9,6 @@ httpx~=0.28.1
 imagequant~=1.1.4
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
-mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=11.1.0
 pyoxipng~=9.0.0