sticker-convert 2.9.4__tar.gz → 2.10.1__tar.gz

{sticker_convert-2.9.4/src/sticker_convert.egg-info → sticker_convert-2.10.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.9.4
-Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
+Version: 2.10.1
+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>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -349,7 +349,7 @@ Project-URL: Source, https://github.com/laggykiller/sticker-convert
 Project-URL: Documentation, https://github.com/laggykiller/sticker-convert
 Project-URL: Tracker, https://github.com/laggykiller/sticker-convert/issues
 Project-URL: Repository, https://github.com/laggykiller/sticker-convert
-Keywords: telegram,line,tgs,whatsapp,kakao,signal,imessage,wastickers,viber
+Keywords: telegram,line,tgs,whatsapp,kakao,signal,imessage,wastickers,viber,discord
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Topic :: Multimedia :: Graphics :: Graphics Conversion
@@ -370,6 +370,7 @@ Requires-Dist: apngasm_python~=1.3.1
 Requires-Dist: av~=12.3.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.2
+Requires-Dist: httpx~=0.27.0
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
@@ -383,17 +384,17 @@ 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: sqlcipher3-wheels~=0.5.2.post1
-Requires-Dist: tqdm~=4.66.4
+Requires-Dist: tqdm~=4.66.5
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
+Requires-Dist: websocket_client~=1.8.0
 
 # sticker-convert
-![imgs/banner.png](imgs/banner.png)
+![imgs/banner.png](https://socialify.git.ci/laggykiller/sticker-convert/image?description=1&font=Inter&logo=https%3A%2F%2Fgithub.com%2Flaggykiller%2Fsticker-convert%2Fblob%2Fmaster%2Fsrc%2Fsticker_convert%2Fresources%2Fappicon.png%3Fraw%3Dtrue&name=1&owner=1&theme=Dark)
 ![imgs/screenshot](imgs/screenshot.png)
 
 - A python script for creating, downloading, converting+compressing and uploading stickers from multiple instant messaging applications.
 - With GUI and CLI that runs on Windows, MacOS and Linux
-- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber, iMessage (Create Xcode sticker pack project)
+- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber, Discord (Download only), iMessage (Create Xcode sticker pack project)
 - Supports static and animated stickers, with transparency support
 
 ## Downloads
@@ -432,6 +433,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 | [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
@@ -441,14 +443,14 @@ Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
     - Upload: Supported
         - `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 (e.g. `https://telegram.me/addstickers/xxxxx`)
-    - Download: Supported for both stickers and custom emoji, but require bot token
+- 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.
 - WhatsApp
-    - Download: You have to manually find sticker packs / extract from your phone or from WhatsApp Web
+    - 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`
         - Any: Go to WhatsApp Web, right click on sticker and click "Save image as..."
-    - Upload: The program can create .wastickers file, which could then be imported into WhatsApp via a third-party app named 'Sticker Maker' (The author of this repo is NOT affiliated with Sticker Maker). View FAQ for more information
+    - Upload: The program can create .wastickers file, which could then be imported into WhatsApp via a third-party app named 'Sticker Maker' (The author of this repo is NOT affiliated with Sticker Maker). View FAQ for more information.
 - Line
     - Download: Supported (e.g. `https://store.line.me/stickershop/product/1234/en` OR `line://shop/detail/1234` OR `1234`)
         - Search on official site: https://store.line.me/stickershop
@@ -461,6 +463,9 @@ Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
     - Upload: Supported. Viber authentication data required for uploading Viber stickers, which could be fetched from Viber Desktop application automatically.
+- Discord
+    - Download: Supported (e.g. `https://discord.com/channels/169256939211980800/@home` OR `169256939211980800`), but require user token.
+    - Upload: Not supported.
 - iMessage
     - Download: Not supported.
     - Upload: The program can create Xcode project for iMessage sticker pack, which could then be compiled and sideloaded using Xcode.
@@ -481,31 +486,15 @@ Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 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]
-                          [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
-                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-viber | --export-imessage]
-                          [--no-compress]
-                          [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,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]
-                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN]
-                          [--kakao-get-auth] [--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]
-                          [--save-cred SAVE_CRED]
+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]
+                          [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE] [--export-signal | --export-telegram | --export-telegram-emoji | --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-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]
 
 CLI for stickers-convert
 
@@ -524,7 +513,7 @@ Input options:
                         Specify input directory.
   --download-auto DOWNLOAD_AUTO
                         Auto detect URL type and download
-                        (Supported input sources: Signal, Telegram, Line, Kakao, Viber)
+                        (Supported input sources: Signal, Telegram, Line, Kakao, Viber, Discord)
   --download-signal DOWNLOAD_SIGNAL
                         Download signal stickers from a URL as input
                         (Example: https://signal.art/addstickers/#pack_id=xxxxx&pack_key=xxxxx)
@@ -544,6 +533,14 @@ Input options:
                         Download viber stickers from a URL as input
                         (Example: https://stickers.viber.com/pages/example
                         OR https://stickers.viber.com/pages/custom-sticker-packs/example)
+  --download-discord DOWNLOAD_DISCORD
+                        Download discord stickers from a channel URL / ID as input
+                        (Example: https://discord.com/channels/169256939211980800/@home
+                        OR 169256939211980800)
+  --download-discord-emoji DOWNLOAD_DISCORD_EMOJI
+                        Download discord emojis from a channel URL / ID as input
+                        (Example: https://discord.com/channels/169256939211980800/@home
+                        OR 169256939211980800)
 
 Output options:
   --output-dir OUTPUT_DIR
@@ -554,13 +551,13 @@ Output options:
   --export-telegram     Upload to Telegram
   --export-telegram-emoji
                         Upload to Telegram (Custom emoji)
-  --export-whatsapp     Create a .wastickers file for uploading to WhatsApp
   --export-viber        Upload to Viber
+  --export-whatsapp     Create a .wastickers file for uploading to WhatsApp
   --export-imessage     Create Xcode project for importing to iMessage
 
 Compression options:
   --no-compress         Do not compress files. Useful for only downloading stickers.
-  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,imessage_small,imessage_medium,imessage_large,custom}
+  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}
                         Apply preset for compression.
   --steps STEPS         Set number of divisions between min and max settings.
                         Steps higher = Slower but yields file more closer to the specified file size limit.
@@ -644,9 +641,6 @@ Credentials options:
   --signal-password SIGNAL_PASSWORD
                         Set Signal password. Required for uploading Signal stickers.
   --signal-get-auth     Generate Signal uuid and password.
-  --signal-data-dir SIGNAL_DATA_DIR
-                        Optionally specify Signal data directory
-                        for getting uuid and password. Useful for portable Signal.
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
@@ -682,6 +676,9 @@ Credentials options:
   --viber-bin-path VIBER_BIN_PATH
                         Specify location of Viber Desktop application.
                         Useful for portable installation.
+  --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.
 ```
@@ -794,6 +791,7 @@ See [docs/COMPILING.md](docs/COMPILING.md)
 - [Line](docs/guide_line.md)
 - [Kakao](docs/guide_kakao.md)
 - [Viber](docs/guide_viber.md)
+- [Discord](docs/guide_discord.md)
 - [iMessage](docs/guide_imessage.md)
 
 ### Conversion is slow
@@ -854,5 +852,5 @@ See [docs/TODO.md](docs/TODO.md)
 - Banner generated from [GitHub Socialify](https://socialify.git.ci/)
 
 ## DISCLAIMER
-- The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Viber, iMessage or Sticker Maker.
+- The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Viber, Discord, iMessage or Sticker Maker.
 - The author of this repo is NOT repsonsible for any legal consequences and loss incurred from using this repo.

{sticker_convert-2.9.4 → sticker_convert-2.10.1}/README.md

@@ -1,10 +1,10 @@
 # sticker-convert
-![imgs/banner.png](imgs/banner.png)
+![imgs/banner.png](https://socialify.git.ci/laggykiller/sticker-convert/image?description=1&font=Inter&logo=https%3A%2F%2Fgithub.com%2Flaggykiller%2Fsticker-convert%2Fblob%2Fmaster%2Fsrc%2Fsticker_convert%2Fresources%2Fappicon.png%3Fraw%3Dtrue&name=1&owner=1&theme=Dark)
 ![imgs/screenshot](imgs/screenshot.png)
 
 - A python script for creating, downloading, converting+compressing and uploading stickers from multiple instant messaging applications.
 - With GUI and CLI that runs on Windows, MacOS and Linux
-- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber, iMessage (Create Xcode sticker pack project)
+- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber, Discord (Download only), iMessage (Create Xcode sticker pack project)
 - Supports static and animated stickers, with transparency support
 
 ## Downloads
@@ -43,6 +43,7 @@
 | [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
@@ -52,14 +53,14 @@
     - Upload: Supported
         - `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 (e.g. `https://telegram.me/addstickers/xxxxx`)
-    - Download: Supported for both stickers and custom emoji, but require bot token
+- 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.
 - WhatsApp
-    - Download: You have to manually find sticker packs / extract from your phone or from WhatsApp Web
+    - 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`
         - Any: Go to WhatsApp Web, right click on sticker and click "Save image as..."
-    - Upload: The program can create .wastickers file, which could then be imported into WhatsApp via a third-party app named 'Sticker Maker' (The author of this repo is NOT affiliated with Sticker Maker). View FAQ for more information
+    - Upload: The program can create .wastickers file, which could then be imported into WhatsApp via a third-party app named 'Sticker Maker' (The author of this repo is NOT affiliated with Sticker Maker). View FAQ for more information.
 - Line
     - Download: Supported (e.g. `https://store.line.me/stickershop/product/1234/en` OR `line://shop/detail/1234` OR `1234`)
         - Search on official site: https://store.line.me/stickershop
@@ -72,6 +73,9 @@
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
     - Upload: Supported. Viber authentication data required for uploading Viber stickers, which could be fetched from Viber Desktop application automatically.
+- Discord
+    - Download: Supported (e.g. `https://discord.com/channels/169256939211980800/@home` OR `169256939211980800`), but require user token.
+    - Upload: Not supported.
 - iMessage
     - Download: Not supported.
     - Upload: The program can create Xcode project for iMessage sticker pack, which could then be compiled and sideloaded using Xcode.
@@ -92,31 +96,15 @@
 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]
-                          [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
-                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-viber | --export-imessage]
-                          [--no-compress]
-                          [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,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]
-                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN]
-                          [--kakao-get-auth] [--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]
-                          [--save-cred SAVE_CRED]
+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]
+                          [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE] [--export-signal | --export-telegram | --export-telegram-emoji | --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-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]
 
 CLI for stickers-convert
 
@@ -135,7 +123,7 @@ Input options:
                         Specify input directory.
   --download-auto DOWNLOAD_AUTO
                         Auto detect URL type and download
-                        (Supported input sources: Signal, Telegram, Line, Kakao, Viber)
+                        (Supported input sources: Signal, Telegram, Line, Kakao, Viber, Discord)
   --download-signal DOWNLOAD_SIGNAL
                         Download signal stickers from a URL as input
                         (Example: https://signal.art/addstickers/#pack_id=xxxxx&pack_key=xxxxx)
@@ -155,6 +143,14 @@ Input options:
                         Download viber stickers from a URL as input
                         (Example: https://stickers.viber.com/pages/example
                         OR https://stickers.viber.com/pages/custom-sticker-packs/example)
+  --download-discord DOWNLOAD_DISCORD
+                        Download discord stickers from a channel URL / ID as input
+                        (Example: https://discord.com/channels/169256939211980800/@home
+                        OR 169256939211980800)
+  --download-discord-emoji DOWNLOAD_DISCORD_EMOJI
+                        Download discord emojis from a channel URL / ID as input
+                        (Example: https://discord.com/channels/169256939211980800/@home
+                        OR 169256939211980800)
 
 Output options:
   --output-dir OUTPUT_DIR
@@ -165,13 +161,13 @@ Output options:
   --export-telegram     Upload to Telegram
   --export-telegram-emoji
                         Upload to Telegram (Custom emoji)
-  --export-whatsapp     Create a .wastickers file for uploading to WhatsApp
   --export-viber        Upload to Viber
+  --export-whatsapp     Create a .wastickers file for uploading to WhatsApp
   --export-imessage     Create Xcode project for importing to iMessage
 
 Compression options:
   --no-compress         Do not compress files. Useful for only downloading stickers.
-  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,imessage_small,imessage_medium,imessage_large,custom}
+  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}
                         Apply preset for compression.
   --steps STEPS         Set number of divisions between min and max settings.
                         Steps higher = Slower but yields file more closer to the specified file size limit.
@@ -255,9 +251,6 @@ Credentials options:
   --signal-password SIGNAL_PASSWORD
                         Set Signal password. Required for uploading Signal stickers.
   --signal-get-auth     Generate Signal uuid and password.
-  --signal-data-dir SIGNAL_DATA_DIR
-                        Optionally specify Signal data directory
-                        for getting uuid and password. Useful for portable Signal.
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
@@ -293,6 +286,9 @@ Credentials options:
   --viber-bin-path VIBER_BIN_PATH
                         Specify location of Viber Desktop application.
                         Useful for portable installation.
+  --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.
 ```
@@ -405,6 +401,7 @@ See [docs/COMPILING.md](docs/COMPILING.md)
 - [Line](docs/guide_line.md)
 - [Kakao](docs/guide_kakao.md)
 - [Viber](docs/guide_viber.md)
+- [Discord](docs/guide_discord.md)
 - [iMessage](docs/guide_imessage.md)
 
 ### Conversion is slow
@@ -465,5 +462,5 @@ See [docs/TODO.md](docs/TODO.md)
 - Banner generated from [GitHub Socialify](https://socialify.git.ci/)
 
 ## DISCLAIMER
-- The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Viber, iMessage or Sticker Maker.
+- The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Viber, Discord, iMessage or Sticker Maker.
 - The author of this repo is NOT repsonsible for any legal consequences and loss incurred from using this repo.

{sticker_convert-2.9.4 → sticker_convert-2.10.1}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "sticker-convert"
-description = "Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python."
+description = "Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python."
 readme = "README.md"
 requires-python = ">=3.8"
 license = {file = "LICENSE"}
-keywords = ["telegram", "line", "tgs", "whatsapp", "kakao", "signal", "imessage", "wastickers", "viber"]
+keywords = ["telegram", "line", "tgs", "whatsapp", "kakao", "signal", "imessage", "wastickers", "viber", "discord"]
 authors = [
   {name = "laggykiller", email = "chaudominic2@gmail.com" } # Optional
 ]

sticker_convert-2.9.4/src/sticker_convert.egg-info/requires.txt → sticker_convert-2.10.1/requirements.txt

@@ -4,6 +4,7 @@ apngasm_python~=1.3.1
 av~=12.3.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.2
+httpx~=0.27.0
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
@@ -17,6 +18,6 @@ PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.6
 signalstickers-client-fork-laggykiller~=3.3.0.post2
-sqlcipher3-wheels~=0.5.2.post1
-tqdm~=4.66.4
+tqdm~=4.66.5
 ttkbootstrap-fork-laggykiller~=1.5.1
+websocket_client~=1.8.0

{sticker_convert-2.9.4 → sticker_convert-2.10.1}/src/sticker_convert/cli.py

@@ -14,6 +14,7 @@ from mergedeep import merge  # type: ignore
 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_line_auth import GetLineAuth
 from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
@@ -164,7 +165,12 @@ class CLI:
         )
 
         parser_cred = parser.add_argument_group("Credentials options")
-        flags_cred_bool = ("signal_get_auth", "kakao_get_auth", "line_get_auth")
+        flags_cred_bool = (
+            "signal_get_auth",
+            "kakao_get_auth",
+            "line_get_auth",
+            "discord_get_auth",
+        )
         for k, v in self.help["cred"].items():
             keyword_args = {}
             if k in flags_cred_bool:
@@ -220,6 +226,8 @@ class CLI:
             "telegram": args.download_telegram,
             "kakao": args.download_kakao,
             "viber": args.download_viber,
+            "discord": args.download_discord,
+            "discord_emoji": args.download_discord_emoji,
         }
 
         download_option = "local"
@@ -456,6 +464,9 @@ class CLI:
             viber_auth=args.viber_auth
             if args.viber_auth
             else creds.get("viber", {}).get("auth"),
+            discord_token=args.discord_token
+            if args.discord_token
+            else creds.get("discord", {}).get("token"),
         )
 
         if args.kakao_get_auth:
@@ -473,23 +484,16 @@ class CLI:
                 self.cb.msg(f"Got auth_token successfully: {auth_token}")
 
         if args.signal_get_auth:
-            get_signal_auth = GetSignalAuth()
-
-            signal_bin_path = None
-            signal_user_data_dir = None
-            if args.signal_data_dir:
-                signal_bin_path = "(User specified)"
-                signal_user_data_dir = args.signal_data_dir
-
-            uuid, password, msg = get_signal_auth.get_cred(
-                signal_bin_path, signal_user_data_dir
-            )
+            m = GetSignalAuth(cb_msg=self.cb.msg, cb_ask_str=self.cb.ask_str)
 
+            uuid, password = m.get_cred()
             if uuid and password:
                 opt_cred.signal_uuid = uuid
                 opt_cred.signal_password = password
 
-            self.cb.msg(msg)
+                self.cb.msg(f"Got uuid and password successfully: {uuid}, {password}")
+
+            self.cb.msg("Failed to get uuid and password")
 
         if args.line_get_auth:
             get_line_auth = GetLineAuth()
@@ -519,6 +523,15 @@ class CLI:
 
             self.cb.msg(msg)
 
+        if args.discord_get_auth:
+            get_discord_auth = GetDiscordAuth(self.cb.msg)
+            discord_token, msg = get_discord_auth.get_cred()
+
+            if discord_token:
+                opt_cred.discord_token = discord_token
+
+            self.cb.msg(msg)
+
         if args.save_cred:
             creds_path = CONFIG_DIR / "creds.json"
             JsonManager.save_json(creds_path, opt_cred.to_dict())

{sticker_convert-2.9.4 → sticker_convert-2.10.1}/src/sticker_convert/downloaders/download_base.py

@@ -6,23 +6,24 @@ from pathlib import Path
 from typing import Any, List, Optional, Tuple
 
 import anyio
+import httpx
 import requests
 
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 
 
 class DownloadBase:
     def __init__(
         self,
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> None:
-        self.url = url
-        self.out_dir = out_dir
+        self.url = opt_input.url
+        self.out_dir = opt_input.dir
+        self.input_option = opt_input.option
         self.opt_cred = opt_cred
         self.cb = cb
         self.cb_return = cb_return
@@ -42,36 +43,32 @@ class DownloadBase:
             ("bar", None, {"set_progress_mode": "determinate", "steps": len(targets)})
         )
 
-        async with anyio.create_task_group() as tg:
-            for url, dest in targets:
-                tg.start_soon(self.download_file_async, url, dest, retries, **kwargs)
+        async with httpx.AsyncClient() as client:
+            async with anyio.create_task_group() as tg:
+                for url, dest in targets:
+                    tg.start_soon(
+                        self.download_file_async, client, url, dest, retries, **kwargs
+                    )
 
     async def download_file_async(
         self,
+        client: httpx.AsyncClient,
         url: str,
         dest: Path,
         retries: int = 3,
         **kwargs: Any,
     ) -> None:
+        self.cb.put(f"Downloading {url}")
         for retry in range(retries):
-            try:
-                response = requests.get(url, allow_redirects=True, **kwargs)
-
-                if not response.ok:
-                    self.cb.put("update_bar")
-                    raise requests.exceptions.RequestException(
-                        f"Error {response.status_code}"
-                    )
+            response = await client.get(url, follow_redirects=True, **kwargs)
 
-                self.cb.put(f"Downloading {url}")
-                with open(dest, "wb+") as f:
-                    f.write(response.content)
+            if response.is_success:
+                async with await anyio.open_file(dest, "wb+") as f:
+                    await f.write(response.content)
                 self.cb.put(f"Downloaded {url}")
-                break
-
-            except requests.exceptions.RequestException as e:
+            else:
                 self.cb.put(
-                    f"Cannot download {url} (tried {retry+1}/{retries} times): {e}"
+                    f"Error {response.status_code}: {url} (tried {retry+1}/{retries} times)"
                 )
 
         self.cb.put("update_bar")