Merge pull request #64 from cse210-works-on-my-machine/pre-fetch

Pre-fetch posts to reduce load time of the webpage
cse210-works-on-my-machine · Dec 13, 2023 · aad0b98 · aad0b98
2 parents 664c9db + 8915cdb
commit aad0b98
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 34 deletions.
diff --git a/docs/Display.html b/docs/Display.html
@@ -121,7 +121,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Fetcher.html b/docs/Fetcher.html
@@ -121,7 +121,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/InstanceEntry.html b/docs/InstanceEntry.html
@@ -168,7 +168,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Paginator_Paginator.html b/docs/Paginator_Paginator.html
@@ -229,7 +229,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/entity_InstanceEntry.js.html b/docs/entity_InstanceEntry.js.html
@@ -111,7 +111,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/fetchers_Fetcher.js.html b/docs/fetchers_Fetcher.js.html
@@ -54,7 +54,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/fetchers_LemmyFetcher.js.html b/docs/fetchers_LemmyFetcher.js.html
@@ -73,7 +73,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/fetchers_MastodonFetcher.js.html b/docs/fetchers_MastodonFetcher.js.html
@@ -30,6 +30,7 @@ <h1 class="page-title">Source: fetchers/MastodonFetcher.js</h1>
 
 export const TAGS_SUFFIX = "/api/v1/trends/tags";
 export const POST_SUFFIX = "/api/v1/timelines/tag/:";
+export const NUM_MASTODON_POSTS = 15;
 
 export class MastodonFetcher extends Fetcher {
     /**
@@ -39,12 +40,10 @@ <h1 class="page-title">Source: fetchers/MastodonFetcher.js</h1>
     async fetchPosts(instURL) {
         try {
             const hashtags = await this.#fetchTrendingTags(instURL + TAGS_SUFFIX);
-            const posts = [];
-            for (const tag of hashtags) {
-                console.log("Fetching posts for tag: " + tag.name);
-                let response = await this.#fetchPostsByHashtag(instURL, tag.name);
-                posts.push(...response);
-            }
+            const fetchPromises = hashtags.map(tag => this.#fetchPostsByHashtag(instURL, tag.name));
+            const responses = await Promise.all(fetchPromises);
+            const posts = responses.flat();
+            posts.push(...posts);
             return posts;
         }
         catch (error) {
@@ -79,7 +78,7 @@ <h1 class="page-title">Source: fetchers/MastodonFetcher.js</h1>
      * @returns {Promise&lt;Array>} - A promise that resolves to an array of posts for the given hashtag
      */
     async #fetchPostsByHashtag(instURL, hashtag) {
-        const trendingPostURL = instURL + POST_SUFFIX + hashtag;
+        const trendingPostURL = instURL + POST_SUFFIX + hashtag + "?limit=" + NUM_MASTODON_POSTS;
         try {
             const response = await fetch(trendingPostURL);
             if (!response.ok) {
@@ -109,7 +108,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/global.html b/docs/global.html
@@ -1370,7 +1370,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/index.html b/docs/index.html
@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/instanceList.js.html b/docs/instanceList.js.html
@@ -150,7 +150,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/pageBuilder.js.html b/docs/pageBuilder.js.html
@@ -101,7 +101,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/paginator.js.html b/docs/paginator.js.html
@@ -125,7 +125,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/postBuilder_LemmyPostBuilder.js.html b/docs/postBuilder_LemmyPostBuilder.js.html
@@ -105,7 +105,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/postBuilder_MastodonPostBuilder.js.html b/docs/postBuilder_MastodonPostBuilder.js.html
@@ -78,7 +78,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/postBuilder_PostBuilder.js.html b/docs/postBuilder_PostBuilder.js.html
@@ -57,7 +57,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="InstanceE
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 01:06:01 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Wed Dec 13 2023 03:40:25 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/src/scripts/fetchers/MastodonFetcher.js b/src/scripts/fetchers/MastodonFetcher.js
@@ -2,6 +2,7 @@ import { Fetcher } from "./Fetcher.js";
 
 export const TAGS_SUFFIX = "/api/v1/trends/tags";
 export const POST_SUFFIX = "/api/v1/timelines/tag/:";
+export const NUM_MASTODON_POSTS = 15;
 
 export class MastodonFetcher extends Fetcher {
     /**
@@ -11,12 +12,10 @@ export class MastodonFetcher extends Fetcher {
     async fetchPosts(instURL) {
         try {
             const hashtags = await this.#fetchTrendingTags(instURL + TAGS_SUFFIX);
-            const posts = [];
-            for (const tag of hashtags) {
-                console.log("Fetching posts for tag: " + tag.name);
-                let response = await this.#fetchPostsByHashtag(instURL, tag.name);
-                posts.push(...response);
-            }
+            const fetchPromises = hashtags.map(tag => this.#fetchPostsByHashtag(instURL, tag.name));
+            const responses = await Promise.all(fetchPromises);
+            const posts = responses.flat();
+            posts.push(...posts);
             return posts;
         }
         catch (error) {
@@ -51,7 +50,7 @@ export class MastodonFetcher extends Fetcher {
      * @returns {Promise<Array>} - A promise that resolves to an array of posts for the given hashtag
      */
     async #fetchPostsByHashtag(instURL, hashtag) {
-        const trendingPostURL = instURL + POST_SUFFIX + hashtag;
+        const trendingPostURL = instURL + POST_SUFFIX + hashtag + "?limit=" + NUM_MASTODON_POSTS;
         try {
             const response = await fetch(trendingPostURL);
             if (!response.ok) {

diff --git a/test/scripts/fetchers/MastodonFetcher.test.js b/test/scripts/fetchers/MastodonFetcher.test.js
@@ -1,6 +1,6 @@
 import { describe, it, beforeEach } from "node:test";
 import * as assert from "assert";
-import { MastodonFetcher, TAGS_SUFFIX, POST_SUFFIX } from "../../../src/scripts/fetchers/MastodonFetcher.js";
+import { MastodonFetcher, TAGS_SUFFIX, POST_SUFFIX, NUM_MASTODON_POSTS } from "../../../src/scripts/fetchers/MastodonFetcher.js";
 import sinon from "sinon";
 
 const FAKE_URL = "fakeTrendingURL";
@@ -39,12 +39,12 @@ describe("MastodonFetcher", () => {
             };
 
             // Mock trending post response for each tag
-            fetchStub.withArgs(FAKE_URL + POST_SUFFIX + "tag1").resolves(mockResponse);
-            fetchStub.withArgs(FAKE_URL + POST_SUFFIX + "tag2").resolves(mockResponse);
+            fetchStub.withArgs(FAKE_URL + POST_SUFFIX + "tag1" + "?limit=" + NUM_MASTODON_POSTS).resolves(mockResponse);
+            fetchStub.withArgs(FAKE_URL + POST_SUFFIX + "tag2" + "?limit=" + NUM_MASTODON_POSTS).resolves(mockResponse);
 
             const posts = await mastodonFetcher.fetchPosts(FAKE_URL);
 
-            assert.strictEqual(posts.length, 2);
+            assert.strictEqual(posts.length, 4);
         });
     });
 });