Merge pull request #173 from leocabeza/ngve-twitter

(Agrega) Integración con Twitter

.env.sample

@@ -1,10 +1,13 @@
-TELEGRAM_BOT_TOKEN=XXX
-GITHUB_ACCESS_TOKEN=XXX
-DIALOGFLOW_CLIENT_EMAIL=XXX
-DIALOGFLOW_PRIVATE_KEY=XXX
-DIALOGFLOW_PROJECT_ID=XXX
-SENTRY_DSN=
-NTBA_FIX_319=1
-BOT_USERNAME=XXX
-NODE_ENV=development
+ADMIN_GROUP_ID=XXX
 APP_PORT=8443
+BOT_USERNAME=TestsBot
+GITHUB_ACCESS_TOKEN=
+DIALOGFLOW_CLIENT_EMAIL=
+DIALOGFLOW_PRIVATE_KEY=
+DIALOGFLOW_PROJECT_ID=
+MAIN_GROUP_ID=
+NODE_ENV=development
+NTBA_FIX_319=1
+SENTRY_DSN=
+TELEGRAM_BOT_TOKEN=
+TWITTER_CONSUMER_SECRET=

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## 4.1.0 (2019-05-04)
+
+### Agregado
+
+- Habilitada de nuevo la funcionalidad de twitter
+
 ## 4.0.3 (2019-05-01)
 
 ### Actualizado

now-staging.json

@@ -14,7 +14,8 @@
     "NODE_ENV": "staging",
     "NTBA_FIX_319": "1",
     "SENTRY_DSN": "@sentryio-dns-staging",
-    "TELEGRAM_BOT_TOKEN": "@telegram-bot-token-staging"
+    "TELEGRAM_BOT_TOKEN": "@telegram-bot-token-staging",
+    "TWITTER_CONSUMER_SECRET": "@twitter-consumer-secret"
   },
   "version": 1,
   "public": true,

now.json

@@ -14,7 +14,8 @@
     "NODE_ENV": "production",
     "NTBA_FIX_319": "1",
     "SENTRY_DSN": "@sentryio-dns",
-    "TELEGRAM_BOT_TOKEN": "@telegram-bot-token"
+    "TELEGRAM_BOT_TOKEN": "@telegram-bot-token",
+    "TWITTER_CONSUMER_SECRET": "@twitter-consumer-secret"
   },
   "version": 1,
   "public": true,

package.json

@@ -31,12 +31,12 @@
     "dotenv": "^6.2.0",
     "express": "^4.16.4",
     "ngrok": "^3.1.1",
-    "node-fetch": "^2.4.1",
+    "node-fetch": "^2.5.0",
     "node-telegram-bot-api": "^0.30.0"
   },
   "devDependencies": {
     "husky": "^1.3.1",
-    "lint-staged": "^8.1.5",
+    "lint-staged": "^8.1.6",
     "prettier": "1.17.0"
   },
   "husky": {

src/config/messages.js

@@ -35,7 +35,7 @@ const messages = {
   newBlogPost: '*#{author}* ha agregado una nueva entrada al blog titulada: '.concat(
     '*#{title}* y está disponible en: #{link}'
   ),
-  newTweet: '#{hashtagMessage} \u{1F426}\n'.concat(
+  newTweet: '#ngVenezuelaTweet \u{1F426}\n'.concat(
     '#{tweetText}\n',
     '----\n',
     'Puedes ver el Tweet aquí: #{tweetUrl}'

src/index.js

@@ -5,8 +5,12 @@ const Sentry = require('@sentry/node');
 const handleListenCommands = require('./listen-commands');
 const handleTimeEvents = require('./time-events');
 const WebhookServer = require('./webhooks/server');
-const { Telegram, Superfeedr } = require('./webhooks');
-const { handleBlogEntry, handleGithubRelease } = require('parsers');
+const { Telegram, Superfeedr, Twitter } = require('./webhooks');
+const {
+  handleBlogEntry,
+  handleGithubRelease,
+  handleTweet,
+} = require('parsers');
 
 //NOTE: About the port -> https://core.telegram.org/bots/api#setwebhook
 const {
@@ -19,14 +23,13 @@ const {
 
 const telegramBot = new Telegram(TELEGRAM_BOT_TOKEN);
 const superfeedr = new Superfeedr();
+const twitter = new Twitter();
 Sentry.init({ dsn: SENTRY_DSN });
 
 initializeBot = async () => {
   if (NODE_ENV === 'development') {
     const url = await ngrok.connect(APP_PORT);
-    console.log(
-      `use this url in your webhooks along with the token: ${url}/${TELEGRAM_BOT_TOKEN}`
-    );
+    console.log(`use this url in your webhooks: ${url}/${TELEGRAM_BOT_TOKEN}`);
     telegramBot.setWebHook(`${url}/${TELEGRAM_BOT_TOKEN}`);
   } else {
     telegramBot.setWebHook(`${APP_URL}/${TELEGRAM_BOT_TOKEN}`);
@@ -39,7 +42,8 @@ handleTimeEvents(telegramBot);
 
 new WebhookServer(`/${TELEGRAM_BOT_TOKEN}`, APP_PORT)
   .subscribe(telegramBot)
-  .subscribe(superfeedr);
+  .subscribe(superfeedr)
+  .subscribe(twitter);
 
 superfeedr.on('newGithubRelease', msg => {
   handleGithubRelease(telegramBot, msg);
@@ -49,6 +53,10 @@ superfeedr.on('newBlogEntry', msg => {
   handleBlogEntry(telegramBot, msg);
 });
 
+twitter.on('newTweet', msg => {
+  handleTweet(telegramBot, msg);
+});
+
 process.on('SIGUSR2', () => {
   if (NODE_ENV === 'development') {
     telegramBot.closeWebHook();

src/listen-commands/development-tools/index.js

@@ -8,10 +8,13 @@ const sendGroupId = async (bot, msg) => {
   const chatId = msg.chat.id;
   const chatInfo = await bot.getChat(chatId);
 
-  if (['group', 'supergroup'].includes(chatInfo.type)) {
+  if (chatInfo.type === 'private') {
     bot.sendMessage(
       chatId,
-      `Tú variable \`mainGroupId/adminGroupId\` es: ${chatInfo.id}`
+      `Tú variable \`mainGroupId/adminGroupId\` es: ${chatInfo.id}`,
+      {
+        parse_mode: 'Markdown',
+      }
     );
   }
 };

src/parsers/index.js

@@ -1,7 +1,9 @@
 const handleBlogEntry = require('./blog');
 const handleGithubRelease = require('./github');
+const handleTweet = require('./twitter');
 
 module.exports = {
   handleBlogEntry,
   handleGithubRelease,
+  handleTweet,
 };

src/parsers/twitter.js

@@ -0,0 +1,31 @@
+const { mainGroupId } = require('config/telegram');
+const { newTweet } = require('config/messages');
+const { sendMessage } = require('bot-api-overrides');
+
+const isRt = tweet => tweet.retweeted || tweet.retweeted_status;
+
+const isReply = tweet =>
+  tweet.in_reply_to_status_id || tweet.in_reply_to_user_id;
+
+const handleTweet = (bot, tweets = []) => {
+  tweets.forEach(tweet => {
+    if (!isReply(tweet) && !isRt(tweet)) {
+      const tweetUrl = `https://twitter.com/${tweet.user.screen_name}/status/${
+        tweet.id_str
+      }`;
+
+      sendMessage(
+        bot,
+        mainGroupId,
+        newTweet
+          .replace('#{tweetText}', tweet.text)
+          .replace('#{tweetUrl}', tweetUrl),
+        {
+          parse_mode: 'Markdown',
+        }
+      );
+    }
+  });
+};
+
+module.exports = handleTweet;

src/webhooks/index.js

@@ -1,7 +1,9 @@
 const Telegram = require('./telegram');
 const Superfeedr = require('./superfeedr');
+const Twitter = require('./twitter');
 
 module.exports = {
   Superfeedr,
   Telegram,
+  Twitter,
 };

src/webhooks/server.js

@@ -24,11 +24,20 @@ class BotServer {
     // parse the updates to JSON
     app.use(bodyParser.json());
 
+    // If a webhook has a verify url, we receive it here
+    app.get(path, (req, res) => {
+      this.webhooks.forEach(
+        webhook =>
+          typeof webhook.verifyMessage === 'function' &&
+          webhook.verifyMessage(req, res)
+      );
+    });
+
     // We are receiving updates at the route below!
     app.post(path, (req, res) => {
       this.webhooks.forEach(
         webhook =>
-          webhook.checkMessage(req.body) && webhook.proccessMessage(req.body)
+          webhook.checkMessage(req.body) && webhook.processMessage(req.body)
       );
 
       res.sendStatus(200).end();
@@ -45,7 +54,11 @@ class BotServer {
    * @param {object} webhook
    */
   static isWebHook(webhook) {
-    return webhook && webhook.checkMessage && webhook.proccessMessage;
+    return (
+      webhook &&
+      typeof webhook.checkMessage === 'function' &&
+      typeof webhook.processMessage === 'function'
+    );
   }
 
   /**

src/webhooks/superfeedr.js

@@ -18,7 +18,7 @@ class Superfeedr extends EventEmitter {
    * Emit message to subscribers
    * @param {object} msg - Message to emit
    */
-  proccessMessage(msg) {
+  processMessage(msg) {
     if (msg.status.feed.startsWith('https://medium.com')) {
       return this.emit('newBlogEntry');
     }

src/webhooks/telegram.js

@@ -32,15 +32,16 @@ class TelegramBot extends NodeTelegramBotApi {
       msg.chosen_inline_result ||
       msg.callback_query ||
       msg.shipping_query ||
-      msg.pre_checkout_query
+      msg.pre_checkout_query ||
+      msg.poll
     );
   }
 
   /**
    * Give message to processUpdate parent method
    * @param {object} msg - Message to process
    */
-  proccessMessage(msg) {
+  processMessage(msg) {
     this.processUpdate(msg);
   }
 }