Push untested 833 patches

patches/customtheme/833.patch

@@ -0,0 +1,134 @@
+diff -crB -x dist -x build com.discord-832-base/res/values/colors.xml com.discord-832/res/values/colors.xml
+*** com.discord-832-base/res/values/colors.xml  2019-01-19 04:41:50.669762506 +0300
+--- com.discord-832/res/values/colors.xml   2019-01-20 01:29:57.358553097 +0300
+***************
+*** 61,68 ****
+      <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_default_color_primary">#ff3f51b5</color>
+      <color name="design_default_color_primary_dark">#ff303f9f</color>
+--- 61,68 ----
+      <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_default_color_primary">#ff3f51b5</color>
+      <color name="design_default_color_primary_dark">#ff303f9f</color>
+***************
+*** 98,106 ****
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+      <color name="grey_6_alpha_30">#4d4f545c</color>
+      <color name="grey_6_alpha_60">#994f545c</color>
+!     <color name="grey_account">#ff282b30</color>
+!     <color name="grey_channels">#ff2e3136</color>
+!     <color name="grey_guilds">#ff1e2124</color>
+      <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+--- 98,106 ----
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+      <color name="grey_6_alpha_30">#4d4f545c</color>
+      <color name="grey_6_alpha_60">#994f545c</color>
+!     <color name="grey_account">#ff000000</color>
+!     <color name="grey_channels">#ff000000</color>
+!     <color name="grey_guilds">#ff000000</color>
+      <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+***************
+*** 109,123 ****
+      <color name="hypesquad_house3">#ff45ddc0</color>
+      <color name="icon_color_light">#ff93a5af</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link_100">#fff2fbfe</color>
+!     <color name="link_200">#ffcceffd</color>
+!     <color name="link_300">#ff99dffb</color>
+!     <color name="link_400">#ff33c0f6</color>
+!     <color name="link_500">#ff00b0f4</color>
+!     <color name="link_600">#ff0078a6</color>
+!     <color name="link_700">#ff004662</color>
+!     <color name="link_800">#ff003549</color>
+!     <color name="link_900">#ff00090c</color>
+      <color name="material_blue_grey_800">#ff37474f</color>
+      <color name="material_blue_grey_900">#ff263238</color>
+      <color name="material_blue_grey_950">#ff21272b</color>
+--- 109,123 ----
+      <color name="hypesquad_house3">#ff45ddc0</color>
+      <color name="icon_color_light">#ff93a5af</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link_100">#ff8cf687</color>
+!     <color name="link_200">#ff7df577</color>
+!     <color name="link_300">#ff6ef368</color>
+!     <color name="link_400">#ff5ff258</color>
+!     <color name="link_500">#ff50f148</color>
+!     <color name="link_600">#ff41f038</color>
+!     <color name="link_700">#ff32ef28</color>
+!     <color name="link_800">#ff23ed19</color>
+!     <color name="link_900">#ff1be411</color>
+      <color name="material_blue_grey_800">#ff37474f</color>
+      <color name="material_blue_grey_900">#ff263238</color>
+      <color name="material_blue_grey_950">#ff21272b</color>
+***************
+*** 159,176 ****
+      <color name="primary_400_alpha_30">#4d7d8187</color>
+      <color name="primary_400_alpha_60">#997d8187</color>
+      <color name="primary_400_alpha_90">#e67d8187</color>
+!     <color name="primary_500">#ff4f545c</color>
+!     <color name="primary_500_alpha_30">#4d4f545c</color>
+!     <color name="primary_500_alpha_60">#994f545c</color>
+!     <color name="primary_500_alpha_90">#e64f545c</color>
+!     <color name="primary_600">#ff36393f</color>
+!     <color name="primary_600_alpha_30">#4d36393f</color>
+!     <color name="primary_600_alpha_60">#9936393f</color>
+!     <color name="primary_600_alpha_90">#e636393f</color>
+!     <color name="primary_630">#ff2f3136</color>
+!     <color name="primary_630_alpha_30">#4d2f3136</color>
+!     <color name="primary_630_alpha_60">#992f3136</color>
+!     <color name="primary_630_alpha_90">#e62f3136</color>
+      <color name="primary_700">#ff202225</color>
+      <color name="primary_700_alpha_30">#4d202225</color>
+      <color name="primary_700_alpha_60">#99202225</color>
+--- 159,176 ----
+      <color name="primary_400_alpha_30">#4d7d8187</color>
+      <color name="primary_400_alpha_60">#997d8187</color>
+      <color name="primary_400_alpha_90">#e67d8187</color>
+!     <color name="primary_500">#ff0f0f0f</color>
+!     <color name="primary_500_alpha_30">#4d0f0f0f</color>
+!     <color name="primary_500_alpha_60">#990f0f0f</color>
+!     <color name="primary_500_alpha_90">#e60f0f0f</color>
+!     <color name="primary_600">#ff000000</color>
+!     <color name="primary_600_alpha_30">#4d000000</color>
+!     <color name="primary_600_alpha_60">#99000000</color>
+!     <color name="primary_600_alpha_90">#e6000000</color>
+!     <color name="primary_630">#ff000000</color>
+!     <color name="primary_630_alpha_30">#4d000000</color>
+!     <color name="primary_630_alpha_60">#99000000</color>
+!     <color name="primary_630_alpha_90">#e6000000</color>
+      <color name="primary_700">#ff202225</color>
+      <color name="primary_700_alpha_30">#4d202225</color>
+      <color name="primary_700_alpha_60">#99202225</color>
+***************
+*** 191,198 ****
+      <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>
+--- 191,198 ----
+      <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">#ff697ec4</color>
+      <color name="purple_brand_hint">#ffc9d2f0</color>
+      <color name="purple_brand_notification">#ff5161ff</color>

patches/customversion/833.patch

@@ -0,0 +1,20 @@
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali    2019-01-19 04:41:50.846430038 +0300
+--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-01-20 22:08:30.905273603 +0300
+***************
+*** 1304,1310 ****
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v0, " - 8.3.3 (833)"
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+--- 1302,1308 ----
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v0, " - 8.3.3 (833), with Cutthecord patches"
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  

patches/experiments/833.patch

@@ -0,0 +1,152 @@
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+*** com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-01-19 04:41:50.793096443 +0300
+--- com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali  2019-01-20 02:25:56.947114965 +0300
+***************
+*** 81,108 ****
+  .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
+      .locals 1
+  
+-     const-string v0, "meUser"
+- 
+-     .line 93
+-     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(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
+- 
+-     return p1
+- 
+-     :cond_1
+-     :goto_0
+      const/4 p1, 0x1
+  
+      return p1
+--- 81,86 ----
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
+*** com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali    2019-01-19 04:41:50.793096443 +0300
+--- com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-01-20 02:30:18.981896059 +0300
+***************
+*** 77,90 ****
+  .method public final call(Lcom/discord/models/domain/ModelUser;)Z
+      .locals 1
+  
+!     const-string v0, "it"
+! 
+!     .line 78
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result p1
+  
+      return p1
+  .end method
+--- 77,83 ----
+  .method public final call(Lcom/discord/models/domain/ModelUser;)Z
+      .locals 1
+  
+!     const/4 p1, 0x1
+  
+      return p1
+  .end method
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/stores/StoreExperiments.smali com.discord-832/smali/com/discord/stores/StoreExperiments.smali
+*** com.discord-832-base/smali/com/discord/stores/StoreExperiments.smali    2019-01-19 04:41:50.796429793 +0300
+--- com.discord-832/smali/com/discord/stores/StoreExperiments.smali 2019-01-20 02:21:41.862372281 +0300
+***************
+*** 1247,1255 ****
+  
+      if-eqz v0, :cond_0
+  
+!     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->isStaff()Z
+! 
+!     move-result v0
+  
+      if-eq v0, v1, :cond_1
+  
+--- 1247,1253 ----
+  
+      if-eqz v0, :cond_0
+  
+!     const/4 v0, 0x1
+  
+      if-eq v0, v1, :cond_1
+  
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali  2019-01-19 04:41:50.846430038 +0300
+--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali   2019-01-20 02:28:45.741380899 +0300
+***************
+*** 71,83 ****
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const-string v1, "it"
+! 
+!     invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result p1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
+--- 71,77 ----
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const/4 p1, 0x1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali    2019-01-19 04:41:50.846430038 +0300
+--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-01-20 02:30:08.458504584 +0300
+***************
+*** 707,715 ****
+      if-eqz p1, :cond_1
+  
+      .line 109
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result v2
+  
+      if-eq v2, v1, :cond_0
+  
+--- 707,713 ----
+      if-eqz p1, :cond_1
+  
+      .line 109
+!     const/4 v2, 0x1
+  
+      if-eq v2, v1, :cond_0
+  
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
+*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali  2019-01-19 04:41:50.849763388 +0300
+--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali   2019-01-20 02:17:36.007680584 +0300
+***************
+*** 80,87 ****
+  .method public final isStaffOrTester()Z
+      .locals 1
+  
+!     .line 102
+!     iget-boolean v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->isStaffOrTester:Z
+  
+      return v0
+  .end method
+--- 80,86 ----
+  .method public final isStaffOrTester()Z
+      .locals 1
+  
+!     const/4 v0, 0x1
+  
+      return v0
+  .end method

patches/nonearby/833.patch

@@ -0,0 +1,87 @@
+
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/friends/NearbyManager.smali com.discord-832/smali/com/discord/widgets/friends/NearbyManager.smali
+*** com.discord-832-base/smali/com/discord/widgets/friends/NearbyManager.smali  2019-01-19 04:41:50.826429940 +0300
+--- com.discord-832/smali/com/discord/widgets/friends/NearbyManager.smali   2019-01-20 22:04:14.444090824 +0300
+***************
+*** 440,512 ****
+  
+  # virtual methods
+  .method public final activateNearby()V
+!     .locals 9
+! 
+!     .line 58
+!     iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
+! 
+!     if-nez v0, :cond_0
+! 
+!     return-void
+! 
+!     .line 59
+!     :cond_0
+!     iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
+! 
+!     if-nez v1, :cond_1
+! 
+!     return-void
+! 
+!     .line 60
+!     :cond_1
+!     iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
+! 
+!     if-nez v2, :cond_2
+! 
+!     return-void
+! 
+!     .line 61
+!     :cond_2
+!     iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener;
+! 
+!     if-nez v3, :cond_3
+! 
+!     return-void
+! 
+!     .line 62
+!     :cond_3
+!     iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+! 
+!     if-nez v4, :cond_4
+! 
+!     return-void
+! 
+!     .line 64
+!     :cond_4
+!     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;
+! 
+!     check-cast v8, Ljava/util/Collection;
+! 
+!     invoke-direct {v7, v8}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
+! 
+!     check-cast v7, Ljava/util/Set;
+! 
+!     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 66
+!     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/g;
+! 
+!     .line 67
+!     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/g;
+! 
+      return-void
+  .end method
+  
+--- 440,446 ----
+  
+  # virtual methods
+  .method public final activateNearby()V
+!     .locals 0
+      return-void
+  .end method
+  

patches/pureevil/833.patch

@@ -0,0 +1,26 @@
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali  2019-01-19 04:41:50.846430038 +0300
+--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali   2019-01-20 02:28:45.741380899 +0300
+***************
+*** 71,83 ****
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const-string v1, "it"
+! 
+!     invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result p1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
+--- 71,77 ----
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const/4 p1, 0x1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+