From 8f839d8659fb761849ff49e5844a9182d6778844 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Sun, 2 Jun 2019 13:56:58 +0300 Subject: [PATCH] fix slashcommands on 9.0.6 --- patches/slashcommands/906.patch | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/patches/slashcommands/906.patch b/patches/slashcommands/906.patch index 087bae7..87f53a7 100644 --- a/patches/slashcommands/906.patch +++ b/patches/slashcommands/906.patch @@ -1,6 +1,8 @@ -diff -crB com.discord-904-base/smali/com/discord/models/domain/ModelChannel.smali com.discord-904/smali/com/discord/models/domain/ModelChannel.smali -*** com.discord-904-base/smali/com/discord/models/domain/ModelChannel.smali 2019-05-29 01:12:16.825462467 +0300 ---- com.discord-904/smali/com/discord/models/domain/ModelChannel.smali 2019-05-29 01:14:12.246076619 +0300 +Binary files com.discord-906-base/build/apk/classes.dex and com.discord-906/build/apk/classes.dex differ +Binary files com.discord-906-base/dist/com.discord-906.apk and com.discord-906/dist/com.discord-906.apk differ +diff -crB com.discord-906-base/smali/com/discord/models/domain/ModelChannel.smali com.discord-906/smali/com/discord/models/domain/ModelChannel.smali +*** com.discord-906-base/smali/com/discord/models/domain/ModelChannel.smali 2019-06-02 13:07:38.540795239 +0300 +--- com.discord-906/smali/com/discord/models/domain/ModelChannel.smali 2019-06-02 13:47:19.569754638 +0300 *************** *** 2082,2087 **** --- 2082,2097 ---- @@ -20,9 +22,9 @@ diff -crB com.discord-904-base/smali/com/discord/models/domain/ModelChannel.smal .line 246 iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map; -diff -crB com.discord-904-base/smali/com/discord/stores/StoreMessages.smali com.discord-904/smali/com/discord/stores/StoreMessages.smali -*** com.discord-904-base/smali/com/discord/stores/StoreMessages.smali 2019-05-29 01:12:17.095463881 +0300 ---- com.discord-904/smali/com/discord/stores/StoreMessages.smali 2019-05-29 01:15:01.819688524 +0300 +diff -crB com.discord-906-base/smali/com/discord/stores/StoreMessages.smali com.discord-906/smali/com/discord/stores/StoreMessages.smali +*** com.discord-906-base/smali/com/discord/stores/StoreMessages.smali 2019-06-02 13:07:38.694129426 +0300 +--- com.discord-906/smali/com/discord/stores/StoreMessages.smali 2019-06-02 13:47:19.576421339 +0300 *************** *** 432,437 **** --- 432,441 ---- @@ -2834,11 +2836,9 @@ diff -crB com.discord-904-base/smali/com/discord/stores/StoreMessages.smali com. const/4 v0, 0x1 if-eqz p6, :cond_0 -Only in com.discord-904/smali/com/discord/stores: StoreMessages.smali.orig -Only in com.discord-904/smali/com/discord/stores: StoreMessages.smali.rej -diff -crB com.discord-904-base/smali/com/discord/stores/StoreUserSettings.smali com.discord-904/smali/com/discord/stores/StoreUserSettings.smali -*** com.discord-904-base/smali/com/discord/stores/StoreUserSettings.smali 2019-05-29 01:12:17.175464299 +0300 ---- com.discord-904/smali/com/discord/stores/StoreUserSettings.smali 2019-05-29 01:14:12.249409971 +0300 +diff -crB com.discord-906-base/smali/com/discord/stores/StoreUserSettings.smali com.discord-906/smali/com/discord/stores/StoreUserSettings.smali +*** com.discord-906-base/smali/com/discord/stores/StoreUserSettings.smali 2019-06-02 13:07:38.730796296 +0300 +--- com.discord-906/smali/com/discord/stores/StoreUserSettings.smali 2019-06-02 13:47:19.576421339 +0300 *************** *** 1272,1277 **** --- 1272,1452 ---- @@ -3023,9 +3023,9 @@ diff -crB com.discord-904-base/smali/com/discord/stores/StoreUserSettings.smali .method handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V .locals 0 -diff -crB com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali com.discord-904/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali -*** com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-05-29 01:12:17.612133252 +0300 ---- com.discord-904/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-05-29 01:14:12.249409971 +0300 +diff -crB com.discord-906-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali com.discord-906/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali +*** com.discord-906-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-06-02 13:07:39.024131263 +0300 +--- com.discord-906/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-06-02 13:53:45.035060762 +0300 *************** *** 59,64 **** --- 59,74 ---- @@ -3034,21 +3034,20 @@ diff -crB com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatIn + invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings; + -+ move-result-object p1 ++ move-result-object v0 + -+ invoke-virtual {p1}, Lcom/discord/stores/StoreUserSettings;->getShowTyping()Z ++ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getShowTyping()Z + -+ move-result p1 ++ move-result v0 + -+ if-eqz p1, :cond_1 ++ if-eqz v0, :cond_1 + .line 222 invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z -Only in com.discord-904/smali/com/discord/widgets/chat/input: WidgetChatInputEditText$1.smali.orig -diff -crB com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-904/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali -*** com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-05-29 01:12:17.612133252 +0300 ---- com.discord-904/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-05-29 01:14:12.249409971 +0300 +diff -crB com.discord-906-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-906/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali +*** com.discord-906-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-06-02 13:07:39.027464615 +0300 +--- com.discord-906/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-06-02 13:47:19.579754689 +0300 *************** *** 355,360 **** --- 355,362 ---- @@ -3107,9 +3106,9 @@ diff -crB com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatIn invoke-static {v8, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V .line 79 -diff -crB com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali com.discord-904/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali -*** com.discord-904-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-05-29 01:12:17.615466603 +0300 ---- com.discord-904/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-05-29 01:14:12.252743323 +0300 +diff -crB com.discord-906-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali com.discord-906/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali +*** com.discord-906-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-06-02 13:07:39.027464615 +0300 +--- com.discord-906/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-06-02 13:47:19.583088040 +0300 *************** *** 50,55 **** --- 50,79 ----