Merge pull request #12 from halitsever/dev

api service url changed to 'https://random-memes-api.vercel.app'

Author: halitsever

package.json

@@ -11,7 +11,7 @@
   "bundleDependencies": [],
   "dependencies": {
     "canvas": "^2.8.0",
-    "node-fetch": "^3.2.6",
+    "node-fetch": "^2.6.7",
     "user": "*"
   },
   "deprecated": false,
@@ -39,7 +39,7 @@
     "start": "node src/index.js",
     "test": "jest"
   },
-  "version": "3.1.3",
+  "version": "3.1.7",
   "devDependencies": {
     "jest": "^28.1.1"
   }

src/lib/fromReddit.js

@@ -17,22 +17,21 @@ var fromReddit = async function (subredditlocale) {
   subredditname = subreddits[subredditlocale];
   if (subreddits[subredditlocale] === undefined)
     subredditname = subreddits["en"];
-  await fetch(
+  let response = await fetch(
     "https://www.reddit.com/r/" + subredditname + "/hot/.json?count=100"
   )
-    .then(res => res.json())
-    .then(json => {
-      let postID =
-        json.data.children[
-        Math.floor(Math.random() * json.data.children.length)
-        ];
-      meme = {
-        image: postID.data.url,
-        category: postID.data.link_flair_text,
-        caption: postID.data.title,
-        permalink: postID.data.permalink
-      };
-    });
+  let memeObject = await response.json();
+  let postID = await
+    memeObject.data.children[
+    Math.floor(Math.random() * memeObject.data.children.length)
+    ];
+  let meme = {
+    image: postID.data.url,
+    category: postID.data.link_flair_text,
+    caption: postID.data.title,
+    permalink: postID.data.permalink
+  };
+
   return meme;
 };
 

src/lib/random.js

@@ -2,17 +2,14 @@ const fetch = require("node-fetch");
 const fs = require("fs");
 
 var random = async function () {
-  await fetch("https://some-random-api.ml/meme")
-    .then(res => res.json())
-    .then(
-      json =>
-      (meme = {
-        image: json.image,
-        category: json.category,
-        caption: json.caption,
-        id: json.id
-      })
-    );
+  let response = await fetch("https://random-memes-api.vercel.app/getmeme");
+  let memeObject = await response.json();
+  let meme = {
+    image: memeObject.image,
+    category: memeObject.category,
+    caption: memeObject.caption,
+    id: memeObject.id
+  }
   return meme;
 };