Merge branch 'next' into fix-live-status-changes

bin/verifications/database/action_counts.js

@@ -3,7 +3,6 @@ const CommentModel = require('../../../models/comment');
 const ActionsService = require('../../../services/actions');
 const {arrayJoinBy} = require('../../../graph/loaders/util');
 const {get} = require('lodash');
-const sc = require('snake-case');
 const debug = require('debug')('talk:cli:verify');
 
 const MODELS = [
@@ -38,8 +37,8 @@ async function processBatch(Model, documents) {
       }
 
       // And we generate the group id.
-      const ACTION_TYPE = sc(actionSummary.action_type.toLowerCase());
-      const GROUP_ID = sc(actionSummary.group_id.toLowerCase());
+      const ACTION_TYPE = actionSummary.action_type.toLowerCase();
+      const GROUP_ID = actionSummary.group_id.toLowerCase();
 
       if (GROUP_ID.length <= 0) {
         continue;

config.js

@@ -343,9 +343,7 @@ CONFIG.REDIS_CLIENT_CONFIG = JSON.parse(CONFIG.REDIS_CLIENT_CONFIG);
  */
 CONFIG.RECAPTCHA_ENABLED =
   CONFIG.RECAPTCHA_SECRET &&
-  CONFIG.RECAPTCHA_SECRET.length > 0 &&
-  CONFIG.RECAPTCHA_PUBLIC &&
-  CONFIG.RECAPTCHA_PUBLIC.length > 0;
+  CONFIG.RECAPTCHA_PUBLIC;
 
 debug(
   `reCAPTCHA is ${
@@ -355,26 +353,4 @@ debug(
   }`
 );
 
-//------------------------------------------------------------------------------
-// SMTP Server configuration
-//------------------------------------------------------------------------------
-
-CONFIG.EMAIL_ENABLED =
-  CONFIG.SMTP_FROM_ADDRESS &&
-  CONFIG.SMTP_FROM_ADDRESS.length > 0 &&
-  CONFIG.SMTP_USERNAME &&
-  CONFIG.SMTP_USERNAME.length > 0 &&
-  CONFIG.SMTP_PASSWORD &&
-  CONFIG.SMTP_PASSWORD.length > 0 &&
-  CONFIG.SMTP_HOST &&
-  CONFIG.SMTP_HOST.length > 0;
-
-debug(
-  `Email is ${
-    CONFIG.EMAIL_ENABLED
-      ? 'enabled'
-      : 'disabled, required config is not present'
-  }`
-);
-
 module.exports = CONFIG;

docs/_docs/03-02-product-guide-commenter-features.md

@@ -197,4 +197,4 @@ will see a message at the top of their streams stating this.
 ### Ban
 
 When a commenter has been banned, they will see a message at the top of their
-streams staging this.
+streams stating this.

services/mailer.js

@@ -54,7 +54,6 @@ const mailer = {};
 mailer.enabled = Boolean(
   SMTP_HOST &&
   SMTP_USERNAME &&
-  SMTP_PORT &&
   SMTP_PASSWORD &&
   SMTP_FROM_ADDRESS
 ) || process.env.NODE_ENV === 'test';