From 7193f292391c7c18c75bb73a180c82a523fe1fc5 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Mon, 18 Nov 2019 00:28:56 +0300 Subject: [PATCH] Port patches to 9.8.6 No builds will happen until I sort out slashcommands, or at least helper utils in it. ETA: Tomorrow. Sorry :/ --- README.md | 2 +- patches/branding/986.patch | 242 + patches/branding/README.md | 1 + patches/customdefaultemoji/986.patch | 80 + patches/customdefaultemoji/README.md | 1 + patches/customtheme/986.patch | 275 + patches/customtheme/README.md | 1 + patches/customversion/986.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/986.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/986.patch | 184 + patches/experiments/README.md | 1 + patches/litecord/986.patch | 323 + patches/litecord/README.md | 1 + patches/mutant/986.patch | 52249 ++++++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/986.patch | 14 + patches/noblocked/986.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/986.patch | 102 + patches/nonearby/README.md | 1 + patches/noprofilestrip/986.patch | 53 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/986.patch | 69 + patches/nospoiler/README.md | 1 + patches/notrack/986.patch | 2770 ++ patches/nozlib/986.patch | 34 + patches/nozlib/README.md | 1 + patches/smalltime/986.patch | 190 + patches/smalltime/README.md | 1 + patches/squareavatars/986.patch | 21 + patches/squareavatars/README.md | 1 + patches/tokenlogin/986.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 36 files changed, 56715 insertions(+), 2 deletions(-) create mode 100644 patches/branding/986.patch create mode 100644 patches/customdefaultemoji/986.patch create mode 100644 patches/customtheme/986.patch create mode 100644 patches/customversion/986.patch create mode 100644 patches/disable-mobileindicator/986.patch create mode 100644 patches/experiments/986.patch create mode 100644 patches/litecord/986.patch create mode 100644 patches/mutant/986.patch create mode 100644 patches/necessary/986.patch create mode 100644 patches/noblocked/986.patch create mode 100644 patches/nonearby/986.patch create mode 100644 patches/noprofilestrip/986.patch create mode 100644 patches/nospoiler/986.patch create mode 100644 patches/notrack/986.patch create mode 100644 patches/nozlib/986.patch create mode 100644 patches/smalltime/986.patch create mode 100644 patches/squareavatars/986.patch create mode 100644 patches/tokenlogin/986.patch diff --git a/README.md b/README.md index ece783e..9cd472d 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.8.4 (984), released on 2019-11-14. +**Latest supported Discord Android version:** 9.8.6 (986), released on 2019-11-17. New patch development will be done for the latest supported version. diff --git a/patches/branding/986.patch b/patches/branding/986.patch new file mode 100644 index 0000000..dcaab59 --- /dev/null +++ b/patches/branding/986.patch @@ -0,0 +1,242 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2019-11-18 00:23:36.396002735 +0300 +--- to/AndroidManifest.xml 2019-11-18 00:23:40.449361790 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 19,30 **** + + + +! + + + + +! + + + +--- 19,30 ---- + + + +! + + + + +! + + + +*************** +*** 85,91 **** + + + +! + + + +--- 85,91 ---- + + + +! + + + +*************** +*** 115,121 **** + + + +! + + + +--- 115,121 ---- + + + +! + + + +*************** +*** 141,147 **** + + + +! + + + +--- 141,147 ---- + + + +! + + + +*************** +*** 151,157 **** + + + +! + + + +--- 151,157 ---- + + + +! + + + +*************** +*** 191,199 **** + + + +! +! +! + + + +\ No newline at end of file +--- 191,199 ---- + + + +! +! +! + + + +\ No newline at end of file +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2019-11-18 00:22:58.602429573 +0300 +--- to/apktool.yml 2019-11-18 00:23:40.449361790 +0300 +*************** +*** 179,183 **** + tag: null + version: 2.4.1-197d46-SNAPSHOT + versionInfo: +! versionCode: '986' +! versionName: 9.8.6 +--- 179,183 ---- + tag: null + version: 2.4.1-197d46-SNAPSHOT + versionInfo: +! versionCode: '986CTCBUILD' +! versionName: 9.8.6-cutthecord-CTCBUILD +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2019-11-18 00:22:53.905733102 +0300 +--- to/res/values/strings.xml 2019-11-18 00:23:40.449361790 +0300 +*************** +*** 1287,1293 **** + 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/ +--- 1287,1293 ---- + 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/ +*************** +*** 3089,3095 **** + 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. +--- 3089,3095 ---- + 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. +*************** +*** 4280,4286 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +--- 4280,4286 ---- + Subscriptions + Suggestions + %1$s, %2$s +! 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." +diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali +*** from/smali/com/discord/app/e.smali 2019-11-18 00:22:55.772411614 +0300 +--- to/smali/com/discord/app/e.smali 2019-11-18 00:23:40.449361790 +0300 +*************** +*** 56,62 **** + .line 16 + sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; + +! const-string v0, "https://support.discordapp.com" + + .line 18 + sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; +--- 56,62 ---- + .line 16 + sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; + +! const-string v0, "https://gitdab.com/distok/cutthecord" + + .line 18 + sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-18 00:22:56.135747253 +0300 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-18 00:23:40.449361790 +0300 +*************** +*** 78,84 **** + .line 65 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discordapp.com/app" + + .line 67 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 65 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 67 + 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 553c77e..1b9f60a 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -69,4 +69,5 @@ You can use the following line to patch authorities: - 9.7.0 - 9.8.0 - 9.8.4 +- 9.8.6 diff --git a/patches/customdefaultemoji/986.patch b/patches/customdefaultemoji/986.patch new file mode 100644 index 0000000..eed3df5 --- /dev/null +++ b/patches/customdefaultemoji/986.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-11-14 22:32:21.079850865 +0300 +--- to/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:33:18.846833515 +0300 +*************** +*** 103,139 **** + + 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 + +--- 103,139 ---- + + 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 b72f32b..f9e4e6c 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -35,4 +35,5 @@ This patch changes default list of custom emojis. - 9.7.0 - 9.8.0 - 9.8.4 +- 9.8.6 diff --git a/patches/customtheme/986.patch b/patches/customtheme/986.patch new file mode 100644 index 0000000..e79e436 --- /dev/null +++ b/patches/customtheme/986.patch @@ -0,0 +1,275 @@ +diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable/drawable_overlay_channels_active.xml +*** from/res/drawable/drawable_overlay_channels_active.xml 2019-11-18 00:22:53.189061888 +0300 +--- to/res/drawable/drawable_overlay_channels_active.xml 2019-11-18 00:23:45.166058388 +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 from/res/values/colors.xml to/res/values/colors.xml +*** from/res/values/colors.xml 2019-11-18 00:22:53.672398289 +0300 +--- to/res/values/colors.xml 2019-11-18 00:23:45.166058388 +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,112 **** + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #ff0067e0 + #ff37474f + #ff263238 +--- 106,112 ---- + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #ff0067e0 + #ff37474f + #ff263238 +*************** +*** 149,166 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #4d4f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 + #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #9918191c + #e618191c +--- 149,166 ---- + #ff72767d + #4d72767d + #9972767d +! #ff0f0f0f +! #4d0f0f0f +! #99404040 + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 + #ff292b2f +! #ff0f0f0f +! #990f0f0f + #ff18191c + #9918191c + #e618191c +*************** +*** 191,199 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 191,199 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 255,261 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 255,261 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +diff -crB from/res/values/styles.xml to/res/values/styles.xml +*** from/res/values/styles.xml 2019-11-18 00:22:53.869066203 +0300 +--- to/res/values/styles.xml 2019-11-18 00:23:45.166058388 +0300 +*************** +*** 368,374 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 368,374 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 380,391 **** + @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 + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark + @color/primary_700 +--- 380,391 ---- + @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 + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark + @color/primary_700 +*************** +*** 448,454 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +