Fix slashcommands when message contains attachments

This commit is contained in:
eatsfoobars 2020-01-14 13:29:11 +00:00
parent 0f49fcd527
commit 328eac4c48
Signed by untrusted user: eatsfoobars
GPG key ID: D08609FADBD8C395

View file

@ -1,8 +1,6 @@
Only in com.discord-1019: build diff -crB from/smali/com/discord/stores/StoreMessages.smali to/smali/com/discord/stores/StoreMessages.smali
Only in com.discord-1019: dist *** from/smali/com/discord/stores/StoreMessages.smali 2020-01-14 13:23:20.364260525 +0000
diff -crB com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali com.discord-1019/smali/com/discord/stores/StoreMessages.smali --- to/smali/com/discord/stores/StoreMessages.smali 2020-01-14 13:23:01.107608765 +0000
*** com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali 2020-01-10 14:08:30.055000416 +0300
--- com.discord-1019/smali/com/discord/stores/StoreMessages.smali 2020-01-10 17:07:41.483341834 +0300
*************** ***************
*** 611,616 **** *** 611,616 ****
--- 611,620 ---- --- 611,620 ----
@ -17,11 +15,11 @@ diff -crB com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali com
invoke-direct {p0, p3, p4}, Lcom/discord/stores/StoreMessages;->getMessageQueue(J)Lcom/discord/utilities/messagesend/MessageQueue; invoke-direct {p0, p3, p4}, Lcom/discord/stores/StoreMessages;->getMessageQueue(J)Lcom/discord/utilities/messagesend/MessageQueue;
*************** ***************
*** 1285,1290 **** *** 1287,1292 ****
--- 1289,1302 ---- --- 1291,1304 ----
const/4 v14, 0x0
.line 2
:goto_0
+ move-object/from16 v8, p4 + move-object/from16 v8, p4
+ +
+ invoke-static {v8}, Lcom/discord/stores/StoreMessages;->interceptSendMessage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v8}, Lcom/discord/stores/StoreMessages;->interceptSendMessage(Ljava/lang/String;)Ljava/lang/String;
@ -30,9 +28,9 @@ diff -crB com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali com
+ +
+ move-object/16 p4, v8 + move-object/16 p4, v8
+ +
.line 2
:goto_0
iget-object v0, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock; iget-object v0, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
move-object/from16 v8, p4
*************** ***************
*** 1369,1371 **** *** 1369,1371 ****
--- 1381,4120 ---- --- 1381,4120 ----
@ -2776,10 +2774,9 @@ diff -crB com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali com
+ :cond_0 + :cond_0
+ return-object p0 + return-object p0
+ .end method + .end method
\ No newline at end of file diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
diff -crB com.discord-1019-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-1019/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali *** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-14 13:23:20.647593639 +0000
*** com.discord-1019-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-10 14:08:30.331668478 +0300 --- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-14 13:23:01.120942088 +0000
--- com.discord-1019/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-10 16:59:31.223187411 +0300
*************** ***************
*** 305,310 **** *** 305,310 ****
--- 305,340 ---- --- 305,340 ----
@ -2858,4 +2855,3 @@ diff -crB com.discord-1019-base/smali/com/discord/widgets/chat/input/WidgetChatI
invoke-static {v13, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-static {v13, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
.line 27 .line 27