diff --git a/client/coral-admin/src/routes/Configure/components/EmbedLink.js b/client/coral-admin/src/routes/Configure/components/EmbedLink.js
index 4506d2f06..be0a13d5e 100644
--- a/client/coral-admin/src/routes/Configure/components/EmbedLink.js
+++ b/client/coral-admin/src/routes/Configure/components/EmbedLink.js
@@ -1,5 +1,6 @@
import React, {Component} from 'react';
import t from 'coral-framework/services/i18n';
+import {join} from 'path';
import styles from './Configure.css';
import {Button, Card} from 'coral-ui';
import {BASE_URL} from 'coral-framework/constants/url';
@@ -25,7 +26,7 @@ class EmbedLink extends Component {
}
render () {
- const coralJsUrl = [BASE_URL, '/embed.js'].join('');
+ const coralJsUrl = join(BASE_URL, '/embed.js');
const nonce = String(Math.random()).slice(2);
const streamElementId = `coral_talk_${nonce}`;
const embedText = `
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 722faaaa3..2ff6b6732 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -208,17 +208,22 @@ class ModerationContainer extends Component {
// Still loading.
return ;
}
- } else if(asset !== undefined || !('premodCount' in root)) {
+ } else if (asset !== undefined || !('premodCount' in root)) {
// loading.
return ;
}
- const premodEnabled = assetId ? isPremod(asset.settings.moderation) : isPremod(settings.moderation);
+ const premodEnabled = assetId ? isPremod(asset.settings.moderation) :
+ isPremod(settings.moderation);
+
const currentQueueConfig = Object.assign({}, this.props.queueConfig);
- if (premodEnabled) {
+
+ if (premodEnabled && root.newCount === 0) {
delete currentQueueConfig.new;
- } else {
+ }
+
+ if (!premodEnabled && root.premodCount === 0) {
delete currentQueueConfig.premod;
}
@@ -355,8 +360,9 @@ const withModQueueQuery = withQuery(({queueConfig}) => gql`
variables: {
asset_id: id,
sortOrder: props.moderation.sortOrder,
- allAssets: id === null
- }
+ allAssets: id === null,
+ },
+ fetchPolicy: 'network-only'
};
},
});
diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index 28ca259d8..866218d73 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -69,15 +69,15 @@ function getCommentQueues(comment, queueConfig) {
const queues = [];
Object.keys(queueConfig).forEach((key) => {
const {action_type, statuses, tags} = queueConfig[key];
- let addToQueues = false;
- if (statuses && statuses.indexOf(comment.status) >= 0) {
- addToQueues = true;
+ let addToQueues = true;
+ if (statuses && statuses.indexOf(comment.status) === -1) {
+ addToQueues = false;
}
- if (tags && comment.tags && comment.tags.some((tagLink) => tags.indexOf(tagLink.tag.name) >= 0)) {
- addToQueues = true;
+ if (tags && (!comment.tags || !comment.tags.some((tagLink) => tags.indexOf(tagLink.tag.name) >= 0))) {
+ addToQueues = false;
}
- if (action_type && comment.actions && comment.actions.some((a) => a.__typename.toLowerCase() === `${action_type}action`)) {
- addToQueues = true;
+ if (action_type && (!comment.actions || !comment.actions.some((a) => a.__typename.toLowerCase() === `${action_type.toLowerCase()}action`))) {
+ addToQueues = false;
}
if (addToQueues) {
queues.push(key);
diff --git a/client/coral-admin/src/routes/Moderation/queueConfig.js b/client/coral-admin/src/routes/Moderation/queueConfig.js
index 9a23ccc6c..86a622177 100644
--- a/client/coral-admin/src/routes/Moderation/queueConfig.js
+++ b/client/coral-admin/src/routes/Moderation/queueConfig.js
@@ -1,16 +1,16 @@
import t from 'coral-framework/services/i18n';
export default {
+ new: {
+ statuses: ['NONE'],
+ icon: 'question_answer',
+ name: t('modqueue.new'),
+ },
premod: {
statuses: ['PREMOD'],
icon: 'access_time',
name: t('modqueue.premod'),
},
- new: {
- statuses: ['NONE', 'PREMOD'],
- icon: 'question_answer',
- name: t('modqueue.new'),
- },
reported: {
action_type: 'FLAG',
statuses: ['NONE', 'PREMOD'],
diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 5e2766b9a..733708a97 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -92,6 +92,11 @@ const singleCommentFragment = gql`
const withCommentFragments = withFragments({
root: gql`
fragment CoralEmbedStream_Comment_root on RootQuery {
+ me {
+ ignoredUsers {
+ id
+ }
+ }
__typename
me {
ignoredUsers {
diff --git a/pluginsa.json b/pluginsa.json
deleted file mode 100644
index 950cec229..000000000
--- a/pluginsa.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "server": [
- "talk-plugin-auth",
- "talk-plugin-respect",
- "talk-plugin-offtopic",
- "talk-plugin-facebook-auth",
- "talk-plugin-featured-comments"
- ],
- "client": [
- "talk-plugin-respect",
- "talk-plugin-auth",
- "talk-plugin-offtopic",
- "talk-plugin-viewing-options",
- "talk-plugin-comment-content",
- "talk-plugin-permalink",
- "talk-plugin-featured-comments",
- "talk-plugin-sort-newest",
- "talk-plugin-sort-oldest",
- "talk-plugin-sort-most-respected",
- "talk-plugin-sort-most-replied",
- "talk-plugin-author-menu",
- "talk-plugin-member-since",
- "talk-plugin-ignore-user"
- ]
-}
diff --git a/services/redis.js b/services/redis.js
index 027d5bc20..5fd1b78d3 100644
--- a/services/redis.js
+++ b/services/redis.js
@@ -30,7 +30,6 @@ const attachMonitors = (client) => {
};
const connectionOptions = {
- url: REDIS_URL,
retry_strategy: function(options) {
if (options.error && options.error.code !== 'ECONNREFUSED') {
@@ -65,7 +64,7 @@ const connectionOptions = {
};
const createClient = () => {
- let client = new Redis(connectionOptions);
+ let client = new Redis(REDIS_URL, connectionOptions);
// Attach the monitors that will print debug messages to the console.
attachMonitors(client);