Add a user timezone as well as build up the slash commands for timezone settings

cakedan · cakedan · commit b942cdbd48f4 · 2022-04-24T06:12:51.000-06:00
diff --git a/src/api/raw.ts b/src/api/raw.ts
@@ -433,6 +433,7 @@ export async function editUser(
     channel_id: options.channelId,
     locale: options.locale,
     opt_out_content: options.optOutContent,
+    timezone: options.timezone,
   };
   const params = {userId};
   return request(context, {
@@ -1775,6 +1776,7 @@ export async function putUser(
     channel_id: options.channelId,
     discriminator: options.discriminator,
     locale: options.locale,
+    timezone: options.timezone,
     username: options.username,
   };
   const params = {userId};
diff --git a/src/api/structures/user.ts b/src/api/structures/user.ts
@@ -59,6 +59,7 @@ const keysUserFull = new Collections.BaseSet<string>([
   NotSoApiKeys.LOCALE,
   NotSoApiKeys.OPTED_OUT,
   NotSoApiKeys.PREMIUM_TYPE,
+  NotSoApiKeys.TIMEZONE,
   NotSoApiKeys.USERNAME,
 ]);
 
@@ -77,6 +78,7 @@ export class UserFull extends User {
     content: string | null,
   };
   premiumType: UserPremiumTypes = UserPremiumTypes.NONE;
+  timezone: string | null = null;
   username: string = '';
 
   constructor(data: Structures.BaseStructureData) {
diff --git a/src/api/types.ts b/src/api/types.ts
@@ -105,6 +105,7 @@ export namespace RestOptions {
     channelId?: null | string,
     locale?: null | string,
     optOutContent?: boolean,
+    timezone?: null | string,
   }
 
 
@@ -313,6 +314,7 @@ export namespace RestOptions {
     channelId?: null | string,
     discriminator: string,
     locale?: null | string,
+    timezone?: null | string,
     username: string,
   }
 
diff --git a/src/commands/interactions/slash/settings-user/set/index.ts b/src/commands/interactions/slash/settings-user/set/index.ts
@@ -1,6 +1,7 @@
 import { BaseInteractionCommandOptionGroup } from '../../../basecommand';
 
 import { SettingsUserSetLocaleCommand } from './set.locale';
+import { SettingsUserSetTimezoneCommand } from './set.timezone';
 
 
 export class SettingsUserSetGroupCommand extends BaseInteractionCommandOptionGroup {
@@ -11,6 +12,7 @@ export class SettingsUserSetGroupCommand extends BaseInteractionCommandOptionGro
     super({
       options: [
         new SettingsUserSetLocaleCommand(),
+        new SettingsUserSetTimezoneCommand(),
       ],
     });
   }
diff --git a/src/commands/interactions/slash/settings-user/set/set.locale.ts b/src/commands/interactions/slash/settings-user/set/set.locale.ts
@@ -13,6 +13,9 @@ export interface CommandArgs {
 
 export class SettingsUserSetLocaleCommand extends BaseInteractionCommandOption {
   description = 'Set your default language for the bot.';
+  metadata = {
+    id: Formatter.Commands.SettingsMeLocale.COMMAND_ID,
+  };
   name = 'locale';
 
   constructor() {
diff --git a/src/commands/interactions/slash/settings-user/set/set.timezone.ts b/src/commands/interactions/slash/settings-user/set/set.timezone.ts
@@ -0,0 +1,35 @@
+import { Interaction } from 'detritus-client';
+import { MessageFlags } from 'detritus-client/lib/constants';
+
+import { Formatter, Parameters, editOrReply } from '../../../../../utils';
+
+import { BaseInteractionCommandOption } from '../../../basecommand';
+
+
+export interface CommandArgs {
+  timezone: string,
+}
+
+export class SettingsUserSetTimezoneCommand extends BaseInteractionCommandOption {
+  description = 'Set your default timezone for the bot';
+  metadata = {
+    id: Formatter.Commands.SettingsMeTimezone.COMMAND_ID,
+  };
+  name = 'timezone';
+
+  constructor() {
+    super({
+      options: [
+        {
+          name: 'timezone',
+          description: 'Timezone to choose from',
+          onAutoComplete: Parameters.AutoComplete.timezone,
+        },
+      ],
+    });
+  }
+
+  async run(context: Interaction.InteractionContext, args: CommandArgs) {
+    return Formatter.Commands.SettingsMeTimezone.createMessage(context, args);
+  }
+}
diff --git a/src/commands/interactions/slash/settings/index.ts b/src/commands/interactions/slash/settings/index.ts
@@ -6,6 +6,7 @@ import { SettingsSetGroupCommand } from './set';
 
 export default class SettingsGroupCommand extends BaseSlashCommand {
   description = '.';
+  disableDm = true;
   name = 'settings';
 
   constructor() {
diff --git a/src/commands/interactions/slash/settings/prefixes/index.ts b/src/commands/interactions/slash/settings/prefixes/index.ts
@@ -9,7 +9,6 @@ import { SettingsPrefixesReplaceCommand } from './prefixes.replace';
 
 export class SettingsPrefixesGroupCommand extends BaseInteractionCommandOptionGroup {
   description = '.';
-  disableDm = true;
   name = 'prefixes';
 
   constructor() {
diff --git a/src/commands/interactions/slash/settings/set/set.timezone.ts b/src/commands/interactions/slash/settings/set/set.timezone.ts
@@ -1,8 +1,7 @@
 import { Interaction } from 'detritus-client';
-import { InteractionCallbackTypes } from 'detritus-client/lib/constants';
-import { Embed, Markup } from 'detritus-client/lib/utils';
+import { Permissions } from 'detritus-client/lib/constants';
 
-import { EmbedBrands, EmbedColors } from '../../../../../constants';
+import { Formatter, Parameters } from '../../../../../utils';
 
 import { BaseInteractionCommandOption } from '../../../basecommand';
 
@@ -12,26 +11,26 @@ export interface CommandArgs {
 }
 
 export class SettingsSetTimezoneCommand extends BaseInteractionCommandOption {
-  description = 'Set the Server\'s Timezone';
+  description = 'Set the server\'s default timezone for the bot';
+  metadata = {
+    id: Formatter.Commands.SettingsMeTimezone.COMMAND_ID,
+  };
   name = 'timezone';
+  permissions = [Permissions.MANAGE_GUILD];
 
   constructor() {
     super({
       options: [
         {
           name: 'timezone',
           description: 'Timezone to choose from',
-          required: true,
-          choices: [{name: 'Test', value: 'a'}],
+          onAutoComplete: Parameters.AutoComplete.timezone,
         },
       ],
     });
   }
 
   async run(context: Interaction.InteractionContext, args: CommandArgs) {
-    return context.respond(InteractionCallbackTypes.CHANNEL_MESSAGE_WITH_SOURCE, {
-      content: 'wip',
-      flags: 64,
-    });
+    return Formatter.Commands.SettingsTimezone.createMessage(context, args);
   }
 }
diff --git a/src/constants.ts b/src/constants.ts
@@ -911,7 +911,7 @@ export const ReminderMessages = [
 
 export enum Timezones {
   MIT = 'Pacific/Midway',
-  HST = 'Us/Hawaii',
+  HST = 'US/Hawaii',
   AST = 'US/Alaska',
   PST = 'US/Pacific',
   PNT = 'America/Phoenix',
@@ -925,7 +925,7 @@ export enum Timezones {
   BET = 'Brazil/East',
   CAT = 'Etc/GMT-1',
   GMT = 'GMT',
-  ECT = 'Etc/GMT+1',
+  ECT = 'Etc/GMT-5',
   EET = 'EET',
   ART = 'Egypt',
   EAT = 'Etc/GMT+3',
@@ -944,6 +944,41 @@ export enum Timezones {
 };
 
 
+export const TimezonesToText: Record<Timezones, string> = Object.freeze({
+  [Timezones.HST]: '(GMT-10:00) Hawaii Standard Time (HST)',
+  [Timezones.MIT]: '(GMT-09:30) Marquesas Islands Time (MIT)',
+  [Timezones.PST]: '(GMT-08:00) Pacific Standard Time (PST)',
+  [Timezones.PNT]: '(GMT-07:00) Phoenix Standard Time (PNT)',
+  [Timezones.AST]: '(GMT-04:00) Atlantic Standard Time (AST)',
+  [Timezones.MST]: '(GMT-07:00) Mountain Standard Time (MST)',
+  [Timezones.CST]: '(GMT-06:00) Central Standard Time (CST)',
+  [Timezones.EST]: '(GMT-05:00) Eastern Standard Time (EST)',
+  [Timezones.IET]: '(GMT-05:00) Indiana Eastern Standard Time (IET)',
+  [Timezones.PRT]: '(GMT+01:00) Western European Summer Time (CNT)',
+  [Timezones.CNT]: '(GMT-03:30) Canada Newfoundland Time (CNT)',
+  [Timezones.AGT]: '(GMT-03:00) Argentina Standard Time(AGT)',
+  [Timezones.BET]: '(GMT-11:00) Bering Standard Time (BET)',
+  [Timezones.CAT]: '(GMT+02:00) Central Africa Time (CAT)',
+  [Timezones.GMT]: '(GMT+00:00) Greenwich Mean Time (GMT)',
+  [Timezones.ECT]: '(GMT-05:00) Ecuador Central Time (ECT)',
+  [Timezones.EET]: '(GMT+03:00) Eastern European Time (EET)',
+  [Timezones.ART]: '(GMT-03:00) Argentina Time (ART)',
+  [Timezones.EAT]: '(GMT+03:00) Eastern Africa Time (EAT)',
+  [Timezones.MET]: '(GMT+01:00) Middle European Time (MET)', // duplicate of CET
+  [Timezones.NET]: '',
+  [Timezones.PLT]: '',
+  [Timezones.IST]: '',
+  [Timezones.BST]: '',
+  [Timezones.VST]: '',
+  [Timezones.CTT]: '',
+  [Timezones.JST]: '(GMT+09:00) Japan Standard Time (JST)',
+  [Timezones.ACT]: '(GMT+09:30) Australian Central Time (ACT)',
+  [Timezones.AET]: '',
+  [Timezones.SST]: '',
+  [Timezones.NST]: '',
+});
+
+
 
 export enum UserFlags {
   NONE = 0,
diff --git a/src/utils/formatter/commands/index.ts b/src/utils/formatter/commands/index.ts
@@ -27,11 +27,13 @@ import * as SearchGoogleImages from './search.google.images';
 import * as SearchGoogleWeb from './search.google.web';
 
 import * as SettingsMeLocale from './settings.me.locale';
+import * as SettingsMeTimezone from './settings.me.timezone';
 import * as SettingsPrefixesAdd from './settings.prefixes.add';
 import * as SettingsPrefixesClear from './settings.prefixes.clear';
 import * as SettingsPrefixesList from './settings.prefixes.list';
 import * as SettingsPrefixesRemove from './settings.prefixes.remove';
 import * as SettingsPrefixesReplace from './settings.prefixes.replace';
+import * as SettingsTimezone from './settings.timezone';
 
 import * as TagInfo from './tag.info';
 import * as TagListServer from './tag.list.server';
@@ -78,11 +80,13 @@ export {
   SearchGoogleImages,
   SearchGoogleWeb,
   SettingsMeLocale,
+  SettingsMeTimezone,
   SettingsPrefixesAdd,
   SettingsPrefixesClear,
   SettingsPrefixesList,
   SettingsPrefixesRemove,
   SettingsPrefixesReplace,
+  SettingsTimezone,
   TagInfo,
   TagListServer,
   TagListUser,
diff --git a/src/utils/formatter/commands/settings.me.locale.ts b/src/utils/formatter/commands/settings.me.locale.ts
@@ -10,6 +10,8 @@ import {
 import { editOrReply } from '../..';
 
 
+export const COMMAND_ID = 'settings me locale';
+
 export interface CommandArgs {
   locale?: GoogleLocales | null,
 }
diff --git a/src/utils/formatter/commands/settings.me.timezone.ts b/src/utils/formatter/commands/settings.me.timezone.ts
@@ -0,0 +1,41 @@
+import { Command, Interaction } from 'detritus-client';
+import { MessageFlags } from 'detritus-client/lib/constants';
+import { Markup } from 'detritus-client/lib/utils';
+
+import { editUser } from '../../../api';
+import {
+  TimezonesToText,
+} from '../../../constants';
+import { editOrReply } from '../..';
+
+
+export const COMMAND_ID = 'settings me timezone';
+
+export interface CommandArgs {
+  timezone?: string | null,
+}
+
+export async function createMessage(
+  context: Command.Context | Interaction.InteractionContext,
+  args: CommandArgs,
+) {
+  const isFromInteraction = (context instanceof Interaction.InteractionContext);
+
+  const user = await editUser(context, context.userId, {timezone: args.timezone});
+
+  let text: string;
+  if (user.timezone) {
+    let timezoneText: string = user.timezone;
+    if (timezoneText in TimezonesToText) {
+      timezoneText = (TimezonesToText as any)[user.timezone];
+    }
+    text = `Ok, set your timezone preference to ${Markup.bold(timezoneText)}`;
+  } else {
+    text = 'Ok, cleared out your default timezone preference';
+  }
+
+  return editOrReply(context, {
+    content: text,
+    flags: (isFromInteraction) ? MessageFlags.EPHEMERAL : undefined,
+  });
+}
diff --git a/src/utils/formatter/commands/settings.timezone.ts b/src/utils/formatter/commands/settings.timezone.ts
@@ -0,0 +1,43 @@
+import { Command, Interaction } from 'detritus-client';
+import { MessageFlags } from 'detritus-client/lib/constants';
+import { Markup } from 'detritus-client/lib/utils';
+
+import { editGuildSettings } from '../../../api';
+import {
+  TimezonesToText,
+} from '../../../constants';
+import { editOrReply } from '../..';
+
+
+export const COMMAND_ID = 'settings timezone';
+
+export interface CommandArgs {
+  timezone?: string,
+}
+
+export async function createMessage(
+  context: Command.Context | Interaction.InteractionContext,
+  args: CommandArgs,
+) {
+  const isFromInteraction = (context instanceof Interaction.InteractionContext);
+
+  const guild = await editGuildSettings(context, context.guildId!, {
+    timezone: args.timezone,
+  });
+
+  let text: string;
+  if (guild.timezone) {
+    let timezoneText: string = guild.timezone;
+    if (timezoneText in TimezonesToText) {
+      timezoneText = (TimezonesToText as any)[guild.timezone];
+    }
+    text = `Ok, set your server\'s timezone preference to ${Markup.bold(timezoneText)}`;
+  } else {
+    text = 'Ok, cleared out your server\'s default timezone preference';
+  }
+
+  return editOrReply(context, {
+    content: text,
+    flags: (isFromInteraction) ? MessageFlags.EPHEMERAL : undefined,
+  });
+}
diff --git a/src/utils/parameters/autocomplete.ts b/src/utils/parameters/autocomplete.ts
diff --git a/src/utils/parameters/index.ts b/src/utils/parameters/index.ts
diff --git a/src/utils/tools.ts b/src/utils/tools.ts

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ export namespace RestOptions {`
`105`	`105`	`channelId?: null \| string,`
`106`	`106`	`locale?: null \| string,`
`107`	`107`	`optOutContent?: boolean,`
	`108`	`+ timezone?: null \| string,`
`108`	`109`	`}`
`109`	`110`
`110`	`111`
`@@ -313,6 +314,7 @@ export namespace RestOptions {`
`313`	`314`	`channelId?: null \| string,`
`314`	`315`	`discriminator: string,`
`315`	`316`	`locale?: null \| string,`
	`317`	`+ timezone?: null \| string,`
`316`	`318`	`username: string,`
`317`	`319`	`}`
`318`	`320`