From 3f9fc556984133acb821e001c2ae08e17083fb6c Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Mon, 23 Dec 2024 00:34:21 -0500 Subject: [PATCH 1/8] Switch to switch statements, add XRCraft back, and fix pojav spelling. --- interactions/slash/invites.js | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/interactions/slash/invites.js b/interactions/slash/invites.js index 5aeb4a2..4e6dffa 100644 --- a/interactions/slash/invites.js +++ b/interactions/slash/invites.js @@ -12,25 +12,27 @@ module.exports = { {name: "QuestCraft Discord", value: "questcraft"}, {name: "Vivecraft Discord", value: "vivecraft"}, {name: "Vivecraft Mixin Discord", value: "vivecraft_mixin"}, - {name: "PojavLauncher Discord", value: "pojav_launcher"}, + {name: "PojavLauncher Discord", value: "pojavlauncher"}, + {name: "XRCraft Discord", value: "xrcraft"}, )), async execute(interaction) { const categories = interaction.options.getString("invites"); - if (categories === "questcraft") { - await interaction.reply("https://discord.gg/questcraft"); - return; - } - if (categories === "vivecraft") { - await interaction.reply("https://discord.com/invite/2x3QCk8qa9"); - return; - } - if (categories === "vivecraft_mixin") { - await interaction.reply("https://discord.gg/bnatWRD8v3"); - return; - } - if (categories === "pojav_launcher") { - await interaction.reply("https://discord.gg/pojavlauncher-724163890803638273"); - return; + switch(categories){ + case "xrcraft": + await interaction.reply("https://discord.gg/xrcraft-947244318740054149"); + return; + case "pojavlauncher": + await interaction.reply("https://discord.gg/pojavlauncher-724163890803638273"); + return; + case "vivecraft_mixin": + await interaction.reply("https://discord.gg/bnatWRD8v3"); + return; + case "vivecraft": + await interaction.reply("https://discord.com/invite/2x3QCk8qa9"); + return; + case "questcraft": + await interaction.reply("https://discord.gg/questcraft") + return; } } }; From 0882e491ad94901adadf5e127319dd9b5a96e892 Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Mon, 23 Dec 2024 00:37:34 -0500 Subject: [PATCH 2/8] md --- md-guidelines.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 md-guidelines.md diff --git a/md-guidelines.md b/md-guidelines.md new file mode 100644 index 0000000..fd50dae --- /dev/null +++ b/md-guidelines.md @@ -0,0 +1,5 @@ +# Markdown Guidelines +## Markdown Document Information: +Markdown documents in this bot are loaded dynamically from the repo. This allows for easy updating of markdown, but comes with the caviat that some things are no longer able to be accessed, such as icon settings, image setting, or other. This can be added manually via a direct edit to the JavaScript, but that requires a bot update for it to be changed. +## Guidelines for Markdown +Markdown must be written in the same format as Discord, as the preview window will always show different compared to discord, as Discord does not use line breaks and only uses enter as a new line start. On top of that, it must be English USA. \ No newline at end of file From 4c5c712b5b71c0bb812d47886bf08d733e424229 Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:53:49 -0500 Subject: [PATCH 3/8] added "Here's a invite to (NAME)!" --- interactions/slash/invites.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interactions/slash/invites.js b/interactions/slash/invites.js index 4e6dffa..d4cc99d 100644 --- a/interactions/slash/invites.js +++ b/interactions/slash/invites.js @@ -19,19 +19,19 @@ module.exports = { const categories = interaction.options.getString("invites"); switch(categories){ case "xrcraft": - await interaction.reply("https://discord.gg/xrcraft-947244318740054149"); + await interaction.reply("Here's a invite to XRCraft!\n\nhttps://discord.gg/xrcraft-947244318740054149"); return; case "pojavlauncher": - await interaction.reply("https://discord.gg/pojavlauncher-724163890803638273"); + await interaction.reply("Here's a invite to PojavLauncher!\n\nhttps://discord.gg/pojavlauncher-724163890803638273"); return; case "vivecraft_mixin": - await interaction.reply("https://discord.gg/bnatWRD8v3"); + await interaction.reply("Here's a invite to Vivecraft Mixin!\n\nhttps://discord.gg/bnatWRD8v3"); return; case "vivecraft": - await interaction.reply("https://discord.com/invite/2x3QCk8qa9"); + await interaction.reply("Here's a invite to Vivecraft!\n\nhttps://discord.com/invite/2x3QCk8qa9"); return; case "questcraft": - await interaction.reply("https://discord.gg/questcraft") + await interaction.reply("Here's a invite to QuestCraft!\n\nhttps://discord.gg/questcraft") return; } } From 976c05bbc5b18e278cfefec139b860f0bf56473f Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:17:18 -0500 Subject: [PATCH 4/8] update this as its not working anymore --- interactions/slash/invites.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interactions/slash/invites.js b/interactions/slash/invites.js index d4cc99d..91cc319 100644 --- a/interactions/slash/invites.js +++ b/interactions/slash/invites.js @@ -22,7 +22,7 @@ module.exports = { await interaction.reply("Here's a invite to XRCraft!\n\nhttps://discord.gg/xrcraft-947244318740054149"); return; case "pojavlauncher": - await interaction.reply("Here's a invite to PojavLauncher!\n\nhttps://discord.gg/pojavlauncher-724163890803638273"); + await interaction.reply("Here's a invite to PojavLauncher!\n\nhttps://discord.gg/tAmxAzSmvB"); return; case "vivecraft_mixin": await interaction.reply("Here's a invite to Vivecraft Mixin!\n\nhttps://discord.gg/bnatWRD8v3"); From 64444c5a3bfeecdb4323c6539469787a81a4647f Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:03:50 -0500 Subject: [PATCH 5/8] Remove buggy mess --- interactions/slash/echo.js | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 interactions/slash/echo.js diff --git a/interactions/slash/echo.js b/interactions/slash/echo.js deleted file mode 100644 index 6ad115b..0000000 --- a/interactions/slash/echo.js +++ /dev/null @@ -1,19 +0,0 @@ -const { SlashCommandBuilder } = require("discord.js"); -const { owner } = require("../../config.json"); - -module.exports = { - data: new SlashCommandBuilder() - .setName("echo") - .setDescription("Repeats your message ADMIN ONLY") - .addStringOption(option => option.setName("Message").setRequired(true)), - async execute(interaction) { - if (!owner.includes(interaction.user.id)) { - return await interaction.reply({ - content: "You do not have permission to use this command.", - ephemeral: true - }); - } - - await interaction.reply(interaction.options.getString('message')); - }, -}; \ No newline at end of file From 7a818d6a3aff82bc586ed3e846fb86ab002e4324 Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:04:10 -0500 Subject: [PATCH 6/8] Update package to not include redundant --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 5b8a7da..19f3c60 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "canvas": "^2.11.2", "chalk": "^5.3.0", "child_process": "^1.0.2", - "discord-api-types": "^0.37.99", "discord-gamecord": "^4.4.2", "discord.js": "^14.16.1", "figlet": "^1.7.0", From 9482b2cf58bd6ee246dc8581def7f84f2da85555 Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:13:20 -0500 Subject: [PATCH 7/8] HOW??????? WHY DID IT NOT WORK BEFORE???? THIS DODESN"T MKE ANY SENSE!?!?!??!?!! --- interactions/buttons/category/login/others/others.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/interactions/buttons/category/login/others/others.js b/interactions/buttons/category/login/others/others.js index 86798a3..e3256d1 100644 --- a/interactions/buttons/category/login/others/others.js +++ b/interactions/buttons/category/login/others/others.js @@ -1,6 +1,15 @@ const login_embeds = require("../login_embeds"); const buttons = require("../restart/restart_buttons"); -const embed_adb = require("../../../../slash/adb") +const {EmbedBuilder} = require("discord.js"); +const embed_adb = new EmbedBuilder() + .setTitle("**Uninstalling using ADB commands**") + .setDescription("If you are having trouble uninstalling by normal means and it requires a force uninstall because it is not showing up, you need to make sure you are using **[SideQuest Advanced](https://SideQuestvr.com/setup-howto)** as basic SideQuest wont work. Run the command: ``adb uninstall com.qcxr.qcxr``, as shown in the image below.") + .setImage("https://media.discordapp.net/attachments/1059913125308145716/1111366186274390226/ADB.png?width=643&height=670") + .setColor("Green") + .setFooter({ + text: "Written by my Developers", + iconURL: "https://images-ext-1.discordapp.net/external/5cPanAYF2wOpIhmzrCkina2UpawRtHHU4y2KjFviqCI/%3Fsize%3D4096/https/cdn.discordapp.com/avatars/997670790604542012/92a28b5bb82c7512fe8711fa2fd63163.png?width=633&height=633" + }); module.exports = { id: "others", From f75d359f94910182a16f08173bbe1d6a5470fe41 Mon Sep 17 00:00:00 2001 From: Cart <81428538+Cartrigger@users.noreply.github.com> Date: Wed, 1 Jan 2025 22:28:33 -0500 Subject: [PATCH 8/8] DO NOT LOOK AT THIS COMMIT UNLESS YOU WANT TO BE SCARRED --- events/NSFW_Invites/nsfw_InviteCreate.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/events/NSFW_Invites/nsfw_InviteCreate.js b/events/NSFW_Invites/nsfw_InviteCreate.js index 7767746..23f6bea 100644 --- a/events/NSFW_Invites/nsfw_InviteCreate.js +++ b/events/NSFW_Invites/nsfw_InviteCreate.js @@ -17,7 +17,9 @@ module.exports = { async execute(message) { // Declares const to be used. - const NSFWwords = ["nsfw", "18+", "+18", "🔞", "nude", "addict", "egirl", "sex", "tik", "tok", "tiktok", "onlyfans", "porn", "lust", "bdsm", "hentai", "🍑", "🍆"]; + const NSFWwords = [ + "nsfw", "18+", "+18", "🔞", "nude", "addict", "egirl", "sex", "tik", "tok", "tiktok", "onlyfans", "porn", "lust", "bdsm", "hentai", "🍑", "🍆", "boobs", "tits", "ass", "buttocks", "vagina", "penis", "cock", "pussy", "dick", "cum", "cumshot", "blowjob", "handjob", "masturbation", "erotic", "lewd", "obscene", "vulgar", "racy", "provocative", "sexy", "hot", "horny", "slut", "whore", "threesome", "orgasm", "fetish", "bondage", "dom", "sub", "sadomasochism", "gangbang", "swinger", "swingers", "nudism", "nudist", "topless", "bottomless", "lingerie", "latex", "leather", "kink", "bdsm", "s&m", "anal", "golden shower", "watersports", "bondage", "pornstar", "cam girl", "chaturbate", "vibrator", "dildo", "adult", + ]; const {client, guild, channel, content, author} = message; const no_perms = new EmbedBuilder()