update common embed location, move some back into their own files

src/commands/apiCmd.ts

@@ -7,7 +7,8 @@ import apiCommands from 'commands/apiCmd/_index.ts';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { failColor } from 'src/commandUtils.ts';
+import { failColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const api = async (message: DiscordenoMessage, args: string[]) => {

src/commands/apiCmd/allowBlock.ts

@@ -2,7 +2,8 @@ import { DiscordenoMessage } from '@discordeno';
 
 import dbClient from 'db/client.ts';
 
-import { generateApiFailed, generateApiSuccess } from 'src/commandUtils.ts';
+import { generateApiFailed, generateApiSuccess } from 'embeds/api.ts';
+
 import utils from 'src/utils.ts';
 
 export const allowBlock = async (message: DiscordenoMessage, apiArg: string) => {

src/commands/apiCmd/apiHelp.ts

@@ -2,7 +2,8 @@ import { DiscordenoMessage } from '@discordeno';
 
 import config from '~config';
 
-import { infoColor1, infoColor2 } from 'src/commandUtils.ts';
+import { infoColor1, infoColor2 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const help = (message: DiscordenoMessage) => {

src/commands/apiCmd/deleteGuild.ts

@@ -4,7 +4,8 @@ import config from '~config';
 
 import dbClient from 'db/client.ts';
 
-import { failColor, successColor } from 'src/commandUtils.ts';
+import { failColor, successColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const deleteGuild = async (message: DiscordenoMessage) => {

src/commands/apiCmd/showHideWarn.ts

@@ -2,7 +2,8 @@ import { DiscordenoMessage } from '@discordeno';
 
 import dbClient from 'db/client.ts';
 
-import { generateApiFailed, generateApiSuccess } from 'src/commandUtils.ts';
+import { generateApiFailed, generateApiSuccess } from 'embeds/api.ts';
+
 import utils from 'src/utils.ts';
 
 export const showHideWarn = async (message: DiscordenoMessage, apiArg: string) => {

src/commands/apiCmd/status.ts

@@ -2,7 +2,9 @@ import { DiscordenoMessage } from '@discordeno';
 
 import dbClient from 'db/client.ts';
 
-import { failColor, generateApiStatus } from 'src/commandUtils.ts';
+import { generateApiStatus } from 'embeds/api.ts';
+import { failColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const status = async (message: DiscordenoMessage) => {

src/commands/audit.ts

@@ -7,7 +7,8 @@ import auditCommands from 'commands/auditCmd/_index.ts';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { failColor } from 'src/commandUtils.ts';
+import { failColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const audit = (message: DiscordenoMessage, args: string[]) => {

src/commands/auditCmd/auditDB.ts

@@ -2,8 +2,9 @@ import { DiscordenoMessage, EmbedField } from '@discordeno';
 
 import dbClient from 'db/client.ts';
 
-import { compilingStats } from 'src/commonEmbeds.ts';
-import { infoColor2 } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+import { compilingStats } from 'embeds/common.ts';
+
 import utils from 'src/utils.ts';
 
 interface DBSizeData {

src/commands/auditCmd/auditGuilds.ts

@@ -2,7 +2,8 @@ import { cache, cacheHandlers, DiscordenoGuild, DiscordenoMessage } from '@disco
 
 import config from '~config';
 
-import { infoColor2 } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 const sortGuildByMemberCount = (a: DiscordenoGuild, b: DiscordenoGuild) => {

src/commands/auditCmd/auditHelp.ts

@@ -2,7 +2,8 @@ import { DiscordenoMessage } from '@discordeno';
 
 import config from '~config';
 
-import { infoColor1 } from 'src/commandUtils.ts';
+import { infoColor1 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const auditHelp = (message: DiscordenoMessage) => {

src/commands/handleMentions.ts

@@ -6,7 +6,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor1 } from 'src/commandUtils.ts';
+import { infoColor1 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const handleMentions = (message: DiscordenoMessage) => {

src/commands/heatmap.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { failColor, infoColor2 } from 'src/commandUtils.ts';
+import { failColor, infoColor2 } from 'embeds/colors.ts';
+
 import intervals from 'src/intervals.ts';
 import utils from 'src/utils.ts';
 

src/commands/help.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor2 } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const help = (message: DiscordenoMessage) => {

src/commands/info.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor2 } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const info = (message: DiscordenoMessage) => {

src/commands/optIn.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { ignoreList, queries } from 'db/common.ts';
 
-import { failColor, successColor } from 'src/commandUtils.ts';
+import { failColor, successColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const optIn = async (message: DiscordenoMessage) => {

src/commands/optOut.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { ignoreList, queries } from 'db/common.ts';
 
-import { failColor, successColor } from 'src/commandUtils.ts';
+import { failColor, successColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const optOut = async (message: DiscordenoMessage) => {

src/commands/ping.ts

@@ -3,9 +3,19 @@ import { DiscordenoMessage } from '@discordeno';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { generatePing } from 'src/commandUtils.ts';
+import { infoColor1 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
+const generatePing = (time: number) => ({
+  embeds: [
+    {
+      color: infoColor1,
+      title: time === -1 ? 'Ping?' : `Pong! Latency is ${time}ms.`,
+    },
+  ],
+});
+
 export const ping = async (message: DiscordenoMessage) => {
   // Light telemetry to see how many times a command is being run
   dbClient.execute(queries.callIncCnt('ping')).catch((e) => utils.commonLoggers.dbError('ping.ts:14', 'call sproc INC_CNT on', e));

src/commands/privacy.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor1 } from 'src/commandUtils.ts';
+import { infoColor1 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const privacy = (message: DiscordenoMessage) => {

src/commands/report.ts

@@ -5,7 +5,7 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { failColor, generateReport, successColor } from 'src/commandUtils.ts';
+import { failColor, infoColor2, successColor } from 'embeds/colors.ts';
 import utils from 'src/utils.ts';
 
 export const report = (message: DiscordenoMessage, args: string[]) => {
@@ -13,7 +13,15 @@ export const report = (message: DiscordenoMessage, args: string[]) => {
   dbClient.execute(queries.callIncCnt('report')).catch((e) => utils.commonLoggers.dbError('report.ts:17', 'call sproc INC_CNT on', e));
 
   if (args.join(' ')) {
-    sendMessage(config.reportChannel, generateReport(args.join(' '))).catch((e: Error) => utils.commonLoggers.messageSendError('report.ts:22', message, e));
+    sendMessage(config.reportChannel, {
+      embeds: [
+        {
+          color: infoColor2,
+          title: 'USER REPORT:',
+          description: args.join(' ') || 'No message',
+        },
+      ],
+    }).catch((e: Error) => utils.commonLoggers.messageSendError('report.ts:22', message, e));
     message
       .send({
         embeds: [

src/commands/rip.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor2 } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const rip = (message: DiscordenoMessage) => {

src/commands/roll.ts

@@ -11,7 +11,9 @@ import { sendRollRequest } from 'artigen/managers/queueManager.ts';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { generateRollError, rollingEmbed, warnColor } from 'src/commandUtils.ts';
+import { generateRollError, rollingEmbed } from 'embeds/artigen.ts';
+import { warnColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const roll = async (message: DiscordenoMessage, args: string[], command: string) => {

src/commands/rollDecorators.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor2 } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const rollDecorators = (message: DiscordenoMessage) => {

src/commands/rollHelp.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor1, infoColor2, successColor } from 'src/commandUtils.ts';
+import { infoColor1, infoColor2, successColor } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const rollHelp = (message: DiscordenoMessage) => {

src/commands/stats.ts

@@ -1,10 +1,13 @@
 import { cache, cacheHandlers, DiscordenoMessage } from '@discordeno';
 
+import config from '~config';
+
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { compilingStats } from 'src/commonEmbeds.ts';
-import { generateStats } from 'src/commandUtils.ts';
+import { infoColor2 } from 'embeds/colors.ts';
+import { compilingStats } from 'embeds/common.ts';
+
 import utils from 'src/utils.ts';
 
 export const stats = async (message: DiscordenoMessage) => {
@@ -33,18 +36,45 @@ export const stats = async (message: DiscordenoMessage) => {
 
     const endTime = new Date().getTime();
 
-    m.edit(
-      generateStats(
-        cachedGuilds + cache.dispatchedGuildIds.size,
-        cachedChannels + cache.dispatchedChannelIds.size,
-        cachedMembers,
-        rolls,
-        total - rolls,
-        rollRate,
-        totalRate - rollRate,
-        endTime - startTime,
-      ),
-    ).catch((e: Error) => utils.commonLoggers.messageEditError('stats.ts:38', m, e));
+    m.edit({
+      embeds: [
+        {
+          color: infoColor2,
+          title: `${config.name}'s Statistics:`,
+          timestamp: new Date().toISOString(),
+          fields: [
+            {
+              name: 'Guilds:',
+              value: `${(cachedGuilds + cache.dispatchedGuildIds.size).toLocaleString()}`,
+              inline: true,
+            },
+            {
+              name: 'Channels:',
+              value: `${(cachedChannels + cache.dispatchedChannelIds.size).toLocaleString()}`,
+              inline: true,
+            },
+            {
+              name: 'Active Members:',
+              value: `${cachedMembers.toLocaleString()}`,
+              inline: true,
+            },
+            {
+              name: 'Roll Commands:',
+              value: `${rolls.toLocaleString()}\n(${Math.abs(rollRate).toFixed(2)} per hour)`,
+              inline: true,
+            },
+            {
+              name: 'Utility Commands:',
+              value: `${(total - rolls).toLocaleString()}\n(${Math.abs(totalRate - rollRate).toFixed(2)} per hour)`,
+              inline: true,
+            },
+          ],
+          footer: {
+            text: `Total query time: ${endTime - startTime}ms`,
+          },
+        },
+      ],
+    }).catch((e: Error) => utils.commonLoggers.messageEditError('stats.ts:38', m, e));
   } catch (e) {
     utils.commonLoggers.messageSendError('stats.ts:41', message, e as Error);
   }

src/commands/version.ts

@@ -5,7 +5,8 @@ import config from '~config';
 import dbClient from 'db/client.ts';
 import { queries } from 'db/common.ts';
 
-import { infoColor1 } from 'src/commandUtils.ts';
+import { infoColor1 } from 'embeds/colors.ts';
+
 import utils from 'src/utils.ts';
 
 export const version = (message: DiscordenoMessage) => {