Big changes

cakedan · cakedan · commit 32d3622da0b0 · 2022-06-05T02:22:53.000-06:00
- Change from beta to stable domain
- Insert reminders into cache when creating
- Increase shards per cluster
- Update redis
- Add description to slash command parents
- Change memory usage calculation
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,21 +8,21 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "@sentry/node": "^6.4.1",
+    "@sentry/node": "^6.19.7",
     "chrono-node": "^2.3.8",
-    "detritus-client": "^0.17.0-beta.12",
-    "emoji-aware": "^3.0.5",
+    "detritus-client": "^0.17.0-beta.14",
+    "emoji-aware": "^3.1.0",
     "juration": "^0.1.1",
-    "moment": "^2.29.1",
+    "moment": "^2.29.3",
     "moment-duration-format": "^2.3.2",
-    "moment-timezone": "^0.5.32",
-    "redis": "^3.1.2",
-    "typescript": "^4.6.4"
+    "moment-timezone": "^0.5.34",
+    "redis": "^4.1.0",
+    "typescript": "^4.7.2"
   },
   "devDependencies": {
-    "@types/moment-duration-format": "^2.2.2",
-    "@types/node": "^17.0.27",
-    "@types/redis": "^2.8.28"
+    "@types/moment-duration-format": "^2.2.3",
+    "@types/node": "^17.0.35",
+    "@types/redis": "^4.0.11"
   },
   "scripts": {
     "build": "tsc",
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
@@ -9,8 +9,8 @@ export enum Domains {
 }
 
 export const Api = Object.freeze({
-  URL: Domains.BETA,
-  URL_PUBLIC: Domains.BETA,
+  URL: Domains.STABLE,
+  URL_PUBLIC: Domains.STABLE,
   PATH: '/api',
 
   AUDIO_TOOLS_CONVERT:
diff --git a/src/api/raw.ts b/src/api/raw.ts
@@ -24,15 +24,18 @@ export interface RequestContext {
   user?: Structures.User,
 }
 
+
+const HOST = Api.URL_PUBLIC.split('/').pop()!;
+
 export async function request(
   context: RequestContext,
   options: RequestTypes.Options,
 ): Promise<any> {
   options.url = Api.URL + Api.PATH;
   options.headers = createHeaders(options.headers);
 
-  if (Api.URL === Domains.LOCALHOST) {
-    options.headers.set('host', 'beta.notsobot.com');
+  if ((Api.URL as string) === (Domains.LOCALHOST as string)) {
+    options.headers.set('host', HOST);
   }
 
   const token = process.env.NOTSOBOT_API_TOKEN;
diff --git a/src/api/structures/basestructure.ts b/src/api/structures/basestructure.ts
@@ -6,7 +6,7 @@ import { NotSoBotKeys } from '../../constants';
 
 export function convertKey(snake: string): string {
   if (snake in NotSoBotKeys) {
-    return NotSoBotKeys[snake];
+    return (NotSoBotKeys as any)[snake];
   }
   return toCamelCase(snake);
 }
diff --git a/src/bot.ts b/src/bot.ts
@@ -43,8 +43,6 @@ const cluster = new ClusterClient('', {
   } else {
     process.title = `S:(${cluster.shardStart}-${cluster.shardEnd})`;
   }
-  connectAllListeners(cluster);
-  connectAllStores(cluster);
 
   cluster.on(ClientEvents.REST_RESPONSE, async ({response, restRequest, shard}) => {
     const route = response.request.route;
@@ -106,6 +104,10 @@ const cluster = new ClusterClient('', {
 
   try {
     await cluster.run();
+
+    connectAllListeners(cluster);
+    connectAllStores(cluster);
+
     console.log('cluster ran', cluster.ran);
     const shardsText = `Shards #(${cluster.shards.map((shard: ShardClient) => shard.shardId).join(', ')})`;
     console.log(`${shardsText} - Loaded`);
diff --git a/src/commands/interactions/basecommand.ts b/src/commands/interactions/basecommand.ts
@@ -334,7 +334,7 @@ export class BaseInteractionImageCommandOption<ParsedArgsFinished = Interaction.
       ...data,
       options: [
         ...(data.options || []),
-        {name: 'image', description: 'Emoji/Image URL/User', label: 'url', default: DefaultParameters.lastMediaUrl({audio: false, video: false}), value: Parameters.lastMediaUrl({audio: false, video: false})},
+        {name: 'url', description: 'Emoji/Image URL/User', default: DefaultParameters.lastMediaUrl({audio: false, video: false}), value: Parameters.lastMediaUrl({audio: false, video: false})},
         {name: 'file', description: 'Image File', type: ApplicationCommandOptionTypes.ATTACHMENT},
       ],
     });
@@ -364,7 +364,7 @@ export class BaseInteractionVideoCommandOption<ParsedArgsFinished = Interaction.
       ...data,
       options: [
         ...(data.options || []),
-        {name: 'video', description: 'Emoji/Media URL/User', label: 'url', default: DefaultParameters.lastMediaUrl({audio: false, image: false}), value: Parameters.lastMediaUrl({audio: false, image: false})},
+        {name: 'url', description: 'Emoji/Media URL/User', default: DefaultParameters.lastMediaUrl({audio: false, image: false}), value: Parameters.lastMediaUrl({audio: false, image: false})},
         {name: 'file', description: 'Video File', type: ApplicationCommandOptionTypes.ATTACHMENT},
       ],
     });
diff --git a/src/commands/interactions/slash/audio/index.ts b/src/commands/interactions/slash/audio/index.ts
@@ -7,7 +7,7 @@ import { AudioIdentifyCommand } from './identify';
 
 
 export default class AudioGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Audio-Related Commands';
   name = 'a';
 
   constructor() {
diff --git a/src/commands/interactions/slash/fun/index.ts b/src/commands/interactions/slash/fun/index.ts
@@ -6,7 +6,7 @@ import { BadMemeCommand } from './badmeme';
 
 
 export default class FunGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Fun Commands';
   name = 'fun';
 
   constructor() {
diff --git a/src/commands/interactions/slash/help.ts b/src/commands/interactions/slash/help.ts
@@ -12,6 +12,6 @@ export default class HelpCommand extends BaseSlashCommand {
   name = COMMAND_NAME;
 
   run(context: Interaction.InteractionContext) {
-    return editOrReply(context, 'This is our rewrite bot. <https://beta.notsobot.com/commands> (Join our support server <https://beta.notsobot.com/support/invite>)');
+    return editOrReply(context, '<https://notsobot.com/commands> (Join our support server <https://notsobot.com/support/invite>)');
   }
 }
diff --git a/src/commands/interactions/slash/image/index.ts b/src/commands/interactions/slash/image/index.ts
@@ -20,7 +20,7 @@ import { ImageToolsGroupCommand } from './tools';
 
 
 export default class ImageGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Image-Related Commands';
   name = 'i';
 
   constructor() {
diff --git a/src/commands/interactions/slash/owner/eval.ts b/src/commands/interactions/slash/owner/eval.ts
@@ -17,6 +17,7 @@ export interface CommandArgs {
   jsonspacing?: number,
   noembed?: boolean,
   noreply?: boolean,
+  upload?: boolean,
 }
 
 export const COMMAND_NAME = 'eval';
@@ -34,6 +35,7 @@ export class OwnerEvalCommand extends BaseInteractionCommandOption<CommandArgs>
         {name: 'jsonspacing', type: Number, description: 'Spacing for the JSON encoder'},
         {name: 'noembed', type: Boolean, description: 'Output the result without an Embed'},
         {name: 'noreply', type: Boolean, description: 'Do not reply'},
+        {name: 'upload', type: Boolean, description: 'Upload as text file'},
       ],
     });
   }
@@ -72,7 +74,21 @@ export class OwnerEvalCommand extends BaseInteractionCommandOption<CommandArgs>
     }
 
     if (!args.noreply) {
-      const content = String(message);
+      let content: string;
+      if (args.upload) {
+        try {
+          return await editOrReply(context, {
+            file: {filename: `eval.${language}`, value: message},
+          });
+        } catch(error) {
+          content = error.stack || error.message;
+          language = 'js';
+          errored = true;
+        }
+      } else {
+        content = String(message);
+      }
+
       if (!args.noembed) {
         const embed = new Embed();
         if (errored) {
diff --git a/src/commands/interactions/slash/owner/index.ts b/src/commands/interactions/slash/owner/index.ts
@@ -4,7 +4,7 @@ import { OwnerEvalCommand } from './eval';
 
 
 export default class OwnerGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Owner Only Commands';
   name = 'owner';
 
   constructor() {
diff --git a/src/commands/interactions/slash/prefixes/index.ts b/src/commands/interactions/slash/prefixes/index.ts
@@ -8,7 +8,7 @@ import { PrefixesReplaceCommand } from './prefixes.replace';
 
 
 export default class PrefixesGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Prefixes';
   disableDm = true;
   name = 'prefixes';
 
diff --git a/src/commands/interactions/slash/reminder/index.ts b/src/commands/interactions/slash/reminder/index.ts
@@ -6,7 +6,7 @@ import { ReminderListGroupCommand } from './list';
 
 
 export default class ReminderCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Reminders';
   name = 'reminder';
 
   constructor() {
diff --git a/src/commands/interactions/slash/search/index.ts b/src/commands/interactions/slash/search/index.ts
@@ -8,7 +8,7 @@ import { SearchSteamGroupCommand } from './steam';
 
 
 export default class SearchGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Search Commands';
   name = 'search';
   triggerLoadingAfter = 100;
 
diff --git a/src/commands/interactions/slash/settings-server/index.ts b/src/commands/interactions/slash/settings-server/index.ts
@@ -4,7 +4,7 @@ import { SettingsServerSetGroupCommand } from './set';
 
 
 export default class SettingsServerGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Server Settings';
   disableDm = true;
   name = 'settings-server';
 
diff --git a/src/commands/interactions/slash/settings/index.ts b/src/commands/interactions/slash/settings/index.ts
@@ -5,7 +5,7 @@ import { SettingsSetGroupCommand } from './set';
 
 
 export default class SettingsGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'User Settings';
   name = 'settings';
 
   constructor() {
diff --git a/src/commands/interactions/slash/tag/index.ts b/src/commands/interactions/slash/tag/index.ts
@@ -8,7 +8,7 @@ import { TagShowCommand } from './show';
 
 
 export default class TagGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Custom Tags';
   name = 'tag';
 
   constructor() {
diff --git a/src/commands/interactions/slash/tools/index.ts b/src/commands/interactions/slash/tools/index.ts
@@ -7,7 +7,7 @@ import { ToolsQrGroupCommand } from './qr';
 
 
 export default class ToolsGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Tool-like Commands';
   name = 'tools';
 
   constructor() {
diff --git a/src/commands/interactions/slash/video/index.ts b/src/commands/interactions/slash/video/index.ts
@@ -7,7 +7,7 @@ import { VideoExtractGroupCommand } from './extract';
 
 
 export default class VideoGroupCommand extends BaseSlashCommand {
-  description = '.';
+  description = 'Video-Related Commands';
   name = 'v';
 
   constructor() {
diff --git a/src/commands/prefixed/info/channel.ts b/src/commands/prefixed/info/channel.ts
@@ -122,7 +122,7 @@ export default class ChannelCommand extends BaseCommand {
       if (channel.isGuildChannel) {
         description.push(`**NSFW**: ${(channel.nsfw) ? 'Yes': 'No'}`);
         if (channel.rateLimitPerUser) {
-          description.push(`*Ratelimit**: ${channel.rateLimitPerUser.toLocaleString()} seconds`);
+          description.push(`**Ratelimit**: ${channel.rateLimitPerUser.toLocaleString()} seconds`);
         } else {
           description.push(`**Ratelimit**: Disabled`);
         }
diff --git a/src/commands/prefixed/owner/eval.ts b/src/commands/prefixed/owner/eval.ts
@@ -32,7 +32,7 @@ export default class EvalCommand extends BaseCommand {
         {name: 'jsonspacing', default: 2, type: Number},
         {name: 'noembed', default: DefaultParameters.noEmbed, type: () => true},
         {name: 'noreply', type: Boolean},
-        {name: 'upload', aliases: ['files.gg'], type: Boolean},
+        {name: 'upload', type: Boolean},
       ],
       label: 'code',
       metadata: {
@@ -78,13 +78,9 @@ export default class EvalCommand extends BaseCommand {
       let content: string;
       if (args.upload) {
         try {
-          const upload = await context.rest.request({
-            files: [{filename: `eval.${language}`, key: 'file', value: message}],
-            method: 'post',
-            url: 'https://api.files.gg/files',
+          return await editOrReply(context, {
+            file: {filename: `eval.${language}`, value: message},
           });
-
-          return editOrReply(context, upload.urls.main);
         } catch(error) {
           content = error.stack || error.message;
           language = 'js';
diff --git a/src/commands/prefixed/utils/help.ts b/src/commands/prefixed/utils/help.ts
@@ -81,7 +81,7 @@ export default class HelpCommand extends BaseCommand {
     if (args.commands) {
       return editOrReply(context, '⚠ Unknown Command');
     }
-    return editOrReply(context, 'This is our rewrite bot. <https://beta.notsobot.com/commands> (Join our support server <https://beta.notsobot.com/support/invite>)');
+    return editOrReply(context, '<https://notsobot.com/commands> (Join our support server <https://notsobot.com/support/invite>)');
   }
 
   // add client permission labels
diff --git a/src/commands/prefixed/utils/invite.ts b/src/commands/prefixed/utils/invite.ts
@@ -22,6 +22,6 @@ export default class InviteCommand extends BaseCommand {
   }
 
   run(context: Command.Context) {
-    return editOrReply(context, '<https://beta.notsobot.com/invite>');
+    return editOrReply(context, '<https://notsobot.com/invite>');
   }
 }
diff --git a/src/commands/prefixed/utils/shards.ts b/src/commands/prefixed/utils/shards.ts
@@ -78,7 +78,7 @@ export async function getClusterInformation(context: Command.Context): Promise<A
           voiceConnections: 0,
           voiceStates: 0,
         },
-        ramUsage: usage.heapUsed + usage.external +  Math.max(0, usage.rss - usage.heapTotal),
+        ramUsage: usage.heapTotal + usage.external + usage.arrayBuffers,//usage.heapUsed + usage.external +  Math.max(0, usage.rss - usage.heapTotal),
         shardsIdentified: 0,
       };
       for (let [shardId, shard] of cluster.shards) {
diff --git a/src/listeners/clusterinfointerval.ts b/src/listeners/clusterinfointerval.ts
@@ -29,7 +29,7 @@ class ClusterInfoInterval extends Listener {
         this.lastUpload = Date.now();
         await putInfoDiscord({client: shard}, {
           clusterId: cluster.clusterId,
-          ramUsage: usage.heapUsed + usage.external + Math.max(0, usage.rss - usage.heapTotal),
+          ramUsage: usage.heapTotal + usage.external + usage.arrayBuffers,//usage.heapUsed + usage.external + Math.max(0, usage.rss - usage.heapTotal),
           shardCount: cluster.shardCount,
           shardsPerCluster: (cluster.manager) ? cluster.manager.clusterShardsPer : 1,
           shards: cluster.shards.map((shard) => {
diff --git a/src/listeners/reminders.ts b/src/listeners/reminders.ts
@@ -24,6 +24,20 @@ class ReminderInterval extends Listener {
   intervalTime = 12 * 60 * 60 * 1000;
   reminders = new Collections.BaseCollection<string, ReminderItem>();
 
+  broadcastEvalInsert = ((moduleName: string, cluster: ClusterClient, reminder: RestResponsesRaw.Reminder) => {
+    const store = require(moduleName).default as ReminderInterval;
+    store.insertReminder(cluster, reminder);
+  }).bind(null, __filename);
+
+  broadcastEvalRemove = ((moduleName: string, cluster: ClusterClient, reminder: RestResponsesRaw.Reminder) => {
+    const store = require(moduleName).default as ReminderInterval;
+    store.removeReminder(reminder.id);
+  }).bind(null, __filename);
+
+  shouldHandle(cluster: ClusterClient): boolean {
+    return cluster.clusterId === 0;
+  }
+
   createReminderText(reminder: RestResponsesRaw.Reminder, expired: boolean = false): string {
     const createdAtUnix = Snowflake.timestamp(reminder.id, {epoch: SNOWFLAKE_EPOCH});
     const text = (reminder.content) ? Markup.codestring(reminder.content) : getReminderMessage(reminder.id);
@@ -38,6 +52,10 @@ class ReminderInterval extends Listener {
   }
 
   insertReminder(cluster: ClusterClient, reminder: RestResponsesRaw.Reminder): void {
+    if (!this.shouldHandle(cluster)) {
+      return;
+    }
+
     const shard = cluster.shards.first();
     if (!shard) {
       return;
@@ -186,7 +204,7 @@ class ReminderInterval extends Listener {
   create(cluster: ClusterClient, redis: RedisSpewer) {
     // we only want to deal with reminders on cluster 0, cause we're awesome like that
 
-    if (cluster.clusterId !== 0) {
+    if (!this.shouldHandle(cluster)) {
       return [];
     }
 
diff --git a/src/redis.ts b/src/redis.ts
diff --git a/src/run.ts b/src/run.ts
diff --git a/src/utils/formatter/commands/reminder.create.ts b/src/utils/formatter/commands/reminder.create.ts
diff --git a/src/utils/parameters/index.ts b/src/utils/parameters/index.ts

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ export enum Domains {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`export const Api = Object.freeze({`
`12`		`- URL: Domains.BETA,`
`13`		`- URL_PUBLIC: Domains.BETA,`
	`12`	`+ URL: Domains.STABLE,`
	`13`	`+ URL_PUBLIC: Domains.STABLE,`
`14`	`14`	`PATH: '/api',`
`15`	`15`
`16`	`16`	`AUDIO_TOOLS_CONVERT:`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { NotSoBotKeys } from '../../constants';`
`6`	`6`
`7`	`7`	`export function convertKey(snake: string): string {`
`8`	`8`	`if (snake in NotSoBotKeys) {`
`9`		`- return NotSoBotKeys[snake];`
	`9`	`+ return (NotSoBotKeys as any)[snake];`
`10`	`10`	`}`
`11`	`11`	`return toCamelCase(snake);`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ export default class HelpCommand extends BaseSlashCommand {`
`12`	`12`	`name = COMMAND_NAME;`
`13`	`13`
`14`	`14`	`run(context: Interaction.InteractionContext) {`
`15`		`- return editOrReply(context, 'This is our rewrite bot. <https://beta.notsobot.com/commands> (Join our support server <https://beta.notsobot.com/support/invite>)');`
	`15`	`+ return editOrReply(context, '<https://notsobot.com/commands> (Join our support server <https://notsobot.com/support/invite>)');`
`16`	`16`	`}`
`17`	`17`	`}`