RSS campaigns

lib/models/subscriptions.js

@@ -193,18 +193,23 @@ module.exports.subscribe = (cid, optInIp, callback) => {
                 optInIp,
                 optInCountry,
                 status: 1
-            }, subscription, err => {
+            }, subscription, (err, result) => {
                 if (err) {
                     return callback(err);
                 }
 
+                if (!result.entryId) {
+                    return callback(new Error('Could not save subscription'));
+                }
+
                 db.getConnection((err, connection) => {
                     if (err) {
                         return callback(err);
                     }
                     connection.query('DELETE FROM confirmations WHERE `cid`=? LIMIT 1', [cid], () => {
                         connection.release();
-                        callback(null, subscription);
+                        // reload full data from db in case it was an update, not insert
+                        return module.exports.getById(listId, result.entryId, callback);
                     });
                 });
             });
@@ -371,6 +376,38 @@ module.exports.get = (listId, cid, callback) => {
             }
 
             let subscription = tools.convertKeys(rows[0]);
+            // ensure list id in response
+            subscription.list = subscription.list || listId;
+            return callback(null, subscription);
+        });
+    });
+};
+
+module.exports.getById = (listId, id, callback) => {
+    id = Number(id) || 0;
+
+    if (!id) {
+        return callback(new Error('Missing Subbscription ID'));
+    }
+
+    db.getConnection((err, connection) => {
+        if (err) {
+            return callback(err);
+        }
+
+        connection.query('SELECT * FROM `subscription__' + listId + '` WHERE id=?', [id], (err, rows) => {
+            connection.release();
+            if (err) {
+                return callback(err);
+            }
+
+            if (!rows || !rows.length) {
+                return callback(null, false);
+            }
+
+            let subscription = tools.convertKeys(rows[0]);
+            // ensure list id in response
+            subscription.list = subscription.list || listId;
             return callback(null, subscription);
         });
     });

routes/segments.js

@@ -236,7 +236,6 @@ router.get('/:list/rules/:segment/create', passport.csrfProtection, (req, res) =
 
             segment.csrfToken = req.csrfToken();
 
-            console.log(segment);
             segment.list = list;
 
             res.render('lists/segments/rule-create', segment);

routes/webhooks.js

@@ -152,8 +152,6 @@ router.post('/sparkpost', (req, res, next) => {
 });
 
 router.post('/sendgrid', (req, res, next) => {
-    console.log(require('util').inspect(req.body, false, 22)); // eslint-disable-line
-
     let events = [].concat(req.body || []);
     let pos = 0;
 

services/feedcheck.js

@@ -46,7 +46,7 @@ function feedLoop() {
                             message = 'Feed error: ' + err.message;
                         } else if (result) {
                             log.verbose('Feed', 'Added %s new campaigns for %s', result, parent.id);
-                            message = 'Found ' + result + ' new campaing messages from feed';
+                            message = 'Found ' + result + ' new campaign messages from feed';
                         } else {
                             message = 'Found nothing new from the feed';
                         }

views/campaigns/view.hbs

@@ -42,6 +42,16 @@
     {{#if isRss}}
         <dt>Feed URL</dt>
         <dd><a href="{{sourceUrl}}">{{sourceUrl}}</a></dd>
+        <dt>Last check</dt>
+        <dd>
+            {{#if lastCheck}}<span class="datestring" data-date="{{lastCheck}}" title="{{lastCheck}}">{{lastCheck}}</span>{{else}}
+                Not yet checked{{/if}}
+            {{#unless isActive}}<span class="text-muted">(feed is only checked if RSS campaign is active)</span>{{/unless}}
+        </dd>
+        {{#if checkStatus}}
+            <dt>RSS status</dt>
+            <dd>{{checkStatus}}</dd>
+        {{/if}}
     {{/if}}
 
     <dt>Email "from name"</dt>