Update tags, add audio commands, fix emoji codepoint parsing

- Update tags
-> Add `{image}`, `{image:ARG}` which will look for the last image url or whatever arg is passed

- Fix emoji codepoint parsing
- Rework media url parsing

- Add audio commands
-> Prefixed
--> `.audio identify`
--> `.video extract audio`
-> Slash
--> `/a convert`
--> `/a identify`
--> `/v extract audio`

Author: cakedan

src/api/endpoints.ts

@@ -13,6 +13,11 @@ export const Api = Object.freeze({
   URL_PUBLIC: Domains.BETA,
   PATH: '/api',
 
+  AUDIO_TOOLS_CONVERT:
+    '/audio/tools/convert',
+  AUDIO_TOOLS_IDENTIFY:
+    '/audio/tools/identify',
+
   COMMANDS:
     '/commands',
 
@@ -252,6 +257,8 @@ export const Api = Object.freeze({
 
   VIDEO_TOOLS_CONVERT:
     '/video/tools/convert',
+  VIDEO_TOOLS_EXTRACT_AUDIO:
+    '/video/tools/extract/audio',
 });
 
 
@@ -273,4 +280,6 @@ export const CDN = Tools.URIEncodeWrap({
 export const CUSTOM = Tools.URIEncodeWrap({
   STEAM_EMOJI: (name: string): string =>
     `https://steamcommunity-a.akamaihd.net/economy/emoticon/${name}`,
+  TWEMOJI_SVG: (codepoint: string) =>
+    `https://raw.githubusercontent.com/twitter/twemoji/master/assets/svg/${codepoint}.svg`,
 });

src/api/index.ts

@@ -26,6 +26,22 @@ export { request } from './raw';
 export { Endpoints, RequestContext, raw };
 
 
+export async function audioToolsConvert(
+  context: RequestContext,
+  options: RestOptions.AudioToolsConvertOptions,
+) {
+  return raw.audioToolsConvert(context, options);
+}
+
+
+export async function audioToolsIdentify(
+  context: RequestContext,
+  options: RestOptions.AudioBaseOptions,
+) {
+  return raw.audioToolsIdentify(context, options);
+}
+
+
 export async function createGuildAllowlist(
   context: RequestContext,
   guildId: string,
@@ -1058,3 +1074,11 @@ export async function videoToolsConvert(
 ) {
   return raw.videoToolsConvert(context, options);
 }
+
+
+export async function videoToolsExtractAudio(
+  context: RequestContext,
+  options: RestOptions.VideoBaseOptions,
+) {
+  return raw.videoToolsExtractAudio(context, options);
+}

src/api/raw.ts

@@ -62,6 +62,42 @@ export async function request(
 }
 
 
+export async function audioToolsConvert(
+  context: RequestContext,
+  options: RestOptions.AudioToolsConvertOptions,
+): Promise<Response> {
+  const query = {
+    to: options.to,
+    url: options.url,
+  };
+  return request(context, {
+    dataOnly: false,
+    query,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.AUDIO_TOOLS_CONVERT,
+    },
+  });
+}
+
+
+export async function audioToolsIdentify(
+  context: RequestContext,
+  options: RestOptions.AudioBaseOptions,
+): Promise<RestResponsesRaw.AudioToolsIdentify> {
+  const query = {
+    url: options.url,
+  };
+  return request(context, {
+    query,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.AUDIO_TOOLS_IDENTIFY,
+    },
+  });
+}
+
+
 export async function createGuildAllowlist(
   context: RequestContext,
   guildId: string,
@@ -160,14 +196,11 @@ export async function createUserCommand(
 ): Promise<RestResponsesRaw.CreateUserCommand> {
   const body = {
     channel_id: options.channelId,
-    content: options.content,
-    content_url: options.contentUrl,
     edited_timestamp: options.editedTimestamp,
     failed_reason: options.failedReason,
     guild_id: options.guildId,
     message_id: options.messageId,
     response_id: options.responseId,
-    response_url: options.responseUrl,
   };
   const params = {userId, command};
   return request(context, {
@@ -2224,3 +2257,21 @@ export async function videoToolsConvert(
     },
   });
 }
+
+
+export async function videoToolsExtractAudio(
+  context: RequestContext,
+  options: RestOptions.VideoBaseOptions,
+): Promise<Response> {
+  const query = {
+    url: options.url,
+  };
+  return request(context, {
+    dataOnly: false,
+    query,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.VIDEO_TOOLS_EXTRACT_AUDIO,
+    },
+  });
+}

src/api/types.ts

@@ -26,6 +26,14 @@ import { User } from './structures/user';
 
 
 export namespace RestOptions {
+  export interface AudioBaseOptions {
+    url: string,
+  }
+
+  export interface AudioToolsConvertOptions extends AudioBaseOptions {
+    to: string,
+  }
+
   export interface CreateGuildLogger {
     channelId: string,
     type: GuildLoggerTypes,
@@ -35,14 +43,11 @@ export namespace RestOptions {
 
   export interface CreateUserCommand {
     channelId: string,
-    content: string,
-    contentUrl?: string,
     editedTimestamp?: null | number,
     failedReason?: string,
     guildId?: string,
     messageId: string,
     responseId?: string,
-    responseUrl?: string,
   }
 
 
@@ -482,6 +487,28 @@ export namespace RestResponses {
 
 export namespace RestResponsesRaw {
 
+  export interface AudioToolsIdentify {
+    error: null | {
+      error_code: number,
+      error_message: string,
+    },
+    result: null | {
+      album: string,
+      artist: string,
+      label: string,
+      release_date: string,
+      song_link: string,
+      timecode: string,
+      title: string,
+      apple_music: any,
+      deezer: any,
+      musicbrainz: any,
+      napster: any,
+      spotify: any,
+    },
+    status: string,
+  }
+
   export type CreateGuildAllowlist = null;
   export type CreateGuildBlocklist = null;
   export type CreateGuildDisabledCommand = null;

src/commands/interactions/basecommand.ts

@@ -188,13 +188,43 @@ export class BaseInteractionCommandOption<ParsedArgsFinished = Interaction.Parse
 }
 
 
+export class BaseInteractionAudioOrVideoCommandOption<ParsedArgsFinished = Interaction.ParsedArgs> extends BaseInteractionCommandOption<ParsedArgsFinished> {
+  constructor(data: Interaction.InteractionCommandOptionOptions = {}) {
+    super({
+      ...data,
+      options: [
+        ...(data.options || []),
+        {name: 'media', description: 'Emoji/Media URL/User', label: 'url', default: DefaultParameters.lastMediaUrl({image: false}), value: Parameters.lastMediaUrl({image: false})},
+        {name: 'file', description: 'Audio/Video File', type: ApplicationCommandOptionTypes.ATTACHMENT},
+      ],
+    });
+  }
+
+  onBeforeRun(context: Interaction.InteractionContext, args: {url?: null | string}) {
+    if (args.url) {
+      context.metadata = Object.assign({}, context.metadata, {contentUrl: args.url});
+    }
+    return !!args.url;
+  }
+
+  onCancelRun(context: Interaction.InteractionContext, args: {url?: null | string}) {
+    if (args.url === undefined) {
+      return editOrReply(context, '⚠ Unable to find any media in the last 50 messages.');
+    } else if (args.url === null) {
+      return editOrReply(context, '⚠ Unable to find that user or it was an invalid url.');
+    }
+    return super.onCancelRun(context, args);
+  }
+}
+
+
 export class BaseInteractionImageCommandOption<ParsedArgsFinished = Interaction.ParsedArgs> extends BaseInteractionCommandOption<ParsedArgsFinished> {
   constructor(data: Interaction.InteractionCommandOptionOptions = {}) {
     super({
       ...data,
       options: [
         ...(data.options || []),
-        {name: 'image', description: 'Emoji/Image URL/User', label: 'url', default: DefaultParameters.lastImageUrl, value: Parameters.lastImageUrl},
+        {name: 'image', description: 'Emoji/Image URL/User', label: 'url', default: DefaultParameters.lastMediaUrl({audio: false, video: false}), value: Parameters.lastMediaUrl({audio: false, video: false})},
         {name: 'file', description: 'Image File', type: ApplicationCommandOptionTypes.ATTACHMENT},
       ],
     });
@@ -224,7 +254,7 @@ export class BaseInteractionVideoCommandOption<ParsedArgsFinished = Interaction.
       ...data,
       options: [
         ...(data.options || []),
-        {name: 'video', description: 'Emoji/Media URL/User', label: 'url', default: DefaultParameters.lastVideoUrl, value: Parameters.lastVideoUrl},
+        {name: 'video', description: 'Emoji/Media URL/User', label: 'url', default: DefaultParameters.lastMediaUrl({audio: false, image: false}), value: Parameters.lastMediaUrl({audio: false, image: false})},
         {name: 'file', description: 'Video File', type: ApplicationCommandOptionTypes.ATTACHMENT},
       ],
     });
@@ -239,7 +269,7 @@ export class BaseInteractionVideoCommandOption<ParsedArgsFinished = Interaction.
 
   onCancelRun(context: Interaction.InteractionContext, args: {url?: null | string}) {
     if (args.url === undefined) {
-      return editOrReply(context, '⚠ Unable to find any media in the last 50 messages.');
+      return editOrReply(context, '⚠ Unable to find any videos in the last 50 messages.');
     } else if (args.url === null) {
       return editOrReply(context, '⚠ Unable to find that user or it was an invalid url.');
     }

src/commands/interactions/slash/audio/convert.ts

@@ -0,0 +1,30 @@
+import { Interaction } from 'detritus-client';
+
+import { Formatter } from '../../../../utils';
+
+import { BaseInteractionAudioOrVideoCommandOption } from '../../basecommand';
+
+
+export const COMMAND_NAME = 'convert';
+
+export class AudioConvertCommand extends BaseInteractionAudioOrVideoCommandOption {
+  description = 'Convert an Audio or Video File';
+  name = COMMAND_NAME;
+
+  constructor() {
+    super({
+      options: [
+        {
+          name: 'to',
+          description: 'Conversion Mimetype',
+          choices: Formatter.Commands.AudioConvert.SLASH_CHOICES,
+          default: Formatter.Commands.AudioConvert.DEFAULT_MIMETYPE,
+        },
+      ],
+    });
+  }
+
+  async run(context: Interaction.InteractionContext, args: Formatter.Commands.AudioConvert.CommandArgs) {
+    return Formatter.Commands.AudioConvert.createMessage(context, args);
+  }
+}

src/commands/interactions/slash/audio/identify.ts

@@ -0,0 +1,17 @@
+import { Interaction } from 'detritus-client';
+
+import { Formatter } from '../../../../utils';
+
+import { BaseInteractionAudioOrVideoCommandOption } from '../../basecommand';
+
+
+export const COMMAND_NAME = 'identify';
+
+export class AudioIdentifyCommand extends BaseInteractionAudioOrVideoCommandOption {
+  description = 'Identify a song in an audio or video file';
+  name = COMMAND_NAME;
+
+  async run(context: Interaction.InteractionContext, args: Formatter.Commands.AudioIdentify.CommandArgs) {
+    return Formatter.Commands.AudioIdentify.createMessage(context, args);
+  }
+}

src/commands/interactions/slash/audio/index.ts

@@ -0,0 +1,22 @@
+import { Permissions } from 'detritus-client/lib/constants';
+
+import { BaseSlashCommand } from '../../basecommand';
+
+import { AudioConvertCommand } from './convert';
+import { AudioIdentifyCommand } from './identify';
+
+
+export default class AudioGroupCommand extends BaseSlashCommand {
+  description = '.';
+  name = 'a';
+
+  constructor() {
+    super({
+      permissions: [Permissions.ATTACH_FILES],
+      options: [
+        new AudioConvertCommand(),
+        new AudioIdentifyCommand(),
+      ],
+    });
+  }
+}

src/commands/interactions/slash/video/extract/audio.ts

@@ -0,0 +1,15 @@
+import { Interaction } from 'detritus-client';
+
+import { Formatter } from '../../../../../utils';
+
+import { BaseInteractionVideoCommandOption } from '../../../basecommand';
+
+
+export class VideoExtractAudioCommand extends BaseInteractionVideoCommandOption {
+  description = 'Extract Audio from a Video';
+  name = 'audio';
+
+  async run(context: Interaction.InteractionContext, args: Formatter.Commands.VideoExtractAudio.CommandArgs) {
+    return Formatter.Commands.VideoExtractAudio.createMessage(context, args);
+  }
+}

src/commands/interactions/slash/video/extract/index.ts

@@ -0,0 +1,17 @@
+import { BaseInteractionCommandOptionGroup } from '../../../basecommand';
+
+import { VideoExtractAudioCommand } from './audio';
+
+
+export class VideoExtractGroupCommand extends BaseInteractionCommandOptionGroup {
+  description = '.';
+  name = 'extract';
+
+  constructor() {
+    super({
+      options: [
+        new VideoExtractAudioCommand(),
+      ],
+    });
+  }
+}