Added .object remove and /i objects remove

NotSoSuper · NotSoSuper · commit 91559cdf2bbd · 2022-05-08T21:41:01.000Z
Fixed minor bug with background remove prefixed command class name
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-/lib
+/lib
+config.json
diff --git a/config.example.json b/config.example.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,14 +10,14 @@
   "dependencies": {
     "@sentry/node": "^6.4.1",
     "chrono-node": "^2.3.8",
-    "detritus-client": "^0.17.0-beta.10",
-    "detritus-rest": "^0.9.0-beta.4",
+    "detritus-client": "^0.17.0-beta.11",
     "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",
+    "typescript": "^4.6.4",
     "undici": "^5.1.1"
   },
   "devDependencies": {
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
@@ -4,14 +4,14 @@ import { Tools } from 'detritus-utils';
 export enum Domains {
   CDN = 'https://cdn.notsobot.com',
   BETA = 'https://beta.notsobot.com',
-  LOCALHOST = 'http://localhost',
+  LOCALHOST = 'http://localhost:8888',
   STABLE = 'https://notsobot.com',
 }
 
 export const Api = Object.freeze({
-  URL: Domains.BETA,
+  URL: Domains.LOCALHOST,
   URL_PUBLIC: Domains.BETA,
-  PATH: '/api',
+  PATH: '',
 
   AUDIO_TOOLS_CONVERT:
     '/audio/tools/convert',
@@ -173,6 +173,8 @@ export const Api = Object.freeze({
 
   IMAGE_TOOLS_BACKGROUND_REMOVE:
     '/image/tools/background/remove',
+    IMAGE_TOOLS_OBJECT_REMOVE:
+    '/image/tools/object/remove',
   IMAGE_TOOLS_CONVERT:
     '/image/tools/convert',
   IMAGE_TOOLS_CROP:
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -807,6 +807,13 @@ export async function imageToolsBackgroundRemove(
   return raw.imageToolsBackgroundRemove(context, options);
 }
 
+export async function imageToolsObjectRemove(
+  context: RequestContext,
+  options: RestOptions.ImageObjectRemoveOptions,
+) {
+  return raw.imageToolsObjectRemove(context, options);
+}
+
 
 export async function imageToolsConvert(
   context: RequestContext,
diff --git a/src/api/raw.ts b/src/api/raw.ts
@@ -1680,6 +1680,25 @@ export async function imageToolsBackgroundRemove(
 }
 
 
+export async function imageToolsObjectRemove(
+  context: RequestContext,
+  options: RestOptions.ImageObjectRemoveOptions,
+): Promise<Response> {
+  const query = {
+    label: options.object,
+    url: options.url,
+  };
+  return request(context, {
+    dataOnly: false,
+    query,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.IMAGE_TOOLS_OBJECT_REMOVE,
+    },
+  });
+}
+
+
 export async function imageToolsConvert(
   context: RequestContext,
   options: RestOptions.ImageToolsConvert,
diff --git a/src/api/types.ts b/src/api/types.ts
@@ -177,6 +177,10 @@ export namespace RestOptions {
     model?: string,
   }
 
+  export interface ImageObjectRemoveOptions extends ImageBaseOptions {
+    object?: string,
+  }
+
   export interface ImageCreateRetrowave {
     background?: number,
     line1?: string,
diff --git a/src/bot.ts b/src/bot.ts
@@ -114,7 +114,7 @@ const cluster = new ClusterClient('', {
       const notSoCommandBot = new NotSoCommandClient(cluster, {
         activateOnEdits: true,
         mentionsEnabled: true,
-        prefix: '.',
+        prefix: ',',
         ratelimits: [
           {duration: 60000, limit: 50, type: 'guild'},
           {duration: 5000, limit: 5, type: 'channel'},
diff --git a/src/commandclient.ts b/src/commandclient.ts
@@ -3,13 +3,17 @@ import { Command, CommandClient } from 'detritus-client';
 import { GuildAllowlistTypes, GuildBlocklistTypes, GuildDisableCommandsTypes } from './constants';
 import GuildSettingsStore from './stores/guildsettings';
 import UserStore from './stores/users';
+import { Endpoints } from './api';
 
 
 export class NotSoCommandClient extends CommandClient {
   async onCommandCheck(context: Command.Context, command: Command.Command) {
     if (context.user.isClientOwner) {
       return true;
+    } else if (Endpoints.Api.URL == Endpoints.Domains.LOCALHOST) {
+      return false;
     }
+
     const user = await UserStore.getOrFetch(context, context.userId);
     if (!user || user.blocked) {
       return false;
diff --git a/src/commands/interactions/slash/image/index.ts b/src/commands/interactions/slash/image/index.ts
@@ -10,6 +10,7 @@ import { ImageMemeCommand } from './meme';
 import { ImageSpinCommand } from './spin';
 
 import { ImageBackgroundGroupCommand } from './background';
+import { ImageObjectGroupCommand } from './object';
 import { ImageFunGroupCommand } from './fun';
 import { ImageGifGroupCommand } from './gif';
 import { ImageOverlayGroupCommand } from './overlay';
@@ -33,6 +34,7 @@ export default class ImageGroupCommand extends BaseSlashCommand {
         new ImageGifGroupCommand(),
         new ImageJPEGCommand(),
         new ImageMemeCommand(),
+        new ImageObjectGroupCommand(),
         new ImageOverlayGroupCommand(),
         new ImageSpinCommand(),
         new ImageTintGroupCommand(),
diff --git a/src/commands/interactions/slash/image/object/index.ts b/src/commands/interactions/slash/image/object/index.ts
@@ -0,0 +1,17 @@
+import { BaseInteractionCommandOptionGroup } from '../../../basecommand';
+
+import { ImageObjectRemoveCommand } from './remove';
+
+
+export class ImageObjectGroupCommand extends BaseInteractionCommandOptionGroup {
+  description = '.';
+  name = 'objects';
+
+  constructor() {
+    super({
+      options: [
+        new ImageObjectRemoveCommand(),
+      ],
+    });
+  }
+}
diff --git a/src/commands/interactions/slash/image/object/remove.ts b/src/commands/interactions/slash/image/object/remove.ts
@@ -0,0 +1,32 @@
+import { Interaction } from 'detritus-client';
+
+import { Formatter, Parameters } from '../../../../../utils';
+
+import { BaseInteractionImageCommandOption } from '../../../basecommand';
+
+
+export const COMMAND_NAME = 'remove';
+
+export class ImageObjectRemoveCommand extends BaseInteractionImageCommandOption {
+  description = 'Remove object(s) from an image';
+  metadata = {
+    id: Formatter.Commands.ImageObjectRemove.COMMAND_ID,
+  };
+  name = COMMAND_NAME;
+
+  constructor() {
+    super({
+      options: [
+        {
+          name: 'object',
+          description: 'Name of the object to remove',
+          onAutoComplete: Parameters.AutoComplete.objectRemovalLabels,
+        },
+      ],
+    });
+  }
+
+  async run(context: Interaction.InteractionContext, args: Formatter.Commands.ImageObjectRemove.CommandArgs) {
+    return Formatter.Commands.ImageObjectRemove.createMessage(context, args);
+  }
+}
diff --git a/src/commands/prefixed/image/background.remove.ts b/src/commands/prefixed/image/background.remove.ts
@@ -13,7 +13,7 @@ export interface CommandArgsBefore {
 
 export const COMMAND_NAME = 'background remove';
 
-export default class GrayscaleCommand extends BaseImageCommand<Formatter.Commands.ImageBackgroundRemove.CommandArgs> {
+export default class BackgroundRemoveCommand extends BaseImageCommand<Formatter.Commands.ImageBackgroundRemove.CommandArgs> {
   constructor(client: CommandClient) {
     super(client, {
       name: COMMAND_NAME,
diff --git a/src/commands/prefixed/image/object.remove.ts b/src/commands/prefixed/image/object.remove.ts
@@ -0,0 +1,42 @@
+import { Command, CommandClient } from 'detritus-client';
+
+import { CommandCategories, ImageObjectRemovalLabels } from '../../../constants';
+import { Formatter } from '../../../utils';
+
+import { BaseImageCommand } from '../basecommand';
+
+
+export interface CommandArgsBefore {
+  model?: string,
+  url?: null | string,
+}
+
+export const COMMAND_NAME = 'object remove';
+
+export default class ObjectRemoveCommand extends BaseImageCommand<Formatter.Commands.ImageObjectRemove.CommandArgs> {
+  constructor(client: CommandClient) {
+    super(client, {
+      name: COMMAND_NAME,
+
+      aliases: ['object rm', 'obj remove', 'obj rm'],
+      args: [
+        {name: 'object', choices: Object.values(ImageObjectRemovalLabels), help: `Must be one of: (${Object.values(ImageObjectRemovalLabels).join(', ')})`},
+      ],
+      metadata: {
+        category: CommandCategories.IMAGE,
+        description: 'Remove the background of an image',
+        examples: [
+          COMMAND_NAME,
+          `${COMMAND_NAME} notsobot`,
+          `${COMMAND_NAME} notsobot -object person`,
+        ],
+        id: Formatter.Commands.ImageObjectRemove.COMMAND_ID,
+        usage: '?<emoji,user:id|mention|name,url> (-model <ImageObjectRemovalLabelsToText>)',
+      },
+    });
+  }
+
+  async run(context: Command.Context, args: Formatter.Commands.ImageObjectRemove.CommandArgs) {
+    return Formatter.Commands.ImageObjectRemove.createMessage(context, args);
+  }
+}
diff --git a/src/constants.ts b/src/constants.ts
@@ -724,6 +724,99 @@ export const ImageBackgroundRemovalModelsToText: Record<ImageBackgroundRemovalMo
   [ImageBackgroundRemovalModels.U2NET_HUMAN_SEG]: 'U2Net Human Segmentation (Human-Orientated U2Net)',
 });
 
+export enum ImageObjectRemovalLabels {
+  PERSON = "PERSON",
+  BICYCLE = "BICYCLE",
+  CAR = "CAR",
+  MOTORCYCLE = "MOTORCYCLE",
+  AIRPLANE = "AIRPLANE",
+  BUS = "BUS",
+  TRAIN = "TRAIN",
+  TRUCK = "TRUCK",
+  BOAT = "BOAT",
+  TRAFFIC_LIGHT = "TRAFFIC_LIGHT",
+  FIRE_HYDRANT = "FIRE_HYDRANT",
+  STREET_SIGN = "STREET_SIGN",
+  STOP_SIGN = "STOP_SIGN",
+  PARKING_METER = "PARKING_METER",
+  BENCH = "BENCH",
+  BIRD = "BIRD",
+  CAT = "CAT",
+  DOG = "DOG",
+  HORSE = "HORSE",
+  SHEEP = "SHEEP",
+  COW = "COW",
+  ELEPHANT = "ELEPHANT",
+  BEAR = "BEAR",
+  ZEBRA = "ZEBRA",
+  GIRAFFE = "GIRAFFE",
+  HAT = "HAT",
+  BACKPACK = "BACKPACK",
+  UMBRELLA = "UMBRELLA",
+  SHOE = "SHOE",
+  EYE_GLASSES = "EYE_GLASSES",
+  HANDBAG = "HANDBAG",
+  TIE = "TIE",
+  SUITCASE = "SUITCASE",
+  FRISBEE = "FRISBEE",
+  SKIS = "SKIS",
+  SNOWBOARD = "SNOWBOARD",
+  SPORTS_BALL = "SPORTS_BALL",
+  KITE = "KITE",
+  BASEBALL_BAT = "BASEBALL_BAT",
+  BASEBALL_GLOVE = "BASEBALL_GLOVE",
+  SKATEBOARD = "SKATEBOARD",
+  SURFBOARD = "SURFBOARD",
+  TENNIS_RACKET = "TENNIS_RACKET",
+  BOTTLE = "BOTTLE",
+  PLATE = "PLATE",
+  WINE_GLASS = "WINE_GLASS",
+  CUP = "CUP",
+  FORK = "FORK",
+  KNIFE = "KNIFE",
+  SPOON = "SPOON",
+  BOWL = "BOWL",
+  BANANA = "BANANA",
+  APPLE = "APPLE",
+  SANDWICH = "SANDWICH",
+  ORANGE = "ORANGE",
+  BROCCOLI = "BROCCOLI",
+  CARROT = "CARROT",
+  HOT_DOG = "HOT_DOG",
+  PIZZA = "PIZZA",
+  DONUT = "DONUT",
+  CAKE = "CAKE",
+  CHAIR = "CHAIR",
+  COUCH = "COUCH",
+  POTTED_PLANT = "POTTED_PLANT",
+  BED = "BED",
+  MIRROR = "MIRROR",
+  DINING_TABLE = "DINING_TABLE",
+  WINDOW = "WINDOW",
+  DESK = "DESK",
+  TOILET = "TOILET",
+  DOOR = "DOOR",
+  TV = "TV",
+  LAPTOP = "LAPTOP",
+  MOUSE = "MOUSE",
+  REMOTE = "REMOTE",
+  KEYBOARD = "KEYBOARD",
+  CELL_PHONE = "CELL_PHONE",
+  MICROWAVE = "MICROWAVE",
+  OVEN = "OVEN",
+  TOASTER = "TOASTER",
+  SINK = "SINK",
+  REFRIGERATOR = "REFRIGERATOR",
+  BLENDER = "BLENDER",
+  BOOK = "BOOK",
+  CLOCK = "CLOCK",
+  VASE = "VASE",
+  SCISSORS = "SCISSORS",
+  TEDDY_BEAR = "TEDDY_BEAR",
+  HAIR_DRIER = "HAIR_DRIER",
+  TOOTHBRUSH = "TOOTHBRUSH",
+  HAIR_BRUSH = "HAIR_BRUSH",
+}
 
 export enum ImageEyeTypes {
   BIG = 'BIG',
diff --git a/src/run.ts b/src/run.ts
@@ -22,8 +22,8 @@ if (SENTRY_DSN) {
 
 // since we're on the thicc bot system, we need to have the shard count divisible by 16
 const manager = new ClusterManager('./bot', NOTSOBOT_DISCORD_TOKEN, {
-  shardCount: 39 * 16,
-  shardsPerCluster: 6,
+  shardCount: 1,
+  shardsPerCluster: 1,
 //  shards: [209, 209],
 });
 
diff --git a/src/utils/formatter/commands/image.object.remove.ts b/src/utils/formatter/commands/image.object.remove.ts
@@ -0,0 +1,23 @@
+import { Command, Interaction } from 'detritus-client';
+
+import { imageToolsObjectRemove } from '../../../api';
+import { ImageObjectRemovalLabels} from '../../../constants';
+import { imageReply, toTitleCase } from '../../../utils';
+
+
+export const COMMAND_ID = 'image.object.remove';
+
+export const DEFAULT_OBJECT = ImageObjectRemovalLabels.PERSON;
+
+export interface CommandArgs {
+  object?: string,
+  url: string,
+}
+
+export async function createMessage(
+  context: Command.Context | Interaction.InteractionContext,
+  args: CommandArgs,
+) {
+  const response = await imageToolsObjectRemove(context, args);
+  return imageReply(context, response);
+}
diff --git a/src/utils/formatter/commands/index.ts b/src/utils/formatter/commands/index.ts
@@ -43,6 +43,7 @@ import * as ImageRip from './image.rip';
 import * as ImageWall from './image.wall';
 
 import * as ImageBackgroundRemove from './image.background.remove';
+import * as ImageObjectRemove from './image.object.remove';
 
 import * as ImageCreateRetrowave from './image.create.retrowave';
 
@@ -158,6 +159,7 @@ export {
   ImageSpin,
   ImageWall,
   ImageBackgroundRemove,
+  ImageObjectRemove,
 
   ImageCreateRetrowave,
 
diff --git a/src/utils/parameters/autocomplete.ts b/src/utils/parameters/autocomplete.ts

-Original file line number
+Diff line change
@@ @@ -1,2 +1,3 @@ @@
 node_modules
 -/lib
 +/lib
 +config.json