Merged in remove-email-notification-links (pull request auth0#27)

Replaces links with note to read more in the app

Author: David Lenton

app.js

@@ -751,9 +751,11 @@ queue.process('ask', (job, done) => {
             false,
             (err) => {
               if (err) return done(err);
-              q.sendEmail(job.data, (err) => {
-                return done(err);
-              });
+              return done();
+              // Temporarily disable ASK email notifications
+              // q.sendEmail(job.data, (err) => {
+              //   return done(err);
+              // });
             }
           );
         });
@@ -787,10 +789,12 @@ queue.process('ask', (job, done) => {
           // Send email notifications
           if (err) return done(err);
           if (!job.data.sendemail) return done();
-          q.sendEmail(job.data, (err) => {
-            if (err) debug(err);
-            return done(null);
-          });
+          return done();
+          // Temporarily disable ASK email notifications
+          // q.sendEmail(job.data, (err) => {
+          //   if (err) debug(err);
+          //   return done(null);
+          // });
         }
       );
     } else {

models/queue.js

@@ -95,15 +95,17 @@ function constructEmail(options, done) {
     link = options.protocol + '://' + options.hostname + '/community/#ask_' + options.ask.id;
     if (options.ask.type === 2)
       link = options.protocol + '://' + options.hostname + '/community/#ask_' + options.ask.ask_id;
-    text = text + '<p>Read more here: <a href="' + link + '">' + link + '</a></p>';
-    // title = 'ASK: ' + type;
-    console.log(text);
+    // Temporarily disable link until deep linking works
+    //text = text + '<p>Read more here: <a href="' + link + '">' + link + '</a></p>';
+    text = text + '<p>Read more in the app</p>';
   }
   if (options.subject) {
     const s = options.subject;
     link = options.protocol + '://' + options.hostname + '/subject/' + s.id + '/';
-    text = s.intro + '<p>Read the full article here: <a href="' + link + '">' + link + '</a></p>';
-    // title = s.title;
+    text = s.intro;
+    // Temporarily disable link until deep linking works
+    // text = text + '<p>Read the full article here: <a href="' + link + '">' + link + '</a></p>';
+    text = text + '<p>Read more in the app<p>';
   }
   // HTML text
   let htmlText = '';
@@ -197,7 +199,7 @@ function sendEmail(options, done) {
     options.profiles.forEach((profile) => {
       audiences.push(profile.profile_id);
     });
-    db.get().query('SELECT DISTINCT account.email FROM clcdc.account_profile_settings INNER JOIN account ON account_profile_settings.account_id = account.id WHERE account.client_id = ? AND notifications_sendemail = 1 AND notifications_on = 1 AND profile_id IN (?) AND account.send_email = 1', [options.appId, audiences], (err, results) => {
+    db.get().query('SELECT DISTINCT account.email FROM clcdc.account_profile_settings INNER JOIN account ON account_profile_settings.account_id = account.id WHERE account.client_id = ? AND notifications_sendemail = 1 AND notifications_on = 1 AND profile_id IN (?) AND account.sendemail = 1', [options.appId, audiences], (err, results) => {
       if (err) return done(err);
       if (results.length > 0) {
         constructEmail(options, (msg) => {