From 5cca5ef4449c57c4283f574d3bcc7a87e594c81e Mon Sep 17 00:00:00 2001 From: clienthax Date: Wed, 11 Aug 2021 17:56:22 +0100 Subject: [PATCH 01/27] Port more patches. --- resources/patches/supplemental/87202.patch | 442 +++++++++++++++++++++ 1 file changed, 442 insertions(+) create mode 100644 resources/patches/supplemental/87202.patch diff --git a/resources/patches/supplemental/87202.patch b/resources/patches/supplemental/87202.patch new file mode 100644 index 0000000..ec54853 --- /dev/null +++ b/resources/patches/supplemental/87202.patch @@ -0,0 +1,442 @@ +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-11-16 13:22:49.331198415 +0000 +--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-11-16 13:57:09.234000134 +0000 +*************** +*** 968,973 **** +--- 968,984 ---- + + .line 70 + :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;->()V +diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali +*** from/smali/com/discord/api/channel/Channel.smali 2021-08-10 20:23:56.976468100 +0100 +--- to/smali/com/discord/api/channel/Channel.smali 2021-08-11 17:13:48.876902500 +0100 +*************** +*** 1774,1779 **** +--- 1774,1789 ---- + } + .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/api/channel/Channel;->permissionOverwrites:Ljava/util/List; + +diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali +*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-11-16 13:22:49.513198310 +0000 +--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-11-16 13:57:09.234000134 +0000 +*************** +*** 2899,2904 **** +--- 2899,3188 ---- + return-void + .end method + ++ .method public getAutoplayGifs()Z ++ .locals 3 ++ ++ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ ++ const-string v1, "CACHE_KEY_CTC_AUTOPLAY_GIFS" ++ ++ 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 setAutoplayGifs(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_AUTOPLAY_GIFS" ++ ++ 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 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;->(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;->(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 public final updateCustomStatus(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lrx/Observable; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + +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-11-16 13:22:49.577198273 +0000 +--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-11-16 13:57:09.234000134 +0000 +*************** +*** 75,80 **** +--- 75,113 ---- + 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;->(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; +*************** +*** 108,113 **** +--- 141,150 ---- + + move-result-object v2 + ++ invoke-static {v2}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; ++ ++ move-result-object v2 ++ + .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_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.smali to/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.smali +*** from/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.smali 2020-11-16 13:22:49.677198215 +0000 +--- to/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.smali 2020-11-16 13:57:09.234000134 +0000 +*************** +*** 101,106 **** +--- 101,116 ---- + + move-result v0 + ++ 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 + iget-boolean v1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1;->empty:Z + +diff -crB from/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText.smali to/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText.smali +*** from/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText.smali 2020-11-16 13:22:49.677198215 +0000 +--- to/smali_classes2/com/discord/widgets/chat/input/WidgetChatInputEditText.smali 2020-11-16 14:09:59.478815215 +0000 +*************** +*** 80,86 **** + # instance fields + .field private channelId:J + +! .field private final editText:Lcom/lytefast/flexinput/widget/FlexEditText; + + .field private final emptyTextSubject:Lrx/subjects/Subject; + .annotation system Ldalvik/annotation/Signature; +--- 80,86 ---- + # instance fields + .field private channelId:J + +! .field public final editText:Lcom/lytefast/flexinput/widget/FlexEditText; + + .field private final emptyTextSubject:Lrx/subjects/Subject; + .annotation system Ldalvik/annotation/Signature; From 5bd99aa8c3f8f4de4767fb2f850ecd5b9edb8e73 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sun, 15 Aug 2021 14:36:52 +0100 Subject: [PATCH 02/27] Deprecate old slashcommand patches --- resources/old-patches/README.md | 3 ++- resources/{patches => old-patches}/slashcommands/1006.patch | 0 resources/{patches => old-patches}/slashcommands/1007.patch | 0 resources/{patches => old-patches}/slashcommands/1011.patch | 0 resources/{patches => old-patches}/slashcommands/1012.patch | 0 resources/{patches => old-patches}/slashcommands/1013.patch | 0 resources/{patches => old-patches}/slashcommands/1015.patch | 0 resources/{patches => old-patches}/slashcommands/1016.patch | 0 resources/{patches => old-patches}/slashcommands/1019.patch | 0 resources/{patches => old-patches}/slashcommands/1020.patch | 0 resources/{patches => old-patches}/slashcommands/1021.patch | 0 resources/{patches => old-patches}/slashcommands/1022.patch | 0 resources/{patches => old-patches}/slashcommands/1023.patch | 0 resources/{patches => old-patches}/slashcommands/1024.patch | 0 resources/{patches => old-patches}/slashcommands/1025.patch | 0 resources/{patches => old-patches}/slashcommands/1026.patch | 0 resources/{patches => old-patches}/slashcommands/1029.patch | 0 resources/{patches => old-patches}/slashcommands/1031.patch | 0 resources/{patches => old-patches}/slashcommands/1032.patch | 0 resources/{patches => old-patches}/slashcommands/1033.patch | 0 resources/{patches => old-patches}/slashcommands/1036.patch | 0 resources/{patches => old-patches}/slashcommands/1037.patch | 0 resources/{patches => old-patches}/slashcommands/1040.patch | 0 resources/{patches => old-patches}/slashcommands/1041.patch | 0 resources/{patches => old-patches}/slashcommands/1045.patch | 0 resources/{patches => old-patches}/slashcommands/1046.patch | 0 resources/{patches => old-patches}/slashcommands/1047.patch | 0 resources/{patches => old-patches}/slashcommands/1049.patch | 0 resources/{patches => old-patches}/slashcommands/1052.patch | 0 resources/{patches => old-patches}/slashcommands/1053.patch | 0 resources/{patches => old-patches}/slashcommands/1054.patch | 0 resources/{patches => old-patches}/slashcommands/1056.patch | 0 resources/{patches => old-patches}/slashcommands/1057.patch | 0 resources/{patches => old-patches}/slashcommands/1062.patch | 0 resources/{patches => old-patches}/slashcommands/1065.patch | 0 resources/{patches => old-patches}/slashcommands/1066.patch | 0 resources/{patches => old-patches}/slashcommands/1069.patch | 0 resources/{patches => old-patches}/slashcommands/1073.patch | 0 resources/{patches => old-patches}/slashcommands/1074.patch | 0 resources/{patches => old-patches}/slashcommands/1078.patch | 0 resources/{patches => old-patches}/slashcommands/1084.patch | 0 resources/{patches => old-patches}/slashcommands/1085.patch | 0 resources/{patches => old-patches}/slashcommands/1087.patch | 0 resources/{patches => old-patches}/slashcommands/1091.patch | 0 resources/{patches => old-patches}/slashcommands/1092.patch | 0 resources/{patches => old-patches}/slashcommands/1100.patch | 0 resources/{patches => old-patches}/slashcommands/1103.patch | 0 resources/{patches => old-patches}/slashcommands/1104.patch | 0 resources/{patches => old-patches}/slashcommands/1105.patch | 0 resources/{patches => old-patches}/slashcommands/1107.patch | 0 resources/{patches => old-patches}/slashcommands/1123.patch | 0 resources/{patches => old-patches}/slashcommands/1132.patch | 0 resources/{patches => old-patches}/slashcommands/1134.patch | 0 resources/{patches => old-patches}/slashcommands/1144.patch | 0 resources/{patches => old-patches}/slashcommands/1145.patch | 0 resources/{patches => old-patches}/slashcommands/1146.patch | 0 resources/{patches => old-patches}/slashcommands/1148.patch | 0 resources/{patches => old-patches}/slashcommands/1150.patch | 0 resources/{patches => old-patches}/slashcommands/1167.patch | 0 resources/{patches => old-patches}/slashcommands/1169.patch | 0 resources/{patches => old-patches}/slashcommands/1171.patch | 0 resources/{patches => old-patches}/slashcommands/1180.patch | 0 resources/{patches => old-patches}/slashcommands/1181.patch | 0 resources/{patches => old-patches}/slashcommands/1192.patch | 0 resources/{patches => old-patches}/slashcommands/1196.patch | 0 resources/{patches => old-patches}/slashcommands/1200.patch | 0 resources/{patches => old-patches}/slashcommands/1201.patch | 0 resources/{patches => old-patches}/slashcommands/1208.patch | 0 resources/{patches => old-patches}/slashcommands/1213.patch | 0 resources/{patches => old-patches}/slashcommands/1216.patch | 0 resources/{patches => old-patches}/slashcommands/1218.patch | 0 resources/{patches => old-patches}/slashcommands/1223.patch | 0 resources/{patches => old-patches}/slashcommands/1243.patch | 0 resources/{patches => old-patches}/slashcommands/1246.patch | 0 resources/{patches => old-patches}/slashcommands/1249.patch | 0 resources/{patches => old-patches}/slashcommands/1251.patch | 0 resources/{patches => old-patches}/slashcommands/1252.patch | 0 resources/{patches => old-patches}/slashcommands/1259.patch | 0 resources/{patches => old-patches}/slashcommands/1266.patch | 0 resources/{patches => old-patches}/slashcommands/1270.patch | 0 resources/{patches => old-patches}/slashcommands/1273.patch | 0 resources/{patches => old-patches}/slashcommands/1279.patch | 0 resources/{patches => old-patches}/slashcommands/1280.patch | 0 resources/{patches => old-patches}/slashcommands/1281.patch | 0 resources/{patches => old-patches}/slashcommands/1282.patch | 0 resources/{patches => old-patches}/slashcommands/1284.patch | 0 resources/{patches => old-patches}/slashcommands/1290.patch | 0 resources/{patches => old-patches}/slashcommands/1294.patch | 0 resources/{patches => old-patches}/slashcommands/1295.patch | 0 resources/{patches => old-patches}/slashcommands/1298.patch | 0 resources/{patches => old-patches}/slashcommands/1300.patch | 0 resources/{patches => old-patches}/slashcommands/1301.patch | 0 resources/{patches => old-patches}/slashcommands/1304.patch | 0 resources/{patches => old-patches}/slashcommands/1306.patch | 0 resources/{patches => old-patches}/slashcommands/1307.patch | 0 resources/{patches => old-patches}/slashcommands/1310.patch | 0 resources/{patches => old-patches}/slashcommands/1315.patch | 0 resources/{patches => old-patches}/slashcommands/1318.patch | 0 resources/{patches => old-patches}/slashcommands/1330.patch | 0 resources/{patches => old-patches}/slashcommands/1334.patch | 0 resources/{patches => old-patches}/slashcommands/1339.patch | 0 resources/{patches => old-patches}/slashcommands/1340.patch | 0 resources/{patches => old-patches}/slashcommands/1355.patch | 0 resources/{patches => old-patches}/slashcommands/1356.patch | 0 resources/{patches => old-patches}/slashcommands/1358.patch | 0 resources/{patches => old-patches}/slashcommands/1361.patch | 0 resources/{patches => old-patches}/slashcommands/1362.patch | 0 resources/{patches => old-patches}/slashcommands/1365.patch | 0 resources/{patches => old-patches}/slashcommands/1367.patch | 0 resources/{patches => old-patches}/slashcommands/1368.patch | 0 resources/{patches => old-patches}/slashcommands/1370.patch | 0 resources/{patches => old-patches}/slashcommands/1371.patch | 0 resources/{patches => old-patches}/slashcommands/900.patch | 0 resources/{patches => old-patches}/slashcommands/901.patch | 0 resources/{patches => old-patches}/slashcommands/902.patch | 0 resources/{patches => old-patches}/slashcommands/903.patch | 0 resources/{patches => old-patches}/slashcommands/904.patch | 0 resources/{patches => old-patches}/slashcommands/906.patch | 0 resources/{patches => old-patches}/slashcommands/909.patch | 0 resources/{patches => old-patches}/slashcommands/910.patch | 0 resources/{patches => old-patches}/slashcommands/938.patch | 0 resources/{patches => old-patches}/slashcommands/939.patch | 0 resources/{patches => old-patches}/slashcommands/940.patch | 0 resources/{patches => old-patches}/slashcommands/942.patch | 0 resources/{patches => old-patches}/slashcommands/943.patch | 0 resources/{patches => old-patches}/slashcommands/945.patch | 0 resources/{patches => old-patches}/slashcommands/946.patch | 0 resources/{patches => old-patches}/slashcommands/947.patch | 0 resources/{patches => old-patches}/slashcommands/948.patch | 0 resources/{patches => old-patches}/slashcommands/963.patch | 0 resources/{patches => old-patches}/slashcommands/964.patch | 0 resources/{patches => old-patches}/slashcommands/965.patch | 0 resources/{patches => old-patches}/slashcommands/966.patch | 0 resources/{patches => old-patches}/slashcommands/967.patch | 0 resources/{patches => old-patches}/slashcommands/968.patch | 0 resources/{patches => old-patches}/slashcommands/970.patch | 0 resources/{patches => old-patches}/slashcommands/980.patch | 0 resources/{patches => old-patches}/slashcommands/992.patch | 0 resources/{patches => old-patches}/slashcommands/993.patch | 0 resources/{patches => old-patches}/slashcommands/994.patch | 0 resources/{patches => old-patches}/slashcommands/996.patch | 0 resources/{patches => old-patches}/slashcommands/README.md | 0 .../slashcommands/textreplacegen-array.py | 0 .../{patches => old-patches}/slashcommands/textreplacegen.py | 0 144 files changed, 2 insertions(+), 1 deletion(-) rename resources/{patches => old-patches}/slashcommands/1006.patch (100%) rename resources/{patches => old-patches}/slashcommands/1007.patch (100%) rename resources/{patches => old-patches}/slashcommands/1011.patch (100%) rename resources/{patches => old-patches}/slashcommands/1012.patch (100%) rename resources/{patches => old-patches}/slashcommands/1013.patch (100%) rename resources/{patches => old-patches}/slashcommands/1015.patch (100%) rename resources/{patches => old-patches}/slashcommands/1016.patch (100%) rename resources/{patches => old-patches}/slashcommands/1019.patch (100%) rename resources/{patches => old-patches}/slashcommands/1020.patch (100%) rename resources/{patches => old-patches}/slashcommands/1021.patch (100%) rename resources/{patches => old-patches}/slashcommands/1022.patch (100%) rename resources/{patches => old-patches}/slashcommands/1023.patch (100%) rename resources/{patches => old-patches}/slashcommands/1024.patch (100%) rename resources/{patches => old-patches}/slashcommands/1025.patch (100%) rename resources/{patches => old-patches}/slashcommands/1026.patch (100%) rename resources/{patches => old-patches}/slashcommands/1029.patch (100%) rename resources/{patches => old-patches}/slashcommands/1031.patch (100%) rename resources/{patches => old-patches}/slashcommands/1032.patch (100%) rename resources/{patches => old-patches}/slashcommands/1033.patch (100%) rename resources/{patches => old-patches}/slashcommands/1036.patch (100%) rename resources/{patches => old-patches}/slashcommands/1037.patch (100%) rename resources/{patches => old-patches}/slashcommands/1040.patch (100%) rename resources/{patches => old-patches}/slashcommands/1041.patch (100%) rename resources/{patches => old-patches}/slashcommands/1045.patch (100%) rename resources/{patches => old-patches}/slashcommands/1046.patch (100%) rename resources/{patches => old-patches}/slashcommands/1047.patch (100%) rename resources/{patches => old-patches}/slashcommands/1049.patch (100%) rename resources/{patches => old-patches}/slashcommands/1052.patch (100%) rename resources/{patches => old-patches}/slashcommands/1053.patch (100%) rename resources/{patches => old-patches}/slashcommands/1054.patch (100%) rename resources/{patches => old-patches}/slashcommands/1056.patch (100%) rename resources/{patches => old-patches}/slashcommands/1057.patch (100%) rename resources/{patches => old-patches}/slashcommands/1062.patch (100%) rename resources/{patches => old-patches}/slashcommands/1065.patch (100%) rename resources/{patches => old-patches}/slashcommands/1066.patch (100%) rename resources/{patches => old-patches}/slashcommands/1069.patch (100%) rename resources/{patches => old-patches}/slashcommands/1073.patch (100%) rename resources/{patches => old-patches}/slashcommands/1074.patch (100%) rename resources/{patches => old-patches}/slashcommands/1078.patch (100%) rename resources/{patches => old-patches}/slashcommands/1084.patch (100%) rename resources/{patches => old-patches}/slashcommands/1085.patch (100%) rename resources/{patches => old-patches}/slashcommands/1087.patch (100%) rename resources/{patches => old-patches}/slashcommands/1091.patch (100%) rename resources/{patches => old-patches}/slashcommands/1092.patch (100%) rename resources/{patches => old-patches}/slashcommands/1100.patch (100%) rename resources/{patches => old-patches}/slashcommands/1103.patch (100%) rename resources/{patches => old-patches}/slashcommands/1104.patch (100%) rename resources/{patches => old-patches}/slashcommands/1105.patch (100%) rename resources/{patches => old-patches}/slashcommands/1107.patch (100%) rename resources/{patches => old-patches}/slashcommands/1123.patch (100%) rename resources/{patches => old-patches}/slashcommands/1132.patch (100%) rename resources/{patches => old-patches}/slashcommands/1134.patch (100%) rename resources/{patches => old-patches}/slashcommands/1144.patch (100%) rename resources/{patches => old-patches}/slashcommands/1145.patch (100%) rename resources/{patches => old-patches}/slashcommands/1146.patch (100%) rename resources/{patches => old-patches}/slashcommands/1148.patch (100%) rename resources/{patches => old-patches}/slashcommands/1150.patch (100%) rename resources/{patches => old-patches}/slashcommands/1167.patch (100%) rename resources/{patches => old-patches}/slashcommands/1169.patch (100%) rename resources/{patches => old-patches}/slashcommands/1171.patch (100%) rename resources/{patches => old-patches}/slashcommands/1180.patch (100%) rename resources/{patches => old-patches}/slashcommands/1181.patch (100%) rename resources/{patches => old-patches}/slashcommands/1192.patch (100%) rename resources/{patches => old-patches}/slashcommands/1196.patch (100%) rename resources/{patches => old-patches}/slashcommands/1200.patch (100%) rename resources/{patches => old-patches}/slashcommands/1201.patch (100%) rename resources/{patches => old-patches}/slashcommands/1208.patch (100%) rename resources/{patches => old-patches}/slashcommands/1213.patch (100%) rename resources/{patches => old-patches}/slashcommands/1216.patch (100%) rename resources/{patches => old-patches}/slashcommands/1218.patch (100%) rename resources/{patches => old-patches}/slashcommands/1223.patch (100%) rename resources/{patches => old-patches}/slashcommands/1243.patch (100%) rename resources/{patches => old-patches}/slashcommands/1246.patch (100%) rename resources/{patches => old-patches}/slashcommands/1249.patch (100%) rename resources/{patches => old-patches}/slashcommands/1251.patch (100%) rename resources/{patches => old-patches}/slashcommands/1252.patch (100%) rename resources/{patches => old-patches}/slashcommands/1259.patch (100%) rename resources/{patches => old-patches}/slashcommands/1266.patch (100%) rename resources/{patches => old-patches}/slashcommands/1270.patch (100%) rename resources/{patches => old-patches}/slashcommands/1273.patch (100%) rename resources/{patches => old-patches}/slashcommands/1279.patch (100%) rename resources/{patches => old-patches}/slashcommands/1280.patch (100%) rename resources/{patches => old-patches}/slashcommands/1281.patch (100%) rename resources/{patches => old-patches}/slashcommands/1282.patch (100%) rename resources/{patches => old-patches}/slashcommands/1284.patch (100%) rename resources/{patches => old-patches}/slashcommands/1290.patch (100%) rename resources/{patches => old-patches}/slashcommands/1294.patch (100%) rename resources/{patches => old-patches}/slashcommands/1295.patch (100%) rename resources/{patches => old-patches}/slashcommands/1298.patch (100%) rename resources/{patches => old-patches}/slashcommands/1300.patch (100%) rename resources/{patches => old-patches}/slashcommands/1301.patch (100%) rename resources/{patches => old-patches}/slashcommands/1304.patch (100%) rename resources/{patches => old-patches}/slashcommands/1306.patch (100%) rename resources/{patches => old-patches}/slashcommands/1307.patch (100%) rename resources/{patches => old-patches}/slashcommands/1310.patch (100%) rename resources/{patches => old-patches}/slashcommands/1315.patch (100%) rename resources/{patches => old-patches}/slashcommands/1318.patch (100%) rename resources/{patches => old-patches}/slashcommands/1330.patch (100%) rename resources/{patches => old-patches}/slashcommands/1334.patch (100%) rename resources/{patches => old-patches}/slashcommands/1339.patch (100%) rename resources/{patches => old-patches}/slashcommands/1340.patch (100%) rename resources/{patches => old-patches}/slashcommands/1355.patch (100%) rename resources/{patches => old-patches}/slashcommands/1356.patch (100%) rename resources/{patches => old-patches}/slashcommands/1358.patch (100%) rename resources/{patches => old-patches}/slashcommands/1361.patch (100%) rename resources/{patches => old-patches}/slashcommands/1362.patch (100%) rename resources/{patches => old-patches}/slashcommands/1365.patch (100%) rename resources/{patches => old-patches}/slashcommands/1367.patch (100%) rename resources/{patches => old-patches}/slashcommands/1368.patch (100%) rename resources/{patches => old-patches}/slashcommands/1370.patch (100%) rename resources/{patches => old-patches}/slashcommands/1371.patch (100%) rename resources/{patches => old-patches}/slashcommands/900.patch (100%) rename resources/{patches => old-patches}/slashcommands/901.patch (100%) rename resources/{patches => old-patches}/slashcommands/902.patch (100%) rename resources/{patches => old-patches}/slashcommands/903.patch (100%) rename resources/{patches => old-patches}/slashcommands/904.patch (100%) rename resources/{patches => old-patches}/slashcommands/906.patch (100%) rename resources/{patches => old-patches}/slashcommands/909.patch (100%) rename resources/{patches => old-patches}/slashcommands/910.patch (100%) rename resources/{patches => old-patches}/slashcommands/938.patch (100%) rename resources/{patches => old-patches}/slashcommands/939.patch (100%) rename resources/{patches => old-patches}/slashcommands/940.patch (100%) rename resources/{patches => old-patches}/slashcommands/942.patch (100%) rename resources/{patches => old-patches}/slashcommands/943.patch (100%) rename resources/{patches => old-patches}/slashcommands/945.patch (100%) rename resources/{patches => old-patches}/slashcommands/946.patch (100%) rename resources/{patches => old-patches}/slashcommands/947.patch (100%) rename resources/{patches => old-patches}/slashcommands/948.patch (100%) rename resources/{patches => old-patches}/slashcommands/963.patch (100%) rename resources/{patches => old-patches}/slashcommands/964.patch (100%) rename resources/{patches => old-patches}/slashcommands/965.patch (100%) rename resources/{patches => old-patches}/slashcommands/966.patch (100%) rename resources/{patches => old-patches}/slashcommands/967.patch (100%) rename resources/{patches => old-patches}/slashcommands/968.patch (100%) rename resources/{patches => old-patches}/slashcommands/970.patch (100%) rename resources/{patches => old-patches}/slashcommands/980.patch (100%) rename resources/{patches => old-patches}/slashcommands/992.patch (100%) rename resources/{patches => old-patches}/slashcommands/993.patch (100%) rename resources/{patches => old-patches}/slashcommands/994.patch (100%) rename resources/{patches => old-patches}/slashcommands/996.patch (100%) rename resources/{patches => old-patches}/slashcommands/README.md (100%) rename resources/{patches => old-patches}/slashcommands/textreplacegen-array.py (100%) rename resources/{patches => old-patches}/slashcommands/textreplacegen.py (100%) diff --git a/resources/old-patches/README.md b/resources/old-patches/README.md index fcffff3..d22c2a6 100644 --- a/resources/old-patches/README.md +++ b/resources/old-patches/README.md @@ -13,4 +13,5 @@ Here's why these patches are no longer maintained in this form: - nonearby: Didn't add much anyways. - squareavatars: Moved to xml-patchs - betterrotation: Moved to xml-patchs -- noblocked: Moved to xml-patchs \ No newline at end of file +- noblocked: Moved to xml-patchs +- slashcommands: Moved to dynamic patch due to discord api supporting this now diff --git a/resources/patches/slashcommands/1006.patch b/resources/old-patches/slashcommands/1006.patch similarity index 100% rename from resources/patches/slashcommands/1006.patch rename to resources/old-patches/slashcommands/1006.patch diff --git a/resources/patches/slashcommands/1007.patch b/resources/old-patches/slashcommands/1007.patch similarity index 100% rename from resources/patches/slashcommands/1007.patch rename to resources/old-patches/slashcommands/1007.patch diff --git a/resources/patches/slashcommands/1011.patch b/resources/old-patches/slashcommands/1011.patch similarity index 100% rename from resources/patches/slashcommands/1011.patch rename to resources/old-patches/slashcommands/1011.patch diff --git a/resources/patches/slashcommands/1012.patch b/resources/old-patches/slashcommands/1012.patch similarity index 100% rename from resources/patches/slashcommands/1012.patch rename to resources/old-patches/slashcommands/1012.patch diff --git a/resources/patches/slashcommands/1013.patch b/resources/old-patches/slashcommands/1013.patch similarity index 100% rename from resources/patches/slashcommands/1013.patch rename to resources/old-patches/slashcommands/1013.patch diff --git a/resources/patches/slashcommands/1015.patch b/resources/old-patches/slashcommands/1015.patch similarity index 100% rename from resources/patches/slashcommands/1015.patch rename to resources/old-patches/slashcommands/1015.patch diff --git a/resources/patches/slashcommands/1016.patch b/resources/old-patches/slashcommands/1016.patch similarity index 100% rename from resources/patches/slashcommands/1016.patch rename to resources/old-patches/slashcommands/1016.patch diff --git a/resources/patches/slashcommands/1019.patch b/resources/old-patches/slashcommands/1019.patch similarity index 100% rename from resources/patches/slashcommands/1019.patch rename to resources/old-patches/slashcommands/1019.patch diff --git a/resources/patches/slashcommands/1020.patch b/resources/old-patches/slashcommands/1020.patch similarity index 100% rename from resources/patches/slashcommands/1020.patch rename to resources/old-patches/slashcommands/1020.patch diff --git a/resources/patches/slashcommands/1021.patch b/resources/old-patches/slashcommands/1021.patch similarity index 100% rename from resources/patches/slashcommands/1021.patch rename to resources/old-patches/slashcommands/1021.patch diff --git a/resources/patches/slashcommands/1022.patch b/resources/old-patches/slashcommands/1022.patch similarity index 100% rename from resources/patches/slashcommands/1022.patch rename to resources/old-patches/slashcommands/1022.patch diff --git a/resources/patches/slashcommands/1023.patch b/resources/old-patches/slashcommands/1023.patch similarity index 100% rename from resources/patches/slashcommands/1023.patch rename to resources/old-patches/slashcommands/1023.patch diff --git a/resources/patches/slashcommands/1024.patch b/resources/old-patches/slashcommands/1024.patch similarity index 100% rename from resources/patches/slashcommands/1024.patch rename to resources/old-patches/slashcommands/1024.patch diff --git a/resources/patches/slashcommands/1025.patch b/resources/old-patches/slashcommands/1025.patch similarity index 100% rename from resources/patches/slashcommands/1025.patch rename to resources/old-patches/slashcommands/1025.patch diff --git a/resources/patches/slashcommands/1026.patch b/resources/old-patches/slashcommands/1026.patch similarity index 100% rename from resources/patches/slashcommands/1026.patch rename to resources/old-patches/slashcommands/1026.patch diff --git a/resources/patches/slashcommands/1029.patch b/resources/old-patches/slashcommands/1029.patch similarity index 100% rename from resources/patches/slashcommands/1029.patch rename to resources/old-patches/slashcommands/1029.patch diff --git a/resources/patches/slashcommands/1031.patch b/resources/old-patches/slashcommands/1031.patch similarity index 100% rename from resources/patches/slashcommands/1031.patch rename to resources/old-patches/slashcommands/1031.patch diff --git a/resources/patches/slashcommands/1032.patch b/resources/old-patches/slashcommands/1032.patch similarity index 100% rename from resources/patches/slashcommands/1032.patch rename to resources/old-patches/slashcommands/1032.patch diff --git a/resources/patches/slashcommands/1033.patch b/resources/old-patches/slashcommands/1033.patch similarity index 100% rename from resources/patches/slashcommands/1033.patch rename to resources/old-patches/slashcommands/1033.patch diff --git a/resources/patches/slashcommands/1036.patch b/resources/old-patches/slashcommands/1036.patch similarity index 100% rename from resources/patches/slashcommands/1036.patch rename to resources/old-patches/slashcommands/1036.patch diff --git a/resources/patches/slashcommands/1037.patch b/resources/old-patches/slashcommands/1037.patch similarity index 100% rename from resources/patches/slashcommands/1037.patch rename to resources/old-patches/slashcommands/1037.patch diff --git a/resources/patches/slashcommands/1040.patch b/resources/old-patches/slashcommands/1040.patch similarity index 100% rename from resources/patches/slashcommands/1040.patch rename to resources/old-patches/slashcommands/1040.patch diff --git a/resources/patches/slashcommands/1041.patch b/resources/old-patches/slashcommands/1041.patch similarity index 100% rename from resources/patches/slashcommands/1041.patch rename to resources/old-patches/slashcommands/1041.patch diff --git a/resources/patches/slashcommands/1045.patch b/resources/old-patches/slashcommands/1045.patch similarity index 100% rename from resources/patches/slashcommands/1045.patch rename to resources/old-patches/slashcommands/1045.patch diff --git a/resources/patches/slashcommands/1046.patch b/resources/old-patches/slashcommands/1046.patch similarity index 100% rename from resources/patches/slashcommands/1046.patch rename to resources/old-patches/slashcommands/1046.patch diff --git a/resources/patches/slashcommands/1047.patch b/resources/old-patches/slashcommands/1047.patch similarity index 100% rename from resources/patches/slashcommands/1047.patch rename to resources/old-patches/slashcommands/1047.patch diff --git a/resources/patches/slashcommands/1049.patch b/resources/old-patches/slashcommands/1049.patch similarity index 100% rename from resources/patches/slashcommands/1049.patch rename to resources/old-patches/slashcommands/1049.patch diff --git a/resources/patches/slashcommands/1052.patch b/resources/old-patches/slashcommands/1052.patch similarity index 100% rename from resources/patches/slashcommands/1052.patch rename to resources/old-patches/slashcommands/1052.patch diff --git a/resources/patches/slashcommands/1053.patch b/resources/old-patches/slashcommands/1053.patch similarity index 100% rename from resources/patches/slashcommands/1053.patch rename to resources/old-patches/slashcommands/1053.patch diff --git a/resources/patches/slashcommands/1054.patch b/resources/old-patches/slashcommands/1054.patch similarity index 100% rename from resources/patches/slashcommands/1054.patch rename to resources/old-patches/slashcommands/1054.patch diff --git a/resources/patches/slashcommands/1056.patch b/resources/old-patches/slashcommands/1056.patch similarity index 100% rename from resources/patches/slashcommands/1056.patch rename to resources/old-patches/slashcommands/1056.patch diff --git a/resources/patches/slashcommands/1057.patch b/resources/old-patches/slashcommands/1057.patch similarity index 100% rename from resources/patches/slashcommands/1057.patch rename to resources/old-patches/slashcommands/1057.patch diff --git a/resources/patches/slashcommands/1062.patch b/resources/old-patches/slashcommands/1062.patch similarity index 100% rename from resources/patches/slashcommands/1062.patch rename to resources/old-patches/slashcommands/1062.patch diff --git a/resources/patches/slashcommands/1065.patch b/resources/old-patches/slashcommands/1065.patch similarity index 100% rename from resources/patches/slashcommands/1065.patch rename to resources/old-patches/slashcommands/1065.patch diff --git a/resources/patches/slashcommands/1066.patch b/resources/old-patches/slashcommands/1066.patch similarity index 100% rename from resources/patches/slashcommands/1066.patch rename to resources/old-patches/slashcommands/1066.patch diff --git a/resources/patches/slashcommands/1069.patch b/resources/old-patches/slashcommands/1069.patch similarity index 100% rename from resources/patches/slashcommands/1069.patch rename to resources/old-patches/slashcommands/1069.patch diff --git a/resources/patches/slashcommands/1073.patch b/resources/old-patches/slashcommands/1073.patch similarity index 100% rename from resources/patches/slashcommands/1073.patch rename to resources/old-patches/slashcommands/1073.patch diff --git a/resources/patches/slashcommands/1074.patch b/resources/old-patches/slashcommands/1074.patch similarity index 100% rename from resources/patches/slashcommands/1074.patch rename to resources/old-patches/slashcommands/1074.patch diff --git a/resources/patches/slashcommands/1078.patch b/resources/old-patches/slashcommands/1078.patch similarity index 100% rename from resources/patches/slashcommands/1078.patch rename to resources/old-patches/slashcommands/1078.patch diff --git a/resources/patches/slashcommands/1084.patch b/resources/old-patches/slashcommands/1084.patch similarity index 100% rename from resources/patches/slashcommands/1084.patch rename to resources/old-patches/slashcommands/1084.patch diff --git a/resources/patches/slashcommands/1085.patch b/resources/old-patches/slashcommands/1085.patch similarity index 100% rename from resources/patches/slashcommands/1085.patch rename to resources/old-patches/slashcommands/1085.patch diff --git a/resources/patches/slashcommands/1087.patch b/resources/old-patches/slashcommands/1087.patch similarity index 100% rename from resources/patches/slashcommands/1087.patch rename to resources/old-patches/slashcommands/1087.patch diff --git a/resources/patches/slashcommands/1091.patch b/resources/old-patches/slashcommands/1091.patch similarity index 100% rename from resources/patches/slashcommands/1091.patch rename to resources/old-patches/slashcommands/1091.patch diff --git a/resources/patches/slashcommands/1092.patch b/resources/old-patches/slashcommands/1092.patch similarity index 100% rename from resources/patches/slashcommands/1092.patch rename to resources/old-patches/slashcommands/1092.patch diff --git a/resources/patches/slashcommands/1100.patch b/resources/old-patches/slashcommands/1100.patch similarity index 100% rename from resources/patches/slashcommands/1100.patch rename to resources/old-patches/slashcommands/1100.patch diff --git a/resources/patches/slashcommands/1103.patch b/resources/old-patches/slashcommands/1103.patch similarity index 100% rename from resources/patches/slashcommands/1103.patch rename to resources/old-patches/slashcommands/1103.patch diff --git a/resources/patches/slashcommands/1104.patch b/resources/old-patches/slashcommands/1104.patch similarity index 100% rename from resources/patches/slashcommands/1104.patch rename to resources/old-patches/slashcommands/1104.patch diff --git a/resources/patches/slashcommands/1105.patch b/resources/old-patches/slashcommands/1105.patch similarity index 100% rename from resources/patches/slashcommands/1105.patch rename to resources/old-patches/slashcommands/1105.patch diff --git a/resources/patches/slashcommands/1107.patch b/resources/old-patches/slashcommands/1107.patch similarity index 100% rename from resources/patches/slashcommands/1107.patch rename to resources/old-patches/slashcommands/1107.patch diff --git a/resources/patches/slashcommands/1123.patch b/resources/old-patches/slashcommands/1123.patch similarity index 100% rename from resources/patches/slashcommands/1123.patch rename to resources/old-patches/slashcommands/1123.patch diff --git a/resources/patches/slashcommands/1132.patch b/resources/old-patches/slashcommands/1132.patch similarity index 100% rename from resources/patches/slashcommands/1132.patch rename to resources/old-patches/slashcommands/1132.patch diff --git a/resources/patches/slashcommands/1134.patch b/resources/old-patches/slashcommands/1134.patch similarity index 100% rename from resources/patches/slashcommands/1134.patch rename to resources/old-patches/slashcommands/1134.patch diff --git a/resources/patches/slashcommands/1144.patch b/resources/old-patches/slashcommands/1144.patch similarity index 100% rename from resources/patches/slashcommands/1144.patch rename to resources/old-patches/slashcommands/1144.patch diff --git a/resources/patches/slashcommands/1145.patch b/resources/old-patches/slashcommands/1145.patch similarity index 100% rename from resources/patches/slashcommands/1145.patch rename to resources/old-patches/slashcommands/1145.patch diff --git a/resources/patches/slashcommands/1146.patch b/resources/old-patches/slashcommands/1146.patch similarity index 100% rename from resources/patches/slashcommands/1146.patch rename to resources/old-patches/slashcommands/1146.patch diff --git a/resources/patches/slashcommands/1148.patch b/resources/old-patches/slashcommands/1148.patch similarity index 100% rename from resources/patches/slashcommands/1148.patch rename to resources/old-patches/slashcommands/1148.patch diff --git a/resources/patches/slashcommands/1150.patch b/resources/old-patches/slashcommands/1150.patch similarity index 100% rename from resources/patches/slashcommands/1150.patch rename to resources/old-patches/slashcommands/1150.patch diff --git a/resources/patches/slashcommands/1167.patch b/resources/old-patches/slashcommands/1167.patch similarity index 100% rename from resources/patches/slashcommands/1167.patch rename to resources/old-patches/slashcommands/1167.patch diff --git a/resources/patches/slashcommands/1169.patch b/resources/old-patches/slashcommands/1169.patch similarity index 100% rename from resources/patches/slashcommands/1169.patch rename to resources/old-patches/slashcommands/1169.patch diff --git a/resources/patches/slashcommands/1171.patch b/resources/old-patches/slashcommands/1171.patch similarity index 100% rename from resources/patches/slashcommands/1171.patch rename to resources/old-patches/slashcommands/1171.patch diff --git a/resources/patches/slashcommands/1180.patch b/resources/old-patches/slashcommands/1180.patch similarity index 100% rename from resources/patches/slashcommands/1180.patch rename to resources/old-patches/slashcommands/1180.patch diff --git a/resources/patches/slashcommands/1181.patch b/resources/old-patches/slashcommands/1181.patch similarity index 100% rename from resources/patches/slashcommands/1181.patch rename to resources/old-patches/slashcommands/1181.patch diff --git a/resources/patches/slashcommands/1192.patch b/resources/old-patches/slashcommands/1192.patch similarity index 100% rename from resources/patches/slashcommands/1192.patch rename to resources/old-patches/slashcommands/1192.patch diff --git a/resources/patches/slashcommands/1196.patch b/resources/old-patches/slashcommands/1196.patch similarity index 100% rename from resources/patches/slashcommands/1196.patch rename to resources/old-patches/slashcommands/1196.patch diff --git a/resources/patches/slashcommands/1200.patch b/resources/old-patches/slashcommands/1200.patch similarity index 100% rename from resources/patches/slashcommands/1200.patch rename to resources/old-patches/slashcommands/1200.patch diff --git a/resources/patches/slashcommands/1201.patch b/resources/old-patches/slashcommands/1201.patch similarity index 100% rename from resources/patches/slashcommands/1201.patch rename to resources/old-patches/slashcommands/1201.patch diff --git a/resources/patches/slashcommands/1208.patch b/resources/old-patches/slashcommands/1208.patch similarity index 100% rename from resources/patches/slashcommands/1208.patch rename to resources/old-patches/slashcommands/1208.patch diff --git a/resources/patches/slashcommands/1213.patch b/resources/old-patches/slashcommands/1213.patch similarity index 100% rename from resources/patches/slashcommands/1213.patch rename to resources/old-patches/slashcommands/1213.patch diff --git a/resources/patches/slashcommands/1216.patch b/resources/old-patches/slashcommands/1216.patch similarity index 100% rename from resources/patches/slashcommands/1216.patch rename to resources/old-patches/slashcommands/1216.patch diff --git a/resources/patches/slashcommands/1218.patch b/resources/old-patches/slashcommands/1218.patch similarity index 100% rename from resources/patches/slashcommands/1218.patch rename to resources/old-patches/slashcommands/1218.patch diff --git a/resources/patches/slashcommands/1223.patch b/resources/old-patches/slashcommands/1223.patch similarity index 100% rename from resources/patches/slashcommands/1223.patch rename to resources/old-patches/slashcommands/1223.patch diff --git a/resources/patches/slashcommands/1243.patch b/resources/old-patches/slashcommands/1243.patch similarity index 100% rename from resources/patches/slashcommands/1243.patch rename to resources/old-patches/slashcommands/1243.patch diff --git a/resources/patches/slashcommands/1246.patch b/resources/old-patches/slashcommands/1246.patch similarity index 100% rename from resources/patches/slashcommands/1246.patch rename to resources/old-patches/slashcommands/1246.patch diff --git a/resources/patches/slashcommands/1249.patch b/resources/old-patches/slashcommands/1249.patch similarity index 100% rename from resources/patches/slashcommands/1249.patch rename to resources/old-patches/slashcommands/1249.patch diff --git a/resources/patches/slashcommands/1251.patch b/resources/old-patches/slashcommands/1251.patch similarity index 100% rename from resources/patches/slashcommands/1251.patch rename to resources/old-patches/slashcommands/1251.patch diff --git a/resources/patches/slashcommands/1252.patch b/resources/old-patches/slashcommands/1252.patch similarity index 100% rename from resources/patches/slashcommands/1252.patch rename to resources/old-patches/slashcommands/1252.patch diff --git a/resources/patches/slashcommands/1259.patch b/resources/old-patches/slashcommands/1259.patch similarity index 100% rename from resources/patches/slashcommands/1259.patch rename to resources/old-patches/slashcommands/1259.patch diff --git a/resources/patches/slashcommands/1266.patch b/resources/old-patches/slashcommands/1266.patch similarity index 100% rename from resources/patches/slashcommands/1266.patch rename to resources/old-patches/slashcommands/1266.patch diff --git a/resources/patches/slashcommands/1270.patch b/resources/old-patches/slashcommands/1270.patch similarity index 100% rename from resources/patches/slashcommands/1270.patch rename to resources/old-patches/slashcommands/1270.patch diff --git a/resources/patches/slashcommands/1273.patch b/resources/old-patches/slashcommands/1273.patch similarity index 100% rename from resources/patches/slashcommands/1273.patch rename to resources/old-patches/slashcommands/1273.patch diff --git a/resources/patches/slashcommands/1279.patch b/resources/old-patches/slashcommands/1279.patch similarity index 100% rename from resources/patches/slashcommands/1279.patch rename to resources/old-patches/slashcommands/1279.patch diff --git a/resources/patches/slashcommands/1280.patch b/resources/old-patches/slashcommands/1280.patch similarity index 100% rename from resources/patches/slashcommands/1280.patch rename to resources/old-patches/slashcommands/1280.patch diff --git a/resources/patches/slashcommands/1281.patch b/resources/old-patches/slashcommands/1281.patch similarity index 100% rename from resources/patches/slashcommands/1281.patch rename to resources/old-patches/slashcommands/1281.patch diff --git a/resources/patches/slashcommands/1282.patch b/resources/old-patches/slashcommands/1282.patch similarity index 100% rename from resources/patches/slashcommands/1282.patch rename to resources/old-patches/slashcommands/1282.patch diff --git a/resources/patches/slashcommands/1284.patch b/resources/old-patches/slashcommands/1284.patch similarity index 100% rename from resources/patches/slashcommands/1284.patch rename to resources/old-patches/slashcommands/1284.patch diff --git a/resources/patches/slashcommands/1290.patch b/resources/old-patches/slashcommands/1290.patch similarity index 100% rename from resources/patches/slashcommands/1290.patch rename to resources/old-patches/slashcommands/1290.patch diff --git a/resources/patches/slashcommands/1294.patch b/resources/old-patches/slashcommands/1294.patch similarity index 100% rename from resources/patches/slashcommands/1294.patch rename to resources/old-patches/slashcommands/1294.patch diff --git a/resources/patches/slashcommands/1295.patch b/resources/old-patches/slashcommands/1295.patch similarity index 100% rename from resources/patches/slashcommands/1295.patch rename to resources/old-patches/slashcommands/1295.patch diff --git a/resources/patches/slashcommands/1298.patch b/resources/old-patches/slashcommands/1298.patch similarity index 100% rename from resources/patches/slashcommands/1298.patch rename to resources/old-patches/slashcommands/1298.patch diff --git a/resources/patches/slashcommands/1300.patch b/resources/old-patches/slashcommands/1300.patch similarity index 100% rename from resources/patches/slashcommands/1300.patch rename to resources/old-patches/slashcommands/1300.patch diff --git a/resources/patches/slashcommands/1301.patch b/resources/old-patches/slashcommands/1301.patch similarity index 100% rename from resources/patches/slashcommands/1301.patch rename to resources/old-patches/slashcommands/1301.patch diff --git a/resources/patches/slashcommands/1304.patch b/resources/old-patches/slashcommands/1304.patch similarity index 100% rename from resources/patches/slashcommands/1304.patch rename to resources/old-patches/slashcommands/1304.patch diff --git a/resources/patches/slashcommands/1306.patch b/resources/old-patches/slashcommands/1306.patch similarity index 100% rename from resources/patches/slashcommands/1306.patch rename to resources/old-patches/slashcommands/1306.patch diff --git a/resources/patches/slashcommands/1307.patch b/resources/old-patches/slashcommands/1307.patch similarity index 100% rename from resources/patches/slashcommands/1307.patch rename to resources/old-patches/slashcommands/1307.patch diff --git a/resources/patches/slashcommands/1310.patch b/resources/old-patches/slashcommands/1310.patch similarity index 100% rename from resources/patches/slashcommands/1310.patch rename to resources/old-patches/slashcommands/1310.patch diff --git a/resources/patches/slashcommands/1315.patch b/resources/old-patches/slashcommands/1315.patch similarity index 100% rename from resources/patches/slashcommands/1315.patch rename to resources/old-patches/slashcommands/1315.patch diff --git a/resources/patches/slashcommands/1318.patch b/resources/old-patches/slashcommands/1318.patch similarity index 100% rename from resources/patches/slashcommands/1318.patch rename to resources/old-patches/slashcommands/1318.patch diff --git a/resources/patches/slashcommands/1330.patch b/resources/old-patches/slashcommands/1330.patch similarity index 100% rename from resources/patches/slashcommands/1330.patch rename to resources/old-patches/slashcommands/1330.patch diff --git a/resources/patches/slashcommands/1334.patch b/resources/old-patches/slashcommands/1334.patch similarity index 100% rename from resources/patches/slashcommands/1334.patch rename to resources/old-patches/slashcommands/1334.patch diff --git a/resources/patches/slashcommands/1339.patch b/resources/old-patches/slashcommands/1339.patch similarity index 100% rename from resources/patches/slashcommands/1339.patch rename to resources/old-patches/slashcommands/1339.patch diff --git a/resources/patches/slashcommands/1340.patch b/resources/old-patches/slashcommands/1340.patch similarity index 100% rename from resources/patches/slashcommands/1340.patch rename to resources/old-patches/slashcommands/1340.patch diff --git a/resources/patches/slashcommands/1355.patch b/resources/old-patches/slashcommands/1355.patch similarity index 100% rename from resources/patches/slashcommands/1355.patch rename to resources/old-patches/slashcommands/1355.patch diff --git a/resources/patches/slashcommands/1356.patch b/resources/old-patches/slashcommands/1356.patch similarity index 100% rename from resources/patches/slashcommands/1356.patch rename to resources/old-patches/slashcommands/1356.patch diff --git a/resources/patches/slashcommands/1358.patch b/resources/old-patches/slashcommands/1358.patch similarity index 100% rename from resources/patches/slashcommands/1358.patch rename to resources/old-patches/slashcommands/1358.patch diff --git a/resources/patches/slashcommands/1361.patch b/resources/old-patches/slashcommands/1361.patch similarity index 100% rename from resources/patches/slashcommands/1361.patch rename to resources/old-patches/slashcommands/1361.patch diff --git a/resources/patches/slashcommands/1362.patch b/resources/old-patches/slashcommands/1362.patch similarity index 100% rename from resources/patches/slashcommands/1362.patch rename to resources/old-patches/slashcommands/1362.patch diff --git a/resources/patches/slashcommands/1365.patch b/resources/old-patches/slashcommands/1365.patch similarity index 100% rename from resources/patches/slashcommands/1365.patch rename to resources/old-patches/slashcommands/1365.patch diff --git a/resources/patches/slashcommands/1367.patch b/resources/old-patches/slashcommands/1367.patch similarity index 100% rename from resources/patches/slashcommands/1367.patch rename to resources/old-patches/slashcommands/1367.patch diff --git a/resources/patches/slashcommands/1368.patch b/resources/old-patches/slashcommands/1368.patch similarity index 100% rename from resources/patches/slashcommands/1368.patch rename to resources/old-patches/slashcommands/1368.patch diff --git a/resources/patches/slashcommands/1370.patch b/resources/old-patches/slashcommands/1370.patch similarity index 100% rename from resources/patches/slashcommands/1370.patch rename to resources/old-patches/slashcommands/1370.patch diff --git a/resources/patches/slashcommands/1371.patch b/resources/old-patches/slashcommands/1371.patch similarity index 100% rename from resources/patches/slashcommands/1371.patch rename to resources/old-patches/slashcommands/1371.patch diff --git a/resources/patches/slashcommands/900.patch b/resources/old-patches/slashcommands/900.patch similarity index 100% rename from resources/patches/slashcommands/900.patch rename to resources/old-patches/slashcommands/900.patch diff --git a/resources/patches/slashcommands/901.patch b/resources/old-patches/slashcommands/901.patch similarity index 100% rename from resources/patches/slashcommands/901.patch rename to resources/old-patches/slashcommands/901.patch diff --git a/resources/patches/slashcommands/902.patch b/resources/old-patches/slashcommands/902.patch similarity index 100% rename from resources/patches/slashcommands/902.patch rename to resources/old-patches/slashcommands/902.patch diff --git a/resources/patches/slashcommands/903.patch b/resources/old-patches/slashcommands/903.patch similarity index 100% rename from resources/patches/slashcommands/903.patch rename to resources/old-patches/slashcommands/903.patch diff --git a/resources/patches/slashcommands/904.patch b/resources/old-patches/slashcommands/904.patch similarity index 100% rename from resources/patches/slashcommands/904.patch rename to resources/old-patches/slashcommands/904.patch diff --git a/resources/patches/slashcommands/906.patch b/resources/old-patches/slashcommands/906.patch similarity index 100% rename from resources/patches/slashcommands/906.patch rename to resources/old-patches/slashcommands/906.patch diff --git a/resources/patches/slashcommands/909.patch b/resources/old-patches/slashcommands/909.patch similarity index 100% rename from resources/patches/slashcommands/909.patch rename to resources/old-patches/slashcommands/909.patch diff --git a/resources/patches/slashcommands/910.patch b/resources/old-patches/slashcommands/910.patch similarity index 100% rename from resources/patches/slashcommands/910.patch rename to resources/old-patches/slashcommands/910.patch diff --git a/resources/patches/slashcommands/938.patch b/resources/old-patches/slashcommands/938.patch similarity index 100% rename from resources/patches/slashcommands/938.patch rename to resources/old-patches/slashcommands/938.patch diff --git a/resources/patches/slashcommands/939.patch b/resources/old-patches/slashcommands/939.patch similarity index 100% rename from resources/patches/slashcommands/939.patch rename to resources/old-patches/slashcommands/939.patch diff --git a/resources/patches/slashcommands/940.patch b/resources/old-patches/slashcommands/940.patch similarity index 100% rename from resources/patches/slashcommands/940.patch rename to resources/old-patches/slashcommands/940.patch diff --git a/resources/patches/slashcommands/942.patch b/resources/old-patches/slashcommands/942.patch similarity index 100% rename from resources/patches/slashcommands/942.patch rename to resources/old-patches/slashcommands/942.patch diff --git a/resources/patches/slashcommands/943.patch b/resources/old-patches/slashcommands/943.patch similarity index 100% rename from resources/patches/slashcommands/943.patch rename to resources/old-patches/slashcommands/943.patch diff --git a/resources/patches/slashcommands/945.patch b/resources/old-patches/slashcommands/945.patch similarity index 100% rename from resources/patches/slashcommands/945.patch rename to resources/old-patches/slashcommands/945.patch diff --git a/resources/patches/slashcommands/946.patch b/resources/old-patches/slashcommands/946.patch similarity index 100% rename from resources/patches/slashcommands/946.patch rename to resources/old-patches/slashcommands/946.patch diff --git a/resources/patches/slashcommands/947.patch b/resources/old-patches/slashcommands/947.patch similarity index 100% rename from resources/patches/slashcommands/947.patch rename to resources/old-patches/slashcommands/947.patch diff --git a/resources/patches/slashcommands/948.patch b/resources/old-patches/slashcommands/948.patch similarity index 100% rename from resources/patches/slashcommands/948.patch rename to resources/old-patches/slashcommands/948.patch diff --git a/resources/patches/slashcommands/963.patch b/resources/old-patches/slashcommands/963.patch similarity index 100% rename from resources/patches/slashcommands/963.patch rename to resources/old-patches/slashcommands/963.patch diff --git a/resources/patches/slashcommands/964.patch b/resources/old-patches/slashcommands/964.patch similarity index 100% rename from resources/patches/slashcommands/964.patch rename to resources/old-patches/slashcommands/964.patch diff --git a/resources/patches/slashcommands/965.patch b/resources/old-patches/slashcommands/965.patch similarity index 100% rename from resources/patches/slashcommands/965.patch rename to resources/old-patches/slashcommands/965.patch diff --git a/resources/patches/slashcommands/966.patch b/resources/old-patches/slashcommands/966.patch similarity index 100% rename from resources/patches/slashcommands/966.patch rename to resources/old-patches/slashcommands/966.patch diff --git a/resources/patches/slashcommands/967.patch b/resources/old-patches/slashcommands/967.patch similarity index 100% rename from resources/patches/slashcommands/967.patch rename to resources/old-patches/slashcommands/967.patch diff --git a/resources/patches/slashcommands/968.patch b/resources/old-patches/slashcommands/968.patch similarity index 100% rename from resources/patches/slashcommands/968.patch rename to resources/old-patches/slashcommands/968.patch diff --git a/resources/patches/slashcommands/970.patch b/resources/old-patches/slashcommands/970.patch similarity index 100% rename from resources/patches/slashcommands/970.patch rename to resources/old-patches/slashcommands/970.patch diff --git a/resources/patches/slashcommands/980.patch b/resources/old-patches/slashcommands/980.patch similarity index 100% rename from resources/patches/slashcommands/980.patch rename to resources/old-patches/slashcommands/980.patch diff --git a/resources/patches/slashcommands/992.patch b/resources/old-patches/slashcommands/992.patch similarity index 100% rename from resources/patches/slashcommands/992.patch rename to resources/old-patches/slashcommands/992.patch diff --git a/resources/patches/slashcommands/993.patch b/resources/old-patches/slashcommands/993.patch similarity index 100% rename from resources/patches/slashcommands/993.patch rename to resources/old-patches/slashcommands/993.patch diff --git a/resources/patches/slashcommands/994.patch b/resources/old-patches/slashcommands/994.patch similarity index 100% rename from resources/patches/slashcommands/994.patch rename to resources/old-patches/slashcommands/994.patch diff --git a/resources/patches/slashcommands/996.patch b/resources/old-patches/slashcommands/996.patch similarity index 100% rename from resources/patches/slashcommands/996.patch rename to resources/old-patches/slashcommands/996.patch diff --git a/resources/patches/slashcommands/README.md b/resources/old-patches/slashcommands/README.md similarity index 100% rename from resources/patches/slashcommands/README.md rename to resources/old-patches/slashcommands/README.md diff --git a/resources/patches/slashcommands/textreplacegen-array.py b/resources/old-patches/slashcommands/textreplacegen-array.py similarity index 100% rename from resources/patches/slashcommands/textreplacegen-array.py rename to resources/old-patches/slashcommands/textreplacegen-array.py diff --git a/resources/patches/slashcommands/textreplacegen.py b/resources/old-patches/slashcommands/textreplacegen.py similarity index 100% rename from resources/patches/slashcommands/textreplacegen.py rename to resources/old-patches/slashcommands/textreplacegen.py From 1d0a8b70885448e832ceebd9b4c0100ae3859f30 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sun, 15 Aug 2021 14:44:50 +0100 Subject: [PATCH 03/27] Implement slashcommands for discord api --- Dockerfile | 6 + resources/patches/slashcommands/87202-pre.sh | 10 + resources/patches/slashcommands/87202.patch | 13 + .../patches/slashcommands/code/.gitignore | 6 + .../patches/slashcommands/code/build.gradle | 28 ++ .../code/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + resources/patches/slashcommands/code/gradlew | 185 +++++++++++ .../patches/slashcommands/code/gradlew.bat | 89 +++++ .../slashcommands/code/settings.gradle | 2 + .../com/cutthecord/commands/CTCCommands.java | 309 ++++++++++++++++++ .../commands/EnableDisableHandler.java | 7 + .../cutthecord/commands/RawMsgHandler.java | 7 + .../com/cutthecord/commands/Replacements.java | 304 +++++++++++++++++ .../cutthecord/commands/commands/CmdCtc.java | 162 +++++++++ .../commands/commands/CmdEmojify.java | 44 +++ .../cutthecord/commands/commands/CmdOwo.java | 26 ++ .../commands/commands/CmdSpoilerImg.java | 25 ++ resources/scripts/ctcci/ctcci.py | 11 + 19 files changed, 1239 insertions(+) create mode 100644 resources/patches/slashcommands/87202-pre.sh create mode 100644 resources/patches/slashcommands/87202.patch create mode 100644 resources/patches/slashcommands/code/.gitignore create mode 100644 resources/patches/slashcommands/code/build.gradle create mode 100644 resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.jar create mode 100644 resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties create mode 100644 resources/patches/slashcommands/code/gradlew create mode 100644 resources/patches/slashcommands/code/gradlew.bat create mode 100644 resources/patches/slashcommands/code/settings.gradle create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/CTCCommands.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/EnableDisableHandler.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/RawMsgHandler.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/Replacements.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdEmojify.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdOwo.java create mode 100644 resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java diff --git a/Dockerfile b/Dockerfile index 397063c..9c3ef47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,9 @@ FROM ubuntu:21.04 # Install needed packages RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 android-sdk-build-tools wget unzip imagemagick git patch software-properties-common +# Mirror is being weird currently so install this seperatly +RUN apt-get update +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install zipmerge # Install fdroid RUN add-apt-repository ppa:fdroid/fdroidserver @@ -20,6 +23,9 @@ RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/av # Grab xml-patch (https://github.com/dnault/xml-patch) RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar +# Grab dex2jar (https://github.com/Aliucord/dex2jar) +RUN wget -O ${CTC_FOLDER}/tools/dex2jar.jar https://github.com/Aliucord/dex2jar/releases/download/v19-fork2/dex2jar.jar + # Grab emoji sets ENV EMOJI_PATH=${CTC_FOLDER}/emojis ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant diff --git a/resources/patches/slashcommands/87202-pre.sh b/resources/patches/slashcommands/87202-pre.sh new file mode 100644 index 0000000..f6500a0 --- /dev/null +++ b/resources/patches/slashcommands/87202-pre.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +cd /opt/ctc/gitrepo/resources/patches/slashcommands/code +chmod +x gradlew +rm -rf build +./gradlew build +cd build/libs +/lib/android-sdk/build-tools/debian/dx --dex --output ctccommands.apk ctccommands-1.0-SNAPSHOT.jar +java -jar /opt/ctc/tools/apktool.jar d ctccommands.apk +cp -r ctccommands/smali/* ${DISTOK_EXTRACTED_DISCORD_PATH}/smali/ \ No newline at end of file diff --git a/resources/patches/slashcommands/87202.patch b/resources/patches/slashcommands/87202.patch new file mode 100644 index 0000000..45737aa --- /dev/null +++ b/resources/patches/slashcommands/87202.patch @@ -0,0 +1,13 @@ +diff -crB com.discord-base/smali/com/discord/stores/BuiltInCommands.smali com.discord/smali/com/discord/stores/BuiltInCommands.smali +*** com.discord-base/smali/com/discord/stores/BuiltInCommands.smali 2021-08-15 15:01:18.951758400 +0100 +--- com.discord/smali/com/discord/stores/BuiltInCommands.smali 2021-08-15 15:02:36.852775500 +0100 +*************** +*** 305,310 **** +--- 305,312 ---- + + iput-object v12, p0, Lcom/discord/stores/BuiltInCommands;->builtInApplication:Lcom/discord/models/commands/Application; + ++ invoke-static {p0}, Lcom/cutthecord/commands/CTCCommands;->CreateCTCCommands(Lcom/discord/stores/BuiltInCommands;)V ++ + return-void + .end method diff --git a/resources/patches/slashcommands/code/.gitignore b/resources/patches/slashcommands/code/.gitignore new file mode 100644 index 0000000..d124c18 --- /dev/null +++ b/resources/patches/slashcommands/code/.gitignore @@ -0,0 +1,6 @@ +.gradle +.idea +build +libs +out + diff --git a/resources/patches/slashcommands/code/build.gradle b/resources/patches/slashcommands/code/build.gradle new file mode 100644 index 0000000..28a7cbc --- /dev/null +++ b/resources/patches/slashcommands/code/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' +} + +group 'org.example' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +compileJava.options.encoding = 'UTF-8' + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +apply plugin: 'java' +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +dependencies { + implementation files('/tmp/cutthecord/discord-base-jar/discord-base.jar', 'libs/discord87202.jar') +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.jar b/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties b/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..be52383 --- /dev/null +++ b/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/resources/patches/slashcommands/code/gradlew b/resources/patches/slashcommands/code/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/resources/patches/slashcommands/code/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/resources/patches/slashcommands/code/gradlew.bat b/resources/patches/slashcommands/code/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/resources/patches/slashcommands/code/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/resources/patches/slashcommands/code/settings.gradle b/resources/patches/slashcommands/code/settings.gradle new file mode 100644 index 0000000..ecd818b --- /dev/null +++ b/resources/patches/slashcommands/code/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'ctccommands' + diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/CTCCommands.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/CTCCommands.java new file mode 100644 index 0000000..39e07e3 --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/CTCCommands.java @@ -0,0 +1,309 @@ +package com.cutthecord.commands; + +import com.cutthecord.commands.commands.CmdCtc; +import com.cutthecord.commands.commands.CmdEmojify; +import com.cutthecord.commands.commands.CmdOwo; +import com.cutthecord.commands.commands.CmdSpoilerImg; +import com.discord.api.commands.ApplicationCommandType; +import com.discord.api.commands.CommandChoice; +import com.discord.models.commands.ApplicationCommand; +import com.discord.models.commands.ApplicationCommandOption; +import com.discord.stores.BuiltInCommands; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.jvm.functions.Function1; +import kotlin.jvm.internal.DefaultConstructorMarker; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@SuppressWarnings("SameParameterValue") +public class CTCCommands { + + static long ID = -100; + + // Helper class for replacements + public static class StrPair { + final String a; + final String b; + + public StrPair(String a, String b) { + this.a = a; + this.b = b; + } + } + + // Need to inject a call at end of init for p0 to this class in BuiltinCommands.smali + // Create commands + @SuppressWarnings({"unused"}) + public static void CreateCTCCommands(BuiltInCommands builtIn) { + // Used in command creation in BuiltinCommands, one more than the last reference + + // Add existing commands + ArrayList commands = new ArrayList<>(builtIn.getBuiltInCommands()); + + // Add our commands + commands.add(createWrappedSlashCommand("st", "Puts a strikethrough the message", "Message", "~~", "~~")); // Strikethrough + commands.add(createWrappedSlashCommand("bold", "Makes text bold", "Message", "**", "**")); // Bold + commands.add(createWrappedSlashCommand("slap", "Slaps people with a large trout", "Message", "*Slaps ", " around a bit with a large trout.*")); // Slap + + commands.add(createReplaceTextSlashCommand("clap", "Please \uD83D\uDC4F clap", "Message", Collections.singletonList(new StrPair(" ", ":clap:")))); // Clap + commands.add(createReplaceTextSlashCommand("flip", "Flips text (like “ʇɥıs”)", "Message", Replacements.FLIP)); // Flip + commands.add(createReplaceTextSlashCommand("fw", "Makes text fullwidth (like “Ｓｅｎｔ　ｆｒｏｍ　ｍｙ　Ａｎｄｒｏｉｄ　Ｄｅｖｉｃｅ”)", "Message", Replacements.FULL_WIDTH)); // fw + commands.add(createReplaceTextSlashCommand("morse", "Converts text into morse code", "Message", Replacements.MORSE, Case.UPPER)); // morse + commands.add(createReplaceTextSlashCommand("gordon", "\uD835\uDDDB\uD835\uDDF2\uD835\uDDF9\uD835\uDDF9\uD835\uDDFC，\uD835\uDDDA\uD835\uDDFC\uD835\uDDFF\uD835\uDDF1\uD835\uDDFC\uD835\uDDFB！", "Message", Replacements.GORDON)); // gordon + commands.add(createReplaceTextSlashCommand("small", "Makes text smaller (like “ᴛʜɪs”)", "Message", Replacements.SMALL, Case.LOWER)); // small + commands.add(createReplaceTextSlashCommand("smaller", "Makes text even smaller (like “ᵗʰvˢ”)", "Message", Replacements.SMALLER, Case.LOWER)); // smaller + //noinspection unchecked + commands.add(createReplaceTextSlashCommand("upper", "Makes text uppercase", "Message", Collections.EMPTY_LIST, Case.UPPER)); // upper + //noinspection unchecked + commands.add(createReplaceTextSlashCommand("lower", "Makes text lowercase", "Message", Collections.EMPTY_LIST, Case.LOWER)); // lower + + commands.add(createAppendToEndCommand("lenny", "( ͡° ͜ʖ ͡°)", "Message", " ( \u0361\u00B0 \u035C\u0296 \u0361\u00B0)")); // lenny + + commands.add(createHandleRawMessageCommand("owo", "Myakes tyext reawwy owo-ly, nya :3", "Message", new CmdOwo())); // owo + commands.add(createHandleRawMessageCommand("emojify", "Emojify text", "Message", new CmdEmojify())); // emojify + commands.add(createHandleRawMessageCommand("spoilerimg", "Prepends SPOILER_ to names of all images attached to the message that starts with this, causing them to get marked as spoiler", "Message", new CmdSpoilerImg())); + + commands.add(createEnableDisableCommand("channelleak", "Shows all hidden channels", new CmdCtc.CmdCtcChannelLeak())); + commands.add(createEnableDisableCommand("showtyping", "Change typing event so that its visible/not when you type", new CmdCtc.CmdCtcShowTyping())); + commands.add(createEnableDisableCommand("nodelete", "Disables handling of message delete events", new CmdCtc.CmdCtcNoDelete())); + commands.add(createHandleRawMessageCommand("gettoken", "Get current token, DO NOT USE IN PUBLIC", null, new CmdCtc.CmdCtcGetToken())); + commands.add(createHandleRawMessageCommand("settoken", "Set current token, DO NOT USE IN PUBLIC", "Token", new CmdCtc.CmdCtcSetToken())); + commands.add(createHandleRawMessageCommand("switchaccount", "Switch to specified account, DO NOT USE IN PUBLIC", "Name", new CmdCtc.CmdCtcSwitchAccount())); + // TODO addaccount + + + // Builtin list is non modifiable, lets hijack it instead :) + try { + Field commandListField = BuiltInCommands.class.getDeclaredField("builtInCommands"); + commandListField.setAccessible(true); + commandListField.set(builtIn, commands); + } catch (Exception e) { + System.out.println("Failed to replace buildInCommands"); + e.printStackTrace(); + } + + } + + // Wrapper for naming + public static class CTCCommand extends ApplicationCommand { + public CTCCommand(String id, long applicationID, String name, String description, Integer descriptionRes, List options, boolean builtIn, Long guildId, String version, Boolean defaultPermissions, Map map, Function1 handler, int flags, DefaultConstructorMarker defaultConstructorMarker) { + super(id, applicationID, name, description, descriptionRes, options, builtIn, guildId, version, defaultPermissions, map, handler, flags, defaultConstructorMarker); + } + } + + // Wrapper for naming + public static ApplicationCommandOption makeOption(ApplicationCommandType type, String name, String description, Integer descriptionRes, boolean required, boolean defaultOpt, List choices, List options) { + return new ApplicationCommandOption(type, name, description, descriptionRes, required, defaultOpt, choices, options); + } + + // Wrapper for naming + public static ApplicationCommandOption makeOption(ApplicationCommandType type, String name, String description, Integer descriptionRes, boolean required, boolean defaultOpt, List choices, List options, int flags, DefaultConstructorMarker marker) { + return new ApplicationCommandOption(type, name, description, descriptionRes, required, defaultOpt, choices, options, flags, marker); + /* + Flags + 4 - description = null + 8 - descriptionRes = null + 64 - choices = null + 128 - options = null + */ + } + + // Wrapper for naming + public static ApplicationCommand makeCtcCommand(String name, String cmdDesc, List options, Function1, String> handler) { + m.checkNotNullParameter(name, "name"); + m.checkNotNullParameter(options, "options"); + return new CTCCommand(String.valueOf(ID--), -1L, name, cmdDesc, null, options, true, null, null, null, null, handler, 1936, null); + /* + Flags + 8 - description = null + 16 - descriptionRes = null + 64 - builtIn = false + 128 - guildID = null + 256 - version = null + 512 - defaultPermissions = false + 1024 - permissions = null + 2048 - handler = null + + 1928 = 1024, 512, 256, 128, 8 + // Lets try 1936 for out purposes + */ + } + + static final class WrapTextCommand extends o implements Function1, String> { + public final String prefix; + public final String suffix; + + public WrapTextCommand(String prefix, String suffix) { + super(1); + this.prefix = prefix; + this.suffix = suffix; + } + + public final String invoke(Map options) { + m.checkNotNullParameter(options, "commandOptions"); + StringBuilder newMessage = new StringBuilder(); + newMessage.append(this.prefix); + Object originalMessage = options.get("message"); + if (originalMessage == null) { + originalMessage = ""; + } + + newMessage.append(originalMessage); + newMessage.append(this.suffix); + return newMessage.toString(); + } + } + + @SuppressWarnings("SameParameterValue") + private static ApplicationCommand createWrappedSlashCommand(String name, String cmdDesc, String optionDesc, String prefix, String suffix) { + return makeCtcCommand(name, cmdDesc, Collections.singletonList( + makeOption(ApplicationCommandType.STRING, "message", optionDesc, null, true, false, null, null, 192, null) + ), new WrapTextCommand(prefix, suffix)); + } + + final static class AppendToEndCommand extends o implements Function1, String> { + public String suffix; + + public AppendToEndCommand(String suffix) { + super(1); + this.suffix = suffix; + } + + public final String invoke(Map options) { + m.checkNotNullParameter( options, "commandOptions"); + StringBuilder newMessage = new StringBuilder(); + Object originalMessage = options.get("message"); + if (originalMessage == null) { + originalMessage = ""; + } + + newMessage.append(originalMessage); + newMessage.append(' '); + newMessage.append(this.suffix); + return newMessage.toString(); + } + } + + @SuppressWarnings("SameParameterValue") + private static ApplicationCommand createAppendToEndCommand(String name, String cmdDesc, String optionDesc, String suffix) { + return makeCtcCommand(name, cmdDesc, Collections.singletonList( + makeOption(ApplicationCommandType.STRING, "message", optionDesc, null, false, false, null, null, 192, null) + ), new AppendToEndCommand(suffix)); + } + + final static class ReplaceMatchesCommand extends o implements Function1, String> { + public final List replacements; + public final Case c; + + public ReplaceMatchesCommand(List replacements, Case c) { + super(1); + this.replacements = replacements; + this.c = c; + } + + public final String invoke(Map options) { + m.checkNotNullParameter(options, "commandOptions"); + StringBuilder newMessage = new StringBuilder(); + Object originalMessage = options.get("message"); + if (originalMessage == null) { + originalMessage = ""; + } + + if (c == Case.UPPER) { + originalMessage = ((String)originalMessage).toUpperCase(); + } else if (c == Case.LOWER) { + originalMessage = ((String)originalMessage).toLowerCase(); + } + + for (StrPair replacement : replacements) { + originalMessage = ((String)originalMessage).replace(replacement.a, replacement.b); + } + + newMessage.append(originalMessage); + return newMessage.toString(); + } + } + + enum Case { + UPPER, + LOWER, + ORIGINAL + } + + private static ApplicationCommand createReplaceTextSlashCommand(String name, String cmdDesc, String optionDesc, List replaceList, Case c) { + return makeCtcCommand(name, cmdDesc, Collections.singletonList( + makeOption(ApplicationCommandType.STRING, "message", optionDesc, null, true, true, null, null, 192, null) + ), new ReplaceMatchesCommand(replaceList, c)); + } + + private static ApplicationCommand createReplaceTextSlashCommand(String name, String cmdDesc, String optionDesc, List replaceList) { + return createReplaceTextSlashCommand(name, cmdDesc, optionDesc, replaceList, Case.ORIGINAL); + } + + final static class RawMessageCommand extends o implements Function1, String> { + public final RawMsgHandler handler; + + public RawMessageCommand(RawMsgHandler handler) { + super(1); + this.handler = handler; + } + + public final String invoke(Map options) { + m.checkNotNullParameter(options, "commandOptions"); + StringBuilder newMessage = new StringBuilder(); + Object originalMessage = options.get("message"); + if (originalMessage == null) { + originalMessage = ""; + } + + newMessage.append(handler.processRawMessage((String) originalMessage)); + return newMessage.toString(); + } + } + + final static class EnableDisableCommand extends o implements Function1, String> { + public final EnableDisableHandler handler; + + public EnableDisableCommand(EnableDisableHandler handler) { + super(1); + this.handler = handler; + } + + public final String invoke(Map options) { + m.checkNotNullParameter(options, "commandOptions"); + StringBuilder newMessage = new StringBuilder(); + + boolean enabled = (boolean) options.get("enabled"); + + newMessage.append(handler.processEnableDisable(enabled)); + return newMessage.toString(); + } + } + + private static ApplicationCommand createHandleRawMessageCommand(String name, String cmdDesc, String optionDesc, RawMsgHandler handler) { + boolean required = true; + if (optionDesc == null) { + required = false; + } + return makeCtcCommand(name, cmdDesc, Collections.singletonList( + makeOption(ApplicationCommandType.STRING, "message", optionDesc, null, required, required, null, null, 192, null) + ), new RawMessageCommand(handler)); + } + + private static ApplicationCommand createEnableDisableCommand(String name, String cmdDesc, EnableDisableHandler handler) { + ArrayList truefalse = new ArrayList<>(); + truefalse.add(new CommandChoice("on", "true")); + truefalse.add(new CommandChoice("off", "false")); + + return makeCtcCommand(name, cmdDesc, Collections.singletonList( + makeOption(ApplicationCommandType.BOOLEAN, "enabled", "Enable/Disable", null, true, true, truefalse, null, 192, null) + ), new EnableDisableCommand(handler)); + } + + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/EnableDisableHandler.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/EnableDisableHandler.java new file mode 100644 index 0000000..e90a9e3 --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/EnableDisableHandler.java @@ -0,0 +1,7 @@ +package com.cutthecord.commands; + +public interface EnableDisableHandler { + + String processEnableDisable(boolean enabled); + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/RawMsgHandler.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/RawMsgHandler.java new file mode 100644 index 0000000..43537f3 --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/RawMsgHandler.java @@ -0,0 +1,7 @@ +package com.cutthecord.commands; + +public interface RawMsgHandler { + + String processRawMessage(String orig); + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/Replacements.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/Replacements.java new file mode 100644 index 0000000..20991eb --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/Replacements.java @@ -0,0 +1,304 @@ +package com.cutthecord.commands; + +import java.util.ArrayList; +import java.util.List; + +public class Replacements { + + public static final List FLIP = new ArrayList() {{ + add(new CTCCommands.StrPair("a", "ɐ")); + add(new CTCCommands.StrPair("b", "q")); + add(new CTCCommands.StrPair("c", "ɔ")); + add(new CTCCommands.StrPair("d", "p")); + add(new CTCCommands.StrPair("e", "ǝ")); + add(new CTCCommands.StrPair("f", "ɟ")); + add(new CTCCommands.StrPair("g", "ƃ")); + add(new CTCCommands.StrPair("h", "ɥ")); + add(new CTCCommands.StrPair("i", "ı")); + add(new CTCCommands.StrPair("j", "ɾ")); + add(new CTCCommands.StrPair("k", "ʞ")); + add(new CTCCommands.StrPair("l", "ן")); + add(new CTCCommands.StrPair("m", "ɯ")); + add(new CTCCommands.StrPair("n", "u")); + //add(new CTCCommands.StrPair("o", "o")); + add(new CTCCommands.StrPair("p", "d")); + add(new CTCCommands.StrPair("q", "b")); + add(new CTCCommands.StrPair("r", "ɹ")); + //add(new CTCCommands.StrPair("s", "s")); + add(new CTCCommands.StrPair("t", "ʇ")); + add(new CTCCommands.StrPair("u", "n")); + add(new CTCCommands.StrPair("v", "ʌ")); + add(new CTCCommands.StrPair("w", "ʍ")); + //add(new CTCCommands.StrPair("x", "x")); + add(new CTCCommands.StrPair("y", "ʎ")); + //add(new CTCCommands.StrPair("z", "z")); + }}; + + public static final List FULL_WIDTH = new ArrayList() {{ + add(new CTCCommands.StrPair(" ", "　")); + add(new CTCCommands.StrPair("!", "！")); + add(new CTCCommands.StrPair("#", "＃")); + add(new CTCCommands.StrPair("$", "＄")); + add(new CTCCommands.StrPair("%", "％")); + add(new CTCCommands.StrPair("&", "＆")); + add(new CTCCommands.StrPair("'", "＇")); + add(new CTCCommands.StrPair("(", "（")); + add(new CTCCommands.StrPair(")", "）")); + add(new CTCCommands.StrPair("*", "＊")); + add(new CTCCommands.StrPair("+", "＋")); + add(new CTCCommands.StrPair(",", "，")); + add(new CTCCommands.StrPair("-", "－")); + add(new CTCCommands.StrPair(".", "．")); + add(new CTCCommands.StrPair("/", "／")); + add(new CTCCommands.StrPair("0", "０")); + add(new CTCCommands.StrPair("1", "１")); + add(new CTCCommands.StrPair("2", "２")); + add(new CTCCommands.StrPair("3", "３")); + add(new CTCCommands.StrPair("4", "４")); + add(new CTCCommands.StrPair("5", "５")); + add(new CTCCommands.StrPair("6", "６")); + add(new CTCCommands.StrPair("7", "７")); + add(new CTCCommands.StrPair("8", "８")); + add(new CTCCommands.StrPair("9", "９")); + add(new CTCCommands.StrPair(":", "：")); + add(new CTCCommands.StrPair(";", "；")); + add(new CTCCommands.StrPair("<", "＜")); + add(new CTCCommands.StrPair("=", "＝")); + add(new CTCCommands.StrPair(">", "＞")); + add(new CTCCommands.StrPair("?", "？")); + add(new CTCCommands.StrPair("@", "＠")); + add(new CTCCommands.StrPair("A", "Ａ")); + add(new CTCCommands.StrPair("B", "Ｂ")); + add(new CTCCommands.StrPair("C", "Ｃ")); + add(new CTCCommands.StrPair("D", "Ｄ")); + add(new CTCCommands.StrPair("E", "Ｅ")); + add(new CTCCommands.StrPair("F", "Ｆ")); + add(new CTCCommands.StrPair("G", "Ｇ")); + add(new CTCCommands.StrPair("H", "Ｈ")); + add(new CTCCommands.StrPair("I", "Ｉ")); + add(new CTCCommands.StrPair("J", "Ｊ")); + add(new CTCCommands.StrPair("K", "Ｋ")); + add(new CTCCommands.StrPair("L", "Ｌ")); + add(new CTCCommands.StrPair("M", "Ｍ")); + add(new CTCCommands.StrPair("N", "Ｎ")); + add(new CTCCommands.StrPair("O", "Ｏ")); + add(new CTCCommands.StrPair("P", "Ｐ")); + add(new CTCCommands.StrPair("Q", "Ｑ")); + add(new CTCCommands.StrPair("R", "Ｒ")); + add(new CTCCommands.StrPair("S", "Ｓ")); + add(new CTCCommands.StrPair("T", "Ｔ")); + add(new CTCCommands.StrPair("U", "Ｕ")); + add(new CTCCommands.StrPair("V", "Ｖ")); + add(new CTCCommands.StrPair("W", "Ｗ")); + add(new CTCCommands.StrPair("X", "Ｘ")); + add(new CTCCommands.StrPair("Y", "Ｙ")); + add(new CTCCommands.StrPair("Z", "Ｚ")); + add(new CTCCommands.StrPair("[", "［")); + add(new CTCCommands.StrPair("]", "］")); + add(new CTCCommands.StrPair("^", "＾")); + add(new CTCCommands.StrPair("_", "＿")); + add(new CTCCommands.StrPair("`", "｀")); + add(new CTCCommands.StrPair("a", "ａ")); + add(new CTCCommands.StrPair("b", "ｂ")); + add(new CTCCommands.StrPair("c", "ｃ")); + add(new CTCCommands.StrPair("d", "ｄ")); + add(new CTCCommands.StrPair("e", "ｅ")); + add(new CTCCommands.StrPair("f", "ｆ")); + add(new CTCCommands.StrPair("g", "ｇ")); + add(new CTCCommands.StrPair("h", "ｈ")); + add(new CTCCommands.StrPair("i", "ｉ")); + add(new CTCCommands.StrPair("j", "ｊ")); + add(new CTCCommands.StrPair("k", "ｋ")); + add(new CTCCommands.StrPair("l", "ｌ")); + add(new CTCCommands.StrPair("m", "ｍ")); + add(new CTCCommands.StrPair("n", "ｎ")); + add(new CTCCommands.StrPair("o", "ｏ")); + add(new CTCCommands.StrPair("p", "ｐ")); + add(new CTCCommands.StrPair("q", "ｑ")); + add(new CTCCommands.StrPair("r", "ｒ")); + add(new CTCCommands.StrPair("s", "ｓ")); + add(new CTCCommands.StrPair("t", "ｔ")); + add(new CTCCommands.StrPair("u", "ｕ")); + add(new CTCCommands.StrPair("v", "ｖ")); + add(new CTCCommands.StrPair("w", "ｗ")); + add(new CTCCommands.StrPair("x", "ｘ")); + add(new CTCCommands.StrPair("y", "ｙ")); + add(new CTCCommands.StrPair("z", "ｚ")); + add(new CTCCommands.StrPair("{", "｛")); + add(new CTCCommands.StrPair("|", "｜")); + add(new CTCCommands.StrPair("}", "｝")); + add(new CTCCommands.StrPair("~", "～")); + }}; + + public static final List MORSE = new ArrayList() {{ + add(new CTCCommands.StrPair(" ", "/ ")); + add(new CTCCommands.StrPair(".", ".-.-.- ")); + add(new CTCCommands.StrPair(",", "--..-- ")); + add(new CTCCommands.StrPair(":", "---... ")); + add(new CTCCommands.StrPair("?", "..--.. ")); + add(new CTCCommands.StrPair("'", ".----. ")); + add(new CTCCommands.StrPair("-", "-....- ")); + add(new CTCCommands.StrPair("/", "-..-. ")); + add(new CTCCommands.StrPair("@", ".--.-. ")); + add(new CTCCommands.StrPair("=", "-...- ")); + add(new CTCCommands.StrPair("A", ".- ")); + add(new CTCCommands.StrPair("B", "-... ")); + add(new CTCCommands.StrPair("C", "-.-. ")); + add(new CTCCommands.StrPair("D", "-.. ")); + add(new CTCCommands.StrPair("E", ". ")); + add(new CTCCommands.StrPair("F", "..-. ")); + add(new CTCCommands.StrPair("G", "--. ")); + add(new CTCCommands.StrPair("H", ".... ")); + add(new CTCCommands.StrPair("I", ".. ")); + add(new CTCCommands.StrPair("J", ".--- ")); + add(new CTCCommands.StrPair("K", "-.- ")); + add(new CTCCommands.StrPair("L", ".-.. ")); + add(new CTCCommands.StrPair("M", "-- ")); + add(new CTCCommands.StrPair("N", "-. ")); + add(new CTCCommands.StrPair("O", "--- ")); + add(new CTCCommands.StrPair("P", ".--. ")); + add(new CTCCommands.StrPair("Q", "--.- ")); + add(new CTCCommands.StrPair("R", ".-. ")); + add(new CTCCommands.StrPair("S", "... ")); + add(new CTCCommands.StrPair("T", "- ")); + add(new CTCCommands.StrPair("U", "..- ")); + add(new CTCCommands.StrPair("V", "...- ")); + add(new CTCCommands.StrPair("W", ".-- ")); + add(new CTCCommands.StrPair("X", "-..- ")); + add(new CTCCommands.StrPair("Y", "-.-- ")); + add(new CTCCommands.StrPair("Z", "--.. ")); + add(new CTCCommands.StrPair("0", "----- ")); + add(new CTCCommands.StrPair("1", ".---- ")); + add(new CTCCommands.StrPair("2", "..--- ")); + add(new CTCCommands.StrPair("3", "...-- ")); + add(new CTCCommands.StrPair("4", "....- ")); + add(new CTCCommands.StrPair("5", "..... ")); + add(new CTCCommands.StrPair("6", "-.... ")); + add(new CTCCommands.StrPair("7", "--... ")); + add(new CTCCommands.StrPair("8", "---.. ")); + add(new CTCCommands.StrPair("9", "----. ")); + }}; + + public static final List GORDON = new ArrayList() {{ + add(new CTCCommands.StrPair("a", "𝗮")); + add(new CTCCommands.StrPair("b", "𝗯")); + add(new CTCCommands.StrPair("c", "𝗰")); + add(new CTCCommands.StrPair("d", "𝗱")); + add(new CTCCommands.StrPair("e", "𝗲")); + add(new CTCCommands.StrPair("f", "𝗳")); + add(new CTCCommands.StrPair("g", "𝗴")); + add(new CTCCommands.StrPair("h", "𝗵")); + add(new CTCCommands.StrPair("i", "𝗶")); + add(new CTCCommands.StrPair("j", "𝗷")); + add(new CTCCommands.StrPair("k", "𝗸")); + add(new CTCCommands.StrPair("l", "𝗹")); + add(new CTCCommands.StrPair("m", "𝗺")); + add(new CTCCommands.StrPair("n", "𝗻")); + add(new CTCCommands.StrPair("o", "𝗼")); + add(new CTCCommands.StrPair("p", "𝗽")); + add(new CTCCommands.StrPair("q", "𝗾")); + add(new CTCCommands.StrPair("r", "𝗿")); + add(new CTCCommands.StrPair("s", "𝘀")); + add(new CTCCommands.StrPair("t", "𝘁")); + add(new CTCCommands.StrPair("u", "𝘂")); + add(new CTCCommands.StrPair("v", "𝘃")); + add(new CTCCommands.StrPair("w", "𝘄")); + add(new CTCCommands.StrPair("x", "𝘅")); + add(new CTCCommands.StrPair("y", "𝘆")); + add(new CTCCommands.StrPair("z", "𝘇")); + add(new CTCCommands.StrPair("A", "𝗔")); + add(new CTCCommands.StrPair("B", "𝗕")); + add(new CTCCommands.StrPair("C", "𝗖")); + add(new CTCCommands.StrPair("D", "𝗗")); + add(new CTCCommands.StrPair("E", "𝗘")); + add(new CTCCommands.StrPair("F", "𝗙")); + add(new CTCCommands.StrPair("G", "𝗚")); + add(new CTCCommands.StrPair("H", "𝗛")); + add(new CTCCommands.StrPair("I", "𝗜")); + add(new CTCCommands.StrPair("J", "𝗝")); + add(new CTCCommands.StrPair("K", "𝗞")); + add(new CTCCommands.StrPair("L", "𝗟")); + add(new CTCCommands.StrPair("M", "𝗠")); + add(new CTCCommands.StrPair("N", "𝗡")); + add(new CTCCommands.StrPair("O", "𝗢")); + add(new CTCCommands.StrPair("P", "𝗣")); + add(new CTCCommands.StrPair("Q", "𝗤")); + add(new CTCCommands.StrPair("R", "𝗥")); + add(new CTCCommands.StrPair("S", "𝗦")); + add(new CTCCommands.StrPair("T", "𝗧")); + add(new CTCCommands.StrPair("U", "𝗨")); + add(new CTCCommands.StrPair("V", "𝗩")); + add(new CTCCommands.StrPair("W", "𝗪")); + add(new CTCCommands.StrPair("X", "𝗫")); + add(new CTCCommands.StrPair("Y", "𝗬")); + add(new CTCCommands.StrPair("Z", "𝗭")); + add(new CTCCommands.StrPair("0", "𝟬")); + add(new CTCCommands.StrPair("1", "𝟭")); + add(new CTCCommands.StrPair("2", "𝟮")); + add(new CTCCommands.StrPair("3", "𝟯")); + add(new CTCCommands.StrPair("4", "𝟰")); + add(new CTCCommands.StrPair("5", "𝟱")); + add(new CTCCommands.StrPair("6", "𝟲")); + add(new CTCCommands.StrPair("7", "𝟳")); + add(new CTCCommands.StrPair("8", "𝟴")); + add(new CTCCommands.StrPair("9", "𝟵")); + }}; + + public static final List SMALL = new ArrayList() {{ + add(new CTCCommands.StrPair("a", "ᴀ")); + add(new CTCCommands.StrPair("b", "ʙ")); + add(new CTCCommands.StrPair("c", "ᴄ")); + add(new CTCCommands.StrPair("d", "ᴅ")); + add(new CTCCommands.StrPair("e", "ᴇ")); + add(new CTCCommands.StrPair("f", "ꜰ")); + add(new CTCCommands.StrPair("g", "ɢ")); + add(new CTCCommands.StrPair("h", "ʜ")); + add(new CTCCommands.StrPair("i", "ɪ")); + add(new CTCCommands.StrPair("j", "ᴊ")); + add(new CTCCommands.StrPair("k", "ᴋ")); + add(new CTCCommands.StrPair("l", "ʟ")); + add(new CTCCommands.StrPair("m", "ᴍ")); + add(new CTCCommands.StrPair("n", "ɴ")); + add(new CTCCommands.StrPair("o", "ᴏ")); + add(new CTCCommands.StrPair("p", "ᴘ")); + add(new CTCCommands.StrPair("q", "ǫ")); + add(new CTCCommands.StrPair("r", "ʀ")); + //add(new CTCCommands.StrPair("s", "s")); + add(new CTCCommands.StrPair("t", "ᴛ")); + add(new CTCCommands.StrPair("u", "ᴜ")); + add(new CTCCommands.StrPair("v", "ᴠ")); + add(new CTCCommands.StrPair("w", "ᴡ")); + add(new CTCCommands.StrPair("y", "ʏ")); + add(new CTCCommands.StrPair("z", "ᴢ")); + }}; + + public static final List SMALLER = new ArrayList() {{ + add(new CTCCommands.StrPair("a", "ᵃ")); + add(new CTCCommands.StrPair("b", "ᵇ")); + add(new CTCCommands.StrPair("c", "ᶜ")); + add(new CTCCommands.StrPair("d", "ᵈ")); + add(new CTCCommands.StrPair("e", "ᵉ")); + add(new CTCCommands.StrPair("f", "ᶠ")); + add(new CTCCommands.StrPair("g", "ᵍ")); + add(new CTCCommands.StrPair("h", "ʰ")); + add(new CTCCommands.StrPair("i", "ᶦ")); + add(new CTCCommands.StrPair("j", "ʲ")); + add(new CTCCommands.StrPair("k", "ᵏ")); + add(new CTCCommands.StrPair("l", "ˡ")); + add(new CTCCommands.StrPair("m", "ᵐ")); + add(new CTCCommands.StrPair("n", "ⁿ")); + add(new CTCCommands.StrPair("o", "ᵒ")); + add(new CTCCommands.StrPair("p", "ᵖ")); + add(new CTCCommands.StrPair("q", "ᑫ")); + add(new CTCCommands.StrPair("r", "ʳ")); + add(new CTCCommands.StrPair("s", "ˢ")); + add(new CTCCommands.StrPair("t", "ᵗ")); + add(new CTCCommands.StrPair("u", "ᵘ")); + add(new CTCCommands.StrPair("v", "ᵛ")); + add(new CTCCommands.StrPair("w", "ʷ")); + add(new CTCCommands.StrPair("x", "ˣ")); + add(new CTCCommands.StrPair("y", "ʸ")); + add(new CTCCommands.StrPair("z", "ᶻ")); + }}; + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java new file mode 100644 index 0000000..9ad3002 --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java @@ -0,0 +1,162 @@ +package com.cutthecord.commands.commands; + +import com.cutthecord.commands.EnableDisableHandler; +import com.cutthecord.commands.RawMsgHandler; +import com.discord.stores.StoreStream; +import com.discord.stores.StoreUserSettings; + +import java.lang.reflect.Method; + +public class CmdCtc { + + + // TODO make token calls write directly to clipboard + // TODO make supplemental inject a interface so we can just cast instead of using reflection + + public static class CmdCtcChannelLeak implements EnableDisableHandler { + + @Override + public String processEnableDisable(boolean enabled) { + try { + //noinspection JavaReflectionMemberAccess + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setLeakChannels", Boolean.class); + m.invoke(StoreStream.getUserSettings(), enabled); + } catch (Exception e) { + System.out.println("Failed to call StoreStream.getUserSettings().setLeakChannels"); + e.printStackTrace(); + } + return "CTC: Successfully set channelleak state."; // TODO use notification + } + + } + + public static class CmdCtcShowTyping implements EnableDisableHandler { + + @Override + public String processEnableDisable(boolean enabled) { + + try { + //noinspection JavaReflectionMemberAccess + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setShowTyping", Boolean.class); + m.invoke(StoreStream.getUserSettings(), enabled); + } catch (Exception e) { + System.out.println("Failed to call StoreStream.getUserSettings().setShowTyping"); + e.printStackTrace(); + } + + return "CTC: Successfully set showtyping state."; // TODO use notification + } + + } + + public static class CmdCtcNoDelete implements EnableDisableHandler { + + @Override + public String processEnableDisable(boolean enabled) { + + try { + //noinspection JavaReflectionMemberAccess + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setNoDelete", Boolean.class); + m.invoke(StoreStream.getUserSettings(), enabled); + } catch (Exception e) { + System.out.println("Failed to call StoreStream.getUserSettings().setNoDelete"); + e.printStackTrace(); + } + + return "CTC: Successfully set nodelete state."; // TODO use notification + } + + } + + public static class CmdCtcGetToken implements RawMsgHandler { + + @Override + public String processRawMessage(String orig) { + try { + //noinspection JavaReflectionMemberAccess + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("getStoredToken"); + return (String) m.invoke(StoreStream.getUserSettings()); // TODO notification + } catch (Exception e) { + System.out.println("Failed to call StoreStream.getUserSettings().getStoredToken()"); + e.printStackTrace(); + } + + return ""; + } + + } + + public static class CmdCtcSetToken implements RawMsgHandler { + + @Override + public String processRawMessage(String msg) { + + try { + //noinspection JavaReflectionMemberAccess + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setStoredToken", String.class); + m.invoke(StoreStream.getUserSettings(), msg); + } catch (Exception e) { + System.out.println("Failed to call StoreStream.getUserSettings().setStoredToken()"); + e.printStackTrace(); + } + + return "CTC: Successfully changed token. Please restart application."; + } + + } + + public static class CmdCtcSwitchAccount implements RawMsgHandler { + + @Override + public String processRawMessage(String msg) { + String trim = msg.trim(); + StoreUserSettings userSettings = StoreStream.getUserSettings(); + + try { + //noinspection JavaReflectionMemberAccess + final Method m1 = userSettings.getClass().getDeclaredMethod("getAccountToken", String.class); + String accountToken = (String) m1.invoke(userSettings, trim); + if (accountToken.startsWith("none")) { + return "CTC: No such account found."; + } + + //noinspection JavaReflectionMemberAccess + final Method m2 = userSettings.getClass().getDeclaredMethod("setStoredToken", String.class); + m2.invoke(userSettings, accountToken); + return "CTC: Successfully changed accounts. Please restart application."; + } catch (Exception e) { + e.printStackTrace(); + } + + return ""; + } + + } + + public static class CmdCtcAddAccount implements RawMsgHandler {//TODO + + @Override + public String processRawMessage(String msg) { + String substring3 = msg.substring(msg.indexOf(" ")); + String accName = msg.replace(substring3, "").trim(); + String accToken = substring3.trim(); + + StoreUserSettings userSettings = StoreStream.getUserSettings(); + if (accName.startsWith("current")) { + accName = StoreStream.getUsers().getMe().getUsername(); + accToken = StoreStream.getUsers().getMe().getToken(); + } + + try { + final Method m = userSettings.getClass().getDeclaredMethod("setAccountToken", String.class, String.class); + m.invoke(userSettings, accName, accToken); + } catch (Exception e) { + e.printStackTrace(); + } + + return "CTC: Added account."; + } + + } + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdEmojify.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdEmojify.java new file mode 100644 index 0000000..a931bcc --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdEmojify.java @@ -0,0 +1,44 @@ +package com.cutthecord.commands.commands; + +import com.cutthecord.commands.RawMsgHandler; + +public class CmdEmojify implements RawMsgHandler { + + @Override + public String processRawMessage(String msg) { + + StringBuilder s = new StringBuilder(); + for (char c : msg.toCharArray()) { + s.append(emojifyChar(c)); + } + + return s.toString(); + } + + final String[] numbers = {"zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"}; + + public String emojifyChar(char c) { + if (Character.isDigit(c)) { + int i = Integer.parseInt(Character.toString(c)); + return ":" + numbers[i] + ":"; + } + + if (Character.isAlphabetic(c)) { + + if (c == 'b') { + return ":b:"; + } + + return ":regional_indicator_" + String.valueOf(c).toLowerCase() + ":"; + } + + switch (c) { + case '.': return ":record_button"; + case '?': return ":grey_question:"; + case '!': return ":grey_exclamation:"; + } + + return Character.toString(c); + } + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdOwo.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdOwo.java new file mode 100644 index 0000000..fc2be33 --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdOwo.java @@ -0,0 +1,26 @@ +package com.cutthecord.commands.commands; + +import com.cutthecord.commands.RawMsgHandler; + +public class CmdOwo implements RawMsgHandler { + + static final String[] expressions = { + ">_<", ":3", "ʕʘ‿ʘʔ", ":D", "._.", + ";3", "xD", "ㅇㅅㅇ", "(人◕ω◕)", + ">_>", "ÙωÙ", "UwU", "OwO", ":P", + "(◠‿◠✿)", "^_^", ";_;", "XDDD", + "x3", "(• o •)", "<_<", "(・`ω´・)", + ";;w;;", ">w<", "^w^" + }; + + public String processRawMessage(String msg) { + return msg.replaceAll("[rl]", "w") + .replaceAll("[RL]", "W") + .replaceAll("n([aeiou])", "ny$1") + .replaceAll("N([aeiou])", "Ny$1") + .replaceAll("N([AEIOU])", "NY$1") + .replace("ove", "uv") + .replaceAll("!+", " "+ expressions[(int) Math.floor(Math.random()*expressions.length)]+ " "); + } + +} diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java new file mode 100644 index 0000000..f01e617 --- /dev/null +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java @@ -0,0 +1,25 @@ +package com.cutthecord.commands.commands; + +import com.cutthecord.commands.RawMsgHandler; +import com.discord.stores.StoreStream; + +import java.lang.reflect.Method; + + +public class CmdSpoilerImg implements RawMsgHandler { + + @Override + public String processRawMessage(String orig) { + try { + // Added by Supplemental patch + //noinspection JavaReflectionMemberAccess + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setImageSpoiler", Boolean.class); + m.invoke(StoreStream.getUserSettings(), true); + } catch (Exception e) { + System.out.println("Failed to call StoreStream.getUserSettings().setImageSpoiler(true)"); + e.printStackTrace(); + } + return orig; + } + +} diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py index 73a987d..124d2ae 100644 --- a/resources/scripts/ctcci/ctcci.py +++ b/resources/scripts/ctcci/ctcci.py @@ -48,6 +48,10 @@ with open(os.path.join(REPO_FOLDER, "resources/patchport-state.json")) as f: VERSION = STATE["versioncode"] BASE_APK_PATH = os.path.join(WORK_FOLDER, f"discord-base-{VERSION}") +BASE_JAR_PATH = os.path.join(WORK_FOLDER, f"discord-base-jar") +# Wipe and recreate the base jar folder +if os.path.exists(BASE_JAR_PATH): + shutil.rmtree(BASE_JAR_PATH) # Prepare names of input and output APKs INPUT_FILE = os.path.join(DISTOK_FOLDER, "android", @@ -79,6 +83,13 @@ if not os.path.exists(BASE_APK_PATH): shell=True, cwd=WORK_FOLDER) +# Convert the dexs to a jar (for slashcommands etc) TODO versionise gradle/this +if not os.path.exists(BASE_JAR_PATH): + subprocess.run(f"unzip -j {INPUT_FILE} *.dex -d {BASE_JAR_PATH}", shell=True, cwd=WORK_FOLDER) + subprocess.run(f"{DEX2JAR_BIN} *.dex", shell=True, cwd=BASE_JAR_PATH) + subprocess.run(f"zipmerge discord-base.jar classes*dex2jar.jar", shell=True, cwd=BASE_JAR_PATH) + subprocess.run(f"rm classes*dex2jar.jar *.dex", shell=True, cwd=BASE_JAR_PATH) + # Copy the base cache to work on it shutil.copytree(BASE_APK_PATH, WORK_APK_PATH) From a70f7395aa20ce87e807f366963478cb0ff06973 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sat, 21 Aug 2021 15:20:59 +0100 Subject: [PATCH 04/27] Split and implement betterdmheader --- resources/patches/betterdmheader/87202.patch | 37 +++++++++++++++++++ resources/xmlpatches/betterdmheader/87202.xml | 7 ++++ 2 files changed, 44 insertions(+) create mode 100644 resources/patches/betterdmheader/87202.patch create mode 100644 resources/xmlpatches/betterdmheader/87202.xml diff --git a/resources/patches/betterdmheader/87202.patch b/resources/patches/betterdmheader/87202.patch new file mode 100644 index 0000000..a258298 --- /dev/null +++ b/resources/patches/betterdmheader/87202.patch @@ -0,0 +1,37 @@ +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 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; +*************** +*** 360,366 **** + + 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 19 + invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 360,366 ---- + + 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 19 + invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/resources/xmlpatches/betterdmheader/87202.xml b/resources/xmlpatches/betterdmheader/87202.xml new file mode 100644 index 0000000..d858450 --- /dev/null +++ b/resources/xmlpatches/betterdmheader/87202.xml @@ -0,0 +1,7 @@ + + + never + never + always + + From 4de5282bf328c077d2d2fe41b28b4de9215d104b Mon Sep 17 00:00:00 2001 From: clienthax Date: Sat, 21 Aug 2021 15:37:47 +0100 Subject: [PATCH 05/27] Woops. --- .../disable-mobileindicator/87202.patch | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/resources/patches/disable-mobileindicator/87202.patch b/resources/patches/disable-mobileindicator/87202.patch index 954dd9f..04bcf67 100644 --- a/resources/patches/disable-mobileindicator/87202.patch +++ b/resources/patches/disable-mobileindicator/87202.patch @@ -1,29 +1,4 @@ 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 *************** From c17cb44eaa92eebf887e121e5a7b41d36b47dcb0 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sat, 21 Aug 2021 17:02:18 +0100 Subject: [PATCH 06/27] Fixup commands/supplemental changes. --- .../cutthecord/commands/commands/CmdCtc.java | 19 ++- resources/patches/supplemental/87202.patch | 137 ++++++++++-------- 2 files changed, 90 insertions(+), 66 deletions(-) diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java index 9ad3002..24066b3 100644 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java @@ -19,11 +19,24 @@ public class CmdCtc { public String processEnableDisable(boolean enabled) { try { //noinspection JavaReflectionMemberAccess - final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setLeakChannels", Boolean.class); + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setLeakChannels", boolean.class); m.invoke(StoreStream.getUserSettings(), enabled); } catch (Exception e) { System.out.println("Failed to call StoreStream.getUserSettings().setLeakChannels"); + + System.out.println("Declared"); + for (Method m : StoreStream.getUserSettings().getClass().getDeclaredMethods()) { + System.out.println(m.getName()+" "+ m.toString()); + } + + System.out.println(); + System.out.println("Methods"); + for (Method m : StoreStream.getUserSettings().getClass().getMethods()) { + System.out.println(m.getName()+" "+ m.toString()); + } + e.printStackTrace(); + return "Failed to call StoreStream.getUserSettings().setLeakChannels"; } return "CTC: Successfully set channelleak state."; // TODO use notification } @@ -37,7 +50,7 @@ public class CmdCtc { try { //noinspection JavaReflectionMemberAccess - final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setShowTyping", Boolean.class); + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setShowTyping", boolean.class); m.invoke(StoreStream.getUserSettings(), enabled); } catch (Exception e) { System.out.println("Failed to call StoreStream.getUserSettings().setShowTyping"); @@ -56,7 +69,7 @@ public class CmdCtc { try { //noinspection JavaReflectionMemberAccess - final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setNoDelete", Boolean.class); + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setNoDelete", boolean.class); m.invoke(StoreStream.getUserSettings(), enabled); } catch (Exception e) { System.out.println("Failed to call StoreStream.getUserSettings().setNoDelete"); diff --git a/resources/patches/supplemental/87202.patch b/resources/patches/supplemental/87202.patch index ec54853..9a4e77e 100644 --- a/resources/patches/supplemental/87202.patch +++ b/resources/patches/supplemental/87202.patch @@ -21,77 +21,65 @@ diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/di new-instance v0, Lcom/discord/models/domain/ModelMessageDelete; invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;->()V -diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali +diff -crB from/smali/com/discord/api/channel/Channel.smali to/smali/com/discord/api/channel/Channel.smali *** from/smali/com/discord/api/channel/Channel.smali 2021-08-10 20:23:56.976468100 +0100 --- to/smali/com/discord/api/channel/Channel.smali 2021-08-11 17:13:48.876902500 +0100 *************** -*** 1774,1779 **** ---- 1774,1789 ---- +*** 1774,1783 **** } .end annotation -+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings; +! .line 1 +! iget-object v0, p0, Lcom/discord/api/channel/Channel;->permissionOverwrites:Ljava/util/List; + + return-object v0 + .end method + + .method public final t()I +--- 1774,1800 ---- + } + .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 + ++ invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List; + + move-result-object v0 + -+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getLeakChannels()Z ++ :goto_0 + return-object v0 + -+ move-result v0 ++ :cond_0 ++ iget-object v0, p0, Lcom/discord/api/channel/Channel;->permissionOverwrites:Ljava/util/List; + -+ if-eqz v0, :cond_0 -+ - .line 1 - iget-object v0, p0, Lcom/discord/api/channel/Channel;->permissionOverwrites:Ljava/util/List; ++ goto :goto_0 + .end method + .method public final t()I diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali *** from/smali/com/discord/stores/StoreUserSettings.smali 2020-11-16 13:22:49.513198310 +0000 --- to/smali/com/discord/stores/StoreUserSettings.smali 2020-11-16 13:57:09.234000134 +0000 *************** *** 2899,2904 **** ---- 2899,3188 ---- +--- 2899,3178 ---- return-void .end method -+ .method public getAutoplayGifs()Z -+ .locals 3 -+ -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; -+ -+ const-string v1, "CACHE_KEY_CTC_AUTOPLAY_GIFS" -+ -+ 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 setAutoplayGifs(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_AUTOPLAY_GIFS" -+ -+ 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 getLeakChannels()Z + .locals 3 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ .line 1 ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS" + @@ -107,7 +95,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public setLeakChannels(Z)V + .locals 2 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + @@ -127,11 +117,14 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public getImageSpoiler()Z + .locals 3 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ .line 1 ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER" + -+ const/4 v2, 0x0 ++ const/4 v2, 0x1 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -143,7 +136,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public setImageSpoiler(Z)V + .locals 2 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + @@ -160,15 +155,17 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + return-void + .end method + -+ + .method public getNoDelete()Z + .locals 3 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ .line 1 ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + const-string v1, "CACHE_KEY_CTC_NO_DELETE" + -+ const/4 v2, 0x0 ++ const/4 v2, 0x1 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -180,7 +177,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public setNoDelete(Z)V + .locals 2 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + @@ -200,7 +199,10 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public getShowTyping()Z + .locals 3 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ .line 1 ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + const-string v1, "CACHE_KEY_CTC_SHOW_TYPING" + @@ -216,7 +218,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public setShowTyping(Z)V + .locals 2 + -+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + @@ -233,11 +237,12 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + return-void + .end method + -+ + .method public getStoredToken()Ljava/lang/String; + .locals 3 + -+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + const-string v1, "none" + @@ -254,7 +259,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + .method public setStoredToken(Ljava/lang/String;)V + .locals 2 + -+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + @@ -290,7 +297,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + move-result-object v2 + -+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + const-string v1, "none" + @@ -321,7 +330,9 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + move-result-object v1 + -+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences; ++ invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences; ++ ++ move-result-object v0 + + invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + From cdfa005d352d66953aa07208afea1f32f6fe7e55 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sat, 21 Aug 2021 17:45:59 +0100 Subject: [PATCH 07/27] Split notrack and port --- resources/patches/notrack/87202-post.sh | 2 + resources/patches/notrack/87202.patch | 1324 +++++++++++++++++++++++ resources/xmlpatches/notrack/87202.xml | 5 + 3 files changed, 1331 insertions(+) create mode 100644 resources/patches/notrack/87202-post.sh create mode 100644 resources/patches/notrack/87202.patch create mode 100644 resources/xmlpatches/notrack/87202.xml diff --git a/resources/patches/notrack/87202-post.sh b/resources/patches/notrack/87202-post.sh new file mode 100644 index 0000000..27b03f0 --- /dev/null +++ b/resources/patches/notrack/87202-post.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mv smali/com/airbnb smali_classes2/com/ diff --git a/resources/patches/notrack/87202.patch b/resources/patches/notrack/87202.patch new file mode 100644 index 0000000..6c91bed --- /dev/null +++ b/resources/patches/notrack/87202.patch @@ -0,0 +1,1324 @@ +diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali +*** from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2021-08-10 20:24:15.471210700 +0100 +--- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2021-08-21 17:10:11.604448700 +0100 +*************** +*** 208,216 **** + .method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V + .locals 0 + +- .line 1 +- invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V +- + return-void + .end method + +--- 208,213 ---- +*************** +*** 233,337 **** + .end method + + .method private final declared-synchronized drainEventsQueue()V +! .locals 15 +! +! monitor-enter p0 +! +! .line 1 +! :try_start_0 +! invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->getCanDrain()Z +! +! move-result v0 +! :try_end_0 +! .catchall {:try_start_0 .. :try_end_0} :catchall_0 +! +! if-nez v0, :cond_0 +! +! .line 2 +! monitor-exit p0 +! +! return-void +! +! .line 3 +! :cond_0 +! :try_start_1 +! new-instance v0, Ljava/util/ArrayList; +! +! iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue; +! +! invoke-direct {v0, v1}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V +! +! .line 4 +! iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue; +! +! invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V +! +! .line 5 +! iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->restAPI:Lcom/discord/utilities/rest/RestAPI; +! +! .line 6 +! new-instance v2, Lcom/discord/api/science/Science; +! +! iget-object v3, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->analyticsToken:Ljava/lang/String; +! +! invoke-direct {v2, v3, v0}, Lcom/discord/api/science/Science;->(Ljava/lang/String;Ljava/util/List;)V +! +! invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->science(Lcom/discord/api/science/Science;)Lrx/Observable; +! +! move-result-object v1 +! +! const/4 v2, 0x0 +! +! const/4 v3, 0x1 +! +! const/4 v4, 0x0 +! +! .line 7 +! invoke-static {v1, v2, v3, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable; +! +! move-result-object v5 +! +! .line 8 +! invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; +! +! move-result-object v6 +! +! const/4 v7, 0x0 +! +! const/4 v8, 0x0 +! +! .line 9 +! sget-object v12, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1; +! +! const/4 v10, 0x0 +! +! const/4 v11, 0x0 +! +! .line 10 +! new-instance v9, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2; +! +! invoke-direct {v9, p0, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2;->(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/util/ArrayList;)V +! +! const/16 v13, 0x36 +! +! const/4 v14, 0x0 +! +! .line 11 +! invoke-static/range {v5 .. v14}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V +! :try_end_1 +! .catchall {:try_start_1 .. :try_end_1} :catchall_0 +! +! .line 12 +! monitor-exit p0 + + return-void +- +- :catchall_0 +- move-exception v0 +- +- monitor-exit p0 +- +- throw v0 + .end method + + .method private final getCanDrain()Z +--- 230,238 ---- + .end method + + .method private final declared-synchronized drainEventsQueue()V +! .locals 0 + + return-void + .end method + + .method private final getCanDrain()Z +*************** +*** 605,636 **** + .method public static synthetic setTrackingData$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;ZILjava/lang/Object;)V + .locals 0 + +- and-int/lit8 p3, p3, 0x2 +- +- if-eqz p3, :cond_0 +- +- const/4 p2, 0x0 +- +- .line 1 +- :cond_0 +- invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->setTrackingData(Ljava/lang/String;Z)V +- + return-void + .end method + + .method public static synthetic track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V + .locals 0 + +- and-int/lit8 p3, p3, 0x2 +- +- if-eqz p3, :cond_0 +- +- const/4 p2, 0x0 +- +- .line 1 +- :cond_0 +- invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V +- + return-void + .end method + +--- 506,517 ---- +*************** +*** 703,943 **** + .end method + + .method public final track(Lcom/discord/api/science/AnalyticsSchema;)V +! .locals 1 +! +! const-string v0, "analyticsSchema" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 7 +! new-instance v0, Lcom/discord/api/science/Science$Event$SchemaObject; +! +! invoke-direct {v0, p1}, Lcom/discord/api/science/Science$Event$SchemaObject;->(Lcom/discord/api/science/AnalyticsSchema;)V +! +! invoke-virtual {p0, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lcom/discord/api/science/Science$Event;)V + + return-void + .end method + + .method public final track(Lcom/discord/api/science/Science$Event;)V +! .locals 12 +! +! const-string v0, "event" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 8 +! iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue; +! +! invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z +! +! .line 9 +! sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; +! +! const-wide/16 v0, 0x5dc +! +! invoke-static {v0, v1, p1}, Lrx/Observable;->d0(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; +! +! move-result-object v2 +! +! const-string p1, "Observable\n .ti\u20260, TimeUnit.MILLISECONDS)" +! +! invoke-static {v2, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 10 +! const-class v3, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker; +! +! new-instance v9, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1; +! +! invoke-direct {v9, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;->(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V +! +! const/4 v4, 0x0 +! +! const/4 v5, 0x0 +! +! const/4 v6, 0x0 +! +! const/4 v7, 0x0 +! +! const/4 v8, 0x0 +! +! const/16 v10, 0x3e +! +! const/4 v11, 0x0 +! +! invoke-static/range {v2 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V +! + return-void + .end method + + .method public final track(Ljava/lang/String;Ljava/util/Map;)V +! .locals 1 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/lang/String;", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;)V" +! } +! .end annotation +! +! const-string v0, "event" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 6 +! new-instance v0, Lcom/discord/api/science/Science$Event$MapObject; +! +! if-eqz p2, :cond_0 +! +! goto :goto_0 +! +! :cond_0 +! invoke-static {}, Ld0/t/h0;->emptyMap()Ljava/util/Map; +! +! move-result-object p2 +! +! :goto_0 +! invoke-direct {v0, p1, p2}, Lcom/discord/api/science/Science$Event$MapObject;->(Ljava/lang/String;Ljava/util/Map;)V +! +! invoke-virtual {p0, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lcom/discord/api/science/Science$Event;)V +! + return-void + .end method + + .method public final track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V +! .locals 2 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Lkotlin/Pair<", +! "Ljava/lang/String;", +! "Ljava/lang/Long;", +! ">;J", +! "Lkotlin/jvm/functions/Function0<", +! "+", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;>;)V" +! } +! .end annotation +! +! const-string/jumbo v0, "throttleKey" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string v0, "lazyPropertyProvider" +! +! invoke-static {p4, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 1 +! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->isEventThrottled(Lkotlin/Pair;)Z +! +! move-result v0 +! +! if-eqz v0, :cond_0 +! +! return-void +! +! .line 2 +! :cond_0 +! invoke-virtual {p1}, Lkotlin/Pair;->component1()Ljava/lang/Object; +! +! move-result-object v0 +! +! check-cast v0, Ljava/lang/String; +! +! .line 3 +! invoke-interface {p4}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object; +! +! move-result-object p4 +! +! check-cast p4, Ljava/util/Map; +! +! invoke-virtual {p0, v0, p4}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V +! +! .line 4 +! iget-object p4, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->clock:Lcom/discord/utilities/time/Clock; +! +! invoke-interface {p4}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J +! +! move-result-wide v0 +! +! .line 5 +! iget-object p4, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsThrottledUntilMillis:Ljava/util/concurrent/ConcurrentHashMap; +! +! add-long/2addr v0, p2 +! +! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object p2 +! +! invoke-interface {p4, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! + return-void + .end method + + .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V +! .locals 8 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/lang/String;", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;)V" +! } +! .end annotation +! +! const-string v0, "event" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string/jumbo v0, "properties" +! +! invoke-static {p2, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 1 +! new-instance v0, Landroid/os/Bundle; +! +! invoke-direct {v0}, Landroid/os/Bundle;->()V +! +! invoke-direct {p0, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->putMap(Landroid/os/Bundle;Ljava/util/Map;)Landroid/os/Bundle; +! +! move-result-object v4 +! +! .line 2 +! sget-object p2, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils; +! +! invoke-static {p2}, Lcom/discord/utilities/analytics/AnalyticsUtils;->access$getFireBaseInstance$p(Lcom/discord/utilities/analytics/AnalyticsUtils;)Lcom/google/firebase/analytics/FirebaseAnalytics; +! +! move-result-object p2 +! +! if-eqz p2, :cond_0 +! +! .line 3 +! iget-object v1, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->b:Lc/i/a/f/h/l/g; +! +! const/4 v2, 0x0 +! +! const/4 v5, 0x0 +! +! const/4 v6, 0x1 +! +! const/4 v7, 0x0 +! +! move-object v3, p1 +! +! .line 4 +! invoke-virtual/range {v1 .. v7}, Lc/i/a/f/h/l/g;->c(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZLjava/lang/Long;)V +! +! :cond_0 + return-void + .end method +--- 584,610 ---- + .end method + + .method public final track(Lcom/discord/api/science/AnalyticsSchema;)V +! .locals 0 + + return-void + .end method + + .method public final track(Lcom/discord/api/science/Science$Event;)V +! .locals 0 + return-void + .end method + + .method public final track(Ljava/lang/String;Ljava/util/Map;)V +! .locals 0 + return-void + .end method + + .method public final track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V +! .locals 0 + return-void + .end method + + .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V +! .locals 0 + return-void + .end method + +diff -crB from/smali/com/adjust/sdk/AdjustInstance.smali to/smali/com/adjust/sdk/AdjustInstance.smali +*** from/smali/com/adjust/sdk/AdjustInstance.smali 2021-08-21 17:20:11.626794200 +0100 +--- to/smali/com/adjust/sdk/AdjustInstance.smali 2021-08-21 17:20:28.335287700 +0100 +*************** +*** 514,541 **** + + .method public isEnabled()Z + .locals 1 +! +! .line 1 +! invoke-direct {p0}, Lcom/adjust/sdk/AdjustInstance;->checkActivityHandler()Z +! +! move-result v0 +! +! if-nez v0, :cond_0 +! +! .line 2 +! invoke-direct {p0}, Lcom/adjust/sdk/AdjustInstance;->isInstanceEnabled()Z +! +! move-result v0 +! +! return v0 +! +! .line 3 +! :cond_0 +! iget-object v0, p0, Lcom/adjust/sdk/AdjustInstance;->activityHandler:Lcom/adjust/sdk/IActivityHandler; +! +! invoke-interface {v0}, Lcom/adjust/sdk/IActivityHandler;->isEnabled()Z +! +! move-result v0 + + return v0 + .end method +--- 514,521 ---- + + .method public isEnabled()Z + .locals 1 +! +! const/4 v0, 0x0 + + return v0 + .end method +*************** +*** 1281,1344 **** + .end method + + .method public trackAdRevenue(Ljava/lang/String;Lorg/json/JSONObject;)V +! .locals 1 +! +! .line 1 +! invoke-direct {p0}, Lcom/adjust/sdk/AdjustInstance;->checkActivityHandler()Z +! +! move-result v0 +! +! if-nez v0, :cond_0 +! +! return-void +! +! .line 2 +! :cond_0 +! iget-object v0, p0, Lcom/adjust/sdk/AdjustInstance;->activityHandler:Lcom/adjust/sdk/IActivityHandler; +! +! invoke-interface {v0, p1, p2}, Lcom/adjust/sdk/IActivityHandler;->trackAdRevenue(Ljava/lang/String;Lorg/json/JSONObject;)V + + return-void + .end method + + .method public trackEvent(Lcom/adjust/sdk/AdjustEvent;)V +! .locals 1 +! +! .line 1 +! invoke-direct {p0}, Lcom/adjust/sdk/AdjustInstance;->checkActivityHandler()Z +! +! move-result v0 +! +! if-nez v0, :cond_0 +! +! return-void +! +! .line 2 +! :cond_0 +! iget-object v0, p0, Lcom/adjust/sdk/AdjustInstance;->activityHandler:Lcom/adjust/sdk/IActivityHandler; +! +! invoke-interface {v0, p1}, Lcom/adjust/sdk/IActivityHandler;->trackEvent(Lcom/adjust/sdk/AdjustEvent;)V + + return-void + .end method + + .method public trackPlayStoreSubscription(Lcom/adjust/sdk/AdjustPlayStoreSubscription;)V +! .locals 1 +! +! .line 1 +! invoke-direct {p0}, Lcom/adjust/sdk/AdjustInstance;->checkActivityHandler()Z +! +! move-result v0 +! +! if-nez v0, :cond_0 +! +! return-void +! +! .line 2 +! :cond_0 +! iget-object v0, p0, Lcom/adjust/sdk/AdjustInstance;->activityHandler:Lcom/adjust/sdk/IActivityHandler; +! +! invoke-interface {v0, p1}, Lcom/adjust/sdk/IActivityHandler;->trackPlayStoreSubscription(Lcom/adjust/sdk/AdjustPlayStoreSubscription;)V + + return-void + .end method +--- 1261,1279 ---- + .end method + + .method public trackAdRevenue(Ljava/lang/String;Lorg/json/JSONObject;)V +! .locals 0 + + return-void + .end method + + .method public trackEvent(Lcom/adjust/sdk/AdjustEvent;)V +! .locals 0 + + return-void + .end method + + .method public trackPlayStoreSubscription(Lcom/adjust/sdk/AdjustPlayStoreSubscription;)V +! .locals 0 + + return-void + .end method +diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali/com/discord/utilities/analytics/AdjustConfig.smali +*** from/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-11-20 16:30:28.163767600 +0000 +--- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-11-20 16:31:00.958556852 +0000 +*************** +*** 12,18 **** + + + # static fields +! .field private static final ADJUST_APP_TOKEN:Ljava/lang/String; = "d8fcx8xdmrr4" + + .field private static final ADJUST_ENVIRONMENT:Ljava/lang/String; + +--- 12,18 ---- + + + # static fields +! .field private static final ADJUST_APP_TOKEN:Ljava/lang/String; = "aaaaaaaaaaaa" + + .field private static final ADJUST_ENVIRONMENT:Ljava/lang/String; + +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-11-20 16:30:28.167767702 +0000 +--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-11-20 16:31:13.916842340 +0000 +*************** +*** 291,357 **** + + aput-object v1, v0, v2 + +- const v1, 0x154a2 +- +- .line 3 +- invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; +- +- move-result-object v1 +- +- const-string v2, "client_build_number" +- +- invoke-static {v2, v1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +- +- move-result-object v1 +- +- const/4 v2, 0x2 +- +- aput-object v1, v0, v2 +- +- const-string v1, "client_version" +- +- const-string v2, "87.2 - Alpha" +- +- .line 4 +- invoke-static {v1, v2}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +- +- move-result-object v1 +- +- const/4 v2, 0x3 +- +- aput-object v1, v0, v2 +- +- .line 5 +- new-instance v1, Ljava/lang/StringBuilder; +- +- invoke-direct {v1}, Ljava/lang/StringBuilder;->()V +- +- sget-object v2, Landroid/os/Build;->MODEL:Ljava/lang/String; +- +- invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +- +- const-string v2, ", " +- +- invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +- +- sget-object v2, Landroid/os/Build;->PRODUCT:Ljava/lang/String; +- +- invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +- +- invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +- +- move-result-object v1 +- +- const-string v2, "device" +- +- invoke-static {v2, v1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +- +- move-result-object v1 +- +- const/4 v2, 0x4 +- +- aput-object v1, v0, v2 +- + const-string/jumbo v1, "os" + + const-string v2, "Android" +--- 291,296 ---- +*************** +*** 361,434 **** + + move-result-object v1 + +! const/4 v2, 0x5 +! +! aput-object v1, v0, v2 +! +! .line 7 +! sget v1, Landroid/os/Build$VERSION;->SDK_INT:I +! +! invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v1 +! +! const-string/jumbo v2, "os_sdk_version" +! +! invoke-static {v2, v1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object v1 +! +! const/4 v2, 0x6 +! +! aput-object v1, v0, v2 +! +! .line 8 +! sget-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String; +! +! const-string/jumbo v2, "os_version" +! +! invoke-static {v2, v1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object v1 +! +! const/4 v2, 0x7 +! +! aput-object v1, v0, v2 +! +! .line 9 +! invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale; +! +! move-result-object v1 +! +! invoke-virtual {v1}, Ljava/util/Locale;->toString()Ljava/lang/String; +! +! move-result-object v2 +! +! const-string v1, "Locale.getDefault().toString()" +! +! invoke-static {v2, v1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string v3, "_" +! +! const-string v4, "-" +! +! const/4 v5, 0x0 +! +! const/4 v6, 0x4 +! +! const/4 v7, 0x0 +! +! invoke-static/range {v2 .. v7}, Ld0/g0/t;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String; +! +! move-result-object v1 +! +! const-string/jumbo v2, "system_locale" +! +! invoke-static {v2, v1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object v1 +! +! const/16 v2, 0x8 + + aput-object v1, v0, v2 + +--- 300,306 ---- + + move-result-object v1 + +! const/4 v2, 0x2 + + aput-object v1, v0, v2 + +*************** +*** 561,1091 **** + .end method + + .method public final setAccessibilityProperties(ZLjava/util/EnumSet;)V +! .locals 4 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(Z", +! "Ljava/util/EnumSet<", +! "Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;", +! ">;)V" +! } +! .end annotation +! +! const-string v0, "features" +! +! invoke-static {p2, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 1 +! invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; +! +! move-result-object p2 +! +! const-wide/16 v0, 0x0 +! +! :goto_0 +! invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v2 +! +! if-eqz v2, :cond_0 +! +! invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v2 +! +! check-cast v2, Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags; +! +! .line 2 +! invoke-virtual {v2}, Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;->getValue()J +! +! move-result-wide v2 +! +! or-long/2addr v0, v2 +! +! goto :goto_0 +! +! :cond_0 +! const/4 p2, 0x2 +! +! new-array p2, p2, [Lkotlin/Pair; +! +! const/4 v2, 0x0 +! +! .line 3 +! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; +! +! move-result-object p1 +! +! const-string v3, "accessibility_support_enabled" +! +! invoke-static {v3, p1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object p1 +! +! aput-object p1, p2, v2 +! +! const/4 p1, 0x1 +! +! .line 4 +! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! const-string v1, "accessibility_features" +! +! invoke-static {v1, v0}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object v0 +! +! aput-object v0, p2, p1 +! +! .line 5 +! invoke-static {p2}, Ld0/t/h0;->mapOf([Lkotlin/Pair;)Ljava/util/Map; +! +! move-result-object p1 +! +! .line 6 +! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V + + return-void + .end method + + .method public final setAdvertiserId(Ljava/lang/String;)V +! .locals 1 +! +! const-string v0, "advertiserId" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string v0, "device_advertiser_id" +! +! .line 1 +! invoke-static {v0, p1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object p1 +! +! invoke-static {p1}, Ld0/t/g0;->mapOf(Lkotlin/Pair;)Ljava/util/Map; +! +! move-result-object p1 +! +! .line 2 +! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V + + return-void + .end method + + .method public final setCampaignProperties(Ljava/lang/String;)V +! .locals 11 +! +! const-string/jumbo v0, "referrerUrl" +! +! invoke-static {p1, v0}, Ld0/z/d/m;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V +! +! const/4 v0, 0x1 +! +! new-array v1, v0, [Lkotlin/Pair; +! +! const-string/jumbo v2, "referrer" +! +! .line 1 +! invoke-static {v2, p1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object v2 +! +! const/4 v3, 0x0 +! +! aput-object v2, v1, v3 +! +! .line 2 +! invoke-static {v1}, Ld0/t/h0;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map; +! +! move-result-object v1 +! +! const-string v2, "&" +! +! .line 3 +! filled-new-array {v2}, [Ljava/lang/String; +! +! move-result-object v5 +! +! const/4 v6, 0x0 +! +! const/4 v7, 0x0 +! +! const/4 v8, 0x6 +! +! const/4 v9, 0x0 +! +! move-object v4, p1 +! +! invoke-static/range {v4 .. v9}, Ld0/g0/w;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZIILjava/lang/Object;)Ljava/util/List; +! +! move-result-object p1 +! +! .line 4 +! new-instance v2, Ljava/util/ArrayList; +! +! const/16 v4, 0xa +! +! invoke-static {p1, v4}, Ld0/t/o;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I +! +! move-result v4 +! +! invoke-direct {v2, v4}, Ljava/util/ArrayList;->(I)V +! +! .line 5 +! invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; +! +! move-result-object p1 +! +! :goto_0 +! invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v4 +! +! if-eqz v4, :cond_0 +! +! invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v4 +! +! .line 6 +! move-object v5, v4 +! +! check-cast v5, Ljava/lang/String; +! +! const-string v4, "=" +! +! .line 7 +! filled-new-array {v4}, [Ljava/lang/String; +! +! move-result-object v6 +! +! const/4 v7, 0x0 +! +! const/4 v8, 0x0 +! +! const/4 v9, 0x6 +! +! const/4 v10, 0x0 +! +! invoke-static/range {v5 .. v10}, Ld0/g0/w;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZIILjava/lang/Object;)Ljava/util/List; +! +! move-result-object v4 +! +! invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z +! +! goto :goto_0 +! +! .line 8 +! :cond_0 +! new-instance p1, Ljava/util/ArrayList; +! +! invoke-direct {p1}, Ljava/util/ArrayList;->()V +! +! .line 9 +! invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; +! +! move-result-object v2 +! +! :cond_1 +! :goto_1 +! invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v4 +! +! if-eqz v4, :cond_3 +! +! invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v4 +! +! move-object v5, v4 +! +! check-cast v5, Ljava/util/List; +! +! .line 10 +! invoke-interface {v5}, Ljava/util/List;->size()I +! +! move-result v5 +! +! const/4 v6, 0x2 +! +! if-ne v5, v6, :cond_2 +! +! const/4 v5, 0x1 +! +! goto :goto_2 +! +! :cond_2 +! const/4 v5, 0x0 +! +! :goto_2 +! if-eqz v5, :cond_1 +! +! invoke-interface {p1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z +! +! goto :goto_1 +! +! .line 11 +! :cond_3 +! new-instance v2, Ljava/util/ArrayList; +! +! invoke-direct {v2}, Ljava/util/ArrayList;->()V +! +! .line 12 +! invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; +! +! move-result-object p1 +! +! :cond_4 +! :goto_3 +! invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v4 +! +! if-eqz v4, :cond_6 +! +! invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v4 +! +! move-object v5, v4 +! +! check-cast v5, Ljava/util/List; +! +! .line 13 +! invoke-interface {v5, v3}, Ljava/util/List;->get(I)Ljava/lang/Object; +! +! move-result-object v5 +! +! check-cast v5, Ljava/lang/String; +! +! invoke-virtual {v5}, Ljava/lang/String;->hashCode()I +! +! move-result v6 +! +! sparse-switch v6, :sswitch_data_0 +! +! goto :goto_5 +! +! :sswitch_0 +! const-string/jumbo v6, "utm_source" +! +! .line 14 +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_1 +! const-string v6, "location" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_2 +! const-string/jumbo v6, "utm_medium" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_3 +! const-string/jumbo v6, "search_engine" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_4 +! const-string/jumbo v6, "mp_keyword" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_5 +! const-string/jumbo v6, "utm_term" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_6 +! const-string/jumbo v6, "utm_campaign" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_7 +! const-string/jumbo v6, "referring_domain" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! goto :goto_4 +! +! :sswitch_8 +! const-string/jumbo v6, "utm_content" +! +! invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v5 +! +! if-eqz v5, :cond_5 +! +! :goto_4 +! const/4 v5, 0x1 +! +! goto :goto_6 +! +! :cond_5 +! :goto_5 +! const/4 v5, 0x0 +! +! :goto_6 +! if-eqz v5, :cond_4 +! +! .line 15 +! invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z +! +! goto :goto_3 +! +! .line 16 +! :cond_6 +! invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; +! +! move-result-object p1 +! +! :goto_7 +! invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v2 +! +! if-eqz v2, :cond_7 +! +! invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v2 +! +! .line 17 +! check-cast v2, Ljava/util/List; +! +! .line 18 +! invoke-interface {v2, v3}, Ljava/util/List;->get(I)Ljava/lang/Object; +! +! move-result-object v4 +! +! check-cast v4, Ljava/lang/String; +! +! invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object; +! +! move-result-object v2 +! +! check-cast v2, Ljava/lang/String; +! +! invoke-interface {v1, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! +! goto :goto_7 +! +! .line 19 +! :cond_7 +! invoke-direct {p0, v1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V + + return-void +- +- nop +- +- :sswitch_data_0 +- .sparse-switch +- -0x5bc8ed18 -> :sswitch_8 +- -0x40f32acd -> :sswitch_7 +- -0x3db0f7f -> :sswitch_6 +- 0x31ad945d -> :sswitch_5 +- 0x3d3a7f4d -> :sswitch_4 +- 0x3f4764b9 -> :sswitch_3 +- 0x70a1a726 -> :sswitch_2 +- 0x714f9fb5 -> :sswitch_1 +- 0x7b737fcc -> :sswitch_0 +- .end sparse-switch + .end method + + .method public final setClientPerformanceProperties(IJ)V +! .locals 2 +! +! const/4 v0, 0x2 +! +! new-array v0, v0, [Lkotlin/Pair; +! +! .line 1 +! invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object p1 +! +! const-string v1, "client_performance_cpu" +! +! invoke-static {v1, p1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object p1 +! +! const/4 v1, 0x0 +! +! aput-object p1, v0, v1 +! +! .line 2 +! invoke-static {p2, p3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; +! +! move-result-object p1 +! +! const-string p2, "client_performance_memory" +! +! invoke-static {p2, p1}, Ld0/o;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; +! +! move-result-object p1 +! +! const/4 p2, 0x1 +! +! aput-object p1, v0, p2 +! +! .line 3 +! invoke-static {v0}, Ld0/t/h0;->mapOf([Lkotlin/Pair;)Ljava/util/Map; +! +! move-result-object p1 +! +! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V + + return-void + .end method +--- 433,457 ---- + .end method + + .method public final setAccessibilityProperties(ZLjava/util/EnumSet;)V +! .locals 0 + + return-void + .end method + + .method public final setAdvertiserId(Ljava/lang/String;)V +! .locals 0 + + return-void + .end method + + .method public final setCampaignProperties(Ljava/lang/String;)V +! .locals 0 + + return-void + .end method + + .method public final setClientPerformanceProperties(IJ)V +! .locals 0 + + return-void + .end method + +diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali +*** from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-11-20 16:30:28.229769289 +0000 +--- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-11-20 16:31:00.958556852 +0000 +*************** +*** 68,74 **** + + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + +! const-string v2, "https://app.adjust.com/ndjczk?campaign=" + + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +--- 68,74 ---- + + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + +! const-string v2, "https://play.google.com/store/apps/details?id=com.spotify.music&trash=" + + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + diff --git a/resources/xmlpatches/notrack/87202.xml b/resources/xmlpatches/notrack/87202.xml new file mode 100644 index 0000000..4359270 --- /dev/null +++ b/resources/xmlpatches/notrack/87202.xml @@ -0,0 +1,5 @@ + + + 00000000-0000-0000-0000-000000000000 + + From 015c90eb702f5f466071d653128181b844cb2142 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sat, 21 Aug 2021 18:12:42 +0100 Subject: [PATCH 08/27] cmd cleanup --- .../com/cutthecord/commands/commands/CmdCtc.java | 13 ------------- .../cutthecord/commands/commands/CmdSpoilerImg.java | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java index 24066b3..64ddbc5 100644 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java @@ -23,19 +23,6 @@ public class CmdCtc { m.invoke(StoreStream.getUserSettings(), enabled); } catch (Exception e) { System.out.println("Failed to call StoreStream.getUserSettings().setLeakChannels"); - - System.out.println("Declared"); - for (Method m : StoreStream.getUserSettings().getClass().getDeclaredMethods()) { - System.out.println(m.getName()+" "+ m.toString()); - } - - System.out.println(); - System.out.println("Methods"); - for (Method m : StoreStream.getUserSettings().getClass().getMethods()) { - System.out.println(m.getName()+" "+ m.toString()); - } - - e.printStackTrace(); return "Failed to call StoreStream.getUserSettings().setLeakChannels"; } return "CTC: Successfully set channelleak state."; // TODO use notification diff --git a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java index f01e617..2a5ef6e 100644 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java +++ b/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java @@ -13,7 +13,7 @@ public class CmdSpoilerImg implements RawMsgHandler { try { // Added by Supplemental patch //noinspection JavaReflectionMemberAccess - final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setImageSpoiler", Boolean.class); + final Method m = StoreStream.getUserSettings().getClass().getDeclaredMethod("setImageSpoiler", boolean.class); m.invoke(StoreStream.getUserSettings(), true); } catch (Exception e) { System.out.println("Failed to call StoreStream.getUserSettings().setImageSpoiler(true)"); From e1e88773ec296fa0a50864b33a71eee029df8bb5 Mon Sep 17 00:00:00 2001 From: clienthax Date: Sat, 21 Aug 2021 18:12:56 +0100 Subject: [PATCH 09/27] notrack fixup --- resources/patches/notrack/87202.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/patches/notrack/87202.patch b/resources/patches/notrack/87202.patch index 6c91bed..9e0a738 100644 --- a/resources/patches/notrack/87202.patch +++ b/resources/patches/notrack/87202.patch @@ -588,6 +588,23 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali 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-11-20 16:30:28.167767702 +0000 --- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-11-20 16:31:13.916842340 +0000 +*************** +*** 261,267 **** + .method private final setBaselineProperties()V + .locals 8 + +! const/16 v0, 0x9 + + new-array v0, v0, [Lkotlin/Pair; + +--- 261,267 ---- + .method private final setBaselineProperties()V + .locals 8 + +! const/16 v0, 0x3 + + new-array v0, v0, [Lkotlin/Pair; + *************** *** 291,357 **** From 4199ef9d223d8efd9a63a09c89d5bd3af659300e Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 18:37:50 +0300 Subject: [PATCH 10/27] Fix permissions on files --- .gitignore | 3 +++ resources/patches/slashcommands/code/gradlew | 0 resources/scripts/ctcci/ctcci.py | 0 3 files changed, 3 insertions(+) mode change 100644 => 100755 resources/patches/slashcommands/code/gradlew mode change 100644 => 100755 resources/scripts/ctcci/ctcci.py diff --git a/.gitignore b/.gitignore index e2b49e0..b758151 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ patches/*/*-custom.patch patches/*/*.patch-failed +resources/distok/versionlogs/* +!resources/distok/versionlogs/.gitkeep +*.apk diff --git a/resources/patches/slashcommands/code/gradlew b/resources/patches/slashcommands/code/gradlew old mode 100644 new mode 100755 diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py old mode 100644 new mode 100755 From d3c51e2beff06127832081eb66953cc2acc6a912 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 18:38:17 +0300 Subject: [PATCH 11/27] Fix images defaulting to spoilered state + not getting out --- .gitignore | 1 + resources/patches/supplemental/87202.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b758151..e1cb701 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ patches/*/*-custom.patch patches/*/*.patch-failed resources/distok/versionlogs/* !resources/distok/versionlogs/.gitkeep +resources/fdroid/repo/icons/*.xml *.apk diff --git a/resources/patches/supplemental/87202.patch b/resources/patches/supplemental/87202.patch index 9a4e77e..b8d912e 100644 --- a/resources/patches/supplemental/87202.patch +++ b/resources/patches/supplemental/87202.patch @@ -83,7 +83,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS" + -+ const/4 v2, 0x1 ++ const/4 v2, 0x0 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -124,7 +124,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER" + -+ const/4 v2, 0x1 ++ const/4 v2, 0x0 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -165,7 +165,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis + + const-string v1, "CACHE_KEY_CTC_NO_DELETE" + -+ const/4 v2, 0x1 ++ const/4 v2, 0x0 + + invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + @@ -385,10 +385,10 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s + + 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 ++ # this only works for a single image ++ const/4 v1, 0x0 + -+ # invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V ++ invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V + + :cond_1 + return-object p0 From f1e838250545d751912ecb8f4ed8cf047573d3fc Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 18:57:56 +0300 Subject: [PATCH 12/27] ctcconfig: Use better defaults --- .gitignore | 1 + resources/scripts/ctcci/ctcconfig.example.py | 26 ++++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index e1cb701..4dbd9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ patches/*/*.patch-failed resources/distok/versionlogs/* !resources/distok/versionlogs/.gitkeep resources/fdroid/repo/icons/*.xml +resources/fonts/*.ttf *.apk diff --git a/resources/scripts/ctcci/ctcconfig.example.py b/resources/scripts/ctcci/ctcconfig.example.py index ff8f65a..095f888 100644 --- a/resources/scripts/ctcci/ctcconfig.example.py +++ b/resources/scripts/ctcci/ctcconfig.example.py @@ -1,6 +1,7 @@ import os -APKTOOL_BIN = "java -jar /opt/ctc/tools/apktool.jar" # use latest +APKTOOL_BIN = "java -jar /opt/ctc/tools/apktool.jar" +DEX2JAR_BIN = "java -jar /opt/ctc/tools/dex2jar.jar" # APKs must be placed under $DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk # Example: /home/ave/distok/android/com.discord-909.apk @@ -15,14 +16,14 @@ FDROID_FOLDER = "/opt/ctc/gitrepo/resources/fdroid" RESULT_FOLDER = FDROID_FOLDER + "/repo" # Repo for CutTheCord (https://gitdab.com/distok/cutthecord) -DO_GITPULL = True +DO_GITPULL = False REPO_FOLDER = "/opt/ctc/gitrepo" # If false, jarsigner will be used for signing the apk. DO_APKSIGNER = True # Keystore file, alias and pass. Required. -KEYSTORE_FILE = "/opt/ctc/gitrepo/resources/keystore.jks" +KEYSTORE_FILE = "/opt/ctc/keystores/keystore.jks" KEYSTORE_ALIAS = "test" KEYSTORE_PASS = "password" @@ -42,8 +43,7 @@ PACKAGE_ID = "com.discord" FORCE = False # Custom ringtones, default = applied to all the ones not explicitly stated -RINGTONES = {"ave": "/opt/ctc/gitrepo/resources/ringtones/sans.mp3", - "default": "/opt/ctc/gitrepo/resources/ringtones/removeskype.mp3"} +RINGTONES = {"default": "/opt/ctc/gitrepo/resources/ringtones/removeskype.mp3"} # Custom icons, default = applied to all the ones not explicitly stated ICONS = {"ave": "/opt/ctc/gitrepo/resources/icons/ctclogoave.png", @@ -63,17 +63,11 @@ APP_NAMES = {"ave": "CutTheCord__Ave", "default": "CutTheCord"} # Custom fonts, default = applied to all the ones not explicitly stated -FONTS = {"ellie": {"whitney_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/GoogleSans-Bold.ttf", - "whitney_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/GoogleSans-Medium.ttf", - "whitney_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/GoogleSans-Regular.ttf"}, - "dyslexic": {"whitney_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/OpenDyslexic3-Bold.ttf", - "whitney_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/OpenDyslexic3-Bold.ttf", - "whitney_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/OpenDyslexic3-Regular.ttf"}, - "murm": {"whitney_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/comicbd.ttf", - "whitney_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/comicbd.ttf", - "whitney_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/comic.ttf"}, - "ave": {"sourcecodepro_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/comic.ttf"}, - "default": {}} +FONTS = {"ave": {"sourcecodepro_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/comic.ttf", + "ginto_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/whitney_bold.ttf", + "ginto_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/whitney_semibold.ttf", + "ginto_regular.ttf": "/opt/ctc/gitrepo/resources/fonts/whitney_medium.ttf"}, + "default": {}} # Amount of last builds cleanartifacts.py should keep CLEAN_ARTIFACT_KEEP_COUNT = 2 From 78d5dea64979c17a132dbe8efe2ddb5540606c83 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 19:17:25 +0300 Subject: [PATCH 13/27] Create an "others" icon folder --- .gitignore | 2 ++ resources/icons/others/.gitkeep | 0 2 files changed, 2 insertions(+) create mode 100644 resources/icons/others/.gitkeep diff --git a/.gitignore b/.gitignore index 4dbd9d3..dab8175 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ resources/distok/versionlogs/* !resources/distok/versionlogs/.gitkeep resources/fdroid/repo/icons/*.xml resources/fonts/*.ttf +resources/icons/others/* +!resources/icons/others/.gitkeep *.apk diff --git a/resources/icons/others/.gitkeep b/resources/icons/others/.gitkeep new file mode 100644 index 0000000..e69de29 From de992e86ea59b2ed57b21b1fa633131ea18b2836 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 19:25:32 +0300 Subject: [PATCH 14/27] Stricter gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index dab8175..e3cd4bf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ resources/distok/versionlogs/* !resources/distok/versionlogs/.gitkeep resources/fdroid/repo/icons/*.xml resources/fonts/*.ttf +resources/fonts/*.otf resources/icons/others/* !resources/icons/others/.gitkeep +resources/ringtones/* +!resources/ringtones/.gitkeep *.apk From 2786de6c73f9f16f24f0690c979a80d11d53d340 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 19:26:57 +0300 Subject: [PATCH 15/27] Add a keystores folder --- .gitignore | 2 ++ resources/keystores/.gitkeep | 0 2 files changed, 2 insertions(+) create mode 100644 resources/keystores/.gitkeep diff --git a/.gitignore b/.gitignore index e3cd4bf..8845bb8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ resources/icons/others/* !resources/icons/others/.gitkeep resources/ringtones/* !resources/ringtones/.gitkeep +resources/keystores/* +!resources/keystores/.gitkeep *.apk diff --git a/resources/keystores/.gitkeep b/resources/keystores/.gitkeep new file mode 100644 index 0000000..e69de29 From b6f80bbee0241a20d790cc406b573943d4ec50e8 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 19:41:58 +0300 Subject: [PATCH 16/27] ctcci: Get xmlpatch command from config --- resources/scripts/ctcci/ctcci.py | 2 +- resources/scripts/ctcci/ctcconfig.example.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py index 124d2ae..6feb7ae 100755 --- a/resources/scripts/ctcci/ctcci.py +++ b/resources/scripts/ctcci/ctcci.py @@ -21,7 +21,7 @@ def xmlpatch(patch_file, workdir, patch_name=""): print(f"Applying {patch_file}") - subprocess.run(f"java -cp /opt/ctc/tools/xml-patch.jar com.github.dnault.xmlpatch.BatchPatcher --patch {patch_file} --srcdir {workdir}", + subprocess.run(f"{XML_PATCH_BIN} com.github.dnault.xmlpatch.BatchPatcher --patch {patch_file} --srcdir {workdir}", shell=True, check=True, cwd=workdir) def patch(patch_file, workdir, patch_name=""): diff --git a/resources/scripts/ctcci/ctcconfig.example.py b/resources/scripts/ctcci/ctcconfig.example.py index 095f888..45be563 100644 --- a/resources/scripts/ctcci/ctcconfig.example.py +++ b/resources/scripts/ctcci/ctcconfig.example.py @@ -2,6 +2,7 @@ import os APKTOOL_BIN = "java -jar /opt/ctc/tools/apktool.jar" DEX2JAR_BIN = "java -jar /opt/ctc/tools/dex2jar.jar" +XML_PATCH_BIN = "java -cp /opt/ctc/tools/xml-patch.jar" # APKs must be placed under $DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk # Example: /home/ave/distok/android/com.discord-909.apk From d139344274cf342df77985bdba99b3f81900e34e Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 20:04:01 +0300 Subject: [PATCH 17/27] Remove hardcode'd docker paths --- resources/patches/slashcommands/87202-pre.sh | 22 +++++++++++++++++--- resources/scripts/ctcci/ctcci.py | 3 +-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/resources/patches/slashcommands/87202-pre.sh b/resources/patches/slashcommands/87202-pre.sh index f6500a0..0f4edf6 100644 --- a/resources/patches/slashcommands/87202-pre.sh +++ b/resources/patches/slashcommands/87202-pre.sh @@ -1,10 +1,26 @@ #!/bin/bash -cd /opt/ctc/gitrepo/resources/patches/slashcommands/code +if [ -z "$DISTOK_FOLDER" ] +then + cd /opt/ctc/gitrepo/resources/patches/slashcommands/code +else + cd "$DISTOK_FOLDER/resources/patches/slashcommands/code" +fi + +if [ -z "$DISTOK_APKTOOL_COMMAND" ] +then + DISTOK_APKTOOL_COMMAND="java -jar /opt/ctc/tools/apktool.jar" +fi + +if [ -z "$DISTOK_DX_COMMAND" ] +then + DISTOK_DX_COMMAND="/lib/android-sdk/build-tools/debian/dx" +fi + chmod +x gradlew rm -rf build ./gradlew build cd build/libs -/lib/android-sdk/build-tools/debian/dx --dex --output ctccommands.apk ctccommands-1.0-SNAPSHOT.jar -java -jar /opt/ctc/tools/apktool.jar d ctccommands.apk +$DISTOK_DX_COMMAND --dex --output ctccommands.apk ctccommands-1.0-SNAPSHOT.jar +$DISTOK_APKTOOL_COMMAND d ctccommands.apk cp -r ctccommands/smali/* ${DISTOK_EXTRACTED_DISCORD_PATH}/smali/ \ No newline at end of file diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py index 6feb7ae..0e0b59f 100755 --- a/resources/scripts/ctcci/ctcci.py +++ b/resources/scripts/ctcci/ctcci.py @@ -48,7 +48,7 @@ with open(os.path.join(REPO_FOLDER, "resources/patchport-state.json")) as f: VERSION = STATE["versioncode"] BASE_APK_PATH = os.path.join(WORK_FOLDER, f"discord-base-{VERSION}") -BASE_JAR_PATH = os.path.join(WORK_FOLDER, f"discord-base-jar") +BASE_JAR_PATH = os.path.join(WORK_FOLDER, f"discord-base-{VERSION}-jar") # Wipe and recreate the base jar folder if os.path.exists(BASE_JAR_PATH): shutil.rmtree(BASE_JAR_PATH) @@ -88,7 +88,6 @@ if not os.path.exists(BASE_JAR_PATH): subprocess.run(f"unzip -j {INPUT_FILE} *.dex -d {BASE_JAR_PATH}", shell=True, cwd=WORK_FOLDER) subprocess.run(f"{DEX2JAR_BIN} *.dex", shell=True, cwd=BASE_JAR_PATH) subprocess.run(f"zipmerge discord-base.jar classes*dex2jar.jar", shell=True, cwd=BASE_JAR_PATH) - subprocess.run(f"rm classes*dex2jar.jar *.dex", shell=True, cwd=BASE_JAR_PATH) # Copy the base cache to work on it shutil.copytree(BASE_APK_PATH, WORK_APK_PATH) From c4fd0be0298c1492a16c70c164e455083d8437c7 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 20:16:55 +0300 Subject: [PATCH 18/27] Fix gradle builds whoops, broke it with d139344274cf342df77985bdba99b3f81900e34e --- resources/patches/slashcommands/code/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/patches/slashcommands/code/build.gradle b/resources/patches/slashcommands/code/build.gradle index 28a7cbc..59a0f8e 100644 --- a/resources/patches/slashcommands/code/build.gradle +++ b/resources/patches/slashcommands/code/build.gradle @@ -20,7 +20,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - implementation files('/tmp/cutthecord/discord-base-jar/discord-base.jar', 'libs/discord87202.jar') + implementation files('/tmp/cutthecord/discord-base-87202-jar/discord-base.jar', 'libs/discord87202.jar') } test { From 0754700d5124f61d1d7f52786ec69285d92f99d4 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 21:49:40 +0300 Subject: [PATCH 19/27] 87202 customtheme: black background pls --- resources/xmlpatches/customtheme/87202.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/xmlpatches/customtheme/87202.xml b/resources/xmlpatches/customtheme/87202.xml index 34ead93..ac1f098 100644 --- a/resources/xmlpatches/customtheme/87202.xml +++ b/resources/xmlpatches/customtheme/87202.xml @@ -36,6 +36,7 @@ #990f0f0f #ff000000 #ff000000 + #ff000000 #ff000000 #e6000000 From 166d763792063d4f6e0571b474b05156b056b67d Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 22:04:35 +0300 Subject: [PATCH 20/27] 87202 customtheme: Use CTC logo for splash --- .../customtheme/asset_loading_zhu_white.png | Bin 11769 -> 15305 bytes resources/patches/customtheme/fixsplash.sh | 2 +- resources/xmlpatches/customtheme/87202.xml | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/patches/customtheme/asset_loading_zhu_white.png b/resources/patches/customtheme/asset_loading_zhu_white.png index 1c1e5a10721921730e19f2cb1ea2b34ccf9de6e8..a0d16f24647589de42b008c2d94922fc12a2fd2d 100644 GIT binary patch literal 15305 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 F_#dyQkz)V= literal 11769 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 AWB>pF diff --git a/resources/patches/customtheme/fixsplash.sh b/resources/patches/customtheme/fixsplash.sh index b1a9574..a7ab3f9 100644 --- a/resources/patches/customtheme/fixsplash.sh +++ b/resources/patches/customtheme/fixsplash.sh @@ -1,2 +1,2 @@ #!/bin/bash -\cp "$1" res/drawable-xxxhdpi/img_loading_logo.png +\cp "$1" res/drawable-xxxhdpi/img_logo.png diff --git a/resources/xmlpatches/customtheme/87202.xml b/resources/xmlpatches/customtheme/87202.xml index ac1f098..90de9ff 100644 --- a/resources/xmlpatches/customtheme/87202.xml +++ b/resources/xmlpatches/customtheme/87202.xml @@ -39,6 +39,10 @@ #ff000000 #ff000000 #e6000000 + #ff9c4249 + #ff9c4249 + #1a5865f2 + #335865f2 From 91c37ab9d030a7882ca906747e8f80eea7bf5291 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 22:19:39 +0300 Subject: [PATCH 21/27] 87202 nocamerabutton: Don't show the fucking expand button --- resources/patches/nocamerabutton/87202.patch | 42 +++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/resources/patches/nocamerabutton/87202.patch b/resources/patches/nocamerabutton/87202.patch index 49d6d8e..fb56644 100644 --- a/resources/patches/nocamerabutton/87202.patch +++ b/resources/patches/nocamerabutton/87202.patch @@ -1,8 +1,23 @@ -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 +diff --color -crB com.discord-87202-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali com.discord-87202/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali +*** com.discord-87202-base/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali 2021-08-22 22:08:14.202391194 +0300 +--- com.discord-87202/smali_classes3/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali 2021-08-22 22:14:01.302308963 +0300 +*************** +*** 183,189 **** + + if-nez v4, :cond_5 + +! const/4 v9, 0x0 + + goto :goto_0 + +--- 183,189 ---- + + if-nez v4, :cond_5 + +! const/16 v9, 0x8 + + goto :goto_0 + *************** *** 206,212 **** @@ -20,3 +35,20 @@ diff -crB com.discord-base/smali_classes3/com/lytefast/flexinput/fragment/FlexIn goto :goto_1 +*************** +*** 234,240 **** + goto :goto_2 + + :cond_7 +! const/16 v4, 0x8 + + :goto_2 + invoke-virtual {v5, v4}, Landroid/widget/ImageButton;->setVisibility(I)V +--- 234,240 ---- + goto :goto_2 + + :cond_7 +! const/16 v4, 0x0 + + :goto_2 + invoke-virtual {v5, v4}, Landroid/widget/ImageButton;->setVisibility(I)V From f58c28410df9bcc6f17d016485fd1dc18d300d62 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 22:34:47 +0300 Subject: [PATCH 22/27] customtheme 87202: Fix logo bg color, drop bg field from ctcconfig --- .../patches/branding/customdynamicicon.sh | 4 ---- resources/scripts/ctcci/ctcci.py | 4 ---- resources/scripts/ctcci/ctcconfig.example.py | 6 ++--- resources/xmlpatches/customtheme/87202.xml | 23 +++++++++++++++++++ 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/resources/patches/branding/customdynamicicon.sh b/resources/patches/branding/customdynamicicon.sh index 750bb67..0bc68a7 100644 --- a/resources/patches/branding/customdynamicicon.sh +++ b/resources/patches/branding/customdynamicicon.sh @@ -1,7 +1,3 @@ -\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-hdpi/ic_launcher_background.png -\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-xhdpi/ic_launcher_background.png -\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-xxhdpi/ic_launcher_background.png - \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-hdpi/ic_launcher_foreground.png \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-xhdpi/ic_launcher_foreground.png \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py index 0e0b59f..b17add8 100755 --- a/resources/scripts/ctcci/ctcci.py +++ b/resources/scripts/ctcci/ctcci.py @@ -140,13 +140,9 @@ for patch_name in PATCHES: os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "logo_debug.png")) if BRANCH in DYN_ICONS: - shutil.copyfile(DYN_ICONS[BRANCH]["bg"], - os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_background.png")) shutil.copyfile(DYN_ICONS[BRANCH]["fg"], os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png")) elif "default" in ICONS: - shutil.copyfile(DYN_ICONS["default"]["bg"], - os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_background.png")) shutil.copyfile(DYN_ICONS["default"]["fg"], os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png")) diff --git a/resources/scripts/ctcci/ctcconfig.example.py b/resources/scripts/ctcci/ctcconfig.example.py index 45be563..6ad82bb 100644 --- a/resources/scripts/ctcci/ctcconfig.example.py +++ b/resources/scripts/ctcci/ctcconfig.example.py @@ -51,10 +51,8 @@ ICONS = {"ave": "/opt/ctc/gitrepo/resources/icons/ctclogoave.png", "default": "/opt/ctc/gitrepo/resources/icons/ctclogo.png"} # Custom dynamic icons, default = applied to all the ones not explicitly stated -DYN_ICONS = {"ave": {"bg": "/opt/ctc/gitrepo/resources/icons/bg.png", - "fg": "/opt/ctc/gitrepo/resources/icons/fg.png"}, - "default": {"bg": "/opt/ctc/gitrepo/resources/icons/dcbg.png", - "fg": "/opt/ctc/gitrepo/resources/icons/dcfg.png"}} +DYN_ICONS = {"ave": {"fg": "/opt/ctc/gitrepo/resources/icons/fg.png"}, + "default": {"fg": "/opt/ctc/gitrepo/resources/icons/dcfg.png"}} # Custom app names, default = applied to all the ones not explicitly stated # Needs to be one word, __ gets replaced with space diff --git a/resources/xmlpatches/customtheme/87202.xml b/resources/xmlpatches/customtheme/87202.xml index 90de9ff..a4a7e40 100644 --- a/resources/xmlpatches/customtheme/87202.xml +++ b/resources/xmlpatches/customtheme/87202.xml @@ -45,4 +45,27 @@ #335865f2 + + @color/primary_500 + + + + @color/primary_500 + + + + @color/primary_500 + + + + @color/primary_500 + + + + @color/primary_500 + + + + @color/primary_500 + From 7e4c49becc364a7e6cb7585d368ad1b3c8dd6b53 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 22:42:41 +0300 Subject: [PATCH 23/27] customtheme 87202: red pings --- resources/xmlpatches/customtheme/87202.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/xmlpatches/customtheme/87202.xml b/resources/xmlpatches/customtheme/87202.xml index a4a7e40..fef3faf 100644 --- a/resources/xmlpatches/customtheme/87202.xml +++ b/resources/xmlpatches/customtheme/87202.xml @@ -45,6 +45,13 @@ #335865f2 + + #1a9c4249 + #149c4249 + #4d9c4249 + #1a9c4249 + + @color/primary_500 From b7aa5694359b8cff55dd9c10b06533ac0e8cf6e5 Mon Sep 17 00:00:00 2001 From: ave Date: Mon, 23 Aug 2021 00:01:16 +0300 Subject: [PATCH 24/27] README: Update readme --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fc55aca..12561b1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ Modular Client Mod for Discord's Android app. -**THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!** +**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!** + +Current state is good enough™ for an RC release, and there's currently RC releases in the repo. Update away! For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord @@ -10,7 +12,7 @@ For status updates and support on the project, join #cutthecord on https://liber New patch development will be done for the latest supported version. -![A CutTheCord screenshot](https://elixi.re/t/mh3eirsy9.png) +![A CutTheCord screenshot](https://elixi.re/i/16z287iw.png) Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)! From de8cfb9a1044aa41af01bcc4070f240090913b89 Mon Sep 17 00:00:00 2001 From: ave Date: Mon, 23 Aug 2021 00:03:15 +0300 Subject: [PATCH 25/27] readme: Make the screenshot smaller --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12561b1..bd82bc6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ For status updates and support on the project, join #cutthecord on https://liber New patch development will be done for the latest supported version. -![A CutTheCord screenshot](https://elixi.re/i/16z287iw.png) +![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png) Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)! From a8c17e20328571bb1645eac5d458a71e8799e63a Mon Sep 17 00:00:00 2001 From: ave Date: Tue, 24 Aug 2021 21:47:57 +0300 Subject: [PATCH 26/27] betterrotation: Restore from old-patches --- resources/{old-patches => patches}/betterrotation/1340.patch | 0 resources/{old-patches => patches}/betterrotation/1355.patch | 0 resources/{old-patches => patches}/betterrotation/1356.patch | 0 resources/{old-patches => patches}/betterrotation/1358.patch | 0 resources/{old-patches => patches}/betterrotation/1361.patch | 0 resources/{old-patches => patches}/betterrotation/1362.patch | 0 resources/{old-patches => patches}/betterrotation/1365.patch | 0 resources/{old-patches => patches}/betterrotation/1367.patch | 0 resources/{old-patches => patches}/betterrotation/1368.patch | 0 resources/{old-patches => patches}/betterrotation/1370.patch | 0 resources/{old-patches => patches}/betterrotation/1371.patch | 0 resources/{old-patches => patches}/betterrotation/78204.patch | 0 resources/{old-patches => patches}/betterrotation/87202.patch | 0 resources/{old-patches => patches}/betterrotation/README.md | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename resources/{old-patches => patches}/betterrotation/1340.patch (100%) rename resources/{old-patches => patches}/betterrotation/1355.patch (100%) rename resources/{old-patches => patches}/betterrotation/1356.patch (100%) rename resources/{old-patches => patches}/betterrotation/1358.patch (100%) rename resources/{old-patches => patches}/betterrotation/1361.patch (100%) rename resources/{old-patches => patches}/betterrotation/1362.patch (100%) rename resources/{old-patches => patches}/betterrotation/1365.patch (100%) rename resources/{old-patches => patches}/betterrotation/1367.patch (100%) rename resources/{old-patches => patches}/betterrotation/1368.patch (100%) rename resources/{old-patches => patches}/betterrotation/1370.patch (100%) rename resources/{old-patches => patches}/betterrotation/1371.patch (100%) rename resources/{old-patches => patches}/betterrotation/78204.patch (100%) rename resources/{old-patches => patches}/betterrotation/87202.patch (100%) rename resources/{old-patches => patches}/betterrotation/README.md (100%) diff --git a/resources/old-patches/betterrotation/1340.patch b/resources/patches/betterrotation/1340.patch similarity index 100% rename from resources/old-patches/betterrotation/1340.patch rename to resources/patches/betterrotation/1340.patch diff --git a/resources/old-patches/betterrotation/1355.patch b/resources/patches/betterrotation/1355.patch similarity index 100% rename from resources/old-patches/betterrotation/1355.patch rename to resources/patches/betterrotation/1355.patch diff --git a/resources/old-patches/betterrotation/1356.patch b/resources/patches/betterrotation/1356.patch similarity index 100% rename from resources/old-patches/betterrotation/1356.patch rename to resources/patches/betterrotation/1356.patch diff --git a/resources/old-patches/betterrotation/1358.patch b/resources/patches/betterrotation/1358.patch similarity index 100% rename from resources/old-patches/betterrotation/1358.patch rename to resources/patches/betterrotation/1358.patch diff --git a/resources/old-patches/betterrotation/1361.patch b/resources/patches/betterrotation/1361.patch similarity index 100% rename from resources/old-patches/betterrotation/1361.patch rename to resources/patches/betterrotation/1361.patch diff --git a/resources/old-patches/betterrotation/1362.patch b/resources/patches/betterrotation/1362.patch similarity index 100% rename from resources/old-patches/betterrotation/1362.patch rename to resources/patches/betterrotation/1362.patch diff --git a/resources/old-patches/betterrotation/1365.patch b/resources/patches/betterrotation/1365.patch similarity index 100% rename from resources/old-patches/betterrotation/1365.patch rename to resources/patches/betterrotation/1365.patch diff --git a/resources/old-patches/betterrotation/1367.patch b/resources/patches/betterrotation/1367.patch similarity index 100% rename from resources/old-patches/betterrotation/1367.patch rename to resources/patches/betterrotation/1367.patch diff --git a/resources/old-patches/betterrotation/1368.patch b/resources/patches/betterrotation/1368.patch similarity index 100% rename from resources/old-patches/betterrotation/1368.patch rename to resources/patches/betterrotation/1368.patch diff --git a/resources/old-patches/betterrotation/1370.patch b/resources/patches/betterrotation/1370.patch similarity index 100% rename from resources/old-patches/betterrotation/1370.patch rename to resources/patches/betterrotation/1370.patch diff --git a/resources/old-patches/betterrotation/1371.patch b/resources/patches/betterrotation/1371.patch similarity index 100% rename from resources/old-patches/betterrotation/1371.patch rename to resources/patches/betterrotation/1371.patch diff --git a/resources/old-patches/betterrotation/78204.patch b/resources/patches/betterrotation/78204.patch similarity index 100% rename from resources/old-patches/betterrotation/78204.patch rename to resources/patches/betterrotation/78204.patch diff --git a/resources/old-patches/betterrotation/87202.patch b/resources/patches/betterrotation/87202.patch similarity index 100% rename from resources/old-patches/betterrotation/87202.patch rename to resources/patches/betterrotation/87202.patch diff --git a/resources/old-patches/betterrotation/README.md b/resources/patches/betterrotation/README.md similarity index 100% rename from resources/old-patches/betterrotation/README.md rename to resources/patches/betterrotation/README.md From 59c76a65063332e61e8057dc42df57f8c5d11e3f Mon Sep 17 00:00:00 2001 From: ave Date: Tue, 24 Aug 2021 22:14:28 +0300 Subject: [PATCH 27/27] Revert "betterrotation: Restore from old-patches" This reverts commit a8c17e20328571bb1645eac5d458a71e8799e63a. I am an idiot --- resources/{patches => old-patches}/betterrotation/1340.patch | 0 resources/{patches => old-patches}/betterrotation/1355.patch | 0 resources/{patches => old-patches}/betterrotation/1356.patch | 0 resources/{patches => old-patches}/betterrotation/1358.patch | 0 resources/{patches => old-patches}/betterrotation/1361.patch | 0 resources/{patches => old-patches}/betterrotation/1362.patch | 0 resources/{patches => old-patches}/betterrotation/1365.patch | 0 resources/{patches => old-patches}/betterrotation/1367.patch | 0 resources/{patches => old-patches}/betterrotation/1368.patch | 0 resources/{patches => old-patches}/betterrotation/1370.patch | 0 resources/{patches => old-patches}/betterrotation/1371.patch | 0 resources/{patches => old-patches}/betterrotation/78204.patch | 0 resources/{patches => old-patches}/betterrotation/87202.patch | 0 resources/{patches => old-patches}/betterrotation/README.md | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename resources/{patches => old-patches}/betterrotation/1340.patch (100%) rename resources/{patches => old-patches}/betterrotation/1355.patch (100%) rename resources/{patches => old-patches}/betterrotation/1356.patch (100%) rename resources/{patches => old-patches}/betterrotation/1358.patch (100%) rename resources/{patches => old-patches}/betterrotation/1361.patch (100%) rename resources/{patches => old-patches}/betterrotation/1362.patch (100%) rename resources/{patches => old-patches}/betterrotation/1365.patch (100%) rename resources/{patches => old-patches}/betterrotation/1367.patch (100%) rename resources/{patches => old-patches}/betterrotation/1368.patch (100%) rename resources/{patches => old-patches}/betterrotation/1370.patch (100%) rename resources/{patches => old-patches}/betterrotation/1371.patch (100%) rename resources/{patches => old-patches}/betterrotation/78204.patch (100%) rename resources/{patches => old-patches}/betterrotation/87202.patch (100%) rename resources/{patches => old-patches}/betterrotation/README.md (100%) diff --git a/resources/patches/betterrotation/1340.patch b/resources/old-patches/betterrotation/1340.patch similarity index 100% rename from resources/patches/betterrotation/1340.patch rename to resources/old-patches/betterrotation/1340.patch diff --git a/resources/patches/betterrotation/1355.patch b/resources/old-patches/betterrotation/1355.patch similarity index 100% rename from resources/patches/betterrotation/1355.patch rename to resources/old-patches/betterrotation/1355.patch diff --git a/resources/patches/betterrotation/1356.patch b/resources/old-patches/betterrotation/1356.patch similarity index 100% rename from resources/patches/betterrotation/1356.patch rename to resources/old-patches/betterrotation/1356.patch diff --git a/resources/patches/betterrotation/1358.patch b/resources/old-patches/betterrotation/1358.patch similarity index 100% rename from resources/patches/betterrotation/1358.patch rename to resources/old-patches/betterrotation/1358.patch diff --git a/resources/patches/betterrotation/1361.patch b/resources/old-patches/betterrotation/1361.patch similarity index 100% rename from resources/patches/betterrotation/1361.patch rename to resources/old-patches/betterrotation/1361.patch diff --git a/resources/patches/betterrotation/1362.patch b/resources/old-patches/betterrotation/1362.patch similarity index 100% rename from resources/patches/betterrotation/1362.patch rename to resources/old-patches/betterrotation/1362.patch diff --git a/resources/patches/betterrotation/1365.patch b/resources/old-patches/betterrotation/1365.patch similarity index 100% rename from resources/patches/betterrotation/1365.patch rename to resources/old-patches/betterrotation/1365.patch diff --git a/resources/patches/betterrotation/1367.patch b/resources/old-patches/betterrotation/1367.patch similarity index 100% rename from resources/patches/betterrotation/1367.patch rename to resources/old-patches/betterrotation/1367.patch diff --git a/resources/patches/betterrotation/1368.patch b/resources/old-patches/betterrotation/1368.patch similarity index 100% rename from resources/patches/betterrotation/1368.patch rename to resources/old-patches/betterrotation/1368.patch diff --git a/resources/patches/betterrotation/1370.patch b/resources/old-patches/betterrotation/1370.patch similarity index 100% rename from resources/patches/betterrotation/1370.patch rename to resources/old-patches/betterrotation/1370.patch diff --git a/resources/patches/betterrotation/1371.patch b/resources/old-patches/betterrotation/1371.patch similarity index 100% rename from resources/patches/betterrotation/1371.patch rename to resources/old-patches/betterrotation/1371.patch diff --git a/resources/patches/betterrotation/78204.patch b/resources/old-patches/betterrotation/78204.patch similarity index 100% rename from resources/patches/betterrotation/78204.patch rename to resources/old-patches/betterrotation/78204.patch diff --git a/resources/patches/betterrotation/87202.patch b/resources/old-patches/betterrotation/87202.patch similarity index 100% rename from resources/patches/betterrotation/87202.patch rename to resources/old-patches/betterrotation/87202.patch diff --git a/resources/patches/betterrotation/README.md b/resources/old-patches/betterrotation/README.md similarity index 100% rename from resources/patches/betterrotation/README.md rename to resources/old-patches/betterrotation/README.md