Refactored post fetching. Cleaner code that will now fetch archived posts even if the user no longer exists on reddit. Expanded gfycat URL detection.

src/sources/getUserPosts.js

@@ -6,42 +6,48 @@ const getArchivePostIds = require('../archives/getArchivePostIds.js');
 const curateUser = require('../curate/user.js');
 const saveProfileDetails = require('../save/profileDetails.js');
 
-function getUserPostsWrap(reddit, args) {
-    return function getUserPosts(usernames) {
-        return usernames.reduce((chain, username) => {
-            return chain.then(accPosts => {
-                return reddit.getUser(username).fetch().then(curateUser).then(saveProfileDetails).then(user => ({
-                    user,
-                    accPosts
-                }));
-            }).then(({user, accPosts}) => {
-                return reddit.getUser(username).getSubmissions({
-                    sort: args.sort,
-                    limit: Infinity
-                }).then(posts => ({
-                    user,
-                    accPosts: accPosts.concat(posts)
-                }));
-            }).then(({user, accPosts}) => {
-                if(args.archives || config.fetch.archives.search) {
-                    return getArchivePostIds(username, accPosts.map(post => post.id)).then(postIds => {
-                        return Promise.all(postIds.map(postId => {
-                            return reddit.getSubmission(postId).fetch();
-                        }));
-                    }).then(archivedPosts => {
-                        return {
-                            user,
-                            accPosts: accPosts.concat(archivedPosts)
-                        };
-                    });
-                }
+const getUser = (username, reddit) => {
+    return reddit.getUser(username).fetch().then(user => curateUser(user)).catch(error => {
+        console.log('\x1b[31m%s\x1b[0m', `Failed to fetch reddit user '${username}': ${error.message} (https://reddit.com/user/${username})`);
 
-                return {user, accPosts};
-            }).then(({user, accPosts}) => {
-                return accPosts.map(post => Object.assign(post, {user}));
-            });
-        }, Promise.resolve([]));
-    };
+        return {
+            name: username,
+            fallback: true
+        };
+    });
 };
 
+const getPosts = (username, reddit, args) => {
+    return reddit.getUser(username).getSubmissions({
+        sort: args.sort,
+        limit: Infinity
+    }).catch(error => {
+        console.log('\x1b[31m%s\x1b[0m', `Failed to fetch posts from reddit user '${username}': ${error.message} (https://reddit.com/user/${username})`);
+
+        return [];
+    });
+};
+
+const getUserPostsWrap = (reddit, args) => usernames => Promise.all(
+    usernames.map(async username => {
+        const [user, posts] = await Promise.all([
+            getUser(username, reddit),
+            getPosts(username, reddit, args)
+        ]);
+
+        if(user) {
+            saveProfileDetails(user);
+        }
+
+        if(args.archives) {
+            const postIds = await getArchivePostIds(username, posts.map(post => post.id));
+            const archivedPosts = await Promise.all(postIds.map(postId => reddit.getSubmission(postId).fetch()));
+
+            posts.push(...archivedPosts);
+        }
+
+        return posts.map(post => Object.assign(post, {user}));
+    })
+).then(posts => posts.flatten());
+
 module.exports = getUserPostsWrap;