clean up

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');
 

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');

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

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

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

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 = {

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

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

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");
 

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");
 

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");
 

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

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

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 = {

commands/message/search/audio.js

@@ -1,8 +1,6 @@
-const { createEmbed, formatPaginationEmbeds } = require('../../../labscore/utils/embed')
+const { createEmbed } = require('../../../labscore/utils/embed')
-const { link } = require('../../../labscore/utils/markdown')
 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');

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');

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

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

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()}`);
 });

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,

labscore/utils/attachment.js

@@ -1,5 +1,3 @@
-
-
 const attachmentTypes = Object.freeze({
   image: ["image/png", "image/jpeg", "image/gif"]
 })

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

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

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)