sticker-convert 2.10.9__tar.gz → 2.11.0__tar.gz

{sticker_convert-2.10.9/src/sticker_convert.egg-info → sticker_convert-2.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.10.9
+Version: 2.11.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>
@@ -368,6 +368,7 @@ Requires-Dist: anyio~=4.7.0
 Requires-Dist: apngasm_python~=1.3.1
 Requires-Dist: av~=13.1.0
 Requires-Dist: beautifulsoup4~=4.12.3
+Requires-Dist: cryptg~=0.5.0.post0
 Requires-Dist: rookiepy~=0.5.6
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.3
@@ -378,11 +379,12 @@ Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=10.4.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=21.9
-Requires-Dist: psutil~=6.1.0
+Requires-Dist: psutil~=6.1.1
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3
 Requires-Dist: rlottie_python~=1.3.6
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
+Requires-Dist: telethon~=1.38.1
 Requires-Dist: tqdm~=4.67.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 Requires-Dist: websocket_client~=1.8.0
@@ -424,16 +426,16 @@ Requires-Dist: websocket_client~=1.8.0
 - [DISCLAIMER](#disclaimer)
 
 ## Compatibility
-| Application                           | ⬇️ Download                         | ⬆️ Upload                                          |
-| ------------------------------------- | ------------------------------------| --------------------------------------------------- |
-| [Signal](docs/guide_signal.md)        | ✅                                  | ✅ (Require `uuid` & `password` or manually)       |
-| [Telegram](docs/guide_telegram.md)    | ✅ (Require `token`)                | ✅ (Require `token` & `user_id` 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)            |
-| [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) |
+| Application                           | ⬇️ Download                         | ⬆️ Upload                                                |
+| ------------------------------------- | ------------------------------------| --------------------------------------------------------- |
+| [Signal](docs/guide_signal.md)        | ✅                                  | ✅ (Require `uuid` & `password` or manually)             |
+| [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)                  |
+| [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)       |
 
 ✅ = Supported ⭕ = Partially supported 🚫 = Not supported
 
@@ -443,8 +445,8 @@ Requires-Dist: websocket_client~=1.8.0
         - `uuid` and `password` are needed if you want to automatically upload the pack with the program. View FAQ for more information.
         - Alternatively, you may use Signal Desktop to manually upload and create sticker pack with the output of this prorgam.
 - Telegram
-    - Download: Supported (e.g. `https://telegram.me/addstickers/xxxxx`) for both stickers and custom emoji, but require bot token.
-    - Upload: Supported for both stickers and custom emoji, but require bot token and user_id. Alternatively, you may manually upload and create sticker pack with the output of this program.
+    - Download: Supported (e.g. `https://telegram.me/addstickers/xxxxx`) for both stickers and custom emoji, but require bot token or setup Telethon
+    - Upload: Supported for both stickers and custom emoji, but require bot token and user_id or setup Telethon. Alternatively, you may manually upload and create sticker pack with the output of this program.
 - WhatsApp
     - Download: You have to manually find sticker packs / extract from your phone or from WhatsApp Web.
         - Android Phone: Inside `/storage/emulated/0/Whatsapp/media/Whatsapp Stickers` OR `/storage/emulated/0/Android/media/com.whatsapp/WhatsApp/Media/WhatsApp Stickers`
@@ -485,22 +487,30 @@ Requires-Dist: websocket_client~=1.8.0
 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]
-                          [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
+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-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-viber | --export-whatsapp | --export-imessage] [--no-compress]
+                          [--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,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]
-                          [--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] [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI]
-                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--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 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]
+                          [--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] [--scale-filter SCALE_FILTER]
+                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--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]
 
 CLI for stickers-convert
 
@@ -527,6 +537,10 @@ Input options:
                         Download telegram stickers from a URL as input
                         (Example: https://telegram.me/addstickers/xxxxx
                          OR https://telegram.me/addemoji/xxxxx)
+  --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON
+                        Download telegram stickers from a URL as input with Telethon
+                        (Example: https://telegram.me/addstickers/xxxxx
+                         OR https://telegram.me/addemoji/xxxxx)
   --download-line DOWNLOAD_LINE
                         Download line stickers from a URL / ID as input
                         (Example: https://store.line.me/stickershop/product/1234/en
@@ -557,6 +571,10 @@ Output options:
   --export-telegram     Upload to Telegram
   --export-telegram-emoji
                         Upload to Telegram (Custom emoji)
+  --export-telegram-telethon
+                        Upload to Telegram with Telethon *Not recommended, but allow link not end with _by_xxxbot*
+  --export-telegram-emoji-telethon
+                        Upload to Telegram with Telethon (Custom emoji) *Not recommended, but allow link not end with _by_xxxbot*
   --export-viber        Upload to Viber
   --export-whatsapp     Create a .wastickers file for uploading to WhatsApp
   --export-imessage     Create Xcode project for importing to iMessage
@@ -650,7 +668,8 @@ Credentials options:
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
-                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
+                        Set Telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
+  --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.
@@ -691,8 +710,7 @@ Credentials options:
   --discord-get-auth    Get Discord token.
   --discord-token DISCORD_TOKEN
                         Set Discord token. Required for downloading Discord stickers and emojis.
-  --save-cred SAVE_CRED
-                        Save Signal and Telegram credentials.
+  --save-cred           Save credentials.
 ```
 
 If you are running python script directly, run with `src/sticker-convert.py`

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/README.md

@@ -35,16 +35,16 @@
 - [DISCLAIMER](#disclaimer)
 
 ## Compatibility
-| Application                           | ⬇️ Download                         | ⬆️ Upload                                          |
-| ------------------------------------- | ------------------------------------| --------------------------------------------------- |
-| [Signal](docs/guide_signal.md)        | ✅                                  | ✅ (Require `uuid` & `password` or manually)       |
-| [Telegram](docs/guide_telegram.md)    | ✅ (Require `token`)                | ✅ (Require `token` & `user_id` 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)            |
-| [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) |
+| Application                           | ⬇️ Download                         | ⬆️ Upload                                                |
+| ------------------------------------- | ------------------------------------| --------------------------------------------------------- |
+| [Signal](docs/guide_signal.md)        | ✅                                  | ✅ (Require `uuid` & `password` or manually)             |
+| [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)                  |
+| [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)       |
 
 ✅ = Supported ⭕ = Partially supported 🚫 = Not supported
 
@@ -54,8 +54,8 @@
         - `uuid` and `password` are needed if you want to automatically upload the pack with the program. View FAQ for more information.
         - Alternatively, you may use Signal Desktop to manually upload and create sticker pack with the output of this prorgam.
 - Telegram
-    - Download: Supported (e.g. `https://telegram.me/addstickers/xxxxx`) for both stickers and custom emoji, but require bot token.
-    - Upload: Supported for both stickers and custom emoji, but require bot token and user_id. Alternatively, you may manually upload and create sticker pack with the output of this program.
+    - Download: Supported (e.g. `https://telegram.me/addstickers/xxxxx`) for both stickers and custom emoji, but require bot token or setup Telethon
+    - Upload: Supported for both stickers and custom emoji, but require bot token and user_id or setup Telethon. Alternatively, you may manually upload and create sticker pack with the output of this program.
 - WhatsApp
     - Download: You have to manually find sticker packs / extract from your phone or from WhatsApp Web.
         - Android Phone: Inside `/storage/emulated/0/Whatsapp/media/Whatsapp Stickers` OR `/storage/emulated/0/Android/media/com.whatsapp/WhatsApp/Media/WhatsApp Stickers`
@@ -96,22 +96,30 @@
 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]
-                          [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
+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-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-viber | --export-whatsapp | --export-imessage] [--no-compress]
+                          [--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,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]
-                          [--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] [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI]
-                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--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 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]
+                          [--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] [--scale-filter SCALE_FILTER]
+                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--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]
 
 CLI for stickers-convert
 
@@ -138,6 +146,10 @@ Input options:
                         Download telegram stickers from a URL as input
                         (Example: https://telegram.me/addstickers/xxxxx
                          OR https://telegram.me/addemoji/xxxxx)
+  --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON
+                        Download telegram stickers from a URL as input with Telethon
+                        (Example: https://telegram.me/addstickers/xxxxx
+                         OR https://telegram.me/addemoji/xxxxx)
   --download-line DOWNLOAD_LINE
                         Download line stickers from a URL / ID as input
                         (Example: https://store.line.me/stickershop/product/1234/en
@@ -168,6 +180,10 @@ Output options:
   --export-telegram     Upload to Telegram
   --export-telegram-emoji
                         Upload to Telegram (Custom emoji)
+  --export-telegram-telethon
+                        Upload to Telegram with Telethon *Not recommended, but allow link not end with _by_xxxbot*
+  --export-telegram-emoji-telethon
+                        Upload to Telegram with Telethon (Custom emoji) *Not recommended, but allow link not end with _by_xxxbot*
   --export-viber        Upload to Viber
   --export-whatsapp     Create a .wastickers file for uploading to WhatsApp
   --export-imessage     Create Xcode project for importing to iMessage
@@ -261,7 +277,8 @@ Credentials options:
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
-                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
+                        Set Telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
+  --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.
@@ -302,8 +319,7 @@ Credentials options:
   --discord-get-auth    Get Discord token.
   --discord-token DISCORD_TOKEN
                         Set Discord token. Required for downloading Discord stickers and emojis.
-  --save-cred SAVE_CRED
-                        Save Signal and Telegram credentials.
+  --save-cred           Save credentials.
 ```
 
 If you are running python script directly, run with `src/sticker-convert.py`

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/requirements.txt

@@ -3,6 +3,7 @@ anyio~=4.7.0
 apngasm_python~=1.3.1
 av~=13.1.0
 beautifulsoup4~=4.12.3
+cryptg~=0.5.0.post0
 rookiepy~=0.5.6
 httpx~=0.28.1
 imagequant~=1.1.3
@@ -13,11 +14,12 @@ numpy>=1.22.4
 Pillow~=10.4.0
 pyoxipng~=9.0.0
 python-telegram-bot~=21.9
-psutil~=6.1.0
+psutil~=6.1.1
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.6
 signalstickers-client-fork-laggykiller~=3.3.0.post2
+telethon~=1.38.1
 tqdm~=4.67.1
 ttkbootstrap-fork-laggykiller~=1.5.1
 websocket_client~=1.8.0

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/src/sticker_convert/cli.py

@@ -20,6 +20,7 @@ from sticker_convert.utils.auth.get_kakao_desktop_auth import GetKakaoDesktopAut
 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
+from sticker_convert.utils.auth.telethon_setup import TelethonSetup
 from sticker_convert.utils.callback import Callback
 from sticker_convert.utils.files.json_manager import JsonManager
 from sticker_convert.utils.url_detect import UrlDetect
@@ -168,10 +169,12 @@ class CLI:
         parser_cred = parser.add_argument_group("Credentials options")
         flags_cred_bool = (
             "signal_get_auth",
+            "telethon_setup",
             "kakao_get_auth",
             "kakao_get_auth_desktop",
             "line_get_auth",
             "discord_get_auth",
+            "save_cred",
         )
         for k, v in self.help["cred"].items():
             keyword_args = {}
@@ -226,6 +229,7 @@ class CLI:
             "signal": args.download_signal,
             "line": args.download_line,
             "telegram": args.download_telegram,
+            "telegram_telethon": args.download_telegram_telethon,
             "kakao": args.download_kakao,
             "viber": args.download_viber,
             "discord": args.download_discord,
@@ -266,6 +270,14 @@ class CLI:
             export_option = "signal"
         elif args.export_telegram:
             export_option = "telegram"
+        elif args.export_telegram_emoji:
+            export_option = "telegram_emoji"
+        elif args.export_telegram_telethon:
+            export_option = "telegram_telethon"
+        elif args.export_telegram_emoji_telethon:
+            export_option = "telegram_emoji_telethon"
+        elif args.export_viber:
+            export_option = "viber"
         elif args.export_imessage:
             export_option = "imessage"
         else:
@@ -291,6 +303,10 @@ class CLI:
                         args.export_whatsapp,
                         args.export_signal,
                         args.export_telegram,
+                        args.export_telegram_emoji,
+                        args.export_telegram_telethon,
+                        args.export_telegram_emoji_telethon,
+                        args.export_viber,
                         args.export_imessage,
                     )
                 )
@@ -302,8 +318,12 @@ class CLI:
                 preset = "whatsapp"
             elif args.export_signal:
                 preset = "signal"
-            elif args.export_telegram:
+            elif args.export_telegram or args.export_telegram_telethon:
                 preset = "telegram"
+            elif args.export_telegram_emoji or args.export_telegram_emoji_telethon:
+                preset = "telegram_emoji"
+            elif args.export_viber:
+                preset = "viber"
             elif args.export_imessage:
                 preset = "imessage_small"
         elif args.preset == "auto":
@@ -316,6 +336,12 @@ class CLI:
                 self.cb.msg(
                     "Auto compression option set to no_compress (Reason: Export to local directory only)"
                 )
+            elif "telegram_emoji" in output_option:
+                preset = "telegram_emoji"
+                self.cb.msg(f"Auto compression option set to {preset}")
+            elif "telegram" in output_option:
+                preset = "telegram"
+                self.cb.msg(f"Auto compression option set to {preset}")
             elif output_option == "imessage":
                 preset = "imessage_small"
                 self.cb.msg(f"Auto compression option set to {preset}")
@@ -445,6 +471,8 @@ class CLI:
             telegram_userid=args.telegram_userid
             if args.telegram_userid
             else creds.get("telegram", {}).get("userid"),
+            telethon_api_id=creds.get("telethon", {}).get("api_id"),
+            telethon_api_hash=creds.get("telethon", {}).get("api_hash"),
             kakao_auth_token=args.kakao_auth_token
             if args.kakao_auth_token
             else creds.get("kakao", {}).get("auth_token"),
@@ -511,6 +539,16 @@ class CLI:
 
             self.cb.msg("Failed to get uuid and password")
 
+        if args.telethon_setup:
+            telethon_setup = TelethonSetup(opt_cred, self.cb.ask_str)
+            success, _, telethon_api_id, telethon_api_hash = telethon_setup.start()
+
+            if success:
+                opt_cred.telethon_api_id = telethon_api_id
+                opt_cred.telethon_api_hash = telethon_api_hash
+
+                self.cb.msg("Telethon setup successful")
+
         if args.line_get_auth:
             get_line_auth = GetLineAuth()
 

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/src/sticker_convert/converter.py

@@ -434,7 +434,7 @@ class StickerConvert:
                 # Pillow is not reliable for getting webp frame durations
                 durations: Optional[List[int]]
                 if im.format == "WEBP":
-                    _, _, _, durations = CodecInfo._get_file_fps_frames_duration_webp(
+                    _, _, _, durations = CodecInfo._get_file_fps_frames_duration_webp(  # type: ignore
                         self.in_f
                     )
                 else:
@@ -764,7 +764,7 @@ class StickerConvert:
             format=self.out_f.suffix.replace(".", ""),
             options=options_container,
         ) as output:
-            out_stream = output.add_stream(codec, rate=self.fps, options=options_stream)
+            out_stream = output.add_stream(codec, rate=self.fps, options=options_stream)  # type: ignore
             out_stream = cast(VideoStream, out_stream)
             assert isinstance(self.res_w, int) and isinstance(self.res_h, int)
             out_stream.width = self.res_w
@@ -811,9 +811,12 @@ class StickerConvert:
         elif self.out_f.suffix == ".webp":
             im_out = [Image.fromarray(i) for i in self.frames_processed]  # type: ignore
             extra_kwargs["format"] = "WebP"
-            # Enabling below is too slow
-            # extra_kwargs["minimize_size"] = True
-            # extra_kwargs["method"] = 6
+            extra_kwargs["allow_mixed"] = True
+            if self.quality:
+                if self.quality < 20:
+                    extra_kwargs["minimize_size"] = True
+                extra_kwargs["method"] = 4 + int(2 * (100 - self.quality) / 100)
+                extra_kwargs["alpha_quality"] = self.quality
         else:
             raise RuntimeError(f"Invalid format {self.out_f.suffix}")
 

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/src/sticker_convert/downloaders/download_base.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from functools import partial
 from pathlib import Path
-from typing import Any, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import anyio
 import httpx
@@ -34,8 +34,8 @@ class DownloadBase:
         retries: int = 3,
         headers: Optional[dict[Any, Any]] = None,
         **kwargs: Any,
-    ) -> dict[str, bool]:
-        results: dict[str, bool] = {}
+    ) -> Dict[str, bool]:
+        results: Dict[str, bool] = {}
         anyio.run(
             partial(
                 self.download_multiple_files_async,

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/src/sticker_convert/downloaders/download_signal.py

@@ -63,11 +63,13 @@ class DownloadSignal(DownloadBase):
         )
 
     def download_stickers_signal(self) -> Tuple[int, int]:
-        if "signal.art" not in self.url:
+        if "signal.art" not in self.url or not self.url.startswith(
+            "sgnl://addstickers/"
+        ):
             self.cb.put("Download failed: Unrecognized URL format")
             return 0, 0
 
-        pack_id = self.url.split("#pack_id=")[1].split("&pack_key=")[0]
+        pack_id = self.url.split("pack_id=")[1].split("&pack_key=")[0]
         pack_key = self.url.split("&pack_key=")[1]
 
         try:

sticker_convert-2.11.0/src/sticker_convert/downloaders/download_telegram.py

@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+from pathlib import Path
+from typing import Optional, Tuple
+from urllib.parse import urlparse
+
+import anyio
+
+from sticker_convert.downloaders.download_base import DownloadBase
+from sticker_convert.job_option import CredOption, InputOption
+from sticker_convert.utils.auth.telegram_api import BotAPI, TelegramAPI, TelethonAPI
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.files.metadata_handler import MetadataHandler
+
+
+class DownloadTelegram(DownloadBase):
+    # def __init__(self, *args: Any, **kwargs: Any) -> None:
+    #     super().__init__(*args, **kwargs)
+
+    def download_stickers_telegram(self) -> Tuple[int, int]:
+        if not ("telegram.me" in self.url or "t.me" in self.url):
+            self.cb.put("Download failed: Unrecognized URL format")
+            return 0, 0
+
+        return anyio.run(self.save_stickers)
+
+    async def save_stickers(self) -> Tuple[int, int]:
+        tg_api: TelegramAPI
+        if self.input_option.endswith("telethon"):
+            tg_api = TelethonAPI()
+        else:
+            tg_api = BotAPI()
+
+        if self.opt_cred is None:
+            self.cb.put("Download failed: No credentials")
+            return 0, 0
+
+        success = await tg_api.setup(self.opt_cred, False, self.cb, self.cb_return)
+        if success is False:
+            self.cb.put("Download failed: Invalid credentials")
+            return 0, 0
+
+        title = Path(urlparse(self.url).path).name
+        results, emoji_dict = await tg_api.pack_dl(title, self.out_dir)
+        MetadataHandler.set_metadata(self.out_dir, title=title, emoji_dict=emoji_dict)
+        return sum(results.values()), len(results)
+
+    @staticmethod
+    def start(
+        opt_input: InputOption,
+        opt_cred: Optional[CredOption],
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> Tuple[int, int]:
+        downloader = DownloadTelegram(opt_input, opt_cred, cb, cb_return)
+        return downloader.download_stickers_telegram()

{sticker_convert-2.10.9 → sticker_convert-2.11.0}/src/sticker_convert/gui.py

@@ -154,6 +154,8 @@ class GUI(Window):
         self.signal_password_var = StringVar(self)
         self.telegram_token_var = StringVar(self)
         self.telegram_userid_var = StringVar(self)
+        self.telethon_api_id_var = IntVar(self)
+        self.telethon_api_hash_var = StringVar(self)
         self.kakao_auth_token_var = StringVar(self)
         self.kakao_username_var = StringVar(self)
         self.kakao_password_var = StringVar(self)
@@ -406,6 +408,10 @@ class GUI(Window):
         self.signal_password_var.set(self.creds.get("signal", {}).get("password", ""))
         self.telegram_token_var.set(self.creds.get("telegram", {}).get("token", ""))
         self.telegram_userid_var.set(self.creds.get("telegram", {}).get("userid", ""))
+        self.telethon_api_id_var.set(self.creds.get("telethon", {}).get("api_id", 0))
+        self.telethon_api_hash_var.set(
+            self.creds.get("telethon", {}).get("api_hash", "")
+        )
         self.kakao_auth_token_var.set(self.creds.get("kakao", {}).get("auth_token", ""))
         self.kakao_username_var.set(self.creds.get("kakao", {}).get("username", ""))
         self.kakao_password_var.set(self.creds.get("kakao", {}).get("password", ""))
@@ -451,6 +457,10 @@ class GUI(Window):
         selection = self.comp_preset_var.get()
         if selection == "auto":
             output_option = self.get_output_name()
+            if "telegram_emoji" in output_option:
+                return "telegram_emoji"
+            if "telegram" in output_option:
+                return "telegram"
             if output_option == "imessage":
                 return "imessage_small"
             if output_option == "local":
@@ -572,6 +582,8 @@ class GUI(Window):
             signal_password=self.signal_password_var.get(),
             telegram_token=self.telegram_token_var.get(),
             telegram_userid=self.telegram_userid_var.get(),
+            telethon_api_id=self.telethon_api_id_var.get(),
+            telethon_api_hash=self.telethon_api_hash_var.get(),
             kakao_auth_token=self.kakao_auth_token_var.get(),
             kakao_username=self.kakao_username_var.get(),
             kakao_password=self.kakao_password_var.get(),