From 128369350fd069a059ff43650a37af1427da67a8 Mon Sep 17 00:00:00 2001
From: derpystuff <3515180-derpystuff@users.noreply.gitlab.com>
Date: Fri, 17 Jun 2022 22:36:10 +0200
Subject: [PATCH] clean up

---
 commands/interaction/tts/texttospeech.js | 1 +
 commands/message/core/shard.js           | 2 +-
 commands/message/core/undo.js            | 2 --
 commands/message/dev/debug/test.js       | 3 ---
 commands/message/dev/eval.js             | 3 ---
 commands/message/dev/reload.js           | 3 ---
 commands/message/dev/update.js           | 4 ----
 commands/message/fun/art.js              | 6 +-----
 commands/message/google/labels.js        | 1 -
 commands/message/google/safetylabels.js  | 1 -
 commands/message/image/dalle.js          | 1 -
 commands/message/info/guild.js           | 3 ---
 commands/message/info/guildicon.js       | 2 --
 commands/message/mod/purge.js            | 3 ++-
 commands/message/search/audio.js         | 4 +---
 commands/message/search/rule34.js        | 3 +--
 commands/message/search/wikihow.js       | 2 +-
 commands/message/search/wolfram-alpha.js | 1 -
 index.js                                 | 7 +++++--
 labscore/client.js                       | 1 -
 labscore/utils/attachment.js             | 2 --
 labscore/utils/embed.js                  | 1 -
 labscore/utils/message.js                | 1 +
 service/makesweet.js                     | 5 +++--
 24 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/commands/interaction/tts/texttospeech.js b/commands/interaction/tts/texttospeech.js
index 7820f2f..c786da9 100644
--- a/commands/interaction/tts/texttospeech.js
+++ b/commands/interaction/tts/texttospeech.js
@@ -3,6 +3,7 @@ const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants;
 
 const { imtranslator } = require('../../../labscore/api');
 const { IMTRANSLATOR_VOICES } = require('../../../labscore/constants');
+
 const { createEmbed } = require('../../../labscore/utils/embed');
 const { icon, highlight } = require('../../../labscore/utils/markdown');
 
diff --git a/commands/message/core/shard.js b/commands/message/core/shard.js
index 90816fa..08667b9 100644
--- a/commands/message/core/shard.js
+++ b/commands/message/core/shard.js
@@ -1,4 +1,4 @@
-const { icon, timestamp, link, codeblock } = require('../../../labscore/utils/markdown')
+const { codeblock } = require('../../../labscore/utils/markdown')
 const { createEmbed } = require('../../../labscore/utils/embed')
 const { editOrReply } = require('../../../labscore/utils/message');
 const { format } = require('../../../labscore/utils/ansi');
diff --git a/commands/message/core/undo.js b/commands/message/core/undo.js
index cd3d28e..4ff4d94 100644
--- a/commands/message/core/undo.js
+++ b/commands/message/core/undo.js
@@ -1,5 +1,3 @@
-const { format } = require('../../../labscore/utils/ansi')
-const { codeblock, icon, highlight } = require('../../../labscore/utils/markdown')
 const { createEmbed } = require('../../../labscore/utils/embed')
 const { editOrReply } = require('../../../labscore/utils/message')
 
diff --git a/commands/message/dev/debug/test.js b/commands/message/dev/debug/test.js
index ddd5a35..f421834 100644
--- a/commands/message/dev/debug/test.js
+++ b/commands/message/dev/debug/test.js
@@ -1,11 +1,8 @@
 const { createEmbed } = require("../../../../labscore/utils/embed");
-const { link } = require("../../../../labscore/utils/markdown");
 const { editOrReply } = require("../../../../labscore/utils/message");
 const { flag } = require("../../../../service/makesweet");
 const { getRecentImage } = require("../../../../labscore/utils/attachment");
 
-const superagent = require('superagent')
-
 module.exports = {
   name: 'test',
   label: 'text',
diff --git a/commands/message/dev/eval.js b/commands/message/dev/eval.js
index b394e03..af3418f 100644
--- a/commands/message/dev/eval.js
+++ b/commands/message/dev/eval.js
@@ -1,6 +1,3 @@
-const { Constants, Utils } = require("detritus-client");
-const Permissions = Constants.Permissions;
-
 const AsyncFunction = Object.getPrototypeOf(async function(){}).constructor;
 
 // TODO: remake this eventually, copy pasted it from v1 cause lazy
diff --git a/commands/message/dev/reload.js b/commands/message/dev/reload.js
index 01fa46c..b940613 100644
--- a/commands/message/dev/reload.js
+++ b/commands/message/dev/reload.js
@@ -1,6 +1,3 @@
-const { Constants, Utils } = require("detritus-client");
-const Permissions = Constants.Permissions;
-
 // TODO: remake this eventually, copy pasted it from v1 cause lazy
 
 module.exports = {
diff --git a/commands/message/dev/update.js b/commands/message/dev/update.js
index e89210c..cf49239 100644
--- a/commands/message/dev/update.js
+++ b/commands/message/dev/update.js
@@ -1,11 +1,7 @@
-const { Constants, Utils } = require("detritus-client");
-const Permissions = Constants.Permissions;
-
 const { createEmbed } = require('../../../labscore/utils/embed')
 const { editOrReply } = require('../../../labscore/utils/message')
 
 const { execSync } = require("child_process");
-const { highlight } = require("../../../labscore/utils/markdown");
 
 module.exports = {
   name: "update",
diff --git a/commands/message/fun/art.js b/commands/message/fun/art.js
index e39f2ba..246d299 100644
--- a/commands/message/fun/art.js
+++ b/commands/message/fun/art.js
@@ -1,12 +1,8 @@
 const { createEmbed } = require('../../../labscore/utils/embed')
-const { format } = require('../../../labscore/utils/ansi')
 const { editOrReply } = require('../../../labscore/utils/message')
-const { STATICS } = require('../../../labscore/utils/statics')
-
-const { paginator } = require('../../../labscore/client');
 
 const superagent = require('superagent');
-const { icon, highlight, codeblock } = require('../../../labscore/utils/markdown');
+const { codeblock } = require('../../../labscore/utils/markdown');
 
 const SIZES = Object.freeze({
   "wallpaper": { x: 1920, y: 1080},
diff --git a/commands/message/google/labels.js b/commands/message/google/labels.js
index 367640b..a6aaf31 100644
--- a/commands/message/google/labels.js
+++ b/commands/message/google/labels.js
@@ -1,7 +1,6 @@
 const { googleVisionLabels } = require("../../../labscore/api");
 const { getRecentImage } = require("../../../labscore/utils/attachment");
 const { createEmbed } = require("../../../labscore/utils/embed");
-const { codeblock } = require("../../../labscore/utils/markdown");
 const { editOrReply } = require("../../../labscore/utils/message");
 const { STATICS } = require("../../../labscore/utils/statics");
 
diff --git a/commands/message/google/safetylabels.js b/commands/message/google/safetylabels.js
index 169a5b4..7784b3d 100644
--- a/commands/message/google/safetylabels.js
+++ b/commands/message/google/safetylabels.js
@@ -1,7 +1,6 @@
 const { googleVisionSafetyLabels } = require("../../../labscore/api");
 const { getRecentImage } = require("../../../labscore/utils/attachment");
 const { createEmbed } = require("../../../labscore/utils/embed");
-const { codeblock } = require("../../../labscore/utils/markdown");
 const { editOrReply } = require("../../../labscore/utils/message");
 const { STATICS } = require("../../../labscore/utils/statics");
 
diff --git a/commands/message/image/dalle.js b/commands/message/image/dalle.js
index a049cca..0e95636 100644
--- a/commands/message/image/dalle.js
+++ b/commands/message/image/dalle.js
@@ -1,4 +1,3 @@
-const { getRecentImage } = require("../../../labscore/utils/attachment");
 const { createEmbed } = require("../../../labscore/utils/embed");
 const { editOrReply } = require("../../../labscore/utils/message");
 
diff --git a/commands/message/info/guild.js b/commands/message/info/guild.js
index 68bcf4e..31ba668 100644
--- a/commands/message/info/guild.js
+++ b/commands/message/info/guild.js
@@ -2,9 +2,6 @@ const { GUILD_FEATURES } = require("../../../labscore/constants");
 const { createEmbed } = require("../../../labscore/utils/embed");
 const { icon, highlight, timestamp, codeblock } = require("../../../labscore/utils/markdown");
 const { editOrReply } = require("../../../labscore/utils/message");
-const { getUser, renderBadges } = require("../../../labscore/utils/users");
-
-const array_chunks = (array, chunk_size) => Array(Math.ceil(array.length / chunk_size)).fill().map((_, index) => index * chunk_size).map(begin => array.slice(begin, begin + chunk_size));
 
 module.exports = {
   name: 'server',
diff --git a/commands/message/info/guildicon.js b/commands/message/info/guildicon.js
index ab7ca83..8b1491a 100644
--- a/commands/message/info/guildicon.js
+++ b/commands/message/info/guildicon.js
@@ -1,5 +1,3 @@
-const { format } = require('../../../labscore/utils/ansi')
-const { codeblock, icon } = require('../../../labscore/utils/markdown')
 const { createEmbed } = require('../../../labscore/utils/embed')
 const { editOrReply } = require('../../../labscore/utils/message')
 
diff --git a/commands/message/mod/purge.js b/commands/message/mod/purge.js
index 329a940..e5445da 100644
--- a/commands/message/mod/purge.js
+++ b/commands/message/mod/purge.js
@@ -1,7 +1,8 @@
 const { Constants } = require("detritus-client");
-const { icon } = require("../../../labscore/utils/markdown");
 const Permissions = Constants.Permissions;
 
+const { icon } = require("../../../labscore/utils/markdown");
+
 // TODO: copy pasted from v1, rework this eventually
 
 module.exports = {
diff --git a/commands/message/search/audio.js b/commands/message/search/audio.js
index 4993737..9ef84e8 100644
--- a/commands/message/search/audio.js
+++ b/commands/message/search/audio.js
@@ -1,8 +1,6 @@
-const { createEmbed, formatPaginationEmbeds } = require('../../../labscore/utils/embed')
-const { link } = require('../../../labscore/utils/markdown')
+const { createEmbed } = require('../../../labscore/utils/embed')
 const { editOrReply } = require('../../../labscore/utils/message')
 
-const { paginator } = require('../../../labscore/client');
 const { searchAudio } = require('../../../labscore/api');
 const { getRecentVideo } = require('../../../labscore/utils/attachment');
 const { renderMusicButtons } = require('../../../labscore/utils/buttons');
diff --git a/commands/message/search/rule34.js b/commands/message/search/rule34.js
index e7476a4..1f3579c 100644
--- a/commands/message/search/rule34.js
+++ b/commands/message/search/rule34.js
@@ -1,7 +1,6 @@
 const { createEmbed, formatPaginationEmbeds } = require('../../../labscore/utils/embed')
-const { link, highlight } = require('../../../labscore/utils/markdown')
+const { highlight } = require('../../../labscore/utils/markdown')
 const { editOrReply } = require('../../../labscore/utils/message')
-const { STATICS } = require('../../../labscore/utils/statics')
 
 const { paginator } = require('../../../labscore/client');
 const { rule34 } = require('../../../labscore/api');
diff --git a/commands/message/search/wikihow.js b/commands/message/search/wikihow.js
index 7c2db25..f791519 100644
--- a/commands/message/search/wikihow.js
+++ b/commands/message/search/wikihow.js
@@ -1,5 +1,5 @@
 const { createEmbed, formatPaginationEmbeds } = require('../../../labscore/utils/embed')
-const { link, icon, highlight } = require('../../../labscore/utils/markdown')
+const { link } = require('../../../labscore/utils/markdown')
 const { editOrReply } = require('../../../labscore/utils/message')
 const { STATICS } = require('../../../labscore/utils/statics')
 
diff --git a/commands/message/search/wolfram-alpha.js b/commands/message/search/wolfram-alpha.js
index 5394f08..9af1dfc 100644
--- a/commands/message/search/wolfram-alpha.js
+++ b/commands/message/search/wolfram-alpha.js
@@ -1,5 +1,4 @@
 const { createEmbed, formatPaginationEmbeds } = require('../../../labscore/utils/embed')
-const { link } = require('../../../labscore/utils/markdown')
 const { editOrReply } = require('../../../labscore/utils/message')
 const { STATICS } = require('../../../labscore/utils/statics')
 
diff --git a/index.js b/index.js
index 24bb7ea..c3e519d 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,5 @@
 const { ClusterManager } = require('detritus-client');
-const express = require('express');
-const app = express();
+
 const time = Date.now();
 
 const token = process.env.token;
@@ -18,6 +17,10 @@ const manager = new ClusterManager(client, token, {
   console.log(`v2 | ready. took ${(Date.now() - time) / 1000}.`)
 })();
 
+// TODO: if i decide that this is necessary for something else, move it to a dedicated directory
+const express = require('express');
+const app = express();
+
 app.get("*", function (request, response) {
   response.send(`🧪 v2 @ ${Date.now()}`);
 });
diff --git a/labscore/client.js b/labscore/client.js
index 9a8415b..770f691 100644
--- a/labscore/client.js
+++ b/labscore/client.js
@@ -29,7 +29,6 @@ let commandPrefix = '.'
 if(process.env.PREFIX_OVERRIDE) commandPrefix = process.env.PREFIX_OVERRIDE;
 
 (async () => {
-  // Run cluster
   await cluster.run();
   const commandClient = new CommandClient(cluster, {
     activateOnEdits: true,
diff --git a/labscore/utils/attachment.js b/labscore/utils/attachment.js
index 79714fc..a367932 100644
--- a/labscore/utils/attachment.js
+++ b/labscore/utils/attachment.js
@@ -1,5 +1,3 @@
-
-
 const attachmentTypes = Object.freeze({
   image: ["image/png", "image/jpeg", "image/gif"]
 })
diff --git a/labscore/utils/embed.js b/labscore/utils/embed.js
index 399ff4e..8ecacce 100644
--- a/labscore/utils/embed.js
+++ b/labscore/utils/embed.js
@@ -1,5 +1,4 @@
 const { COLORS } = require('../constants')
-const { link } = require('./markdown')
 
 // TODO: make embed icons use the general STATICS system
 const embedTypes = Object.freeze({
diff --git a/labscore/utils/message.js b/labscore/utils/message.js
index 0dd6fb2..b867a92 100644
--- a/labscore/utils/message.js
+++ b/labscore/utils/message.js
@@ -2,6 +2,7 @@ module.exports.editOrReply = function(context, message, disableReference = false
   // Apply message_reference
   if(!message.content && !message.embed && !message.embeds && !message.components && !message.files) message = {embeds: [message]}
   if(!message.message_reference && !disableReference) message.reference = true
+  // Disable mentions
   if(!message.allowedMentions) message.allowedMentions = {parse: [], repliedUser: false}
   return context.editOrReply(message)
 }
\ No newline at end of file
diff --git a/service/makesweet.js b/service/makesweet.js
index 96a7cec..a47268c 100644
--- a/service/makesweet.js
+++ b/service/makesweet.js
@@ -22,19 +22,20 @@ async function fetchImage(url) {
 }
 
 async function processMakesweet(effect, args, image) {
+  if(!effects[effect.toLowerCase()]) throw "Invalid Effect"
   try{
     if(image){
       image = await fetchImage(image)
       if(!image) throw "Unable to fetch image"
 
-      let res = await superagent.post(`http://api.makesweet.com/make/${effect}`)
+      let res = await superagent.post(`http://api.makesweet.com/make/${effect.toLowerCase()}`)
         .set("Authorization", process.env.makesweet)
         .buffer(true)
         .query(args)
         .attach('image', image, 'image.png')
       return res;
     }
-    let res = await superagent.post(`http://api.makesweet.com/make/${effect}`)
+    let res = await superagent.post(`http://api.makesweet.com/make/${effect.toLowerCase()}`)
       .set("Authorization", process.env.makesweet)
       .buffer(true)
       .query(args)