Merge pull request #2135 from coralproject/concurrency

Concurrency

.circleci/config.yml

@@ -41,9 +41,9 @@ integration_job: &integration_job
     - attach_workspace:
         at: ~/coralproject/talk
     - <<: *create_indexes
-    - run:
-        name: Setup the database with defaults
-        command: ./bin/cli setup --defaults
+    # - run:
+    #     name: Setup the database with defaults
+    #     command: ./bin/cli setup --defaults
     - run:
         name: Run the integration tests
         command: bash .circleci/e2e.sh

Dockerfile.onbuild

@@ -11,6 +11,7 @@ ONBUILD ARG TALK_DEFAULT_LANG=en
 ONBUILD ARG TALK_WHITELISTED_LANGUAGES
 ONBUILD ARG TALK_PLUGINS_JSON
 ONBUILD ARG TALK_WEBPACK_SOURCE_MAP
+ONBUILD ARG TALK_DEFAULT_LAZY_RENDER
 
 # Bundle app source
 ONBUILD COPY . /usr/src/app

README.md

@@ -18,7 +18,7 @@ You’ve installed Talk on your server, and you’re preparing to launch it on y
 
 ## Advanced Usage
 
-For advanced configuration and usage of Talk, check out our [Configuration](https://docs.coralproject.net/talk/advanced-configuration/) and [Integration](https://docs.coralproject.net/talk/integrating/authentication/) how-tos. This covers topics in whih you will need dev support to fully customize and integrate Talk, such as SSO/authentication, creating and managing assets and articles, styling Talk with custom CSS, and setting up Notifications and SMTP support.
+For advanced configuration and usage of Talk, check out our [Configuration](https://docs.coralproject.net/talk/advanced-configuration/) and [Integration](https://docs.coralproject.net/talk/integrating/authentication/) how-tos. This covers topics in which you will need dev support to fully customize and integrate Talk, such as SSO/authentication, creating and managing assets and articles, styling Talk with custom CSS, and setting up Notifications and SMTP support.
 
 ## Versions & Upgrading
 

bin/cli-assets

@@ -219,6 +219,28 @@ async function rewrite(search, replace, options) {
   }
 }
 
+/**
+ * debugAssetURL will scrape the given URL and print it's scraped values.
+ */
+async function debugAssetURL(url) {
+  try {
+    const meta = await scraper.scrape(url);
+
+    const table = new Table({ head: ['Property', 'Value'] });
+
+    for (const [property, value] of Object.entries(meta)) {
+      table.push([property, value]);
+    }
+
+    console.log(table.toString());
+
+    util.shutdown(0);
+  } catch (err) {
+    console.error(err);
+    util.shutdown(1);
+  }
+}
+
 //==============================================================================
 // Setting up the program command line arguments.
 //==============================================================================
@@ -234,6 +256,13 @@ program
   .description('list all the assets in the database')
   .action(listAssets);
 
+program
+  .command('debug [url]')
+  .description(
+    'prints the scraped metadata that would be added to the given asset'
+  )
+  .action(debugAssetURL);
+
 program
   .command('refresh [age]')
   .description('queues the assets that exceed the age requested')

bin/cli-serve

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 
+const throng = require('throng');
+const { CONCURRENCY } = require('../config');
+const { logger } = require('../services/logging');
 const util = require('./util');
 const program = require('commander');
-const serve = require('../serve');
 
 //==============================================================================
 // Setting up the program command line arguments.
@@ -22,8 +24,18 @@ program
   )
   .parse(process.argv);
 
-// Start serving.
-serve(program).catch(err => {
-  console.error(err);
-  util.shutdown(1);
+throng({
+  workers: CONCURRENCY,
+  start: i => {
+    logger.info({ workerID: i }, 'started worker');
+
+    // Load in the serve.
+    const serve = require('../serve');
+
+    // Start serving.
+    serve(program).catch(err => {
+      console.error(err);
+      util.shutdown(1);
+    });
+  },
 });

bin/cli-setup

@@ -45,11 +45,10 @@ const performSetup = async () => {
   } catch (err) {
     // If the error is `not init`, then we're good, otherwise, it's something
     // else.
-    if (err instanceof ErrSettingsNotInit) {
+    if (!err instanceof ErrSettingsNotInit) {
+      throw err;
       return;
     }
-
-    throw err;
   }
 
   if (program.defaults) {
@@ -138,7 +137,7 @@ const performSetup = async () => {
 
   console.log("\nWe'll ask you some questions about your first admin user.\n");
 
-  let user = await inquirer.prompt([
+  let { username, email } = await inquirer.prompt([
     {
       type: 'input',
       name: 'username',
@@ -161,39 +160,46 @@ const performSetup = async () => {
         return 'Email is required';
       },
     },
-    {
-      name: 'password',
-      message: 'Password',
-      type: 'password',
-      filter: password => {
-        return UsersService.isValidPassword(password).catch(err => {
-          throw err.message;
-        });
-      },
-    },
-    {
-      name: 'confirmPassword',
-      message: 'Confirm Password',
-      type: 'password',
-      filter: (confirmPassword, { password }) => {
-        if (password !== confirmPassword) {
-          return Promise.reject(new Error('Passwords do not match'));
-        }
-
-        return UsersService.isValidPassword(confirmPassword).catch(err => {
-          throw err.message;
-        });
-      },
-    },
   ]);
 
+  let password = '';
+  while (!password) {
+    answers = await inquirer.prompt([
+      {
+        name: 'password',
+        message: 'Password',
+        type: 'password',
+        filter: password => {
+          try {
+            UsersService.isValidPassword(password);
+          } catch (err) {
+            throw err.message;
+          }
+
+          return password;
+        },
+      },
+      {
+        name: 'confirmPassword',
+        message: 'Confirm Password',
+        type: 'password',
+      },
+    ]);
+
+    if (answers.password !== answers.confirmPassword) {
+      console.error('Passwords do not match');
+    } else {
+      password = answers.password;
+    }
+  }
+
   const ctx = Context.forSystem();
   let { user: newUser } = await SetupService.setup(ctx, {
     settings: settings.toObject(),
     user: {
-      email: user.email,
-      username: user.username,
-      password: user.password,
+      email,
+      username,
+      password,
     },
   });
 

client/coral-admin/src/components/Drawer.js

@@ -7,9 +7,9 @@ import t from 'coral-framework/services/i18n';
 import { can } from 'coral-framework/services/perms';
 import cn from 'classnames';
 
-const CoralDrawer = ({ handleLogout, currentUser }) => (
-  <Drawer className={cn('talk-admin-drawer-nav', styles.drawer)}>
-    {currentUser && can(currentUser, 'ACCESS_ADMIN') ? (
+const CoralDrawer = ({ handleLogout, currentUser }) =>
+  currentUser && can(currentUser, 'ACCESS_ADMIN') ? (
+    <Drawer className={cn('talk-admin-drawer-nav', styles.drawer)}>
       <div>
         <Navigation className={styles.nav}>
           {can(currentUser, 'MODERATE_COMMENTS') && (
@@ -48,9 +48,8 @@ const CoralDrawer = ({ handleLogout, currentUser }) => (
           <span>{`v${process.env.VERSION}`}</span>
         </Navigation>
       </div>
-    ) : null}
-  </Drawer>
-);
+    </Drawer>
+  ) : null;
 
 CoralDrawer.propTypes = {
   handleLogout: PropTypes.func.isRequired,

client/coral-admin/src/components/UserDetailComment.js

@@ -123,7 +123,7 @@ class UserDetailComment extends React.Component {
                 <IfHasLink text={comment.body}>
                   <span className={styles.hasLinks}>
                     {/* TODO: translate string */}
-                    <Icon name="error_outline" /> Contains Link
+                    <Icon name="error_outline" /> {t('common.contains_link')}
                   </span>
                 </IfHasLink>
                 <div className={styles.actions}>

client/coral-admin/src/index.js

@@ -14,6 +14,11 @@ import { hideShortcutsNote } from './actions/moderation';
 
 smoothscroll.polyfill();
 
+if (!NodeList.prototype.forEach) {
+  // Polyfill IE11 missing forEach in NodeList.
+  NodeList.prototype.forEach = Array.prototype.forEach;
+}
+
 function init({ store, localStorage }) {
   const shouldHide = localStorage.getItem('coral:shortcutsNote') === 'hide';
   if (shouldHide) {

client/coral-admin/src/routes/Community/components/People.css

@@ -34,6 +34,21 @@
   }
 }
 
+.filterHeader {
+  margin-top: 30px;
+  font-size: 16px;
+  font-weight: 900;
+}
+
+.filterDetail {
+  margin-top: 15px;
+  font-size: 16px;
+}
+
+.radioGroup {
+  margin: 5px 0;
+}
+
 .mainContent {
   width: calc(100% - 300px);
   padding: 34px 14px;

client/coral-admin/src/routes/Community/components/People.js

@@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import { isSuspended, isBanned } from 'coral-framework/utils/user';
+import { RadioGroup, Radio } from 'react-mdl';
 import moment from 'moment';
 import {
   ADMIN,
@@ -64,11 +65,12 @@ class People extends React.Component {
 
   render() {
     const {
-      onSearchChange,
+      onFilterChange,
       users = [],
       setUserRole,
       viewUserDetail,
       loadMore,
+      filters,
     } = this.props;
 
     const hasResults = !!users.nodes.length;
@@ -87,11 +89,43 @@ class People extends React.Component {
               id="commenters-search"
               type="text"
               className={styles.searchBoxInput}
-              defaultValue=""
-              onChange={onSearchChange}
+              value={filters.search}
+              onChange={onFilterChange('search')}
               placeholder={t('streams.search')}
             />
           </div>
+          <div className={styles.filterHeader}>
+            {t('community.filter_users')}
+          </div>
+          <div className={styles.filterDetail}>{t('community.status')}</div>
+          <RadioGroup
+            name="statusFilter"
+            value={filters.status}
+            childContainer="div"
+            onChange={onFilterChange('status')}
+            className={styles.radioGroup}
+          >
+            <Radio value="">{t('community.all')}</Radio>
+            <Radio value="active">{t('community.active')}</Radio>
+            <Radio value="suspended">{t('community.suspended')}</Radio>
+            <Radio value="banned">{t('community.banned')}</Radio>
+          </RadioGroup>
+          <div className={styles.filterDetail}>
+            {t('community.filter_role')}
+          </div>
+          <RadioGroup
+            name="roleFilter"
+            value={filters.role}
+            childContainer="div"
+            onChange={onFilterChange('role')}
+            className={styles.radioGroup}
+          >
+            <Radio value="">{t('community.all')}</Radio>
+            <Radio value={ADMIN}>{t('community.admin')}</Radio>
+            <Radio value={STAFF}>{t('community.staff')}</Radio>
+            <Radio value={MODERATOR}>{t('community.moderator')}</Radio>
+            <Radio value={COMMENTER}>{t('community.commenter')}</Radio>
+          </RadioGroup>
         </div>
         <div className={styles.mainContent}>
           {hasResults ? (
@@ -254,7 +288,8 @@ class People extends React.Component {
 
 People.propTypes = {
   users: PropTypes.object.isRequired,
-  onSearchChange: PropTypes.func.isRequired,
+  filters: PropTypes.object.isRequired,
+  onFilterChange: PropTypes.func.isRequired,
   setUserRole: PropTypes.func.isRequired,
   viewUserDetail: PropTypes.func.isRequired,
   unbanUser: PropTypes.func.isRequired,

client/coral-admin/src/routes/Community/containers/People.js

@@ -17,59 +17,65 @@ import update from 'immutability-helper';
 import { Spinner } from 'coral-ui';
 import withQuery from 'coral-framework/hocs/withQuery';
 
-class PeopleContainer extends React.Component {
+class PeopleContainer extends React.PureComponent {
   timer = null;
 
   state = {
-    searchValue: '',
+    search: '',
+    role: '',
+    status: '',
   };
 
-  onSearchChange = e => {
-    const { value } = e.target;
-    this.setState({ searchValue: value }, () => {
+  statusToQuery = {
+    active: { suspended: false, banned: false },
+    suspended: { suspended: true },
+    banned: { banned: true },
+  };
+
+  onFilterChange = filter => e =>
+    this.setState({ [filter]: e.target.value }, () => {
       clearTimeout(this.timer);
-      this.timer = setTimeout(() => {
-        this.search(value);
-      }, 350);
+      this.timer = setTimeout(this.filter, 350);
     });
+
+  getFilterState = () => {
+    const { role, status } = this.state;
+
+    return {
+      status: this.statusToQuery[status] || null,
+      role: role || null,
+    };
   };
 
-  search = async value => {
-    return this.props.data.fetchMore({
-      query: SEARCH_QUERY,
+  filter = () =>
+    this.props.data.fetchMore({
+      query: FILTER_QUERY,
       variables: {
-        value,
+        state: this.getFilterState(),
+        value: this.state.search,
         limit: 10,
       },
-      updateQuery: (previous, { fetchMoreResult: { users } }) => {
-        const updated = update(previous, {
+      updateQuery: (previous, { fetchMoreResult: { users } }) =>
+        update(previous, {
           users: {
-            nodes: {
-              $set: users.nodes,
-            },
+            nodes: { $set: users.nodes },
             hasNextPage: { $set: users.hasNextPage },
             endCursor: { $set: users.endCursor },
           },
-        });
-        return updated;
-      },
+        }),
     });
-  };
 
-  setUserRole = async (id, role) => {
-    await this.props.setUserRole(id, role);
-  };
-
-  loadMore = () => {
-    return this.props.data.fetchMore({
+  loadMore = () =>
+    this.props.data.fetchMore({
       query: LOAD_MORE_QUERY,
       variables: {
-        value: this.state.searchValue,
-        limit: 5,
         cursor: this.props.root.users.endCursor,
+        state: this.getFilterState(),
+        value: this.state.search,
+        limit: 5,
       },
-      updateQuery: (previous, { fetchMoreResult: { users } }) => {
-        const updated = update(previous, {
+      updateQuery: (previous, { fetchMoreResult: { users } }) =>
+        update(previous, {
           users: {
             nodes: {
               $apply: nodes => appendNewNodes(nodes, users.nodes),
@@ -77,11 +83,8 @@ class PeopleContainer extends React.Component {
             hasNextPage: { $set: users.hasNextPage },
             endCursor: { $set: users.endCursor },
           },
-        });
-        return updated;
-      },
+        }),
     });
-  };
 
   render() {
     if (this.props.data.error) {
@@ -98,9 +101,9 @@ class PeopleContainer extends React.Component {
 
     return (
       <People
-        onSearchChange={this.onSearchChange}
+        onFilterChange={this.onFilterChange}
         viewUserDetail={this.props.viewUserDetail}
-        setUserRole={this.setUserRole}
+        setUserRole={this.props.setUserRole}
         showSuspendUserDialog={this.props.showSuspendUserDialog}
         showBanUserDialog={this.props.showBanUserDialog}
         unbanUser={this.props.unbanUser}
@@ -109,6 +112,7 @@ class PeopleContainer extends React.Component {
         root={this.props.root}
         users={this.props.root.users}
         loadMore={this.loadMore}
+        filters={this.state}
       />
     );
   }
@@ -125,16 +129,6 @@ PeopleContainer.propTypes = {
   root: PropTypes.object,
 };
 
-const mapDispatchToProps = dispatch =>
-  bindActionCreators(
-    {
-      viewUserDetail,
-      showSuspendUserDialog,
-      showBanUserDialog,
-    },
-    dispatch
-  );
-
 const LOAD_MORE_QUERY = gql`
   query TalkAdmin_Community_People_LoadMoreUsers(
     $limit: Int
@@ -169,9 +163,13 @@ const LOAD_MORE_QUERY = gql`
   }
 `;
 
-const SEARCH_QUERY = gql`
-  query TalkAdmin_Community_People_SearchUsers($value: String, $limit: Int) {
-    users(query: { value: $value, limit: $limit }) {
+const FILTER_QUERY = gql`
+  query TalkAdmin_Community_People_FilterUsers(
+    $state: UserStateInput
+    $value: String
+    $limit: Int
+  ) {
+    users(query: { state: $state, value: $value, limit: $limit }) {
       hasNextPage
       endCursor
       nodes {
@@ -199,6 +197,16 @@ const SEARCH_QUERY = gql`
   }
 `;
 
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(
+    {
+      viewUserDetail,
+      showSuspendUserDialog,
+      showBanUserDialog,
+    },
+    dispatch
+  );
+
 export default compose(
   connect(
     null,

client/coral-admin/src/routes/Configure/components/StreamSettings.js

@@ -155,9 +155,19 @@ class StreamSettings extends React.Component {
         <ConfigureCard
           checked={settings.infoBoxEnable}
           onCheckbox={this.updateInfoBoxEnable}
-          title={t('configure.include_comment_stream')}
+          title={t('configure.code_of_conduct_summary')}
         >
-          <p>{t('configure.include_comment_stream_desc')}</p>
+          <p>
+            {t('configure.code_of_conduct_summary_desc')}
+            &nbsp;
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://guides.coralproject.net/create-a-code-of-conduct/"
+            >
+              Code of Conduct Guide.
+            </a>
+          </p>
           <div
             className={cn(
               styles.configSettingInfoBox,
@@ -238,12 +248,14 @@ class StreamSettings extends React.Component {
               onChange={this.updateClosedTimeout}
               value={getTimeoutAmount(settings.closedTimeout)}
               label={t('configure.closed_comments_label')}
+              disabled={!settings.autoCloseStream}
             />
             <div className={styles.configTimeoutSelect}>
               <SelectField
                 label="comments closed time window"
                 value={getTimeoutMeasure(settings.closedTimeout)}
                 onChange={this.updateClosedTimeoutMeasure}
+                readOnly={!settings.autoCloseStream}
               >
                 <Option value={'hours'}>{t('configure.hours')}</Option>
                 <Option value={'days'}>{t('configure.days')}</Option>

client/coral-admin/src/routes/Configure/components/Wordlist.js

@@ -6,7 +6,7 @@ import ConfigureCard from 'coral-framework/components/ConfigureCard';
 
 const Wordlist = ({ suspectWords, bannedWords, onChangeWordlist }) => (
   <div>
-    <ConfigureCard title={t('configure.banned_words_title')}>
+    <ConfigureCard collapsible title={t('configure.banned_words_title')}>
       <p>{t('configure.banned_word_text')}</p>
       <TagsInput
         value={bannedWords}
@@ -16,7 +16,7 @@ const Wordlist = ({ suspectWords, bannedWords, onChangeWordlist }) => (
         onChange={tags => onChangeWordlist('banned', tags)}
       />
     </ConfigureCard>
-    <ConfigureCard title={t('configure.suspect_word_title')}>
+    <ConfigureCard collapsible title={t('configure.suspect_word_title')}>
       <p>{t('configure.suspect_word_text')}</p>
       <TagsInput
         value={suspectWords}

client/coral-admin/src/routes/Moderation/components/Comment.css

@@ -62,13 +62,19 @@
   font-weight: 300;
   margin-bottom: 8px;
   overflow-wrap: break-word;
+  word-break:break-word;
 }
 
 .body {
   margin-top: 0px;
   flex: 1;
   color: black;
-  max-width: 500px;
+  /*
+    IE11 fix – Next line was supposed to be:
+    max-width: 500px;
+  */
+  padding-right: 20px;
+  /** IE11 fix end **/
   font-weight: 300;
   font-size: 16px;
   overflow-wrap: break-word;

client/coral-admin/src/routes/Moderation/components/Comment.js

@@ -183,8 +183,7 @@ class Comment extends React.Component {
               <div className={styles.sideActions}>
                 <IfHasLink text={comment.body}>
                   <span className={styles.hasLinks}>
-                    {/* TODO: translate string */}
-                    <Icon name="error_outline" /> Contains Link
+                    <Icon name="error_outline" /> {t('common.contains_link')}
                   </span>
                 </IfHasLink>
                 <div className={`actions ${styles.actions}`}>

client/coral-admin/src/routes/Stories/containers/Stories.js

@@ -50,7 +50,7 @@ class StoriesContainer extends Component {
     const { updateAssetState } = this.props;
 
     try {
-      updateAssetState(id, closeStream ? Date.now() : null);
+      await updateAssetState(id, closeStream ? Date.now() : null);
       this.fetchAssets();
     } catch (err) {
       console.error(err);

client/coral-embed-stream/src/tabs/configure/components/QuestionBoxBuilder.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import QuestionBox from '../../../components/QuestionBox';
 import DefaultQuestionBoxIcon from '../../../components/DefaultQuestionBoxIcon';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import styles from './QuestionBoxBuilder.css';
 import { Icon } from 'coral-ui';
@@ -12,6 +13,7 @@ const icons = [{ default: DefaultIcon }, 'forum', 'build', 'format_quote'];
 class QuestionBoxBuilder extends React.Component {
   render() {
     const {
+      title,
       questionBoxIcon,
       questionBoxContent,
       onContentChange,
@@ -20,7 +22,7 @@ class QuestionBoxBuilder extends React.Component {
 
     return (
       <div className={styles.root}>
-        <h4>Include an Icon</h4>
+        <h4>{title}</h4>
 
         <ul className={styles.iconList}>
           {icons.map(item => {
@@ -53,4 +55,12 @@ class QuestionBoxBuilder extends React.Component {
   }
 }
 
+QuestionBoxBuilder.propTypes = {
+  title: PropTypes.string,
+  questionBoxIcon: PropTypes.string,
+  questionBoxContent: PropTypes.string,
+  onContentChange: PropTypes.func,
+  onIconChange: PropTypes.func,
+};
+
 export default QuestionBoxBuilder;

client/coral-embed-stream/src/tabs/configure/components/Settings.js

@@ -69,6 +69,7 @@ class Settings extends React.Component {
             {questionBoxEnable && (
               <div className={styles.questionBoxContainer}>
                 <QuestionBoxBuilder
+                  title={t('configure.include_an_icon')}
                   questionBoxIcon={questionBoxIcon}
                   questionBoxContent={questionBoxContent}
                   onIconChange={onQuestionBoxIconChange}

client/coral-embed-stream/src/tabs/stream/components/Comment.css

@@ -18,6 +18,11 @@
 .comment {
   position: relative;
   padding-left: 15px;
+  display: flex;
+}
+
+.commentContainer {
+  width: 100%;
 }
 
 .commentLevel0 {
@@ -138,6 +143,7 @@
 }
 
 .commentAvatar {
+  margin-top: 10px;
   max-width: 60px;
 }
 

client/coral-embed-stream/src/tabs/stream/components/Comment.js

@@ -645,7 +645,7 @@ export default class Comment extends React.Component {
                       })}
                       onClick={this.onClickEdit}
                     >
-                      Edit
+                      {t('framework.edit')}
                     </a>
                   )}
                 </span>

client/coral-embed-stream/src/tabs/stream/components/Stream.js

@@ -206,15 +206,30 @@ class Stream extends React.Component {
     );
   }
 
+  renderQuestionBox() {
+    const {
+      root,
+      asset,
+      asset: {
+        settings: { questionBoxEnable, questionBoxContent, questionBoxIcon },
+      },
+    } = this.props;
+    const slotPassthrough = { root, asset };
+    if (questionBoxEnable) {
+      return (
+        <QuestionBox content={questionBoxContent} icon={questionBoxIcon}>
+          <Slot fill="streamQuestionArea" passthrough={slotPassthrough} />
+        </QuestionBox>
+      );
+    }
+  }
+
   render() {
     const {
       root,
       appendItemArray,
       asset,
-      asset: {
-        comment: highlightedComment,
-        settings: { questionBoxEnable },
-      },
+      asset: { comment: highlightedComment },
       postComment,
       notify,
       updateItem,
@@ -260,14 +275,7 @@ class Stream extends React.Component {
               content={asset.settings.infoBoxContent}
               enable={asset.settings.infoBoxEnable}
             />
-            {questionBoxEnable && (
-              <QuestionBox
-                content={asset.settings.questionBoxContent}
-                icon={asset.settings.questionBoxIcon}
-              >
-                <Slot fill="streamQuestionArea" passthrough={slotPassthrough} />
-              </QuestionBox>
-            )}
+            {this.renderQuestionBox()}
             {!banned &&
               temporarilySuspended && (
                 <RestrictedMessageBox>
@@ -305,6 +313,7 @@ class Stream extends React.Component {
             ) : (
               <Markdown content={asset.settings.disableCommentingMessage} />
             )}
+            {this.renderQuestionBox()}
           </div>
         )}
 

client/coral-embed/src/Bridge.js

@@ -0,0 +1,324 @@
+import queryString from 'querystringify';
+import URLSearchParams from '@ungap/url-search-params';
+import pym from 'pym.js';
+import EventEmitter from 'eventemitter2';
+import { buildUrl } from 'coral-framework/utils/url';
+import SnackBar from './SnackBar';
+import onIntersect from './onIntersect';
+import {
+  createStorage,
+  connectStorageToPym,
+} from 'coral-framework/services/storage';
+
+// Rebuild the origin if it isn't defined. This is our poor-mans polyfill
+// for the location APIs.
+if (!window.location.origin) {
+  window.location.origin = `${window.location.protocol}//${
+    window.location.hostname
+  }${window.location.port ? `:${window.location.port}` : ''}`;
+}
+
+const NOTIFICATION_OFFSET = 200;
+
+// Ensure there is a trailing slash.
+function ensureEndSlash(p) {
+  return p.match(/\/$/) ? p : `${p}/`;
+}
+
+// Build the URL to load in the pym iframe.
+function buildStreamIframeUrl(talkBaseUrl, query) {
+  let url = talkBaseUrl + 'embed/stream?';
+
+  url += queryString.stringify(query);
+
+  return url;
+}
+
+// detectAssetURL will try to grab the canonical url from the head, if it isn't
+// available, source the url from the current one.
+function detectAssetURL() {
+  try {
+    // Try to get the url from the canonical tag on the page.
+    return document.querySelector('link[rel="canonical"]').href;
+  } catch (e) {
+    window.console.warn(
+      'This page does not include a canonical link tag. Talk has inferred this asset_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages.'
+    );
+
+    return window.location.origin + window.location.pathname;
+  }
+}
+
+function buildQuery({ asset_id, asset_url }) {
+  // Compose the query to send down to the Talk API so it knows what to load.
+  const query = {};
+
+  // Parse the url parameters to extract some of the information.
+  const search = new URLSearchParams(window.location.search);
+
+  // Pull the Comment ID out of the query string.
+  const commentID = search.get('commentId') || search.get('commentID');
+  if (commentID) {
+    query.comment_id = commentID;
+  }
+
+  // Insert the asset_id into the query.
+  if (asset_id) {
+    query.asset_id = asset_id;
+  }
+
+  // If the asset_url is defined, use it, otherwise, detect it.
+  if (asset_url) {
+    query.asset_url = asset_url;
+  } else {
+    query.asset_url = detectAssetURL();
+  }
+
+  return query;
+}
+
+// Get dimensions of viewport.
+function viewportDimensions() {
+  let target = window;
+  let prefix = 'inner';
+  if (!('innerWidth' in window)) {
+    prefix = 'client';
+    target = document.documentElement || document.body;
+  }
+
+  return {
+    width: target[`${prefix}Width`],
+    height: target[`${prefix}Height`],
+  };
+}
+
+export default class Bridge {
+  constructor(
+    element,
+    {
+      // Pull out the URLs used to setup Talk.
+      talk: talkBaseUrl,
+      talkStaticUrl = talkBaseUrl,
+      // Default the following to null.
+      events = null,
+      snackBarStyles = null,
+      onAuthChanged = null,
+      // Determine if we're in lazy mode or not. By default, the build argument
+      // will determine the lazy render status. This default is primarily used
+      // when the embed code cannot be changed, but control of the Talk serving
+      // domain is available.
+      lazy = process.env.TALK_DEFAULT_LAZY_RENDER === 'TRUE',
+      // Any additional options are extracted to be sent to the embed via the
+      // pym bridge.
+      ...opts
+    }
+  ) {
+    this.pym = null;
+    this.element = element;
+    this.opts = opts;
+    this.query = buildQuery(this.opts);
+    this.emitter = new EventEmitter({ wildcard: true });
+    this.snackBar = new SnackBar(snackBarStyles || {});
+    this.onAuthChanged = onAuthChanged;
+    this.talkBaseUrl = ensureEndSlash(talkBaseUrl);
+    this.talkStaticUrl = ensureEndSlash(talkStaticUrl);
+    this.lazy = lazy;
+
+    // Store queued operations in a queue that can be processed once the stream
+    // is rendered.
+    this.queued = [];
+
+    // Attach to the events emitted by the pym parent.
+    if (events) {
+      events(this.emitter);
+    }
+
+    // Start the embed loading process.
+    if (this.lazy) {
+      // When the dom element containing the talk embed container is in view,
+      // render the stream with force turned on so that it skips this portion.
+      onIntersect(this.element, () => this.load());
+    } else {
+      // We aren't being lazy, load it now!
+      this.load();
+    }
+  }
+
+  ensureRendered() {
+    // Check to see if the pym bridge is created, and the embed is loaded.
+    if (this.pym === null) {
+      throw new Error('Stream Embed must be rendered first');
+    }
+  }
+
+  queueWhenRendered(callback) {
+    // Check to see if the queue is alive, if it isn't, run the callback now,
+    // otherwise, push the callback to be processed when the stream has loaded.
+    if (this.queued !== null) {
+      this.queued.push(callback);
+    } else {
+      callback();
+    }
+  }
+
+  setupPym() {
+    const url = buildStreamIframeUrl(this.talkBaseUrl, this.query);
+    this.pym = new pym.Parent(this.element.id, url, {
+      title: this.opts.title,
+      id: `${this.element.id}_iframe`,
+      name: `${this.element.id}_iframe`,
+    });
+
+    // NOTE: Workaround for iOS Safari which ignores `width` but respects `min-width` value.
+    this.pym.el.firstChild.style.width = '1px';
+    this.pym.el.firstChild.style.minWidth = '100%';
+
+    // Resize parent iframe height when child height changes
+    let cachedHeight;
+    this.pym.onMessage('height', height => {
+      if (height !== cachedHeight) {
+        this.pym.el.firstChild.style.height = `${height}px`;
+        cachedHeight = height;
+      }
+    });
+
+    // Send the config back over the pym bridge if requested.
+    this.pym.onMessage('getConfig', () => {
+      this.pym.sendMessage('config', JSON.stringify(this.opts));
+    });
+
+    // If the auth changes, and someone is listening for it, then re-emit it.
+    if (this.onAuthChanged) {
+      this.pym.onMessage('coral-auth-changed', message => {
+        this.onAuthChanged(message ? JSON.parse(message) : null);
+      });
+    }
+
+    // Remove the permalink comment id from the search.
+    this.pym.onMessage('coral-view-all-comments', () => {
+      const query = queryString.parse(location.search);
+
+      // Remove the commentId/commentID url param.
+      delete query.commentId;
+      delete query.commentID;
+
+      // Rebuild the search field without the commentId in it.
+      const search = queryString.stringify(query);
+
+      // Change the url.
+      window.history.replaceState(
+        {},
+        document.title,
+        buildUrl({ ...location, search })
+      );
+    });
+
+    // Remove the permalink comment id from the hash.
+    this.pym.onMessage('coral-view-comment', id => {
+      const search = queryString.stringify({
+        ...queryString.parse(location.search),
+        commentId: id,
+      });
+
+      // Change the url to the permalink url.
+      window.history.replaceState(
+        {},
+        document.title,
+        buildUrl({ ...location, search })
+      );
+    });
+
+    // Helps child show notifications at the right scrollTop.
+    this.pym.onMessage('getPosition', () => {
+      const { height } = viewportDimensions();
+      let position = height + document.body.scrollTop;
+
+      if (position > NOTIFICATION_OFFSET) {
+        position = position - NOTIFICATION_OFFSET;
+      }
+
+      this.pym.sendMessage('position', position);
+    });
+
+    // When end-user clicks link in iframe, open it in parent context
+    this.pym.onMessage('navigate', url => {
+      // Open the new window, detach the opener, and focus on it.
+      const w = window.open(url, '_blank');
+      w.opener = null;
+      w.focus();
+    });
+
+    // Pass events from iframe to the event emitter.
+    this.pym.onMessage('event', raw => {
+      const { eventName, value } = JSON.parse(raw);
+      this.emitter.emit(eventName, value);
+    });
+  }
+
+  /**
+   * load will configure the pym parent if it hasn't already been, and setup the
+   * snackBar. If there are any queued operations, it will run them first.
+   */
+  load() {
+    if (this.pym !== null) {
+      throw new Error('Stream Embed already rendered');
+    }
+
+    // Setup Pym.
+    this.setupPym();
+
+    // Attach the snackBar to the pym parent and to the body of the page.
+    this.snackBar.attach(window.document.body, this.pym);
+
+    // If the user clicks outside the embed, then tell the embed.
+    document.addEventListener('click', this.handleClick.bind(this), true);
+
+    // Listens to ${name}Storage requests on pym and relay it to
+    // ${name}Storage.
+    ['local', 'session'].forEach(name => {
+      connectStorageToPym(
+        createStorage(`${name}Storage`),
+        this.pym,
+        `${name}Storage`
+      );
+    });
+
+    // Process any queued operations.
+    const queued = this.queued;
+    this.queued = null;
+    queued.forEach(callback => callback());
+  }
+
+  handleClick() {
+    this.pym.sendMessage('click');
+  }
+
+  enablePluginsDebug() {
+    this.pym.sendMessage('enablePluginsDebug');
+  }
+
+  disablePluginsDebug() {
+    this.pym.sendMessage('disablePluginsDebug');
+  }
+
+  login(token) {
+    this.pym.sendMessage('login', token);
+  }
+
+  logout() {
+    this.pym.sendMessage('logout');
+  }
+
+  remove() {
+    // Remove the event listeners.
+    document.removeEventListener('click', this.handleClick.bind(this));
+    this.emitter.removeAllListeners();
+
+    // Remove the snackbar.
+    this.snackBar.remove();
+
+    // Remove the pym parent.
+    this.pym.remove();
+    this.pym = null;
+  }
+}

client/coral-embed/src/Stream.js

@@ -1,196 +0,0 @@
-import queryString from 'querystringify';
-import pym from 'pym.js';
-import EventEmitter from 'eventemitter2';
-import { buildUrl } from 'coral-framework/utils/url';
-import Snackbar from './Snackbar';
-import {
-  createStorage,
-  connectStorageToPym,
-} from 'coral-framework/services/storage';
-
-const NOTIFICATION_OFFSET = 200;
-
-// Build the URL to load in the pym iframe.
-function buildStreamIframeUrl(talkBaseUrl, query) {
-  let url = [
-    talkBaseUrl,
-    talkBaseUrl.match(/\/$/) ? '' : '/', // make sure no double-'/' if opts.talk already ends with '/'
-    'embed/stream?',
-  ].join('');
-
-  url += queryString.stringify(query);
-
-  return url;
-}
-
-// Get dimensions of viewport.
-function viewportDimensions() {
-  let e = window,
-    a = 'inner';
-  if (!('innerWidth' in window)) {
-    a = 'client';
-    e = document.documentElement || document.body;
-  }
-
-  return {
-    width: e[`${a}Width`],
-    height: e[`${a}Height`],
-  };
-}
-
-export default class Stream {
-  constructor(el, talkBaseUrl, query, config) {
-    this.query = query;
-
-    // Extract the non-opts opts from the object.
-    const {
-      events = null,
-      snackBarStyles = null,
-      onAuthChanged = null,
-      ...opts
-    } = config;
-
-    this.opts = opts;
-
-    this.emitter = new EventEmitter({ wildcard: true });
-    this.pym = new pym.Parent(el.id, buildStreamIframeUrl(talkBaseUrl, query), {
-      title: opts.title,
-      id: `${el.id}_iframe`,
-      name: `${el.id}_iframe`,
-    });
-    this.snackBar = new Snackbar(snackBarStyles || {});
-
-    // Workaround: IOS Safari ignores `width` but respects `min-width` value.
-    this.pym.el.firstChild.style.width = '1px';
-    this.pym.el.firstChild.style.minWidth = '100%';
-
-    // Resize parent iframe height when child height changes
-    let cachedHeight;
-    this.pym.onMessage('height', height => {
-      if (height !== cachedHeight) {
-        this.pym.el.firstChild.style.height = `${height}px`;
-        cachedHeight = height;
-      }
-    });
-
-    // Attach to the events emitted by the pym parent.
-    if (events) {
-      events(this.emitter);
-    }
-
-    this.pym.onMessage('getConfig', () => {
-      this.pym.sendMessage('config', JSON.stringify(opts));
-    });
-
-    // If the auth changes, and someone is listening for it, then re-emit it.
-    if (onAuthChanged) {
-      this.pym.onMessage('coral-auth-changed', message => {
-        onAuthChanged(message ? JSON.parse(message) : null);
-      });
-    }
-
-    // Attach the snackbar to the pym parent and to the body of the page.
-    this.snackBar.attach(window.document.body, this.pym);
-
-    // Remove the permalink comment id from the hash.
-    this.pym.onMessage('coral-view-all-comments', () => {
-      const query = queryString.parse(location.search);
-
-      // Remove the commentId url param.
-      delete query.commentId;
-
-      const search = queryString.stringify(query);
-
-      const url = buildUrl({ ...location, search });
-
-      // Change the url.
-      window.history.replaceState({}, document.title, url);
-    });
-
-    // Remove the permalink comment id from the hash.
-    this.pym.onMessage('coral-view-comment', id => {
-      const search = queryString.stringify({
-        ...queryString.parse(location.search),
-        commentId: id,
-      });
-
-      // Remove the commentId url param.
-      const url = buildUrl({ ...location, search });
-
-      // Change the url.
-      window.history.replaceState({}, document.title, url);
-    });
-
-    // Helps child show notifications at the right scrollTop.
-    this.pym.onMessage('getPosition', () => {
-      const { height } = viewportDimensions();
-      let position = height + document.body.scrollTop;
-
-      if (position > NOTIFICATION_OFFSET) {
-        position = position - NOTIFICATION_OFFSET;
-      }
-
-      this.pym.sendMessage('position', position);
-    });
-
-    // When end-user clicks link in iframe, open it in parent context
-    this.pym.onMessage('navigate', url => {
-      window.open(url, '_blank').focus();
-    });
-
-    // Pass events from iframe to the event emitter.
-    this.pym.onMessage('event', raw => {
-      const { eventName, value } = JSON.parse(raw);
-      this.emitter.emit(eventName, value);
-    });
-
-    // If the user clicks outside the embed, then tell the embed.
-    document.addEventListener('click', this.handleClick.bind(this), true);
-
-    // Listens to local storage requests on pym and relay it to local storage.
-    connectStorageToPym(
-      createStorage('localStorage'),
-      this.pym,
-      'localStorage'
-    );
-
-    // Listens to session storage requests on pym and relay it to session storage.
-    connectStorageToPym(
-      createStorage('sessionStorage'),
-      this.pym,
-      'sessionStorage'
-    );
-  }
-
-  enablePluginsDebug() {
-    this.pym.sendMessage('enablePluginsDebug');
-  }
-
-  disablePluginsDebug() {
-    this.pym.sendMessage('disablePluginsDebug');
-  }
-
-  login(token) {
-    this.pym.sendMessage('login', token);
-  }
-
-  logout() {
-    this.pym.sendMessage('logout');
-  }
-
-  remove() {
-    // Remove the event listeners.
-    document.removeEventListener('click', this.handleClick.bind(this));
-    this.emitter.removeAllListeners();
-
-    // Remove the snackbar.
-    this.snackBar.remove();
-
-    // Remove the pym parent.
-    this.pym.remove();
-  }
-
-  handleClick() {
-    this.pym.sendMessage('click');
-  }
-}

client/coral-embed/src/StreamInterface.js

@@ -1,33 +0,0 @@
-export default class StreamInterface {
-  constructor(stream) {
-    this._stream = stream;
-  }
-
-  on(eventName, callback) {
-    return this._stream.emitter.on(eventName, callback);
-  }
-
-  off(eventName, callback) {
-    return this._stream.emitter.off(eventName, callback);
-  }
-
-  login(token) {
-    return this._stream.login(token);
-  }
-
-  logout() {
-    return this._stream.logout();
-  }
-
-  remove() {
-    return this._stream.remove();
-  }
-
-  enablePluginsDebug() {
-    return this._stream.enablePluginsDebug();
-  }
-
-  disablePluginsDebug() {
-    return this._stream.disablePluginsDebug();
-  }
-}

client/coral-embed/src/index.js

@@ -1,106 +1,71 @@
-import URLSearchParams from 'url-search-params';
-import Stream from './Stream';
-import StreamInterface from './StreamInterface';
+// Polyfill IntersectionObserver always, the alternative is that we have to also
+// polyfill for Promise, which itself adds 1KB gziped, which means that the
+// 4KB that the intersection observer really doesn't take up that much in terms
+// of size.
+import 'intersection-observer';
 
-// Rebuild the origin if it isn't defined. This is our poor-mans polyfill
-// for the location API's.
-if (!window.location.origin) {
-  window.location.origin = `${window.location.protocol}//${
-    window.location.hostname
-  }${window.location.port ? `:${window.location.port}` : ''}`;
-}
+import Bridge from './Bridge';
+import wrapBridge from './wrapBridge';
 
-// parses the Asset URL from the config variable
-function parseAssetURL() {
-  try {
-    // Try to get the url from the canonical tag on the page.
-    return document.querySelector('link[rel="canonical"]').href;
-  } catch (e) {
-    window.console.warn(
-      'This page does not include a canonical link tag. Talk has inferred this asset_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages.'
+/**
+ * validateElement will throw an error when the element is not configured
+ * correctly or is not an HTMLElement at all.
+ *
+ * @param {HTMLElement} element the HTMLElement where the stream will be rendered
+ */
+function validateElement(element) {
+  if (!element) {
+    throw new Error(
+      'Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.'
     );
+  }
 
-    return window.location.origin + window.location.pathname;
+  if (typeof element !== 'object') {
+    throw new Error(
+      `Coral.Talk.render() expected HTMLElement but got ${element} (${typeof element})`
+    );
+  }
+
+  // Ensure element has an id, as pym can't directly accept the HTMLElement.
+  if (!element.id) {
+    element.id = `_${Math.random()}`;
   }
 }
 
-export class Talk {
+/**
+ * validateConfig is the configuration validation tool.
+ *
+ * @param {Object} config the configuration that will be used to setup Talk.
+ */
+function validateConfig(config) {
+  if (!config || typeof config !== 'object' || !config.talk) {
+    throw new Error(
+      'Coral.Talk.render() expected configuration with at least opts.talk as the Talk Base URL, none found'
+    );
+  }
+}
+
+export const Talk = {
   /**
    * Render a Talk stream
    * @param {HTMLElement} element - Element to render the stream in
    * @param {Object} config - Configuration options for talk
-   * @param {String} config.talk - Talk base URL
-   * @param {String} [config.title] - Title of Stream (rendered in iframe)
-   * @param {String} [config.asset_url] - Asset URL
-   * @param {String} [config.asset_id] - Asset ID
+   * @param {String} config.talk - URL to the Talk installation
+   * @param {String} [config.asset_id] - (optional) ID for the Asset
+   * @param {String} [config.asset_url] - (optional) URL where the Asset is located
    * @param {String} [config.auth_token] - (optional) A jwt representing the session
+   * @param {String} [config.lazy] - (optional) If set the stream will only render lazily
+   * @param {String} [config.talkStaticUrl] - (optional) Static URL used to serve Talk
    * @return {Object}
-   *
-   * Example:
-   * ```
-   *   const embed = Talk.render(document.getElementById('talkStreamEmbed'), config);
-   *
-   *   // trigger a login with optional token.
-   *   embed.login(token);
-   *
-   *   // trigger a logout.
-   *   embed.logout();
-   *
-   *   // listen to events (in this case all events).
-   *   embed.on('**', function(value) {
-   *     console.log(this.event, value);
-   *   });
-   * ```
    */
-  static render(element, config) {
-    if (!element) {
-      throw new Error(
-        'Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.'
-      );
-    }
-    if (typeof element !== 'object') {
-      throw new Error(
-        `Coral.Talk.render() expected HTMLElement but got ${element} (${typeof element})`
-      );
-    }
-    if (!config || typeof config !== 'object' || !config.talk) {
-      throw new Error(
-        'Coral.Talk.render() expected configuration with at least opts.talk as the Talk Base URL, none found'
-      );
-    }
+  render: (element, config) => {
+    // Validate the element.
+    validateElement(element);
 
-    // Ensure el has an id, as pym can't directly accept the HTMLElement.
-    if (!element.id) {
-      element.id = `_${Math.random()}`;
-    }
+    // Validate the configuration.
+    validateConfig(config);
 
-    // Compose the query to send down to the Talk API so it knows what to load.
-    const query = {};
-
-    // Parse the url parameters to extract some of the information.
-    const search = new URLSearchParams(window.location.search);
-
-    // Pull the commentID out from the query params.
-    const commentID = search.get('commentId') || search.get('commentID');
-    if (commentID) {
-      query.comment_id = commentID;
-    }
-
-    // Extract the asset id from the options.
-    if (config.asset_id) {
-      query.asset_id = config.asset_id;
-    }
-
-    // Parse the Asset URL.
-    query.asset_url = config.asset_url;
-    if (!query.asset_url) {
-      query.asset_url = parseAssetURL();
-    }
-
-    // Create the new Stream.
-    const stream = new Stream(element, config.talk, query, config);
-
-    // Return the public interface for the stream.
-    return new StreamInterface(stream);
-  }
-}
+    // Create the new Bridge, and wrap it up.
+    return wrapBridge(new Bridge(element, config));
+  },
+};

client/coral-embed/src/onIntersect.js

@@ -0,0 +1,30 @@
+export default function onIntersect(el, callback) {
+  // Ensure that the intersection observer is available.
+  if (!IntersectionObserver) {
+    // tslint:disable-next-line:no-console
+    window.console.warn('IntersectionObserver not available, rendering now');
+    callback();
+    return;
+  }
+
+  // Create the Intersection Observer that will wait till the embed is within
+  // view and will then call the callback.
+  const observer = new IntersectionObserver(
+    entries => {
+      if (entries[0].isIntersecting) {
+        // Stop receiving intersection events.
+        observer.disconnect();
+
+        // Fire the callback.
+        callback();
+      }
+    },
+    {
+      rootMargin: '100px',
+      threshold: 1.0,
+    }
+  );
+
+  // Start observing the element for visibility.
+  observer.observe(el);
+}

client/coral-embed/src/wrapBridge.js

@@ -0,0 +1,31 @@
+export default bridge => {
+  // whenRendered will call the callback when the stream has rendered (or now if
+  // the stream is already rendered).
+  const whenRendered = callback => bridge.queueWhenRendered(callback);
+
+  // onlyWhenRendered will guard the callback unless the stream is rendered.
+  const onlyWhenRendered = callback => {
+    bridge.ensureRendered();
+    callback();
+  };
+
+  // Return the limited stream interface.
+  return {
+    // Directly map the on/off from the event emitter to the stream.
+    on: (eventName, callback) => bridge.emitter.on(eventName, callback),
+    off: (eventName, callback) => bridge.emitter.off(eventName, callback),
+
+    // Queue up the login operation until the stream has been rendered.
+    login: token => whenRendered(() => bridge.login(token)),
+
+    // Queue up the logout operation until the stream has been rendered.
+    logout: () => whenRendered(() => bridge.logout()),
+
+    // Remove the stream if it's already been rendered.
+    remove: () => onlyWhenRendered(() => bridge.remove()),
+
+    // Queue up the plugin config until the embed has rendered.
+    enablePluginsDebug: () => whenRendered(() => bridge.enablePluginsDebug()),
+    disablePluginsDebug: () => whenRendered(() => bridge.disablePluginsDebug()),
+  };
+};

client/coral-framework/actions/auth.js

@@ -1,10 +1,5 @@
 import * as actions from '../constants/auth';
-import jwtDecode from 'jwt-decode';
-
-function cleanAuthData(localStorage) {
-  localStorage.removeItem('token');
-  localStorage.removeItem('exp');
-}
+import { setStorageAuthToken, clearStorageAuthToken } from '../services/auth';
 
 export const checkLogin = () => (
   dispatch,
@@ -15,7 +10,7 @@ export const checkLogin = () => (
   rest('/auth')
     .then(result => {
       if (!result.user) {
-        cleanAuthData(localStorage);
+        clearStorageAuthToken(localStorage);
         dispatch(checkLoginSuccess(null));
         client.resetWebsocket();
         return;
@@ -32,7 +27,7 @@ export const checkLogin = () => (
     .catch(error => {
       if (error.status && error.status === 401 && localStorage) {
         // Unauthorized.
-        cleanAuthData(localStorage);
+        clearStorageAuthToken(localStorage);
         client.resetWebsocket();
       } else {
         console.error(error);
@@ -58,8 +53,7 @@ export const setAuthToken = token => (
   _,
   { localStorage, client }
 ) => {
-  localStorage.setItem('exp', jwtDecode(token).exp);
-  localStorage.setItem('token', token);
+  setStorageAuthToken(localStorage, token);
 
   // Dispatch the set auth token action. For some browsers and situations, we
   // may not be able to persist the auth token any other way. Keep it in redux!
@@ -76,9 +70,7 @@ export const handleSuccessfulLogin = (user, token) => (
   _,
   { client, localStorage, postMessage }
 ) => {
-  const { exp } = jwtDecode(token);
-  localStorage.setItem('exp', exp);
-  localStorage.setItem('token', token);
+  setStorageAuthToken(localStorage, token);
 
   // Send the message via the messages service to the window.opener if it
   // exists.
@@ -117,7 +109,7 @@ export const logout = () => async (
   }
 
   // Clear the auth data persisted to localStorage.
-  cleanAuthData(localStorage);
+  clearStorageAuthToken(localStorage);
 
   // Reset the websocket.
   client.resetWebsocket();

client/coral-framework/components/ConfigureCard.css

@@ -1,50 +1,48 @@
 .card {
-  margin-bottom: 20px;
-  align-items: flex-start;
-  min-height: 100px;
   max-width: 600px;
+  min-height: 100px;
+  flex-direction: row;
+  align-items: flex-start;
+  margin-bottom: 20px;
   overflow: visible;
 }
 
+.collapsibleCard {
+  min-height: auto;
+}
+
+.enabledCard {
+  border-left: 7px solid #00796b;
+}
+
+.action {
+  flex-shrink: 0;
+  margin-right: 12px;
+}
+
+.wrapper {
+  flex-grow: 1;
+}
+
 .header {
-  margin-top: 3px;
-  margin-bottom: 7px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 2px;
+}
+
+.title {
   font-size: 18px;
   font-weight: 500;
 }
 
-.wrapper {
-  width: 100%;
+.body {
+  margin-top: 7px;
   font-size: 14px;
   letter-spacing: 0;
 }
 
-.action {
-  display: inline-block;
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 20px;
-}
-
-.content {
-  display: inline-block;
-  padding: 0px 30px;
-  box-sizing: border-box;
-}
-
-.enabledSetting {
-  border-left-color: #00796b;
-  border-left-style: solid;
-  border-left-width: 7px;
-}
-
-.disabledSetting {
-  padding-left: 22px;
-}
-
-.disabledSettingText {
+.disabledBody {
   color: #ccc;
-  pointer-events: none;
 }
 

client/coral-framework/components/ConfigureCard.js

@@ -1,46 +1,69 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import styles from './ConfigureCard.css';
+import classnames from 'classnames/bind';
 import { Card } from 'coral-ui';
-import { Checkbox } from 'react-mdl';
-import cn from 'classnames';
+import { Checkbox, IconButton } from 'react-mdl';
 
-const ConfigureCard = ({
-  title,
-  children,
-  className,
-  onCheckbox,
-  checked,
-  ...rest
-}) => (
-  <Card
-    {...rest}
-    className={cn(styles.card, className, {
-      [styles.enabledSetting]: checked === true,
-      [styles.disabledSetting]: checked === false,
-    })}
-  >
-    {checked !== undefined && (
-      <div className={styles.action}>
-        <Checkbox onChange={onCheckbox} checked={checked} />
-      </div>
-    )}
-    <div
-      className={cn(styles.wrapper, {
-        [styles.content]: checked !== undefined,
-      })}
-    >
-      <div className={styles.header}>{title}</div>
-      <div
-        className={cn({
-          [styles.disabledSettingText]: checked === false,
+import styles from './ConfigureCard.css';
+
+const cn = classnames.bind(styles);
+
+class ConfigureCard extends PureComponent {
+  state = {
+    isOpen: !this.props.collapsible,
+  };
+
+  toggle = () => this.setState({ isOpen: !this.state.isOpen });
+
+  render() {
+    const {
+      title,
+      children,
+      className,
+      onCheckbox,
+      checked,
+      collapsible,
+      ...rest
+    } = this.props;
+
+    const { isOpen } = this.state;
+
+    const iconName = isOpen ? 'keyboard_arrow_up' : 'keyboard_arrow_down';
+
+    return (
+      <Card
+        {...rest}
+        className={cn(styles.card, className, {
+          enabledCard: checked === true,
+          collapsibleCard: collapsible,
         })}
       >
-        {children}
-      </div>
-    </div>
-  </Card>
-);
+        {checked !== undefined && (
+          <div className={styles.action}>
+            <Checkbox onChange={onCheckbox} checked={checked} />
+          </div>
+        )}
+        <div className={styles.wrapper}>
+          <div className={styles.header}>
+            <div className={styles.title}>{title}</div>
+            {collapsible && (
+              <IconButton onClick={this.toggle} name={iconName} ripple />
+            )}
+          </div>
+          {isOpen && (
+            <div
+              className={cn(styles.body, {
+                disabledBody: checked === false,
+              })}
+            >
+              {children}
+            </div>
+          )}
+        </div>
+      </Card>
+    );
+  }
+}
 
 ConfigureCard.propTypes = {
   title: PropTypes.string,
@@ -48,6 +71,7 @@ ConfigureCard.propTypes = {
   onCheckbox: PropTypes.func,
   checked: PropTypes.bool,
   children: PropTypes.node,
+  collapsible: PropTypes.bool,
 };
 
 export default ConfigureCard;

client/coral-framework/services/auth.js

@@ -0,0 +1,11 @@
+import jwtDecode from 'jwt-decode';
+
+export const setStorageAuthToken = (storage, token) => {
+  storage.setItem('exp', jwtDecode(token).exp);
+  storage.setItem('token', token);
+};
+
+export const clearStorageAuthToken = storage => {
+  storage.removeItem('token');
+  storage.removeItem('exp');
+};

client/coral-framework/services/bootstrap.js

@@ -22,6 +22,7 @@ import {
 } from 'coral-framework/services/storage';
 import { createHistory } from 'coral-framework/services/history';
 import { createIntrospection } from 'coral-framework/services/introspection';
+import { setStorageAuthToken } from 'coral-framework/services/auth';
 import introspectionData from 'coral-framework/graphql/introspection.json';
 import coreReducers from '../reducers';
 import { checkLogin as checkLoginAction } from '../actions/auth';
@@ -46,7 +47,30 @@ const getAuthToken = (store, storage) => {
     // capable of storing the token in localStorage, then we would have
     // persisted it to the redux state.
     return state.config.auth_token || state.auth.token;
-  } else if (!bowser.safari && !bowser.ios && storage) {
+  } else if (location.hash && location.hash.startsWith('#access_token=')) {
+    // Check to see if the access token is living in the URL as a hash.
+    const token = location.hash.substring(14);
+
+    history.replaceState(
+      {},
+      document.title,
+      window.location.pathname + window.location.search
+    );
+
+    // Once we clear the hash above, this login method will not persist across
+    // refreshes. We will need to persist the token to storage if it's
+    // available.
+    if (storage) {
+      setStorageAuthToken(storage, token);
+    }
+
+    return token;
+  } else if (
+    !bowser.safari &&
+    !bowser.ios &&
+    storage &&
+    storage.getItem('token')
+  ) {
     // Use local storage auth tokens where there's a stable api.
     return storage.getItem('token');
   }

client/coral-framework/services/i18n.js

@@ -12,6 +12,7 @@ import 'moment/locale/da';
 import 'moment/locale/de';
 import 'moment/locale/es';
 import 'moment/locale/fr';
+import 'moment/locale/it';
 import 'moment/locale/nl';
 import 'moment/locale/pt-br';
 
@@ -22,6 +23,7 @@ import daTA from 'timeago.js/locales/da';
 import deTA from 'timeago.js/locales/de';
 import esTA from 'timeago.js/locales/es';
 import frTA from 'timeago.js/locales/fr';
+import itTA from 'timeago.js/locales/it';
 import nlTA from 'timeago.js/locales/nl';
 import pt_BRTA from 'timeago.js/locales/pt_BR';
 import zh_CNTA from 'timeago.js/locales/zh_CN';
@@ -34,6 +36,7 @@ import da from '../../../locales/da.yml';
 import de from '../../../locales/de.yml';
 import es from '../../../locales/es.yml';
 import fr from '../../../locales/fr.yml';
+import it from '../../../locales/it.yml';
 import nl_NL from '../../../locales/nl_NL.yml';
 import pt_BR from '../../../locales/pt_BR.yml';
 import zh_CN from '../../../locales/zh_CN.yml';
@@ -61,6 +64,7 @@ export const translations = {
   ...de,
   ...es,
   ...fr,
+  ...it,
   ...nl_NL,
   ...pt_BR,
   ...zh_CN,
@@ -106,6 +110,7 @@ export function setupTranslations() {
   ta.register('da', daTA);
   ta.register('de', deTA);
   ta.register('fr', frTA);
+  ta.register('it', itTA);
   ta.register('nl_NL', nlTA);
   ta.register('pt_BR', pt_BRTA);
   ta.register('zh_CN', zh_CNTA);

config.js

@@ -30,7 +30,7 @@ const CONFIG = {
   ENABLE_TRACING: Boolean(process.env.APOLLO_ENGINE_KEY),
 
   // EMAIL_SUBJECT_PREFIX is the string before emails in the subject.
-  EMAIL_SUBJECT_PREFIX: process.env.TALK_EMAIL_SUBJECT_PREFIX || '[Talk]',
+  EMAIL_SUBJECT_PREFIX: process.env.TALK_EMAIL_SUBJECT_PREFIX,
 
   // DEFAULT_LANG is the default language used for server sent emails and
   // rendered text.
@@ -76,6 +76,10 @@ const CONFIG = {
   // on the scraper when it makes requests.
   SCRAPER_HEADERS: process.env.TALK_SCRAPER_HEADERS || '{}',
 
+  // HTTP_X_REQUEST_ID is a string which represents the request header where we
+  // should source the request ID from, otherwise, a new one will be generated.
+  HTTP_X_REQUEST_ID: process.env.TALK_HTTP_X_REQUEST_ID || null,
+
   //------------------------------------------------------------------------------
   // JWT based configuration
   //------------------------------------------------------------------------------
@@ -213,6 +217,9 @@ const CONFIG = {
   // messages through the websocket to keep the socket alive.
   KEEP_ALIVE: process.env.TALK_KEEP_ALIVE || '30s',
 
+  // CONCURRENCY is the number of workers that will serve traffic.
+  CONCURRENCY: parseInt(process.env.TALK_CONCURRENCY || '1'),
+
   //------------------------------------------------------------------------------
   // Cache configuration
   //------------------------------------------------------------------------------
@@ -220,6 +227,14 @@ const CONFIG = {
   CACHE_EXPIRY_COMMENT_COUNT:
     process.env.TALK_CACHE_EXPIRY_COMMENT_COUNT || '1hr',
 
+  // EMBED_EXPIRY_TIME is the time that the embed will be cacheable for, sent as
+  // the max-age= directive on the Cache-Control header.
+  EMBED_EXPIRY_TIME: ms(process.env.TALK_EMBED_EXPIRY || '24hr'),
+
+  // EMBED_EXPIRY_TIME is the time that the rest of the static files will be
+  // cacheable for, sent as the max-age= directive on the Cache-Control header.
+  STATIC_EXPIRY_TIME: ms(process.env.TALK_STATIC_EXPIRY || '1w'),
+
   //------------------------------------------------------------------------------
   // Recaptcha configuration
   //------------------------------------------------------------------------------
@@ -271,6 +286,10 @@ const CONFIG = {
 // CONFIG VALIDATION
 //==============================================================================
 
+if (typeof CONFIG.EMAIL_SUBJECT_PREFIX === 'undefined') {
+  CONFIG.EMAIL_SUBJECT_PREFIX = '[Talk]';
+}
+
 if (process.env.NODE_ENV === 'test') {
   if (!CONFIG.ROOT_URL) {
     CONFIG.ROOT_URL = `http://${localAddress}:3001`;

docs/_config.yml

@@ -98,12 +98,16 @@ sidebar:
           url: /configuration/
         - title: Advanced Configuration
           url: /advanced-configuration/
+        - title: Configuration with CLI tools
+          url: /configuration-cli-tools/
     - title: Integrating
       children:
         - title: Authentication
           url: /integrating/authentication/
-        - title: Asset Management
-          url: /integrating/asset-management/
+        - title: CMS Integration
+          url: /integrating/cms-integration/
+        - title: Asset Scraping
+          url: /integrating/asset-scraping/
         - title: Configuring the Comment Stream
           url: /integrating/configuring-comment-stream/
         - title: Configuring the Admin

docs/public/_redirects

@@ -1,3 +1,4 @@
 / /talk/
 /talk/reference/server/ /talk/api/server/
-/talk/reference/graphql/ /talk/api/graphql/
+/talk/reference/graphql/ /talk/api/graphql/
+/talk/integrating/asset-management/ /talk/integrating/cms-integration/

docs/source/01-01-talk-quickstart.md

@@ -187,8 +187,10 @@ and walk through the initial setup steps.
 
 * First, enter your **Organization Name** and **Organization Contact Email**. This will appear in emails when inviting new team members.
 * Next, create your Admin user. You can specify an **Email Address**, **Username**, and **Password**
+
 * Finally, enter your list of **Permitted Domains**, read [here](/talk/configuring-talk/#permitted-domains) about whitelisting domains 
 
+
 _During development, ensure you whitelist 127.0.0.1:3000 otherwise the
 [http://127.0.0.1:3000/](http://127.0.0.1:3000/) page will not
 load._
@@ -220,6 +222,17 @@ Once you have added the domain of these docs, you can click the button below.
   <div class="mount"></div>
 </div>
 
+### Developer Endpoints
+
+With your local instance of Talk running in development mode (env variable `NODE_ENV=development`) you should now also be able to access the following developer routes:
+
+* [http://127.0.0.1:3000/dev](http://127.0.0.1:3000/dev]) provides a sample comment stream 
+
+* [http://127.0.0.1:3000/dev/assets](http://127.0.0.1:3000/dev/assets]) provides a list of all stories in Talk and can generate new sample assets
+
+### Conclusion
 At this point you've successfully installed, configured, and ran your very own
 instance of Talk! Continue through this documentation on this site to learn more
 on how to configure, develop with, and contribute to Talk!
+
+

docs/source/01-03-installation-from-source.md

@@ -70,5 +70,7 @@ You can now start the application by running:
 yarn watch:server
 ```
 
+If you are developing a custom plugin you can use `yarn watch:client` or `yarn watch` to run both client and server.
+
 At this stage, you should refer to the [configuration](/talk/configuration/) for
 configuration variables that are specific to your installation.

docs/source/01-05-pre-launch-checklist.md

@@ -23,11 +23,13 @@ permalink: /pre-launch-checklist/
 
 - [ ] Do you need to migrate comments from a legacy system? We currently support Disqus, Livefyre, and Civil Comments.
   - Use the [Talk Import](https://github.com/coralproject/talk-importer) framework
-
+  
 
 - [ ] Do you want to provide single sign-on (SSO) by integrating with an external auth system?
   - See [Authenticating with Talk](/talk/integrating/authentication/)
 
+- [ ] Do you want to integrate Talk with your CMS to automate embedding Talk Comment Stream into your site?
+  - See [CMS Integration](/talk/integrating/cms-integration/)
 
 - [ ] Do you want to use Social sign-on?
   - Facebook

docs/source/02-02-advanced-configuration.md

@@ -246,6 +246,21 @@ Refer to the documentation for [TALK_JWT_ALG](#talk-jwt-alg) for other signing
 methods and other forms of the `TALK_JWT_SECRET`. If you are interested in using
 multiple keys, then refer to [TALK_JWT_SECRETS](#talk-jwt-secrets).
 
+You can also encode your secret as a base64 string (if you are using a symmetric
+algorithm) as long as you prefix it with `base64:`. For example:
+
+```plain
+TALK_JWT_SECRET={"secret": "base64:dGVzdA=="}
+```
+
+Would be the same as:
+
+```plain
+TALK_JWT_SECRET={"secret": "test"}
+```
+
+As `dGVzdA==` is just `test` encoded using base64.
+
 ## TALK_JWT_SECRETS
 
 Used when specifying multiple secrets used for key rotations. This is a JSON
@@ -271,7 +286,6 @@ Note that the secret is stored in a JSON object, keyed by `secret`. This is only
 needed when specifying in the multiple secrets for `TALK_JWT_SECRETS`, but may
 be used to specify the single [TALK_JWT_SECRET](#talk-jwt-secret).
 
-
 When the value of [TALK_JWT_ALG](#talk-jwt-alg) is **not** a `HS*` value, then
 the value of the `TALK_JWT_SECRETS` should take the form:
 
@@ -282,7 +296,6 @@ TALK_JWT_SECRETS=[{"kid": "1", "private": "<my private key>", "public": "<my pub
 Refer to the documentation on the [TALK_JWT_ALG](#talk-jwt-alg) for more
 information on what to store in these parameters.
 
-
 ## TALK_JWT_SIGNING_COOKIE_NAME
 
 The default cookie name that is use to set a cookie containing a JWT that was

docs/source/02-03-cli-tools.md

@@ -0,0 +1,181 @@
+---
+title: Configuration with CLI tools
+permalink: /configuration-cli-tools/
+class: configuration
+toc: true
+---
+
+Talk can be configured using CLI tools. The CLI tools are available through `./bin/cli`. Below is a list of commands available:
+```
+  Usage: cli [options] [command]
+
+  Options:
+
+    -h, --help  output usage information
+
+  Commands:
+
+    serve       serve the application
+    db          run database commands
+    settings    interact with the application settings
+    assets      interact with assets
+    setup       setup the application
+    jobs        work with the job queues
+    token       work with the access tokens
+    users       work with the application auth
+    migration   provides utilities for migrating the database
+    plugins     provides utilities for interacting with the plugin system
+    help [cmd]  display help for [cmd]
+```
+
+## Serving the application
+To serve the application, run `./bin/cli serve`. Please check that you have installed the Talk before doing this step. Below is a list of additional options available for this command:
+```
+  Usage: cli-serve [options]
+
+  Options:
+
+    -j, --jobs              enable job processing on this thread
+    --disabled-jobs <jobs>  disable jobs specified if the -j option is passed, specified as a comma separated list (default: )
+    -w, --websockets        enable the websocket (subscriptions) handler on this thread
+    -h, --help              output usage information
+```
+
+## Database commands
+You can also run database commands using `./bin/cli db`. Below is a list of additional options available for this command:
+```
+  Usage: cli-db [options] [command]
+
+  Options:
+
+    -h, --help     output usage information
+
+  Commands:
+
+    createIndexes  creates the database indexes and waits until they are created
+```
+
+## Application settings
+You can also change application settings using `./bin/cli settings`. Below is a list of additional options available for this command:
+```
+  Usage: cli-settings [options] [command]
+
+  Options:
+
+    -h, --help       output usage information
+
+  Commands:
+
+    change-org-name  change the organization name
+```
+
+## Interaction with assets
+You can also interact with your application's assets using `./bin/cli assets`. Below is a list of additional options available for this command:
+```
+Usage: cli-assets [options] [command]
+
+  Options:
+
+    -h, --help                            output usage information
+
+  Commands:
+
+    list [options]                        list all the assets in the database
+    refresh [age]                         queues the assets that exceed the age requested
+    update-url <assetID> <url>            update the URL of an asset
+    merge <srcID> <dstID>                 merges two assets together by moving comments from src to dst and deleting the src asset
+    rewrite [options] <search> <replace>  rewrites asset url's using the provided regex replacement pattern
+```
+
+## Setting up the application
+You can also run a setup wizard to setup the wizard using `./bin/cli setup`. Below is a list of additional options available for this command:
+```
+  Usage: cli-setup [options]
+
+  runs the setup wizard to setup the application
+
+  Options:
+
+    --defaults  apply defaults for config instead of prompting
+    -h, --help  output usage information
+```
+
+## Working with job queues
+You can also work with job queues using `./bin/cli jobs`. Below is a list of additional options available for this command:
+```
+  Usage: cli-jobs [options] [command]
+
+  Options:
+
+    -h, --help         output usage information
+
+  Commands:
+
+    process            starts job processing
+    cleanup [options]  cleans up inactive jobs
+```
+
+## Working with access tokens
+You can also work with access tokens using `./bin/cli token`. Below is a list of additional options available for this command:
+```
+  Usage: cli-token [options] [command]
+
+  Options:
+
+    -h, --help                   output usage information
+
+  Commands:
+
+    list <userID>                list tokens for a user
+    revoke <tokenID>             revokes a token with a given id
+    create <userID> <tokenName>  create a token for a user with a given name
+```
+
+## Working with your application's authentication
+You can also work with your application's authentication using `./bin/cli users`. Below is a list of additional options available for this command:
+```
+Usage: cli-users [options] [command]
+
+  Options:
+
+    -h, --help               output usage information
+
+  Commands:
+
+    create                   creates a local user
+    delete <userID>          delete a user
+    list                     searches for a user based on their stored username and email
+    set-role <userID>        sets the role on a user
+    verify <userID> <email>  verifies the given user's email address
+```
+
+## Migrating your database
+Talk provides utilities for migrating your database using `./bin/cli migration`. Below is a list of additional options available for this command:
+```
+  Usage: cli-migration [options] [command]
+
+  Options:
+
+    -h, --help     output usage information
+
+  Commands:
+
+    create <name>  creates a new migration
+    run [options]  runs all pending migrations
+```
+
+## Interacting with the plugin system
+Talk provides utilities to interact with the plugin system using `./bin/cli plugins`. Below is a list of additional options available for this command:
+```
+  Usage: cli-plugins [options] [command]
+
+  Options:
+
+    -h, --help           output usage information
+
+  Commands:
+
+    create               creates a seed plugin
+    list
+    reconcile [options]  reconciles dependencies by downloading external plugins
+```

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

@@ -5,13 +5,15 @@ permalink: /commenter-features/
 
 ## Signing up for Talk
 
-There are 2 ways that newsrooms can support signup/login functionality with Talk:
+There are 3 ways that newsrooms can support signup/login functionality with Talk:
 
 * Use Talk’s auth plugin out of the box (supports account registration with username and password, as well as features like forgot password)
 
+* Use 3rd party authentication provider such as FaceBook or Google. We provide plugins that support logging in with either [Facebook](/talk/plugin/talk-plugin-facebook-auth/)
+or [Google](/talk/plugin/talk-plugin-google-auth/). (Note: you must provide your own Facebook App ID and Secret, which you can read more about here: [https://developers.facebook.com](https://developers.facebook.com))
+
 * Create their own auth plugin to integrate with your own auth systems
 
-We also provide a Facebook auth plugin that supports logging in with Facebook (you must provide your own Facebook App ID and Secret, which you can read more about here: [https://developers.facebook.com](https://developers.facebook.com))
 
 ## Comments and Replies
 

docs/source/03-03-product-guide-moderator-features.md

@@ -5,7 +5,7 @@ permalink: /moderator-features/
 
 ## The Talk Admin
 
-The Admin is your moderators will moderate your comments, and your Admins will
+The Admin is where your moderators will moderate your comments, and your Admins will
 configure and manage the different parts of Talk.
 
 ### Moderate
@@ -18,57 +18,99 @@ site-wide.
 
 **New**
 
-The New queue contains all comments that have not been moderated yet.
+>_Conditions:_ Pre-Mod disabled
 
-**Reported**
+Comments have been published? _**Yes**_
 
-The Reported queue contains all comments that need moderator attention.
+The New queue contains all comments that have not been moderated yet. This queue contains comments that haven’t yet been Accepted or Rejected by a moderator
 
-**Approved**
+**Pre-mod**
 
-The Approved queue contains all approved comments.
+>_Conditions:_ Pre-Mod enabled
+
+Comments have been published? _**No**_
+
+This queue contains comments that haven’t yet been Accepted or Rejected by a moderator
+
+**Accepted**
+
+Comments have been published? _**Yes**_
+
+Comments that have been approved by a moderator, written by a Staff member (and so auto approved), or Featured (and so auto approved). Tags for reports still appear on comments in this queue, but the comments will not go back into Reported.
 
 **Rejected**
 
-The Rejected queue contains all comments that have been rejected, either
-manually by moderators or automatically, e.g. they have used a banned word.
+Comments have been published? _**No**_
+
+Comments that have been rejected by a moderator, or rejected because they contained a banned word/phrase. Tags for reports still appear on comments in this queue, but the comments will not go back into Reported.
+
+
+**Reported**
+
+>_Conditions:_ Pre-Mod disabled
+
+Comments have been published? _**depends**_
+
+This queue contains comments that have been reported for moderator review, either by users or automatically by Talk, and have not yet been Approved or Rejected. If there are comments to review in this queue, a red dot will be displayed in the top menu. 
 
 **All**
 
 The All queue contains all comments that have been submitted either article or
 site-wide.
 
-#### Moderation Badges
+#### Moderation Tags that appear in Reported/other queues
 
 **Pre-mod**
 
-The Pre-mod badge signifies comments that are being pre-modded.
+_Comment published? No_
+
+The Pre-mod tag signifies comments that are being pre-modded.
 
 **User**
 
-The User badge signifies comments that have been reported by another user.
+_Comment published? Yes_
 
-**History**
+Comment has been reported by a user. The ‘More Details’ box contains the name/s of the users who reported the comment, and any additional information they provided.
+
+**Staff**
+
+_Comment published? Yes_
+
+Comment has been reported by a staff member. The ‘More Details’ box contains the name/s of the staff member who reported the comment, and any additional information they provided.
+
+**Suspect Word**
+
+_Comment published? Yes_
+
+Comment contains a word or phrase that is on the ’Suspect words’ list in the Configure > Moderation tab (administrators only). The word/phrase will be highlighted in yellow.
+
+**Karma**
+
+_Comment published? No_
+
+The History tag signifies comments that have been flagged because the user’s history indicates their Accepted:Rejected ratio has reached below the karma threshold. [Read more about karma here.](/talk/trust/#user-karma-score)
+
+**Spam**
+
+_Comment published? No_
+
+If you are using the Akismet anti-spam plugin, this tag means that Akismet has flagged the comment as spam. You must Approve it for it to appear in the stream. **Requires:** [talk-plugin-akismet](/talk/plugin/talk-plugin-akismet/)
 
-The History badge signifies comments that have been flagged because of a user’s
-history.
 
 **Toxic**
 
-The Toxic badge signifies comments that are above the set Toxicity Probability
-Threshold. Note you must have [talk-plugin-toxic-comments](/talk/additional-plugins/#talk-plugin-toxic-comments) enabled.
-[Read more about Toxic Comments here](/talk/toxic-comments/).
+_Comment published? No_
 
-**Suspect**
+If you are using the Toxic Comments plugin, this tag means that Perspective API has flagged the comment as likely to be toxic, above the threshold you have set (default: 80%). You must Approve it for it to appear in the stream. **Requires:** [talk-plugin-toxic-comments](/talk/additional-plugins/#talk-plugin-toxic-comments). 
+Read more about [Toxic Comments here](/talk/toxic-comments/).
 
-The Suspect badge signifies comments that contain a Suspect Word.
 
 **Contains Link**
 
-The Contains Link badge signifies a comment that contains a link, which can
+The Contains Link tag signifies a comment that contains a link, which can
 sometimes mean it is a spam or ad comment.
 
-**Flag Details View**
+**More Details View**
 
 At the bottom of each comment in the moderation queues, you can see more
 information about a comment’s flags by clicking on More Detail.
@@ -88,9 +130,35 @@ Rejecting a comment removes the comment from the stream.
 Featuring a comment adds that comment to the Featured Comments tab on the
 stream.
 
+#### Keyboard Shortcuts
+
+Talk also supports a number of keyboard shortcuts that moderators can leverage
+to moderate queues quickly:
+
+| Shortcut | Action                     |
+| -------- | -------------------------- |
+| `j`      | Go to the next comment     |
+| `k`      | Go to the previous comment |
+| `ctrl+f` | Open search                |
+| `1-5`    | Switch queues              |
+| `z`      | Zen mode                   |
+| `?`      | Open shortcuts menu        |
+| `d`      | Approve                    |
+| `f`      | Reject                     |
+
+Note: "Zen mode" allows a moderator to view and action only one comment at a time. Enjoy the silence!
+
+#### The User Drawer
+
+In order to get an idea of what sort of a commenter someone is, moderators can
+click on the commenter's username in any moderation queue/elsewhere in the admin (eg the Community page) to see details about
+their comments, and to take actions.
+
+#### User Drawer Actions
+
 **Suspend User**
 
-Suspending a user allows a moderator to give a commenter a “time-out”; during
+Suspending a user allows a moderator to give a commenter a “time-out” for a set time chosen from four options; during
 that time they won’t be allowed to post comments or react to comments.
 
 **Ban User**
@@ -99,15 +167,13 @@ Banning a user allows a moderator to permanently disallow a commenter to
 interact with their community. The commenters previous comments will remain on
 the site. This action can only be un-done manually by a moderator.
 
-#### Viewing a User’s Comment History
+**Reject Username**
 
-In order to get an idea of what sort of a commenter someone is, moderators can
-click on the commenters username in any moderation queue and see details about
-their history.
+If a username is violating your guidelines but isn't bad enough to lead to a ban (eg. they are impersonating a famous person), you can reject their username. This will prevent them from publishing comments until they submit a new username. The new name will appear on the Community page for moderator approval before they can publish comments again.
 
 **Username, Email and Member Since Date**
 
-This shows the basic details about a commenter.
+This shows the basic details about a commenter's account
 
 **Total Comments**
 
@@ -119,32 +185,17 @@ display on the site.
 This shows the % of comments a commenter has had rejected by moderators, or
 automatically.
 
-**Reports**
+**Karma score**
 
-This shows if a commenter is a reliable flagger, an unreliable flagger, or a
-neutral flagger. [Read more about reliable and unreliable flaggers here](/talk/trust/#reliable-and-unreliable-flaggers).
+The user's current score. To see the default threshhold, click on the 'i' next to the word Karma. If the user's score is equal to or below the default threshhold, the number will be highlighted red. [Read more about karma scores here.](/talk/trust/#user-karma-score)
+
+**User History**
+
+This shows the history of the account - if a user has changed their username, or been suspended or banned. The name of the moderator who suspended/banned them/lifted the suspection or ban is displayed here as well.
 
 **Moderating from this View**
 
-Talk also allows you to moderate a commenters recent comments from this view.
-
-#### Keyboard Shortcuts
-
-Talk also supports a number of keyboard shortcuts that moderators can leverage
-to moderate quickly:
-
-| Shortcut | Action                     |
-| -------- | -------------------------- |
-| `j`      | Go to the next comment     |
-| `k`      | Go to the previous comment |
-| `ctrl+f` | Open search                |
-| `t`      | Switch queues              |
-| `z`      | Zen mode                   |
-| `?`      | Open this menu             |
-| `d`      | Approve                    |
-| `f`      | Reject                     |
-
-Note: "Zen mode" allows a moderator to view and action only one comment at a time. Enjoy the silence!
+Talk also allows you to moderate a commenters recent comments from this view. You can 'Select all' to select up to ten previous comments, and take bulk accept/reject actions.
 
 ### Stories
 

docs/source/03-07-product-guide-trust.md

@@ -7,7 +7,7 @@ Trust is a set of components within Talk that incorporate basic automated modera
 
 ## User Karma Score
 
-Using Trust’s calculations, Talk will automatically hold back, move to the Reported queue, and tag with a 'History' marker, any comments by users who have an Unreliable karma score. (This is for sites who practice post-moderation. If you set pre-moderation of all comments sitewide, this feature has limited use.)
+Using Trust’s calculations, Talk will automatically hold back, move to the Reported queue, and tag with a 'Karma' marker, any comments by users who have an Unreliable karma score. (This is for sites who practice post-moderation. If you set pre-moderation of all comments sitewide, this feature has limited use.)
 
 All users start out with a Neutral karma score (`0`). If they have a comment approved by a moderator, their score increases by `1`; if they have a comment rejected by a moderator, it decreases by `1`. When a commenter's score is labeled as Unreliable, their comments must be approved from the Reported queue before they are posted. Commenters are shown a message stating that a moderator will review their comment shortly.
 
@@ -27,29 +27,3 @@ We strongly recommend not telling your community how this system works, or where
 
 If you see that a high proportion of first-time commenters on your site are abusive, you might want to change the threshhold to `0`, at least temporarily. You can configure your own Trust thresholds by using [TRUST_THRESHOLDS](/talk/advanced-configuration/#trust-thresholds) in your site configuration.
 
-
-## Reliable and Unreliable Flaggers
-
-Trust also calculates how reliable users are in terms of the comments they
-report. This information is displayed to moderators in the User History drawer,
-which is accessed by clicking on a user’s name in the Admin. Currently, no other action is taken based on this score.
-
-If a user's reports mostly match what moderators reject, their Report status
-will display to moderators as Reliable in the user information drawer. If a
-user's reports mostly differ from what moderators reject, their Report status
-will show as Unreliable.
-
-If Talk doesn't have enough reports to make a call, or the reports even out, their
-status is Neutral.
-
-Here are the default thresholds:
-
-```text
--1 and lower: Unreliable
-0 to +1: Neutral
-+2 and higher: Reliable
-```
-You can configure your own Trust thresholds by using [TRUST_THRESHOLDS](/talk/advanced-configuration/#trust-thresholds) in your
-configuration.
-
-Note: Report Karma doesn't include reports of "I don't agree with this comment".

docs/source/03-08-gdpr.md

@@ -15,7 +15,7 @@ Even if GDPR will not apply to you, it is recommended to enable these
 features as a best practice to provide your users with control over their own
 data.
 
-## GPDR Feature Overview
+## GDPR Feature Overview
 
 Integrating our GDPR tools will give your users and organizations the following benefits:
 

docs/source/integrating/asset-scraping.md

@@ -0,0 +1,44 @@
+---
+title: Asset Scraping
+permalink: /integrating/asset-scraping/
+---
+
+By default, Assets in Talk have their metadata scraped when they are loaded.
+This provides the easiest way for newsrooms to integrate their CMS's into Talk
+in a simple way. We use the following
+[meta tags](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta) on
+the target pages that allow us to extract some properties.
+
+| Asset Property     | Selector |
+|--------------------|----------|
+| `title`            | See [`metascraper-title`](https://github.com/microlinkhq/metascraper/blob/dc664c37ea1b238b1e3e9d5342edfacc9027892c/packages/metascraper-title/index.js) |
+| `description`      | See [`metascraper-description`](https://github.com/microlinkhq/metascraper/blob/dc664c37ea1b238b1e3e9d5342edfacc9027892c/packages/metascraper-description/index.js) |
+| `image`            | See [`metascraper-image`](https://github.com/microlinkhq/metascraper/blob/dc664c37ea1b238b1e3e9d5342edfacc9027892c/packages/metascraper-image/index.js) |
+| `author`           | See [`metascraper-author`](https://github.com/microlinkhq/metascraper/blob/dc664c37ea1b238b1e3e9d5342edfacc9027892c/packages/metascraper-author/index.js) |
+| `publication_date` | See [`metascraper-date`](https://github.com/microlinkhq/metascraper/blob/dc664c37ea1b238b1e3e9d5342edfacc9027892c/packages/metascraper-date/index.js) |
+| `modified_date`    | `meta[property="article:modified"]` |
+| `section`          | `meta[property="article:section"]` |
+
+You can use the `./bin/cli assets debug <url>` to print the scraped metadata
+from that URL. For example:
+
+```bash
+ $ ./bin/cli assets debug https://www.washingtonpost.com/technology/2018/10/30/apple-event-october-ipad-pro-macbook-air/
+┌──────────────────┬──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ Property         │ Value                                                                                                                                                                            │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ title            │ Apple redesigns the iPad Pro, breathes new life in the MacBook Air                                                                                                               │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ description      │ Apple is unveiling new iPads and MacBooks at an event in New York starting at 10 a.m. Fowler is there and will report in with the news and hands-on analysis throughout the day. │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ image            │ https://www.washingtonpost.com/resizer/JAwNQE2alL2JjiWrbXeJ46wZHqA=/1484x0/arc-anglerfish-washpost-prod-washpost.s3.amazonaws.com/public/G5TWBFW4LAI6RC5MX7QB7TODUY.jpg          │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ author           │ Geoffrey A. Fowler                                                                                                                                                               │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ publication_date │ 2018-10-30T10:40:00.000Z                                                                                                                                                         │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ modified_date    │                                                                                                                                                                                  │
+├──────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ section          │                                                                                                                                                                                  │
+└──────────────────┴──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```

docs/source/integrating/authentication.md

@@ -3,8 +3,10 @@ title: Authenticating with Talk
 permalink: /integrating/authentication/
 ---
 
-You can integrate Talk with any external authentication service that will enable
-seamless single sign-on for users within your organization. There are a few
+Out of the box Talk supports account registration with username and password, as well as features like forgot password. 
+
+You can also integrate Talk with any external authentication service that will enable
+seamless single sign-on (SSO) for users within your organization. There are a few
 methods of doing so:
 
 1. Passport Middleware
@@ -17,8 +19,12 @@ choice.
 
 You would choose the **Passport Middleware** route when you are OK using an auth
 that is triggered from inside Talk that is not connected to an external auth
-state (you don't use the auth anywhere else now). A great example of this is our
-[talk-plugin-facebook-auth](/talk/plugin/talk-plugin-facebook-auth/) plugin.
+state (you don't use the auth anywhere else now). 
+
+Plugins are available for the following 3rd party authentication providers:
+
+* [Facebook](/talk/plugin/talk-plugin-facebook-auth/)
+* [Google](/talk/plugin/talk-plugin-google-auth/) 
 
 ## Custom Token Integration 
 

docs/source/integrating/cms-integration.md

@@ -1,22 +1,81 @@
 ---
-title: Asset Management
-permalink: /integrating/asset-management/
+title: CMS Integration
+permalink: /integrating/cms-integration/
 ---
 
+## Embedding Comments on Your Site
+Talk provides an embed script that you can drop into your site where you want a comments section to appear. By default that script dynamically generate Assets
+in Talk in order to make it easier for lighter installations.
+
+You can find the embed script inside talk under `Configure > Tech Settings > Embed Script`. It should look something like this, but with your domain in place of `<TALK_ROOT_URL>`:
+```
+<div id="coral_talk_stream"></div>
+<script src="<TALK_ROOT_URL>/static/embed.js" async onload="
+  Coral.Talk.render(document.getElementById('coral_talk_stream'), {
+    talk: '<TALK_ROOT_URL>'
+  });
+"></script>
+```
+
+## Triggering the Comments Section (client side, i.e. Your site)
+
+When the embed script is triggered on your page load several things are initiated inside Talk, including fetching all comments for the specified article, establishing websocket connections for this user, and checking user’s session for SSO/authentication. 
+
+Instead of greedily triggering the embed to render on _EVERY PAGE LOAD_, we highly recommend implementing a _“lazy”_ rendering strategy to only render the comments section if a user wants to interact with it. This will greatly improve your initial page load performance, and will be critical to managing server resources if you’re running Talk on a heavy-traffic production site. 
+
+We recommend using one of these _“lazy”_ loading strategies:
+
+#### Scroll to Comments Section
+Wait for user to scroll to the comment section before triggering the embed to render. 
+
+You can pass lazy: true to the render options, like so:
+```
+Coral.Talk.render(document.getElementById('container'), {
+    talk: 'https://my-talk-installation.com',
+    lazy: true,
+});
+```
+
+Or you can enable lazy rendering by default on all assets using ENV variable `TALK_DEFAULT_LAZY_RENDER=TRUE`
+
+_*Note: This feature requires Talk version 4.6.8 or greater_
+
+#### Show Comments Button
+ You can hide the comments section until a user clicks button, then trigger the embed to render
+
+This example uses jQuery to render the embed on the button's click event
+```
+<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+
+<div id="coral_talk_stream">
+  <button>Show Comments</button>
+</div>
+
+<script type="text/javascript">
+  $('#coral_talk_stream button').on('click', function() {
+    $.getScript('<TALK_ROOT_URL>/static/embed.js', function() {
+      Coral.Talk.render(document.getElementById('coral_talk_stream'), {
+        talk: '<TALK_ROOT_URL>',
+      });
+    });
+  });
+</script>
+```
+
+## Creating Assets in Talk (server side, i.e. What you need to send to Talk)
 One of the most frequent questions that we get asked by organizations trying to
 integrate Talk is: _How do we hook our CMS up to Talk so that articles are in
 sync?_
 
-This guide is designed to explain the steps to take your base installation of
-Talk and configure it to allow only assets pushed into it from your CMS, and
-keep your URL/title in sync. We won't cover here how to install the plugin, as
-it is covered in our [Plugins Overview](/talk/plugins/).
+### “Lazy Asset Creation”
+Talk’s provided embed script by default dynamically generates Assets in Talk based on each unique url that triggers it. The url must reference an existing Permitted Domain. If your articles/stories always have unique urls, then you will not need to modify the default behavior. 
 
-## Why do we need to create a plugin?
+Assets created in this way will then be scraped to load metadata, see [Asset Scraping](/talk/integrating/asset-scraping/)
 
-By default, Talk will use "Lazy Asset Creation" to dynamically generate Assets
-in Talk in order to make it easier for lighter installations. In order to have
-more strict control over this flow, we will create a plugin that will:
+## Customizing the Integration with a Plugin
+In order to have more strict control over the asset creation flow to allow only assets pushed into it from your CMS, and keep your URL/title in sync we will create a plugin. 
+
+We will create a plugin that will:
 
 1. Disable "Lazy Asset Creation" by [Overriding a Resolver](#overriding-a-resolver).
 2. Create Assets from our CMS by [Creating a New Asset Route](#creating-a-new-asset-route).
@@ -24,6 +83,9 @@ more strict control over this flow, we will create a plugin that will:
 
 We will then modify our embed so that we can [Target the Asset](#target-the-asset).
 
+
+This guide is designed to explain the steps to take your base installation of Talk and configure it. We won't cover here how to install the plugin, as it is covered in our [Plugins Overview](/talk/plugins/).
+
 But first we should grab our basic plugin structure:
 
 ```sh
@@ -248,7 +310,7 @@ module.exports = router => {
 };
 ```
 
-As you can see from the previous step of [Creating a New Asset Route](#creating-a-New-Asset-Route)
+As you can see from the previous step of [Creating a New Asset Route](#Creating%20a%20New%20Asset%20Route)
 , we have added the new `PUT` route to the router. This is a simple addition
 that allows your CMS to call into Talk when the asset has updated it's title,
 it's url (or really anything in the [AssetSchema](https://github.com/coralproject/talk/blob/master/models/asset.js)) to keep the Talk Admin and links up to date.

docs/source/plugins/overview.md

@@ -105,6 +105,8 @@ Then the application can be started as is.
 
 ### Docker
 
+To deploy customized plugins to a production instance of Talk, we recommend using the Docker onbuild strategy outlined below.
+
 If you deploy using Docker, you can extend from the `*-onbuild` image, an
 example `Dockerfile` for your project could be:
 
@@ -112,14 +114,22 @@ example `Dockerfile` for your project could be:
 FROM coralproject/talk:4.5-onbuild
 ```
 
-Where the directory for your instance would contain a `plugins.json` file
-describing the plugin requirements and a `plugins` directory containing any
+Establish a private repository for your instance that includes the following:
+
+* a `plugins.json` file
+listing the plugin requirements
+* a `plugins` directory containing any
 other local plugins that should be included.
+* a Dockerfile as outlined above
+
+Git submodules can also be used to point to plugin directories that might be outside your primary repository. 
 
 Onbuild triggers will execute when the image is building with your custom
 configuration and will ensure that the image is ready to use by building all
 assets inside the image as well.
 
+Once built, you can deploy the docker image to your architecture by tagging the image and including it in your docker-compose.yml. 
+
 For more information on the onbuild image, refer to the
 [Installation from Docker](/talk/installation-from-docker/) documentation.
 

graph/loaders/users.js

@@ -4,7 +4,11 @@ const { SEARCH_OTHER_USERS } = require('../../perms/constants');
 const { escapeRegExp } = require('../../services/regex');
 
 const mergeState = (query, state) => {
-  const { status } = state;
+  const { role, status } = state;
+
+  if (role) {
+    query.merge({ role });
+  }
 
   if (status) {
     const { username, banned, suspended } = status;

graph/typeDefs.graphql

@@ -189,6 +189,7 @@ type UserStatus {
 }
 
 input UserStateInput {
+  role: USER_ROLES
   status: UserStatusInput
 }
 

jobs/scraper/index.js

@@ -3,59 +3,7 @@ const scraper = require('../../services/scraper');
 const Assets = require('../../services/assets');
 const { createLogger } = require('../../services/logging');
 const logger = createLogger('jobs:scraper');
-const fetch = require('node-fetch');
 const { merge } = require('lodash');
-const { version } = require('../../package.json');
-const { SCRAPER_HEADERS, SCRAPER_PROXY_URL } = require('../../config');
-const ProxyAgent = require('proxy-agent');
-
-// Load the scraper with the rules.
-const metascraper = require('metascraper').load([
-  require('metascraper-title')(),
-  require('metascraper-description')(),
-  require('metascraper-image')(),
-  require('metascraper-author')(),
-  require('metascraper-date')(),
-  require('./rules/modified')(),
-  require('./rules/section')(),
-]);
-
-let customHeaders = {};
-try {
-  customHeaders = JSON.parse(SCRAPER_HEADERS);
-} catch (err) {
-  console.error('Cannot parse TALK_SCRAPER_HEADERS');
-  throw err;
-}
-
-// Parse the headers to be added to the scraper.
-const headers = merge(
-  {
-    'User-Agent': `Coral-Talk/${version}`,
-  },
-  customHeaders
-);
-
-// Add proxy configuration if exists.
-const agent = SCRAPER_PROXY_URL ? new ProxyAgent(SCRAPER_PROXY_URL) : null;
-
-/**
- * Scrapes the given asset for metadata.
- */
-async function scrape({ url }) {
-  const res = await fetch(url, {
-    headers,
-    agent,
-  });
-  const html = await res.text();
-
-  // Get the metadata from the scraped html.
-  const metadata = await metascraper({
-    html,
-    url,
-  });
-  return metadata;
-}
 
 /**
  * Updates an Asset based on scraped asset metadata.
@@ -64,16 +12,9 @@ function update(id, meta) {
   return Asset.update(
     { id },
     {
-      $set: {
-        title: meta.title || '',
-        description: meta.description || '',
-        image: meta.image ? meta.image : '',
-        author: meta.author || '',
-        publication_date: meta.date || '',
-        modified_date: meta.modified || '',
-        section: meta.section || '',
+      $set: merge(meta, {
         scraped: new Date(),
-      },
+      }),
     }
   );
 }
@@ -95,7 +36,7 @@ module.exports = () => {
       }
 
       // Scrape the metadata from the asset.
-      const meta = await scrape(asset);
+      const meta = await scraper.scrape(asset.url);
 
       log.info('Finished scraping');
 

locales/ar.yml

@@ -130,8 +130,8 @@ ar:
     enable_questionbox: 'اطرح سؤال على القراء'
     enable_questionbox_description: 'هذا السؤال سيظهر في الجزء العلوي من جدول التعليقات هذا. اسأل القراء عن مسألة معينة في المقال او اطرح أسئلة نقاشية.. الخ.'
     hours: ساعات
-    include_comment_stream: 'ادراج وصف جدول التعليقات للقراء'
-    include_comment_stream_desc: 'اكتب رسالة ليتم إضافتها إلى الجزء العلوي من جدول التعليقات. ضع موضوعا، اشمل القواعد الإرشادية للمجموعة .. الخ'
+    code_of_conduct_summary: 'ادراج وصف جدول التعليقات للقراء'
+    code_of_conduct_summary_desc: 'اكتب رسالة ليتم إضافتها إلى الجزء العلوي من جدول التعليقات. ضع موضوعا، اشمل القواعد الإرشادية للمجموعة .. الخ'
     include_question_here: 'اكتب سؤالك هنا:'
     include_text: 'ادرج النص هنا.'
     moderate: اشرف

locales/da.yml

@@ -123,8 +123,8 @@ da:
     enable_questionbox: 'Stil et spørgsmål til læserne'
     enable_questionbox_description: 'Dette spørgsmål vises øverst i denne kommentarstrøm. Stil et spørgsmål til læserne om et bestemt problem i artiklen eller stil spørgsmål til diskussion mv.'
     hours: Timer
-    include_comment_stream: 'Inkluder kommentarstrømmens beskrivelse for læsere'
-    include_comment_stream_desc: 'Skriv en besked, der skal tilføjes øverst i din kommentarstrøm. Indsæt et emne der omfatter fællesskabsretningslinjer mv.'
+    code_of_conduct_summary: 'Inkluder kommentarstrømmens beskrivelse for læsere'
+    code_of_conduct_summary_desc: 'Skriv en besked, der skal tilføjes øverst i din kommentarstrøm. Indsæt et emne der omfatter fællesskabsretningslinjer mv.'
     include_question_here: 'Stil dit spørgsmål her:'
     include_text: 'Medtag din tekst her.'
     moderate: Moderat

locales/de.yml

@@ -132,10 +132,11 @@ de:
     enable_questionbox: 'Stellen Sie den Lesern eine Frage'
     enable_questionbox_description: 'Diese Frage erscheint am Anfang des Kommentarbereichs. Regen Sie eine Diskussion an.'
     hours: Stunden
-    include_comment_stream: 'Einleitung zum Kommentarbereich'
-    include_comment_stream_desc: 'Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien.'
+    code_of_conduct_summary: 'Einleitung zum Kommentarbereich'
+    code_of_conduct_summary_desc: 'Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien.'
     include_question_here: 'Stellen Sie Ihre Frage hier:'
     include_text: 'Fügen Sie Ihren Text hier ein.'
+    include_an_icon: 'Fügen Sie ein Icon hinzu'
     moderate: Moderieren
     moderation_settings: Moderations-Einstellungen
     open: Öffnen

locales/en.yml

@@ -48,6 +48,7 @@ en:
   comment_post_notif_premod: 'Thank you for posting. Our moderation team will review your comment shortly.'
   comment_singular: Comment
   common:
+    contains_link: 'Contains Link'
     copy: Copy
     copied: 'Copied'
     notsupported: 'Not supported'
@@ -62,6 +63,7 @@ en:
     active: Active
     admin: Administrator
     ads_marketing: 'This looks like an ad/marketing'
+    all: 'All'
     are_you_sure: 'Are you sure you would like to ban {0}?'
     ban_user: 'Ban User?'
     banned: Banned
@@ -69,6 +71,8 @@ en:
     cancel: Cancel
     commenter: Commenter
     dont_like_username: 'Dislike username'
+    filter_users: 'Filter users'
+    filter_role: Role
     flaggedaccounts: 'Reported Usernames'
     flags: Flags
     impersonating: Impersonation
@@ -85,6 +89,7 @@ en:
     spam_ads: Spam/Ads
     staff: Staff
     status: Status
+    suspended: Suspended
     username_and_email: 'Username and Email'
     yes_ban_user: 'Yes Ban User'
   configure:
@@ -132,8 +137,9 @@ en:
     enable_questionbox: 'Ask Readers a Question'
     enable_questionbox_description: 'This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc.'
     hours: Hours
-    include_comment_stream: 'Include Comment Stream Description for Readers'
-    include_comment_stream_desc: 'Write a message to be added to the top of your comment stream. Pose a topic include community guidelines etc.'
+    code_of_conduct_summary: 'Summary of your Code of Conduct'
+    code_of_conduct_summary_desc: 'This message will appear above every comments stream on your site. Click here to learn more about writing a good code.'
+    include_an_icon: 'Include an Icon'
     include_question_here: 'Write your question here:'
     include_text: 'Include your text here.'
     moderate: Moderate
@@ -254,7 +260,7 @@ en:
     organization_contact_email: 'Organization email is not valid.'
     organization_name: 'Organization name must only contain letters or numbers.'
     password: 'Password must be at least 8 characters'
-    PAGE_NOT_AVAILABLE_ROLE: 'This page is for team use only. Please contact an administrator if you want to join this team.' 
+    PAGE_NOT_AVAILABLE_ROLE: 'This page is for team use only. Please contact an administrator if you want to join this team.'
     PASSWORD_INCORRECT: 'Your current password was entered incorrectly'
     PASSWORD_LENGTH: 'Password is too short'
     PASSWORD_REQUIRED: 'Must input a password'
@@ -313,6 +319,7 @@ en:
     comments: comments
     configure_stream: Configure
     content_not_available: 'This content is not available'
+    edit: Edit
     edit_name:
       button: Submit
       error: 'Usernames can contain letters numbers and _ only'

locales/es.yml

@@ -4,19 +4,19 @@ es:
     view_options: 'Ver opciones'
   already_flagged_username: 'Usted ya reportó a este usuario.'
   bandialog:
-    are_you_sure: '¿Estás segura que quieres suspender a {0}?'
-    ban_user: '¿Quieres suspender el Usuario?'
+    are_you_sure: '¿Estás seguro que quieres suspender a {0}?'
+    ban_user: '¿Quieres suspender al Usuario?'
     banned_user: 'Usuario Suspendido'
     cancel: Cancelar
-    email_message_ban: "Estimado/a {0},\n\nUsted o alguien con acceso a su cuenta a violado los lineamientos de nuestra comunidad. Como consecuencia de esto, su cuenta fue bloqueada. No podrá realizar ni reportar más comentarios. Si usted piensa que esto ha sido un error, por favor contáctese con nosotros."
+    email_message_ban: "Estimado/a {0},\n\nUsted o alguien con acceso a su cuenta ha violado los lineamientos de nuestra comunidad. Como consecuencia de esto, su cuenta fue bloqueada. No podrá realizar ni reportar más comentarios. Si usted piensa que esto ha sido un error, por favor contáctese con nosotros."
     note: 'Nota: {0}'
     note_ban_user: 'Suspender a este usuario no le va a permitir (al usuario) borrar ni editar ni comentar.'
     note_reject_comment: 'Suspender a este usuario también va a colocar este comentario en la cola de Rechazados.'
-    notify_ban_description: 'Esto notificará al usuario por email que fueron suspendidos de la comunidad'
+    notify_ban_description: 'Esto notificará al usuario por correo electrónico que fueron suspendidos de la comunidad'
     notify_ban_headline: 'Notificar al usuario de la suspensión'
     send: Enviar
     write_a_message: 'Escribe un mensaje'
-    yes_ban_user: 'Si, Suspender al usuario'
+    yes_ban_user: 'Si, suspender al usuario'
   bio_offensive: 'Esta biografia es ofensiva'
   cancel: Cancelar
   characters_remaining: 'caracteres restantes'
@@ -30,21 +30,25 @@ es:
     view_context: 'Ver contexto'
   comment_box:
     cancel: Cancelar
-    characters_remaining: 'carácteres restantes'
+    characters_remaining: 'caracteres restantes'
     comment: 'Publicar un comentario'
-    comment_post_banned_word: 'Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación.'
+    comment_post_banned_word: 'Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contactate a nuestro equipo de moderación.'
     comment_post_notif: 'Tu comentario ha sido publicado.'
     comment_post_notif_premod: 'Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto.'
     name: Nombre
     post: Publicar
     reply: Responder
+  comment_history_blank:
+    info: 'Una historia de tus comentarios aparecerá aquí'
+    title: 'No has escrito ningún comentario'
   comment_offensive: 'Este comentario es ofensivo'
   comment_plural: Comentarios
-  comment_post_banned_word: 'Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación.'
+  comment_post_banned_word: 'Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contactate con nuestro equipo de moderación.'
   comment_post_notif: 'Tu comentario ha sido publicado.'
   comment_post_notif_premod: 'Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto.'
   comment_singular: Comentario
   common:
+    contains_link: 'Contiene enlace'
     copy: Copiar
     error: 'Ha ocurrido un error.'
     reaction: reacción
@@ -56,36 +60,40 @@ es:
     account_creation_date: 'Fecha de creación de la cuenta'
     active: Activa
     admin: Administrator
-    ads_marketing: 'Esto parece ser un ad/marketing'
-    are_you_sure: '¿Estás segura que quieres suspender a {0}?'
+    ads_marketing: 'Esto parece ser un publicidad/acción de comercialización'
+    all: 'Todos'
+    are_you_sure: '¿Estás seguro que quieres suspender a {0}?'
     ban_user: '¿Quieres suspender al Usuario?'
     banned: Suspendido
-    banned_user: 'Usuario Suspendido'
+    banned_user: 'Usuario suspendido'
     cancel: Cancelar
     commenter: Comentarista
     dont_like_username: 'No me gusta este nombre de usuario'
-    flaggedaccounts: 'Nombres de Usuario Reportados'
+    filter_users: 'Filtrarr usuarios'
+    filter_role: Rol
+    flaggedaccounts: 'Nombres de usuario reportados'
     flags: Reportes
     impersonating: Impersonando
     loading: 'Cargando resultados'
     moderator: Moderator
     newsroom_role: 'Rol en la redacción'
-    no_flagged_accounts: 'No hay ningún nombre de usario reportado en este momento.'
+    no_flagged_accounts: 'No hay ningún nombre de usuario reportado en este momento.'
     no_results: 'No se encontraron usuarios con ese nombre o correo.'
     offensive: Ofensivo
     other: Otro
     people: Gente
     role: 'Seleccionar rol...'
     select_status: 'Seleccionar estado...'
-    spam_ads: Spam/Publicidad
+    spam_ads: Correo basura/Publicidad
     staff: Personal
     status: Estado
+    suspended: Suspendido
     username_and_email: 'Usuario y Correo'
-    yes_ban_user: 'Si, Suspendan el usuario'
+    yes_ban_user: 'Sí, suspendan el usuario'
   configure:
-    access_message: 'Usted debe ser un administrador para acceder a esta página. Encuentre a otro admin y actualice los permisos de su cuenta!'
+    access_message: 'Usted debe ser un administrador para acceder a esta página. Encuentre a otro administrador y actualice los permisos de su cuenta!'
     apply: Aplicar
-    banned_word_text: 'Comentarios que contengan estas palabras o frases,  en mayusculas o minúsculas, serán automáticamente eliminados del hilo de comentario. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pueden pegar una lista de palabras separadas por coma.'
+    banned_word_text: 'Comentarios que contengan estas palabras o frases, en mayúsculas o minúsculas, serán automáticamente eliminados del hilo de comentarios. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pueden pegar una lista de palabras separadas por coma.'
     banned_words_title: 'Lista de palabras prohibidas'
     close: Cerrar
     close_after: 'Cerrar comentarios luego de'
@@ -93,14 +101,14 @@ es:
     close_stream_configuration: 'Este hilo de comentario está en este momento cerrado. Al abrirlo, nuevos comentarios serán publicados y mostrados.'
     closed_comments_desc: 'Escribe un mensaje que será mostrado cuando los comentarios estén cerrados y no se acepten más comentarios.'
     closed_comments_label: 'Escribe un mensaje...'
-    closed_stream_settings: 'Mensaje que se muestra cuando no se aceptan más comentarios en el articulo'
+    closed_stream_settings: 'Mensaje que se muestra cuando no se aceptan más comentarios en el artículo'
     comment_count_error: 'Por favor escribir un número válido'
     comment_count_header: 'Limitar el largo del comentario'
-    comment_count_text_post: carácteres
+    comment_count_text_post: caracteres
     comment_count_text_pre: 'Los comentarios serán limitados a'
     comment_settings: Configuración
     comment_stream: 'Hilo de Comentarios'
-    comment_stream_will_close: 'El hilo de comentarios se cerrara'
+    comment_stream_will_close: 'El hilo de comentarios se cerrará'
     community: Comunidad
     configure: Configurar
     copy_and_paste: 'Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus artículos'
@@ -117,16 +125,16 @@ es:
     embed_comment_stream: 'Colocar Hilo de Comentarios'
     enable_pre_moderation: 'Permitir pre-moderación'
     enable_pre_moderation_text: 'Los moderadores deben aprobar todo comentario antes que sea publicado.'
-    enable_premod: 'Activar Pre Moderación'
+    enable_premod: 'Activar Pre-Moderación'
     enable_premod_description: 'Los y las moderadoras deben aprobar cualquier comentario antes de su publicación'
-    enable_premod_links: 'Pre-Moderar Comentarios que contienen Enlaces'
+    enable_premod_links: 'Pre-Moderar comentarios que contienen Enlaces'
     enable_premod_links_description: 'Los y las moderadoras deben aprobar cualquier comentario que contengan enlaces antes de su publicación.'
     enable_premod_links_text: 'Los moderadores deben aprobar todo comentario que contenga un enlace antes de que sea publicado.'
     enable_questionbox: 'Hacer una pregunta a los y las lectoras.'
     enable_questionbox_description: 'Esta pregunta aparecerá en la parte de arriba del hilo de comentarios.'
     hours: Horas
-    include_comment_stream: 'Incluir Descripción de Hilo de Comentarios para Lectores'
-    include_comment_stream_desc: 'Escribir un mensaje para ser incluido al principio del hilo de comentarios. Un tema planteado podría ser la guía de comunidad, etc.'
+    code_of_conduct_summary: 'Incluir Descripción de Hilo de Comentarios para Lectores'
+    code_of_conduct_summary_desc: 'Escribir un mensaje para ser incluido al principio del hilo de comentarios. Un tema planteado podría ser la guía de comunidad, etc.'
     include_question_here: 'Escribir la pregunta aquí.'
     include_text: 'Agregar tu texto aquí.'
     moderate: Moderar
@@ -135,7 +143,7 @@ es:
     open_stream: 'Abrir Hilo de Comentarios'
     open_stream_configuration: 'Este hilo de comentarios está abierto. Al cerrarlo no se podrán publicar nuevos comentarios pero todos los comentarios anteriores aún serán mostrados.'
     organization_contact_email: 'Email de la Organización'
-    organization_info_copy: 'Nosotros usamos esta información en las notificaciones de email generadas por Talk. Esto conecta los mensajes de tu organización, y provee una forma para que los usuarios se comuniquen si tienen un inconveniente con su cuenta.'
+    organization_info_copy: 'Nosotros usamos esta información en las notificaciones de correo electrónico generadas por Talk. Esto conecta los mensajes de tu organización, y provee una forma para que los usuarios se comuniquen si tienen un inconveniente con su cuenta.'
     organization_info_copy_2: 'Recomendamos crear un email genérico (ej: community@yournewsroom.com) for this purpose. Esto significa que puede permanecer consistente con el tiempo y no expone un nombre que los usuarios puedan atacar si su cuenta fue bloqueada.'
     organization_information: 'Información de la Organización'
     organization_name: 'Nombre de la Organización'
@@ -285,6 +293,7 @@ es:
     comments: comentarios
     configure_stream: 'Configurar'
     content_not_available: 'Este contenido no se encuentra disponible'
+    edit: Editar
     edit_name:
       button: Enviar
       error: 'Nombres de usuarios pueden solamente incluir letras, números y _'
@@ -310,14 +319,14 @@ es:
       save: Guardar
     create:
       confirm_password: 'Confirmar Contraseña'
-      email: 'Dirección de correo'
-      organization_contact_email: 'Organización: Email de contacto'
+      email: 'Dirección de correo electrónico'
+      organization_contact_email: 'Organización: correo electrónico de contacto'
       password: Contraseña
       save: Guardar
       username: 'Nombre de Usuario'
     final:
       close: 'Cerrar este instalador'
-      description: '¡Gracias por instalar Talk! Enviamos un correo para verificar su dirección de correo. Mientras esta terminando de configurar su cuenta, ya puede comenzar a involucrarse con sus lectores.'
+      description: '¡Gracias por instalar Talk! Enviamos un correo para verificar su dirección de correo electrónico. Mientras esta terminando de configurar su cuenta, ya puede comenzar a involucrarse con sus lectores.'
       launch: 'Iniciar Talk'
     initial:
       description: 'Vamos a crear su comunidad Talk en unos pocos pasos.'
@@ -396,6 +405,7 @@ es:
   other: Otro
   password_reset:
     change_password: 'Cambio de contraseña'
+    change_password_help: 'Por favor, introduzca una nueva contraseña. ¡Hazlo seguro!'
     confirm_new_password: 'Confirme su nueva contraseña'
     mail_sent: 'Si tiene una cuenta registrada, un enlace para resetear su clave ha sido enviado a esa dirección de correo.'
     new_password: 'Nueva contraseña'

locales/fi_FI.yml

@@ -123,8 +123,8 @@ fi_FI:
     enable_questionbox: 'Kysy lukijoilta'
     enable_questionbox_description: 'Tämä kysymys tulee näkymään kommenttiosion ylälaidassa. Kysy artikkelin aiheesta tai ohjaa keskustelua kysymyksen avulla.'
     hours: Tuntia
-    include_comment_stream: 'Sisällytä kommentoinnin kuvaus lukijoille'
-    include_comment_stream_desc: 'Kirjoita kommenttiosion yläreunassa näkyvä viesti. Aseta keskustelun aihe, sisällytä sääntöjä tms.'
+    code_of_conduct_summary: 'Sisällytä kommentoinnin kuvaus lukijoille'
+    code_of_conduct_summary_desc: 'Kirjoita kommenttiosion yläreunassa näkyvä viesti. Aseta keskustelun aihe, sisällytä sääntöjä tms.'
     include_question_here: 'Kirjoita kysymyksesi tähän:'
     include_text: 'Lisää teksti tähän.'
     moderate: Moderoi

locales/fr.yml

@@ -127,8 +127,8 @@ fr:
     enable_questionbox: 'Posez une question aux lecteurs.'
     enable_questionbox_description: 'Cette question apparaîtra en haut de ce fil de commentaires. Demandez aux lecteurs de s''exprimer sur un sujet évoqué dans l''article ou posez les termes de la discussion, etc.'
     hours: Heures
-    include_comment_stream: 'Inclure la description du fil de commentaires pour les lecteurs'
-    include_comment_stream_desc: 'Écrivez un message à ajouter au haut de votre flux de commentaires. Publiez un sujet de discussion, avec des suggestion sur la tenue des débats, etc.'
+    code_of_conduct_summary: 'Inclure la description du fil de commentaires pour les lecteurs'
+    code_of_conduct_summary_desc: 'Écrivez un message à ajouter au haut de votre flux de commentaires. Publiez un sujet de discussion, avec des suggestion sur la tenue des débats, etc.'
     include_question_here: 'Écrivez votre question ici.'
     include_text: 'Entrez votre texte ici.'
     moderate: Modérer

locales/it.yml

@@ -0,0 +1,574 @@
+it:
+  admin_sidebar:
+    sort_comments: 'Ordina Commenti'
+    view_options: 'Visualizza Opzioni'
+  already_flagged_username: 'Hai già segnalato questo username.'
+  bandialog:
+    are_you_sure: 'Sei sicuro di voler bloccare {0}?'
+    ban_user: 'Blocca Utente'
+    banned_user: 'Utenti bloccati'
+    cancel: Annulla
+    email_message_ban: "Caro {0},\n\nQualcuno che ha accesso al tuo account ha violato le nostre linee guida per la community. Di conseguenza, il tuo account è stato bloccato. Non potrai più commentare, apprezzare o segnalare commenti. Se ritieni questo sia un errore, contatta i nostri moderatori."
+    note: 'Nota: {0}'
+    note_ban_user: 'Bloccare questo utente non gli permetterà di commentare, interagire, o segnalare commenti.'
+    note_reject_comment: 'Bloccare questo utente inserirà inoltre questo commento tra quelli rifiutati.'
+    notify_ban_description: 'Questo notificherà l''utente, tramite email, che è stato bloccato dalla comunità.'
+    notify_ban_headline: 'Notifica l''utente della interdizione'
+    send: Invia
+    write_a_message: 'Scrivi un messaggio'
+    yes_ban_user: 'Si, blocca utente'
+  bio_offensive: 'Questa descrizione è offensiva'
+  cancel: Annulla
+  characters_remaining: 'caratteri rimanenti'
+  comment:
+    anon: Anonimo
+    ban_user: 'Blocca Utente'
+    comment: 'Pubblica un commento'
+    edited: Modificato
+    flagged: segnalato
+    undo_reject: Annulla
+    view_context: 'Visualizza il contesto'
+  comment_box:
+    cancel: Annulla
+    characters_remaining: 'caratteri rimanenti'
+    comment: 'Pubblica un commento'
+    comment_post_banned_word: 'Il tuo commento contiene una o più parole non permesse, non sarà quindi pubblicato. Se ritieni questo sia un errore, contatta i nostri moderatori.'
+    comment_post_notif: 'Il tuo commento è stato pubblicato.'
+    comment_post_notif_premod: 'Grazie per il tuo contributo. Il nostro team di moderatori revisionerà presto il tuo commento.'
+    name: Nome
+    post: Invia
+    reply: Rispondi
+  comment_history_blank:
+    info: 'La cronologia dei tuoi commenti apparirà qui'
+    title: 'Non hai pubblicato nessun commento'
+  comment_offensive: 'Questo commento è offensivo'
+  comment_plural: Commenti
+  comment_post_banned_word: 'Il tuo commento contiene una o più parole non permesse, non sarà quindi pubblicato. Se ritieni questo sia un errore, contatta i nostri moderatori.'
+  comment_post_notif: 'Il tuo commento è stato pubblicato.'
+  comment_post_notif_premod: 'Grazie per il tuo contributo. Il nostro team di moderatori revisionerà presto il tuo commento.'
+  comment_singular: Commento
+  common:
+    copy: Copia
+    copied: 'Copiato'
+    notsupported: 'Non supportato'
+    error: 'Si è verificato un errore.'
+    reaction: reazione
+    reactions: reazioni
+    reply: 'rispondi' # noun, singular
+    replies: 'risposte'
+    story: 'Storia'
+  community:
+    account_creation_date: 'Data creazione account'
+    active: Attivo
+    admin: Amministratore
+    ads_marketing: 'Questo sembra essere un annuncio pubblicitario'
+    all: 'Tutti'
+    are_you_sure: 'Sei sicuro di voler bloccare {0}?'
+    ban_user: 'Blocca Utente?'
+    banned: Bloccato
+    banned_user: 'Utente bloccato'
+    cancel: Annulla
+    commenter: Utente
+    dont_like_username: 'Username non adatto'
+    filter_users: 'Filtra utenti'
+    filter_role: Ruolo
+    flaggedaccounts: 'Username segnalati'
+    flags: Segnalazioni
+    impersonating: 'Impersonare'
+    loading: 'Caricamento risultati'
+    moderator: Moderatore
+    newsroom_role: 'Ruolo della sala stampa'
+    no_flagged_accounts: 'Nessun utente segnalato per ora.'
+    no_results: 'Nessun utente con quell''username o indirizzo email trovato.'
+    offensive: Offensivo
+    other: Altro
+    people: Persone
+    role: 'Seleziona ruolo...'
+    select_status: 'Seleziona status...'
+    spam_ads: Spam/pubblicità
+    staff: Staff
+    status: Status
+    suspended: Sospeso
+    username_and_email: 'Username e Email'
+    yes_ban_user: 'Si, blocca utente'
+  configure:
+    access_message: 'Devi essere amministratore per accedere alle configurazioni. Perfavore contatta un amministratore e chiedi di promuoverti!'
+    apply: Applica
+    banned_word_text: 'Commenti che contengono queste parole o frasi, che siano in maiuscolo o minuscolo, saranno automaticamente rimossi. Inserisci una parola e premi Invio o Tab per aggiungerla. Oppure aggiungi una lista di parole separate da virgole.'
+    banned_words_title: 'Lista di parole vietate'
+    close: Chiudi
+    close_after: 'Chiudi commenti successivi'
+    close_stream: 'Chiudi il thread dei commenti'
+    close_stream_configuration: 'Questo thread dei commenti è attualmente chiuso. Aprirlo per visulizzare nuovi commenti'
+    closed_comments_desc: 'Scrivi un messaggio da visualizzare quando il tuo thread dei commenti viene chiuso senza accettarne nuovi.'
+    closed_comments_label: 'Scrivi un messaggio...'
+    closed_stream_settings: 'Thread dei messaggi chiusi'
+    comment_count_error: 'Inserisci un numero valido.'
+    comment_count_header: 'Limite lunghezza commento'
+    comment_count_text_post: caratteri
+    comment_count_text_pre: 'I commenti saranno limitati a'
+    comment_settings: Impostazioni
+    comment_stream: 'Thread dei commenti'
+    comment_stream_will_close: 'Il thread dei commenti sarà chiuso'
+    community: Comunità
+    configure: Configura
+    copy_and_paste: 'Copia e incolla il codice qui sotto nel tuo CMS per includere il box dei commenti nei tuoi articoli'
+    custom_css_url: 'URL per il CSS personalizzato'
+    custom_css_url_desc: 'URL del CSS che sostituirà lo stile predefinito del thread dei commenti. Può essere interno o esterno.'
+    days: Giorni
+    description: 'Modifica le impostazioni dei commenti in questa storia.'
+    disable_commenting_desc: 'Scrivi il messaggio che sarà visualizzato quando i commenti saranno disattivati.'
+    disable_commenting_title: 'Disattiva tutti i commenti del sito'
+    domain_list_text: 'Inserisci i domini che vuoi autorizzare per Talk. Per esempio i tuoi ambienti di sviluppo, test o produzione (ex. localhost:3000 staging.domain.com domain.com).'
+    domain_list_title: 'Domain permessi'
+    edit_comment_timeframe_heading: 'Periodo di tempo disponibile per modificare i commenti'
+    edit_comment_timeframe_text_post: 'secondi per modificare i commenti.'
+    edit_comment_timeframe_text_pre: 'Gli utenti avranno'
+    edit_info: 'Modifica informazioni'
+    embed_comment_stream: 'Integra il thread dei commenti'
+    enable_pre_moderation: 'Abilita pre-moderazione'
+    enable_pre_moderation_text: 'I moderatori dovranno approvare tutti i commenti prima che vengano pubblicati.'
+    enable_premod: 'Abilita pre-moderazione'
+    enable_premod_description: 'I moderatori dovranno approvare tutti i commenti prima che vengano pubblicati.'
+    enable_premod_links: 'Pre-Modera commenti contenenti link'
+    enable_premod_links_description: 'I moderatori devono approvare tutti i commenti contenenti link prima di essere pubblicati.'
+    enable_premod_links_text: 'I moderatori devono approvare tutti i commenti contenenti link prima di essere pubblicati.'
+    enable_questionbox: 'Domanda qualcosa ai lettori'
+    enable_questionbox_description: 'Questa domanda apparirà sopra al thread dei commenti. Chiedi ai lettori cosa ne pensano dell''articolo o poni domande per iniziare una conversazione etc.'
+    hours: Ore
+    include_comment_stream: 'Includi la descrizione del thread dei commenti'
+    include_comment_stream_desc: 'Scrivi un messaggio che sarà aggiunto sopra il thread dei commenti. Poni una domanda, includi le linee guida della comunità etc.'
+    include_question_here: 'Scrivi la tua domanda di seguito:'
+    include_text: 'Includi il testo qui.'
+    moderate: Modera
+    moderation_settings: 'Impostazioni di moderazione'
+    open: Apri
+    open_stream: 'Apri il thread'
+    open_stream_configuration: 'Questo thread dei commenti è attualmente aperto. Chiudendolo non saranno più accettati nuovi commenti, mentre tutti i commenti precedenti continueranno ad essere visibili.'
+    organization_contact_email: 'Indirizzo email dell''organizzazione'
+    organization_info_copy: 'Utilizziamo queste informazioni nelle email di notifica generate da Talk. Questo connette i messaggi alla tua organizzazione, permettendo agli utenti di contattarti se riscontrano problemi con il loro account.'
+    organization_info_copy_2: 'Raccomandiamo di creare un indirizzo email generico (eg. community@yournewsroom.com) per questo scopo. Così da poter rimanere consistente nel tempo, senza rivelare il proprio nome che gli utenti potrebbero prendere di mira nel caso il loro account venga bloccato.'
+    organization_information: 'Informazioni dell''organizzazione'
+    organization_name: 'Nome dell''organizzazione'
+    suspect_or_forbidden_words_placeholder: 'Parola o frase'
+    product_guide_link: 'Guida all''uso del prodotto'
+    report_bug_or_feedback: 'Segnala un bug o lascia un feedback'
+    require_email_verification: 'Richiede la verifica dell''email'
+    require_email_verification_text: 'I nuovi utenti devono verificare la loro email prima di poter commentare'
+    save: Salva
+    save_changes: 'Salva le modifiche'
+    save_changes_dialog:
+      cancel: Annulla
+      copy: 'Hai apportato una o più modifiche senza salvare. Vuoi salvare o scartare le modifiche?'
+      discard: Scarta
+      save_settings: 'Salva impostazioni'
+      unsaved_changes: 'Modifiche non salvate'
+    shortcuts: Scorciatoie
+    sign_out: Esci
+    stories: Storie
+    stream_settings: 'Impostazioni thread dei commenti'
+    suspect_word_text: 'Commenti che contengono queste parole o frasi, che siano in maiuscolo o minuscolo, saranno evidenziate nel thread dei commenti. Inserisci una parola e premi Invio o Tab per aggiungerla. Oppure aggiungi una lista di parole separate da virgole.'
+    suspect_word_title: 'Lista delle parole indiziate'
+    tech_settings: 'Impostazioni tecniche'
+    title: 'Configura il thread dei commenti'
+    view_last_version: 'Visualizza ultima versione'
+    weeks: Settimane
+    wordlist: 'Parole vietate'
+  confirm_email:
+    click_to_confirm: 'Premi qui sotto per confermare il tuo indirizzo email.'
+    confirm: Conferma
+    email_confirmation: 'Conferma Email'
+  continue: Continua
+  createdisplay:
+    check_the_form: 'Modulo non valido. Ricontrolla i campi'
+    continue: 'Continua con lo stesso username di Facebook'
+    error_create: 'Errore nel cambiamento dell''username'
+    fake_comment_body: 'Questo è un commento esempio. I lettori possono condividere i loro pensieri e opinioni con le redazioni nella sezione dei commenti.'
+    fake_comment_date: '1 minuto fa'
+    if_you_dont_change_your_name: 'Se non modifichi il tuo username in questo momento, il tuo nome Facebook comparirà accanto a tutti i tuoi commenti.'
+    required_field: 'Campo obbligatorio'
+    save: Salva
+    special_characters: 'Gli username possono contenere solo lettere numeri e _'
+    username: Username
+    write_your_username: 'Modifica il tuo username'
+    your_username: 'Il tuo username appare in tutti i commenti che pubblichi.'
+  done: Finito
+  edit_comment:
+    body_input_label: 'Modifica questo commento'
+    edit_window_expired: 'Non puoi più modificare questo commento. Il periodo di tempo disponibile per modificarlo è terminato. Perchè non ne pubblichi uno nuovo?'
+    edit_window_expired_close: Chiudi
+    edit_window_timer_prefix: 'Modifica periodo di tempo: '
+    minute: minuto
+    minutes_plural: minuti
+    save_button: 'Salva modifiche'
+    second: secondo
+    seconds_plural: secondi
+  email:
+    banned:
+      body: 'In conformità con le linee guida della comunità The Coral Project, il tuo account è stato bloccato. Non ti è più permesso commentare, segnalare o interagire con la nostra comunità.'
+      subject: 'Il tuo account è stato bloccato'
+    confirm:
+      confirm_email: 'Conferma Email'
+      has_been_requested: 'Una email di conferma è stata richiesta per i seguenti account:'
+      if_you_did_not: 'Se non sei stato tu a richiederla puoi tranquillamente ignorare questa email.'
+      subject: 'Email di conferma'
+      to_confirm: 'Per confermare l''account visita il seguente link:'
+    password_change:
+      body: "La password del tuo account è stata modificata.\n\nSe non sei stato tu a richiedere questa modifica, contattaci a {0}."
+      subject: '{0} password modificata'
+    password_reset:
+      if_you_did: 'Se sei stato tu,'
+      please_click: 'premi qui per reimpostare la password'
+      subject: 'Reimposta Password'
+      we_received_a_request: 'Abbiamo ricevuto una richiesta di reimpostare la password. Se non sei stato tu a richiedere la modifica puoi ignorare questa email.'
+    suspended:
+      subject: 'Il tuo account è stato sospeso'
+  embed_comments_tab: Commenti
+  embedlink:
+    copy: 'Copiato negli appunti'
+    copied: 'Copiato'
+  error:
+    ALREADY_EXISTS: 'Risorsa già esistente'
+    AUTHENTICATION: 'Si è verificato un errore durante il tentativo di autenticazione del tuo account.'
+    CANNOT_IGNORE_STAFF: 'Non puoi ignorare membri dello stuff.'
+    COMMENT_PARENT_NOT_VISIBLE: 'Il commento al quale stai rispondendo è stato rimosso o non esiste.'
+    COMMENT_TOO_SHORT: 'I commenti devono avere più di un carattere, ricontrolla il tuo commento e riprova.'
+    COMMENT_TOO_LONG: 'Il testo eccede il limite permesso.'
+    COMMENTING_CLOSED: 'I commenti sono stati chiusi.'
+    COMMENTING_DISABLED: 'Attualmente non è possibile commentare in questo sito.'
+    confirm_password: 'Le password non coincidono. Perfavore riprova.'
+    DELETION_NOT_SCHEDULED: 'L''eliminazione non è stata pianificata.'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Non hai l''autorizzazione per modificare il tuo username.'
+    EDIT_WINDOW_ENDED: 'Non puoi più modificare questo commento. Il periodo di tempo disponibile per farlo è terminato.'
+    email: 'Inserisci un indirizzo email valido.'
+    EMAIL_ALREADY_VERIFIED: 'Indirizzo email già verificato.'
+    EMAIL_IN_USE: 'Indirizzo email già in uso.'
+    email_not_verified: 'L''indirizzo email {0} non è verificato.'
+    EMAIL_NOT_VERIFIED: 'Indirizzo email non verificato.'
+    email_password: 'Email e/o password errate/a.'
+    EMAIL_REQUIRED: 'È richiesto un indirizzo email'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'Il token di verifica dell''e-mail non è valido.'
+    INCORRECT_PASSWORD: 'Password errata'
+    INVALID_ASSET_URL: 'URL non valido'
+    LOGIN_MAXIMUM_EXCEEDED: 'Hai effettuato troppi tentativi falliti. Si prega di attendere.'
+    network_error: 'Errore durante la connessione con il server. Controlla la tua connessione internet e riprova.'
+    NO_SPECIAL_CHARACTERS: 'L''username può contenere solo lettere numeri o _'
+    NOT_AUTHORIZED: 'Non sei autorizzato a compiere questa azione.'
+    NOT_FOUND: 'Risorsa non trovata'
+    organization_contact_email: 'L''email dell''organizzazione è invalida.'
+    organization_name: 'Il nome dell''organizzazione può contenere solo lettere o numeri.'
+    password: 'La password deve avere almeno 8 caratteri'
+    PAGE_NOT_AVAILABLE_ROLE: 'Questa pagina può essere utilizzata solo dal team. Contatta l''amministratore se vuoi entrare a far parte di questo team.'
+    PASSWORD_INCORRECT: 'La password inserita non è corretta'
+    PASSWORD_LENGTH: 'La password è troppo corta'
+    PASSWORD_REQUIRED: 'Inserire una password'
+    PASSWORD_RESET_TOKEN_INVALID: 'Il link per reimpostare la tua password non è valido.'
+    PROFANITY_ERROR: 'Gli username non devono contenere volgarità. Contatta l''amministratore se ritieni ci sia stato un errore.'
+    RATE_LIMIT_EXCEEDED: 'Limite di tentativi superato'
+    required_field: 'Questo campo è obbligatorio'
+    SAME_USERNAME_PROVIDED: 'Devi inserire un username diverso.'
+    temporarily_suspended: 'Il tuo account è attualmente sospeso. Sarà riattivato {0}. Contattaci se hai qualche domanda.'
+    unexpected: 'Si è verificato un errore imprevisto. Ci scusiamo!'
+    username: 'L''username può contenere solo lettere numeri o _'
+    USERNAME_IN_USE: 'Username già in uso'
+    USERNAME_REQUIRED: 'Inserire un username'
+  flag_comment: 'Segnala commento'
+  flag_reason: 'Motivi segnalazione (Opzionale)'
+  flag_reasons:
+    username:
+      impersonating: 'Questo utente sta impersonando'
+      nolike: 'Non mi piace il suo username'
+      offensive: 'Username offensivo'
+      other: Altro
+      spam: 'Sembra si tratti di pubblicità/marketing'
+  flag_username: 'Segnala username'
+  flagged_usernames:
+    notify_approved: '{0} username approvato {1}'
+    notify_changed: 'utente {0} ha cambiato il suo username in {1}'
+    notify_flagged: '{0} ha segnalato l''username {1}'
+    notify_rejected: '{0} ha rifiutato l''username {1}'
+  flags:
+    reasons:
+      comment:
+        banned_word: 'Parola vietata'
+        comment_noagree: Disaccordo
+        comment_offensive: Offensivo
+        comment_other: Altro
+        comment_spam: Spam
+        links: Link
+        suspect_word: 'Parola sospetta'
+        trust: Karma
+      user:
+        username_impersonating: Impersonificazione
+        username_nolike: 'Non mi piace'
+        username_offensive: Offensivo
+        username_other: Altro
+        username_spam: Spam
+  framework:
+    banned_account_body: 'Significa che non potrai votare, segnalare o scrivere commenti.'
+    banned_account_header: 'Il tuo account è attualmente bloccato.'
+    changed_name:
+      msg: 'Il tuo nuovo username è sotto esame da parte del nostro team di moderatori.'
+    comment: commento
+    comment_is_deleted: 'Questo utente ha eliminato il suo account.'
+    comment_is_hidden: 'Questo commento non è disponibile.'
+    comment_is_ignored: 'Questo commento è nascosto perchè hai ignorato questo utente.'
+    comment_is_rejected: 'Hai rifiutato questo commento.'
+    comments: commenti
+    configure_stream: Configura
+    content_not_available: 'Questo contenuto non è disponibile'
+    edit_name:
+      button: Invia
+      error: 'L''username può contenere solo lettere numeri o _'
+      label: 'Nuovo username'
+      msg: 'Il tuo account è attualmente sospeso perchè il tuo username è considerato inappropriato. Per ripristinare il tuo account inserisci un nuovo username. Contattaci se hai qualche domanda.'
+    my_comments: 'I miei commenti'
+    my_profile: 'Il mio profilo'
+    new_count: 'Visualizza {0} e {1}'
+    profile: Profilo
+    show_all_comments: 'Visualizza tutti i commenti'
+    show_all_replies: 'Visualizza tutte le risposte'
+    show_more_replies: 'Visualizza più risposte'
+    success_bio_update: 'La tua descrizione è stata aggiornata'
+    success_name_update: 'Il tuo username è stato aggiornato'
+    success_update_settings: 'Le modifiche apportate sono state applicate al thread dei commenti in questo articolo'
+    view_more_comments: 'visualizza più commenti'
+    view_reply: 'visualizza risposta'
+  from_settings_page: 'Dalla pagina del profilo puoi vedere la tua cronologia dei commenti.'
+  install:
+    add_organization:
+      description: 'Inserisci il nome della tua organizzazione. Questa apparirà nelle email di invito ai nuovi membri.'
+      label: 'Nome dell''organizzazione'
+      save: Salva
+    create:
+      confirm_password: 'Conferma password'
+      email: 'Indirizzo email'
+      organization_contact_email: 'Indirizzo email dell''organizzazione'
+      password: Password
+      save: Salva
+      username: Username
+    final:
+      close: 'Chiudi l''installer'
+      description: 'Grazie per aver installato Talk! Ti abbiamo inviato una email per verificare il tuo indirizzo email. Mentre termini la configurazione del tuo account, puoi iniziare a interagire con i tuoi lettori.'
+      launch: 'Avvia Talk'
+    initial:
+      description: 'Configura la tua comunità Talk in pochi passi.'
+      submit: Inizia
+    permitted_domains:
+      description: 'Inserisci i domini che vuoi autorizzare per Talk. Per esempio i tuoi ambienti di sviluppo, test o produzione (ex. localhost:3000 staging.domain.com domain.com).'
+      submit: 'Termina installazione'
+      title: 'Domini autorizzati'
+  like: 'Mi piace'
+  loading_results: 'Caricamento risultati'
+  login:
+    email_address: 'Indirizzo email'
+    forgot_password: 'Hai dimenticato la tua password?'
+    go_back: Indietro
+    sign_in: Accedi
+    sign_in_button: Accedi
+    sign_in_message: 'Accedi per interagire con la comunità.'
+    password: Password
+    reset_password_send_button: 'Reimposta Password'
+    request_passowrd: 'Richiedi una nuova password.'
+    team_sign_in: 'Accesso Team'
+  marketing: 'Sembra si tratti di pubblicità/marketing'
+  moderate_all_streams: 'Modera i commenti in Tutte le storie'
+  moderate_this_stream: 'Modera questo thread dei commenti'
+  modqueue:
+    account: 'segnalazioni dell''account'
+    actions: Azioni
+    all: tutto
+    all_streams: 'Tutti i thread di commenti'
+    approve: Approva
+    approved: Approvato
+    ban_user: Bloccato
+    ban_user_actions: 'Blocca utente'
+    billion: M
+    close: Chiudi
+    empty_queue: 'Non ci sono più commenti da moderare.'
+    flagged: contrassegnato
+    jump_to_queue: 'Vai a una determinata coda'
+    less_detail: 'Meno dettagli'
+    likes: 'mi piace'
+    million: m
+    mod_faster: 'Modera più velocemente con le scorciatoie da tastiera'
+    moderate: 'Modera →'
+    more_detail: 'Più dettagli'
+    navigation: Navigazione
+    new: Nuovo
+    newest_first: 'Nuovo primo'
+    next_comment: 'Vai al prossimo commento'
+    next_queue: 'Cambia coda'
+    notify_accepted: '{0} ha accettato il commento "{1}"'
+    notify_edited: '{0} ha modificato il commento "{1}"'
+    notify_flagged: '{0} ha contrassegnato il commento "{1}"'
+    notify_rejected: '{0} ha rifiutato il commento "{1}"'
+    notify_reset: '{0} ha ripristinato lo stato del commento "{1}"'
+    oldest_first: 'Primo più vecchio'
+    premod: pre-moderazione
+    prev_comment: 'Vai al commento precedente'
+    reject: Rifiuta
+    rejected: Rifiutato
+    reply: Rispondi
+    reported: Segnalato
+    select_stream: 'Seleziona thread dei commenti'
+    shift_key: ⇧
+    shortcuts: Scorciatoie
+    show_shortcuts: 'Visualizza scorciatoie'
+    singleview: 'Modalità zen'
+    sort: Ordina
+    suspend: 'Sospendi utente'
+    system_withheld: 'Sistema bloccato'
+    thismenu: 'Apri questo menu'
+    thousand: k
+    toggle_search: 'Apri ricerca'
+    try_these: 'Prova queste'
+    view_more_shortcuts: 'Visualizza più scorciatoie'
+  my_comment_history: 'La mia cronologia di commenti'
+  name: Nome
+  no_agree_comment: 'Non concordo con questo commento'
+  no_like_bio: 'Non apprezzo questa descrizione'
+  no_like_username: 'Non apprezzo questo username'
+  other: Altro
+  password_reset:
+    change_password: 'Cambia password'
+    change_password_help: 'Inserisci una nuova password per accedere'
+    confirm_new_password: 'Conferma la nuova password'
+    mail_sent: 'Se hai già un account ti è stata inviata una email con un link per reimpostare la password'
+    new_password: 'Nuova password'
+    new_password_help: 'La password deve avere almeno 8 caratteri'
+    set_new_password: 'Cambia la tua password'
+  permalink: Condividi
+  personal_info: 'Questo commento contiene dati personali'
+  post: Pubblica
+  profile: Profilo
+  profile_settings: Impostazioni
+  reject_username:
+    description_notify: 'La sospensione di questo utente disabiliterà temporaneamente il loro account.'
+    description_reject: 'Sei sicuro di volere bloccare temporaneamente questo utente perchè {0}? Accettando sospenderai temporaneamente questo utente finché non riscriveranno il loro {0}.'
+    email_message_reject: 'Un''altro membro della comunità ha recentemente segnalato il tuo username consigliando una revisione. A causa del suo contenuto, il tuo username è stato rifiutato. Significa che non potrai più commentare, apprezzare o segnalare contenuti fino a quando non modificherai il tuo username. Inviaci una email per qualsiasi domanda o dubbio.'
+    no_cancel: 'Non annullare'
+    send: Invia
+    suspend_user: 'Sospendi utente'
+    title_notify: 'Avvisa l''utente della sua temporanea sospensione'
+    title_reject: 'Abbiamo notato che hai rifiutato un nome utente'
+    username: username
+    write_message: 'Scrivi un messaggio'
+    yes_suspend: 'Si, sospendi'
+  reject_username_dialog:
+    cancel: Annulla
+    description: 'Aiutaci a capire'
+    message: 'Motivi per la segnalazione (Opzionale)'
+    reason: Ragione
+    reject_username: 'Rifiuta username'
+    title: 'Rifiuta username'
+  reply: Rispondi
+  report: Segnala
+  report_notif: 'Grazie per aver segnalato questo commento. Il nostro team di moderatori è stato avvisato e lo revisionerà presto.'
+  report_notif_remove: 'La tua segnalazione è stata rimossa.'
+  reported: Segnalato
+  settings:
+    from_settings_page: 'Dalla pagina del profilo puoi vedere la tua cronologia dei commenti.'
+    my_comment_history: 'La mia cronologia dei commenti'
+    profile: Profilo
+    profile_settings: 'Impostazioni profilo'
+    sign_in: Accedi
+    to_access: 'per accedere al profilo'
+    user_no_comment: 'Non hai ancora pubblicato un commento. Partecipa alla conversazione!'
+  step_1_header: 'Segnala un problema'
+  step_2_header: 'Aiutaci a capire'
+  step_3_header: 'Grazie per la tua partecipazione'
+  stream:
+    all_comments: 'Tutti i commenti'
+    comment_not_found: 'Questo commento è stato rimosso o non esiste.'
+    no_comments: 'Non ci sono ancora commenti. Perchè non ne pubblichi uno?'
+    no_comments_and_closed: 'Non c''era alcun commento in questo articolo.'
+    temporarily_suspended: 'In conformità con le linee guida della comunità {0}, il tuo account è stato temporaneamente sospeso. Torna a partecipare alla conversazione {1}.'
+  streams:
+    all: Tutti
+    article: Storia
+    closed: Chiuso
+    empty_result: 'Questa ricerca non ha ottenuto risultati. Prova ad amplicare la tua ricerca.'
+    filter_streams: 'Filtra i thread dei commenti'
+    most_recent_stories: 'Storie più recenti'
+    newest: Nuovi
+    no_results: 'Nessun risultato'
+    oldest: Vecchi
+    open: Apri
+    pubdate: 'Data di pubblicazione'
+    search: Cerca
+    search_results: 'Risultati della ricerca'
+    sort_by: 'Ordina per'
+    status: 'Status del thread dei commenti'
+    stream_status: 'Status del thread dei commenti'
+  suspenduser:
+    cancel: Annulla
+    day: '{0} giorno'
+    days: '{0} giorni'
+    description_notify: 'La sospensione di questo utente disabiliterà temporaneamente il loro account.'
+    description_suspend: 'Stai sospendendo {0}. Questo commento sarà inserito tra quelli rifiutati, e {0} non potrà apprezzare, segnalare, rispondere o pubblicare fino al termine del periodo di sospensione.'
+    email_message_suspend: "Caro {0},\n\nIn conformità con le linee guida della comunità, il tuo account è stato temporaneamente sospenso. Durante il periodo di sospension non potrai commentare, segnalare o interagire con la comunità. Puoi tornare a partecipare dal {2}."
+    hour: '{0} ora'
+    hours: '{0} ore'
+    notify_suspend_until: 'L''utente {0} è stato temporaneamente sospeso. Questa sospensione finirà automaticamente {1}.'
+    one_hour: '1 ora'
+    select_duration: 'Seleziona la durata della sospensione'
+    send: Invia
+    suspend_user: 'Sospendi utente'
+    title_notify: 'Avvisa l''utente della sua temporanea sospensione'
+    title_suspend: 'Sospendi utente'
+    write_message: 'Scrivi un messaggio'
+  thank_you: 'Apprezziamo il tuo feedback. Un moderatore revisionerà la tua segnalazione.'
+  user:
+    bio_flags: 'segnalazioni per questa descrizione'
+    user_bio: 'Descrizione utente'
+    username_flags: 'segnalazioni per questo utente'
+  user_detail:
+    all: Tutti
+    ban: 'Blocca utente'
+    banned: Bloccato
+    email: Email
+    id: ID
+    karma: Karma
+    karma_docs_link: 'https://docs.coralproject.net/talk/trust/#user-karma-score'
+    learn_more: 'Maggiori informazioni'
+    member_since: 'Membro dal'
+    reject_rate: 'Tasso di rifiuto'
+    reject_username: 'Username rifiutato'
+    rejected: Rifiutato
+    remove_ban: 'Ban rimosso'
+    remove_suspension: 'Sospensione rimossa'
+    suspend: 'Utente sospeso'
+    suspended: Sospeso
+    total_comments: 'Commenti totali'
+    unreliable: Inaffidabile
+    user_history: 'Cronologia utente'
+    user_karma_score: 'Punteggio Karma dell''utente'
+    username: Username
+    username_needs_approval: 'L''username necessita di approvazione'
+    username_rejected: 'Username rifiutato'
+  user_history:
+    action: Azione
+    ban_removed: 'Ban rimosso'
+    date: Data
+    suspended: 'Sospeso, {0}'
+    suspension_removed: 'Sospensione rimossa'
+    system: Sistema
+    taken_by: 'Preso da'
+    user_banned: 'Utente bloccato'
+    username_status: 'Username {0}'
+  user_impersonating: 'Questo utente sta impersonando'
+  user_no_comment: 'Non hai ancora pubblicato un commento. Partecipa alla discussione!'
+  username_offensive: 'Questo username è offensivo'
+  validators:
+    confirm_email: 'Le email non coincidono. Perfavore riprova.'
+    confirm_password: 'Le password non coincidono. Perfavore riprova.'
+    required: 'Questo campo è obbligatorio'
+    verify_email: 'Inserisci un email valida.'
+    verify_organization_name: 'Il nome dell''organizzazione può contenere solo lettere o numeri.'
+    verify_password: 'La password deve contenere almeno 8 caratteri'
+    verify_username: 'Gli username possono contenere solo lettere numeri e _'
+  view_conversation: 'Visualizza conversazione'
+  your_account_has_been_banned: 'Il tuo account è stato bloccato.'
+  your_account_has_been_suspended: 'Il tuo account è stato temporaneamente sospeso.'
+  your_username_has_been_rejected: 'Il tuo account è stato sospeso perchè il tuo username è ritenuto inappropriato. Per ripristinare il tuo account inserisci un nuovo username.'

locales/nl_NL.yml

@@ -38,6 +38,9 @@ nl_NL:
     name: Naam
     post: Plaats
     reply: Beantwoord
+  comment_history_blank:
+    info: 'Reacties die je hebt geplaatst zullen hier verschijnen'
+    title: 'Je hebt nog geen reacties geplaatst'
   comment_offensive: 'Deze reactie is aanstootgevend'
   comment_plural: Reacties
   comment_post_banned_word: 'Je reactie bevat een of meerdere termen die wij niet toestaan. Neem contact op wanneer je het er niet mee eens bent.'
@@ -45,7 +48,10 @@ nl_NL:
   comment_post_notif_premod: 'Dank voor je reactie! Deze wordt zo snel mogelijk gemodereerd.'
   comment_singular: Reactie
   common:
+    contains_link: 'Bevat link'
     copy: Kopieer
+    copied: Gekopieerd
+    notsupported: 'Niet ondersteund'
     error: 'Er is een fout opgetreden.'
     reaction: reactie
     reactions: reacties
@@ -80,9 +86,11 @@ nl_NL:
     spam_ads: Spam/Ads
     staff: Staff
     status: Status
+    suspended: Geschorst
     username_and_email: 'Gebruikersnaam en e-mailadres'
     yes_ban_user: 'Ja, verban gebruiker'
   configure:
+    access_message: 'Je moet een admin zijn om toegang te krijgen tot de configuratie instellingen. Vraag de dichtsbijzijnde Admin om toegang!'
     apply: Toepassen
     banned_word_text: 'Reacties die deze woorden of zinnen bevatten (niet hoofdlettergevoelig) worden automatisch uit de conversatie verwijderd. Voer een woord in, en druk op enter of Tab om toe te passen. Je kunt ook een kommagescheiden lijst plakken.'
     banned_words_title: 'Lijst met verbannen woorden'
@@ -107,6 +115,8 @@ nl_NL:
     custom_css_url_desc: 'URL van CSS stylesheet die de standaard Embed Conversatie stylesheet overschrijft. Kan intern of extern zijn.'
     days: Dagen
     description: 'Als admin kun je de instellingen aanpassen voor de conversatie bij dit verhaal:'
+    disable_commenting_desc: 'Schrijf een bericht dat wordt weergeven wanneer reageren is afgesloten.'
+    disable_commenting_title: 'Reacties afsluiten voor de gehele site'
     domain_list_text: 'Voer de domeinen in die je wil toestaan voor Talk, bijvoorbeeld je staging en productie-omgevingen (bijv. localhost:3000 staging.domeinnaam.com domeinnaam.com).'
     domain_list_title: 'Toegestane domeinnamen'
     edit_comment_timeframe_heading: 'Wijzig reactie tijdsduur'
@@ -123,8 +133,8 @@ nl_NL:
     enable_questionbox: 'Stel een vraag aan de lezers'
     enable_questionbox_description: 'Deze vraag zal bovenaan de conversatie verschijnen. Vraag lezers naar een probleem in het artikel, poneer discussie vragen, enzovoort.'
     hours: Uren
-    include_comment_stream: 'Neem conversatie beschrijving op voor lezers.'
-    include_comment_stream_desc: 'Schrijf een bericht voor boven je conversatie. Poneer een stelling, wijs op de community richtlijnen, etc.'
+    code_of_conduct_summary: 'Neem conversatie beschrijving op voor lezers.'
+    code_of_conduct_summary_desc: 'Schrijf een bericht voor boven je conversatie. Poneer een stelling, wijs op de community richtlijnen, etc.'
     include_question_here: 'Schrijf je vraag hier:'
     include_text: 'Schrijf hier je tekst.'
     moderate: Modereer
@@ -132,9 +142,23 @@ nl_NL:
     open: Open
     open_stream: 'Open Stream'
     open_stream_configuration: 'Deze converstatie is momenteel open. Door deze te sluiten kunnen geen nieuwe reacties meer worden geplaatst, maar de oude zullen nog steeds worden weergegeven.'
+    organization_contact_email: 'Organisatie Contact E-mailadres'
+    organization_info_copy: 'We gebruiken deze informatie in e-mail notificaties die door Talk worden verstuurd. Dit verbind de berichten met je organisatie en biedt gebruikers een manier om contact op te nemen mochten ze een probleem met hun account ondervinden.'
+    organization_info_copy_2: 'We raden aan om een algemeen e-mail account (bijvoorbeeld community@yournewsroom.com) te gebruiken voor dit doeleinde. Dit betekent dat dit adres onveranderd kan blijven en deze geen naam blootstelt die gebruikers kunnen gebruiken mocht hun account geblokkeerd worden.'
+    organization_information: 'Organisatie Informatie'
+    organization_name: 'Organisatie Naam'
+    suspect_or_forbidden_words_placeholder: 'Woord of uitdrukking'
+    product_guide_link: 'Product Handleiding'
+    report_bug_or_feedback: 'Rapporteer een bug of geef feedback'
     require_email_verification: 'Maak e-mail verificatie vereist'
     require_email_verification_text: 'Nieuwe gebruikers moeten hun e-mailadres verifiëren voordat ze door kunnen gaan.'
     save_changes: 'Wijzigingen opslaan'
+    save_changes_dialog:
+      cancel: Annuleren
+      copy: 'Je hebt een of meerdere wijzigingen gedaan zonder op te slaan. Wil je je wijzigingen opslaan of ongedaan maken?'
+      discard: 'Ongedaan maken'
+      save_settings: 'Instellingen Opslaan'
+      unsaved_changes: 'Niet-opgeslagen wijzigingen'
     shortcuts: Sneltoetsen
     sign_out: Uitloggen
     stories: Conversaties
@@ -142,7 +166,7 @@ nl_NL:
     suspect_word_text: 'Reacties die deze woorden of zinsdelen bevatten (niet hoofdlettergevoelig) zullen worden gemarkeerd in de conversatie. Type een woord en druk op enter of tab om toe te voegen. Je kunt optioneel een komma-gescheiden lijst plakken.'
     suspect_word_title: 'Lijst met verdachte woorden'
     tech_settings: 'Technische instellingen'
-    title: 'Conversatie cnfigureren'
+    title: 'Conversatie configureren'
     weeks: Weken
     wordlist: 'Zwarte woordenlijst'
   confirm_email:
@@ -183,6 +207,9 @@ nl_NL:
       if_you_did_not: 'Wanneer jij dit niet hebt aangevraagd, kun je deze e-mail negeren.'
       subject: 'Email bevestiging'
       to_confirm: 'Ga naar de volgende link om het account te bevestigen:'
+    password_change:
+      body: 'Het wachtwoord voor je account is gewijzigd.\n\nAls je deze wijziging niet hebt aangevraagd, neem dan contact met ons op: {0}'
+      subject: '{0} wachtwoord wijziging'
     password_reset:
       if_you_did: 'Wanneer je dit zelf was,'
       please_click: 'klik dan hier om je wachtwoord te veranderen'
@@ -192,44 +219,61 @@ nl_NL:
   embed_comments_tab: Reacties
   embedlink:
     copy: 'Kopieer naar klembord'
+    copied: Gekopieerd
   error:
     ALREADY_EXISTS: 'Bron bestaat al'
+    AUTHENTICATION: 'Er is een fout opgetreden tijdens het aanmelden van je account'
     CANNOT_IGNORE_STAFF: 'Kan geen Staff-leden negeren.'
     COMMENT_PARENT_NOT_VISIBLE: 'De reactie waarop je probeert te reageren bestaat niet of is inmiddels verwijderd.'
     COMMENT_TOO_SHORT: 'Reacties moeten meer dan één teken hebben. Herzie je reactie en probeer opnieuw.'
     COMMENT_TOO_LONG: 'Tekst is te lang'
     COMMENTING_CLOSED: 'Reageren is al afgesloten.'
+    COMMENTING_DISABLED: 'Reageren is momenteel uigeschakeld op deze site'
     confirm_password: 'Wachtwoorden komen niet overeen. Controleer opnieuw.'
+    DELETION_NOT_SCHEDULED: 'Verwijdering was niet ingepland'
     EDIT_USERNAME_NOT_AUTHORIZED: 'Je bent niet gemachtigd om je gebruikersnaam te wijzigen.'
     EDIT_WINDOW_ENDED: 'Dit commentaar kan niet langer worden gewijzigd. Het tijdsbestek is verstreken.'
     email: 'Geen geldig e-mailadres'
+    EMAIL_ALREADY_VERIFIED: 'E-mailadres is reeds geverifiëerd'
     EMAIL_IN_USE: 'E-mailadres al in gebruik'
     email_not_verified: 'E-mailadres {0} is niet geverifiëerd'
     EMAIL_NOT_VERIFIED: 'E-mailadres is niet geverifiëerd'
     email_password: 'E-mail en/of wachtwoord combinatie onjuist'
     EMAIL_REQUIRED: 'Een e-mailadres is vereist'
     EMAIL_VERIFICATION_TOKEN_INVALID: 'Ongeldig e-mail verificatie token'
+    INCORRECT_PASSWORD: 'Ongeldig wachtwoord'
     INVALID_ASSET_URL: 'Ongeldige URL'
     LOGIN_MAXIMUM_EXCEEDED: 'Je hebt te veel mislukte inlogpogingen gedaan. Even geduld aub.'
     network_error: 'Kon geen verbinding maken met server. Controleer je internetverbinding en probeer het opnieuw.'
     NO_SPECIAL_CHARACTERS: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
     NOT_AUTHORIZED: 'Je bent niet geauthoriseerd om dit te doen.'
     NOT_FOUND: 'Bron niet gevonden'
+    organization_contact_email: 'Organisatie e-mailadres is niet geldig.'
     organization_name: 'Organisatienaam kan alleen cijfers en letters bevatten.'
     password: 'Wachtwoord moet minimaal 8 karakters lang zijn'
+    PAGE_NOT_AVAILABLE_ROLE: 'Deze pagina is enkel voor toegankelijk voor teamleden. Neem contact op met een admin als je toegang tot dit team wilt.'
+    PASSWORD_INCORRECT: 'Je huidige wachtwoord is incorrect ingevuld'
     PASSWORD_LENGTH: 'Wachtwoord is te kort'
     PASSWORD_REQUIRED: 'Je moet een wachtwoord invoeren.'
     PASSWORD_RESET_TOKEN_INVALID: 'Je wachtwoord-herstel token is ongeldig.'
     PROFANITY_ERROR: 'Gebruikersnamen mogen niet aanstootgevend zijn. Neem contact op met de administrator wanneer je denkt dat dit niet klopt.'
     RATE_LIMIT_EXCEEDED: 'Gebruikslimiet overschreden'
+    required_field: 'Dit veld is verplicht'
     SAME_USERNAME_PROVIDED: 'Je moet een andere gebruikersnaam invoeren.'
-    temporarily_suspended: 'Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions.'
+    temporarily_suspended: 'Je account is momenteel geschorst. Deze zal worden gereactiveerd {0}. Neem s.v.p. contact met ons op voor vragen.'
     unexpected: 'Onverwachte fout opgetreden. Sorry!'
     username: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
     USERNAME_IN_USE: 'Gebruikersnaam al in gebruik'
     USERNAME_REQUIRED: 'Gebruikersnaam is vereist'
   flag_comment: 'Rapporteer reactie'
   flag_reason: 'Reden voor rapporteren (optioneel)'
+  flag_reasons:
+    username:
+      impersonating: 'Deze gebruiker doet zich voor als iemand anders'
+      nolike: 'Ik vind deze gebruikersnaam niet leuk'
+      offensive: 'Deze gebruikersnaam is aanstootgevend'
+      other: Andere
+      spam: 'Dit lijkt op een advertentie/marketing'
   flag_username: 'Rapporteer gebruikersnaam'
   flagged_usernames:
     notify_approved: '{0} heeft gebruikersnaam {1} goedgekeurd'
@@ -258,6 +302,7 @@ nl_NL:
     changed_name:
       msg: 'De verandering van je gebruikersnaam wordt door ons moderatieteam gecontroleerd.'
     comment: reactie
+    comment_is_deleted: 'De reageerder heeft zijn account verwijderd.'
     comment_is_hidden: 'Deze reactie is niet beschikbaar.'
     comment_is_ignored: 'Deze reactie is verborgen omdat je de gebruiker negeert.'
     comment_is_rejected: 'Je hebt deze reactie afgewezen.'
@@ -306,6 +351,17 @@ nl_NL:
       title: 'Toegestane domeinnamen'
   like: Like
   loading_results: 'Resultaten worden geladen'
+  login:
+    email_address: E-mailadres
+    forgot_password: 'Wachtwoord vergeten?'
+    go_back: 'Ga terug'
+    sign_in: Inloggen
+    sign_in_button: Inloggen
+    sign_in_message: 'Log in om te communiceren met je community'
+    password: Wachtwoord
+    reset_password_send_button: 'Wachtwoord ophalen'
+    request_passowrd: 'Vraag een nieuwe aan.'
+    team_sign_in: 'Team login'
   marketing: 'Dit lijkt op een advertentie/marketing'
   moderate_this_stream: 'Modereer deze conversatie'
   modqueue:
@@ -350,6 +406,8 @@ nl_NL:
     show_shortcuts: 'Toon sneltoetsen'
     singleview: Zen-modus
     sort: Sorteer
+    suspend: 'Schors gebruiker'
+    system_withheld: 'Achtergehouden door systeem'
     thismenu: 'Open dit menu'
     thousand: k
     toggle_search: 'Open zoekvenster'
@@ -363,6 +421,7 @@ nl_NL:
   other: Ander
   password_reset:
     change_password: 'Verander wachtwoord'
+    change_password_help: 'Voer een nieuw wachtwoord in om mee in te loggen. Gebruik een veilig wachtwoord!'
     confirm_new_password: 'Bevestig nieuw wachtwoord'
     new_password: 'Nieuw wachtwoord'
     new_password_help: 'Wachtwoord moet minimaal 8 karakters lang zijn.'
@@ -384,6 +443,13 @@ nl_NL:
     username: gebruikersnaam
     write_message: 'Schrijf een bericht'
     yes_suspend: 'Ja, schors'
+  reject_username_dialog:
+    cancel: Annuleren
+    description: 'Help ons dit te begrijpen'
+    message: 'Reden voor rapporteren (Optioneel)'
+    reason: Reden
+    reject_username: 'Gebruikersnaam afwijzen'
+    title: 'Gebruikersnaam afwijzen'
   reply: Beantwoord
   report: Rapporteer
   report_notif: 'Dank voor het rapporteren van deze reactie. Deze wordt zo snel mogelijk gemodereerd.'
@@ -443,30 +509,43 @@ nl_NL:
   user_detail:
     all: Alle
     ban: 'Gebruiker verbannen'
-    email: Email
+    email: E-mailadres
+    id: ID
+    karma: Karma
+    karma_docs_link: 'https://docs.coralproject.net/talk/trust/#user-karma-score'
+    learn_more: 'Meer informatie'
     member_since: 'Lid sinds'
     reject_rate: 'Beoordeling verwijderen'
+    reject_username: 'Gebruikersnaam afwijzen'
     rejected: Afgewezen
     remove_ban: 'Verbanning verwijderen'
     remove_suspension: 'Schorsing opheffen'
     suspend: 'Gebruiker schorsen'
+    suspended: Geschorst
     total_comments: 'Totaal aantal reacties'
+    unreliable: Onbetrouwbaar
     user_history: Accountgeschiedenis
+    user_karma_score: 'Gebruiker Karma Score'
+    username: Gebruikersnaam
+    username_needs_approval: 'Gebruikersnaam heeft goedkeuring nodig'
+    username_rejected: 'Gebruikersnaam afgewezen'
   user_history:
-    action: Action
-    ban_removed: 'Ban removed'
-    date: Date
-    suspended: 'Suspended, {0}'
-    suspension_removed: 'Suspension removed'
-    system: System
-    taken_by: 'Taken By'
-    user_banned: 'User banned'
-    username_status: 'Username {0}'
-  user_impersonating: 'Deze gebruiker imiteert'
+    action: Actie
+    ban_removed: 'Schorsing opgeheven'
+    date: Datum
+    suspended: 'Geschorst, {0}'
+    suspension_removed: 'Schorsing opgeheven'
+    system: Systeem
+    taken_by: 'Genomen door'
+    user_banned: 'Gebruiker geschorst'
+    username_status: 'Gebruikersnaam {0}'
+  user_impersonating: 'Deze gebruiker doet zich voor als iemand anders'
   user_no_comment: 'Je hebt nog niet eerder gereageerd. Laat je mening horen!'
   username_offensive: 'Dit is een aanstootgevende gebruikersnaam.'
   validators:
-    confirm_password: 'Wachtwoorden komen niet overeen. Controleer opnieuw.'
+    confirm_email: 'E-mailadressen komen niet overeen. Controleer opnieuw.'
+    confirm_password: Wachtwoorden komen niet overeen. Controleer opnieuw.
+    required: 'Dit veld is verplicht'
     verify_email: 'Geen geldig e-mailadres'
     verify_organization_name: 'Organisatienaam kan alleen cijfers en letters bevatten.'
     verify_password: 'Wachtwoord moet minimaal 8 karakters lang zijn'

locales/pt_BR.yml

@@ -130,8 +130,8 @@ pt_BR:
     enable_questionbox: 'Faça uma pergunta aos leitores'
     enable_questionbox_description: 'Esta pergunta aparecerá no topo da lista de comentários. Pergunte aos leitores sobre um determinado problema no artigo, abra o assunto para discussão, etc.'
     hours: Horas
-    include_comment_stream: 'Incluir descrição da lista comentários para leitores'
-    include_comment_stream_desc: 'Escreva uma mensagem para adicionar ao topo do seu hilo de comentários. Posicionar um tópico, incluem diretrizes comunitárias, etc.'
+    code_of_conduct_summary: 'Incluir descrição da lista comentários para leitores'
+    code_of_conduct_summary_desc: 'Escreva uma mensagem para adicionar ao topo do seu hilo de comentários. Posicionar um tópico, incluem diretrizes comunitárias, etc.'
     include_question_here: 'Escreva sua pergunta aqui:'
     include_text: 'Inclua seu texto aqui:'
     moderate: Moderar
@@ -209,7 +209,7 @@ pt_BR:
       to_confirm: 'Para confirmar a conta, visite este link: '
     password_change:
       body: "A sua senha foi alterada.\n\nSe você não solicitou essa alteracão, por favor nos contate em {0}"
-      subject: '{0} password change'  
+      subject: '{0} password change'
     password_reset:
       if_you_did: 'Se você solicitou isso, '
       please_click: 'clique aqui para redefinir sua senha.'
@@ -223,7 +223,7 @@ pt_BR:
     copied: 'Copiado'
   error:
     ALREADY_EXISTS: 'O recurso já existe'
-    AUTHENTICATION: ‘Ocorreu um erro durante a autenticação da sua conta’ 
+    AUTHENTICATION: ‘Ocorreu um erro durante a autenticação da sua conta’
     CANNOT_IGNORE_STAFF: 'Não é possível ignorar membros Staff.'
     COMMENT_PARENT_NOT_VISIBLE: 'O comentário que você está respondendo foi removido ou não existe.'
     COMMENT_TOO_SHORT: 'Seu comentário precisar ter mais de um caracter. Revise seu comentário e envie novamente'

locales/zh_CN.yml

@@ -114,8 +114,8 @@ zh_CN:
     enable_questionbox: 向读者提问
     enable_questionbox_description: 该问题将在评论流顶部出现。可以就文章中特定内容发问，也可以设置一个讨论问题，等等。
     hours: 小时
-    include_comment_stream: 开启评论流描述
-    include_comment_stream_desc: 填写将在评论流顶部出现的描述。可以写评论主题、社群指引方针，等等。
+    code_of_conduct_summary: 开启评论流描述
+    code_of_conduct_summary_desc: 填写将在评论流顶部出现的描述。可以写评论主题、社群指引方针，等等。
     include_question_here: 此处输入问题：
     include_text: 此处输入文本。
     moderate: 审查

locales/zh_TW.yml

@@ -113,8 +113,8 @@ zh_TW:
     enable_questionbox: 向讀者提問
     enable_questionbox_description: 該問題將會在評論流置頂。您可以詢問其他讀者有關文章中的具體時間或是提出討論等
     hours: 小時
-    include_comment_stream: 包含讀者的評論流描述
-    include_comment_stream_desc: 留言將在您的評論流中置頂。發布一個社區規則等
+    code_of_conduct_summary: 包含讀者的評論流描述
+    code_of_conduct_summary_desc: 留言將在您的評論流中置頂。發布一個社區規則等
     include_question_here: 請在此處輸入問題：
     include_text: 在此插入您的文本
     moderate: 審核

middleware/staticFiles.js

@@ -0,0 +1,44 @@
+const express = require('express');
+const path = require('path');
+const staticServer = require('express-static-gzip');
+const { merge } = require('lodash');
+const { EMBED_EXPIRY_TIME, STATIC_EXPIRY_TIME } = require('../config');
+
+// EMBED_CACHE_CONTROL_HEADER is the header sent when the file is embed.js.
+const EMBED_CACHE_CONTROL_HEADER = [
+  'public',
+  `max-age=${Math.floor(EMBED_EXPIRY_TIME / 1000)}`,
+  'immutable',
+].join(', ');
+
+// Define the options to be applied to all static files, the embed itself has a
+// separate override.
+const defaultOpts = {
+  maxAge: STATIC_EXPIRY_TIME,
+  immutable: true,
+  setHeaders: (res, path) => {
+    if (path.includes('/dist/embed.js')) {
+      // embed.js has a different max-age then the rest of the static files.
+      res.setHeader('Cache-Control', EMBED_CACHE_CONTROL_HEADER);
+    }
+  },
+};
+
+// Setup the configuration for the compression options on how to serve files.
+const compressionOpts = {
+  indexFromEmptyFile: false,
+  enableBrotli: true,
+  customCompressions: [{ encodingName: 'deflate', fileExtension: 'zz' }],
+};
+
+// Serve the directories under ../dist.
+const dist = path.resolve(path.join(__dirname, '../dist'));
+
+/**
+ * middleware in production will serve compressed files if available, otherwise
+ * it will use express's static middleware.
+ */
+module.exports =
+  process.env.NODE_ENV === 'production'
+    ? staticServer(dist, merge(compressionOpts, defaultOpts))
+    : express.static(dist, defaultOpts);

middleware/trace.js

@@ -1,11 +1,21 @@
+const { HTTP_X_REQUEST_ID } = require('../config');
 const uuid = require('uuid/v1');
 
 // Trace middleware attaches a request id to each incoming request.
-module.exports = (req, res, next) => {
-  req.id = uuid();
+module.exports = HTTP_X_REQUEST_ID
+  ? (req, res, next) => {
+      req.id = req.get(HTTP_X_REQUEST_ID) || uuid();
 
-  // Add the context ID to the request as an HTTP header.
-  res.set('X-Talk-Trace-ID', req.id);
+      // Add the context ID to the request as an HTTP header.
+      res.set('X-Talk-Trace-ID', req.id);
 
-  next();
-};
+      next();
+    }
+  : (req, res, next) => {
+      req.id = uuid();
+
+      // Add the context ID to the request as an HTTP header.
+      res.set('X-Talk-Trace-ID', req.id);
+
+      next();
+    };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "4.6.5",
+  "version": "4.7.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,
@@ -58,6 +58,7 @@
   "dependencies": {
     "@coralproject/gql-merge": "^0.1.0",
     "@coralproject/graphql-anywhere-optimized": "^0.1.0",
+    "@ungap/url-search-params": "^0.1.2",
     "apollo-client": "^1.9.1",
     "apollo-engine": "^0.8.1",
     "apollo-server-express": "^1.2.0",
@@ -105,7 +106,7 @@
     "eventemitter2": "^4.1.2",
     "exports-loader": "^0.6.4",
     "express": "4.16.0",
-    "express-static-gzip": "^0.3.1",
+    "express-static-gzip": "^1.1.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^0.11.2",
     "final-form": "^4.8.1",
@@ -130,6 +131,7 @@
     "imports-loader": "^0.7.1",
     "inquirer": "^3.2.2",
     "inquirer-autocomplete-prompt": "^0.12.1",
+    "intersection-observer": "^0.5.1",
     "ioredis": "3.1.4",
     "ip": "^1.1.5",
     "jest": "^23.0.0",
@@ -203,6 +205,7 @@
     "style-loader": "^0.16.0",
     "subscriptions-transport-ws": "^0.7.2",
     "supports-color": "^4",
+    "throng": "^4.0.0",
     "timeago.js": "^2.0.3",
     "timekeeper": "^1.0.0",
     "tlds": "^1.196.0",
@@ -210,7 +213,6 @@
     "url-join": "^2.0.2",
     "url-loader": "^0.6.0",
     "url-parse": "^1.4.3",
-    "url-search-params": "^0.9.0",
     "uuid": "^3.1.0",
     "webpack": "^3.10.0",
     "webpack-manifest-plugin": "^2.0.0-rc.2",

plugins/talk-plugin-auth/client/translations.yml

@@ -219,7 +219,7 @@ es:
       register: "Registrar"
       sign_up: "Registro"
       confirm_password: "Confirmar Contraseña"
-      username: "Nombre"
+      username: "Nombre de Usuario"
       already_have_an_account: "¿Ya tienes una cuenta?"
       recover_password: "Recuperar la contraseña"
       email_in_use: "Este correo se encuentra en uso"
@@ -297,49 +297,58 @@ fr:
       write_your_username: "Modifier votre nom d'utilisateur"
       your_username: "Votre nom d'utilisateur apparaît sur chaque commentaire que vous publiez."
 nl_NL:
-  sign_in:
-    email_verify_cta: "Controleer je e-mailadres."
-    request_new_verify_email: "Vraag nieuwe bevestigingsemail aan"
-    verify_email: "Bedankt voor het aanmaken van een account! We hebben een email verstuurd naar het adres dat je hebt opgegeven om je account te verifiëren."
-    verify_email2: "Je account moet worden geverifiëerd voordat je kunt deelnemen in de community."
-    not_you: "Ben je dit niet?"
-    logged_in_as: "Ingelogd als"
-    facebook_sign_in: "Inloggen met Facebook"
-    facebook_sign_up: "Registreren met Facebook"
-    logout: "Uitloggen"
-    sign_in: "Inloggen"
-    sign_in_to_join: "Log in om deel te nemen"
-    or: "Of"
-    email: "E-mailadres"
-    password: "Wachtwoord"
-    forgot_your_pass: "Wachtwoord vergeten?"
-    need_an_account: "Heb je een account nodig?"
-    register: "Registreren"
-    sign_up: "Aanmelden"
-    confirm_password: "Bevestig wachtwoord"
-    username: "Gebruikersnaam"
-    already_have_an_account: "Heb je al een account?"
-    recover_password: "Wachtwoord herstellen"
-    email_in_use: "E-mailadres is al in gebruik"
-    email_or_username_in_use: "E-mailadres of gebruikersnaam is al in gebruik"
-    required_field: "Dit is een vereist veld"
-    passwords_dont_match: "Wachtwoorden komen niet overeen"
-    special_characters: "Gebruikersnamen kunnen alleen letters, cijfers en _ bevatten"
-    sign_in_to_comment: "Aanmelden om te reageren"
-    check_the_form: "Het formulier bevat ongeldige invoer, controleer je invoer"
-  createdisplay:
-    check_the_form: "Het formulier bevat ongeldige invoer, controleer je invoer"
-    continue: "Doorgaan met dezelfde Facebook gebruikersnaam"
-    error_create: "Fout opgetreden bij het wijzigen van de gebruikersnaam"
-    fake_comment_body: "Dit is een voorbeeldreactie. Lezers kunnen hun gedachten en meningen met newsrooms delen in het reactie-gedeelte"
-    fake_comment_date: "1 minuut geleden"
-    if_you_dont_change_your_name: "Wanneer je je gebruikersnaam nu niet wijzigt, zal je Facebook naam bij al je reacties komen te staan."
-    required_field: "Vereist veld"
-    save: Opslaan
-    special_characters: "Gebruikersnamen kunnen alleen letters, cijfers en _ bevatten"
-    username: Gebruikersnaam
-    write_your_username: "Wijzig je gebruikersnaam"
-    your_username: "Je gebruikersnaam verschijnt bij al je reacties."
+  talk-plugin-auth:
+    login:
+      email_verify_cta: "Controleer je e-mailadres."
+      request_new_verify_email: "Vraag nieuwe bevestigingsemail aan"
+      verify_email: "Bedankt voor het aanmaken van een account! We hebben een email verstuurd naar het adres dat je hebt opgegeven om je account te verifiëren."
+      verify_email2: "Je account moet worden geverifiëerd voordat je kunt deelnemen in de community."
+      not_you: "Ben je dit niet?"
+      logged_in_as: "Ingelogd als"
+      logout: "Uitloggen"
+      sign_in: "Inloggen"
+      sign_in_to_join: "Log in om deel te nemen"
+      or: "Of"
+      email: "E-mailadres"
+      password: "Wachtwoord"
+      password_error: "Wachtwoord moet minstens 8 karakters bevatten."
+      forgot_your_pass: "Wachtwoord vergeten?"
+      need_an_account: "Heb je een account nodig?"
+      register: "Registreren"
+      sign_up: "Aanmelden"
+      confirm_password: "Bevestig wachtwoord"
+      username: "Gebruikersnaam"
+      already_have_an_account: "Heb je al een account?"
+      recover_password: "Wachtwoord herstellen"
+      email_in_use: "E-mailadres is al in gebruik"
+      email_or_username_in_use: "E-mailadres of gebruikersnaam is al in gebruik"
+      required_field: "Dit is een vereist veld"
+      passwords_dont_match: "Wachtwoorden komen niet overeen"
+      special_characters: "Gebruikersnamen kunnen alleen letters, cijfers en _ bevatten"
+      sign_in_to_comment: "Aanmelden om te reageren"
+      check_the_form: "Het formulier bevat ongeldige invoer, controleer je invoer"
+    set_username_dialog:
+      check_the_form: "Het formulier bevat ongeldige invoer, controleer je invoer"
+      continue: "Doorgaan met dezelfde Facebook gebruikersnaam"
+      error_create: "Fout opgetreden bij het wijzigen van de gebruikersnaam"
+      fake_comment_body: "Dit is een voorbeeldreactie. Lezers kunnen hun gedachten en meningen met newsrooms delen in het reactie-gedeelte"
+      fake_comment_date: "1 minuut geleden"
+      if_you_dont_change_your_name: "Wanneer je je gebruikersnaam nu niet wijzigt, zal je Facebook naam bij al je reacties komen te staan."
+      required_field: "Vereist veld"
+      save: Opslaan
+      special_characters: "Gebruikersnamen kunnen alleen letters, cijfers en _ bevatten"
+      username: Gebruikersnaam
+      write_your_username: "Wijzig je gebruikersnaam"
+      your_username: "Je gebruikersnaam verschijnt bij al je reacties."
+    change_password:
+      change_password: "Wachtwoord Wijzigen"
+      passwords_dont_match: "Wachtwoorden komen niet overeen"
+      required_field: "Dit veld is verplicht"
+      forgot_password: "Wachtwoord vergeten?"
+      save: "Opslaan"
+      cancel: "Annuleren"
+      edit: "Wijzigen"
+      changed_password_msg: "Je wachtwoord is succesvol gewijzigd"
 pt_BR:
   talk-plugin-auth:
     login:

plugins/talk-plugin-facebook-auth/client/translations.yml

@@ -2,6 +2,10 @@ ar:
   talk-plugin-facebook-auth:
     sign_in: "تسجيل الدخول عبر حساب الفيسبوك"
     sign_up: "اشترك عبر حساب الفيسبوك"
+de:
+  talk-plugin-facebook-auth:
+    sign_in: "Mit Facebook anmelden"
+    sign_up: "Mit Facebook registrieren"
 en:
   talk-plugin-facebook-auth:
     sign_in: "Sign in with Facebook"
@@ -14,6 +18,10 @@ fr:
   talk-plugin-facebook-auth:
     sign_in: "Connectez-vous avec Facebook"
     sign_up: "Inscrivez-vous avec Facebook"
+nl_NL:
+  talk-plugin-facebook-auth:
+    sign_in: "Inloggen met Facebook"
+    sign_up: "Registreren met Facebook"
 zh_CN:
   talk-plugin-facebook-auth:
     sign_in: "使用 Facebook 帐号"
@@ -22,7 +30,3 @@ zh_TW:
   talk-plugin-facebook-auth:
     sign_in: "使用 Facebook 帳號"
     sign_up: "使用 Facebook 帳號"
-de:
-  talk-plugin-facebook-auth:
-    sign_in: "Mit Facebook anmelden"
-    sign_up: "Mit Facebook registrieren"

plugins/talk-plugin-google-auth/client/translations.yml

@@ -14,6 +14,10 @@ fr:
   talk-plugin-google-auth:
     sign_in: "Connectez-vous avec Google"
     sign_up: "Inscrivez-vous avec Google"
+nl_NL:
+  talk-plugin-google-auth:
+    sign_in: "Inloggen met Google"
+    sign_up: "Registeren met Google"
 zh_CN:
   talk-plugin-google-auth:
     sign_in: "使用 Google 帐号"

plugins/talk-plugin-local-auth/client/components/Profile.js

@@ -178,10 +178,12 @@ class Profile extends React.Component {
         },
       },
       notify,
+      success: hasChangedUsername,
     } = this.props;
     const { editing, formData, showDialog } = this.state;
 
-    const usernameCanBeUpdated = canUsernameBeUpdated(status);
+    const usernameCanBeUpdated =
+      canUsernameBeUpdated(status) && !hasChangedUsername;
 
     return (
       <section
@@ -232,6 +234,7 @@ class Profile extends React.Component {
                   validationType="username"
                   disabled={!usernameCanBeUpdated}
                   columnDisplay
+                  errorMsg={this.state.errors.newUsername}
                 >
                   <div className={styles.bottomText}>
                     <span>
@@ -307,6 +310,7 @@ Profile.propTypes = {
   notify: PropTypes.func.isRequired,
   username: PropTypes.string,
   emailAddress: PropTypes.string,
+  success: PropTypes.bool.isRequired,
 };
 
 export default Profile;

plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js

@@ -1,4 +1,5 @@
 import React from 'react';
+
 import PropTypes from 'prop-types';
 import { compose, gql } from 'react-apollo';
 import { bindActionCreators } from 'redux';
@@ -23,6 +24,14 @@ class AddEmailAddressDialog extends React.Component {
 
   componentDidMount() {
     this.props.startAttach();
+    document.body.style.minHeight = `${
+      document.getElementById('talk-plugin-local-auth-email-dialog')
+        .clientHeight
+    }px`;
+  }
+
+  componentWillUnmount() {
+    document.body.style.removeProperty('min-height');
   }
 
   handleDone = () => {
@@ -63,7 +72,7 @@ class AddEmailAddressDialog extends React.Component {
     } = this.props;
 
     return (
-      <Dialog open={true}>
+      <Dialog open={true} id="talk-plugin-local-auth-email-dialog">
         {step === 0 && <AddEmailForm onSubmit={this.handleSubmit} />}
         {step === 1 &&
           !requireEmailConfirmation && (

plugins/talk-plugin-local-auth/translations.yml

@@ -302,25 +302,28 @@ de:
         path: "Mein Profil > Profil-Einstellungen"
         alert: "E-Mail-Adresse hinzugefügt!"
 es:
+  email:
+    email_change_original:
+      subject: Cambio de correo electrónico
+      body: Su dirección de correo electrónico ha cambiado de {0} a {1}. Si no solicitó este cambio, póngase en contacto con {2}.
+  error:
+    NO_LOCAL_PROFILE: No hay una dirección de correo electrónico asociada a esta cuenta.
+    LOCAL_PROFILE: Una dirección de correo electrónico ya está asociada a esta cuenta.
+    INCORRECT_PASSWORD: La contraseña dada fue incorrecta.
   talk-plugin-local-auth:
-    email:
-      email_change_original:
-        subject: Cambio de correo electrónico
-        body: Su dirección de correo electrónico ha cambiado de {0} a {1}. Si no solicitó este cambio, póngase en contacto con {2}.
-    error:
-      NO_LOCAL_PROFILE: No hay una dirección de correo electrónico asociada a esta cuenta.
-      LOCAL_PROFILE: Una dirección de correo electrónico ya está asociada a esta cuenta.
-      INCORRECT_PASSWORD: La contraseña dada fue incorrecta.
     change_password:
+      save: "Salvar"
+      cancel: "Cancelar"
+      edit: "Editar"
+      changed_password_msg: "Contraseña cambiada - Su contraseña ha sido cambiado"
+      forgot_password_sent: "Contraseña olvidada - Enviamos un email para recuperar la contraseña"
       change_password: "Cambiar Contraseña"
       passwords_dont_match: "Las contraseñas no coinciden"
       required_field: "Este campo es requerido"
       forgot_password: "Olvidaste tu contraseña?"
-      save: "Guardar"
-      cancel: "Cancelar"
-      edit: "Editar"
-      changed_password_msg: "Contraseña Actualizada - Tu contraseña ha sido exitosamente actualizada"
-      forgot_password_sent: "Contraseña Olvidada - Te enviamos un email para recuperar tu contraseña"
+      old_password: "Contraseña anterior"
+      new_password: "Contraseña nueva"
+      confirm_new_password: "Confirme contraseña nueva"
     change_username:
       change_username_note: "El usuario puede ser cambiado cada 14 días."
       is_not_eligible: "Ahora mismo no se puede cambiar su nombre de usuario."
@@ -329,11 +332,13 @@ es:
       cancel: "Cancelar"
       confirm_username_change: "Confirmar Cambio de Usuario"
       description: "Estás intentando cambiar tu usuario. Tu nuevo usuario aparecerá en todos tus pasados y futuros comentarios."
-      old_username: "Usuario viejo"
+      old_username: "Usuario anterior"
       new_username: "Usuario nuevo"
+      re_enter: "Escriba usuario nuevo otra vez"
       bottom_note: "Nota: No podrás cambiar tu usuario por 14 días"
       confirm_changes: "Confirmar Cambios"
       username_does_not_match: "El usuario no coincide"
+      cant_be_equal: "Tu nuev@ {0} tiene que ser diferente"
       changed_username_success_msg: "Usuario Actualizado - Tu usuario ha sido exitosamente actualizado. No podrás cambiar el usuario por 14 días."
       change_username_attempt: "El usuario no puede ser actualizado. Los usuarios pueden ser cambiados cada 14 días."
     change_email:
@@ -346,7 +351,7 @@ es:
       cancel: "Cancelar"
       change_email_msg: "Dirección de correo electrónico modificada. Esta dirección de correo electrónico ahora se utilizará para iniciar sesión y notificaciones por correo electrónico."
     add_email:
-      add_email_address: "Agregar dirección de correo electrónico"
+      add_email_address: "Confirmar"
       enter_email_address: "Introducir la dirección de correo electrónico:"
       invalid_email_address: "Dirección de correo electrónico no válida"
       confirm_email_address: "Confirmar el correo:"
@@ -371,3 +376,79 @@ es:
         description_2: "Puedes cambiar la configuración de tu cuenta visitando"
         path: "Mi perfil > Configuración"
         alert: "¡Correo electrónico agregado!"
+nl_NL:
+  email:
+    email_change_original:
+      subject: E-mailadres wijziging
+      body: "Je e-mailadres is gewijzigd van {0} naar {1}. Als je deze wijziging niet hebt aangevraagd, neem dan s.v.p. contact op: {2}."
+  error:
+    NO_LOCAL_PROFILE: Er is geen bestaand e-mailadres geassocieerd met dit account.
+    LOCAL_PROFILE: Er is reeds een e-mailadres geassocieerd met dit account.
+    INCORRECT_PASSWORD: Het opgegeven wachtwoord is onjuist.
+  talk-plugin-local-auth:
+    change_password:
+      change_password: "Wachtwoord wijzigen"
+      passwords_dont_match: "Wachtwoorden komen niet overeen"
+      required_field: "Dit veld is verplicht"
+      forgot_password: "Wachtwoord vergeten?"
+      old_password: "Oud Wachtwoord"
+      new_password: "Nieuw Wachtwoord"
+      confirm_new_password: "Bevestig Nieuw Wachtwoord"
+      save: "Opslaan"
+      cancel: "Annuleren"
+      edit: "Wijzigen"
+      changed_password_msg: "Wachtwoord Gewijzigd - Je wachtwoord is succesvol gewijzigd"
+      forgot_password_sent: "Wachtwoord Vergeten - We hebben je een e-mail gestuurd om je wachtwoord te herstellen"
+    change_username:
+      change_username_note: "Gebruikersnamen kunnen eens per 14 dagen worden gewijzigd."
+      is_not_eligible: "Je kunt je gebruikersnaam momenteel niet wijzigen."
+      save: "Opslaan"
+      edit_profile: "Profiel wijzigen"
+      cancel: "Annuleren"
+      confirm_username_change: "Bevestig Gebruikersnaam Wijziging"
+      description: "Je probeert je gebruikersnaam te wijzigen. Je nieuwe gebruikersnaam zal verschijnen bij al je huidige en toekomstige reacties."
+      old_username: "Oude Gebruikersnaam"
+      new_username: "Nieuwe Gebruikersnaam"
+      re_enter: "Voer je nieuwe gebruikersnaam opnieuw in"
+      bottom_note: "Let op: Je kan je gebruikersnaam niet opnieuw wijzigen in de komende 14 dagen."
+      confirm_changes: "Bevestig Wijzigingen"
+      username_does_not_match: "Gebruikersnaam komt niet overeen"
+      cant_be_equal: "Je nieuwe {0} moet verschillen van je huidige"
+      changed_username_success_msg: "Gebruikersnaam Gewijzigd - Je gebruikersnaam is succesvol gewijzigd. Je kan je gebruikersnaam niet wijzigen voor de komende 14 dagen."
+      change_username_attempt: "Gebruikersnaam kan niet worden gewijzigd. Gebruikersnamen kunnen eens per 14 dagen worden gewijzigd."
+    change_email:
+      confirm_email_change: "Bevestig E-mailadres Wijziging"
+      description: "Je probeert je e-mailadres te wijzigen. Je nieuwe e-mailadres zal worden gebruikt om in te loggen en voor het ontvangen van account notificaties."
+      old_email: "Oude E-mailadres"
+      new_email: "Nieuwe E-mailadres"
+      enter_password: "Wachtwoord Invoeren"
+      incorrect_password: "Ongeldig Wachtwoord"
+      confirm_change: "Bevestig Wijziging"
+      cancel: "Annuleren"
+      change_email_msg: "E-mailadres Gewijzigd. Dit E-mailadres zal nu worden gebruikt om in te loggen en voor het ontvangen van account notificaties."
+    add_email:
+      add_email_address: "E-mailadres Toevoegen"
+      enter_email_address: "E-mailadres Invoeren:"
+      invalid_email_address: "Ongeldig E-mailadres"
+      confirm_email_address: "Bevestig E-mailadres:"
+      email_does_not_match: "E-mailadres komt niet overeen"
+      insert_password: "Wachtwoord Invoeren:"
+      confirm_password: "Wachtwoord Bevestigen:"
+      required_field: "Dit veld is verplicht"
+      done: "Klaar"
+      content:
+        title: "Voeg een e-mailadres toe"
+        description: "Voor je veiligheid vragen we gebruikers om een e-mailadres toe te voegen aan hun account. Je e-mailadres zal worden gebruikt om:"
+        item_1: "Updates te ontvangen omtrent wijzigingen in je account (e-mailadres, gebruikersnaam, wachtwoord, etc.)"
+        item_2: "Je reacties te kunnen downloaden."
+        item_3: "Reactie notificaties te sturen indien je hebt gekozen deze te ontvangen."
+      verify:
+        title: "Bevestig Je E-mailadres"
+        description: "We hebben een e-mail gestuurd aan {0} om je account te bevestigen. Je moet je e-mailadres verifiëren zodat deze gebruikt kan worden voor bevestigingen omtrent account wijzigingen en voor notificaties."
+      added:
+        title: "E-mailadres Toegevoegd"
+        description: "Je e-mailadres is toegevoegd aan je account."
+        subtitle: "Wil je je e-mailadres wijzigen?"
+        description_2: "Je kan je account instellingen wijzigen door te gaan naar"
+        path: "Mijn Profiel > Instellingen"
+        alert: "E-mailadres Toegevoegd!"

plugins/talk-plugin-love/client/translations.yml

@@ -24,8 +24,8 @@ fr:
     loved: Loved
 nl_NL:
   talk-plugin-love:
-    love: Ik hou er van
-    loved: Geliefd
+    love: Love
+    loved: Loved
 pt_BR:
   talk-plugin-love:
     love: Love

plugins/talk-plugin-member-since/client/translations.yml

@@ -18,7 +18,7 @@ fr:
     member_since: "Member Since"
 nl_NL:
   talk-plugin-member-since:
-    member_since: "Gebruiker sinds"
+    member_since: "Lid sinds"
 pt_BR:
   talk-plugin-member-since:
     member_since: "Membro desde"

plugins/talk-plugin-notifications-category-reply/client/translations.yml

@@ -10,3 +10,6 @@ es:
 de:
   talk-plugin-notifications-category-reply:
     toggle_description: Jemand antwortet auf meinen Kommentar
+nl_NL:
+  talk-plugin-notifications-category-reply:
+    toggle_description: Iemand antwoord op mijn reactie

plugins/talk-plugin-notifications-category-staff/client/translations.yml

@@ -10,3 +10,6 @@ es:
 de:
   talk-plugin-notifications-category-staff:
     toggle_description: Ein Redaktionsmitglied antwortet auf meinen Kommentar
+nl_NL:
+  talk-plugin-notifications-category-staff:
+    toggle_description: Een redactielid antwoord op mijn reactie

plugins/talk-plugin-notifications-category-staff/translations.yml

@@ -23,3 +23,9 @@ de:
       staff:
         subject: "Jemand hat bei {0} auf Ihren Kommentar geantwortet"
         body: "{0}\n{1} arbeitet für {2} und hat auf Ihren Kommentar geantwortet: {3}"
+nl_NL:
+  talk-plugin-notifications:
+    categories:
+      staff:
+        subject: "Iemand bij {0} heeft geantwoord op je reactie"
+        body: "{0}\n{1} werkt voor {2} en heeft geantwoord op je reactie: {3}"

plugins/talk-plugin-notifications-digest-daily/client/translations.yml

@@ -14,3 +14,7 @@ de:
   talk-plugin-notifications:
     digest_enum:
       DAILY: Einmal täglich
+nl_NL:
+  talk-plugin-notifications:
+    digest_enum:
+      DAILY: In een dagelijkse samenvatting

plugins/talk-plugin-notifications-digest-hourly/client/translations.yml

@@ -14,3 +14,7 @@ de:
   talk-plugin-notifications:
     digest_enum:
       HOURLY: Stündlich
+nl_NL:
+  talk-plugin-notifications:
+    digest_enum:
+      HOURLY: In een uurlijkse samenvatting

plugins/talk-plugin-notifications/client/translations.yml

@@ -70,3 +70,21 @@ de:
     digest_option: Benachrichtigungen senden
     digest_enum:
       NONE: Sofort
+nl_NL:
+  talk-plugin-notifications:
+    settings_title: Notificaties
+    settings_subtitle: Ontvang notificaties wanneer
+    turn_off_all: Ik wil geen notificaties ontvangen
+    banner_info:
+      title: E-mail bevestiging vereist
+      text: Je moet een geverifieerd e-mailadres hebben om e-mail notificaties te ontvangen
+      verify_now: Verifieer je e-mailadres nu
+    banner_success:
+      title: E-mail verificatie verzonden
+      text: Een e-mail met verificatielink is verstuurd naar {0}.
+    banner_error:
+      title: Fout
+      text: Er is een fout opgetreden tijdens het versturen van je verificatie e-mail. Probeer het later nog eens.
+    digest_option: Notificaties versturen
+    digest_enum:
+      NONE: Onmiddelijk

plugins/talk-plugin-notifications/server/translations.yml

@@ -40,3 +40,17 @@ de:
       confirm: "Bestätigen"
       are_unsubscribed: "Sie haben haben alle Benachrichtigungen erfolgreich abbestellt."
       token_invalid: "Der Abbestell-Link ist ungültig. Klicken Sie den Link einer neueren E-Mail oder gehen Sie zu einem Kommentarbereich, melden Sie sich an und ändern Sie dort Ihre Benachrichtigungseinstellungen"
+nl_NL:
+  talk-plugin-notifications:
+    templates:
+      digest:
+        subject: "Je recente reactie-activiteit op {0}"
+      footer: "Je hebt deze notificatie ontvangen omdat je een reageerder bent op {0} en je hebt je aangemeld om notificaties te ontvangen."
+      links:
+        unsubscribe: "Afmelden voor reactie notificaties"
+    unsubscribe_page:
+      unsubscribe: "Afmelden voor reactie notificaties"
+      click_to_confirm: "Klik onderstaande om te bevestigen dat je je wilt afmelden voor alle notificaties"
+      confirm: "Bevestigen"
+      are_unsubscribed: "Je bent nu afgemeld voor alle notificaties."
+      token_invalid: "Afmeldlink is ongeldig, klik de link van een recentere e-mail of bezoek een pagina met reacties en log in om je notificatie voorkeuren te wijzigen"

plugins/talk-plugin-toxic-comments/README.md

@@ -10,9 +10,10 @@ plugin:
 ---
 
 Using the [Perspective API](http://perspectiveapi.com/), this
-plugin will warn users and reject comments that exceed the predefined toxicity
-threshold. For more information on what Toxic Comments are, check out the
-[Toxic Comments](/talk/toxic-comments/) documentation.
+plugin will warn users when comments exceed the predefined toxicity 
+threshold. Toxic comments will be flagged and are held back from being posted until reviewed by a moderator. 
+
+For more information on what Toxic Comments are, check out the [Toxic Comments](/talk/toxic-comments/) documentation, and you can see how the plugin works on [this blog post](https://coralproject.net/blog/toxic-avenging/).
 
 Configuration:
 
@@ -25,4 +26,5 @@ Configuration:
 - `TALK_PERSPECTIVE_TIMEOUT` - The timeout for sending a comment to
   be processed before it will skip the toxicity analysis, parsed by
   [ms](https://www.npmjs.com/package/ms). (Default `300ms`)
-- `TALK_PERSPECTIVE_DO_NOT_STORE` - Whether the API is permitted to store comment and context from this request. Stored comments will be used for future research and community model building purposes to improve the API over time. (Default `true`) [Perspective API - Analize Comment Request](https://github.com/conversationai/perspectiveapi/blob/master/api_reference.md#analyzecomment-request)
+- `TALK_PERSPECTIVE_DO_NOT_STORE` - Whether the API stores or deletes the comment text and context from this request after it has been evaluated. Stored comments will be used for future research and community model building purposes to improve the API over time. (Default `true`) [Perspective API - Analyze Comment Request](https://github.com/conversationai/perspectiveapi/blob/master/api_reference.md#analyzecomment-request)
+- `TALK_PERSPECTIVE_SEND_FEEDBACK` - If set to `TRUE`, this plugin will send back moderation actions as feedback to [Perspective](http://perspectiveapi.com/) to improve their model. (Default `FALSE`)

plugins/talk-plugin-toxic-comments/client/components/ToxicDetail.js

@@ -11,10 +11,10 @@ const getInfo = (toxicity, actions) => {
   let text = t('talk-plugin-toxic-comments.unlikely');
   if (toxicity > 0.8) {
     text = t('talk-plugin-toxic-comments.highly_likely');
-  } else if (toxicity >= 0.5) {
-    text = t('talk-plugin-toxic-comments.possibly');
   } else if (toxicity >= 0.7) {
     text = t('talk-plugin-toxic-comments.likely');
+  } else if (toxicity >= 0.5) {
+    text = t('talk-plugin-toxic-comments.possibly');
   }
 
   return (

plugins/talk-plugin-toxic-comments/package.json

@@ -1,13 +1,9 @@
 {
-  "name": "@coralproject/talk-plugin-toxicity",
-  "pluginName": "talk-plugin-toxicity",
+  "name": "@coralproject/talk-plugin-toxic-comments",
+  "pluginName": "talk-plugin-toxic-comments",
   "version": "0.0.1",
   "description": "Provides support for measuring the toxicity of user comments using the Perspectives API",
   "main": "index.js",
-  "author": "The Coral Project Team <coral@mozillafoundation.org>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "debug": "^4.0.1",
-    "ms": "^2.0.0"
-  }
+  "author": "The Coral Project Team <coralcore@mozillafoundation.org>",
+  "license": "Apache-2.0"
 }

plugins/talk-plugin-toxic-comments/server/config.js

@@ -8,6 +8,7 @@ const config = {
   THRESHOLD: process.env.TALK_TOXICITY_THRESHOLD || 0.8,
   API_TIMEOUT: ms(process.env.TALK_PERSPECTIVE_TIMEOUT || '300ms'),
   DO_NOT_STORE: process.env.TALK_PERSPECTIVE_DO_NOT_STORE || true,
+  SEND_FEEDBACK: process.env.TALK_PERSPECTIVE_SEND_FEEDBACK === 'TRUE',
 };
 
 if (process.env.NODE_ENV !== 'test' && !config.API_KEY) {

plugins/talk-plugin-toxic-comments/server/hooks.js

@@ -1,5 +1,8 @@
-const { getScores, isToxic } = require('./perspective');
+const { getScores, submitFeedback, isToxic } = require('./perspective');
+const { SEND_FEEDBACK } = require('./config');
 const { ErrToxic } = require('./errors');
+
+const { merge } = require('lodash');
 const debug = require('debug')('talk:plugin:toxic-comments');
 
 function handlePositiveToxic(input) {
@@ -28,7 +31,8 @@ async function getScore(body) {
   return scores;
 }
 
-module.exports = {
+// Create all the hooks that will enable Perspective to add scores to Comments.
+const hooks = {
   RootMutation: {
     editComment: {
       pre: async (_, { edit: { body }, edit }) => {
@@ -59,3 +63,57 @@ module.exports = {
     },
   },
 };
+
+// If feedback sending is enabled, we need to add in the hooks for processing
+// feedback.
+if (SEND_FEEDBACK) {
+  // statusMap provides a map of Talk names to ones Perspective are expecting.
+  const statusMap = {
+    ACCEPTED: 'APPROVED',
+    REJECTED: 'DELETED',
+  };
+
+  // Merge these hooks into the hooks for plugging into the graph operations.
+  merge(hooks, {
+    RootMutation: {
+      // Hook into mutations associated with accepting/rejecting comments.
+      setCommentStatus: {
+        async post(root, args, ctx) {
+          if (ctx.user && args.status in statusMap) {
+            const comment = await ctx.loaders.Comments.get.load(args.id);
+            if (comment) {
+              const asset = await ctx.loaders.Assets.getByID.load(
+                comment.asset_id
+              );
+
+              // Submit feedback.
+              submitFeedback(comment, asset, statusMap[args.status]);
+            }
+          }
+        },
+      },
+      // Hook into mutations associated with featuring comments.
+      addTag: {
+        async post(root, args, ctx) {
+          if (
+            ctx.user &&
+            args.tag.name === 'FEATURED' &&
+            args.tag.item_type === 'COMMENTS'
+          ) {
+            const comment = await ctx.loaders.Comments.get.load(args.tag.id);
+            if (comment) {
+              const asset = await ctx.loaders.Assets.getByID.load(
+                comment.asset_id
+              );
+
+              // Submit feedback.
+              submitFeedback(comment, asset, 'HIGHLIGHTED');
+            }
+          }
+        },
+      },
+    },
+  });
+}
+
+module.exports = hooks;

plugins/talk-plugin-toxic-comments/server/perspective.js

@@ -8,48 +8,64 @@ const {
 } = require('./config');
 const debug = require('debug')('talk:plugin:toxic-comments');
 
+// Load the global Talk configuration, we want to grab some variables..
+const { ROOT_URL } = require('config');
+
+// Use the ROOT_URL to grab the domain to construct a communityID for the
+// feedback.
+const communityId = `Coral:${ROOT_URL}`;
+
+async function send(method, body) {
+  // Perform the fetch.
+  const res = await fetch(`${API_ENDPOINT}/${method}?key=${API_KEY}`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    timeout: API_TIMEOUT,
+    body: JSON.stringify(body, null, 2),
+  });
+  if (!res.ok) {
+    return null;
+  }
+
+  // Grab the JSON from the request.
+  const data = await res.json();
+
+  // Send the data back!
+  return data;
+}
+
 /**
  * Get scores from the perspective api
- * @param  {string}  text  text to be anaylized
+ *
+ * @param  {string}  text  text to be analyzed
  * @return {object}        object containing toxicity scores
  */
 async function getScores(text) {
   debug('Sending to Perspective: %o', text);
 
-  const response = await fetch(
-    `${API_ENDPOINT}/comments:analyze?key=${API_KEY}`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      timeout: API_TIMEOUT,
-      body: JSON.stringify({
-        comment: {
-          text,
-        },
-        // TODO: support other languages.
-        languages: ['en'],
-        doNotStore: DO_NOT_STORE,
-        requestedAttributes: {
-          TOXICITY: {},
-          SEVERE_TOXICITY: {},
-        },
-      }),
-    }
-  );
-
-  const data = await response.json();
-
-  // If we get an error, just say it's not a toxic comment.
-  if (data.error) {
-    debug('Recieved Error when submitting: %o', data.error);
+  // Send the comment off to be analyzed.
+  const data = await send('comments:analyze', {
+    comment: {
+      text,
+    },
+    // TODO: support other languages.
+    languages: ['en'],
+    doNotStore: DO_NOT_STORE,
+    requestedAttributes: {
+      TOXICITY: {},
+      SEVERE_TOXICITY: {},
+    },
+  });
+  if (!data || data.error) {
+    debug('Received Error when submitting: %o', data.error);
     return {
       TOXICITY: {
-        summaryScore: 0.0,
+        summaryScore: null,
       },
       SEVERE_TOXICITY: {
-        summaryScore: 0.0,
+        summaryScore: null,
       },
     };
   }
@@ -66,6 +82,7 @@ async function getScores(text) {
 
 /**
  * Get toxicity probability
+ *
  * @param  {object} scores  scores as returned by `getScores`
  * @return {number}         toxicity probability from 0 - 1.0
  */
@@ -74,7 +91,9 @@ function getProbability(scores) {
 }
 
 /**
- * isToxic determines if given probabilty or scores meets the toxicity threshold.
+ * isToxic determines if given probability or scores meets the toxicity
+ * threshold.
+ *
  * @param  {object|number} scoresOrProbability scores or probability
  * @return {boolean}
  */
@@ -86,9 +105,23 @@ function isToxic(scoresOrProbability) {
   return probability > THRESHOLD;
 }
 
+/**
+ * wrapError will mask API key in error messages.
+ *
+ * @param {Error} err the error potentially containing the API key
+ */
+function wrapError(err) {
+  if (err.message) {
+    err.message = err.message.replace(API_KEY, '***');
+  }
+
+  return err;
+}
+
 /**
  * maskKeyInError is a decorator that calls fn and masks the
  * API_KEY in errors before throwing.
+ *
  * @param  {function} fn Function that returns a Promise
  * @return {function} decorated function
  */
@@ -97,16 +130,83 @@ function maskKeyInError(fn) {
     try {
       return await fn(...args);
     } catch (err) {
-      if (err.message) {
-        err.message = err.message.replace(API_KEY, '***');
-      }
-      throw err;
+      throw wrapError(err);
     }
   };
 }
 
+/**
+ * submitFeedback will send back moderation feedback to Perspective.
+ *
+ * @param {Object} comment the Comment that feedback is related to
+ * @param {Object} asset the Asset where the Comment was made on
+ * @param {Object} status the attribute to send back to Perspective
+ */
+const submitFeedback = (
+  {
+    id: Coral_comment_id, // Comment ID.
+    parent_id: reply_to_id_Coral_comment_id, // Comment parent id (reply parent).
+    body: text, // Comment body.
+  }, // Comment.
+  {
+    url, // Asset (article) URL.
+  }, // Asset (article).
+  status // Either APPROVED, DELETED, or HIGHLIGHTED.
+) =>
+  // Handle this operation in the next tick, so it does not affect the current
+  // comment processing.
+  process.nextTick(async () => {
+    // Construct a client token.
+    const clientToken = `comment:${Coral_comment_id}`;
+
+    try {
+      // Send the feedback to perspective.
+      const body = await send('comments:suggestscore', {
+        comment: {
+          text,
+        },
+        context: {
+          entries: [
+            {
+              text: JSON.stringify({
+                url,
+                reply_to_id_Coral_comment_id,
+                Coral_comment_id,
+              }),
+            },
+          ],
+        },
+        attributeScores: {
+          [status]: {
+            summaryScore: {
+              value: 1,
+            },
+          },
+        },
+        languages: ['EN'],
+        communityId,
+        clientToken,
+      });
+      if (!body || body.clientToken !== clientToken) {
+        throw new Error(
+          `"${JSON.stringify(
+            body
+          )}" did not contain the clientToken we expected`
+        );
+      }
+
+      debug(`sent ${status} feedback to perspective`);
+    } catch (err) {
+      console.error(
+        `could not send ${status} feedback to perspective`,
+        wrapError(err)
+      );
+    }
+  });
+
 module.exports = {
   getScores: maskKeyInError(getScores),
   getProbability,
+  submitFeedback,
   isToxic,
 };

routes/index.js

@@ -10,7 +10,7 @@ const compression = require('compression');
 const plugins = require('../services/plugins');
 const staticTemplate = require('../middleware/staticTemplate');
 const nonce = require('../middleware/nonce');
-const staticServer = require('express-static-gzip');
+const staticFiles = require('../middleware/staticFiles');
 const { DISABLE_STATIC_SERVER } = require('../config');
 const { passport } = require('../services/passport');
 const { MOUNT_PATH } = require('../url');
@@ -32,6 +32,8 @@ if (!DISABLE_STATIC_SERVER) {
 
   /**
    * Redirect old embed calls.
+   *
+   * TODO: (wyattjoh) remove this on the next minor release
    */
   const oldEmbed = url.resolve(MOUNT_PATH, 'embed.js');
   const newEmbed = url.resolve(MOUNT_PATH, 'static/embed.js');
@@ -43,28 +45,15 @@ if (!DISABLE_STATIC_SERVER) {
   });
 
   /**
-   * Serve the directories under dist.
+   * Setup static file serving.
    */
-  const dist = path.resolve(path.join(__dirname, '../dist'));
-  if (process.env.NODE_ENV === 'production') {
-    router.use(
-      '/static',
-      staticServer(dist, {
-        indexFromEmptyFile: false,
-        enableBrotli: true,
-        customCompressions: [
-          {
-            encodingName: 'deflate',
-            fileExtension: 'zz',
-          },
-        ],
-      })
-    );
-  } else {
-    router.use('/static', express.static(dist));
-  }
+  router.use('/static', staticFiles);
 }
 
+//==============================================================================
+// Shared Middleware
+//==============================================================================
+
 // Add the i18n middleware to all routes.
 router.use(i18n);
 

services/jwt.js

@@ -120,6 +120,11 @@ function SharedSecret({ kid = undefined, secret = null }, algorithm) {
     throw new Error('Secret cannot have a zero length');
   }
 
+  // If the secret is base64 encoded, then decode it!
+  if (secret.startsWith('base64:')) {
+    secret = Buffer.from(secret.substring(7), 'base64').toString();
+  }
+
   return new Secret({
     kid,
     signingKey: secret,

services/kue.js

@@ -91,12 +91,12 @@ class Task {
   static shutdown() {
     debug('Shutting down the Queue');
 
-    return new Promise((resolve, reject) => {
+    return new Promise(resolve => {
       // Shutdown and give the queue 5 seconds to shutdown before we start
       // killing jobs.
       getQueue().shutdown(5000, err => {
         if (err) {
-          return reject(err);
+          return resolve();
         }
 
         debug('Queue shut down.');

services/moderation/phases/links.js

@@ -11,7 +11,7 @@ module.exports = (
     },
   }
 ) => {
-  if (premodLinksEnable && linkify.test(comment.body)) {
+  if (premodLinksEnable && linkify.test(comment.body.replace(/\xAD/g, ''))) {
     // Add the flag related to Trust to the comment.
     return {
       status: 'SYSTEM_WITHHELD',

services/scraper.js

@@ -1,33 +0,0 @@
-const kue = require('./kue');
-
-/**
- * Exposes a service object to allow operations to execute against the scraper.
- * @type {Object}
- */
-const scraper = {
-  /**
-   * Create the new Task kue singleton.
-   */
-  task: new kue.Task({
-    name: 'scraper',
-  }),
-
-  /**
-   * Creates a new scraper job and scrapes the url when it gets processed.
-   */
-  async create(ctx, id) {
-    ctx.log.info({ assetID: id }, 'Creating job');
-
-    const job = await scraper.task.create({
-      title: `Scrape for asset ${id}`,
-      id: ctx.id,
-      asset_id: id,
-    });
-
-    ctx.log.info({ jobID: job.id, assetID: id }, 'Created job');
-
-    return job;
-  },
-};
-
-module.exports = scraper;

services/scraper/index.js

@@ -0,0 +1,96 @@
+const fetch = require('node-fetch');
+const ProxyAgent = require('proxy-agent');
+const { merge } = require('lodash');
+
+const { SCRAPER_HEADERS, SCRAPER_PROXY_URL } = require('../../config');
+const kue = require('../kue');
+const { version } = require('../../package.json');
+
+// Load the scraper with the rules.
+const metascraper = require('metascraper').load([
+  require('metascraper-title')(),
+  require('metascraper-description')(),
+  require('metascraper-image')(),
+  require('metascraper-author')(),
+  require('metascraper-date')(),
+  require('./rules/modified')(),
+  require('./rules/section')(),
+]);
+
+let customHeaders = {};
+try {
+  customHeaders = JSON.parse(SCRAPER_HEADERS);
+} catch (err) {
+  console.error('Cannot parse TALK_SCRAPER_HEADERS');
+  throw err;
+}
+
+// Parse the headers to be added to the scraper.
+const headers = merge(
+  {
+    'User-Agent': `Coral-Talk/${version}`,
+  },
+  customHeaders
+);
+
+// Add proxy configuration if exists.
+const agent = SCRAPER_PROXY_URL ? new ProxyAgent(SCRAPER_PROXY_URL) : null;
+
+/**
+ * Exposes a service object to allow operations to execute against the scraper.
+ * @type {Object}
+ */
+const scraper = {
+  /**
+   * Create the new Task kue singleton.
+   */
+  task: new kue.Task({
+    name: 'scraper',
+  }),
+
+  /**
+   * Creates a new scraper job and scrapes the url when it gets processed.
+   */
+  async create(ctx, id) {
+    ctx.log.info({ assetID: id }, 'Creating job');
+
+    const job = await scraper.task.create({
+      title: `Scrape for asset ${id}`,
+      id: ctx.id,
+      asset_id: id,
+    });
+
+    ctx.log.info({ jobID: job.id, assetID: id }, 'Created job');
+
+    return job;
+  },
+
+  /**
+   * Scrapes the given asset for metadata.
+   */
+  async scrape(url) {
+    const res = await fetch(url, {
+      headers,
+      agent,
+    });
+    const html = await res.text();
+
+    // Get the metadata from the scraped html.
+    const meta = await metascraper({
+      html,
+      url,
+    });
+
+    return {
+      title: meta.title || '',
+      description: meta.description || '',
+      image: meta.image ? meta.image : '',
+      author: meta.author || '',
+      publication_date: meta.date || '',
+      modified_date: meta.modified || '',
+      section: meta.section || '',
+    };
+  },
+};
+
+module.exports = scraper;

test/e2e/page_objects/admin.js

@@ -30,6 +30,10 @@ module.exports = {
           .waitForElementVisible('@signOutButton')
           .click('@signOutButton');
       },
+      login(user) {
+        this.expect.section('@login').to.be.visible;
+        return this.section.login.login(user);
+      },
       navigateAndLogin(user) {
         this.navigate().expect.section('@login').to.be.visible;
         return this.section.login.login(user);

test/e2e/specs/02_admin.js

@@ -20,13 +20,18 @@ module.exports = {
     client.end();
   },
 
+  'Admin goes to login': client => {
+    const adminPage = client.page.admin();
+    adminPage.navigate().expect.element('drawerButton').to.not.be.present;
+  },
+
   'Admin logs in': client => {
     const adminPage = client.page.admin();
     const {
       testData: { admin },
     } = client.globals;
 
-    adminPage.navigateAndLogin(admin);
+    adminPage.login(admin);
   },
 
   'Admin goes to Stories': client => {