diff --git a/Dockerfile b/Dockerfile index 9c3ef47..397063c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,6 @@ 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 @@ -23,9 +20,6 @@ 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/old-patches/README.md b/resources/old-patches/README.md index d22c2a6..fcffff3 100644 --- a/resources/old-patches/README.md +++ b/resources/old-patches/README.md @@ -13,5 +13,4 @@ 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 -- slashcommands: Moved to dynamic patch due to discord api supporting this now +- noblocked: Moved to xml-patchs \ No newline at end of file diff --git a/resources/old-patches/slashcommands/1006.patch b/resources/patches/slashcommands/1006.patch similarity index 100% rename from resources/old-patches/slashcommands/1006.patch rename to resources/patches/slashcommands/1006.patch diff --git a/resources/old-patches/slashcommands/1007.patch b/resources/patches/slashcommands/1007.patch similarity index 100% rename from resources/old-patches/slashcommands/1007.patch rename to resources/patches/slashcommands/1007.patch diff --git a/resources/old-patches/slashcommands/1011.patch b/resources/patches/slashcommands/1011.patch similarity index 100% rename from resources/old-patches/slashcommands/1011.patch rename to resources/patches/slashcommands/1011.patch diff --git a/resources/old-patches/slashcommands/1012.patch b/resources/patches/slashcommands/1012.patch similarity index 100% rename from resources/old-patches/slashcommands/1012.patch rename to resources/patches/slashcommands/1012.patch diff --git a/resources/old-patches/slashcommands/1013.patch b/resources/patches/slashcommands/1013.patch similarity index 100% rename from resources/old-patches/slashcommands/1013.patch rename to resources/patches/slashcommands/1013.patch diff --git a/resources/old-patches/slashcommands/1015.patch b/resources/patches/slashcommands/1015.patch similarity index 100% rename from resources/old-patches/slashcommands/1015.patch rename to resources/patches/slashcommands/1015.patch diff --git a/resources/old-patches/slashcommands/1016.patch b/resources/patches/slashcommands/1016.patch similarity index 100% rename from resources/old-patches/slashcommands/1016.patch rename to resources/patches/slashcommands/1016.patch diff --git a/resources/old-patches/slashcommands/1019.patch b/resources/patches/slashcommands/1019.patch similarity index 100% rename from resources/old-patches/slashcommands/1019.patch rename to resources/patches/slashcommands/1019.patch diff --git a/resources/old-patches/slashcommands/1020.patch b/resources/patches/slashcommands/1020.patch similarity index 100% rename from resources/old-patches/slashcommands/1020.patch rename to resources/patches/slashcommands/1020.patch diff --git a/resources/old-patches/slashcommands/1021.patch b/resources/patches/slashcommands/1021.patch similarity index 100% rename from resources/old-patches/slashcommands/1021.patch rename to resources/patches/slashcommands/1021.patch diff --git a/resources/old-patches/slashcommands/1022.patch b/resources/patches/slashcommands/1022.patch similarity index 100% rename from resources/old-patches/slashcommands/1022.patch rename to resources/patches/slashcommands/1022.patch diff --git a/resources/old-patches/slashcommands/1023.patch b/resources/patches/slashcommands/1023.patch similarity index 100% rename from resources/old-patches/slashcommands/1023.patch rename to resources/patches/slashcommands/1023.patch diff --git a/resources/old-patches/slashcommands/1024.patch b/resources/patches/slashcommands/1024.patch similarity index 100% rename from resources/old-patches/slashcommands/1024.patch rename to resources/patches/slashcommands/1024.patch diff --git a/resources/old-patches/slashcommands/1025.patch b/resources/patches/slashcommands/1025.patch similarity index 100% rename from resources/old-patches/slashcommands/1025.patch rename to resources/patches/slashcommands/1025.patch diff --git a/resources/old-patches/slashcommands/1026.patch b/resources/patches/slashcommands/1026.patch similarity index 100% rename from resources/old-patches/slashcommands/1026.patch rename to resources/patches/slashcommands/1026.patch diff --git a/resources/old-patches/slashcommands/1029.patch b/resources/patches/slashcommands/1029.patch similarity index 100% rename from resources/old-patches/slashcommands/1029.patch rename to resources/patches/slashcommands/1029.patch diff --git a/resources/old-patches/slashcommands/1031.patch b/resources/patches/slashcommands/1031.patch similarity index 100% rename from resources/old-patches/slashcommands/1031.patch rename to resources/patches/slashcommands/1031.patch diff --git a/resources/old-patches/slashcommands/1032.patch b/resources/patches/slashcommands/1032.patch similarity index 100% rename from resources/old-patches/slashcommands/1032.patch rename to resources/patches/slashcommands/1032.patch diff --git a/resources/old-patches/slashcommands/1033.patch b/resources/patches/slashcommands/1033.patch similarity index 100% rename from resources/old-patches/slashcommands/1033.patch rename to resources/patches/slashcommands/1033.patch diff --git a/resources/old-patches/slashcommands/1036.patch b/resources/patches/slashcommands/1036.patch similarity index 100% rename from resources/old-patches/slashcommands/1036.patch rename to resources/patches/slashcommands/1036.patch diff --git a/resources/old-patches/slashcommands/1037.patch b/resources/patches/slashcommands/1037.patch similarity index 100% rename from resources/old-patches/slashcommands/1037.patch rename to resources/patches/slashcommands/1037.patch diff --git a/resources/old-patches/slashcommands/1040.patch b/resources/patches/slashcommands/1040.patch similarity index 100% rename from resources/old-patches/slashcommands/1040.patch rename to resources/patches/slashcommands/1040.patch diff --git a/resources/old-patches/slashcommands/1041.patch b/resources/patches/slashcommands/1041.patch similarity index 100% rename from resources/old-patches/slashcommands/1041.patch rename to resources/patches/slashcommands/1041.patch diff --git a/resources/old-patches/slashcommands/1045.patch b/resources/patches/slashcommands/1045.patch similarity index 100% rename from resources/old-patches/slashcommands/1045.patch rename to resources/patches/slashcommands/1045.patch diff --git a/resources/old-patches/slashcommands/1046.patch b/resources/patches/slashcommands/1046.patch similarity index 100% rename from resources/old-patches/slashcommands/1046.patch rename to resources/patches/slashcommands/1046.patch diff --git a/resources/old-patches/slashcommands/1047.patch b/resources/patches/slashcommands/1047.patch similarity index 100% rename from resources/old-patches/slashcommands/1047.patch rename to resources/patches/slashcommands/1047.patch diff --git a/resources/old-patches/slashcommands/1049.patch b/resources/patches/slashcommands/1049.patch similarity index 100% rename from resources/old-patches/slashcommands/1049.patch rename to resources/patches/slashcommands/1049.patch diff --git a/resources/old-patches/slashcommands/1052.patch b/resources/patches/slashcommands/1052.patch similarity index 100% rename from resources/old-patches/slashcommands/1052.patch rename to resources/patches/slashcommands/1052.patch diff --git a/resources/old-patches/slashcommands/1053.patch b/resources/patches/slashcommands/1053.patch similarity index 100% rename from resources/old-patches/slashcommands/1053.patch rename to resources/patches/slashcommands/1053.patch diff --git a/resources/old-patches/slashcommands/1054.patch b/resources/patches/slashcommands/1054.patch similarity index 100% rename from resources/old-patches/slashcommands/1054.patch rename to resources/patches/slashcommands/1054.patch diff --git a/resources/old-patches/slashcommands/1056.patch b/resources/patches/slashcommands/1056.patch similarity index 100% rename from resources/old-patches/slashcommands/1056.patch rename to resources/patches/slashcommands/1056.patch diff --git a/resources/old-patches/slashcommands/1057.patch b/resources/patches/slashcommands/1057.patch similarity index 100% rename from resources/old-patches/slashcommands/1057.patch rename to resources/patches/slashcommands/1057.patch diff --git a/resources/old-patches/slashcommands/1062.patch b/resources/patches/slashcommands/1062.patch similarity index 100% rename from resources/old-patches/slashcommands/1062.patch rename to resources/patches/slashcommands/1062.patch diff --git a/resources/old-patches/slashcommands/1065.patch b/resources/patches/slashcommands/1065.patch similarity index 100% rename from resources/old-patches/slashcommands/1065.patch rename to resources/patches/slashcommands/1065.patch diff --git a/resources/old-patches/slashcommands/1066.patch b/resources/patches/slashcommands/1066.patch similarity index 100% rename from resources/old-patches/slashcommands/1066.patch rename to resources/patches/slashcommands/1066.patch diff --git a/resources/old-patches/slashcommands/1069.patch b/resources/patches/slashcommands/1069.patch similarity index 100% rename from resources/old-patches/slashcommands/1069.patch rename to resources/patches/slashcommands/1069.patch diff --git a/resources/old-patches/slashcommands/1073.patch b/resources/patches/slashcommands/1073.patch similarity index 100% rename from resources/old-patches/slashcommands/1073.patch rename to resources/patches/slashcommands/1073.patch diff --git a/resources/old-patches/slashcommands/1074.patch b/resources/patches/slashcommands/1074.patch similarity index 100% rename from resources/old-patches/slashcommands/1074.patch rename to resources/patches/slashcommands/1074.patch diff --git a/resources/old-patches/slashcommands/1078.patch b/resources/patches/slashcommands/1078.patch similarity index 100% rename from resources/old-patches/slashcommands/1078.patch rename to resources/patches/slashcommands/1078.patch diff --git a/resources/old-patches/slashcommands/1084.patch b/resources/patches/slashcommands/1084.patch similarity index 100% rename from resources/old-patches/slashcommands/1084.patch rename to resources/patches/slashcommands/1084.patch diff --git a/resources/old-patches/slashcommands/1085.patch b/resources/patches/slashcommands/1085.patch similarity index 100% rename from resources/old-patches/slashcommands/1085.patch rename to resources/patches/slashcommands/1085.patch diff --git a/resources/old-patches/slashcommands/1087.patch b/resources/patches/slashcommands/1087.patch similarity index 100% rename from resources/old-patches/slashcommands/1087.patch rename to resources/patches/slashcommands/1087.patch diff --git a/resources/old-patches/slashcommands/1091.patch b/resources/patches/slashcommands/1091.patch similarity index 100% rename from resources/old-patches/slashcommands/1091.patch rename to resources/patches/slashcommands/1091.patch diff --git a/resources/old-patches/slashcommands/1092.patch b/resources/patches/slashcommands/1092.patch similarity index 100% rename from resources/old-patches/slashcommands/1092.patch rename to resources/patches/slashcommands/1092.patch diff --git a/resources/old-patches/slashcommands/1100.patch b/resources/patches/slashcommands/1100.patch similarity index 100% rename from resources/old-patches/slashcommands/1100.patch rename to resources/patches/slashcommands/1100.patch diff --git a/resources/old-patches/slashcommands/1103.patch b/resources/patches/slashcommands/1103.patch similarity index 100% rename from resources/old-patches/slashcommands/1103.patch rename to resources/patches/slashcommands/1103.patch diff --git a/resources/old-patches/slashcommands/1104.patch b/resources/patches/slashcommands/1104.patch similarity index 100% rename from resources/old-patches/slashcommands/1104.patch rename to resources/patches/slashcommands/1104.patch diff --git a/resources/old-patches/slashcommands/1105.patch b/resources/patches/slashcommands/1105.patch similarity index 100% rename from resources/old-patches/slashcommands/1105.patch rename to resources/patches/slashcommands/1105.patch diff --git a/resources/old-patches/slashcommands/1107.patch b/resources/patches/slashcommands/1107.patch similarity index 100% rename from resources/old-patches/slashcommands/1107.patch rename to resources/patches/slashcommands/1107.patch diff --git a/resources/old-patches/slashcommands/1123.patch b/resources/patches/slashcommands/1123.patch similarity index 100% rename from resources/old-patches/slashcommands/1123.patch rename to resources/patches/slashcommands/1123.patch diff --git a/resources/old-patches/slashcommands/1132.patch b/resources/patches/slashcommands/1132.patch similarity index 100% rename from resources/old-patches/slashcommands/1132.patch rename to resources/patches/slashcommands/1132.patch diff --git a/resources/old-patches/slashcommands/1134.patch b/resources/patches/slashcommands/1134.patch similarity index 100% rename from resources/old-patches/slashcommands/1134.patch rename to resources/patches/slashcommands/1134.patch diff --git a/resources/old-patches/slashcommands/1144.patch b/resources/patches/slashcommands/1144.patch similarity index 100% rename from resources/old-patches/slashcommands/1144.patch rename to resources/patches/slashcommands/1144.patch diff --git a/resources/old-patches/slashcommands/1145.patch b/resources/patches/slashcommands/1145.patch similarity index 100% rename from resources/old-patches/slashcommands/1145.patch rename to resources/patches/slashcommands/1145.patch diff --git a/resources/old-patches/slashcommands/1146.patch b/resources/patches/slashcommands/1146.patch similarity index 100% rename from resources/old-patches/slashcommands/1146.patch rename to resources/patches/slashcommands/1146.patch diff --git a/resources/old-patches/slashcommands/1148.patch b/resources/patches/slashcommands/1148.patch similarity index 100% rename from resources/old-patches/slashcommands/1148.patch rename to resources/patches/slashcommands/1148.patch diff --git a/resources/old-patches/slashcommands/1150.patch b/resources/patches/slashcommands/1150.patch similarity index 100% rename from resources/old-patches/slashcommands/1150.patch rename to resources/patches/slashcommands/1150.patch diff --git a/resources/old-patches/slashcommands/1167.patch b/resources/patches/slashcommands/1167.patch similarity index 100% rename from resources/old-patches/slashcommands/1167.patch rename to resources/patches/slashcommands/1167.patch diff --git a/resources/old-patches/slashcommands/1169.patch b/resources/patches/slashcommands/1169.patch similarity index 100% rename from resources/old-patches/slashcommands/1169.patch rename to resources/patches/slashcommands/1169.patch diff --git a/resources/old-patches/slashcommands/1171.patch b/resources/patches/slashcommands/1171.patch similarity index 100% rename from resources/old-patches/slashcommands/1171.patch rename to resources/patches/slashcommands/1171.patch diff --git a/resources/old-patches/slashcommands/1180.patch b/resources/patches/slashcommands/1180.patch similarity index 100% rename from resources/old-patches/slashcommands/1180.patch rename to resources/patches/slashcommands/1180.patch diff --git a/resources/old-patches/slashcommands/1181.patch b/resources/patches/slashcommands/1181.patch similarity index 100% rename from resources/old-patches/slashcommands/1181.patch rename to resources/patches/slashcommands/1181.patch diff --git a/resources/old-patches/slashcommands/1192.patch b/resources/patches/slashcommands/1192.patch similarity index 100% rename from resources/old-patches/slashcommands/1192.patch rename to resources/patches/slashcommands/1192.patch diff --git a/resources/old-patches/slashcommands/1196.patch b/resources/patches/slashcommands/1196.patch similarity index 100% rename from resources/old-patches/slashcommands/1196.patch rename to resources/patches/slashcommands/1196.patch diff --git a/resources/old-patches/slashcommands/1200.patch b/resources/patches/slashcommands/1200.patch similarity index 100% rename from resources/old-patches/slashcommands/1200.patch rename to resources/patches/slashcommands/1200.patch diff --git a/resources/old-patches/slashcommands/1201.patch b/resources/patches/slashcommands/1201.patch similarity index 100% rename from resources/old-patches/slashcommands/1201.patch rename to resources/patches/slashcommands/1201.patch diff --git a/resources/old-patches/slashcommands/1208.patch b/resources/patches/slashcommands/1208.patch similarity index 100% rename from resources/old-patches/slashcommands/1208.patch rename to resources/patches/slashcommands/1208.patch diff --git a/resources/old-patches/slashcommands/1213.patch b/resources/patches/slashcommands/1213.patch similarity index 100% rename from resources/old-patches/slashcommands/1213.patch rename to resources/patches/slashcommands/1213.patch diff --git a/resources/old-patches/slashcommands/1216.patch b/resources/patches/slashcommands/1216.patch similarity index 100% rename from resources/old-patches/slashcommands/1216.patch rename to resources/patches/slashcommands/1216.patch diff --git a/resources/old-patches/slashcommands/1218.patch b/resources/patches/slashcommands/1218.patch similarity index 100% rename from resources/old-patches/slashcommands/1218.patch rename to resources/patches/slashcommands/1218.patch diff --git a/resources/old-patches/slashcommands/1223.patch b/resources/patches/slashcommands/1223.patch similarity index 100% rename from resources/old-patches/slashcommands/1223.patch rename to resources/patches/slashcommands/1223.patch diff --git a/resources/old-patches/slashcommands/1243.patch b/resources/patches/slashcommands/1243.patch similarity index 100% rename from resources/old-patches/slashcommands/1243.patch rename to resources/patches/slashcommands/1243.patch diff --git a/resources/old-patches/slashcommands/1246.patch b/resources/patches/slashcommands/1246.patch similarity index 100% rename from resources/old-patches/slashcommands/1246.patch rename to resources/patches/slashcommands/1246.patch diff --git a/resources/old-patches/slashcommands/1249.patch b/resources/patches/slashcommands/1249.patch similarity index 100% rename from resources/old-patches/slashcommands/1249.patch rename to resources/patches/slashcommands/1249.patch diff --git a/resources/old-patches/slashcommands/1251.patch b/resources/patches/slashcommands/1251.patch similarity index 100% rename from resources/old-patches/slashcommands/1251.patch rename to resources/patches/slashcommands/1251.patch diff --git a/resources/old-patches/slashcommands/1252.patch b/resources/patches/slashcommands/1252.patch similarity index 100% rename from resources/old-patches/slashcommands/1252.patch rename to resources/patches/slashcommands/1252.patch diff --git a/resources/old-patches/slashcommands/1259.patch b/resources/patches/slashcommands/1259.patch similarity index 100% rename from resources/old-patches/slashcommands/1259.patch rename to resources/patches/slashcommands/1259.patch diff --git a/resources/old-patches/slashcommands/1266.patch b/resources/patches/slashcommands/1266.patch similarity index 100% rename from resources/old-patches/slashcommands/1266.patch rename to resources/patches/slashcommands/1266.patch diff --git a/resources/old-patches/slashcommands/1270.patch b/resources/patches/slashcommands/1270.patch similarity index 100% rename from resources/old-patches/slashcommands/1270.patch rename to resources/patches/slashcommands/1270.patch diff --git a/resources/old-patches/slashcommands/1273.patch b/resources/patches/slashcommands/1273.patch similarity index 100% rename from resources/old-patches/slashcommands/1273.patch rename to resources/patches/slashcommands/1273.patch diff --git a/resources/old-patches/slashcommands/1279.patch b/resources/patches/slashcommands/1279.patch similarity index 100% rename from resources/old-patches/slashcommands/1279.patch rename to resources/patches/slashcommands/1279.patch diff --git a/resources/old-patches/slashcommands/1280.patch b/resources/patches/slashcommands/1280.patch similarity index 100% rename from resources/old-patches/slashcommands/1280.patch rename to resources/patches/slashcommands/1280.patch diff --git a/resources/old-patches/slashcommands/1281.patch b/resources/patches/slashcommands/1281.patch similarity index 100% rename from resources/old-patches/slashcommands/1281.patch rename to resources/patches/slashcommands/1281.patch diff --git a/resources/old-patches/slashcommands/1282.patch b/resources/patches/slashcommands/1282.patch similarity index 100% rename from resources/old-patches/slashcommands/1282.patch rename to resources/patches/slashcommands/1282.patch diff --git a/resources/old-patches/slashcommands/1284.patch b/resources/patches/slashcommands/1284.patch similarity index 100% rename from resources/old-patches/slashcommands/1284.patch rename to resources/patches/slashcommands/1284.patch diff --git a/resources/old-patches/slashcommands/1290.patch b/resources/patches/slashcommands/1290.patch similarity index 100% rename from resources/old-patches/slashcommands/1290.patch rename to resources/patches/slashcommands/1290.patch diff --git a/resources/old-patches/slashcommands/1294.patch b/resources/patches/slashcommands/1294.patch similarity index 100% rename from resources/old-patches/slashcommands/1294.patch rename to resources/patches/slashcommands/1294.patch diff --git a/resources/old-patches/slashcommands/1295.patch b/resources/patches/slashcommands/1295.patch similarity index 100% rename from resources/old-patches/slashcommands/1295.patch rename to resources/patches/slashcommands/1295.patch diff --git a/resources/old-patches/slashcommands/1298.patch b/resources/patches/slashcommands/1298.patch similarity index 100% rename from resources/old-patches/slashcommands/1298.patch rename to resources/patches/slashcommands/1298.patch diff --git a/resources/old-patches/slashcommands/1300.patch b/resources/patches/slashcommands/1300.patch similarity index 100% rename from resources/old-patches/slashcommands/1300.patch rename to resources/patches/slashcommands/1300.patch diff --git a/resources/old-patches/slashcommands/1301.patch b/resources/patches/slashcommands/1301.patch similarity index 100% rename from resources/old-patches/slashcommands/1301.patch rename to resources/patches/slashcommands/1301.patch diff --git a/resources/old-patches/slashcommands/1304.patch b/resources/patches/slashcommands/1304.patch similarity index 100% rename from resources/old-patches/slashcommands/1304.patch rename to resources/patches/slashcommands/1304.patch diff --git a/resources/old-patches/slashcommands/1306.patch b/resources/patches/slashcommands/1306.patch similarity index 100% rename from resources/old-patches/slashcommands/1306.patch rename to resources/patches/slashcommands/1306.patch diff --git a/resources/old-patches/slashcommands/1307.patch b/resources/patches/slashcommands/1307.patch similarity index 100% rename from resources/old-patches/slashcommands/1307.patch rename to resources/patches/slashcommands/1307.patch diff --git a/resources/old-patches/slashcommands/1310.patch b/resources/patches/slashcommands/1310.patch similarity index 100% rename from resources/old-patches/slashcommands/1310.patch rename to resources/patches/slashcommands/1310.patch diff --git a/resources/old-patches/slashcommands/1315.patch b/resources/patches/slashcommands/1315.patch similarity index 100% rename from resources/old-patches/slashcommands/1315.patch rename to resources/patches/slashcommands/1315.patch diff --git a/resources/old-patches/slashcommands/1318.patch b/resources/patches/slashcommands/1318.patch similarity index 100% rename from resources/old-patches/slashcommands/1318.patch rename to resources/patches/slashcommands/1318.patch diff --git a/resources/old-patches/slashcommands/1330.patch b/resources/patches/slashcommands/1330.patch similarity index 100% rename from resources/old-patches/slashcommands/1330.patch rename to resources/patches/slashcommands/1330.patch diff --git a/resources/old-patches/slashcommands/1334.patch b/resources/patches/slashcommands/1334.patch similarity index 100% rename from resources/old-patches/slashcommands/1334.patch rename to resources/patches/slashcommands/1334.patch diff --git a/resources/old-patches/slashcommands/1339.patch b/resources/patches/slashcommands/1339.patch similarity index 100% rename from resources/old-patches/slashcommands/1339.patch rename to resources/patches/slashcommands/1339.patch diff --git a/resources/old-patches/slashcommands/1340.patch b/resources/patches/slashcommands/1340.patch similarity index 100% rename from resources/old-patches/slashcommands/1340.patch rename to resources/patches/slashcommands/1340.patch diff --git a/resources/old-patches/slashcommands/1355.patch b/resources/patches/slashcommands/1355.patch similarity index 100% rename from resources/old-patches/slashcommands/1355.patch rename to resources/patches/slashcommands/1355.patch diff --git a/resources/old-patches/slashcommands/1356.patch b/resources/patches/slashcommands/1356.patch similarity index 100% rename from resources/old-patches/slashcommands/1356.patch rename to resources/patches/slashcommands/1356.patch diff --git a/resources/old-patches/slashcommands/1358.patch b/resources/patches/slashcommands/1358.patch similarity index 100% rename from resources/old-patches/slashcommands/1358.patch rename to resources/patches/slashcommands/1358.patch diff --git a/resources/old-patches/slashcommands/1361.patch b/resources/patches/slashcommands/1361.patch similarity index 100% rename from resources/old-patches/slashcommands/1361.patch rename to resources/patches/slashcommands/1361.patch diff --git a/resources/old-patches/slashcommands/1362.patch b/resources/patches/slashcommands/1362.patch similarity index 100% rename from resources/old-patches/slashcommands/1362.patch rename to resources/patches/slashcommands/1362.patch diff --git a/resources/old-patches/slashcommands/1365.patch b/resources/patches/slashcommands/1365.patch similarity index 100% rename from resources/old-patches/slashcommands/1365.patch rename to resources/patches/slashcommands/1365.patch diff --git a/resources/old-patches/slashcommands/1367.patch b/resources/patches/slashcommands/1367.patch similarity index 100% rename from resources/old-patches/slashcommands/1367.patch rename to resources/patches/slashcommands/1367.patch diff --git a/resources/old-patches/slashcommands/1368.patch b/resources/patches/slashcommands/1368.patch similarity index 100% rename from resources/old-patches/slashcommands/1368.patch rename to resources/patches/slashcommands/1368.patch diff --git a/resources/old-patches/slashcommands/1370.patch b/resources/patches/slashcommands/1370.patch similarity index 100% rename from resources/old-patches/slashcommands/1370.patch rename to resources/patches/slashcommands/1370.patch diff --git a/resources/old-patches/slashcommands/1371.patch b/resources/patches/slashcommands/1371.patch similarity index 100% rename from resources/old-patches/slashcommands/1371.patch rename to resources/patches/slashcommands/1371.patch diff --git a/resources/patches/slashcommands/87202-pre.sh b/resources/patches/slashcommands/87202-pre.sh deleted file mode 100644 index f6500a0..0000000 --- a/resources/patches/slashcommands/87202-pre.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 deleted file mode 100644 index 45737aa..0000000 --- a/resources/patches/slashcommands/87202.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/old-patches/slashcommands/900.patch b/resources/patches/slashcommands/900.patch similarity index 100% rename from resources/old-patches/slashcommands/900.patch rename to resources/patches/slashcommands/900.patch diff --git a/resources/old-patches/slashcommands/901.patch b/resources/patches/slashcommands/901.patch similarity index 100% rename from resources/old-patches/slashcommands/901.patch rename to resources/patches/slashcommands/901.patch diff --git a/resources/old-patches/slashcommands/902.patch b/resources/patches/slashcommands/902.patch similarity index 100% rename from resources/old-patches/slashcommands/902.patch rename to resources/patches/slashcommands/902.patch diff --git a/resources/old-patches/slashcommands/903.patch b/resources/patches/slashcommands/903.patch similarity index 100% rename from resources/old-patches/slashcommands/903.patch rename to resources/patches/slashcommands/903.patch diff --git a/resources/old-patches/slashcommands/904.patch b/resources/patches/slashcommands/904.patch similarity index 100% rename from resources/old-patches/slashcommands/904.patch rename to resources/patches/slashcommands/904.patch diff --git a/resources/old-patches/slashcommands/906.patch b/resources/patches/slashcommands/906.patch similarity index 100% rename from resources/old-patches/slashcommands/906.patch rename to resources/patches/slashcommands/906.patch diff --git a/resources/old-patches/slashcommands/909.patch b/resources/patches/slashcommands/909.patch similarity index 100% rename from resources/old-patches/slashcommands/909.patch rename to resources/patches/slashcommands/909.patch diff --git a/resources/old-patches/slashcommands/910.patch b/resources/patches/slashcommands/910.patch similarity index 100% rename from resources/old-patches/slashcommands/910.patch rename to resources/patches/slashcommands/910.patch diff --git a/resources/old-patches/slashcommands/938.patch b/resources/patches/slashcommands/938.patch similarity index 100% rename from resources/old-patches/slashcommands/938.patch rename to resources/patches/slashcommands/938.patch diff --git a/resources/old-patches/slashcommands/939.patch b/resources/patches/slashcommands/939.patch similarity index 100% rename from resources/old-patches/slashcommands/939.patch rename to resources/patches/slashcommands/939.patch diff --git a/resources/old-patches/slashcommands/940.patch b/resources/patches/slashcommands/940.patch similarity index 100% rename from resources/old-patches/slashcommands/940.patch rename to resources/patches/slashcommands/940.patch diff --git a/resources/old-patches/slashcommands/942.patch b/resources/patches/slashcommands/942.patch similarity index 100% rename from resources/old-patches/slashcommands/942.patch rename to resources/patches/slashcommands/942.patch diff --git a/resources/old-patches/slashcommands/943.patch b/resources/patches/slashcommands/943.patch similarity index 100% rename from resources/old-patches/slashcommands/943.patch rename to resources/patches/slashcommands/943.patch diff --git a/resources/old-patches/slashcommands/945.patch b/resources/patches/slashcommands/945.patch similarity index 100% rename from resources/old-patches/slashcommands/945.patch rename to resources/patches/slashcommands/945.patch diff --git a/resources/old-patches/slashcommands/946.patch b/resources/patches/slashcommands/946.patch similarity index 100% rename from resources/old-patches/slashcommands/946.patch rename to resources/patches/slashcommands/946.patch diff --git a/resources/old-patches/slashcommands/947.patch b/resources/patches/slashcommands/947.patch similarity index 100% rename from resources/old-patches/slashcommands/947.patch rename to resources/patches/slashcommands/947.patch diff --git a/resources/old-patches/slashcommands/948.patch b/resources/patches/slashcommands/948.patch similarity index 100% rename from resources/old-patches/slashcommands/948.patch rename to resources/patches/slashcommands/948.patch diff --git a/resources/old-patches/slashcommands/963.patch b/resources/patches/slashcommands/963.patch similarity index 100% rename from resources/old-patches/slashcommands/963.patch rename to resources/patches/slashcommands/963.patch diff --git a/resources/old-patches/slashcommands/964.patch b/resources/patches/slashcommands/964.patch similarity index 100% rename from resources/old-patches/slashcommands/964.patch rename to resources/patches/slashcommands/964.patch diff --git a/resources/old-patches/slashcommands/965.patch b/resources/patches/slashcommands/965.patch similarity index 100% rename from resources/old-patches/slashcommands/965.patch rename to resources/patches/slashcommands/965.patch diff --git a/resources/old-patches/slashcommands/966.patch b/resources/patches/slashcommands/966.patch similarity index 100% rename from resources/old-patches/slashcommands/966.patch rename to resources/patches/slashcommands/966.patch diff --git a/resources/old-patches/slashcommands/967.patch b/resources/patches/slashcommands/967.patch similarity index 100% rename from resources/old-patches/slashcommands/967.patch rename to resources/patches/slashcommands/967.patch diff --git a/resources/old-patches/slashcommands/968.patch b/resources/patches/slashcommands/968.patch similarity index 100% rename from resources/old-patches/slashcommands/968.patch rename to resources/patches/slashcommands/968.patch diff --git a/resources/old-patches/slashcommands/970.patch b/resources/patches/slashcommands/970.patch similarity index 100% rename from resources/old-patches/slashcommands/970.patch rename to resources/patches/slashcommands/970.patch diff --git a/resources/old-patches/slashcommands/980.patch b/resources/patches/slashcommands/980.patch similarity index 100% rename from resources/old-patches/slashcommands/980.patch rename to resources/patches/slashcommands/980.patch diff --git a/resources/old-patches/slashcommands/992.patch b/resources/patches/slashcommands/992.patch similarity index 100% rename from resources/old-patches/slashcommands/992.patch rename to resources/patches/slashcommands/992.patch diff --git a/resources/old-patches/slashcommands/993.patch b/resources/patches/slashcommands/993.patch similarity index 100% rename from resources/old-patches/slashcommands/993.patch rename to resources/patches/slashcommands/993.patch diff --git a/resources/old-patches/slashcommands/994.patch b/resources/patches/slashcommands/994.patch similarity index 100% rename from resources/old-patches/slashcommands/994.patch rename to resources/patches/slashcommands/994.patch diff --git a/resources/old-patches/slashcommands/996.patch b/resources/patches/slashcommands/996.patch similarity index 100% rename from resources/old-patches/slashcommands/996.patch rename to resources/patches/slashcommands/996.patch diff --git a/resources/old-patches/slashcommands/README.md b/resources/patches/slashcommands/README.md similarity index 100% rename from resources/old-patches/slashcommands/README.md rename to resources/patches/slashcommands/README.md diff --git a/resources/patches/slashcommands/code/.gitignore b/resources/patches/slashcommands/code/.gitignore deleted file mode 100644 index d124c18..0000000 --- a/resources/patches/slashcommands/code/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.gradle -.idea -build -libs -out - diff --git a/resources/patches/slashcommands/code/build.gradle b/resources/patches/slashcommands/code/build.gradle deleted file mode 100644 index 28a7cbc..0000000 --- a/resources/patches/slashcommands/code/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index e708b1c..0000000 Binary files a/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties b/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index be52383..0000000 --- a/resources/patches/slashcommands/code/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 4f906e0..0000000 --- a/resources/patches/slashcommands/code/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/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 deleted file mode 100644 index 107acd3..0000000 --- a/resources/patches/slashcommands/code/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@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 deleted file mode 100644 index ecd818b..0000000 --- a/resources/patches/slashcommands/code/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 7da7eca..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/CTCCommands.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.cutthecord.commands; - -import com.cutthecord.commands.commands.*; -import com.discord.api.commands.ApplicationCommandType; -import com.discord.api.commands.CommandChoice; -import com.discord.models.commands.*; -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.*; - -@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 - - // TODO help text? - - // 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 - - - // TODO - /* - - cmds.put("spoilerimg", new CmdSpoilerImg()); - - // TODO can we add an CTC user that responds for these? - Command ctcCommand = new CmdCtc(); - - ctcCommand.registerSubCommand("channelleak", new CmdCtc.CmdCtcChannelLeak()); - ctcCommand.registerSubCommand("showtyping", new CmdCtc.CmdCtcShowTyping()); - ctcCommand.registerSubCommand("token", new CmdCtc.CmdCtcToken()); - ctcCommand.registerSubCommand("account", new CmdCtc.CmdCtcAccount()); - ctcCommand.registerSubCommand("addaccount", new CmdCtc.CmdCtcAddAccount()); - ctcCommand.registerSubCommand("nodelete", new CmdCtc.CmdCtcNoDelete()); - - cmds.put("ctc", ctcCommand); - */ - - // 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(); - } - } - - private static ApplicationCommand createHandleRawMessageCommand(String name, String cmdDesc, String optionDesc, RawMsgHandler handler) { - return makeCtcCommand(name, cmdDesc, Collections.singletonList( - makeOption(ApplicationCommandType.STRING, "message", optionDesc, null, false, false, null, null, 192, null) - ), new RawMessageCommand(handler)); - } - -} 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 deleted file mode 100644 index 43537f3..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/RawMsgHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 20991eb..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/Replacements.java +++ /dev/null @@ -1,304 +0,0 @@ -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 deleted file mode 100644 index f8c1614..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdCtc.java +++ /dev/null @@ -1,131 +0,0 @@ -/*package com.cutthecord.commands.commands; - -import com.cutthecord.commands.CommandHandler; -import com.discord.stores.StoreStream; -import com.discord.stores.StoreUserSettings; - -public class CmdCtc extends CommandHandler.PrivateCommand { - - - // TODO make token calls write directly to clipboard - // TODO replace patched method calls with reflection - @Override - public String getPopupInfo() { - return "cheese"; - } - - - - public static class CmdCtcChannelLeak extends CommandHandler.PrivateCommand { - - @Override - public String handleCommand(String msg) { - StoreStream.getUserSettings().setLeakChannels(msg.startsWith("false")); - return "CTC: Successfully set channelleak state."; - } - - @Override - public String getPopupInfo() { - return "Shows all channels, even those you don’t have permissions to view"; - } - - } - - public static class CmdCtcShowTyping extends CommandHandler.PrivateCommand { - - @Override - public String handleCommand(String msg) { - StoreStream.getUserSettings().setShowTyping(msg.startsWith("true")); - return "CTC: Successfully set showtyping state."; - } - - @Override - public String getPopupInfo() { - return "Change typing event so that its visible/not when you type"; - } - - } - - public static class CmdCtcToken extends CommandHandler.PrivateCommand { - - @Override - public String handleCommand(String msg) { - if (msg.isEmpty()) { - // Print token - return StoreStream.getUserSettings().getStoredToken(); - } - - // Set token - StoreStream.getUserSettings().setStoredToken(msg); - return "CTC: Successfully changed token. Please restart application."; - } - - @Override - public String getPopupInfo() { - return "Gives or sets token"; - } - - } - - public static class CmdCtcAccount extends CommandHandler.PrivateCommand { - - @Override - public String handleCommand(String msg) { - String trim = msg.trim(); - StoreUserSettings userSettings = StoreStream.getUserSettings(); - String accountToken = userSettings.getAccountToken(trim); - if (accountToken.startsWith("none")) { - return "CTC: No such account found."; - } - - userSettings.setStoredToken(accountToken); - return "CTC: Successfully changed accounts. Please restart application."; - } - - @Override - public String getPopupInfo() { - return "Switches to the account specified"; - } - - } - - public static class CmdCtcAddAccount extends CommandHandler.PrivateCommand { - - @Override - public String handleCommand(String msg) { - String substring3 = msg.substring(msg.indexOf(" ")); - String trim2 = msg.replace(substring3, "").trim(); - String trim3 = substring3.trim(); - StoreUserSettings userSettings2 = StoreStream.getUserSettings(); - if (trim2.startsWith("current")) { - trim2 = userSettings2.getStoredToken(); - } - userSettings2.setAccountToken(trim2, trim3); - return "CTC: Added account."; - } - - @Override - public String getPopupInfo() { - return "Adds an account to the account switcher"; - } - - } - - public static class CmdCtcNoDelete extends CommandHandler.PrivateCommand { - - @Override - public String handleCommand(String msg) { - StoreStream.getUserSettings().setNoDelete(msg.startsWith("true")); - return "CTC: Successfully set nodelete state."; - } - - @Override - public String getPopupInfo() { - return "Disables handling of message delete events"; - } - - } - - -} -*/ \ No newline at end of file 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 deleted file mode 100644 index a931bcc..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdEmojify.java +++ /dev/null @@ -1,44 +0,0 @@ -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 deleted file mode 100644 index fc2be33..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdOwo.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 8c2ea5f..0000000 --- a/resources/patches/slashcommands/code/src/main/java/com/cutthecord/commands/commands/CmdSpoilerImg.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cutthecord.commands.commands; - -import com.discord.stores.StoreStream; - - -public class CmdSpoilerImg { - - public String handleCommand(String msg) { - // TODO StoreStream.getUserSettings().setImageSpoiler(true); - return msg; - } - - public String getPopupInfo() { - return "Prepends SPOILER_ to names of all images attached to the message that starts with this, causing them to get marked as spoiler"; - } - -} diff --git a/resources/old-patches/slashcommands/textreplacegen-array.py b/resources/patches/slashcommands/textreplacegen-array.py similarity index 100% rename from resources/old-patches/slashcommands/textreplacegen-array.py rename to resources/patches/slashcommands/textreplacegen-array.py diff --git a/resources/old-patches/slashcommands/textreplacegen.py b/resources/patches/slashcommands/textreplacegen.py similarity index 100% rename from resources/old-patches/slashcommands/textreplacegen.py rename to resources/patches/slashcommands/textreplacegen.py diff --git a/resources/patches/supplemental/87202.patch b/resources/patches/supplemental/87202.patch deleted file mode 100644 index ec54853..0000000 --- a/resources/patches/supplemental/87202.patch +++ /dev/null @@ -1,442 +0,0 @@ -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; diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py index 124d2ae..73a987d 100644 --- a/resources/scripts/ctcci/ctcci.py +++ b/resources/scripts/ctcci/ctcci.py @@ -48,10 +48,6 @@ 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", @@ -83,13 +79,6 @@ 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)