Added .e2p and .e2e

Author: cakedan

package.json

@@ -10,14 +10,15 @@
   "dependencies": {
     "@sentry/node": "^6.4.1",
     "chrono-node": "^2.3.8",
-    "detritus-client": "^0.17.0-beta.8",
-    "detritus-client-rest": "^0.11.0-beta.3",
+    "detritus-client": "^0.17.0-beta.10",
+    "detritus-rest": "^0.9.0-beta.4",
     "emoji-aware": "^3.0.5",
     "juration": "^0.1.1",
     "moment": "^2.29.1",
     "moment-duration-format": "^2.3.2",
     "moment-timezone": "^0.5.32",
-    "redis": "^3.1.2"
+    "redis": "^3.1.2",
+    "undici": "^5.1.1"
   },
   "devDependencies": {
     "@types/moment-duration-format": "^2.2.2",

src/api/endpoints.ts

@@ -125,6 +125,8 @@ export const Api = Object.freeze({
     '/image/manipulation/mirror-top',
   IMAGE_MANIPULATION_PAPER:
     '/image/manipulation/paper',
+  IMAGE_MANIPULATION_PIX2PIX:
+    '/image/manipulation/pix2pix',
   IMAGE_MANIPULATION_PIXELATE:
     '/image/manipulation/pixelate',
   IMAGE_MANIPULATION_RAIN:

src/api/index.ts

@@ -640,6 +640,14 @@ export async function imageManipulationPaper(
 }
 
 
+export async function imageManipulationPix2Pix(
+  context: RequestContext,
+  options: RestOptions.ImageManipulationPix2Pix,
+) {
+  return raw.imageManipulationPix2Pix(context, options);
+}
+
+
 export async function imageManipulationPixelate(
   context: RequestContext,
   options: RestOptions.ImageManipulationPixelate,

src/api/raw.ts

@@ -1280,6 +1280,25 @@ export async function imageManipulationPaper(
 }
 
 
+export async function imageManipulationPix2Pix(
+  context: RequestContext,
+  options: RestOptions.ImageManipulationPix2Pix,
+): Promise<Response> {
+  const query = {
+    model: options.model,
+    url: options.url,
+  };
+  return request(context, {
+    dataOnly: false,
+    query,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.IMAGE_MANIPULATION_PIX2PIX,
+    },
+  });
+}
+
+
 export async function imageManipulationPixelate(
   context: RequestContext,
   options: RestOptions.ImageManipulationPixelate,

src/api/types.ts

@@ -247,6 +247,10 @@ export namespace RestOptions {
     top: string,
   }
 
+  export interface ImageManipulationPix2Pix extends ImageBaseOptions {
+    model: string,
+  }
+
   export interface ImageManipulationPixelate extends ImageBaseOptions {
     pixelWidth?: number,
   }

src/commands/prefixed/image/deepfry.ts

@@ -6,14 +6,9 @@ import { Formatter } from '../../../utils';
 import { BaseImageCommand } from '../basecommand';
 
 
-export interface CommandArgsBefore {
-  scale?: number,
-  url?: null | string,
-}
-
 export const COMMAND_NAME = 'deepfry';
 
-export default class DeepfryCommand extends BaseImageCommand<Formatter.Commands.ImageDeepfry.CommandArgs> {
+export default class DeepfryCommand extends BaseImageCommand {
   constructor(client: CommandClient) {
     super(client, {
       name: COMMAND_NAME,

src/commands/prefixed/image/e2e.ts

@@ -0,0 +1,33 @@
+import { Command, CommandClient } from 'detritus-client';
+
+import { CommandCategories } from '../../../constants';
+import { Formatter } from '../../../utils';
+
+import { BaseImageCommand } from '../basecommand';
+
+
+export const COMMAND_NAME = 'e2e';
+
+export default class E2ECommand extends BaseImageCommand {
+  constructor(client: CommandClient) {
+    super(client, {
+      name: COMMAND_NAME,
+
+      aliases: ['edges2emoji'],
+      metadata: {
+        category: CommandCategories.IMAGE,
+        description: 'Edges to Emoji',
+        examples: [
+          COMMAND_NAME,
+          `${COMMAND_NAME} notsobot`,
+        ],
+        id: Formatter.Commands.ImageManipulationE2E.COMMAND_ID,
+        usage: '?<emoji,user:id|mention|name,url>',
+      },
+    });
+  }
+
+  async run(context: Command.Context, args: Formatter.Commands.ImageManipulationE2E.CommandArgs) {
+    return Formatter.Commands.ImageManipulationE2E.createMessage(context, args);
+  }
+}

src/commands/prefixed/image/e2p.ts

@@ -0,0 +1,33 @@
+import { Command, CommandClient } from 'detritus-client';
+
+import { CommandCategories } from '../../../constants';
+import { Formatter } from '../../../utils';
+
+import { BaseImageCommand } from '../basecommand';
+
+
+export const COMMAND_NAME = 'e2p';
+
+export default class E2PCommand extends BaseImageCommand {
+  constructor(client: CommandClient) {
+    super(client, {
+      name: COMMAND_NAME,
+
+      aliases: ['edges2porn'],
+      metadata: {
+        category: CommandCategories.IMAGE,
+        description: 'Edges to Porn',
+        examples: [
+          COMMAND_NAME,
+          `${COMMAND_NAME} notsobot`,
+        ],
+        id: Formatter.Commands.ImageManipulationE2P.COMMAND_ID,
+        usage: '?<emoji,user:id|mention|name,url>',
+      },
+    });
+  }
+
+  async run(context: Command.Context, args: Formatter.Commands.ImageManipulationE2P.CommandArgs) {
+    return Formatter.Commands.ImageManipulationE2P.createMessage(context, args);
+  }
+}

src/commands/prefixed/image/explode.ts

@@ -6,14 +6,9 @@ import { Formatter } from '../../../utils';
 import { BaseImageCommand } from '../basecommand';
 
 
-export interface CommandArgsBefore {
-  scale?: number,
-  url?: null | string,
-}
-
 export const COMMAND_NAME = 'explode';
 
-export default class ExplodeCommand extends BaseImageCommand<Formatter.Commands.ImageExplode.CommandArgs> {
+export default class ExplodeCommand extends BaseImageCommand {
   constructor(client: CommandClient) {
     super(client, {
       name: COMMAND_NAME,

src/commands/prefixed/moderation/commands.disable.ts

@@ -1,5 +1,6 @@
 import { Command, CommandClient, Structures } from 'detritus-client';
 import { ChannelTypes, Permissions } from 'detritus-client/lib/constants';
+import { Markup } from 'detritus-client/lib/utils';
 
 import { createGuildDisabledCommand, editGuildSettings } from '../../../api';
 import { GuildSettings } from '../../../api/structures/guildsettings';
@@ -96,16 +97,17 @@ export default class CommandsDisable extends BaseCommand {
 
   async run(context: Command.Context, args: CommandArgs) {
     const { command } = args;
+    const commandId = (command.metadata && command.metadata.id) ? command.metadata.id : command.name.split(' ').join('.');
     const guildId = context.guildId as string;
 
     const isServerWide = !args.channels && !args.roles && !args.users;
 
     let settings = await GuildSettingsStore.getOrFetch(context, guildId) as GuildSettings;
 
-    let title = `Disabled ${command.name}`;
+    let title = `Disabled ${Markup.codestring(commandId)}`;
     if (isServerWide) {
       title = `${title} server-wide`;
-      await createGuildDisabledCommand(context, guildId, command.name, guildId, GuildDisableCommandsTypes.GUILD);
+      await createGuildDisabledCommand(context, guildId, commandId, guildId, GuildDisableCommandsTypes.GUILD);
       settings = await GuildSettingsStore.fetch(context, guildId) as GuildSettings;
     } else {
       let channels = 0, roles = 0, users = 0;
@@ -131,7 +133,7 @@ export default class CommandsDisable extends BaseCommand {
       }
 
       for (let payload of payloads) {
-        const key = `${command.name}.${payload.item.id}.${payload.type}`;
+        const key = `${commandId}.${payload.item.id}.${payload.type}`;
         if (!settings.disabledCommands.has(key)) {
           await createGuildDisabledCommand(context, guildId, command.name, payload.item.id, payload.type);
         }