Patched Upcoming Command Event Ordering

ichenglin · Jan 25, 2024 · 9e886d5 · 9e886d5
1 parent 4d39e91
commit 9e886d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/commands/command_upcoming.ts b/commands/command_upcoming.ts
@@ -34,6 +34,7 @@ export default class UpcomingCommand extends VerificationCommand {
         const guild_events_total     = guild_events.length;
         const guild_events_maximum   = 10;
         guild_events = guild_events.slice(0, Math.min(guild_events_total, guild_events_maximum));
+        guild_events = guild_events.sort((event_data_a, event_data_b) => event_data_a.event_date.date_begin - event_data_b.event_date.date_begin);
         const guild_events_teams     = await Promise.all(guild_events.map(event_data => RobotEvent.get_event_teams(event_data.event_id)));
         // embed
         const events_embed = new EmbedBuilder()
@@ -66,7 +67,7 @@ export default class UpcomingCommand extends VerificationCommand {
                         name: `📌 ${event_data.event_name} 📌`,
                         value: [
                             `${VerificationDisplay.LIST_MARKER} Location: ${CountryFlag.get_flag(event_data.event_location.address_country)} \`${event_region}\``,
-                            `${VerificationDisplay.LIST_MARKER} Date: <t:${Math.floor(new Date(event_data.event_date.date_begin).getTime() / 1000)}:R>`,
+                            `${VerificationDisplay.LIST_MARKER} Date: <t:${Math.floor(event_data.event_date.date_begin / 1000)}:R>`,
                             `${VerificationDisplay.LIST_MARKER} Teams: \`${event_teams_list}\` and \`${event_teams_excluded}\` more team(s)...`,
                             `${VerificationDisplay.LIST_MARKER} Links: ${event_links.map(link_data => `[**\`${link_data.link_name}\`**](${link_data.link_url})`).join(", ")}`,
                             `\u200B`

diff --git a/objects/robotevent.ts b/objects/robotevent.ts
@@ -92,10 +92,10 @@ export default class RobotEvent {
             skills_score: {
                 driver_score:           skill_data.scores.driver,
                 driver_time_stop:       skill_data.scores.driverStopTime,
-                driver_score_date:      skill_data.scores.driverScoredAt,
+                driver_score_date:      new Date(skill_data.scores.driverScoredAt).getTime(),
                 programming_score:      skill_data.scores.programming,
                 programming_time_stop:  skill_data.scores.progStopTime,
-                programming_score_date: skill_data.scores.progScoredAt,
+                programming_score_date: new Date(skill_data.scores.progScoredAt).getTime()
             }
         } as SeasonSkills));
         await VerificationCache.cache_set(`ROBOTEVENT_SEASONSKILLS_${season_id}`, result);
@@ -132,8 +132,8 @@ export default class RobotEvent {
                 event_sku:             event_data.sku,
                 event_name:            event_data.name,
                 event_date: {
-                    date_begin:        VerificationTimezone.timezone_set(event_data.start, event_timezone[0].timezone_offset).toUTCString(),
-                    date_end:          VerificationTimezone.timezone_set(event_data.end,   event_timezone[0].timezone_offset).toUTCString()
+                    date_begin:        VerificationTimezone.timezone_set(event_data.start, event_timezone[0].timezone_offset).getTime(),
+                    date_end:          VerificationTimezone.timezone_set(event_data.end,   event_timezone[0].timezone_offset).getTime()
                 },
                 event_program: {
                     program_id:        event_data.program.id,
@@ -206,8 +206,8 @@ export interface EventData {
     event_sku:        string,
     event_name:       string,
     event_date: {
-        date_begin:   string,
-        date_end:     string
+        date_begin:   number,
+        date_end:     number
     },
     event_program: {
         program_id:   number,
@@ -255,10 +255,10 @@ export interface SeasonSkills {
         // driver
         driver_score:            number,
         driver_time_stop:        number,
-        driver_score_date:       string,
+        driver_score_date:       number,
         // programming
         programming_score:       number,
         programming_time_stop:   number,
-        programming_score_date:  string
+        programming_score_date:  number
     }
 }