Cleanup more of our code

Author: cakedan

src/commands/prefixed/image/grayscale.ts

@@ -1,42 +1,33 @@
 import { Command, CommandClient } from 'detritus-client';
 
-import { imageManipulationGrayscale } from '../../../api';
 import { CommandCategories } from '../../../constants';
-import { imageReply } from '../../../utils';
+import { Formatter } from '../../../utils';
 
 import { BaseImageCommand } from '../basecommand';
 
 
-export interface CommandArgsBefore {
-  url?: null | string,
-}
-
-export interface CommandArgs {
-  url: string,
-}
-
 export const COMMAND_NAME = 'grayscale';
 
-export default class GrayscaleCommand extends BaseImageCommand<CommandArgs> {
+export default class GrayscaleCommand extends BaseImageCommand {
   constructor(client: CommandClient) {
     super(client, {
       name: COMMAND_NAME,
 
       aliases: ['greyscale'],
       metadata: {
+        category: CommandCategories.IMAGE,
         description: 'Grayscale an Image',
         examples: [
           COMMAND_NAME,
           `${COMMAND_NAME} notsobot`,
         ],
-        category: CommandCategories.IMAGE,
+        id: Formatter.Commands.ImageGrayscale.COMMAND_ID,
         usage: '?<emoji,user:id|mention|name,url>',
       },
     });
   }
 
-  async run(context: Command.Context, args: CommandArgs) {
-    const response = await imageManipulationGrayscale(context, args);
-    return imageReply(context, response);
+  async run(context: Command.Context, args: Formatter.Commands.ImageGrayscale.CommandArgs) {
+    return Formatter.Commands.ImageGrayscale.createMessage(context, args);
   }
 }

src/commands/prefixed/image/rotate.ts

@@ -1,27 +1,14 @@
 import { Command, CommandClient } from 'detritus-client';
 
-import { imageToolsRotate } from '../../../api';
 import { CommandCategories } from '../../../constants';
-import { imageReply } from '../../../utils';
+import { Formatter } from '../../../utils';
 
 import { BaseImageCommand } from '../basecommand';
 
 
-export interface CommandArgsBefore {
-  degrees?: number,
-  crop?: boolean,
-  url?: null | string,
-}
-
-export interface CommandArgs {
-  degrees?: number,
-  crop?: boolean,
-  url: string,
-}
-
 export const COMMAND_NAME = 'rotate';
 
-export default class RotateCommand extends BaseImageCommand<CommandArgs> {
+export default class RotateCommand extends BaseImageCommand {
   constructor(client: CommandClient) {
     super(client, {
       name: COMMAND_NAME,
@@ -31,25 +18,21 @@ export default class RotateCommand extends BaseImageCommand<CommandArgs> {
         {name: 'crop', type: Boolean},
       ],
       metadata: {
+        category: CommandCategories.IMAGE,
         description: 'Rotate an Image (default 90 degrees)',
         examples: [
           COMMAND_NAME,
           `${COMMAND_NAME} notsobot`,
           `${COMMAND_NAME} notsobot -degrees 90`,
           `${COMMAND_NAME} notsobot -degrees 90 -nocrop`,
         ],
-        category: CommandCategories.IMAGE,
+        id:  Formatter.Commands.ImageToolsRotate.COMMAND_ID,
         usage: '?<emoji,user:id|mention|name,url> (-degrees <number>) (-nocrop)',
       },
     });
   }
 
-  async run(context: Command.Context, args: CommandArgs) {
-    const response = await imageToolsRotate(context, {
-      crop: args.crop,
-      degrees: args.degrees,
-      url: args.url,
-    });
-    return imageReply(context, response);
+  async run(context: Command.Context, args:  Formatter.Commands.ImageToolsRotate.CommandArgs) {
+    return Formatter.Commands.ImageToolsRotate.createMessage(context, args);
   }
 }

src/commands/prefixed/tools/exif.ts

@@ -1,108 +1,32 @@
 import { Command, CommandClient } from 'detritus-client';
-import { Markup } from 'detritus-client/lib/utils';
 
-import { imageInformationExif } from '../../../api';
-import { RestResponsesRaw } from '../../../api/types';
-import { CommandCategories, EmbedBrands, EmbedColors } from '../../../constants';
-import { createUserEmbed, editOrReply, formatMemory, splitArray } from '../../../utils';
+import { CommandCategories } from '../../../constants';
+import { Formatter } from '../../../utils';
 
 import { BaseImageCommand } from '../basecommand';
 
 
-export interface CommandArgsBefore {
-  url?: null | string,
-}
-
-export interface CommandArgs {
-  url: string,
-}
-
 export const COMMAND_NAME = 'exif';
 
-export default class ExifCommand extends BaseImageCommand<CommandArgs> {
+export default class ExifCommand extends BaseImageCommand {
   constructor(client: CommandClient) {
     super(client, {
       name: COMMAND_NAME,
 
       metadata: {
+        category: CommandCategories.TOOLS,
         description: 'Get exif information from an image',
         examples: [
           COMMAND_NAME,
           `${COMMAND_NAME} https://i.imgur.com/WwiO7Bx.jpg`,
         ],
-        category: CommandCategories.IMAGE,
+        id: Formatter.Commands.ToolsExif.COMMAND_ID,
         usage: '?<emoji,user:id|mention|name,url>',
       },
     });
   }
 
-  async run(context: Command.Context, args: CommandArgs) {
-    const response = await imageInformationExif(context, args);
-    const isGif = (response.information.mimetype === 'image/gif');
-
-    const embed = createUserEmbed(context.user);
-    embed.setColor(EmbedColors.DEFAULT);
-    embed.setFooter('Image Exif Information', EmbedBrands.NOTSOBOT);
-
-    {
-      const { information, metadata } = response;
-
-      const description: Array<string> = [];
-      description.push(`**Color Profile**: ${information.interpretation}`);
-      description.push(`**Dimensions**: ${information.width}x${information.height}`);
-      if (isGif) {
-        description.push(`**Frames**: ${information.frames.toLocaleString()}`);
-        description.push(`**Frame Delay**: ${information.delay.toLocaleString()}`);
-        description.push(`**Loops**: ${(information.loop) ? 'Yes' : 'No'}`);
-      }
-      description.push(`**Mimetype**: ${information.mimetype}`);
-      description.push(`**Size**: ${formatMemory(information.size)}`);
-
-      if (metadata['gif-comment']) {
-        description.push('');
-        description.push(`**Comment**`);
-        description.push(Markup.codeblock(metadata['gif-comment']))
-      }
-
-      embed.setDescription(description.join('\n'));
-    }
-
-    if (response.exif.length) {
-      const exif = response.exif.map((field) => {
-        field.name = field.name.split('-').pop() as string;
-        return field;
-      }).sort((x, y) => x.name.localeCompare(y.name));
-
-      const split = splitArray<any>(exif, 3);
-      for (let i = 0; i < split.length; i++) {
-        const fields = split[i];
-        const description: Array<string> = [];
-
-        for (let field of fields) {
-          let value: string;
-          if (field.description === field.value) {
-            value = field.value;
-          } else {
-            value = `${field.value} (${field.description})`;
-          }
-          if (value) {
-            description.push(`**${field.name.split('-').pop()}**`);
-            description.push(`-> ${value}`);
-          }
-        }
-
-        const title = (!i) ? 'Exif Data' : '\u200b';
-        embed.addField(title, description.join('\n') || '\u200b', true);
-      }
-      if (response.url) {
-        embed.setImage(response.url);
-      }
-    } else {
-      if (response.url) {
-        embed.setThumbnail(response.url);
-      }
-    }
-
-    return editOrReply(context, {embed});
+  async run(context: Command.Context, args: Formatter.Commands.ToolsExif.CommandArgs) {
+    return Formatter.Commands.ToolsExif.createMessage(context, args);
   }
 }

src/utils/formatter/commands/image.grayscale.ts

@@ -0,0 +1,19 @@
+import { Command, Interaction } from 'detritus-client';
+
+import { imageManipulationGrayscale } from '../../../api';
+import { imageReply } from '../../../utils';
+
+
+export const COMMAND_ID = 'image.grayscale';
+
+export interface CommandArgs {
+  url: string,
+}
+
+export async function createMessage(
+  context: Command.Context | Interaction.InteractionContext,
+  args: CommandArgs,
+) {
+  const response = await imageManipulationGrayscale(context, args);
+  return imageReply(context, response);
+}

src/utils/formatter/commands/image.tools.rotate.ts

@@ -7,9 +7,8 @@ import { imageReply } from '../../../utils';
 export const COMMAND_ID = 'image.tools.rotate';
 
 export interface CommandArgs {
-  amount?: number,
-  iterations?: number,
-  seed?: number,
+  crop?: boolean,
+  degrees?: number,
   url: string,
 }
 

src/utils/formatter/commands/index.ts

@@ -22,6 +22,7 @@ import * as ImageGifSeeSaw from './image.gif.seesaw';
 import * as ImageGifSpeed from './image.gif.speed';
 import * as ImageGlitch from './image.glitch';
 import * as ImageGold from './image.gold';
+import * as ImageGrayscale from './image.grayscale';
 import * as ImageImplode from './image.implode';
 import * as ImageInvert from './image.invert';
 import * as ImageLegofy from './image.legofy';
@@ -82,6 +83,7 @@ import * as TagRemove from './tag.remove';
 import * as TagShow from './tag.show';
 
 import * as ToolsCode from './tools.code';
+import * as ToolsExif from './tools.exif';
 import * as ToolsHash from './tools.hash';
 import * as ToolsOCR from './tools.ocr';
 import * as ToolsOCRTranslate from './tools.ocrtranslate';
@@ -117,6 +119,7 @@ export {
   ImageGifSpeed,
   ImageGlitch,
   ImageGold,
+  ImageGrayscale,
   ImageImplode,
   ImageInvert,
   ImageLegofy,
@@ -169,6 +172,7 @@ export {
   TagRemove,
   TagShow,
   ToolsCode,
+  ToolsExif,
   ToolsHash,
   ToolsOCR,
   ToolsOCRTranslate,

src/utils/formatter/commands/tools.exif.ts

@@ -10,7 +10,6 @@ import { createUserEmbed, editOrReply, formatMemory, splitArray } from '../../..
 export const COMMAND_ID = 'tools.exif';
 
 export interface CommandArgs {
- isEphemeral?: boolean,
  url: string, 
 }