Merge pull request #561 from m-h-c-t/kga-2024

Update KGA end date for 2024

src/scripts/util/constants.ts

@@ -32,7 +32,7 @@ export class CustomConvertibleIds {
  */
 export class EventDates {
     // KGA
-    public static readonly KingsGiveawayEndDate: Date = new Date("2023-10-03T15:00:00Z");
+    public static readonly KingsGiveawayEndDate: Date = new Date("2024-07-09T15:00:00Z");
 
     // GWH
     public static readonly GreatWinterHuntEndDate: Date = new Date("2024-01-16T16:00:00Z");

src/scripts/util/time.ts

@@ -15,3 +15,17 @@ export function getUnixTimestamp(): number {
 export function hasEventEnded(eventEndDate: Date) {
     return Date.now() > eventEndDate.getTime();
 }
+
+
+/**
+ * Adds the specified number of days to a given date.
+ *
+ * @param date - The date to which the days will be added.
+ * @param days - The number of days to add.
+ * @returns A new Date object representing the updated date.
+ */
+export function addDays(date: Date, days: number): Date {
+    const result = new Date(date);
+    result.setDate(date.getDate() + days);
+    return result;
+}

tests/scripts/modules/ajax-handlers/kingsGiveaway.spec.ts

@@ -2,7 +2,8 @@ import {KingsGiveawayAjaxHandler} from "@scripts/modules/ajax-handlers/kingsGive
 import {KingsGiveawayResponse} from "@scripts/modules/ajax-handlers/kingsGiveaway.types";
 import {HgResponse} from "@scripts/types/hg";
 import {HgItem} from "@scripts/types/mhct";
-import {CustomConvertibleIds} from "@scripts/util/constants";
+import {CustomConvertibleIds, EventDates} from "@scripts/util/constants";
+import {addDays} from "@scripts/util/time";
 
 jest.mock("@scripts/util/logger");
 import {ConsoleLogger} from "@scripts/util/logger";
@@ -25,13 +26,13 @@ describe("KingsGiveawayAjaxHandler", () => {
 
         it("is false when KGA has vanished", () => {
             // return the day after our filter
-            Date.now = jest.fn(() => new Date("2023-10-04T05:00:00Z").getTime());
+            Date.now = jest.fn(() => addDays(EventDates.KingsGiveawayEndDate, 1).getTime());
 
             expect(handler.match(kga_url)).toBe(false);
         });
 
         it("is true when url matches", () => {
-            Date.now = jest.fn(() => new Date("2023-09-12T05:00:00Z").getTime());
+            Date.now = jest.fn(() => addDays(EventDates.KingsGiveawayEndDate, -5).getTime());
 
             expect(handler.match(kga_url)).toBe(true);
         });