some refactoring, try to be more consistent

aloop · Jan 6, 2024 · 1bbee32 · 1bbee32
1 parent aa097a5
commit 1bbee32
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 43 deletions.
diff --git a/api-client/epic-games-store.js b/api-client/epic-games-store.js
@@ -2,7 +2,7 @@ const productBaseUrl = "https://www.epicgames.com/store/en-US/product/";
 const freeGamesApiUrl =
     "https://store-site-backend-static.ak.epicgames.com/freeGamesPromotions?locale=en-US&country=US&allowCountries=US";
 
-const isCurrentlyFree = (game) => {
+function isCurrentlyFree(game) {
     const currentDate = Date.now();
     const giveawayStart =
         game?.promotions?.promotionalOffers[0]?.promotionalOffers[0]?.startDate;
@@ -17,9 +17,9 @@ const isCurrentlyFree = (game) => {
     }
 
     return false;
-};
+}
 
-const getFormattedEndDate = (game) => {
+function getFormattedEndDate(game) {
     const giveawayEnd =
         game?.promotions?.promotionalOffers[0]?.promotionalOffers[0]?.endDate;
 
@@ -32,7 +32,35 @@ const getFormattedEndDate = (game) => {
     }
 
     return null;
-};
+}
+
+function selectFreeGames(game) {
+    return (
+        // Check for a discounted price of $0
+        game?.price?.totalPrice?.discountPrice === 0 &&
+        // Make sure it has "promotional offers"
+        game?.promotions?.promotionalOffers?.length > 0 &&
+        // Make sure it's actually free
+        isCurrentlyFree(game)
+    );
+}
+
+function formatGameData(game) {
+    return {
+        title: game.title,
+        description: game.description,
+        id: game.id,
+        url: new URL(`${game?.productSlug}`, productBaseUrl).href,
+        thumbnailUrl:
+            game?.keyImages?.find(
+                (img) => img?.type?.toLowerCase() === "thumbnail"
+            )?.url ?? game?.keyImages[0]?.url,
+        freeUntil: getFormattedEndDate(game),
+        endDate:
+            game?.promotions?.promotionalOffers[0]?.promotionalOffers[0]
+                ?.endDate,
+    };
+}
 
 export async function fetchFreeGames() {
     const response = await fetch(freeGamesApiUrl);
@@ -45,32 +73,9 @@ export async function fetchFreeGames() {
 
     const result = await response.json();
 
-    if (result?.data?.Catalog?.searchStore?.elements) {
-        const elements = result.data.Catalog.searchStore.elements;
+    const elements = result?.data?.Catalog?.searchStore?.elements;
 
-        return elements
-            .filter(
-                (game) =>
-                    // Check for a discounted price of $0
-                    game?.price?.totalPrice?.discountPrice === 0 &&
-                    // Make sure it has "promotional offers"
-                    game?.promotions?.promotionalOffers?.length > 0 &&
-                    // Make sure it's actually free
-                    isCurrentlyFree(game)
-            )
-            .map((game) => ({
-                title: game.title,
-                description: game.description,
-                id: game.id,
-                url: new URL(`${game?.productSlug}`, productBaseUrl).href,
-                thumbnailUrl:
-                    game?.keyImages?.find(
-                        (img) => img?.type?.toLowerCase() === "thumbnail"
-                    )?.url ?? game?.keyImages[0]?.url,
-                freeUntil: getFormattedEndDate(game),
-                endDate:
-                    game?.promotions?.promotionalOffers[0]?.promotionalOffers[0]
-                        ?.endDate,
-            }));
+    if (elements) {
+        return elements.filter(selectFreeGames).map(formatGameData);
     }
 }
diff --git a/cron-tasks/fetch-free-epic-games.js b/cron-tasks/fetch-free-epic-games.js
@@ -7,7 +7,7 @@ const {
     channels: { deals },
 } = await loadConfig();
 
-const postNewDeals = (client, games) => {
+function postNewDeals(client, games) {
     if (games.length > 0) {
         try {
             const channel = client.channels.cache.get(deals);
@@ -40,7 +40,7 @@ const postNewDeals = (client, games) => {
             console.error(err);
         }
     }
-};
+}
 
 // 2 hours in milliseconds
 const intervalLength = 2 * 60 * 60 * 1000;

diff --git a/models/epic-games-store.js b/models/epic-games-store.js
@@ -4,7 +4,7 @@ import { fetchFreeGames } from "../api-client/epic-games-store.js";
 const pickGameId = (game) => game.id;
 
 export async function fetchNewGames() {
-    let freeGames = null;
+    let freeGames = [];
 
     try {
         freeGames = await fetchFreeGames();
@@ -15,10 +15,6 @@ export async function fetchNewGames() {
         );
     }
 
-    if (freeGames === null) {
-        return;
-    }
-
     const currentDate = Date.now();
     const store = new Store("../db/epic-games-store-free-games.json");
     const currentGames = await store.read();

diff --git a/models/wow-token-price.js b/models/wow-token-price.js
@@ -12,9 +12,9 @@ const db = await open({
     driver: sqlite3.cached.Database,
 });
 
-const closeDB = async () => {
+async function closeDB() {
     await db.close();
-};
+}
 
 process.on("SIGINT", closeDB);
 process.on("SIGTERM", closeDB);
@@ -32,10 +32,12 @@ const insertPriceQuery = `
         (:updated_at,:price);
 `;
 
-const formatResult = ({ updated_at, price }) => ({
-    updatedAt: updated_at,
-    price,
-});
+function formatResult({ updated_at, price }) {
+    return {
+        updatedAt: updated_at,
+        price,
+    };
+}
 
 export async function getLatest() {
     const result = await db.get(getLatestQuery);