From 55350f39f39feeff61805ee0f1d856e8dabc643b Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Tue, 29 Sep 2020 14:13:40 +0100 Subject: [PATCH] 42.0 (1281) --- README.md | 2 +- patches/betterdmheader/1281.patch | 66 + patches/betterdmheader/README.md | 1 + patches/bettertm/bettertm.sh | 2 - patches/blobs/emojireplace.py | 2 +- patches/branding/1281.patch | 247 + patches/branding/README.md | 1 + patches/customtheme/1281.patch | 344 + patches/customtheme/README.md | 1 + patches/customversion/1281.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1281.patch | 92 + patches/disable-mobileindicator/README.md | 1 + patches/embedlinks/1281.patch | 91 + patches/embedlinks/README.md | 1 + patches/experiments/1281.patch | 101 + patches/experiments/README.md | 1 + patches/hideunusableemojis/1281.patch | 21 + patches/hideunusableemojis/README.md | 1 + patches/hqavatars/1281.patch | 20 + patches/hqavatars/README.md | 1 + patches/litecord/1281.patch | 328 + patches/litecord/README.md | 1 + patches/mutant/1281.patch | 56773 +++++++++++++++++++ patches/mutant/README.md | 1 + patches/mutant/emojireplace.py | 272 +- patches/necessary/1281.patch | 14 + patches/noblocked/1281.patch | 18 + patches/noblocked/README.md | 1 + patches/nocamerabutton/1281.patch | 54 + patches/nocamerabutton/README.md | 1 + patches/noemojibutton/1281.patch | 20 + patches/noemojibutton/README.md | 1 + patches/nonearby/1281.patch | 179 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1281.patch | 49 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1281.patch | 69 + patches/nospoiler/README.md | 1 + patches/notrack/1281-post.sh | 2 + patches/notrack/1281.patch | 1174 + patches/notrack/README.md | 1 + patches/nozlib/1281.patch | 34 + patches/nozlib/README.md | 1 + patches/profilemention/1281.patch | 65 + patches/profilemention/README.md | 1 + patches/pseudonitro-viewer/1281.patch | 21 + patches/pseudonitro-viewer/README.md | 1 + patches/showtag/1281.patch | 34 + patches/showtag/README.md | 1 + patches/slashcommands/1281.patch | 3686 ++ patches/slashcommands/README.md | 1 + patches/squareavatars/1281.patch | 55 + patches/squareavatars/README.md | 1 + patches/supplemental/1281.patch | 543 + patches/supplemental/README.md | 1 + patches/tokenlogin/1281.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 59 files changed, 64318 insertions(+), 141 deletions(-) create mode 100644 patches/betterdmheader/1281.patch create mode 100644 patches/branding/1281.patch create mode 100644 patches/customtheme/1281.patch create mode 100644 patches/customversion/1281.patch create mode 100644 patches/disable-mobileindicator/1281.patch create mode 100644 patches/embedlinks/1281.patch create mode 100644 patches/experiments/1281.patch create mode 100644 patches/hideunusableemojis/1281.patch create mode 100644 patches/hqavatars/1281.patch create mode 100644 patches/litecord/1281.patch create mode 100644 patches/mutant/1281.patch create mode 100644 patches/necessary/1281.patch create mode 100644 patches/noblocked/1281.patch create mode 100644 patches/nocamerabutton/1281.patch create mode 100644 patches/noemojibutton/1281.patch create mode 100644 patches/nonearby/1281.patch create mode 100644 patches/noprofilestrip/1281.patch create mode 100644 patches/nospoiler/1281.patch create mode 100644 patches/notrack/1281-post.sh create mode 100644 patches/notrack/1281.patch create mode 100644 patches/nozlib/1281.patch create mode 100644 patches/profilemention/1281.patch create mode 100644 patches/pseudonitro-viewer/1281.patch create mode 100644 patches/showtag/1281.patch create mode 100644 patches/slashcommands/1281.patch create mode 100644 patches/squareavatars/1281.patch create mode 100644 patches/supplemental/1281.patch create mode 100644 patches/tokenlogin/1281.patch diff --git a/README.md b/README.md index 1fa3181..5189416 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 41.11 (1280), released on 2020-09-24. +**Latest supported Discord Android version:** 42.0 (1281), released on 2020-09-29. New patch development will be done for the latest supported version. diff --git a/patches/betterdmheader/1281.patch b/patches/betterdmheader/1281.patch new file mode 100644 index 0000000..0fb0079 --- /dev/null +++ b/patches/betterdmheader/1281.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300 +--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300 +--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md index c242c4f..555b23b 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -20,4 +20,5 @@ This patch replaces the call button on DM headers with search button. The call b - 41.06 - 41.10 - 41.11 +- 42.0 diff --git a/patches/bettertm/bettertm.sh b/patches/bettertm/bettertm.sh index 0e5cd0b..756d8ac 100644 --- a/patches/bettertm/bettertm.sh +++ b/patches/bettertm/bettertm.sh @@ -1,5 +1,3 @@ #!/bin/bash \cp "$1/emoji_2122_fe0f.png" res/raw/emoji_2122_fe0f.png \cp "$1/emoji_ae_fe0f.png" res/raw/emoji_ae_fe0f.png -\rm res/raw/emoji_2122_fe0f.webp -\rm res/raw/emoji_ae_fe0f.webp diff --git a/patches/blobs/emojireplace.py b/patches/blobs/emojireplace.py index 4f325e3..9248272 100644 --- a/patches/blobs/emojireplace.py +++ b/patches/blobs/emojireplace.py @@ -29,7 +29,7 @@ replace_counter = 0 # Go through each discord emoji, and clean their names for emoji in discord_emojis: - clean_discord_emoji = clean_emoji_name("{}.png".format(os.path.splitext(emoji)[0])) + clean_discord_emoji = clean_emoji_name(emoji) # Check if said clean name of emoji is in clean blobmoji list if clean_discord_emoji in clean_blobmojis: diff --git a/patches/branding/1281.patch b/patches/branding/1281.patch new file mode 100644 index 0000000..1ba3909 --- /dev/null +++ b/patches/branding/1281.patch @@ -0,0 +1,247 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-09-29 13:36:06.215293796 +0100 +--- to/AndroidManifest.xml 2020-09-29 13:41:51.922947388 +0100 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,33 **** + + + +! + + + + + +! + + + +--- 21,33 ---- + + + +! + + + + + +! + + + +*************** +*** 131,137 **** + + + +! + + + +--- 131,137 ---- + + + +! + + + +*************** +*** 155,161 **** + + + +! + + + +--- 155,161 ---- + + + +! + + + +*************** +*** 178,184 **** + + + +! + + + +--- 178,184 ---- + + + +! + + + +*************** +*** 196,209 **** + + + +! + + + + + + +! + + + +--- 196,209 ---- + + + +! + + + + + + +! + + + +*************** +*** 258,261 **** + + + +! +\ No newline at end of file +--- 258,261 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-09-29 13:35:48.475289304 +0100 +--- to/apktool.yml 2020-09-29 13:41:51.922947388 +0100 +*************** +*** 78,82 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1281' +! versionName: '42.0' +--- 78,82 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1281CTCBUILD' +! versionName: '42.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-09-29 13:35:43.254599726 +0100 +--- to/res/values/strings.xml 2020-09-29 13:41:51.922947388 +0100 +*************** +*** 1542,1548 **** + Disconnect %1$s + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1542,1548 ---- + Disconnect %1$s + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4356,4362 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4356,4362 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 5802,5808 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 5802,5808 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +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 2020-09-29 13:35:45.302876938 +0100 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-29 13:41:51.924947357 +0100 +*************** +*** 78,84 **** + .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; +--- 78,84 ---- + .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 -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-29 13:35:46.367017476 +0100 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-29 13:41:51.924947357 +0100 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/README.md b/patches/branding/README.md index a52bdb3..75664ca 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -201,4 +201,5 @@ You can use the following line to patch authorities: - 41.06 - 41.10 - 41.11 +- 42.0 diff --git a/patches/customtheme/1281.patch b/patches/customtheme/1281.patch new file mode 100644 index 0000000..103adb6 --- /dev/null +++ b/patches/customtheme/1281.patch @@ -0,0 +1,344 @@ +diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml +*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-29 13:35:42.756530932 +0100 +--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-29 13:39:04.930199342 +0100 +*************** +*** 1,6 **** + + +! + + +\ No newline at end of file +--- 1,6 ---- + + +! + + +\ No newline at end of file +diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml +*** from/res/drawable/drawable_circle_black.xml 2020-09-29 13:35:42.764532046 +0100 +--- to/res/drawable/drawable_circle_black.xml 2020-09-29 13:39:04.930199342 +0100 +*************** +*** 1,5 **** + + +! + +\ No newline at end of file +--- 1,5 ---- + + +! + +\ No newline at end of file +diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml +*** from/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-29 13:35:41.480352022 +0100 +--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-29 13:39:04.930199342 +0100 +*************** +*** 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 2020-09-29 13:35:43.426623297 +0100 +--- to/res/values/colors.xml 2020-09-29 13:39:04.930199342 +0100 +*************** +*** 110,119 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 +! #ff121212 + #ffcf6679 + #ffffffff + #ff000000 +--- 110,119 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 +! #ff000000 + #ffcf6679 + #ffffffff + #ff000000 +*************** +*** 125,131 **** + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff121212 + #ffffffff + #ffb00020 + #ff000000 +--- 125,131 ---- + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff000000 + #ffffffff + #ffb00020 + #ff000000 +*************** +*** 174,181 **** + #4d737f8d + #ff949494 + #0d4f545c +! #ff282b30 +! #ff8a8e94 + #6680cbc4 + #66009688 + #ff9c84ef +--- 174,181 ---- + #4d737f8d + #ff949494 + #0d4f545c +! #ff000000 +! #ff000000 + #6680cbc4 + #66009688 + #ff9c84ef +*************** +*** 185,191 **** + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +--- 185,191 ---- + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +*************** +*** 298,317 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 +! #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #8018191c + #9918191c +--- 298,317 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 +! #ff000000 +! #ff000000 +! #990f0f0f + #ff18191c + #8018191c + #9918191c +*************** +*** 336,345 **** + #ff4f545c + #ff484c54 + #ff40444b +! #ff36393f +! #ff2f3136 + #ff292b2f +! #ff202225 + #ff1e1f22 + #ff1b1d20 + #ff18191c +--- 336,345 ---- + #ff4f545c + #ff484c54 + #ff40444b +! #ff000000 +! #ff000000 + #ff292b2f +! #ff000000 + #ff1e1f22 + #ff1b1d20 + #ff18191c +*************** +*** 385,393 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 385,393 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 526,532 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 526,532 ---- + #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 2020-09-29 13:35:43.168587940 +0100 +--- to/res/values/styles.xml 2020-09-29 13:39:04.930199342 +0100 +*************** +*** 421,427 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 421,427 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 432,444 **** + @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/img_empty_server_settings_emoji_dark +--- 432,444 ---- + @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/img_empty_server_settings_emoji_dark +*************** +*** 785,791 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +