Merge branch 'master' into edit-history

circle.yml

@@ -37,7 +37,7 @@ dependencies:
 
     # Install node dependencies.
     - yarn --version
-    - yarn global add node-gyp nsp --force
+    - yarn global add node-gyp --force
     - yarn
 
   post:
@@ -59,8 +59,6 @@ test:
     - yarn test
     # Run the end to end tests
     - yarn e2e:ci
-    # Check dependancies using nsp.
-    - nsp check
 
 deployment:
   release:

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

@@ -23,7 +23,7 @@ export default class ModerationKeysModal extends React.Component {
           'ctrl+f': 'modqueue.toggle_search',
           t: 'modqueue.next_queue',
           [`1...${this.props.queueCount}`]: 'modqueue.jump_to_queue',
-          s: 'modqueue.singleview',
+          z: 'modqueue.singleview',
           '?': 'modqueue.thismenu',
         },
       },

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

@@ -19,7 +19,7 @@ class Moderation extends Component {
   componentWillMount() {
     const { toggleModal, singleView } = this.props;
 
-    key('s', () => singleView());
+    key('z', () => singleView());
     key('shift+/', () => toggleModal(true));
     key('esc', () => toggleModal(false));
     key('ctrl+f', () => this.openSearch());
@@ -113,7 +113,7 @@ class Moderation extends Component {
   };
 
   componentWillUnmount() {
-    key.unbind('s');
+    key.unbind('z');
     key.unbind('shift+/');
     key.unbind('esc');
     key.unbind('ctrl+f');

client/coral-embed-stream/src/graphql/index.js

@@ -198,7 +198,7 @@ export default {
           { mutationResult: { data: { createComment: { comment } } } }
         ) => {
           if (
-            (prev.me.role !== 'ADMIN' &&
+            (!['ADMIN', 'MODERATOR'].includes(prev.me.role) &&
               prev.asset.settings.moderation === 'PRE') ||
             comment.status === 'PREMOD' ||
             comment.status === 'REJECTED' ||

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

@@ -133,16 +133,18 @@ Talk also allows you to moderate a commenters recent comments from this view.
 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                   |
-| `s`      | Toggle single comment edit view |
-| `?`      | Open this menu                  |
-| `d`      | Approve                         |
-| `f`      | Reject                          |
+| 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!
 
 ### Stories
 

locales/da.yml

@@ -274,7 +274,7 @@ da:
     shift_key: "⇧"
     shortcuts: "Genveje"
     show_shortcuts: "Vis genveje"
-    singleview: "Skift enkeltkommentar redigerings visning"
+    singleview: "Zen mode"
     thismenu: "Åben denne menu"
     thousand: "k"
     try_these: "Prøv disse"

locales/en.yml

@@ -330,7 +330,7 @@ en:
     shortcuts: "Shortcuts"
     sort: "Sort"
     show_shortcuts: "Show Shortcuts"
-    singleview: "Toggle single comment edit view"
+    singleview: "Zen mode"
     thismenu: "Open this menu"
     jump_to_queue: "Jump to specific queue"
     thousand: k

locales/es.yml

@@ -291,7 +291,7 @@ es:
     shortcuts: Atajos
     sort: "Ordenar"
     show_shortcuts: "Mostrar Atajos"
-    singleview: "Colocar vista de edición de comentario único"
+    singleview: "Modo zen"
     thismenu: "Abrir este menu"
     thousand: k
     try_these: "Intentar estos"

locales/fr.yml

@@ -225,7 +225,7 @@ fr:
     shift_key: ⇧
     shortcuts: Raccourcis
     show_shortcuts: "Afficher les raccourcis"
-    singleview: "Passer en mode d'édition de commentaire unique"
+    singleview: "Mode zen"
     spam_ads: Spam / Publicités
     thismenu: "Ouvrir ce menu"
     thousand: k

locales/nl_NL.yml

@@ -325,7 +325,7 @@ nl_NL:
     shortcuts: "Sneltoetsen"
     sort: "Sorteer"
     show_shortcuts: "Toon sneltoetsen"
-    singleview: "Schakel wijzigen enkele reactie aan of uit"
+    singleview: "Zen-modus"
     thismenu: "Open dit menu"
     jump_to_queue: "Spring naar specifieke wachtrij"
     thousand: k

locales/pt_BR.yml

@@ -276,7 +276,7 @@ pt_BR:
     shift_key: "⇧"
     shortcuts: "Atalhos"
     show_shortcuts: "Ver atalhos"
-    singleview: "Alternar vista de edição de comentário único"
+    singleview: "Modo zen"
     spam_ads: Spam/Anuncios
     thismenu: "Abra este menu"
     thousand: k

locales/zh_CN.yml

@@ -290,7 +290,7 @@ zh_CN:
     shortcuts: "快捷键"
     sort: "排序"
     show_shortcuts: "显示快捷键"
-    singleview: "展开单评论编辑视图"
+    singleview: "禅宗模式"
     thismenu: "开启该菜单"
     jump_to_queue: "跳转到特定序列"
     thousand: "千"

locales/zh_TW.yml

@@ -290,7 +290,7 @@ zh_TW:
     shortcuts: "快捷鍵"
     sort: "排序"
     show_shortcuts: "顯示快捷鍵"
-    singleview: "切換單個評論編輯視圖"
+    singleview: "禪宗模式"
     thismenu: "打開這個菜單"
     jump_to_queue: "跳轉到特定隊列"
     thousand: 千