Adding basic subreddit-denylist functionality

ouifi · Apr 20, 2021 · 8d2401e · 8d2401e
1 parent 1ef2174
commit 8d2401e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ Create a `.env` file with the following values from your own reddit bot account.
 ```
 REDDIT_CLIENT_SECRET=<secret>
 REDDIT_CLIENT_ID=<id>
+REDDIT_USERNAME=<username>
 NODE_ENV={ development | production }
 LOG_LEVEL={ NONE | ERROR | WARN | LOG | [DEBUG] | VERBOSE }
 ```

diff --git a/src/index.js b/src/index.js
@@ -38,13 +38,6 @@ if (process.env.NODE_ENV !== "production") {
     });
 }
 
-Reddit.initialize(
-    // process.env.REDDIT_USERNAME,
-    // process.env.REDDIT_PASSWORD,
-    process.env.REDDIT_CLIENT_ID,
-    process.env.REDDIT_CLIENT_SECRET
-);
-
 Reddit.connect().then(() => {
     Server.listen(process.env.PORT || 9999, "0.0.0.0", function (err, address) {
         if (err) {

diff --git a/src/lib/reddit.js b/src/lib/reddit.js
@@ -4,23 +4,15 @@ const url = require("url");
 const { Logger } = require("../lib/log");
 
 const creds = {
-    username: null, 
-    password: null, 
-    id: null, 
-    secret: null
-}
+    id: process.env.REDDIT_CLIENT_ID, 
+    secret: process.env.REDDIT_CLIENT_SECRET
+};
 
 let auth = null;
-
 let user_agent = `node.js:guessr.io:v1.0.0 (by u/${process.env.REDDIT_USERNAME})`;
 
 class RedditClient {
 
-    static initialize(id, secret) {
-        creds.id = id;
-        creds.secret = secret;
-    }
-
     static async connect() {
         return axios.request({
             method: "POST",
@@ -37,19 +29,24 @@ class RedditClient {
                 if (response.status === 200) {
                     auth = response.data;
                     return response.data;
+                } else {
+                    throw new Error(response.message);
                 }
             }
         ).catch(
             (err) => {
                 Logger.error(err.message);
             }
-        )
+        );
     }
 
     static async getRandomSubreddit() {
         return axios.request({
             method: "POST",
             url: "https://www.reddit.com/r/random/top/.json?t=week",
+            headers: {
+                "User-Agent": user_agent
+            }
         })
         .then(
             (response) => {
@@ -61,7 +58,7 @@ class RedditClient {
             (err) => {
                 Logger.error(err.message);
             }
-        )
+        );
     }
 
     static async getRandomSubredditWithAuth() {
@@ -88,10 +85,11 @@ class RedditClient {
                         );
                     if (clean_headers["x-ratelimit-used"]) {
                         Logger.warn("Reddit API is warning of usage for /u/" + process.env.REDDIT_USERNAME);
-                        if (clean_headers["x-ratelimit-remaining"] < 20) {
-                            Logger.error("< 20 requests remaining for /u/" + process.env.REDDIT_USERNAME);
-                        }
-                    } 
+                    }
+
+                    if (clean_headers["x-ratelimit-remaining"] < 20) {
+                        Logger.error("< 20 requests remaining for /u/" + process.env.REDDIT_USERNAME);
+                    }
                     return response.data;
                 }
             }
@@ -100,7 +98,7 @@ class RedditClient {
             (err) => {
                 Logger.error(err);
             }
-        )
+        );
     }
 
     static async requestWithAuth(config) {
@@ -111,7 +109,7 @@ class RedditClient {
                 "User-Agent": user_agent,
                 ...config.headers
             }
-        })
+        });
     }
 }
 
@@ -120,6 +118,6 @@ setInterval(
         RedditClient.connect();
     },
     1000 * 60 * 5
-)
+);
 
 module.exports = RedditClient;
diff --git a/src/routes/api.js b/src/routes/api.js
@@ -1,3 +1,6 @@
+const fs = require("fs");
+const path = require("path");
+
 const { Logger } = require("../lib/log");
 const Reddit = require("../lib/reddit");
 
@@ -8,21 +11,35 @@ const api = function (instance, opts, done) {
         });
     });
 
-    // instance.get("/connect", async () => {
-    //     await Reddit.connect();
-    //     return {};
-    // });
+    let denySubreddits = null;
+
+    try {
+        const data = fs.readFileSync(path.join(process.cwd(), "subreddit-denylist.txt"), { encoding: "utf-8"});
+        data.replace("\r", "");
+        denySubreddits = data.split("\n");
+    } catch (err) {
+        Logger.error(err.message);
+        denySubreddits = [];
+    }
 
     instance.get("/newgame", async () => {
         let response;
         try {
             response = await Reddit.getRandomSubredditWithAuth();
         } catch (err) {
-            Logger.warn("Reddit API Call with Auth failed... falling back to no auth")
-
+            Logger.warn("Reddit API call with Auth failed... falling back to no auth");
             response = await Reddit.getRandomSubreddit();
         }
 
+        while (denySubreddits.indexOf(response.data.children[0].data.subreddit) > -1) {
+            try {
+                response = await Reddit.getRandomSubredditWithAuth();
+            } catch (err) {
+                Logger.warn("Reddit API call with Auth failed... falling back to no auth");
+                response = await Reddit.getRandomSubreddit();
+            }
+        }
+
         return {
             subreddit: response.data.children[0].data.subreddit,
             posts: response.data.children.map((post) => ({

diff --git a/subreddit-denylist.txt b/subreddit-denylist.txt
@@ -0,0 +1 @@
+NoahGetTheBoat