p/cutthecord
1
0
Fork 0
forked from distok/cutthecord
Code Issues Pull requests Releases Wiki Activity

28-alpha2 (1167)

Browse source
This commit is contained in:
eatsfoobars 2020-06-20 07:01:36 +01:00
parent b21564104e
commit 13e2bea520
Signed by untrusted user: eatsfoobars
GPG key ID: D08609FADBD8C395
50 changed files with 58994 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -2,7 +2,7 @@
Modular Client Mod for Discord's Android app. Modular Client Mod for Discord's Android app.
**Latest supported Discord Android version:** 24 (1150), released on 2020-05-27. **Latest supported Discord Android version:** 28-alpha2 (1167), released on 2020-06-20.
New patch development will be done for the latest supported version. New patch development will be done for the latest supported version.

6
patches/bettertm/bettertm.sh
View file

@ -1,3 +1,5 @@
#!/bin/bash #!/bin/bash
\cp "$1/emoji_2122_fe0f.png" res/raw/ \cp "$1/emoji_2122_fe0f.png" res/raw/emoji_2122_fe0f.png
\cp "$1/emoji_ae_fe0f.png" res/raw/ \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

229
patches/branding/1167.patch Normal file
View file

@ -0,0 +1,229 @@
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
*** from/AndroidManifest.xml 2020-06-20 04:19:16.425191294 +0100
--- to/AndroidManifest.xml 2020-06-20 05:15:44.405886392 +0100
***************
*** 1,4 ****
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1167" platformBuildVersionName="28-alpha2">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
--- 1,4 ----
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1167CTCBUILD" platformBuildVersionName="28-alpha2-cutthecord-CTCBUILD">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
***************
*** 20,31 ****
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.discord.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
--- 20,31 ----
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
***************
*** 118,124 ****
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
<intent-filter>
<action android:name="com.discord.intent.action.CONNECT"/>
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
--- 118,124 ----
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
<intent-filter>
<action android:name="com.discord.intent.action.CONNECT"/>
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
***************
*** 148,154 ****
</receiver>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
</provider>
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
--- 148,154 ----
</receiver>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
</provider>
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
***************
*** 166,172 ****
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
</service>
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
--- 166,172 ----
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
</service>
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
***************
*** 181,192 ****
</intent-filter>
</receiver>
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
--- 181,192 ----
</intent-filter>
</receiver>
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
***************
*** 232,239 ****
<service android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
<meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application>
! </manifest>
\ No newline at end of file
--- 232,239 ----
<service android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
<meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application>
! </manifest>
diff -crB from/apktool.yml to/apktool.yml
*** from/apktool.yml 2020-06-20 04:18:54.933348057 +0100
--- to/apktool.yml 2020-06-20 05:16:09.013679643 +0100
***************
*** 3229,3233 ****
tag: null
version: 2.4.2-f3136b-SNAPSHOT
versionInfo:
! versionCode: '1167'
! versionName: 28-alpha2
--- 3229,3233 ----
tag: null
version: 2.4.2-f3136b-SNAPSHOT
versionInfo:
! versionCode: '1167CTCBUILD'
! versionName: 28-alpha2-cutthecord-CTCBUILD
diff -crB from/res/values/strings.xml to/res/values/strings.xml
*** from/res/values/strings.xml 2020-06-20 04:18:49.653386657 +0100
--- to/res/values/strings.xml 2020-06-20 05:14:49.198352629 +0100
***************
*** 1417,1423 ****
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
<string name="disconnect_account_title">Disconnect %1$s</string>
<string name="disconnect_from_voice">Disconnect from Voice</string>
! <string name="discord">Discord</string>
<string name="discord_desc_long">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
<string name="discord_desc_short">Team voice &amp; text chat</string>
<string name="discord_gg">discord.gg/</string>
--- 1417,1423 ----
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
<string name="disconnect_account_title">Disconnect %1$s</string>
<string name="disconnect_from_voice">Disconnect from Voice</string>
! <string name="discord">CTCNAME</string>
<string name="discord_desc_long">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
<string name="discord_desc_short">Team voice &amp; text chat</string>
<string name="discord_gg">discord.gg/</string>
***************
*** 3844,3850 ****
<string name="notification_reply_failed">Failed to reply to %1$s</string>
<string name="notification_reply_success">Replied to %1$s</string>
<string name="notification_settings">Notification Settings</string>
! <string name="notification_title_discord">Discord</string>
<string name="notification_title_start_game">"Somebody Playin'"</string>
<string name="notifications">Notifications</string>
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
--- 3844,3850 ----
<string name="notification_reply_failed">Failed to reply to %1$s</string>
<string name="notification_reply_success">Replied to %1$s</string>
<string name="notification_settings">Notification Settings</string>
! <string name="notification_title_discord">CTCNAME</string>
<string name="notification_title_start_game">"Somebody Playin'"</string>
<string name="notifications">Notifications</string>
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
***************
*** 5170,5176 ****
<string name="subscriptions_title">Subscriptions</string>
<string name="suggestions">Suggestions</string>
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
! <string name="support">Support</string>
<string name="suppress_all_embeds">Remove all embeds</string>
<string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
<string name="suppress_embed_confirm">Remove All Embeds</string>
--- 5170,5176 ----
<string name="subscriptions_title">Subscriptions</string>
<string name="suggestions">Suggestions</string>
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
! <string name="support">CutTheCord Repo</string>
<string name="suppress_all_embeds">Remove all embeds</string>
<string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
<string name="suppress_embed_confirm">Remove All Embeds</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 2020-06-20 04:18:51.707371636 +0100
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-06-20 05:14:49.198352629 +0100
***************
*** 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;

1
patches/branding/README.md
View file

@ -177,4 +177,5 @@ You can use the following line to patch authorities:
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

344
patches/customtheme/1167.patch Normal file
View file

@ -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-06-20 04:18:48.131397789 +0100
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-06-20 04:42:54.845439247 +0100
***************
*** 1,6 ****
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
! <solid android:color="@color/white" />
<corners android:radius="20.0dip" />
</shape>
\ No newline at end of file
--- 1,6 ----
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
! <solid android:color="@android:color/transparent" />
<corners android:radius="20.0dip" />
</shape>
\ 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-06-20 04:18:48.845392566 +0100
--- to/res/drawable/drawable_circle_black.xml 2020-06-20 04:42:54.845439247 +0100
***************
*** 1,5 ****
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
! <solid android:color="@color/black" />
</shape>
\ No newline at end of file
--- 1,5 ----
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
! <solid android:color="@android:color/transparent" />
</shape>
\ 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-06-20 04:18:48.243396970 +0100
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-06-20 04:42:54.845439247 +0100
***************
*** 3,9 ****
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="8.0dip" android:right="8.0dip">
<shape android:shape="rectangle">
! <solid android:color="#ff42464d" />
<corners android:radius="4.0dip" />
</shape>
</item>
--- 3,9 ----
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="8.0dip" android:right="8.0dip">
<shape android:shape="rectangle">
! <solid android:color="@color/primary_500" />
<corners android:radius="4.0dip" />
</shape>
</item>
diff -crB from/res/values/colors.xml to/res/values/colors.xml
*** from/res/values/colors.xml 2020-06-20 04:18:49.599387051 +0100
--- to/res/values/colors.xml 2020-06-20 04:42:54.845439247 +0100
***************
*** 105,114 ****
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
! <color name="dark_grey_2">#ff36393e</color>
! <color name="dark_grey_2_alpha_10">#ff303337</color>
<color name="design_bottom_navigation_shadow_color">#14000000</color>
! <color name="design_dark_default_color_background">#ff121212</color>
<color name="design_dark_default_color_error">#ffcf6679</color>
<color name="design_dark_default_color_on_background">#ffffffff</color>
<color name="design_dark_default_color_on_error">#ff000000</color>
--- 105,114 ----
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
! <color name="dark_grey_2">#ff000000</color>
! <color name="dark_grey_2_alpha_10">#ff000000</color>
<color name="design_bottom_navigation_shadow_color">#14000000</color>
! <color name="design_dark_default_color_background">#ff000000</color>
<color name="design_dark_default_color_error">#ffcf6679</color>
<color name="design_dark_default_color_on_background">#ffffffff</color>
<color name="design_dark_default_color_on_error">#ff000000</color>
***************
*** 120,126 ****
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
<color name="design_dark_default_color_secondary">#ff03dac6</color>
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
! <color name="design_dark_default_color_surface">#ff121212</color>
<color name="design_default_color_background">#ffffffff</color>
<color name="design_default_color_error">#ffb00020</color>
<color name="design_default_color_on_background">#ff000000</color>
--- 120,126 ----
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
<color name="design_dark_default_color_secondary">#ff03dac6</color>
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
! <color name="design_dark_default_color_surface">#ff000000</color>
<color name="design_default_color_background">#ffffffff</color>
<color name="design_default_color_error">#ffb00020</color>
<color name="design_default_color_on_background">#ff000000</color>
***************
*** 165,172 ****
<color name="grey_3_alpha_30">#4d737f8d</color>
<color name="grey_4">#ff949494</color>
<color name="grey_6_alpha_05">#0d4f545c</color>
! <color name="grey_account">#ff282b30</color>
! <color name="grey_unread">#ff8a8e94</color>
<color name="highlighted_text_material_dark">#6680cbc4</color>
<color name="highlighted_text_material_light">#66009688</color>
<color name="hypesquad_house_1">#ff9c84ef</color>
--- 165,172 ----
<color name="grey_3_alpha_30">#4d737f8d</color>
<color name="grey_4">#ff949494</color>
<color name="grey_6_alpha_05">#0d4f545c</color>
! <color name="grey_account">#ff000000</color>
! <color name="grey_unread">#ff000000</color>
<color name="highlighted_text_material_dark">#6680cbc4</color>
<color name="highlighted_text_material_light">#66009688</color>
<color name="hypesquad_house_1">#ff9c84ef</color>
***************
*** 176,182 ****
<color name="hypesquad_house_3">#ff45ddc0</color>
<color name="hypesquad_house_3_500">#ff45ddc0</color>
<color name="league_of_legends">#ff021f25</color>
! <color name="link">#ff00b0f4</color>
<color name="link_100">#fff2fbfe</color>
<color name="link_130">#ffe8f8fe</color>
<color name="link_160">#ffdaf4fd</color>
--- 176,182 ----
<color name="hypesquad_house_3">#ff45ddc0</color>
<color name="hypesquad_house_3_500">#ff45ddc0</color>
<color name="league_of_legends">#ff021f25</color>
! <color name="link">#ff50f148</color>
<color name="link_100">#fff2fbfe</color>
<color name="link_130">#ffe8f8fe</color>
<color name="link_160">#ffdaf4fd</color>
***************
*** 264,283 ****
<color name="primary_400">#ff72767d</color>
<color name="primary_400_alpha_30">#4d72767d</color>
<color name="primary_400_alpha_60">#9972767d</color>
! <color name="primary_500">#ff4f545c</color>
! <color name="primary_500_alpha_20">#334f545c</color>
! <color name="primary_500_alpha_30">#4d4f545c</color>
! <color name="primary_500_alpha_32">#514f545c</color>
! <color name="primary_500_alpha_60">#994f545c</color>
<color name="primary_560">#ff40444b</color>
! <color name="primary_600">#ff36393f</color>
! <color name="primary_600_alpha_60">#9936393f</color>
! <color name="primary_630">#ff2f3136</color>
! <color name="primary_630_alpha_60">#992f3136</color>
! <color name="primary_630_alpha_90">#e62f3136</color>
! <color name="primary_660">#ff292b2f</color>
! <color name="primary_700">#ff202225</color>
! <color name="primary_700_alpha_60">#99202225</color>
<color name="primary_800">#ff18191c</color>
<color name="primary_800_alpha_50">#8018191c</color>
<color name="primary_800_alpha_60">#9918191c</color>
--- 264,283 ----
<color name="primary_400">#ff72767d</color>
<color name="primary_400_alpha_30">#4d72767d</color>
<color name="primary_400_alpha_60">#9972767d</color>
! <color name="primary_500">#ff333333</color>
! <color name="primary_500_alpha_20">#330f0f0f</color>
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
! <color name="primary_500_alpha_32">#510f0f0f</color>
! <color name="primary_500_alpha_60">#990f0f0f</color>
<color name="primary_560">#ff40444b</color>
! <color name="primary_600">#ff000000</color>
! <color name="primary_600_alpha_60">#99000000</color>
! <color name="primary_630">#ff000000</color>
! <color name="primary_630_alpha_60">#99000000</color>
! <color name="primary_630_alpha_90">#e6000000</color>
! <color name="primary_660">#ff000000</color>
! <color name="primary_700">#ff000000</color>
! <color name="primary_700_alpha_60">#990f0f0f</color>
<color name="primary_800">#ff18191c</color>
<color name="primary_800_alpha_50">#8018191c</color>
<color name="primary_800_alpha_60">#9918191c</color>
***************
*** 302,311 ****
<color name="primary_dark_500">#ff4f545c</color>
<color name="primary_dark_530">#ff484c54</color>
<color name="primary_dark_560">#ff40444b</color>
! <color name="primary_dark_600">#ff36393f</color>
! <color name="primary_dark_630">#ff2f3136</color>
<color name="primary_dark_660">#ff292b2f</color>
! <color name="primary_dark_700">#ff202225</color>
<color name="primary_dark_730">#ff1e1f22</color>
<color name="primary_dark_760">#ff1b1d20</color>
<color name="primary_dark_800">#ff18191c</color>
--- 302,311 ----
<color name="primary_dark_500">#ff4f545c</color>
<color name="primary_dark_530">#ff484c54</color>
<color name="primary_dark_560">#ff40444b</color>
! <color name="primary_dark_600">#ff000000</color>
! <color name="primary_dark_630">#ff000000</color>
<color name="primary_dark_660">#ff292b2f</color>
! <color name="primary_dark_700">#ff000000</color>
<color name="primary_dark_730">#ff1e1f22</color>
<color name="primary_dark_760">#ff1b1d20</color>
<color name="primary_dark_800">#ff18191c</color>
***************
*** 351,359 ****
<color name="primary_text_default_material_light">#de000000</color>
<color name="primary_text_disabled_material_dark">#4dffffff</color>
<color name="primary_text_disabled_material_light">#39000000</color>
! <color name="purple_brand">#ff738bd7</color>
! <color name="purple_brand_alpha_10">#1a738bd7</color>
! <color name="purple_brand_dark">#ff697ec4</color>
<color name="purple_brand_hint">#ffc9d2f0</color>
<color name="purple_brand_notification">#ff5161ff</color>
<color name="reaction_background_me_dark">#4d5c6a9e</color>
--- 351,359 ----
<color name="primary_text_default_material_light">#de000000</color>
<color name="primary_text_disabled_material_dark">#4dffffff</color>
<color name="primary_text_disabled_material_light">#39000000</color>
! <color name="purple_brand">#ff9c4249</color>
! <color name="purple_brand_alpha_10">#1a9c4249</color>
! <color name="purple_brand_dark">#ff000000</color>
<color name="purple_brand_hint">#ffc9d2f0</color>
<color name="purple_brand_notification">#ff5161ff</color>
<color name="reaction_background_me_dark">#4d5c6a9e</color>
***************
*** 492,498 ****
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
! <color name="tooltip_background_dark">#e6616161</color>
<color name="tooltip_background_light">#e6ffffff</color>
<color name="transparent">@android:color/transparent</color>
<color name="twitch">#ff593695</color>
--- 492,498 ----
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
! <color name="tooltip_background_dark">#e6000000</color>
<color name="tooltip_background_light">#e6ffffff</color>
<color name="transparent">@android:color/transparent</color>
<color name="twitch">#ff593695</color>
diff -crB from/res/values/styles.xml to/res/values/styles.xml
*** from/res/values/styles.xml 2020-06-20 04:18:49.557387358 +0100
--- to/res/values/styles.xml 2020-06-20 04:42:54.847439234 +0100
***************
*** 402,408 ****
<item name="tabTextColor">@color/white_alpha_40</item>
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
! <item name="theme_chat_blocked_bg">#ff34373c</item>
<item name="theme_chat_blocked_text">@color/grey_unread</item>
<item name="theme_chat_code">@color/primary_630</item>
<item name="theme_chat_codeblock_border">@color/grey_account</item>
--- 402,408 ----
<item name="tabTextColor">@color/white_alpha_40</item>
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
<item name="theme_chat_blocked_text">@color/grey_unread</item>
<item name="theme_chat_code">@color/primary_630</item>
<item name="theme_chat_codeblock_border">@color/grey_account</item>
***************
*** 414,426 ****
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
! <item name="theme_chat_input_edit">#ff3e4145</item>
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
<item name="theme_chat_loading_spinner_color">@color/white</item>
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
! <item name="theme_chat_spoiler_bg">@color/primary_700</item>
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
<item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
--- 414,426 ----
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
! <item name="theme_chat_input_edit">@color/primary_600</item>
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
<item name="theme_chat_loading_spinner_color">@color/white</item>
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
! <item name="theme_chat_spoiler_bg">@color/primary_500</item>
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
<item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
***************
*** 832,838 ****
<item name="colorControlActivated">@color/brand_500</item>
<item name="colorControlNormal">@color/primary_100</item>
<item name="colorPrimary">@color/primary_600</item>
! <item name="colorPrimaryDark">#ff2b2e31</item>
</style>
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
<item name="colorAccent">@color/brand_600</item>
--- 832,838 ----
<item name="colorControlActivated">@color/brand_500</item>
<item name="colorControlNormal">@color/primary_100</item>
<item name="colorPrimary">@color/primary_600</item>
! <item name="colorPrimaryDark">@color/primary_630</item>
</style>
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
<item name="colorAccent">@color/brand_600</item>
***************
*** 862,868 ****
<item name="colorControlActivated">@color/brand_500</item>
<item name="colorControlNormal">@color/primary_100</item>
<item name="colorPrimary">@color/primary_600</item>
! <item name="colorPrimaryDark">#ff2b2e31</item>
</style>
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
--- 862,868 ----
<item name="colorControlActivated">@color/brand_500</item>
<item name="colorControlNormal">@color/primary_100</item>
<item name="colorPrimary">@color/primary_600</item>
! <item name="colorPrimaryDark">@color/primary_630</item>
</style>
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
diff -crB from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-06-20 04:18:53.089361533 +0100
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-06-20 04:43:21.609259791 +0100
***************
*** 78,84 ****
.line 3
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
! const v1, 0x7f060253
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
--- 78,84 ----
.line 3
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
! const v1, 0x7f060022
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I

1
patches/customtheme/README.md
View file

@ -170,6 +170,7 @@ Self note: Top bar color is set by `setStatusBarColorResourceId`
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2
#### Value reference #### Value reference

20
patches/customversion/1167.patch Normal file
View file

@ -0,0 +1,20 @@
diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/com/discord/widgets/settings/WidgetSettings.smali
*** from/smali/com/discord/widgets/settings/WidgetSettings.smali 2020-06-20 04:18:52.403366548 +0100
--- to/smali/com/discord/widgets/settings/WidgetSettings.smali 2020-06-20 04:19:05.377271807 +0100
***************
*** 1950,1956 ****
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
! const-string v0, " - 28-alpha2 (1167)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 1950,1956 ----
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
! const-string v0, " - 28-alpha2 (1167), with Cutthecord patches"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

1
patches/customversion/README.md
View file

@ -164,4 +164,5 @@ This patch replaces version string and adds mention of cutthecord in the user se
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

20
patches/disable-mobileindicator/1167.patch Normal file
View file

@ -0,0 +1,20 @@
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-06-20 04:18:51.683371812 +0100
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-06-20 04:19:01.317301433 +0100
***************
*** 176,182 ****
const-string v2, "browser"
! const-string v3, "Discord Android"
invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
--- 176,182 ----
const-string v2, "browser"
! const-string v3, "Discord Client"
invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V

1
patches/disable-mobileindicator/README.md
View file

@ -166,4 +166,5 @@ However, this causes some issues. See the `Bugs / Side effects` list below.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

142
patches/experiments/1167.patch Normal file
View file

@ -0,0 +1,142 @@
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-06-20 04:18:51.555372747 +0100
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-06-20 04:39:43.536723733 +0100
***************
*** 81,110 ****
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
.locals 1
! const-string v0, "meUser"
! .line 2
! invoke-static {p1, v0}, Lk0/r/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
!
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
!
! move-result p1
!
! if-nez p1, :cond_1
!
! if-eqz p2, :cond_0
!
! goto :goto_0
!
! :cond_0
! const/4 p1, 0x0
!
! goto :goto_1
!
! :cond_1
! :goto_0
! const/4 p1, 0x1
!
! :goto_1
! return p1
.end method
--- 81,87 ----
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
.locals 1
! const/4 v0, 0x1
! return v0
.end method
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-06-20 04:18:51.557372733 +0100
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-06-20 04:39:10.294947295 +0100
***************
*** 1333,1390 ****
.end method
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
! .locals 4
! .line 1
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
! const/4 v1, 0x1
!
! if-eqz v0, :cond_0
!
! .line 2
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
!
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
!
! move-result-object v0
!
! if-eqz v0, :cond_0
!
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
!
! move-result v0
!
! if-eq v0, v1, :cond_2
!
! .line 3
! :cond_0
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
!
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
!
! move-result-object v0
!
! const-wide v2, 0x2bc056ab0800006L
!
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
!
! move-result-object v2
!
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
!
! move-result v0
!
! if-eqz v0, :cond_1
!
! goto :goto_0
!
! :cond_1
! const/4 v1, 0x0
!
! :cond_2
! :goto_0
! return v1
.end method
.method public final isInitialized()Lrx/Observable;
--- 1333,1343 ----
.end method
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
! .locals 1
! const/4 v0, 0x1
! return v0
.end method
.method public final isInitialized()Lrx/Observable;
diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-06-20 04:18:52.399366577 +0100
--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-06-20 04:40:15.968505744 +0100
***************
*** 87,97 ****
if-nez p4, :cond_1
! invoke-static {p1, v1}, Lk0/r/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
!
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
!
! move-result p4
if-eqz p4, :cond_0
--- 87,93 ----
if-nez p4, :cond_1
! const/4 p4, 0x1
if-eqz p4, :cond_0

1
patches/experiments/README.md
View file

@ -168,4 +168,5 @@ This patch enables developer options (empty), mobile experiments (of which there
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

20
patches/hqavatars/1167.patch Normal file
View file

@ -0,0 +1,20 @@
diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/discord/utilities/icon/IconUtils.smali
*** from/smali/com/discord/utilities/icon/IconUtils.smali 2020-04-30 01:36:39.987338080 +0100
--- to/smali/com/discord/utilities/icon/IconUtils.smali 2020-04-30 01:36:52.607266611 +0100
***************
*** 1402,1407 ****
--- 1402,1415 ----
invoke-virtual {p3, p4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+ # Set avatar image size to 256
+
+ const-string v0, "?size=256"
+
+ invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ const-string v0, "https://cdn.discordapp.com/avatars/"
+
invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object p3

1
patches/hqavatars/README.md
View file

@ -56,4 +56,5 @@ Changes avatars from 128x128 to 256x256 variants.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

260
patches/litecord/1167.patch Normal file
View file

@ -0,0 +1,260 @@
diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smali
*** from/smali/com/discord/app/App.smali 2020-06-20 04:18:51.321374458 +0100
--- to/smali/com/discord/app/App.smali 2020-06-20 04:40:41.600333533 +0100
***************
*** 147,153 ****
invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
! const-string v0, "https://cdn.discordapp.com"
.line 23
invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
--- 147,153 ----
invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
! const-string v0, "https://dev.litecord.top"
.line 23
invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildConfig.smali
*** from/smali/com/discord/BuildConfig.smali 2020-06-20 04:18:51.321374458 +0100
--- to/smali/com/discord/BuildConfig.smali 2020-06-20 04:40:41.600333533 +0100
***************
*** 18,36 ****
.field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
! .field public static final HOST:Ljava/lang/String; = "https://discord.com"
! .field public static final HOST_ALTERNATE:Ljava/lang/String; = "https://discordapp.com"
! .field public static final HOST_API:Ljava/lang/String; = "https://discord.com/api/"
! .field public static final HOST_CDN:Ljava/lang/String; = "https://cdn.discordapp.com"
! .field public static final HOST_GIFT:Ljava/lang/String; = "https://discord.gift"
! .field public static final HOST_GUILD_TEMPLATE:Ljava/lang/String; = "https://discord.new"
! .field public static final HOST_INVITE:Ljava/lang/String; = "https://discord.gg"
.field public static final LOCAL_IP:Ljava/lang/String; = ""
--- 18,36 ----
.field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
! .field public static final HOST:Ljava/lang/String; = "https://dev.litecord.top"
! .field public static final HOST_ALTERNATE:Ljava/lang/String; = "https://dev.litecord.top"
! .field public static final HOST_API:Ljava/lang/String; = "https://dev.litecord.top/api/"
! .field public static final HOST_CDN:Ljava/lang/String; = "https://dev.litecord.top"
! .field public static final HOST_GIFT:Ljava/lang/String; = "https://dev.litecord.top"
! .field public static final HOST_GUILD_TEMPLATE:Ljava/lang/String; = "https://dev.litecord.top"
! .field public static final HOST_INVITE:Ljava/lang/String; = "https://dev.litecord.top"
.field public static final LOCAL_IP:Ljava/lang/String; = ""
diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/com/discord/stores/StoreGatewayConnection.smali
*** from/smali/com/discord/stores/StoreGatewayConnection.smali 2020-06-20 04:18:51.559372719 +0100
--- to/smali/com/discord/stores/StoreGatewayConnection.smali 2020-06-20 04:41:12.448126362 +0100
***************
*** 1370,1376 ****
sget-object v3, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
! const-string v7, "https://discord.com/api/"
invoke-direct {v6, v7, v3, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
--- 1370,1376 ----
sget-object v3, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
! const-string v7, "https://dev.litecord.top/api/"
invoke-direct {v6, v7, v3, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/discord/utilities/icon/IconUtils.smali
*** from/smali/com/discord/utilities/icon/IconUtils.smali 2020-06-20 04:18:51.743371373 +0100
--- to/smali/com/discord/utilities/icon/IconUtils.smali 2020-06-20 04:40:41.602333520 +0100
***************
*** 459,465 ****
goto :goto_3
:cond_1
! const-string p3, "https://cdn.discordapp.com"
.line 2
invoke-interface {p3}, Ljava/lang/CharSequence;->length()I
--- 459,465 ----
goto :goto_3
:cond_1
! const-string p3, "https://dev.litecord.top"
.line 2
invoke-interface {p3}, Ljava/lang/CharSequence;->length()I
***************
*** 509,515 ****
invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
! const-string v0, "https://cdn.discordapp.com/channel-icons/"
invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 509,515 ----
invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
! const-string v0, "https://dev.litecord.top/channel-icons/"
invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
***************
*** 918,924 ****
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://cdn.discordapp.com"
invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
--- 918,924 ----
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://dev.litecord.top"
invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
***************
*** 999,1005 ****
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
! const-string v2, "https://cdn.discordapp.com/icons/"
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 999,1005 ----
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
! const-string v2, "https://dev.litecord.top/icons/"
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
***************
*** 1310,1316 ****
:cond_0
if-eqz p1, :cond_6
! const-string p2, "https://cdn.discordapp.com"
.line 6
invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
--- 1310,1316 ----
:cond_0
if-eqz p1, :cond_6
! const-string p2, "https://dev.litecord.top"
.line 6
invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
***************
*** 1417,1423 ****
invoke-direct {p4}, Ljava/lang/StringBuilder;-><init>()V
! const-string v0, "https://cdn.discordapp.com/avatars/"
invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 1417,1423 ----
invoke-direct {p4}, Ljava/lang/StringBuilder;-><init>()V
! const-string v0, "https://dev.litecord.top/avatars/"
invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
***************
*** 2626,2632 ****
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://cdn.discordapp.com/app-icons/"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 2626,2632 ----
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://dev.litecord.top/app-icons/"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
***************
*** 2743,2749 ****
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://cdn.discordapp.com/app-assets/"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 2743,2749 ----
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://dev.litecord.top/app-assets/"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
***************
*** 3090,3096 ****
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://cdn.discordapp.com/app-icons/"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 3090,3096 ----
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
! const-string v1, "https://dev.litecord.top/app-icons/"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali/com/discord/utilities/rest/RestAPI$Companion.smali
*** from/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2020-06-20 04:18:51.785371066 +0100
--- to/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2020-06-20 04:40:41.602333520 +0100
***************
*** 312,318 ****
.line 9
new-instance v1, Lcom/discord/restapi/RestAPIBuilder;
! const-string v9, "https://discord.com/api/"
invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lo0/p;)V
--- 312,318 ----
.line 9
new-instance v1, Lcom/discord/restapi/RestAPIBuilder;
! const-string v9, "https://dev.litecord.top/api/"
invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lo0/p;)V

1
patches/litecord/README.md
View file

@ -168,4 +168,5 @@ Please keep in mind that litecord is free (gratis and libre) software, provided
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

52096
patches/mutant/1167.patch Normal file
View file

File diff suppressed because it is too large Load diff

1
patches/mutant/README.md
View file

@ -176,6 +176,7 @@ Various scripts are provided to help building of custom patches easier.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2
#### Disclaimer #### Disclaimer

272
patches/mutant/emojireplace.py
View file

@ -11,140 +11,140 @@ extracted_mutstd_path = os.environ.get("DISTOK_EMOJI_MUTANT", "/root/distokfiles
# Add your custom emojis here # Add your custom emojis here
# with "mutstd filename": "discord filename". # with "mutstd filename": "discord filename".
# You'll need to write a patch for `assets/data/emojis.json` too. # You'll need to write a patch for `assets/data/emojis.json` too.
custom_emojis = {"1f4af-200d-1f308.png": "emoji_1f4af_1f308.png", custom_emojis = {"1f4af-200d-1f308.png": "emoji_1f4af_1f308.webp",
"10169b-200d-1f308.png": "emoji_10169b_1f308.png", "10169b-200d-1f308.png": "emoji_10169b_1f308.webp",
"1f9d1-200d-2708-fe0f.png": "emoji_1f9d1_2708.png", "1f9d1-200d-2708-fe0f.png": "emoji_1f9d1_2708.webp",
"1f9d1-200d-2695-fe0f.png": "emoji_1f9d1_2695.png", "1f9d1-200d-2695-fe0f.png": "emoji_1f9d1_2695.webp",
"1f9d1-200d-1f680.png": "emoji_1f9d1_1f680.png", "1f9d1-200d-1f680.png": "emoji_1f9d1_1f680.webp",
"1f9d1-200d-1f52c.png": "emoji_1f9d1_1f52c.png", "1f9d1-200d-1f52c.png": "emoji_1f9d1_1f52c.webp",
"1f9d1-200d-1f527.png": "emoji_1f9d1_1f527.png", "1f9d1-200d-1f527.png": "emoji_1f9d1_1f527.webp",
"1f9d1-200d-1f4bb.png": "emoji_1f9d1_1f4bb.png", "1f9d1-200d-1f4bb.png": "emoji_1f9d1_1f4bb.webp",
"1f9d1-200d-1f373.png": "emoji_1f9d1_1f373.png", "1f9d1-200d-1f373.png": "emoji_1f9d1_1f373.webp",
"1f3fb.png": "emoji_1f3fb.png", "1f3fb.png": "emoji_1f3fb.webp",
"1f3fc.png": "emoji_1f3fc.png", "1f3fc.png": "emoji_1f3fc.webp",
"1f3fd.png": "emoji_1f3fd.png", "1f3fd.png": "emoji_1f3fd.webp",
"1f3fe.png": "emoji_1f3fe.png", "1f3fe.png": "emoji_1f3fe.webp",
"1f3ff.png": "emoji_1f3ff.png", "1f3ff.png": "emoji_1f3ff.webp",
"101600.png": "emoji_101600.png", "101600.png": "emoji_101600.webp",
"101601.png": "emoji_101601.png", "101601.png": "emoji_101601.webp",
"101602.png": "emoji_101602.png", "101602.png": "emoji_101602.webp",
"101603.png": "emoji_101603.png", "101603.png": "emoji_101603.webp",
"101604.png": "emoji_101604.png", "101604.png": "emoji_101604.webp",
"101605.png": "emoji_101605.png", "101605.png": "emoji_101605.webp",
"101606.png": "emoji_101606.png", "101606.png": "emoji_101606.webp",
"101607.png": "emoji_101607.png", "101607.png": "emoji_101607.webp",
"101608.png": "emoji_101608.png", "101608.png": "emoji_101608.webp",
"101609.png": "emoji_101609.png", "101609.png": "emoji_101609.webp",
"10160a.png": "emoji_10160a.png", "10160a.png": "emoji_10160a.webp",
"10160b.png": "emoji_10160b.png", "10160b.png": "emoji_10160b.webp",
"10160c.png": "emoji_10160c.png", "10160c.png": "emoji_10160c.webp",
"10160d.png": "emoji_10160d.png", "10160d.png": "emoji_10160d.webp",
"10160e.png": "emoji_10160e.png", "10160e.png": "emoji_10160e.webp",
"10160f.png": "emoji_10160f.png", "10160f.png": "emoji_10160f.webp",
"101610.png": "emoji_101610.png", "101610.png": "emoji_101610.webp",
"101611.png": "emoji_101611.png", "101611.png": "emoji_101611.webp",
"101612.png": "emoji_101612.png", "101612.png": "emoji_101612.webp",
"101613.png": "emoji_101613.png", "101613.png": "emoji_101613.webp",
"101614.png": "emoji_101614.png", "101614.png": "emoji_101614.webp",
"101615.png": "emoji_101615.png", "101615.png": "emoji_101615.webp",
"101616.png": "emoji_101616.png", "101616.png": "emoji_101616.webp",
"101617.png": "emoji_101617.png", "101617.png": "emoji_101617.webp",
"101618.png": "emoji_101618.png", "101618.png": "emoji_101618.webp",
"101619.png": "emoji_101619.png", "101619.png": "emoji_101619.webp",
"10161a.png": "emoji_10161a.png", "10161a.png": "emoji_10161a.webp",
"10161b.png": "emoji_10161b.png", "10161b.png": "emoji_10161b.webp",
"10161c.png": "emoji_10161c.png", "10161c.png": "emoji_10161c.webp",
"10161d.png": "emoji_10161d.png", "10161d.png": "emoji_10161d.webp",
"10161e.png": "emoji_10161e.png", "10161e.png": "emoji_10161e.webp",
"10161f.png": "emoji_10161f.png", "10161f.png": "emoji_10161f.webp",
"101620.png": "emoji_101620.png", "101620.png": "emoji_101620.webp",
"101621.png": "emoji_101621.png", "101621.png": "emoji_101621.webp",
"101622.png": "emoji_101622.png", "101622.png": "emoji_101622.webp",
"101623.png": "emoji_101623.png", "101623.png": "emoji_101623.webp",
"101624.png": "emoji_101624.png", "101624.png": "emoji_101624.webp",
"101625.png": "emoji_101625.png", "101625.png": "emoji_101625.webp",
"101626.png": "emoji_101626.png", "101626.png": "emoji_101626.webp",
"101627.png": "emoji_101627.png", "101627.png": "emoji_101627.webp",
"101628.png": "emoji_101628.png", "101628.png": "emoji_101628.webp",
"101629.png": "emoji_101629.png", "101629.png": "emoji_101629.webp",
"10162a.png": "emoji_10162a.png", "10162a.png": "emoji_10162a.webp",
"10162b.png": "emoji_10162b.png", "10162b.png": "emoji_10162b.webp",
"10162c.png": "emoji_10162c.png", "10162c.png": "emoji_10162c.webp",
"101650.png": "emoji_101650.png", "101650.png": "emoji_101650.webp",
"101651.png": "emoji_101651.png", "101651.png": "emoji_101651.webp",
"10169a.png": "emoji_10169a.png", "10169a.png": "emoji_10169a.webp",
"26b2-fe0f.png": "emoji_26b2.png", "26b2-fe0f.png": "emoji_26b2.webp",
"26a8-fe0f.png": "emoji_26a8.png", "26a8-fe0f.png": "emoji_26a8.webp",
"26a7-fe0f.png": "emoji_26a7.png", "26a7-fe0f.png": "emoji_26a7.webp",
"26a5-fe0f.png": "emoji_26a5.png", "26a5-fe0f.png": "emoji_26a5.webp",
"26a4-fe0f.png": "emoji_26a4.png", "26a4-fe0f.png": "emoji_26a4.webp",
"26a3-fe0f.png": "emoji_26a3.png", "26a3-fe0f.png": "emoji_26a3.webp",
"26a2-fe0f.png": "emoji_26a2.png", "26a2-fe0f.png": "emoji_26a2.webp",
"2642-fe0f.png": "emoji_2642.png", "2642-fe0f.png": "emoji_2642.webp",
"2640-fe0f.png": "emoji_2640.png", "2640-fe0f.png": "emoji_2640.webp",
"1f9e1.png": "emoji_1f9e1.png", "1f9e1.png": "emoji_1f9e1.webp",
"101685.png": "emoji_101685.png", "101685.png": "emoji_101685.webp",
"101684.png": "emoji_101684.png", "101684.png": "emoji_101684.webp",
"101683.png": "emoji_101683.png", "101683.png": "emoji_101683.webp",
"101682.png": "emoji_101682.png", "101682.png": "emoji_101682.webp",
"1f9fb.png": "emoji_1f9fb.png", "1f9fb.png": "emoji_1f9fb.webp",
"1f9f1.png": "emoji_1f9f1.png", "1f9f1.png": "emoji_1f9f1.webp",
"1f9e8.png": "emoji_1f9e8.png", "1f9e8.png": "emoji_1f9e8.webp",
"1f9b4.png": "emoji_1f9b4.png", "1f9b4.png": "emoji_1f9b4.webp",
"101696.png": "emoji_101696.png", "101696.png": "emoji_101696.webp",
"101695.png": "emoji_101695.png", "101695.png": "emoji_101695.webp",
"101694.png": "emoji_101694.png", "101694.png": "emoji_101694.webp",
"101693.png": "emoji_101693.png", "101693.png": "emoji_101693.webp",
"101692.png": "emoji_101692.png", "101692.png": "emoji_101692.webp",
"10169b.png": "emoji_10169b.png", "10169b.png": "emoji_10169b.webp",
"101698.png": "emoji_101698.png", "101698.png": "emoji_101698.webp",
"101699.png": "emoji_101699.png", "101699.png": "emoji_101699.webp",
"1f9dd.png": "emoji_1f9dd.png", "1f9dd.png": "emoji_1f9dd.webp",
"1f99d.png": "emoji_1f99d.png", "1f99d.png": "emoji_1f99d.webp",
"1f99c.png": "emoji_1f99c.png", "1f99c.png": "emoji_1f99c.webp",
"1f99a.png": "emoji_1f99a.png", "1f99a.png": "emoji_1f99a.webp",
"101666.png": "emoji_101666.png", "101666.png": "emoji_101666.webp",
"1f9d0.png": "emoji_1f9d0.png", "1f9d0.png": "emoji_1f9d0.webp",
"1f97a.png": "emoji_1f97a.png", "1f97a.png": "emoji_1f97a.webp",
"1f976.png": "emoji_1f976.png", "1f976.png": "emoji_1f976.webp",
"1f975.png": "emoji_1f975.png", "1f975.png": "emoji_1f975.webp",
"1f974.png": "emoji_1f974.png", "1f974.png": "emoji_1f974.webp",
"1f973.png": "emoji_1f973.png", "1f973.png": "emoji_1f973.webp",
"1f970.png": "emoji_1f970.png", "1f970.png": "emoji_1f970.webp",
"1f92f.png": "emoji_1f92f.png", "1f92f.png": "emoji_1f92f.webp",
"1f92e.png": "emoji_1f92e.png", "1f92e.png": "emoji_1f92e.webp",
"1f92d.png": "emoji_1f92d.png", "1f92d.png": "emoji_1f92d.webp",
"1f92c.png": "emoji_1f92c.png", "1f92c.png": "emoji_1f92c.webp",
"1f92b.png": "emoji_1f92b.png", "1f92b.png": "emoji_1f92b.webp",
"1f92a.png": "emoji_1f92a.png", "1f92a.png": "emoji_1f92a.webp",
"1f929.png": "emoji_1f929.png", "1f929.png": "emoji_1f929.webp",
"1f928.png": "emoji_1f928.png", "1f928.png": "emoji_1f928.webp",
"1f575-10162b.png": "emoji_1f575_10162b.png", "1f575-10162b.png": "emoji_1f575_10162b.webp",
"1f486-10162b.png": "emoji_1f486_10162b.png", "1f486-10162b.png": "emoji_1f486_10162b.webp",
"1f481-10162b.png": "emoji_1f481_10162b.png", "1f481-10162b.png": "emoji_1f481_10162b.webp",
"101690.png": "emoji_101690.png", "101690.png": "emoji_101690.webp",
"101697.png": "emoji_101697.png", "101697.png": "emoji_101697.webp",
"1f9dc.png": "emoji_1f9dc.png", "1f9dc.png": "emoji_1f9dc.webp",
"101681.png": "emoji_101681.png", "101681.png": "emoji_101681.webp",
"101680.png": "emoji_101680.png", "101680.png": "emoji_101680.webp",
"10167f.png": "emoji_10167f.png", "10167f.png": "emoji_10167f.webp",
"10167e.png": "emoji_10167e.png", "10167e.png": "emoji_10167e.webp",
"10167d.png": "emoji_10167d.png", "10167d.png": "emoji_10167d.webp",
"10167c.png": "emoji_10167c.png", "10167c.png": "emoji_10167c.webp",
"10167b.png": "emoji_10167b.png", "10167b.png": "emoji_10167b.webp",
"10167a.png": "emoji_10167a.png", "10167a.png": "emoji_10167a.webp",
"101679.png": "emoji_101679.png", "101679.png": "emoji_101679.webp",
"101678.png": "emoji_101678.png", "101678.png": "emoji_101678.webp",
"101677.png": "emoji_101677.png", "101677.png": "emoji_101677.webp",
"101676.png": "emoji_101676.png", "101676.png": "emoji_101676.webp",
"101675.png": "emoji_101675.png", "101675.png": "emoji_101675.webp",
"101674.png": "emoji_101674.png", "101674.png": "emoji_101674.webp",
"101673.png": "emoji_101673.png", "101673.png": "emoji_101673.webp",
"101672.png": "emoji_101672.png", "101672.png": "emoji_101672.webp",
"101671.png": "emoji_101671.png", "101671.png": "emoji_101671.webp",
"101670.png": "emoji_101670.png", "101670.png": "emoji_101670.webp",
"101686.png": "emoji_101686.png", "101686.png": "emoji_101686.webp",
"101691.png": "emoji_101691.png"} "101691.png": "emoji_101691.webp"}
# self note to get MM emojos: # self note to get MM emojos:
@ -175,7 +175,7 @@ def clean_emoji_name(name):
def discordify_emoji_name(name): def discordify_emoji_name(name):
name = "emoji_" + name.lower().replace("-", "_").replace("fe0f_", "")\ name = "emoji_" + name.lower().replace("-", "_").replace("fe0f_", "")\
.replace("200d_", "") .replace("200d_", "").replace(".png", ".webp")
return name return name
@ -195,7 +195,7 @@ replace_counter = 0
# Go through each discord emoji, and clean their names # Go through each discord emoji, and clean their names
for emoji in discord_emojis: for emoji in discord_emojis:
clean_discord_emoji = clean_emoji_name(emoji) clean_discord_emoji = clean_emoji_name("{}.png".format(os.path.splitext(emoji)[0]))
# Check if said clean name of emoji is in clean mutstd list # Check if said clean name of emoji is in clean mutstd list
if clean_discord_emoji in clean_mutstd_emojis: if clean_discord_emoji in clean_mutstd_emojis:

14
patches/necessary/1167.patch Normal file
View file

@ -0,0 +1,14 @@
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
*** from/AndroidManifest.xml 2020-06-20 04:18:47.385403248 +0100
--- to/AndroidManifest.xml 2020-06-20 04:19:15.591197366 +0100
***************
*** 1,4 ****
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="29" platformBuildVersionName="10">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
--- 1,4 ----
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1167" platformBuildVersionName="28-alpha2">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>

18
patches/noblocked/1167.patch Normal file
View file

@ -0,0 +1,18 @@
diff -crB -x dist -x build com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml
*** com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml 2019-01-25 10:57:34.359248256 +0300
--- com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml 2019-01-27 00:08:22.929085528 +0300
***************
*** 1,5 ****
<?xml version="1.0" encoding="utf-8"?>
! <RelativeLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
xmlns:android="http://schemas.android.com/apk/res/android">
! <TextView android:textSize="11.0sp" android:textColor="?theme_chat_blocked_text" android:gravity="center" android:id="@id/chat_list_adapter_item_blocked" android:background="?theme_chat_blocked_bg" android:paddingTop="7.5dip" android:paddingBottom="7.5dip" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
</RelativeLayout>
\ No newline at end of file
--- 1,5 ----
<?xml version="1.0" encoding="utf-8"?>
! <RelativeLayout android:background="?selectableItemBackground" android:paddingLeft="0px" android:paddingTop="0px" android:paddingRight="0px" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="0px" android:layout_height="0px" android:layout_marginLeft="0px" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
xmlns:android="http://schemas.android.com/apk/res/android">
! <TextView android:textSize="0sp" android:textColor="?theme_chat_blocked_text" android:gravity="center" android:id="@id/chat_list_adapter_item_blocked" android:background="?theme_chat_blocked_bg" android:paddingTop="0dip" android:paddingBottom="0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
</RelativeLayout>
\ No newline at end of file

1
patches/noblocked/README.md
View file

@ -159,4 +159,5 @@ This patch completely hides the "# Blocked Message(s)" thing.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

69
patches/nocamerabutton/1167.patch Normal file
View file

@ -0,0 +1,69 @@
diff -crB from/res/layout/flex_input_widget.xml to/res/layout/flex_input_widget.xml
*** from/res/layout/flex_input_widget.xml 2020-06-20 04:18:48.593394410 +0100
--- to/res/layout/flex_input_widget.xml 2020-06-20 04:20:25.034694444 +0100
***************
*** 8,14 ****
<RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
! <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
</LinearLayout>
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
--- 8,14 ----
<RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
! <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:visibility="gone" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
</LinearLayout>
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
***************
*** 22,25 ****
</RelativeLayout>
<FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
<FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
! </LinearLayout>
\ No newline at end of file
--- 22,25 ----
</RelativeLayout>
<FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
<FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
! </LinearLayout>
diff -crB from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
*** from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-06-20 04:18:53.511358449 +0100
--- to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-06-20 04:36:17.584111077 +0100
***************
*** 353,359 ****
if-eqz v5, :cond_5
! const/4 v10, 0x0
goto :goto_2
--- 353,359 ----
if-eqz v5, :cond_5
! const/16 v10, 0x0
goto :goto_2
***************
*** 508,514 ****
if-eqz v5, :cond_e
! const/4 v10, 0x0
goto :goto_9
--- 508,514 ----
if-eqz v5, :cond_e
! const/16 v10, 0x8
goto :goto_9

1
patches/nocamerabutton/README.md
View file

@ -66,4 +66,5 @@ to
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

20
patches/noemojibutton/1167.patch Normal file
View file

@ -0,0 +1,20 @@
diff -crB from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
*** from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-06-20 04:18:53.511358449 +0100
--- to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-06-20 04:19:07.375257235 +0100
***************
*** 220,226 ****
.method public static final g(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Lcom/lytefast/flexinput/viewmodel/FlexInputState;)V
.locals 11
! const/4 v0, 0x0
if-eqz p0, :cond_26
--- 220,226 ----
.method public static final g(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Lcom/lytefast/flexinput/viewmodel/FlexInputState;)V
.locals 11
! const/16 v0, 0x8
if-eqz p0, :cond_26

1
patches/noemojibutton/README.md
View file

@ -91,4 +91,5 @@ Self explanatory.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

179
patches/nonearby/1167.patch Normal file
View file

@ -0,0 +1,179 @@
diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali
*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-06-20 04:18:52.157368346 +0100
--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-06-20 04:37:59.897421161 +0100
***************
*** 475,609 ****
# virtual methods
.method public final activateNearby()V
! .locals 9
- .line 1
- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
-
- if-eqz v0, :cond_1
-
- .line 2
- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
-
- if-eqz v1, :cond_1
-
- .line 3
- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
-
- if-eqz v2, :cond_1
-
- .line 4
- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener;
-
- if-eqz v3, :cond_1
-
- .line 5
- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
-
- if-eqz v4, :cond_1
-
- .line 6
- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject;
-
- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;
-
- new-instance v7, Ljava/util/HashSet;
-
- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet;
-
- invoke-direct {v7, v8}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
-
- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;-><init>(Ljava/util/Set;)V
-
- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
- .line 7
- check-cast v0, Lf/j/a/d/j/b/e/i;
-
- .line 8
- invoke-static {v1}, Lf/j/a/b/l1/e;->y(Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {v2}, Lf/j/a/b/l1/e;->y(Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-virtual {v0, v1}, Lf/j/a/d/j/b/e/i;->h(Ljava/lang/Object;)Lf/j/a/d/e/j/l/i;
-
- move-result-object v5
-
- .line 9
- iget-object v6, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->b:Lf/j/a/d/j/b/b;
-
- .line 10
- invoke-virtual {v0, v6}, Lf/j/a/d/j/b/e/i;->h(Ljava/lang/Object;)Lf/j/a/d/e/j/l/i;
-
- move-result-object v6
-
- new-instance v7, Lf/j/a/d/j/b/e/r;
-
- invoke-direct {v7, v0, v6, v5}, Lf/j/a/d/j/b/e/r;-><init>(Lf/j/a/d/j/b/e/i;Lf/j/a/d/e/j/l/i;Lf/j/a/d/e/j/l/i;)V
-
- new-instance v6, Lf/j/a/d/j/b/e/j;
-
- invoke-direct {v6, v0, v1, v7, v2}, Lf/j/a/d/j/b/e/j;-><init>(Lf/j/a/d/j/b/e/i;Lcom/google/android/gms/nearby/messages/Message;Lf/j/a/d/j/b/e/b0;Lcom/google/android/gms/nearby/messages/PublishOptions;)V
-
- new-instance v2, Lf/j/a/d/j/b/e/k;
-
- invoke-direct {v2, v1}, Lf/j/a/d/j/b/e/k;-><init>(Lcom/google/android/gms/nearby/messages/Message;)V
-
- invoke-virtual {v0, v5, v6, v2}, Lf/j/a/d/j/b/e/i;->f(Lf/j/a/d/e/j/l/i;Lf/j/a/d/j/b/e/a0;Lf/j/a/d/j/b/e/a0;)Lcom/google/android/gms/tasks/Task;
-
- .line 11
- invoke-static {v3}, Lf/j/a/b/l1/e;->y(Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {v4}, Lf/j/a/b/l1/e;->y(Ljava/lang/Object;)Ljava/lang/Object;
-
- .line 12
- iget-object v1, v4, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->a:Lcom/google/android/gms/nearby/messages/Strategy;
-
- .line 13
- iget v1, v1, Lcom/google/android/gms/nearby/messages/Strategy;->k:I
-
- if-nez v1, :cond_0
-
- const/4 v1, 0x1
-
- goto :goto_0
-
- :cond_0
- const/4 v1, 0x0
-
- :goto_0
- const-string v2, "Strategy.setBackgroundScanMode() is only supported by background subscribe (the version which takes a PendingIntent)."
-
- .line 14
- invoke-static {v1, v2}, Lf/j/a/b/l1/e;->m(ZLjava/lang/Object;)V
-
- invoke-virtual {v0, v3}, Lf/j/a/d/j/b/e/i;->h(Ljava/lang/Object;)Lf/j/a/d/e/j/l/i;
-
- move-result-object v1
-
- .line 15
- iget-object v2, v4, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->c:Lf/j/a/d/j/b/d;
-
- .line 16
- invoke-virtual {v0, v2}, Lf/j/a/d/j/b/e/i;->h(Ljava/lang/Object;)Lf/j/a/d/e/j/l/i;
-
- move-result-object v2
-
- new-instance v3, Lf/j/a/d/j/b/e/s;
-
- invoke-direct {v3, v0, v2, v1}, Lf/j/a/d/j/b/e/s;-><init>(Lf/j/a/d/j/b/e/i;Lf/j/a/d/e/j/l/i;Lf/j/a/d/e/j/l/i;)V
-
- new-instance v2, Lf/j/a/d/j/b/e/l;
-
- invoke-direct {v2, v0, v1, v3, v4}, Lf/j/a/d/j/b/e/l;-><init>(Lf/j/a/d/j/b/e/i;Lf/j/a/d/e/j/l/i;Lf/j/a/d/j/b/e/d0;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)V
-
- new-instance v3, Lf/j/a/d/j/b/e/m;
-
- invoke-direct {v3, v1}, Lf/j/a/d/j/b/e/m;-><init>(Lf/j/a/d/e/j/l/i;)V
-
- invoke-virtual {v0, v1, v2, v3}, Lf/j/a/d/j/b/e/i;->f(Lf/j/a/d/e/j/l/i;Lf/j/a/d/j/b/e/a0;Lf/j/a/d/j/b/e/a0;)Lcom/google/android/gms/tasks/Task;
-
- :cond_1
return-void
.end method
--- 475,482 ----
# virtual methods
.method public final activateNearby()V
! .locals 0
return-void
.end method
***************
*** 706,725 ****
.end method
.method public final initialize(J)V
! .locals 1
!
! .line 1
! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
!
! move-result-object v0
!
! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long;
!
! .line 2
! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V
!
! .line 3
! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V
return-void
.end method
--- 579,585 ----
.end method
.method public final initialize(J)V
! .locals 0
return-void
.end method

1
patches/nonearby/README.md
View file

@ -162,4 +162,5 @@ This patch nulls a bunch of nearby friends features for privacy.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

49
patches/noprofilestrip/1167.patch Normal file
View file

@ -0,0 +1,49 @@
diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000
--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000
***************
*** 430,442 ****
move-result-object v2
! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
!
! move-result-object v4
!
! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
!
! move-result-object v4
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
--- 430,436 ----
move-result-object v2
! const-string v4, ""
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
***************
*** 445,457 ****
move-result-object v2
! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
!
! move-result-object p1
!
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
!
! move-result-object p1
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
--- 439,445 ----
move-result-object v2
! const-string p1, ""
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V

1
patches/noprofilestrip/README.md
View file

@ -156,4 +156,5 @@ This patch removes the "profile strip" from the left side menu, helping remove P
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

69
patches/nospoiler/1167.patch Normal file
View file

@ -0,0 +1,69 @@
diff -crB from/smali/com/discord/models/domain/ModelMessageEmbed.smali to/smali/com/discord/models/domain/ModelMessageEmbed.smali
*** from/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-06-20 04:18:51.415373771 +0100
--- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-06-20 04:19:13.477212763 +0100
***************
*** 1921,1953 ****
.end method
.method public isSpoilerAttachment()Z
! .locals 2
!
! .line 1
! invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessageEmbed;->isAttachment()Z
!
! move-result v0
!
! if-eqz v0, :cond_0
!
! iget-object v0, p0, Lcom/discord/models/domain/ModelMessageEmbed;->title:Ljava/lang/String;
!
! const-string v1, "SPOILER_"
!
! invoke-virtual {v0, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
!
! move-result v0
!
! if-eqz v0, :cond_0
!
! const/4 v0, 0x1
!
! goto :goto_0
!
! :cond_0
const/4 v0, 0x0
- :goto_0
return v0
.end method
--- 1921,1929 ----
.end method
.method public isSpoilerAttachment()Z
! .locals 1
const/4 v0, 0x0
return v0
.end method
diff -crB from/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
*** from/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali 2020-06-20 04:18:51.833370715 +0100
--- to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali 2020-06-20 04:19:13.477212763 +0100
***************
*** 209,216 ****
.method public isRevealed()Z
.locals 1
! .line 1
! iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z
return v0
.end method
--- 209,215 ----
.method public isRevealed()Z
.locals 1
! const/4 v0, 0x1
return v0
.end method

1
patches/nospoiler/README.md
View file

@ -159,4 +159,5 @@ I personally won't be using it as I like to use them as CWs, but I do acknowledg
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

3
patches/notrack/1167-post.sh Normal file
View file

@ -0,0 +1,3 @@
#!/bin/bash
mv smali/com/crashlytics smali_classes2/com/
mv smali/com/airbnb smali_classes2/com/

1298
patches/notrack/1167.patch Normal file
View file

File diff suppressed because it is too large Load diff

1
patches/notrack/README.md
View file

@ -166,3 +166,4 @@ Fuck telemetry.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

34
patches/nozlib/1167.patch Normal file
View file

@ -0,0 +1,34 @@
diff -crB from/smali/com/discord/gateway/GatewaySocket.smali to/smali/com/discord/gateway/GatewaySocket.smali
*** from/smali/com/discord/gateway/GatewaySocket.smali 2020-06-20 04:18:51.353374224 +0100
--- to/smali/com/discord/gateway/GatewaySocket.smali 2020-06-20 04:19:18.297177665 +0100
***************
*** 1333,1339 ****
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
! const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 1333,1339 ----
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
! const-string p1, "/?encoding=json&v=6"
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff -crB from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
*** from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2020-06-20 04:18:51.359374181 +0100
--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2020-06-20 04:19:18.297177665 +0100
***************
*** 68,73 ****
--- 68,75 ----
iput p2, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->large_threshold:I
+ const/4 p3, 0x0
+
iput-boolean p3, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->compress:Z
iput-wide p4, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->capabilities:J

1
patches/nozlib/README.md
View file

@ -159,4 +159,5 @@ This patch disables zlib-stream field on wss, making it easier to parse it.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

65
patches/profilemention/1167.patch Normal file
View file

@ -0,0 +1,65 @@
diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali to/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
*** from/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali 2020-06-20 04:18:52.071368975 +0100
--- to/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali 2020-06-20 04:55:36.860065606 +0100
***************
*** 268,326 ****
.end annotation
.end param
- .line 1
- invoke-static {p1}, Lcom/discord/utilities/guilds/PublicGuildUtils;->isPublicGuildSystemMessage(Lcom/discord/models/domain/ModelMessage;)Z
-
- move-result v0
-
- if-nez v0, :cond_1
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMessageReference()Lcom/discord/models/domain/ModelMessage$MessageReference;
-
- move-result-object v0
-
- if-eqz v0, :cond_0
-
- goto :goto_0
-
- .line 2
- :cond_0
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
-
- move-result-wide v0
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
-
- move-result-wide v2
-
- invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object p1
-
- iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
-
- invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
-
- move-result-object v2
-
- invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object p2
-
- invoke-static {v0, v1, p1, v2, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
-
- goto :goto_1
-
- .line 3
- :cond_1
- :goto_0
invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/chat/list/WidgetChatList$1;->onMessageAuthorNameClicked(Lcom/discord/models/domain/ModelMessage;J)V
- :goto_1
return-void
.end method
--- 268,275 ----

1
patches/profilemention/README.md
View file

@ -8,4 +8,5 @@ This patch restores the behavior where tapping a user's profile picture adds the
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

21
patches/pseudonitro-viewer/1167.patch Normal file
View file

@ -0,0 +1,21 @@
diff -crB from/smali/com/discord/utilities/textprocessing/Rules.smali to/smali/com/discord/utilities/textprocessing/Rules.smali
*** from/smali/com/discord/utilities/textprocessing/Rules.smali 2020-06-20 04:18:51.825370773 +0100
--- to/smali/com/discord/utilities/textprocessing/Rules.smali 2020-06-20 04:42:29.215611152 +0100
***************
*** 133,139 ****
sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_UNICODE_EMOJI$delegate:Lkotlin/Lazy;
! const-string v0, "^<(a)?:([a-zA-Z_0-9]+):(\\d+)>"
.line 8
invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
--- 133,140 ----
sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_UNICODE_EMOJI$delegate:Lkotlin/Lazy;
! # There's a ZWSP there
! const-string v0, "^<&?​?(a)?:([a-zA-Z_0-9]+):(\\d+)>"
.line 8
invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;

1
patches/pseudonitro-viewer/README.md
View file

@ -13,4 +13,5 @@ TL;DR:
#### Available and tested on: #### Available and tested on:
- 24 - 24
- 28-alpha2

3384
patches/slashcommands/1167.patch Normal file
View file

File diff suppressed because it is too large Load diff

1
patches/slashcommands/README.md
View file

@ -169,4 +169,5 @@ Commands like fw can be generated by `textreplacegen.py` or `textreplacegen-arra
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

21
patches/squareavatars/1167.patch Normal file
View file

@ -0,0 +1,21 @@
diff -crB from/res/values/styles.xml to/res/values/styles.xml
*** from/res/values/styles.xml 2020-06-20 04:18:49.557387358 +0100
--- to/res/values/styles.xml 2020-06-20 04:19:09.409242406 +0100
***************
*** 1041,1047 ****
<item name="actualImageScaleType">fitCenter</item>
<item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
<item name="placeholderImageScaleType">fitCenter</item>
! <item name="roundAsCircle">true</item>
</style>
<style name="Avatar.Chat" parent="@style/Avatar.Large">
<item name="android:layout_width">@dimen/avatar_size_chat</item>
--- 1041,1048 ----
<item name="actualImageScaleType">fitCenter</item>
<item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
<item name="placeholderImageScaleType">fitCenter</item>
! <item name="roundAsCircle">false</item>
! <item name="roundedCornerRadius">3dp</item>
</style>
<style name="Avatar.Chat" parent="@style/Avatar.Large">
<item name="android:layout_width">@dimen/avatar_size_chat</item>

1
patches/squareavatars/README.md
View file

@ -161,4 +161,5 @@ A very small amount of rounding is applied to make it look a little better.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

422
patches/supplemental/1167.patch Normal file
View file

@ -0,0 +1,422 @@
diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/discord/gateway/io/IncomingParser.smali
*** from/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 04:18:51.361374166 +0100
--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 04:19:03.349286602 +0100
***************
*** 754,759 ****
--- 754,770 ----
.line 57
:goto_2
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getNoDelete()Z
+
+ move-result v4
+
+ if-nez v4, :cond_b
+
new-instance v0, Lcom/discord/models/domain/ModelMessageDelete;
invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;-><init>()V
diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali
*** from/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 04:18:51.383374005 +0100
--- to/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 04:19:03.349286602 +0100
***************
*** 2230,2235 ****
--- 2230,2245 ----
}
.end annotation
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getLeakChannels()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
.line 1
iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map;
diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali
*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 04:18:51.667371929 +0100
--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 04:19:03.351286588 +0100
***************
*** 396,401 ****
--- 396,649 ----
return-void
.end method
+ .method public getLeakChannels()Z
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
+
+ const/4 v2, 0x1
+
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+
+ move-result v0
+
+ return v0
+ .end method
+
+ .method public setLeakChannels(Z)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
+
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+ .end method
+
+ .method public getImageSpoiler()Z
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
+
+ const/4 v2, 0x0
+
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+
+ move-result v0
+
+ return v0
+ .end method
+
+ .method public setImageSpoiler(Z)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
+
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+ .end method
+
+
+ .method public getNoDelete()Z
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ const-string v1, "CACHE_KEY_CTC_NO_DELETE"
+
+ const/4 v2, 0x0
+
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+
+ move-result v0
+
+ return v0
+ .end method
+
+ .method public setNoDelete(Z)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ const-string v1, "CACHE_KEY_CTC_NO_DELETE"
+
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+ .end method
+
+ .method public getShowTyping()Z
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ const-string v1, "CACHE_KEY_CTC_SHOW_TYPING"
+
+ const/4 v2, 0x1
+
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+
+ move-result v0
+
+ return v0
+ .end method
+
+ .method public setShowTyping(Z)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ const-string v1, "CACHE_KEY_CTC_SHOW_TYPING"
+
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+ .end method
+
+
+ .method public getStoredToken()Ljava/lang/String;
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
+
+ const-string v1, "none"
+
+ const-string v2, "STORE_AUTHED_TOKEN"
+
+ invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object v0
+
+ return-object v0
+ .end method
+
+
+ .method public setStoredToken(Ljava/lang/String;)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ const-string v1, "STORE_AUTHED_TOKEN"
+
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+ .end method
+
+ .method public getAccountToken(Ljava/lang/String;)Ljava/lang/String;
+ .locals 3
+
+ const-string v2, "STORE_AUTHED_TOKEN_CTC_USER_"
+
+ invoke-virtual {p1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
+
+ move-result-object p1
+
+ new-instance v0, Ljava/lang/StringBuilder;
+
+ invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+ invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object v2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
+
+ const-string v1, "none"
+
+ invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object v0
+
+ return-object v0
+ .end method
+
+
+ .method public setAccountToken(Ljava/lang/String;Ljava/lang/String;)V
+ .locals 2
+
+ const-string v1, "STORE_AUTHED_TOKEN_CTC_USER_"
+
+ invoke-virtual {p1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
+
+ move-result-object p1
+
+ new-instance v0, Ljava/lang/StringBuilder;
+
+ invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+ invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object v1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ invoke-interface {v0, v1, p2}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+ .end method
+
.method private getAdjustedTheme(Ljava/lang/String;)Ljava/lang/String;
.locals 1
diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 04:18:51.787371051 +0100
--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 04:19:03.351286588 +0100
***************
*** 46,51 ****
--- 46,85 ----
return-void
.end method
+ .method public static final interceptFilename(Ljava/lang/String;)Ljava/lang/String;
+ .locals 3
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getImageSpoiler()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_1
+
+ new-instance v2, Ljava/lang/StringBuilder;
+
+ const-string v1, "SPOILER_"
+
+ invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+ invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object p0
+
+ # I commented this out and do this in StoreMessages now as this'd only work for a single image
+ # const/4 v1, 0x0
+
+ # invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V
+
+ :cond_1
+ return-object p0
+ .end method
+
# virtual methods
.method public final invoke(Lokhttp3/RequestBody;Ljava/lang/String;Landroid/graphics/Bitmap$CompressFormat;)Lcom/discord/utilities/rest/SendUtils$FileUpload;
***************
*** 77,82 ****
--- 111,120 ----
move-result-object v4
+ invoke-static {v3}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object v3
+
.line 4
iget-object p1, p0, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->this$0:Lcom/discord/utilities/rest/SendUtils$getPart$1;
diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 04:18:52.031369267 +0100
--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 04:19:03.351286588 +0100
***************
*** 59,64 ****
--- 59,74 ----
invoke-virtual {v0}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->saveText()V
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getShowTyping()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_1
+
.line 4
invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 04:18:52.035369238 +0100
--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 04:19:03.351286588 +0100
***************
*** 60,65 ****
--- 60,89 ----
return p0
.end method
+ .method public static final access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z
+ .locals 1
+
+ .line 147
+ invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setText(Ljava/lang/CharSequence;)V
+
+ .line 148
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->clearLastTypingEmission()V
+
+ .line 151
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getChat()Lcom/discord/stores/StoreChat;
+
+ move-result-object p1
+
+ const/4 v0, 0x0
+
+ .line 152
+ invoke-virtual {p1, v0}, Lcom/discord/stores/StoreChat;->setEditingMessage(Lcom/discord/stores/StoreChat$EditingMessage;)V
+
+ const/4 p1, 0x1
+
+ return p1
+ .end method
+
.method private final clearInput(Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/Boolean;)Z
.locals 1

1
patches/supplemental/README.md
View file

@ -112,4 +112,5 @@ This patch adds various helper functions that were previously part of slashcomma
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

33
patches/tokenlogin/1167.patch Normal file
View file

@ -0,0 +1,33 @@
diff -crB from/smali/com/discord/widgets/auth/WidgetAuthLogin.smali to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
*** from/smali/com/discord/widgets/auth/WidgetAuthLogin.smali 2020-06-20 04:18:51.913370130 +0100
--- to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali 2020-06-20 04:19:11.447227553 +0100
***************
*** 950,955 ****
--- 950,976 ----
move-result-object v3
+ # tokenlogin code
+
+ const-string v6, "tokenlogin"
+
+ invoke-virtual {v2, v6}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+ move-result v6
+
+ if-eqz v6, :cond_2
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+ move-result-object v6
+
+ invoke-virtual {v6, v3}, Lcom/discord/stores/StoreUserSettings;->setStoredToken(Ljava/lang/String;)V
+
+ return-void
+
+ # end of new code (except conf below, that's also new)
+
+ :cond_2
invoke-virtual {v0, v2, v3, p1, p2}, Lcom/discord/stores/StoreAuthentication;->login(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lrx/Observable;
move-result-object p1

1
patches/tokenlogin/README.md
View file

@ -138,3 +138,4 @@ This patch relies on supplemental, so please use that patch too.
- 23.0 - 23.0
- 24-alpha2 - 24-alpha2
- 24 - 24
- 28-alpha2

2
patchport-state.json
View file

@ -1 +1 @@
{"versionname": "24", "versioncode": "1150"} {"versionname": "28-alpha2", "versioncode": "1167"}