diff --git a/BUILDING.md b/BUILDING.md index c9f0cf0..b8f6a26 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -8,8 +8,7 @@ - If you want Mutant Standard emoji patches, get 72x72 PNG copies of latest version of mutant standard emojis with codepoints. I have a zip [here](https://mutant.lavatech.top/72x72.zip). - If you want Blob emoji patches, get 72x72 PNG copies of blobmojis with codepoints. I personally resized the png/128 folder in this [repo](https://github.com/C1710/blobmoji) (`find /home/ave/blobmoji/png/72 -iname '*.png' -exec convert \{\} -verbose -resize 72x72\> \{\} \;`). - Extract the emojis you got somewhere. -- Clone this repo somewhere. -- Set your environment variables (see below), put them to somewhere where they'll persist (like your .bashrc/.zshrc, or preferably a build script). +- Clone this repo somewhere, edit `patches/mutant/emojireplace.py` and `patches/blobs/emojireplace.py`, set the `extracted_mutstd_path` and `extracted_blobmoji_path` folders respectively to the folder you just extracted emojis to. - Get a Discord apk (*cough* [apkmirror](https://www.apkmirror.com/apk/discord-inc/discord-chat-for-gamers/), [aptoide API](https://ws75.aptoide.com/api/7/app/getMeta?package_name=com.discord)). ### Using CutTheCord CI @@ -26,16 +25,9 @@ CTCCI requires python3.6+, and also likely requires Linux (I haven't tried it on - If you don't want to always automatically be required to use the latest discord version, set `LOCAL_STATE` to `True` and point `STATE_FILE` to a `state.json` file that looks like this: `{"android": {"com.discord": {"version": 909}}}`. - Set up a local distok-style file storage for your APKs, and copy your APKs on it, and name them properly (the format is `$DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk`, example: `/home/ave/distok/android/com.discord-909.apk`). -#### Environment Variables - -- `DISTOK_VERSION_LOGS` (required, default: `"/root/distokrepos/versionlogs/"`): Should point to an empty directory (such as `export DISTOK_VERSION_LOGS="/home/ave/distokversionlogs"`). This directory will hold versions that will increase with each build. This is a hack that I need to eventually re-design, preferably move to a json file etc. -- `DISTOK_EMOJI_MUTANT` (optional, default: `"/root/distokfiles/mutant/72x72"`): Folder with the mutant emoji files. This should be set if you're going to be enabling the mutant emoji patches. -- `DISTOK_EMOJI_BLOBMOJI` (optional, default: `"/root/distokfiles/blobmoji/png/72"`): Folder with the blobmoji files. This should be set if you're going to be enabling the blobmoji patches. -- `DISTOK_EXTRACTED_DISCORD_PATH` (complicated, default: `"/tmp/cutthecord/discord"`): Directory at which your extracted discord files reside. This is required on manual builds, but will be overriden by ctcci with `WORK_APK_PATH` if ctcci is being used. - #### Running builds -- Firstly, ensure that you properly set your environment variables! +- First off, if you're not running as root (you shouldn't!), set an environment variable called `DISTOK_VERSION_LOGS` to an empty directory (such as `export DISTOK_VERSION_LOGS="/home/ave/distokversionlogs"`). This directory will hold versions that will increase. This is a hack that I need to eventually improve. - Simply run the `ctcci.py` script, with first argument being branch name, and latter ones being name of patches you want to add in. Example: `python3.6 /home/ave/distokrepos/cutthecord/ctcci/ctcci.py ave mutant customfont slashcommands tokenlogin customtheme customdefaultemoji customring bettertm notrack noprofilestrip nonearby experiments noblocked squareavatars` diff --git a/README.md b/README.md index 2b9f62f..3a84d27 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 24-alpha2 (1148), released on 2020-05-24. +**Latest supported Discord Android version:** 23.0 (1146), released on 2020-05-19. New patch development will be done for the latest supported version. diff --git a/ctcci/ctcci.py b/ctcci/ctcci.py index 980d69e..e69296f 100644 --- a/ctcci/ctcci.py +++ b/ctcci/ctcci.py @@ -34,8 +34,6 @@ def patch(patch_file, workdir, patch_name=""): if os.path.exists(WORK_APK_PATH): shutil.rmtree(WORK_APK_PATH) -os.environ["DISTOK_EXTRACTED_DISCORD_PATH"] = WORK_APK_PATH - os.makedirs(WORK_FOLDER, exist_ok=True) if LOCAL_STATE: diff --git a/patches/blobs/emojireplace.py b/patches/blobs/emojireplace.py index 9248272..8f84611 100644 --- a/patches/blobs/emojireplace.py +++ b/patches/blobs/emojireplace.py @@ -2,9 +2,11 @@ import os import shutil -# You'll likely want to edit these lines or set DISTOK_EXTRACTED_DISCORD_PATH and DISTOK_EMOJI_BLOBMOJI -extracted_discord_path = os.environ.get("DISTOK_EXTRACTED_DISCORD_PATH", "/tmp/cutthecord/discord") -extracted_blobmoji_path = os.environ.get("DISTOK_EMOJI_BLOBMOJI", "/root/distokfiles/blobmoji/png/72") +# REPLACE THESE LINES +# extracted_discord_path = "/home/ave/workbench/ctc/com.discord-896" +# extracted_blobmoji_path = "/home/ave/workbench/blobmoji/png/72" +extracted_discord_path = "/tmp/cutthecord/discord" +extracted_blobmoji_path = "/home/ave/blobmoji/png/72" def clean_emoji_name(name): diff --git a/patches/branding/1148.patch b/patches/branding/1148.patch deleted file mode 100644 index c3fd6a4..0000000 --- a/patches/branding/1148.patch +++ /dev/null @@ -1,252 +0,0 @@ -diff -crB com.discord-base/AndroidManifest.xml com.discord/AndroidManifest.xml -*** com.discord-base/AndroidManifest.xml 2020-05-25 02:39:45.000000000 +0300 ---- com.discord/AndroidManifest.xml 2020-05-25 02:47:06.547660256 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 114,120 **** - - - -! - - - ---- 114,120 ---- - - - -! - - - -*************** -*** 144,150 **** - - - -! - - - ---- 144,150 ---- - - - -! - - - -*************** -*** 161,167 **** - - - -! - - - ---- 161,167 ---- - - - -! - - - -*************** -*** 176,182 **** - - - -! - - - ---- 176,182 ---- - - - -! - - - -*************** -*** 186,192 **** - - - -! - - - ---- 186,192 ---- - - - -! - - - -*************** -*** 226,239 **** - - - -! - - - - - -! -! - - -! -\ No newline at end of file ---- 226,239 ---- - - - -! - - - - - -! -! - - -! -diff -crB com.discord-base/apktool.yml com.discord/apktool.yml -*** com.discord-base/apktool.yml 2020-05-25 02:36:27.293542157 +0300 ---- com.discord/apktool.yml 2020-05-25 02:47:56.457981783 +0300 -*************** -*** 190,194 **** - tag: null - version: 2.4.2-83a459-SNAPSHOT - versionInfo: -! versionCode: '1148' -! versionName: 24-alpha2 ---- 190,194 ---- - tag: null - version: 2.4.2-83a459-SNAPSHOT - versionInfo: -! versionCode: '1148CTCBUILD' -! versionName: 24-alpha2-cutthecord-CTCBUILD -Only in com.discord: apktool.yml.orig -Only in com.discord: apktool.yml.rej -diff -crB com.discord-base/res/values/strings.xml com.discord/res/values/strings.xml -*** com.discord-base/res/values/strings.xml 2020-05-25 02:36:22.140175625 +0300 ---- com.discord/res/values/strings.xml 2020-05-25 02:47:06.550993611 +0300 -*************** -*** 1406,1412 **** - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! Discord - Discord is an all-in-one communication app for your friends, communities, and gaming. - Team voice & text chat - discord.gg/ ---- 1406,1412 ---- - Disconnecting your account might remove you from servers you joined via this account. - Disconnect %1$s - Disconnect from Voice -! CTCNAME - Discord is an all-in-one communication app for your friends, communities, and gaming. - Team voice & text chat - discord.gg/ -*************** -*** 3814,3820 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Setup notifications to know when your friends send a message. ---- 3814,3820 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Setup notifications to know when your friends send a message. -*************** -*** 5147,5153 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 5147,5153 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds -Only in com.discord/res/values: strings.xml.orig -diff -crB com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-25 02:36:24.293522830 +0300 ---- com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-25 02:47:06.550993611 +0300 -*************** -*** 76,82 **** - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discord.com/app" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 76,82 ---- - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; - diff --git a/patches/branding/README.md b/patches/branding/README.md index 9a4d32a..0317956 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -175,5 +175,4 @@ You can use the following line to patch authorities: - 22.4 - 22.5 - 23.0 -- 24-alpha2 diff --git a/patches/customtheme/1148.patch b/patches/customtheme/1148.patch deleted file mode 100644 index 3b3459d..0000000 --- a/patches/customtheme/1148.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff -crB com.discord-base/res/drawable/drawable_bg_corners_20dp.xml com.discord/res/drawable/drawable_bg_corners_20dp.xml -*** com.discord-base/res/drawable/drawable_bg_corners_20dp.xml 2020-05-25 02:36:21.146835892 +0300 ---- com.discord/res/drawable/drawable_bg_corners_20dp.xml 2020-05-25 02:49:23.685210370 +0300 -*************** -*** 1,6 **** - - -! - - -\ No newline at end of file ---- 1,6 ---- - - -! - - -\ No newline at end of file -diff -crB com.discord-base/res/drawable/drawable_circle_black.xml com.discord/res/drawable/drawable_circle_black.xml -*** com.discord-base/res/drawable/drawable_circle_black.xml 2020-05-25 02:36:19.926828033 +0300 ---- com.discord/res/drawable/drawable_circle_black.xml 2020-05-25 02:49:23.685210370 +0300 -*************** -*** 1,5 **** - - -! - -\ No newline at end of file ---- 1,5 ---- - - -! - -\ No newline at end of file -diff -crB com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord/res/drawable/drawable_overlay_channels_active_dark.xml -*** com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-05-25 02:36:20.423497899 +0300 ---- com.discord/res/drawable/drawable_overlay_channels_active_dark.xml 2020-05-25 02:49:23.685210370 +0300 -*************** -*** 3,9 **** - xmlns:android="http://schemas.android.com/apk/res/android"> - - -! - - - ---- 3,9 ---- - xmlns:android="http://schemas.android.com/apk/res/android"> - - -! - - - -diff -crB com.discord-base/res/values/colors.xml com.discord/res/values/colors.xml -*** com.discord-base/res/values/colors.xml 2020-05-25 02:36:22.246842979 +0300 ---- com.discord/res/values/colors.xml 2020-05-25 02:49:23.685210370 +0300 -*************** -*** 103,112 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 -! #ff121212 - #ffcf6679 - #ffffffff - #ff000000 ---- 103,112 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 -! #ff000000 - #ffcf6679 - #ffffffff - #ff000000 -*************** -*** 118,124 **** - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff121212 - #ffffffff - #ffb00020 - #ff000000 ---- 118,124 ---- - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff000000 - #ffffffff - #ffb00020 - #ff000000 -*************** -*** 163,170 **** - #4d737f8d - #ff949494 - #0d4f545c -! #ff282b30 -! #ff8a8e94 - #6680cbc4 - #66009688 - #ff9c84ef ---- 163,170 ---- - #4d737f8d - #ff949494 - #0d4f545c -! #ff000000 -! #ff000000 - #6680cbc4 - #66009688 - #ff9c84ef -*************** -*** 174,180 **** - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd ---- 174,180 ---- - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd -*************** -*** 262,281 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #334f545c -! #4d4f545c -! #514f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 -! #ff292b2f -! #ff202225 -! #99202225 - #ff18191c - #9918191c - #e618191c ---- 262,281 ---- - #ff72767d - #4d72767d - #9972767d -! #ff333333 -! #330f0f0f -! #4d0f0f0f -! #510f0f0f -! #990f0f0f - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 -! #ff000000 -! #ff000000 -! #990f0f0f - #ff18191c - #9918191c - #e618191c -*************** -*** 299,308 **** - #ff4f545c - #ff484c54 - #ff40444b -! #ff36393f -! #ff2f3136 - #ff292b2f -! #ff202225 - #ff1e1f22 - #ff1b1d20 - #ff18191c ---- 299,308 ---- - #ff4f545c - #ff484c54 - #ff40444b -! #ff000000 -! #ff000000 - #ff292b2f -! #ff000000 - #ff1e1f22 - #ff1b1d20 - #ff18191c -*************** -*** 347,355 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 347,355 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 488,494 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 488,494 ---- - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6000000 - #e6ffffff - @android:color/transparent - #ff593695 -diff -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml -*** com.discord-base/res/values/styles.xml 2020-05-25 02:36:21.716839564 +0300 ---- com.discord/res/values/styles.xml 2020-05-25 02:49:23.685210370 +0300 -*************** -*** 385,391 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/primary_630 - @color/grey_account ---- 385,391 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/primary_630 - @color/grey_account -*************** -*** 397,409 **** - @color/chat_input_button_tint_colors_dark - @drawable/drawable_rect_rounded_dark - @color/dark_grey_2_alpha_10 -! #ff3e4145 - @drawable/ic_img_selected_dark_theme - @color/white -! #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_700 - @color/white_alpha_10 - @color/primary_600 - @drawable/ic_emoji_activity_dark ---- 397,409 ---- - @color/chat_input_button_tint_colors_dark - @drawable/drawable_rect_rounded_dark - @color/dark_grey_2_alpha_10 -! @color/primary_600 - @drawable/ic_img_selected_dark_theme - @color/white -! @color/purple_brand_alpha_10 - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_500 - @color/white_alpha_10 - @color/primary_600 - @drawable/ic_emoji_activity_dark -*************** -*** 812,818 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -