87202 patches

README.md

@@ -6,7 +6,7 @@ Modular Client Mod for Discord's Android app.
 
 For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
 
-**Latest supported Discord Android version:** 78.4 - Alpha (78204), released on 2021-05-31.
+**Latest supported Discord Android version:** 87.2 - Alpha (87202), released on 2021-08-04.
 
 New patch development will be done for the latest supported version.
 

patches/betterrotation/87202.patch

@@ -0,0 +1,22 @@
+diff -crB fromAndroidManifest.xml to/AndroidManifest.xml
+*** fromAndroidManifest.xml	2021-05-31 15:40:24.000000000 +0300
+--- to/AndroidManifest.xml	2021-05-31 15:40:24.000000000 +0300
+***************
+*** 37,44 ****
+      <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+      <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
+          <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">
+              <intent-filter>
+                  <action android:name="android.intent.action.MAIN"/>
+                  <category android:name="android.intent.category.LAUNCHER"/>
+--- 37,44 ----
+      <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+      <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
+          <activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
+!         <activity android:name="com.discord.app.AppActivity" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
+!         <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
+              <intent-filter>
+                  <action android:name="android.intent.action.MAIN"/>
+                  <category android:name="android.intent.category.LAUNCHER"/>

patches/branding/87202.patch

@@ -0,0 +1,212 @@
+diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
+*** from/AndroidManifest.xml    2021-08-04 19:44:13.386881200 +0100
+--- to/AndroidManifest.xml      2021-08-04 23:05:33.372467500 +0100
+***************
+*** 1,4 ****
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" android:installLocation="auto" package="com.discord" platformBuildVersionCode="87202" platformBuildVersionName="87.2 - Alpha">
+      <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="30" android:compileSdkVersionCodename="11" android:installLocation="auto" package="com.discord.CTCBRANCH" platformBuildVersionCode="87202CTCBUILD" platformBuildVersionName="87.2-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"/>
+***************
+*** 22,28 ****
+      <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+      <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+      <uses-permission android:name="android.permission.READ_CONTACTS"/>
+!     <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-feature android:name="android.hardware.camera.any" android:required="false"/>
+      <queries>
+          <package android:name="com.samsung.android.game.gametools"/>
+--- 22,28 ----
+      <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+      <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+      <uses-permission android:name="android.permission.READ_CONTACTS"/>
+!     <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-feature android:name="android.hardware.camera.any" android:required="false"/>
+      <queries>
+          <package android:name="com.samsung.android.game.gametools"/>
+***************
+*** 35,41 ****
+      <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"/>
+!     <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
+          <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">
+--- 35,41 ----
+      <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"/>
+!     <application android:allowBackup="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
+          <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">
+***************
+*** 143,149 ****
+                  <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"/>
+--- 143,149 ----
+                  <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.CTCBRANCH.permission.CONNECT">
+              <intent-filter>
+                  <action android:name="com.discord.intent.action.CONNECT"/>
+                  <data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
+***************
+*** 166,172 ****
+              </intent-filter>
+          </receiver>
+          <service android:foregroundServiceType="mediaProjection" 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"/>
+--- 166,172 ----
+              </intent-filter>
+          </receiver>
+          <service android:foregroundServiceType="mediaProjection" 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"/>
+***************
+*** 210,218 ****
+          <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"/>
+!         <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+          <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"/>
+--- 210,218 ----
+          <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"/>
+!         <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+          <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"/>
+diff -crB from/apktool.yml to/apktool.yml
+*** from/apktool.yml    2021-08-04 19:47:51.922495900 +0100
+--- to/apktool.yml      2021-08-04 23:19:20.589588900 +0100
+***************
+*** 860,864 ****
+    tag: null
+  version: 2.5.1-e25c0f-SNAPSHOT
+  versionInfo:
+!   versionCode: '87202'
+!   versionName: 87.2 - Alpha
+--- 860,864 ----
+    tag: null
+  version: 2.5.1-e25c0f-SNAPSHOT
+  versionInfo:
+!   versionCode: '87202CTCBUILD'
+!   versionName: 87.2-cutthecord-CTCBUILD
+diff -crB from/res/values/strings.xml to/res/values/strings.xml
+*** from/res/values/strings.xml 2021-08-04 19:45:07.324879100 +0100
+--- to/res/values/strings.xml   2021-08-04 23:10:01.984080100 +0100
+***************
+*** 2119,2125 ****
+      <string name="disconnect_other">Disconnect</string>
+      <string name="disconnect_self">Disconnect</string>
+      <string name="disconnect_user_success">User has been disconnected from voice.</string>
+!     <string name="discord">Discord-Canary</string>
+      <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
+      <string name="discord_desc_short">Imagine a place</string>
+      <string name="discord_gg">discord.gg/</string>
+--- 2119,2125 ----
+      <string name="disconnect_other">Disconnect</string>
+      <string name="disconnect_self">Disconnect</string>
+      <string name="disconnect_user_success">User has been disconnected from voice.</string>
+!     <string name="discord">CTCNAME</string>
+      <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
+      <string name="discord_desc_short">Imagine a place</string>
+      <string name="discord_gg">discord.gg/</string>
+***************
+*** 5802,5808 ****
+      <string name="notification_reply_failed">Failed to reply to {recipient}</string>
+      <string name="notification_reply_success">Replied to {recipient}</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_muted">Notifications, muted</string>
+--- 5802,5808 ----
+      <string name="notification_reply_failed">Failed to reply to {recipient}</string>
+      <string name="notification_reply_success">Replied to {recipient}</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_muted">Notifications, muted</string>
+***************
+*** 8036,8042 ****
+      <string name="suggested_languages">Suggested languages</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>
+--- 8036,8042 ----
+      <string name="suggested_languages">Suggested languages</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    2021-08-04 19:45:49.664874800 +0100
+--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali      2021-08-04 23:10:50.091576100 +0100
+***************
+*** 104,110 ****
+      .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;
+--- 104,110 ----
+      .line 3
+      new-instance v0, Landroid/content/Intent;
+
+!     const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
+
+      .line 4
+      invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali
+*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali      2021-08-04 19:46:33.436376300 +0100
+--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali        2021-08-04 23:13:23.464566700 +0100
+***************
+*** 89,95 ****
+
+      invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     const-string v2, "https://support.discord.com"
+
+      const/4 v3, 0x0
+
+--- 89,95 ----
+
+      invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     const-string v2, "https://gitdab.com/distok/cutthecord"
+
+      const/4 v3, 0x0

patches/customversion/87202.patch

@@ -0,0 +1,19 @@
+diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
+*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali       2021-08-04 19:46:33.476875700 +0100
+--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2021-08-04 20:46:17.098990400 +0100
+***************
+*** 813,819 ****
+
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+!     const-string v1, " - 87.2 - Alpha (87202)"
+
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+--- 813,819 ----
+
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+!     const-string v1, " - 87.2 - Alpha (87202), With Cutthecord patches"
+
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

patches/disable-mobileindicator/87202.patch

@@ -0,0 +1,115 @@
+diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali   2021-08-04 19:46:28.632872300 +0100
+--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali     2021-08-04 21:06:15.420553000 +0100
+***************
+*** 181,187 ****
+
+      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+      .line 7
+      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+--- 181,187 ----
+
+      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+      .line 7
+      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$
+clienthax@DESKTOP-KM4G6JD:/mnt/c/Users/clienthax/Documents/Projects/cutthecord/ugh$ 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    2021-08-04 19:45:49.058376400 +0100
+--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali      2021-08-04 21:13:23.168882700 +0100
+***************
+*** 444,514 ****
+  .end method
+
+  .method private final setSuperProperties(Ljava/util/Map;)V
+!     .locals 3
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;)V"
+!         }
+!     .end annotation
+!
+!     sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
+!
+!     sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+!
+!     const/4 v2, 0x0
+!
+!     aget-object v1, v1, v2
+!
+!     invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+!
+      return-void
+  .end method
+
+  .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
+!     .locals 1
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;)V"
+!         }
+!     .end annotation
+!
+!     monitor-enter p0
+!
+!     .line 1
+!     :try_start_0
+!     invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
+!
+!     move-result-object v0
+!
+!     invoke-static {v0, p1}, Ld0/t/h0;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+!
+!     move-result-object p1
+!
+!     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
+!     :try_end_0
+!     .catchall {:try_start_0 .. :try_end_0} :catchall_0
+!
+!     .line 2
+!     monitor-exit p0
+
+      return-void
+-
+-     :catchall_0
+-     move-exception p1
+-
+-     monitor-exit p0
+-
+-     throw p1
+  .end method
+
+
+--- 444,458 ----
+  .end method
+
+  .method private final setSuperProperties(Ljava/util/Map;)V
+!     .locals 0
+!
+      return-void
+  .end method
+
+  .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
+!     .locals 0
+
+      return-void
+  .end method

patches/embedlinks/87202.patch

@@ -0,0 +1,92 @@
+diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
+*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali   2021-08-04 19:45:53.005373900 +0100
+--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali     2021-08-04 21:16:24.965470600 +0100
+***************
+*** 773,851 ****
+  .end method
+
+  .method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
+!     .locals 3
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/util/Collection<",
+!             "Lcom/discord/simpleast/core/node/Node<",
+!             "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
+!             ">;>;)V"
+!         }
+!     .end annotation
+
+-     .line 1
+-     invoke-interface {p1}, Ljava/util/Collection;->size()I
+-
+-     move-result v0
+-
+-     const/4 v1, 0x1
+-
+-     if-ne v0, v1, :cond_2
+-
+-     iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
+-
+-     if-eqz v0, :cond_2
+-
+-     invoke-interface {v0}, Ljava/util/List;->size()I
+-
+-     move-result v0
+-
+-     if-eq v0, v1, :cond_0
+-
+-     goto :goto_0
+-
+-     :cond_0
+-     const/4 v0, 0x0
+-
+-     .line 2
+-     invoke-static {p1, v0}, Ld0/t/u;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
+-
+-     move-result-object v1
+-
+-     check-cast v1, Lcom/discord/simpleast/core/node/Node;
+-
+-     .line 3
+-     iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
+-
+-     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+-
+-     move-result-object v0
+-
+-     check-cast v0, Lcom/discord/api/message/embed/MessageEmbed;
+-
+-     .line 4
+-     instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
+-
+-     if-nez v1, :cond_1
+-
+-     return-void
+-
+-     .line 5
+-     :cond_1
+-     sget-object v1, Lcom/discord/utilities/embed/EmbedResourceUtils;->INSTANCE:Lcom/discord/utilities/embed/EmbedResourceUtils;
+-
+-     invoke-virtual {v1, v0}, Lcom/discord/utilities/embed/EmbedResourceUtils;->isSimpleEmbed(Lcom/discord/api/message/embed/MessageEmbed;)Z
+-
+-     move-result v0
+-
+-     if-eqz v0, :cond_2
+-
+-     .line 6
+-     invoke-interface {p1}, Ljava/util/Collection;->clear()V
+-
+-     :cond_2
+-     :goto_0
+      return-void
+  .end method
+
+--- 773,780 ----
+  .end method
+
+  .method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
+!     .locals 0
+
+      return-void
+  .end method

patches/experiments/87202.patch

@@ -0,0 +1,102 @@
+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-12-10 17:59:07.971850829 +0000
+--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2020-12-10 18:09:32.190991391 +0000
+***************
+*** 84,147 ****
+  .end method
+
+  .method public final invoke()Z
+!     .locals 4
+!
+!     .line 2
+!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;->this$0:Lcom/discord/stores/StoreExperiments;
+!
+!     invoke-static {v0}, Lcom/discord/stores/StoreExperiments;->access$getStoreUser$p(Lcom/discord/stores/StoreExperiments;)Lcom/discord/stores/StoreUser;
+!
+!     move-result-object v0
+!
+!     invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/user/MeUser;
+!
+!     move-result-object v0
+!
+!     .line 3
+!     iget-object v1, p0, Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;->this$0:Lcom/discord/stores/StoreExperiments;
+!
+!     invoke-static {v1}, Lcom/discord/stores/StoreExperiments;->access$getStoreGuilds$p(Lcom/discord/stores/StoreExperiments;)Lcom/discord/stores/StoreGuilds;
+!
+!     move-result-object v1
+!
+!     invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+!
+!     move-result-object v1
+!
+!     const-wide v2, 0x2bc056ab0800006L
+!
+!     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+!
+!     move-result-object v2
+!
+!     invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+!
+!     move-result-object v1
+!
+!     check-cast v1, Lcom/discord/models/guild/Guild;
+!
+!     .line 4
+!     sget-object v2, Lcom/discord/utilities/user/UserUtils;->INSTANCE:Lcom/discord/utilities/user/UserUtils;
+!
+!     invoke-virtual {v2, v0}, Lcom/discord/utilities/user/UserUtils;->isStaff(Lcom/discord/models/user/User;)Z
+!
+!     move-result v0
+!
+!     if-nez v0, :cond_1
+!
+!     if-eqz v1, :cond_0
+!
+!     goto :goto_0
+!
+!     :cond_0
+!     const/4 v0, 0x0
+!
+!     goto :goto_1
+!
+!     :cond_1
+!     :goto_0
+!     const/4 v0, 0x1
+!
+!     :goto_1
+!     return v0
+  .end method
+--- 84,92 ----
+  .end method
+
+  .method public final invoke()Z
+!      .locals 1
+!
+!      const/4 v0, 0x1
+!
+!      return v0
+  .end method
+diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
+*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2020-12-10 17:59:09.323866394 +0000
+--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2020-12-10 18:09:56.939273259 +0000
+***************
+*** 121,131 ****
+
+      sget-object p3, Lcom/discord/utilities/user/UserUtils;->INSTANCE:Lcom/discord/utilities/user/UserUtils;
+
+!     invoke-static {p1, v2}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+!
+!     invoke-virtual {p3, p1}, Lcom/discord/utilities/user/UserUtils;->isStaff(Lcom/discord/models/user/User;)Z
+!
+!     move-result p3
+
+      if-eqz p3, :cond_0
+
+--- 121,127 ----
+
+      sget-object p3, Lcom/discord/utilities/user/UserUtils;->INSTANCE:Lcom/discord/utilities/user/UserUtils;
+
+!     const/4 p3, 0x1
+
+      if-eqz p3, :cond_0

patches/hideunusableemojis/87202.patch

@@ -0,0 +1 @@
+# Already in base discord

patches/necessary/87202.patch

@@ -0,0 +1,14 @@
+diff -crB fromAndroidManifest.xml to/AndroidManifest.xml
+*** fromAndroidManifest.xml	2021-05-31 14:05:32.000000000 +0300
+--- to/AndroidManifest.xml	2021-05-31 15:40:24.000000000 +0300
+***************
+*** 1,4 ****
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" android:installLocation="auto" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+      <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="30" android:compileSdkVersionCodename="11" android:installLocation="auto" package="com.discord" platformBuildVersionCode="87202" platformBuildVersionName="87.2 - Alpha">
+      <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"/>

patches/noblocked/87202.patch

@@ -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

patches/nocamerabutton/87202.patch

@@ -0,0 +1,22 @@
+Binary files com.discord-base/build/apk/classes3.dex and com.discord/build/apk/classes3.dex differ
+Binary files com.discord-base/dist/com.discord-78204.apk and com.discord/dist/com.discord-78204.apk differ
+diff -crB com.discord-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali com.discord/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali
+*** com.discord-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali	2021-05-31 14:05:59.000000000 +0300
+--- com.discord/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali	2021-05-31 16:02:21.000000000 +0300
+***************
+*** 206,212 ****
+  
+      if-eqz v4, :cond_6
+  
+!     const/4 v9, 0x0
+  
+      goto :goto_1
+  
+--- 206,212 ----
+  
+      if-eqz v4, :cond_6
+  
+!     const/16 v9, 0x8
+  
+      goto :goto_1
+  

patches/noemojibutton/87202.patch

@@ -0,0 +1,20 @@
+diff -crB from/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali to/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
+*** from/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali    2021-08-04 19:46:19.422375900 +0100
+--- to/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali      2021-08-04 22:41:58.849465700 +0100
+***************
+*** 350,356 ****
+
+      invoke-static {v0, v1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     invoke-virtual {v0, v6}, Landroid/widget/ImageButton;->setVisibility(I)V
+
+      :goto_0
+      return-void
+--- 350,356 ----
+
+      invoke-static {v0, v1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+!     # invoke-virtual {v0, v6}, Landroid/widget/ImageButton;->setVisibility(I)V
+
+      :goto_0
+      return-void

patches/nospoiler/87202.patch

@@ -0,0 +1,58 @@
+diff -crB from/smali/com/discord/api/message/attachment/MessageAttachment.smali to/smali/com/discord/api/message/attachment/MessageAttachment.smali
+*** from/smali/com/discord/api/message/attachment/MessageAttachment.smali       2021-08-04 19:45:36.435878400 +0100
+--- to/smali/com/discord/api/message/attachment/MessageAttachment.smali 2021-08-04 21:31:37.148568400 +0100
+***************
+*** 376,398 ****
+  .end method
+
+  .method public final h()Z
+!     .locals 5
+!
+!     .line 1
+!     iget-object v0, p0, Lcom/discord/api/message/attachment/MessageAttachment;->filename:Ljava/lang/String;
+!
+!     const-string v1, "SPOILER_"
+!
+!     const/4 v2, 0x0
+!
+!     const/4 v3, 0x2
+!
+!     const/4 v4, 0x0
+!
+!     invoke-static {v0, v1, v2, v3, v4}, Ld0/g0/t;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
+!
+!     move-result v0
+!
+      return v0
+  .end method
+
+--- 376,383 ----
+  .end method
+
+  .method public final h()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-12-10 17:59:08.345855134 +0000
+--- to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali	2020-12-10 18:00:01.624468003 +0000
+***************
+*** 249,256 ****
+  .method public isRevealed()Z
+      .locals 1
+
+!     .line 1
+!     iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z
+
+      return v0
+  .end method
+--- 249,255 ----
+  .method public isRevealed()Z
+      .locals 1
+
+!     const/4 v0, 0x1
+
+      return v0
+  .end method

patches/nozlib/87202.patch

@@ -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  2021-08-04 19:45:39.263375300 +0100
+--- to/smali/com/discord/gateway/GatewaySocket.smali    2021-08-04 23:26:38.221788200 +0100
+***************
+*** 1410,1416 ****
+
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+!     const-string p1, "/?encoding=json&v=9&compress=zlib-stream"
+
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+--- 1410,1416 ----
+
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+!     const-string p1, "/?encoding=json&v=9"
+
+      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    2021-08-04 19:45:39.360374800 +0100
+--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali      2021-08-04 23:28:01.288223200 +0100
+***************
+*** 115,120 ****
+--- 115,122 ----
+
+      iput p2, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->largeThreshold: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

patches/profilemention/87202.patch

@@ -0,0 +1,96 @@
+diff -crB from/smali_classes2/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.smali to/smali_classes2/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.smali
+*** from/smali_classes2/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.smali  2021-08-04 19:46:22.122875500 +0100
+--- to/smali_classes2/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.smali    2021-08-04 22:31:44.645076000 +0100
+***************
+*** 717,797 ****
+  .end method
+
+  .method public onMessageAuthorAvatarClicked(Lcom/discord/models/message/Message;J)V
+!     .locals 12
+
+-     const-string v0, "message"
+-
+-     invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+-
+-     .line 1
+-     sget-object v0, Lcom/discord/utilities/guilds/PublicGuildUtils;->INSTANCE:Lcom/discord/utilities/guilds/PublicGuildUtils;
+-
+-     invoke-virtual {v0, p1}, Lcom/discord/utilities/guilds/PublicGuildUtils;->isPublicGuildSystemMessage(Lcom/discord/models/message/Message;)Z
+-
+-     move-result v0
+-
+-     if-nez v0, :cond_1
+-
+-     invoke-virtual {p1}, Lcom/discord/models/message/Message;->isCrosspost()Z
+-
+-     move-result v0
+-
+-     if-eqz v0, :cond_0
+-
+-     goto :goto_0
+-
+-     .line 2
+-     :cond_0
+-     invoke-virtual {p1}, Lcom/discord/models/message/Message;->getAuthor()Lcom/discord/api/user/User;
+-
+-     move-result-object v0
+-
+-     if-eqz v0, :cond_2
+-
+-     .line 3
+-     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+-
+-     invoke-virtual {v0}, Lcom/discord/api/user/User;->i()J
+-
+-     move-result-wide v2
+-
+-     invoke-virtual {p1}, Lcom/discord/models/message/Message;->getChannelId()J
+-
+-     move-result-wide v4
+-
+-     invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+-
+-     move-result-object v4
+-
+-     invoke-direct {p0}, Lcom/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
+-
+-     move-result-object v5
+-
+-     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+-
+-     move-result-object v6
+-
+-     const/4 v7, 0x0
+-
+-     const/4 v8, 0x0
+-
+-     const/4 v9, 0x0
+-
+-     const/16 v10, 0x70
+-
+-     const/4 v11, 0x0
+-
+-     invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
+-
+-     goto :goto_1
+-
+-     .line 4
+-     :cond_1
+-     :goto_0
+      invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler;->onMessageAuthorNameClicked(Lcom/discord/models/message/Message;J)V
+
+-     :cond_2
+-     :goto_1
+      return-void
+  .end method
+
+--- 717,726 ----
+  .end method
+
+  .method public onMessageAuthorAvatarClicked(Lcom/discord/models/message/Message;J)V
+!     .locals 4
+
+      invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler;->onMessageAuthorNameClicked(Lcom/discord/models/message/Message;J)V
+
+      return-void
+  .end method

patches/showtag/87202.patch

@@ -0,0 +1,73 @@
+Binary files com.discord-base/build/apk/classes.dex and com.discord/build/apk/classes.dex differ
+Binary files com.discord-base/dist/com.discord-78204.apk and com.discord/dist/com.discord-78204.apk differ
+diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion.smali com.discord/smali/com/discord/models/member/GuildMember$Companion.smali
+*** com.discord-base/smali/com/discord/models/member/GuildMember$Companion.smali	2021-05-31 14:05:54.000000000 +0300
+--- com.discord/smali/com/discord/models/member/GuildMember$Companion.smali	2021-05-31 18:27:22.000000000 +0300
+***************
+*** 530,535 ****
+--- 530,567 ----
+      :goto_4
+      if-eqz v0, :cond_8
+  
++     new-instance v1, Ljava/lang/StringBuilder;
++ 
++     invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
++ 
++     const-string v2, " ("
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     invoke-interface {p1}, Lcom/discord/models/user/User;->getUsername()Ljava/lang/String;
++ 
++     move-result-object v2
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     const-string v2, "#"
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     invoke-interface {p1}, Lcom/discord/models/user/User;->getDiscriminator()I
++ 
++     move-result v2
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
++ 
++     const-string v2, ")"
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
++ 
++     move-result-object v0
++ 
+      goto :goto_5
+  
+      :cond_8
+***************
+*** 537,542 ****
+--- 569,592 ----
+  
+      move-result-object v0
+  
++     new-instance v1, Ljava/lang/StringBuilder;
++ 
++     invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
++ 
++     const-string v2, "#"
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     invoke-interface {p1}, Lcom/discord/models/user/User;->getDiscriminator()I
++ 
++     move-result v2
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
++ 
++     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
++ 
++     move-result-object v0
++ 
+      :goto_5
+      return-object v0
+  .end method

patches/squareavatars/87202.patch

@@ -0,0 +1,40 @@
+diff -crB from/res/values/dimens.xml to/res/values/dimens.xml
+*** from/res/values/dimens.xml  2021-08-04 19:45:05.262372100 +0100
+--- to/res/values/dimens.xml    2021-08-05 00:17:34.791880800 +0100
+***************
+*** 262,268 ****
+      <dimen name="folder_guild_outer_margin">6.0dip</dimen>
+      <dimen name="folder_guild_size">16.0dip</dimen>
+      <dimen name="grid_item_padding">4.0dip</dimen>
+!     <dimen name="guild_icon_radius">12.0dip</dimen>
+      <dimen name="guild_item_size">54.0dip</dimen>
+      <dimen name="guild_item_spacing">6.0dip</dimen>
+      <dimen name="guild_list_size">72.0dip</dimen>
+--- 262,268 ----
+      <dimen name="folder_guild_outer_margin">6.0dip</dimen>
+      <dimen name="folder_guild_size">16.0dip</dimen>
+      <dimen name="grid_item_padding">4.0dip</dimen>
+!     <dimen name="guild_icon_radius">0.0dip</dimen>
+      <dimen name="guild_item_size">54.0dip</dimen>
+      <dimen name="guild_item_spacing">6.0dip</dimen>
+      <dimen name="guild_list_size">72.0dip</dimen>
+diff -crB from/res/values/styles.xml to/res/values/styles.xml
+*** from/res/values/styles.xml  2021-08-04 19:45:07.372873000 +0100
+--- to/res/values/styles.xml    2021-08-05 00:18:33.259073800 +0100
+***************
+*** 1133,1139 ****
+          <item name="actualImageScaleType">fitCenter</item>
+          <item name="placeholderImage">?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>
+--- 1133,1139 ----
+          <item name="actualImageScaleType">fitCenter</item>
+          <item name="placeholderImage">?asset_default_avatar_32dp</item>
+          <item name="placeholderImageScaleType">fitCenter</item>
+!         <item name="roundAsCircle">false</item>
+      </style>
+      <style name="Avatar.Chat" parent="@style/Avatar.Large">
+          <item name="android:layout_width">@dimen/avatar_size_chat</item>

patchport-state.json

@@ -1 +1 @@
-{"versionname": "78.4 - Alpha", "versioncode": "78204"}
+{"versionname": "87.2 - Alpha", "versioncode": "87202"}