Merge branch 'develop'

Author: ericrallen

components/express_webserver.js

@@ -7,6 +7,33 @@ var http = require('http');
 var hbs = require('express-hbs');
 
 module.exports = function(controller) {
+
+  /*function errorHandler (err, req, res, next) {
+    if (res.headersSent) {
+      return next(err);
+    }
+
+    res
+      .status(500)
+      .render('500', {
+        domain: req.get('host'),
+        protocol: req.protocol,
+        layout: 'layouts/default'
+      });
+    ;
+  }
+
+  function error404Handler (req, res) {
+    res
+      .status(404)
+      .render('404', {
+        domain: req.get('host'),
+        protocol: req.protocol,
+        layout: 'layouts/default'
+      });
+    ;
+  }*/
+
   const port = process.env.PORT || 3000;
 
   var webserver = express();
@@ -62,6 +89,10 @@ module.exports = function(controller) {
     require("./routes/" + file)(webserver, controller);
   });
 
+  /*webserver.use(error404Handler);
+
+  webserver.use(errorHandler);*/
+
   controller.webserver = webserver;
   controller.httpserver = server;
 

skills/link_to_rss.js

@@ -4,6 +4,7 @@ const scrape = require('../utils/scrape');
 const getFeed = require('../utils/get-feed-url');
 const getChannel = require('../utils/get-channel-name');
 const updateFeed = require('../utils/update-feed');
+const deleteTeamData = require('../utils/delete-team-data');
 
 const GLOBAL_URL_REGEX = /<(https?:\/\/[-A-Z0-9._~:\/?#[\]@!$&'()*+,;=]+)>/igm;
 const URL_REGEX = /<(https?:\/\/[-A-Z0-9._~:\/?#[\]@!$&'()*+,;=]+)>/i;
@@ -57,9 +58,10 @@ const addUrlToFeed = (url, message, channelName) => {
 };
 
 module.exports = function(controller) {
-  controller.on('app_uninstalled', function(...args) {
-    console.log('===UNINSTALL===');
-    console.log(args);
+  controller.on('app_uninstalled', function(bot, message) {
+    const teamId = message.team;
+
+    deleteTeamData(controller, teamId);
   });
 
   controller.on('bot_channel_join', function(bot, message) {

utils/delete-team-data.js

@@ -0,0 +1,63 @@
+module.exports = function(controller, teamId) {
+  controller.storage.teams.delete(teamId, (err) => {
+    if (err) {
+      console.error(`ERROR: could not delete team ${teamId}:`, err);
+    }
+
+    controller.storage.feeds.find({}, (err, feeds) => {
+      if (err) {
+        console.error(`ERROR: could not find feeds for team ${teamId}`, err);
+      }
+
+      feeds.forEach((feed) => {
+        if (feed.id.split('::')[0] === teamId) {
+          controller.storage.feeds.delete(feed.id, (err) => {
+            if (err) {
+              console.error(`ERROR: could not delete feed ${teamId}::${feed.id}:`, err);
+            } else {
+              if (process.env.ANALYTICS === 'TRUE') {
+                const pingFeedRequest = {
+                  method: 'GET',
+                  url: `${process.env.FEEDPRESS_API_URL}/feeds/ping.json`,
+                  data: stringify({
+                    feed: `${teamId}-${channelId}`,
+                  }),
+                  params: {
+                    key: process.env.FEEDPRESS_API_KEY,
+                    token: process.env.FEEDPRESS_API_TOKEN,
+                    feed: `${teamId}-${channelId}`,
+                  },
+                };
+
+                axios(pingFeedRequest)
+                  .then(({ data }) => {
+                    if (data.errors && data.errors.length) {
+                      data.errors.forEach((err) => console.error('ERROR:', err));
+                    }
+                  })
+                  .catch((error) => {
+                    console.error('ERROR: could not ping feed for refresh:', error);
+                  })
+                ;
+              }
+            }
+          });
+        }
+      });
+    });
+
+    controller.storage.links.find({ teamId }, (err, links) => {
+      if (err) {
+        console.error(`ERROR: could not delete links for team ${teamId}:`, err);
+      }
+
+      links.forEach((link) => {
+        controller.storage.links.delete(link.id, (err) => {
+          if (err) {
+            console.error(`ERROR: could not delete link ${teamId}::${link.id}`);
+          }
+        });
+      });
+    });
+  });
+};