commands/tags/tags.js

@@ -8,6 +8,7 @@ class TagsCommand extends Command {
   // todo: attempt to not make this file the worst thing that human eyes have ever seen
   async run() {
     this.success = false;
+    if (!this.guild) return "This command only works in servers!";
     const cmd = this.type === "classic" ? (this.args[0] ?? "").toLowerCase() : this.optionsArray[0].name;
     if (!cmd || !cmd.trim()) return "You need to provide the name of the tag you want to view!";
     const tagName = this.type === "classic" ? this.args.slice(1)[0] : (this.optionsArray[0].options[0] ?? {}).value;
@@ -15,7 +16,7 @@ class TagsCommand extends Command {
     if (cmd === "create" || cmd === "add") {
       if (!tagName || !tagName.trim()) return "You need to provide the name of the tag you want to add!";
       if (blacklist.includes(tagName)) return "You can't make a tag with that name!";
-      const getResult = await database.getTag(this.channel, tagName);
+      const getResult = await database.getTag(this.guild.id, tagName);
       if (getResult) return "This tag already exists!";
       const result = await database.setTag(tagName, { content: this.type === "classic" ? this.args.slice(2).join(" ") : this.optionsArray[0].options[1].value, author: this.member.id }, this.guild);
       this.success = true;
@@ -23,25 +24,25 @@ class TagsCommand extends Command {
       return `The tag \`${tagName}\` has been added!`;
     } else if (cmd === "delete" || cmd === "remove") {
       if (!tagName || !tagName.trim()) return "You need to provide the name of the tag you want to delete!";
-      const getResult = await database.getTag(this.channel, tagName);
+      const getResult = await database.getTag(this.guild.id, tagName);
       if (!getResult) return "This tag doesn't exist!";
       const owners = process.env.OWNER.split(",");
-      if (getResult.author !== this.author && !owners.includes(this.author)) return "You don't own this tag!";
+      if (getResult.author !== this.author && !this.member.permissions.has("MANAGE_MESSAGES") && !owners.includes(this.author)) return "You don't own this tag!";
       await database.removeTag(tagName, this.guild);
       this.success = true;
       return `The tag \`${tagName}\` has been deleted!`;
     } else if (cmd === "edit") {
       if (!tagName || !tagName.trim()) return "You need to provide the name of the tag you want to edit!";
-      const getResult = await database.getTag(this.channel, tagName);
+      const getResult = await database.getTag(this.guild.id, tagName);
       if (!getResult) return "This tag doesn't exist!";
       const owners = process.env.OWNER.split(",");
-      if (getResult.author !== this.author && !owners.includes(this.author)) return "You don't own this tag!";
+      if (getResult.author !== this.author && !this.member.permissions.has("MANAGE_MESSAGES") && !owners.includes(this.author)) return "You don't own this tag!";
       await database.editTag(tagName, { content: this.type === "classic" ? this.args.slice(2).join(" ") : this.optionsArray[0].options[1].value, author: this.member.id }, this.guild);
       this.success = true;
       return `The tag \`${tagName}\` has been edited!`;
     } else if (cmd === "own" || cmd === "owner") {
       if (!tagName || !tagName.trim()) return "You need to provide the name of the tag you want to check the owner of!";
-      const getResult = await database.getTag(this.channel, tagName);
+      const getResult = await database.getTag(this.guild.id, tagName);
       if (!getResult) return "This tag doesn't exist!";
       const user = this.client.users.get(getResult.author);
       this.success = true;
@@ -57,41 +58,39 @@ class TagsCommand extends Command {
       }
     } else if (cmd === "list") {
       if (!this.channel.permissionsOf(this.client.user.id.toString()).has("EMBED_LINKS")) return "I don't have the `Embed Links` permission!";
-      const tagList = await database.getTags(this.channel);
+      const tagList = await database.getTags(this.guild.id);
       const embeds = [];
       const groups = Object.keys(tagList).map((item, index) => {
         return index % 15 === 0 ? Object.keys(tagList).slice(index, index + 15) : null;
       }).filter((item) => {
         return item;
       });
-      let output = JSON.stringify(groups.entries());
-      // for (const [i, value] of groups.entries()) {
-      //   // embeds.push({
-      //   //   embeds: [{
-      //   //     title: "Tag List",
-      //   //     color: 16711680,
-      //   //     footer: {
-      //   //       text: `Page ${i + 1} of ${groups.length}`
-      //   //     },
-      //   //     description: value.join("\n"),
-      //   //     author: {
-      //   //       name: this.author.username,
-      //   //       iconURL: this.author.avatarURL()
-      //   //     }
-      //   //   }]
-      //   // });
-      // }
+      for (const [i, value] of groups.entries()) {
+        embeds.push({
+          embeds: [{
+            title: "Tag List",
+            color: 16711680,
+            footer: {
+              text: `Page ${i + 1} of ${groups.length}`
+            },
+            description: value.join("\n"),
+            author: {
+              name: this.author.username,
+              iconURL: this.author.avatarURL()
+            }
+          }]
+        });
+      }
       if (embeds.length === 0) return "I couldn't find any tags!";
       this.success = true;
-      return output;
-      // return paginator(this.client, { type: this.type, message: this.message, interaction: this.interaction, channel: this.channel, author: this.author }, embeds);
+      return paginator(this.client, { type: this.type, message: this.message, interaction: this.interaction, channel: this.channel, author: this.author }, embeds);
     } else {
       let getResult;
       if (cmd === "random") {
-        const tagList = await database.getTags(this.channel);
+        const tagList = await database.getTags(this.guild.id);
         getResult = tagList[random(Object.keys(tagList))];
       } else {
-        getResult = await database.getTag(this.channel, this.type === "classic" ? cmd : tagName);
+        getResult = await database.getTag(this.guild.id, this.type === "classic" ? cmd : tagName);
       }
       if (!getResult) return "This tag doesn't exist!";
       this.success = true;

natives/explode.cc

@@ -7,7 +7,7 @@ using namespace vips;
 
 char *Explode(string type, string *outType, char *BufferData,
               size_t BufferLength, ArgumentMap Arguments, size_t *DataSize) {
-  bool implode = GetArgumentWithFallback<bool>(Arguments, "implode", false);
+  bool implode = GetArgument<bool>(Arguments, "implode");
   string basePath = GetArgument<string>(Arguments, "basePath");
 
   VOption *options = VImage::option();

natives/reddit.cc

@@ -7,7 +7,7 @@ using namespace vips;
 
 char *Reddit(string type, string *outType, char *BufferData,
              size_t BufferLength, ArgumentMap Arguments, size_t *DataSize) {
-  string text = GetArgumentWithFallback<string>(Arguments, "text", "");
+  string text = GetArgument<string>(Arguments, "text");
   string basePath = GetArgument<string>(Arguments, "basePath");
 
   VOption *options = VImage::option()->set("access", "sequential");