From f5bf44fa4879fd78e62b23fcb16a8f019ebf230f Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Thu, 3 Oct 2019 08:52:14 +0300 Subject: [PATCH] 9.6.5 --- README.md | 2 +- patches/branding/965.patch | 230 ++ patches/branding/README.md | 1 + patches/compact/965.patch | 78 + patches/compact/README.md | 1 + patches/customdefaultemoji/965.patch | 80 + patches/customdefaultemoji/README.md | 1 + patches/customtheme/965.patch | 292 ++ patches/customtheme/README.md | 1 + patches/customversion/965.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/965.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/965.patch | 199 ++ patches/experiments/README.md | 1 + patches/litecord/965.patch | 293 ++ patches/litecord/README.md | 1 + patches/mutant/965.patch | 1909 +++++++++++++ patches/mutant/README.md | 1 + patches/necessary/965.patch | 14 + patches/noblocked/965.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/965.patch | 100 + patches/nonearby/README.md | 1 + patches/noprofilestrip/965.patch | 54 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/965.patch | 64 + patches/nospoiler/README.md | 1 + patches/notrack/965.patch | 3076 ++++++++++++++++++++ patches/nozlib/965.patch | 37 + patches/nozlib/README.md | 1 + patches/pureevil/965.patch | 45 + patches/pureevil/README.md | 1 + patches/slashcommands/965.patch | 3125 +++++++++++++++++++++ patches/slashcommands/README.md | 1 + patches/smalltime/965.patch | 190 ++ patches/smalltime/README.md | 1 + patches/squareavatars/965.patch | 21 + patches/squareavatars/README.md | 1 + patches/tokenlogin/965.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 42 files changed, 9919 insertions(+), 2 deletions(-) create mode 100644 patches/branding/965.patch create mode 100644 patches/compact/965.patch create mode 100644 patches/customdefaultemoji/965.patch create mode 100644 patches/customtheme/965.patch create mode 100644 patches/customversion/965.patch create mode 100644 patches/disable-mobileindicator/965.patch create mode 100644 patches/experiments/965.patch create mode 100644 patches/litecord/965.patch create mode 100644 patches/mutant/965.patch create mode 100644 patches/necessary/965.patch create mode 100644 patches/noblocked/965.patch create mode 100644 patches/nonearby/965.patch create mode 100644 patches/noprofilestrip/965.patch create mode 100644 patches/nospoiler/965.patch create mode 100644 patches/notrack/965.patch create mode 100644 patches/nozlib/965.patch create mode 100644 patches/pureevil/965.patch create mode 100644 patches/slashcommands/965.patch create mode 100644 patches/smalltime/965.patch create mode 100644 patches/squareavatars/965.patch create mode 100644 patches/tokenlogin/965.patch diff --git a/README.md b/README.md index 8963436..1922e30 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 9.6.4 (964), released on 2019-10-01. +**Latest supported Discord Android version:** 9.6.5 (965), released on 2019-10-03. New patch development will be done for the latest supported version. diff --git a/patches/branding/965.patch b/patches/branding/965.patch new file mode 100644 index 0000000..c7e8ed6 --- /dev/null +++ b/patches/branding/965.patch @@ -0,0 +1,230 @@ +diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManifest.xml +*** com.discord-965-base/AndroidManifest.xml 2019-10-03 08:11:33.587135682 +0300 +--- com.discord-965/AndroidManifest.xml 2019-10-03 08:22:45.367231869 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 24,30 **** + + + +! + + + +--- 24,30 ---- + + + +! + + + +*************** +*** 79,85 **** + + + +! + + + +--- 79,85 ---- + + + +! + + + +*************** +*** 109,122 **** + + + +! + + + + + + +! + + + +--- 109,122 ---- + + + +! + + + + + + +! + + + +*************** +*** 179,185 **** + + + +! + + + +--- 179,185 ---- + + + +! + + + +*************** +*** 190,197 **** + + + +! +! + + + +--- 190,197 ---- + + + +! +! + + + +Only in com.discord-965: AndroidManifest.xml.orig +Only in com.discord-965: AndroidManifest.xml.rej +diff -crB com.discord-965-base/apktool.yml com.discord-965/apktool.yml +*** com.discord-965-base/apktool.yml 2019-10-03 08:11:21.017081408 +0300 +--- com.discord-965/apktool.yml 2019-10-03 08:21:54.563724932 +0300 +*************** +*** 181,185 **** + tag: null + version: 2.4.1-75e4c6-SNAPSHOT + versionInfo: +! versionCode: '965' +! versionName: 9.6.5 +--- 181,185 ---- + tag: null + version: 2.4.1-75e4c6-SNAPSHOT + versionInfo: +! versionCode: '965CTCBUILD' +! versionName: 9.6.5-cutthecord-CTCBUILD +diff -crB com.discord-965-base/res/values/strings.xml com.discord-965/res/values/strings.xml +*** com.discord-965-base/res/values/strings.xml 2019-10-03 08:11:17.503732905 +0300 +--- com.discord-965/res/values/strings.xml 2019-10-03 08:21:54.563724932 +0300 +*************** +*** 1308,1314 **** + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! Discord + Free and secure chat for gamers, works on both your desktop and your phone. + Team voice & text chat + discord.gg/ +--- 1308,1314 ---- + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! CTCNAME + Free and secure chat for gamers, works on both your desktop and your phone. + Team voice & text chat + discord.gg/ +*************** +*** 3198,3204 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Join them: %1$s + Join the party! +--- 3198,3204 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Join them: %1$s + Join the party! +*************** +*** 4379,4385 **** + Sub Enabled Servers + Subscriber Information + Suggestions +! Support + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +--- 4379,4385 ---- + Sub Enabled Servers + Subscriber Information + Suggestions +! CutTheCord Repo + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +Only in com.discord-965/res/values: strings.xml.orig +diff -crB com.discord-965-base/smali/com/discord/app/e.smali com.discord-965/smali/com/discord/app/e.smali +*** com.discord-965-base/smali/com/discord/app/e.smali 2019-10-03 08:11:18.677071304 +0300 +--- com.discord-965/smali/com/discord/app/e.smali 2019-10-03 08:21:54.563724932 +0300 +*************** +*** 56,62 **** + .line 17 + sput-object v0, Lcom/discord/app/e;->wy:Ljava/lang/String; + +! const-string v0, "https://support.discordapp.com" + + .line 18 + sput-object v0, Lcom/discord/app/e;->wz:Ljava/lang/String; +--- 56,62 ---- + .line 17 + sput-object v0, Lcom/discord/app/e;->wy:Ljava/lang/String; + +! const-string v0, "https://gitdab.com/distok/cutthecord" + + .line 18 + sput-object v0, Lcom/discord/app/e;->wz:Ljava/lang/String; +Only in com.discord-965/smali/com/discord/app: e.smali.orig +diff -crB com.discord-965-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-965/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** com.discord-965-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-03 08:11:18.940405774 +0300 +--- com.discord-965/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-03 08:21:54.567058277 +0300 +*************** +*** 77,83 **** + + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discordapp.com/app" + + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; + +--- 77,83 ---- + + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + 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 9d0ebf7..61916fe 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -62,4 +62,5 @@ You can use the following line to patch authorities: - 9.4.8 - 9.6.3 - 9.6.4 +- 9.6.5 diff --git a/patches/compact/965.patch b/patches/compact/965.patch new file mode 100644 index 0000000..5832b9a --- /dev/null +++ b/patches/compact/965.patch @@ -0,0 +1,78 @@ +diff -crB from/res/layout/widget_chat_list_adapter_item_text.xml to/res/layout/widget_chat_list_adapter_item_text.xml +*** from/res/layout/widget_chat_list_adapter_item_text.xml 2019-10-01 22:09:14.867283952 +0300 +--- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-10-01 22:10:21.921063112 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB from/res/layout-v17/widget_chat_list_adapter_item_text.xml to/res/layout-v17/widget_chat_list_adapter_item_text.xml +*** from/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-10-01 22:09:13.297273514 +0300 +--- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-10-01 22:10:21.921063112 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB from/res/values/dimens.xml to/res/values/dimens.xml +*** from/res/values/dimens.xml 2019-10-01 22:09:16.847297117 +0300 +--- to/res/values/dimens.xml 2019-10-01 22:10:21.921063112 +0300 +*************** +*** 336,342 **** + 4.0dip + 1.0dip + 96.0dip +! 58.0dip + 48.0dip + 72.0dip + 3.0dip +--- 336,342 ---- + 4.0dip + 1.0dip + 96.0dip +! 20.0dip + 48.0dip + 72.0dip + 3.0dip diff --git a/patches/compact/README.md b/patches/compact/README.md index 1ac4bd5..7491b07 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -46,4 +46,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.4.8 - 9.6.3 - 9.6.4 +- 9.6.5 diff --git a/patches/customdefaultemoji/965.patch b/patches/customdefaultemoji/965.patch new file mode 100644 index 0000000..48aa3bc --- /dev/null +++ b/patches/customdefaultemoji/965.patch @@ -0,0 +1,80 @@ +diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali +*** from/smali/com/discord/stores/StoreEmoji.smali 2019-10-01 22:09:20.710656138 +0300 +--- to/smali/com/discord/stores/StoreEmoji.smali 2019-10-01 22:10:14.464346867 +0300 +*************** +*** 100,136 **** + + const/4 v1, 0x0 + +! const-string v2, "thinking" + + aput-object v2, v0, v1 + + const/4 v1, 0x1 + +! const-string v2, "ok_hand" + + aput-object v2, v0, v1 + + const/4 v1, 0x2 + +! const-string v2, "eyes" + + aput-object v2, v0, v1 + + const/4 v1, 0x3 + +! const-string v2, "sweat_drops" + + aput-object v2, v0, v1 + + const/4 v1, 0x4 + +! const-string v2, "joy" + + aput-object v2, v0, v1 + + const/4 v1, 0x5 + +! const-string v2, "pig" + + aput-object v2, v0, v1 + +--- 100,136 ---- + + const/4 v1, 0x0 + +! const-string v2, "star" + + aput-object v2, v0, v1 + + const/4 v1, 0x1 + +! const-string v2, "thinking" + + aput-object v2, v0, v1 + + const/4 v1, 0x2 + +! const-string v2, "ok_hand" + + aput-object v2, v0, v1 + + const/4 v1, 0x3 + +! const-string v2, "eyes" + + aput-object v2, v0, v1 + + const/4 v1, 0x4 + +! const-string v2, "sweat_drops" + + aput-object v2, v0, v1 + + const/4 v1, 0x5 + +! const-string v2, "joy" + + aput-object v2, v0, v1 + diff --git a/patches/customdefaultemoji/README.md b/patches/customdefaultemoji/README.md index efb3191..b1e6b9e 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -28,4 +28,5 @@ This patch changes default list of custom emojis. - 9.4.8 - 9.6.3 - 9.6.4 +- 9.6.5 diff --git a/patches/customtheme/965.patch b/patches/customtheme/965.patch new file mode 100644 index 0000000..e4bf128 --- /dev/null +++ b/patches/customtheme/965.patch @@ -0,0 +1,292 @@ +diff -crB com.discord-965-base/res/values/colors.xml com.discord-965/res/values/colors.xml +*** com.discord-965-base/res/values/colors.xml 2019-10-03 08:11:17.473732775 +0300 +--- com.discord-965/res/values/colors.xml 2019-10-03 08:24:08.824224516 +0300 +*************** +*** 50,56 **** + #37000000 + #ff657b83 + #ff333333 +! #ff1d1d1d + #40000000 + #40ffffff + @android:color/white +--- 50,56 ---- + #37000000 + #ff657b83 + #ff333333 +! #ff000000 + #40000000 + #40ffffff + @android:color/white +*************** +*** 61,68 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 + #ff3f51b5 + #ff303f9f +--- 61,68 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 + #ff3f51b5 + #ff303f9f +*************** +*** 96,104 **** + #ff4f545c + #0d4f545c + #4d4f545c +! #ff282b30 +! #ff2e3136 +! #ff1e2124 + #ff8a8e94 + #6680cbc4 + #66009688 +--- 96,104 ---- + #ff4f545c + #0d4f545c + #4d4f545c +! #ff000000 +! #ff000000 +! #ff000000 + #ff8a8e94 + #6680cbc4 + #66009688 +*************** +*** 106,120 **** + #fff47b67 + #ff45ddc0 + #ff021f25 +! #fff2fbfe +! #ffcceffd +! #ff99dffb +! #ff33c0f6 +! #ff00b0f4 +! #ff0078a6 +! #ff004662 +! #ff003549 +! #ff00090c + #ff37474f + #ff263238 + #ff21272b +--- 106,120 ---- + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff8cf687 +! #ff7df577 +! #ff6ef368 +! #ff5ff258 +! #ff50f148 +! #ff41f038 +! #ff32ef28 +! #ff23ed19 +! #ff1be411 + #ff37474f + #ff263238 + #ff21272b +*************** +*** 153,170 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #4d4f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 + #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #9918191c + #e618191c +--- 153,170 ---- + #ff72767d + #4d72767d + #9972767d +! #ff0f0f0f +! #4d0f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 + #ff292b2f +! #ff0f0f0f +! #990f0f0f + #ff18191c + #9918191c + #e618191c +*************** +*** 194,202 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 194,202 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 258,264 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 258,264 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +Only in com.discord-965/res/values: colors.xml.orig +diff -crB com.discord-965-base/res/values/styles.xml com.discord-965/res/values/styles.xml +*** com.discord-965-base/res/values/styles.xml 2019-10-03 08:11:17.610400032 +0300 +--- com.discord-965/res/values/styles.xml 2019-10-03 08:24:08.827557859 +0300 +*************** +*** 114,120 **** + @color/primary_600 + @drawable/drawable_uikit_primary_600_bg_dark + @drawable/drawable_uikit_primary_600_circle +! #ff2b2e31 + @color/primary_500_alpha_60 + @color/black_alpha_05 + @style/AppTheme.Dark.Notice +--- 114,120 ---- + @color/primary_600 + @drawable/drawable_uikit_primary_600_bg_dark + @drawable/drawable_uikit_primary_600_circle +! @color/primary_630 + @color/primary_500_alpha_60 + @color/black_alpha_05 + @style/AppTheme.Dark.Notice +*************** +*** 337,343 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 337,343 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 351,362 **** + @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_alpha_70 + @color/white_alpha_20 + @color/white +! #1afaa61a + @color/white + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +--- 351,362 ---- + @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_alpha_70 + @color/white_alpha_20 + @color/white +! @color/purple_brand_alpha_10 + @color/white + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +*************** +*** 422,428 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +