Add initial batching to wrapped

commands/100-games/chartgamegenres.js

@@ -52,32 +52,34 @@ module.exports = {
         return interaction.editReply({ embeds: [embed] });
         }
 
-        const beatGameIGDBEntries = [];
+        const gameIds = [];
 
         for (let i = 0; i < beatenGamesDatabaseEntries.length; i++) {
           const game = await checkGameStorageId(beatenGamesDatabaseEntries[i].gameId);
-            const json = await getGameJson(String.prototype.concat('where id = ', game.igdb_id, '; fields *;'));
+          gameIds.push(game.igdb_id);
-            beatGameIGDBEntries.push(json[0]);
         }
 
-        const genres = [];
+        const beatGameIGDBEntries = await getGameJson(String.prototype.concat(`where id = (${gameIds}); fields *; limit ${gameIds.length};`));
+
         const counts = [];
-        const cachedGenres = new Map();
+        const cachedGenres = new Set();
 
         for (let i = 0; i < beatGameIGDBEntries.length; i++) {
             if (beatGameIGDBEntries[i].genres) {
                 for (let j = 0; j < beatGameIGDBEntries[i].genres.length; j++) {
+                    cachedGenres.add(beatGameIGDBEntries[i].genres[j]);
+                }
+            }
+        }
 
-                    if (cachedGenres.has(beatGameIGDBEntries[i].genres[j]))
+        const genresinfo = await getGenres([...cachedGenres]);
-                    {
+
-                        genres.push(cachedGenres.get(beatGameIGDBEntries[i].genres[j]));
+        const genres = [];
-                    }
+
-                    else
+        for (let i = 0; i < beatGameIGDBEntries.length; i++) {
-                    {
+            if (beatGameIGDBEntries[i].genres) {
-                        const genre = await getGenres(beatGameIGDBEntries[i].genres[j]);
+                for (let j = 0; j < beatGameIGDBEntries[i].genres.length; j++) {
-                        cachedGenres.set(beatGameIGDBEntries[i].genres[j], genre);
+                    genres.push(genresinfo.find(item => item.id === beatGameIGDBEntries[i].genres[j]).name);
-                        genres.push(genre);
-                    }
                 }
             }
         }

commands/100-games/wrapped.js

@@ -103,13 +103,14 @@ async function GetBeatenGamesForYear(userDatabaseEntry, year) {
 }
 
 async function GetIGDBEntries(array) {
-	beatGameIGDBEntries = [];
+	const gameIds = [];
 
 	for (let i = 0; i < array.length; i++) {
 		const game = await checkGameStorageId(array[i].gameId);
-		const json = await getGameJson(String.prototype.concat('where id = ', game.igdb_id, '; fields *;'));
+		gameIds.push(game.igdb_id);
-		beatGameIGDBEntries.push(json[0]);
 	}
+
+	beatGameIGDBEntries = await getGameJson(String.prototype.concat(`where id = (${gameIds}); fields *; limit ${gameIds.length};`));
 }
 
 async function GetDevelopers() {
@@ -257,24 +258,25 @@ async function GetAverageGameAge() {
 }
 
 async function GetFavouriteGenres() {
-	const genres = [];
 	const counts = [];
-	const cachedGenres = new Map();
+	const cachedGenres = new Set();
 
 	for (let i = 0; i < beatGameIGDBEntries.length; i++) {
 		if (beatGameIGDBEntries[i].genres) {
 			for (let j = 0; j < beatGameIGDBEntries[i].genres.length; j++) {
+				cachedGenres.add(beatGameIGDBEntries[i].genres[j]);
+			}
+		}
+	}
 
-				if (cachedGenres.has(beatGameIGDBEntries[i].genres[j]))
+	const genresinfo = await getGenres([...cachedGenres]);
-				{
+
-					genres.push(cachedGenres.get(beatGameIGDBEntries[i].genres[j]));
+	const genres = [];
-				}
+
-				else
+	for (let i = 0; i < beatGameIGDBEntries.length; i++) {
-				{
+		if (beatGameIGDBEntries[i].genres) {
-					const genre = await getGenres(beatGameIGDBEntries[i].genres[j]);
+			for (let j = 0; j < beatGameIGDBEntries[i].genres.length; j++) {
-					cachedGenres.set(beatGameIGDBEntries[i].genres[j], genre);
+				genres.push(genresinfo.find(item => item.id === beatGameIGDBEntries[i].genres[j]).name);
-					genres.push(genre);
-				}
 			}
 		}
 	}

igdbHelperFunctions.js

@@ -150,17 +150,17 @@ async function getGenres(id) {
             'Client-ID': `${process.env.igdbClientId}`,
             'Authorization': `Bearer ${process.env.igdbAccessToken}`,
           },
-          body: `where id = ${id}; fields *;`,
+          body: `where id = (${id}); fields *; limit ${id.length};`,
       })
       .then(response => response.json())
       .then(response => {
-        genre = response[0];
+        genre = response;
       })
         .catch(err => {
             console.error(err);
         });
 
-    return genre.name;
+    return genre;
 }
 
 async function getFranchise(id) {