Merge remote-tracking branch 'origin/main'

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()

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",
 

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("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/tAmxAzSmvB");
+                return;
+            case "vivecraft_mixin":
+                await interaction.reply("Here's a invite to Vivecraft Mixin!\n\nhttps://discord.gg/bnatWRD8v3");
+                return;
+            case "vivecraft":
+                await interaction.reply("Here's a invite to Vivecraft!\n\nhttps://discord.com/invite/2x3QCk8qa9");
+                return;
+            case "questcraft":
+                await interaction.reply("Here's a invite to QuestCraft!\n\nhttps://discord.gg/questcraft")
+                return;
         }
     }
 };

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.

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",