Fix tweet url

src/index.js

@@ -3,7 +3,7 @@ const bodyParser = require("body-parser");
 const cache = require("memory-cache");
 const cors = require("cors");
 const VError = require("verror").WError;
-const { twitter, alerts, fetch } = require("./utils");
+const { getTwitterMediaUrl, alerts, fetch } = require("./utils");
 
 const app = express();
 
@@ -14,8 +14,6 @@ app.use(
   })
 );
 
-twitter.createClient();
-
 app.get("/", (req, res) => {
   res.send(`memsize=${cache.memsize()}`);
 });
@@ -44,8 +42,7 @@ app.post("/v1/tweetMedia", (req, res, next) => {
     return next(new VError(alerts.error.imageInvalid));
   }
 
-  twitter
-    .getMediaUrl(image)
+  getTwitterMediaUrl(image)
     .then(mediaUrl =>
       res.json({
         mediaUrl

src/utils/index.js

@@ -1,9 +1,9 @@
 const { fetchDataForAllYears } = require("./fetch");
 const alerts = require("./alerts");
-const twitter = require("./twitter")(alerts);
+const getTwitterMediaUrl = require("./twitter")(alerts);
 
 module.exports = {
   fetch: fetchDataForAllYears,
   alerts,
-  twitter
+  getTwitterMediaUrl
 };

src/utils/twitter.js

@@ -2,19 +2,15 @@ const Twitter = require("twitter");
 const VError = require("verror").WError;
 const dataUriToBuffer = require("data-uri-to-buffer");
 
-module.exports = function(alerts) {
-  const twitter = {};
+const twitterClient = new Twitter({
+  consumer_key: process.env.TWITTER_CONSUMER_KEY,
+  consumer_secret: process.env.TWITTER_CONSUMER_SECRET,
+  access_token_key: process.env.TWITTER_ACCESS_TOKEN_KEY,
+  access_token_secret: process.env.TWITTER_ACCESS_TOKEN_SECRET
+});
 
-  twitter.createClient = function() {
-    return new Twitter({
-      consumer_key: process.env.TWITTER_CONSUMER_KEY,
-      consumer_secret: process.env.TWITTER_CONSUMER_SECRET,
-      access_token_key: process.env.TWITTER_ACCESS_TOKEN_KEY,
-      access_token_secret: process.env.TWITTER_ACCESS_TOKEN_SECRET
-    });
-  };
-
-  twitter.getMediaUrl = async function getMediaUrl(base64data) {
+module.exports = alerts =>
+  async function getMediaUrl(base64data) {
     try {
       const buff = dataUriToBuffer(base64data);
       const mediaResponse = await twitterClient.post("media/upload", {
@@ -32,6 +28,3 @@ module.exports = function(alerts) {
       throw new VError(err, alerts.error.imageUploadFailed);
     }
   };
-
-  return twitter;
-};