Merge remote-tracking branch 'origin/main' into main

command/NSFW/ass.js

@@ -1,40 +0,0 @@
-const { MessageEmbed } = require("discord.js");
-const { getreddit } = require("cath");
-module.exports = {
-  name: "ass",
-  description: "Get some ass images",
-  run: async (client, interaction) => {
-    if (!interaction.channel.nsfw) {
-      const embed = new MessageEmbed()
-        .setTitle(`AYO Calm Yo Cheeks`)
-        .setDescription("This command only works in NSFW Channels!")
-        .setImage(
-          "https://media.discordapp.net/attachments/851761493815853060/893777701599584266/warning.gif"
-        )
-        .setColor(client.color)
-        .setFooter(`Made by ${client.author}`, client.user.displayAvatarURL())
-        .setTimestamp();
-      interaction.followUp({ embeds: [embed] });
-    } else {
-      const subreddits = ["ass", "BestBooties", "BootyGIFs", "booty_queens"];
-      const reddit = subreddits[Math.round(Math.random() * subreddits.length)];
-      const data = await getreddit(reddit);
-      interaction.followUp({
-        embeds: [
-          new MessageEmbed({
-            title: data.title,
-            url: data.url,
-            image: { url: data.image },
-            timestamp: Date.now(),
-            footer: { text: data.footer },
-            color: client.color,
-            author: {
-              name: interaction.user.tag,
-              iconURL: interaction.user.displayAvatarURL({ dynamic: true }),
-            },
-          }),
-        ],
-      });
-    }
-  },
-};

command/NSFW/blowjob.js

@@ -1,48 +0,0 @@
-const { MessageEmbed } = require("discord.js");
-const { getreddit } = require("cath");
-module.exports = {
-  name: "blowjob",
-  description: "Get some blowjob images",
-  run: async (client, interaction) => {
-    if (!interaction.channel.nsfw) {
-      const embed = new MessageEmbed()
-        .setTitle(`AYO Calm Yo Cheeks`)
-        .setDescription("This command only works in NSFW Channels!")
-        .setImage(
-          "https://media.discordapp.net/attachments/851761493815853060/893777701599584266/warning.gif"
-        )
-        .setColor(client.color)
-        .setFooter(`Made by ${client.author}`, client.user.displayAvatarURL())
-        .setTimestamp();
-
-      interaction.followUp({ embeds: [embed] });
-    } else {
-      const subreddits = [
-        "BlowJob",
-        "blowjobs",
-        "blowjobgifs",
-        "OralSex",
-        "PushHerHead",
-        "ThroatFuck",
-      ];
-      const reddit = subreddits[Math.round(Math.random() * subreddits.length)];
-      const data = await getreddit(reddit);
-      interaction.followUp({
-        embeds: [
-          new MessageEmbed({
-            title: data.title,
-            url: data.url,
-            image: { url: data.image },
-            timestamp: Date.now(),
-            footer: { text: data.footer },
-            color: client.color,
-            author: {
-              name: interaction.user.tag,
-              iconURL: interaction.user.displayAvatarURL({ dynamic: true }),
-            },
-          }),
-        ],
-      });
-    }
-  },
-};

command/NSFW/boobs.js

@@ -1,40 +0,0 @@
-const { MessageEmbed } = require("discord.js");
-const { getreddit } = require("cath");
-module.exports = {
-  name: "boobs",
-  description: "Get some boobie images",
-  run: async (client, interaction) => {
-    if (!interaction.channel.nsfw) {
-      const embed = new MessageEmbed()
-        .setTitle(`AYO Calm Yo Cheeks`)
-        .setDescription("This command only works in NSFW Channels!")
-        .setImage(
-          "https://media.discordapp.net/attachments/851761493815853060/893777701599584266/warning.gif"
-        )
-        .setColor(client.color)
-        .setFooter(`Made by ${client.author}`, client.user.displayAvatarURL())
-        .setTimestamp();
-      interaction.followUp({ embeds: [embed] });
-    } else {
-      const subreddits = ["boobs", "GrabHerTitties", "titfuck"];
-      const reddit = subreddits[Math.round(Math.random() * subreddits.length)];
-      const data = await getreddit(reddit);
-      interaction.followUp({
-        embeds: [
-          new MessageEmbed({
-            title: data.title,
-            url: data.url,
-            image: { url: data.image },
-            timestamp: Date.now(),
-            footer: { text: data.footer },
-            color: client.color,
-            author: {
-              name: interaction.user.tag,
-              iconURL: interaction.user.displayAvatarURL({ dynamic: true }),
-            },
-          }),
-        ],
-      });
-    }
-  },
-};

command/NSFW/hentai.js

@@ -1,40 +0,0 @@
-const { MessageEmbed } = require("discord.js");
-const { getreddit } = require("cath");
-module.exports = {
-  name: "hentai",
-  description: "Get some hentai images",
-  run: async (client, interaction) => {
-    if (!interaction.channel.nsfw) {
-      const embed = new MessageEmbed()
-        .setTitle(`AYO Calm Yo Cheeks`)
-        .setDescription("This command only works in NSFW Channels!")
-        .setImage(
-          "https://media.discordapp.net/attachments/851761493815853060/893777701599584266/warning.gif"
-        )
-        .setColor(client.color)
-        .setFooter(`Made by ${client.author}`, client.user.displayAvatarURL())
-        .setTimestamp();
-      interaction.followUp({ embeds: [embed] });
-    } else {
-      const subreddits = ["hentai", "HentaiAnime", "nekogirls"];
-      const reddit = subreddits[Math.round(Math.random() * subreddits.length)];
-      const data = await getreddit(reddit);
-      interaction.followUp({
-        embeds: [
-          new MessageEmbed({
-            title: data.title,
-            url: data.url,
-            image: { url: data.image },
-            timestamp: Date.now(),
-            footer: { text: data.footer },
-            color: client.color,
-            author: {
-              name: interaction.user.tag,
-              iconURL: interaction.user.displayAvatarURL({ dynamic: true }),
-            },
-          }),
-        ],
-      });
-    }
-  },
-};

command/NSFW/pussy.js

@@ -1,42 +0,0 @@
-const { MessageEmbed } = require("discord.js");
-const { getreddit } = require("cath");
-
-module.exports = {
-  name: "pussy",
-  description: "Get some vagina images",
-  run: async (client, interaction) => {
-    if (!interaction.channel.nsfw) {
-      const embed = new MessageEmbed()
-        .setTitle(`AYO Calm Yo Cheeks`)
-        .setDescription("This command only works in NSFW Channels!")
-        .setImage(
-          "https://media.discordapp.net/attachments/851761493815853060/893777701599584266/warning.gif"
-        )
-        .setColor(client.color)
-        .setFooter(`Made by ${client.author}`, client.user.displayAvatarURL())
-        .setTimestamp();
-      interaction.followUp({ embeds: [embed] });
-      return;
-    } else {
-      const subreddits = ["vagina", "GodPussy", "peachlips"];
-      const reddit = subreddits[Math.round(Math.random() * subreddits.length)];
-      const data = await getreddit(reddit);
-      interaction.followUp({
-        embeds: [
-          new MessageEmbed({
-            title: data.title,
-            url: data.url,
-            image: { url: data.image },
-            timestamp: Date.now(),
-            footer: { text: data.footer },
-            color: client.color,
-            author: {
-              name: interaction.user.tag,
-              iconURL: interaction.user.displayAvatarURL({ dynamic: true }),
-            },
-          }),
-        ],
-      });
-    }
-  },
-};

command/Utilities/nsfw.js

@@ -2,7 +2,7 @@ const { getreddit } = require("cath");
 const { MessageActionRow, MessageButton, MessageEmbed } = require("discord.js");
 module.exports = {
   name: "nsfw",
-  description: "nsfw command",
+  description: "NSFW command",
   run: async (client, interaction) => {
     const msg = await interaction.channel.send({ content: "Getting images" });
     async function embed() {
@@ -14,11 +14,17 @@ module.exports = {
             "https://media.discordapp.net/attachments/851761493815853060/893777701599584266/warning.gif"
           )
           .setColor(client.color)
-          .setFooter(`Made by ${client.author}`, client.user.displayAvatarURL())
+          .setFooter({
+            text: `Made by ${client.author}`,
+            iconURL: client.user.displayAvatarURL(),
+          })
           .setTimestamp();
         interaction.followUp({ embeds: [embed] });
       }
       let subreddits = [
+        "GodPussy",
+        "peachlips",
+        "vagina",
         "GoneWild",
         "WorkGoneWild",
         "GoneWild30Plus",
@@ -42,9 +48,16 @@ module.exports = {
         "thighs",
         "PerfectThighs",
         "thickthighs",
+        "PushHerHead",
+        "ThroatFuck",
       ];
       const reddit = subreddits[Math.round(Math.random() * subreddits.length)];
-      const data = await getreddit(reddit);
+      let data = await getreddit(reddit);
+      while (data.length === 0) {
+        while (data.image.length === 0) {
+          data = await getreddit(reddit);
+        }
+      }
       let embed1 = null;
       embed1 = new MessageEmbed({
         title: data.title,

util/Data/domains.json

@@ -1,5 +1,10 @@
 {
   "scam": [
+    "disceord.gift",
+    "discode.gift",
+    "discosb.gift",
+    "discorx.gift",
+    "disocrds.gift",
     "disocrde.gift",
     "discrods.gift",
     "discordsgift.com",

util/functions/common.js

@@ -345,7 +345,7 @@ function attachmentsIdentifier(inpmsg, gun) {
       probables[probables.length - 1].length != 1 ||
       probables.length < splitInputAttachmentsName.length
     ) {
-      // ask the user if he/she means xxx = which attachment
+      // ask the user if he means xxx = which attachment
       errors.push(
         `\`
           ${curr
@@ -358,6 +358,7 @@ function attachmentsIdentifier(inpmsg, gun) {
           "\``
       );
     }
+    // push the attachment to the output list
     outAttachments.push(gun.aments[probables[probables.length - 1][0]]);
   }