Update TOS and all that lovely stuff

PRIVACY.md

@@ -14,6 +14,7 @@ DaalBot sometimes reaches out to 3rd party services to store / retrieve data. Yo
 
 * [ImgBB](https://imgbb.com/) - Used to store images
 * [Twitch](https://www.twitch.tv/) - Used to provide twitch integration
+* [Termbin](https://termbin.com) - Used to store raw data for logging (Deleted automatically after 1 week)
 
 ## Questions and removal
 If you have any questions about the privacy policy please or want your data removed please create a ticket in the [support server](https://lnk.daalbot.xyz/HQ) or contact the bot owner directly.

TERMS.md

@@ -1,24 +1,34 @@
 ### - Conditions
 
-General conditions regarding DaalBot are under this topic.
-##### 1. Our terms and conditions apply to each and every user of DaalBot.
-##### 2. By adding DaalBot in your server, you agree to these terms of service and the future terms which we may add after a notice.
+General conditions regarding DaalBot are under this topic.<br/><br/>
+**1. Our terms and conditions apply to each and every user of DaalBot.**<br/>
+**2. By adding DaalBot in your server, you agree to these terms of service and the future terms which we may add after a notice.**
 
 ### - Glossary
-##### 1. We: The team behind the development of DaalBot
-##### 2. Services: The DaalBot bot itself or any specific "Modules"
-##### 3. Module: Any individual feature inside of DaalBot (eg. Welcome messages, Embeds)
+**1. We: The team behind the development of DaalBot**<br/>
+**2. Services: The DaalBot bot itself or any specific "Modules"**<br/>
+**3. Module: Any individual feature inside of DaalBot (eg. Welcome messages, Embeds)**
 
 ### - Terms of Use
-##### 1. Intentional spam data or attempts to cause the bot to spam outside resources should not be made.
-##### 2. The client is responsible for any content they use our services to create.
+**1. Intentional spam data or attempts to cause the bot to spam outside resources should not be made.**<br/>
+**2. The client is responsible for any content they use our services to create.**
 
 ### - Our rights
-##### 1. We have the right to update terms of service anytime with a notice in the [support server](https://lnk.daalbot.xyz/HQ).
-##### 2. We reserve the right to block or prohibit the use of services to any user / server found to be abusing them.
+**1. We have the right to update terms of service anytime with a notice in the [support server](https://lnk.daalbot.xyz/HQ).**<br/>
+**2. We reserve the right to block or prohibit the use of services to any user / server found to be abusing them.**
 
 ### - Our definition of "Abuse"
 Any content that violates Discords Terms of Service / Community Guidelines, or Any kind of scams or content designed to mislead users.
 
+### - Means of Identification
+We may use your server ID, user ID, IP address, or any other means of indentification to track down users who are abusing our services.
+
+We may check your identifying information against a list of known abusers however we will not share this information with anyone else or store it in any form of database / logs.
+
+*We may also use this information to contact you if we believe you are in violation of our terms of service.*
+
+### - Changes
+We reserve the right to change the terms of service at any time with a notice in the [support server](https://lnk.daalbot.xyz/HQ). It is your responsibility to check for any changes. If you do not agree with the changes you may remove the bot from your server at any time.
+
 ### - Questions and Concerns
 If you have any questions or concerns regarding our terms of service, please contact us by emailing [[email protected]](mailto:[email protected])

buttons/ticket.js

@@ -19,7 +19,7 @@ client.on('interactionCreate', async (interaction) => {
             }
 
             // Check if the server has any tickets free
-            if (fs.readdirSync(path.resolve(`./db/tickets/${interaction.guild.id}/`)).length / 2 >= 25) {
+            if (fs.existsSync(path.resolve(`./db/tickets/${interaction.guild.id}`)) && fs.readdirSync(path.resolve(`./db/tickets/${interaction.guild.id}/`)).length / 2 >= 25) {
                 // if (interaction.user.id === interaction.guild.ownerId) {
                 //     return await interaction.reply({
                 //         content: `This server has reached the maximum amount of tickets. You can upgrade to DaalBot Premium to increase the limit.`,

cmd.hash

@@ -11,7 +11,7 @@ config|29dfb2ca590e077ef98d428fa8090eb6f501c7232568d28f3290ba170aa7fb70
 event|78654ecc742ff95b00d101cd5a29bcf738c7d413b7dd8128b97c13badbfec28e
 lockdown|aa2539dfa3db0d1c62ffb4bc9ddb077af6e936b44b1c6a787fb07f7c409b92ee
 logs|a68a7e9a2fad010768dd91a7bf177b80c73f28cf474d0420778c29788843fbbd
-ticket|af0c2ef411d2d3e76952c2c8472a0beaa67915c7c44c14fad90b1ff1c2a944bc
+ticket|d4186942ba1344e1926a3f22a6de9c9839690f7fce2e6d4e445acad897a89c97
 verify|42b82961da192280157504f498a59cc29e52dcf9f3bf717017ed6a5f67ecad4a
 welcome|7e49422ef702d0ea30e187379851765ffb6b00c595ccf59baa1b6ab655cba822
 help|68a4e331b4664dedd5622dc2ef012a56d8beb8c820ad83c33679404ec2bcabc2

commands/Guild/ticket.js

@@ -88,9 +88,9 @@ module.exports = {
             type: Discord.ApplicationCommandOptionType.Subcommand,
             options: [
                 {
-                    name: Discord.ApplicationCommandOptionType.Boolean,
+                    name: 'role',
                     description: 'The role to modify the permissions for.',
-                    type: Discord.ApplicationCommandOptionType.Boolean,
+                    type: Discord.ApplicationCommandOptionType.Role,
                     required: true
                 },
                 {

commands/Message/embed.js

@@ -118,6 +118,9 @@ module.exports = {
             }
         ],
 
+        /**
+         * @param {{ interaction: DJS.ChatInputCommandInteraction }} param0
+         */
         callback: async ({ interaction }) => {
         if (interaction.options.getSubcommand() === 'builder') {
             // return 'Command has been disabled'
@@ -155,6 +158,8 @@ module.exports = {
             const getPermanentLink = async(attachment) => {
                 if (attachment) {
                     const tempLink = getAttachmentLink(attachment);
+
+                    console.log(tempLink);
 
                     const url = await daalbot.images.createPermLink(tempLink);
 

custom/olilz/ffembed.js

@@ -38,14 +38,31 @@ client.on('messageCreate', async message => {
         data = data.map(row => row.split('    '));
 
         data.forEach(map => {
+            if (map[0].match(/[0-9]\./g)) {
+                // This is a bit of a hacky way to check how many elements to remove
+                if (map[1].includes('.')) {
+                    // Chances are this is useless
+                    map.shift();
+                    map.shift();
+                } else {
+                    map.shift();
+                }
+            }
+
+            let creatorPing = null;
+            if (map[0].includes('<@')) {
+                creatorPing = map[0].trim();
+                map.shift();
+            }
+
             const mapCreator = map[0];
             const mapName = map[1];
             const mapCode = map[2];
             const playerCount = map[3];
             const testedBefore = map[4] === 'TRUE' ? 'Yes' : 'No';
 
             desc += `## ${mapName} - ${mapCreator}\n`
-            desc += `Code: ${mapCode}\n`
+            desc += `Code: [${mapCode}](https://fchq.io/map/${mapCode})\n`
             desc += `Players: ${playerCount}\n`
             desc += `Tested Before: ${testedBefore}\n\n`
         })

listings/top.gg.js

@@ -16,6 +16,7 @@ client.on('guildCreate', async (guild) => {
             console.log(`[LISTINGS] Posted server count to top.gg. Status: ${res.status}`);
         })
         .catch((err) => {
+            // TODO: This keeps logging out a invalid key error. Not too important but should be fixed.
             console.error(`[LISTINGS] Error posting server count to top.gg: ${err}`);
         })
 })