diff --git a/client/coral-configure/components/ConfigureCommentStream.css b/client/coral-configure/components/ConfigureCommentStream.css
index ea20e4c05..335c94377 100644
--- a/client/coral-configure/components/ConfigureCommentStream.css
+++ b/client/coral-configure/components/ConfigureCommentStream.css
@@ -9,12 +9,12 @@
right: 0;
}
-ul {
+.wrapper ul {
list-style: none;
padding: 0;
}
-ul ul {
+.wrapper ul ul {
padding-left: 20px
}
@@ -23,12 +23,12 @@ ul ul {
margin: 12px 12px 12px 0;
}
-h4 {
+.wrapper h4 {
font-size: 14px;
margin-bottom: 5px;
}
-p {
+.wrapper p {
max-width: 380px;
}
diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 4383cbc5b..8d7c7ebf9 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -12,3 +12,14 @@
filter: blur(2px);
pointer-events: none;
}
+
+.topRightMenu {
+ float: right;
+ text-align: right;
+ cursor: pointer;
+ margin-top: 5px;
+}
+
+.topRightMenu > * {
+ text-align: initial;
+}
diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 45f2ef084..4b01e19a7 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -20,6 +20,8 @@ import LikeButton from 'coral-plugin-likes/LikeButton';
import {BestButton, IfUserCanModifyBest, BEST_TAG, commentIsBest, BestIndicator} from 'coral-plugin-best/BestButton';
import LoadMore from 'coral-embed-stream/src/LoadMore';
import {Slot} from 'coral-framework';
+import IgnoredCommentTombstone from './IgnoredCommentTombstone';
+import {TopRightMenu} from './TopRightMenu';
import styles from './Comment.css';
@@ -84,11 +86,17 @@ class Comment extends React.Component {
}).isRequired
}).isRequired,
+ // given a comment, return whether it should be rendered as ignored
+ commentIsIgnored: React.PropTypes.func,
+
// dispatch action to add a tag to a comment
addCommentTag: React.PropTypes.func,
// dispatch action to remove a tag from a comment
removeCommentTag: React.PropTypes.func,
+
+ // dispatch action to ignore another user
+ ignoreUser: React.PropTypes.func,
}
render () {
@@ -111,7 +119,9 @@ class Comment extends React.Component {
deleteAction,
addCommentTag,
removeCommentTag,
+ ignoreUser,
disableReply,
+ commentIsIgnored,
} = this.props;
const like = getActionSummary('LikeActionSummary', comment);
@@ -121,10 +131,10 @@ class Comment extends React.Component {
commentClass += comment.id === 'pending' ? ` ${styles.pendingComment}` : '';
// call a function, and if it errors, call addNotification('error', ...) (e.g. to show user a snackbar)
- const notifyOnError = (fn, errorToMessage) => async () => {
+ const notifyOnError = (fn, errorToMessage) => async function (...args) {
if (typeof errorToMessage !== 'function') {errorToMessage = (error) => error.message;}
try {
- return await fn();
+ return await fn(...args);
} catch (error) {
addNotification('error', errorToMessage(error));
throw error;
@@ -160,6 +170,16 @@ class Comment extends React.Component {
+
+ : null
+ }
+
@@ -225,27 +245,29 @@ class Comment extends React.Component {
{
comment.replies &&
comment.replies.map(reply => {
- return this.props.logout().then(refetch)} changeTab={this.changeTab}/>;
+
return (
-
- {lang.t('MY_COMMENTS')}
+ {lang.t('myProfile')}
Configure Stream
{
@@ -174,8 +178,8 @@ class Embed extends React.Component {
this.props.data.refetch();
}}>{lang.t('showAllComments')}
}
- {loggedIn && this.props.logout().then(refetch)} changeTab={this.changeTab}/>}
+ { loggedIn ? userBox : null }
{
openStream
?
}
-
-
-
-
-
-
-
+
+
+
+
+
+ { loggedIn ? userBox : null }
+
+
);
@@ -304,7 +311,7 @@ class Embed extends React.Component {
const mapStateToProps = state => ({
auth: state.auth.toJS(),
userData: state.user.toJS(),
- asset: state.asset.toJS()
+ asset: state.asset.toJS(),
});
const mapDispatchToProps = dispatch => ({
@@ -317,7 +324,7 @@ const mapDispatchToProps = dispatch => ({
updateCountCache: (id, count) => dispatch(updateCountCache(id, count)),
viewAllComments: () => dispatch(viewAllComments()),
logout: () => dispatch(logout()),
- dispatch: d => dispatch(d)
+ dispatch: d => dispatch(d),
});
export default compose(
@@ -328,6 +335,7 @@ export default compose(
postDontAgree,
addCommentTag,
removeCommentTag,
+ ignoreUser,
deleteAction,
queryStream,
)(Embed);
diff --git a/client/coral-embed-stream/src/IgnoreUserWizard.css b/client/coral-embed-stream/src/IgnoreUserWizard.css
new file mode 100644
index 000000000..838f2f76a
--- /dev/null
+++ b/client/coral-embed-stream/src/IgnoreUserWizard.css
@@ -0,0 +1,14 @@
+.IgnoreUserWizard {
+ background-color: #2E343B;
+ color: white;
+ padding: 1em;
+ max-width: 220px;
+}
+
+.IgnoreUserWizard header {
+ font-weight: bold;
+}
+
+.IgnoreUserWizard .textAlignRight {
+ text-align: right;
+}
diff --git a/client/coral-embed-stream/src/IgnoreUserWizard.js b/client/coral-embed-stream/src/IgnoreUserWizard.js
new file mode 100644
index 000000000..371e6d48b
--- /dev/null
+++ b/client/coral-embed-stream/src/IgnoreUserWizard.js
@@ -0,0 +1,66 @@
+import React, {PropTypes} from 'react';
+import styles from './IgnoreUserWizard.css';
+import {Button} from 'coral-ui';
+
+// Guides the user through ignoring another user, including confirming their decision
+export class IgnoreUserWizard extends React.Component {
+ static propTypes = {
+
+ // comment on which this menu appears
+ user: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired
+ }).isRequired,
+ cancel: PropTypes.func.isRequired,
+
+ // actually submit the ignore. Provide {id: user id to ignore}
+ ignoreUser: PropTypes.func.isRequired,
+ }
+ constructor(props) {
+ super(props);
+ this.state = {
+
+ // what step of the wizard is the user on
+ step: 1
+ };
+ this.onClickCancel = this.onClickCancel.bind(this);
+ }
+ onClickCancel() {
+ this.props.cancel();
+ }
+ render() {
+ const {user, ignoreUser} = this.props;
+ const goToStep = (stepNum) => this.setState({step: stepNum});
+ const step1 = (
+
+
+
When you ignore a user, all comments they wrote on the site will be hidden from you. You can undo this later from the Profile tab.
+
+ Cancel
+ goToStep(2)}>Ignore user
+
+
+
+
Are you sure you want to ignore { user.name }?
+
+ Cancel
+ Ignore user
+
+
+ { elForThisStep }
+
+ );
+ }
+}
diff --git a/client/coral-embed-stream/src/IgnoredCommentTombstone.js b/client/coral-embed-stream/src/IgnoredCommentTombstone.js
new file mode 100644
index 000000000..0ed746976
--- /dev/null
+++ b/client/coral-embed-stream/src/IgnoredCommentTombstone.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-framework/translations';
+const lang = new I18n(translations);
+
+// Render in place of a Comment when the author of the comment is ignored
+const IgnoredCommentTombstone = () => (
+
+
+
+ {lang.t('commentIsIgnored')}
+
+
{
comments.map(comment =>
-
diff --git a/client/coral-embed-stream/src/TopRightMenu.css b/client/coral-embed-stream/src/TopRightMenu.css
new file mode 100644
index 000000000..5cddae125
--- /dev/null
+++ b/client/coral-embed-stream/src/TopRightMenu.css
@@ -0,0 +1,24 @@
+.Toggleable:focus {
+ outline: none;
+}
+
+/**
+ * Up/Down Chevrons for the top right menu
+ */
+.chevron {
+}
+.chevron:before {
+ content: '⌃';
+ display: inline-block;
+ position: relative;
+ top: 0.25em;
+}
+
+/* Down Arrow */
+.chevron.down:before {
+ display: inline-block;
+ position: relative;
+ transform: rotate(180deg);
+ top: 0;
+ /*top: -0.25em;*/
+}
diff --git a/client/coral-embed-stream/src/TopRightMenu.js b/client/coral-embed-stream/src/TopRightMenu.js
new file mode 100644
index 000000000..e6b264c27
--- /dev/null
+++ b/client/coral-embed-stream/src/TopRightMenu.js
@@ -0,0 +1,94 @@
+import React, {PropTypes} from 'react';
+import classnames from 'classnames';
+
+import {IgnoreUserWizard} from './IgnoreUserWizard';
+import styles from './TopRightMenu.css';
+
+// TopRightMenu appears as a dropdown in the top right of the comment.
+// when you click the down cehvron, it expands and shows IgnoreUserWizard
+// when you click 'cancel' in the wizard, it closes the menu
+export class TopRightMenu extends React.Component {
+ static propTypes = {
+
+ // comment on which this menu appears
+ comment: PropTypes.shape({
+ user: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired
+ }).isRequired
+ }).isRequired,
+ ignoreUser: PropTypes.func,
+
+ // show notification to the user (e.g. for errors)
+ addNotification: PropTypes.func.isRequired,
+ }
+ constructor(props) {
+ super(props);
+ this.state = {
+ timesReset: 0
+ };
+ }
+ render() {
+ const {comment, ignoreUser, addNotification} = this.props;
+
+ // timesReset is used as Toggleable key so it re-renders on reset (closing the toggleable)
+ const reset = () => this.setState({timesReset: this.state.timesReset + 1});
+ const ignoreUserAndCloseMenuAndNotifyOnError = async ({id}) => {
+
+ // close menu
+ reset();
+
+ // ignore user
+ try {
+ await ignoreUser({id});
+ } catch (error) {
+ addNotification('error', 'Failed to ignore user');
+ throw error;
+ }
+ };
+ return (
+
+
+
+
+ );
+ }
+}
+
+const upArrow =
+ {isOpen ? upArrow : downArrow}
+ {isOpen ? children : null}
+
+ );
+ }
+}
+
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 41ec7a64b..51028949b 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -1,8 +1,6 @@
* {
- font-weight: inherit;
font-family: inherit;
font-style: inherit;
- font-size: 100%;
}
html, body {
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 3d1d61328..0e5cf86c2 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -5,9 +5,9 @@ class Slot extends Component {
render() {
const {fill, ...rest} = this.props;
return (
-
+
{getSlotElements(fill, rest)}
-
+
);
}
}
diff --git a/client/coral-framework/constants/user.js b/client/coral-framework/constants/user.js
index 5f040db5b..1557a42c9 100644
--- a/client/coral-framework/constants/user.js
+++ b/client/coral-framework/constants/user.js
@@ -6,3 +6,5 @@ export const COMMENTS_BY_USER_SUCCESS = 'COMMENTS_BY_USER_SUCCESS';
export const COMMENTS_BY_USER_FAILURE = 'COMMENTS_BY_USER_FAILURE';
export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
export const UPDATE_USERNAME = 'UPDATE_USERNAME';
+export const IGNORE_USER_SUCCESS = 'IGNORE_USER_SUCCESS';
+export const STOP_IGNORING_USER_SUCCESS = 'STOP_IGNORING_USER_SUCCESS';
diff --git a/client/coral-framework/graphql/mutations/ignoreUser.graphql b/client/coral-framework/graphql/mutations/ignoreUser.graphql
new file mode 100644
index 000000000..ad3c399f3
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/ignoreUser.graphql
@@ -0,0 +1,7 @@
+mutation ignoreUser ($id: ID!) {
+ ignoreUser(id:$id) {
+ errors {
+ translation_key
+ }
+ }
+}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 04dba8402..da1603f9e 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -6,6 +6,12 @@ import POST_DONT_AGREE from './postDontAgree.graphql';
import DELETE_ACTION from './deleteAction.graphql';
import ADD_COMMENT_TAG from './addCommentTag.graphql';
import REMOVE_COMMENT_TAG from './removeCommentTag.graphql';
+import IGNORE_USER from './ignoreUser.graphql';
+import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
+
+import MY_IGNORED_USERS from '../queries/myIgnoredUsers.graphql';
+import STREAM_QUERY from '../queries/streamQuery.graphql';
+import {variablesForStreamQuery} from '../queries';
import commentView from '../fragments/commentView.graphql';
@@ -148,3 +154,40 @@ export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
});
}}),
});
+
+export const ignoreUser = graphql(IGNORE_USER, {
+ props: ({mutate}) => ({
+ ignoreUser: ({id}) => {
+ return mutate({
+ variables: {
+ id,
+ },
+ refetchQueries: [{
+ query: MY_IGNORED_USERS,
+ }]
+ });
+ }}),
+});
+
+export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {
+ props: ({mutate, ownProps}) => {
+ return {
+ stopIgnoringUser: ({id}) => {
+ return mutate({
+ variables: {
+ id,
+ },
+ refetchQueries: [
+ {
+ query: MY_IGNORED_USERS,
+ },
+ {
+ query: STREAM_QUERY,
+ variables: variablesForStreamQuery(ownProps),
+ }
+ ]
+ });
+ }
+ };
+ }
+});
diff --git a/client/coral-framework/graphql/mutations/stopIgnoringUser.graphql b/client/coral-framework/graphql/mutations/stopIgnoringUser.graphql
new file mode 100644
index 000000000..042452ff5
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/stopIgnoringUser.graphql
@@ -0,0 +1,7 @@
+mutation stopIgnoringUser ($id: ID!) {
+ stopIgnoringUser(id:$id) {
+ errors {
+ translation_key
+ }
+ }
+}
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index 32bdfb6c9..5dbea5822 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -3,6 +3,7 @@ import STREAM_QUERY from './streamQuery.graphql';
import LOAD_MORE from './loadMore.graphql';
import GET_COUNTS from './getCounts.graphql';
import MY_COMMENT_HISTORY from './myCommentHistory.graphql';
+import MY_IGNORED_USERS from './myIgnoredUsers.graphql';
import uniqBy from 'lodash/uniqBy';
import sortBy from 'lodash/sortBy';
import isNil from 'lodash/isNil';
@@ -28,10 +29,10 @@ export const getCounts = (data) => ({asset_id, limit, sort}) => {
variables: {
asset_id,
limit,
- sort
+ sort,
+ excludeIgnored: data.variables.excludeIgnored,
},
updateQuery: (oldData, {fetchMoreResult:{asset}}) => {
-
return {
...oldData,
asset: {
@@ -52,7 +53,8 @@ export const loadMore = (data) => ({limit, cursor, parent_id = null, asset_id, s
cursor, // the date of the first/last comment depending on the sort order
parent_id, // if null, we're loading more top-level comments, if not, we're loading more replies to a comment
asset_id, // the id of the asset we're currently on
- sort // CHRONOLOGICAL or REVERSE_CHRONOLOGICAL
+ sort, // CHRONOLOGICAL or REVERSE_CHRONOLOGICAL
+ excludeIgnored: data.variables.excludeIgnored,
},
updateQuery: (oldData, {fetchMoreResult:{new_top_level_comments}}) => {
let updatedAsset;
@@ -119,21 +121,25 @@ export const loadMore = (data) => ({limit, cursor, parent_id = null, asset_id, s
});
};
+export const variablesForStreamQuery = ({auth}) => {
+
+ // where the query string is from the embeded iframe url
+ let comment_id = getQueryVariable('comment_id');
+ let has_comment = comment_id != null;
+ return {
+ asset_id: getQueryVariable('asset_id'),
+ asset_url: getQueryVariable('asset_url'),
+ comment_id: has_comment ? comment_id : 'no-comment',
+ has_comment,
+ excludeIgnored: Boolean(auth && auth.user && auth.user.id),
+ };
+};
+
// load the comment stream.
export const queryStream = graphql(STREAM_QUERY, {
- options: () => {
-
- // where the query string is from the embeded iframe url
- let comment_id = getQueryVariable('comment_id');
- let has_comment = comment_id != null;
-
+ options: (props) => {
return {
- variables: {
- asset_id: getQueryVariable('asset_id'),
- asset_url: getQueryVariable('asset_url'),
- comment_id: has_comment ? comment_id : 'no-comment',
- has_comment
- }
+ variables: variablesForStreamQuery(props)
};
},
props: ({data}) => ({
@@ -144,3 +150,11 @@ export const queryStream = graphql(STREAM_QUERY, {
});
export const myCommentHistory = graphql(MY_COMMENT_HISTORY, {});
+
+export const myIgnoredUsers = graphql(MY_IGNORED_USERS, {
+ props: ({data}) => {
+ return ({
+ myIgnoredUsersData: data
+ });
+ }
+});
diff --git a/client/coral-framework/graphql/queries/loadMore.graphql b/client/coral-framework/graphql/queries/loadMore.graphql
index 10b3c2e34..b18f4d84e 100644
--- a/client/coral-framework/graphql/queries/loadMore.graphql
+++ b/client/coral-framework/graphql/queries/loadMore.graphql
@@ -1,9 +1,9 @@
#import "../fragments/commentView.graphql"
-query LoadMoreComments($limit: Int = 5, $cursor: Date, $parent_id: ID, $asset_id: ID, $sort: SORT_ORDER) {
- new_top_level_comments: comments(query: {limit: $limit, cursor: $cursor, parent_id: $parent_id, asset_id: $asset_id, sort: $sort}) {
+query LoadMoreComments($limit: Int = 5, $cursor: Date, $parent_id: ID, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
+ new_top_level_comments: comments(query: {limit: $limit, cursor: $cursor, parent_id: $parent_id, asset_id: $asset_id, sort: $sort, excludeIgnored: $excludeIgnored}) {
...commentView
- replyCount
+ replyCount(excludeIgnored: $excludeIgnored)
replies(limit: 3) {
...commentView
}
diff --git a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql b/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
new file mode 100644
index 000000000..d81531e37
--- /dev/null
+++ b/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
@@ -0,0 +1,6 @@
+query myIgnoredUsers {
+ myIgnoredUsers {
+ id,
+ username,
+ }
+}
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index 94dc3d32e..9f27ce235 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -1,18 +1,18 @@
#import "../fragments/commentView.graphql"
-query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comment: Boolean!) {
+query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comment: Boolean!, $excludeIgnored: Boolean) {
# the comment here is for loading one comment and it's children, probably after following a permalink
# $has_comment is derived from the comment_id query param in the iframe url,
# which is in turn pulled from the host page url
comment(id: $comment_id) @include(if: $has_comment) {
...commentView
- replyCount
+ replyCount(excludeIgnored: $excludeIgnored)
replies {
...commentView
}
parent {
...commentView
- replyCount
+ replyCount(excludeIgnored: $excludeIgnored)
replies {
...commentView
}
@@ -36,15 +36,15 @@ query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comme
charCount
requireEmailConfirmation
}
- commentCount
- totalCommentCount
lastComment {
id
}
- comments(limit: 10) {
+ commentCount(excludeIgnored: $excludeIgnored)
+ totalCommentCount(excludeIgnored: $excludeIgnored)
+ comments(limit: 10, excludeIgnored: $excludeIgnored) {
...commentView
- replyCount
- replies(limit: 3) {
+ replyCount(excludeIgnored: $excludeIgnored)
+ replies(limit: 3, excludeIgnored: $excludeIgnored) {
...commentView
}
}
diff --git a/client/coral-framework/reducers/user.js b/client/coral-framework/reducers/user.js
index b8ff54380..efa967cf0 100644
--- a/client/coral-framework/reducers/user.js
+++ b/client/coral-framework/reducers/user.js
@@ -1,4 +1,4 @@
-import {Map} from 'immutable';
+import {Map, Set} from 'immutable';
import * as authActions from '../constants/auth';
import * as actions from '../constants/user';
import * as assetActions from '../constants/assets';
@@ -8,7 +8,8 @@ const initialState = Map({
profiles: [],
settings: {},
myComments: [],
- myAssets: [] // the assets from which myComments (above) originated
+ myAssets: [], // the assets from which myComments (above) originated
+ ignoredUsers: Set(),
});
const purge = user => {
@@ -38,7 +39,14 @@ export default function user (state = initialState, action) {
return state.set('myAssets', action.assets);
case actions.LOGOUT_SUCCESS:
return initialState;
- default :
- return state;
+ case 'APOLLO_MUTATION_RESULT':
+ switch (action.operationName) {
+ case 'ignoreUser':
+ return state.updateIn(['ignoredUsers'], i => i.add(action.variables.id));
+ case 'stopIgnoringUser':
+ return state.updateIn(['ignoredUsers'], i => i.delete(action.variables.id));
+ }
+ break;
}
+ return state;
}
diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index 31c3e98ea..88ead57af 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -2,6 +2,7 @@
"en": {
"MY_COMMENTS": "My Comments",
"profile": "Profile",
+ "myProfile": "My profile",
"successUpdateSettings": "The changes you have made have been applied to the comment stream on this article",
"successNameUpdate": "Your username has been updated",
"contentNotAvailable": "This content is not available",
@@ -20,6 +21,7 @@
"newCount": "View {0} new {1}",
"comment": "comment",
"comments": "comments",
+ "commentIsIgnored": "This comment is hidden because you ignored this user.",
"error": {
"emailNotVerified": "Email address {0} not verified.",
"email": "Not a valid E-Mail",
@@ -44,7 +46,7 @@
"es": {
"profile": "Pérfil",
"MY_COMMENTS": "Mis Comentarios",
- "profile": "Pérfil",
+ "myProfile": "Mi pérfil",
"successUpdateSettings": "La configuración de este articulo fue actualizada",
"successBioUpdate": "Tu biografia fue actualizada",
"contentNotAvailable": "El contenido no se encuentra disponible",
@@ -57,6 +59,7 @@
"newCount": "Ver {0} {1} más",
"comment": "commentario",
"comments": "commentarios",
+ "commentIsIgnored": "Este comentario está escondido porque has ignorado al usuario.",
"showAllComments": "Mostrar todos los comentarios",
"error": {
"emailNotVerified": "E-mail {0} no verificado.",
diff --git a/client/coral-plugin-history/Comment.css b/client/coral-plugin-history/Comment.css
index 2c0dee094..bc2134639 100644
--- a/client/coral-plugin-history/Comment.css
+++ b/client/coral-plugin-history/Comment.css
@@ -1,6 +1,7 @@
@custom-media --big-viewport (min-width: 780px);
.myComment {
+ margin: 1em 0;
border-bottom: 1px solid lightgrey;
display: flex;
align-items: baseline;
@@ -24,6 +25,9 @@
.sidebar {
ul {
+ margin-top: 0;
+ margin-bottom: 0;
+ list-style-type: none;
min-width: 136px;
}
diff --git a/client/coral-settings/components/IgnoredUsers.css b/client/coral-settings/components/IgnoredUsers.css
new file mode 100644
index 000000000..716140256
--- /dev/null
+++ b/client/coral-settings/components/IgnoredUsers.css
@@ -0,0 +1,24 @@
+.ignoredUser {
+ display: table-row;
+}
+
+.ignoredUserList {
+ display: table;
+}
+
+.ignoredUser > * {
+ display: table-cell;
+}
+
+.stopListening {
+ color: #D0011B;
+}
+
+.link {
+ text-decoration: underline;
+ cursor: pointer;
+}
+
+.stopListening:before {
+ content: '\00a0\00a0\00a0\00a0';
+}
\ No newline at end of file
diff --git a/client/coral-settings/components/IgnoredUsers.js b/client/coral-settings/components/IgnoredUsers.js
new file mode 100644
index 000000000..4bbf6cc50
--- /dev/null
+++ b/client/coral-settings/components/IgnoredUsers.js
@@ -0,0 +1,43 @@
+import React, {Component, PropTypes} from 'react';
+
+import styles from './IgnoredUsers.css';
+
+export class IgnoredUsers extends Component {
+ static propTypes = {
+ users: PropTypes.arrayOf(PropTypes.shape({
+ username: PropTypes.string,
+ id: PropTypes.string,
+ })).isRequired,
+
+ // accepts { id }
+ stopIgnoring: PropTypes.func.isRequired,
+ }
+ render() {
+ const {users, stopIgnoring} = this.props;
+ return (
+
+ );
+ }
+}
+
+export default IgnoredUsers;
diff --git a/client/coral-settings/components/ProfileHeader.css b/client/coral-settings/components/ProfileHeader.css
deleted file mode 100644
index f97c4731e..000000000
--- a/client/coral-settings/components/ProfileHeader.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.header h1 {
- margin: 4px 0;
-}
-
-.header h2 {
- font-size: 13px;
-}
-
diff --git a/client/coral-settings/components/ProfileHeader.js b/client/coral-settings/components/ProfileHeader.js
deleted file mode 100644
index 24b2222bd..000000000
--- a/client/coral-settings/components/ProfileHeader.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React, {PropTypes} from 'react';
-import styles from './ProfileHeader.css';
-
-const ProfileHeader = ({username}) => (
-
-
{username}
-
-);
-
-ProfileHeader.propTypes = {username: PropTypes.string.isRequired};
-
-export default ProfileHeader;
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index 331069058..2d756077d 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -3,10 +3,12 @@ import {compose} from 'react-apollo';
import React, {Component} from 'react';
import I18n from 'coral-framework/modules/i18n/i18n';
-import {myCommentHistory} from 'coral-framework/graphql/queries';
+import {myCommentHistory, myIgnoredUsers} from 'coral-framework/graphql/queries';
+import {stopIgnoringUser} from 'coral-framework/graphql/mutations';
import {link} from 'coral-framework/services/PymConnection';
import NotLoggedIn from '../components/NotLoggedIn';
+import IgnoredUsers from '../components/IgnoredUsers';
import {Spinner} from 'coral-ui';
import CommentHistory from 'coral-plugin-history/CommentHistory';
@@ -30,7 +32,7 @@ class ProfileContainer extends Component {
}
render() {
- const {loggedIn, asset, showSignInDialog, data} = this.props;
+ const {loggedIn, asset, showSignInDialog, data, myIgnoredUsersData, stopIgnoringUser} = this.props;
const {me} = this.props.data;
if (!loggedIn || !me) {
@@ -41,16 +43,35 @@ class ProfileContainer extends Component {
return
- {
+
{this.props.userData.username}
+ { emailAddress
+ ?
{ emailAddress }
+ : null
+ }
- // Hiding bio until moderation can get figured out
- /*
- {lang.t('allComments')} ({user.myComments.length})
- {lang.t('profileSettings')}
-
-
*/
+ {
+ myIgnoredUsersData.myIgnoredUsers && myIgnoredUsersData.myIgnoredUsers.length
+ ? (
+
+
Ignored users
+ My comments
+ {
me.comments.length ?
{lang.t('userNoComment')}
-
- // Hiding user bio pending effective moderation system.
- /*
-
- */
}
} id The ID of the asset
+ * @param {Array} excludeIgnored Exclude comments ignored by the requesting user
+ */
+const getCountsByAssetIDPersonalized = async (context, {assetId, excludeIgnored}) => {
+ const query = {
+ asset_id: assetId,
+ status: {
+ $in: ['NONE', 'ACCEPTED'],
+ },
+ };
+ const user = context.user;
+ if (excludeIgnored && user) {
+
+ // load afresh, as `user` may be from cache and not have recent ignores
+ const freshUser = await UsersService.findById(user.id);
+ const ignoredUsers = freshUser.ignoresUsers;
+ query.author_id = {$nin: ignoredUsers};
+ }
+ const count = await CommentModel.where(query).count();
+ return count;
+};
+
/**
* Returns the comment count for all comments that are public based on their
* asset ids.
@@ -72,6 +98,32 @@ const getParentCountsByAssetID = (context, asset_ids) => {
.then((results) => results.map((result) => result ? result.count : 0));
};
+/**
+ * Returns the count of top-level comments on an asset id, also filtering by personalization options.
+ *
+ * @param {Array} id The ID of the asset
+ * @param {Array} excludeIgnored Exclude comments ignored by the requesting user
+ */
+const getParentCountByAssetIDPersonalized = async (context, {assetId, excludeIgnored}) => {
+ const query = {
+ asset_id: assetId,
+ parent_id: null,
+ status: {
+ $in: ['NONE', 'ACCEPTED'],
+ },
+ };
+ const user = context.user;
+ if (excludeIgnored && user) {
+
+ // load afresh, as `user` may be from cache and not have recent ignores
+ const freshUser = await UsersService.findById(user.id);
+ const ignoredUsers = freshUser.ignoresUsers;
+ query.author_id = {$nin: ignoredUsers};
+ }
+ const count = await CommentModel.where(query).count();
+ return count;
+};
+
/**
* Returns the comment count for all comments that are public based on their
* parent ids.
@@ -104,6 +156,33 @@ const getCountsByParentID = (context, parent_ids) => {
.then((results) => results.map((result) => result ? result.count : 0));
};
+/**
+ * Returns the count of comments for the provided parent_id, also filtering by personalization options.
+ *
+ * @param {Array} id The ID of the parent comment
+ * @param {Array} excludeIgnored Exclude comments ignored by context.user
+ */
+const getCountByParentIDPersonalized = async (context, {id, excludeIgnored}) => {
+ const query = {
+ parent_id: {
+ $in: [id]
+ },
+ status: {
+ $in: ['NONE', 'ACCEPTED']
+ }
+ };
+ const user = context.user;
+ if (excludeIgnored && user) {
+
+ // load afresh, as `user` may be from cache and not have recent ignores
+ const freshUser = await UsersService.findById(user.id);
+ const ignoredUsers = freshUser.ignoresUsers;
+ query.author_id = {$nin: ignoredUsers};
+ }
+ const count = await CommentModel.where(query).count();
+ return count;
+};
+
/**
* Retrieves the count of comments based on the passed in query.
* @param {Object} context graph context
@@ -142,7 +221,7 @@ const getCommentCountByQuery = (context, {ids, statuses, asset_id, parent_id}) =
* @param {Object} context graph context
* @param {Object} query query terms to apply to the comments query
*/
-const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, author_id, limit, cursor, sort}) => {
+const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, author_id, limit, cursor, sort, excludeIgnored}) => {
let comments = CommentModel.find();
// Only administrators can search for comments with statuses that are not
@@ -184,6 +263,16 @@ const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, author_
comments = comments.where({parent_id});
}
+ if (excludeIgnored && user) {
+
+ // load afresh, as `user` may be from cache and not have recent ignores
+ const freshUser = await UsersService.findById(user.id);
+ const ignoredUsers = freshUser.ignoresUsers;
+ comments = comments.where({
+ author_id: {$nin: ignoredUsers}
+ });
+ }
+
if (cursor) {
if (sort === 'REVERSE_CHRONOLOGICAL') {
comments = comments.where({
@@ -344,8 +433,11 @@ module.exports = (context) => ({
getByQuery: (query) => getCommentsByQuery(context, query),
getCountByQuery: (query) => getCommentCountByQuery(context, query),
countByAssetID: new SharedCounterDataLoader('Comments.totalCommentCount', 3600, (ids) => getCountsByAssetID(context, ids)),
+ countByAssetIDPersonalized: (query) => getCountsByAssetIDPersonalized(context, query),
parentCountByAssetID: new SharedCounterDataLoader('Comments.countByAssetID', 3600, (ids) => getParentCountsByAssetID(context, ids)),
+ parentCountByAssetIDPersonalized: (query) => getParentCountByAssetIDPersonalized(context, query),
countByParentID: new SharedCounterDataLoader('Comments.countByParentID', 3600, (ids) => getCountsByParentID(context, ids)),
+ countByParentIDPersonalized: (query) => getCountByParentIDPersonalized(context, query),
genRecentReplies: new DataLoader((ids) => genRecentReplies(context, ids)),
genRecentComments: new DataLoader((ids) => genRecentComments(context, ids))
}
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index 48966c5e8..d68351701 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -13,11 +13,21 @@ const suspendUser = ({user}, {id, message}) => {
});
};
+const ignoreUser = async ({user}, userToIgnore) => {
+ return await UsersService.ignoreUsers(user.id, [userToIgnore.id]);
+};
+
+const stopIgnoringUser = async ({user}, userToStopIgnoring) => {
+ return await UsersService.stopIgnoringUsers(user.id, [userToStopIgnoring.id]);
+};
+
module.exports = (context) => {
let mutators = {
User: {
setUserStatus: () => Promise.reject(errors.ErrNotAuthorized),
- suspendUser: () => Promise.reject(errors.ErrNotAuthorized)
+ suspendUser: () => Promise.reject(errors.ErrNotAuthorized),
+ ignoreUser: (action) => ignoreUser(context, action),
+ stopIgnoringUser: (action) => stopIgnoringUser(context, action),
}
};
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 877b5e7aa..c260d0070 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -9,26 +9,31 @@ const Asset = {
recentComments({id}, _, {loaders: {Comments}}) {
return Comments.genRecentComments.load(id);
},
- comments({id}, {sort, limit}, {loaders: {Comments}}) {
+ comments({id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
return Comments.getByQuery({
asset_id: id,
sort,
limit,
- parent_id: null
+ parent_id: null,
+ excludeIgnored,
});
},
- commentCount({id, commentCount}, _, {loaders: {Comments}}) {
+ commentCount({id, commentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
+ if (user && excludeIgnored) {
+ return Comments.parentCountByAssetIDPersonalized({assetId: id, excludeIgnored});
+ }
if (commentCount != null) {
return commentCount;
}
-
return Comments.parentCountByAssetID.load(id);
},
- totalCommentCount({id, totalCommentCount}, _, {loaders: {Comments}}) {
+ totalCommentCount({id, totalCommentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
+ if (user && excludeIgnored) {
+ return Comments.countByAssetIDPersonalized({assetId: id, excludeIgnored});
+ }
if (totalCommentCount != null) {
return totalCommentCount;
}
-
return Comments.countByAssetID.load(id);
},
settings({settings = null}, _, {loaders: {Settings}}) {
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 2752ad0e3..19ea11efe 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -12,16 +12,20 @@ const Comment = {
recentReplies({id}, _, {loaders: {Comments}}) {
return Comments.genRecentReplies.load(id);
},
- replies({id, asset_id}, {sort, limit}, {loaders: {Comments}}) {
+ replies({id, asset_id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
return Comments.getByQuery({
asset_id,
parent_id: id,
sort,
- limit
+ limit,
+ excludeIgnored,
});
},
- replyCount({id}, _, {loaders: {Comments}}) {
- return Comments.countByParentID.load(id);
+ replyCount({id}, {excludeIgnored}, {user, loaders: {Comments}}) {
+ if (user && excludeIgnored) {
+ return Comments.countByParentIDPersonalized({id, excludeIgnored});
+ }
+ return Comments.countByParentID.load(id);
},
actions({id}, _, {user, loaders: {Actions}}) {
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 3d5ea9ad9..38183bff6 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -23,6 +23,12 @@ const RootMutation = {
suspendUser(_, {id, message}, {mutators: {User}}) {
return wrapResponse(null)(User.suspendUser({id, message}));
},
+ ignoreUser(_, {id}, {mutators: {User}}) {
+ return wrapResponse(null)(User.ignoreUser({id}));
+ },
+ stopIgnoringUser(_, {id}, {mutators: {User}}) {
+ return wrapResponse(null)(User.stopIgnoringUser({id}));
+ },
setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
return wrapResponse(null)(Comment.setCommentStatus({id, status}));
},
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 32e2e4263..b26ecabca 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -19,15 +19,15 @@ const RootQuery = {
// This endpoint is used for loading moderation queues, so hide it in the
// event that we aren't an admin.
- comments(_, {query: {action_type, statuses, asset_id, parent_id, limit, cursor, sort}}, {user, loaders: {Comments, Actions}}) {
- let query = {statuses, asset_id, parent_id, limit, cursor, sort};
+ comments(_, {query: {action_type, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored}}, {user, loaders: {Comments, Actions}}) {
+ let query = {statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored};
if (user != null && user.hasRoles('ADMIN') && action_type) {
return Actions.getByTypes({action_type, item_type: 'COMMENTS'})
.then((ids) => {
// Perform the query using the available resolver.
- return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort});
+ return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
});
}
@@ -83,6 +83,16 @@ const RootQuery = {
return user;
},
+ myIgnoredUsers: async (_, args, {user, loaders: {Users}}) => {
+
+ // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser
+ const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0];
+ if ( ! (currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
+ return [];
+ }
+ return await Users.getByQuery({ids: currentUser.ignoresUsers});
+ },
+
// This endpoint is used for loading the user moderation queues (users whose username has been flagged),
// so hide it in the event that we aren't an admin.
users(_, {query: {action_type, limit, cursor, sort}}, {user, loaders: {Users, Actions}}) {
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 3f61273d4..0aac36aaa 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -140,6 +140,9 @@ input CommentsQuery {
# Sort the results by created_at.
sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
+
+ # Exclude comments ignored by the requesting user
+ excludeIgnored: Boolean
}
# CommentCountQuery allows the ability to query comment counts by specific
@@ -185,10 +188,10 @@ type Comment {
recentReplies: [Comment]
# the replies that were made to the comment.
- replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3): [Comment]
+ replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): [Comment]
# The count of replies on a comment.
- replyCount: Int
+ replyCount(excludeIgnored: Boolean): Int
# Actions completed on the parent. Requires the `ADMIN` role.
actions: [Action]
@@ -420,13 +423,13 @@ type Asset {
recentComments: [Comment]
# The top level comments that are attached to the asset.
- comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10): [Comment]
+ comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): [Comment]
# The count of top level comments on the asset.
- commentCount: Int
+ commentCount(excludeIgnored: Boolean): Int
# The total count of all comments made on the asset.
- totalCommentCount: Int
+ totalCommentCount(excludeIgnored: Boolean): Int
# The settings (rectified with the global settings) that should be applied to
# this asset.
@@ -540,6 +543,9 @@ type RootQuery {
# role.
me: User
+ # Users that the currently logged in user ignores
+ myIgnoredUsers: [User]
+
# Users returned based on a query.
users(query: UsersQuery): [User]
@@ -706,6 +712,18 @@ type RemoveCommentTagResponse implements Response {
errors: [UserError]
}
+# Response to ignoreUser mutation
+type IgnoreUserResponse implements Response {
+ # An array of errors relating to the mutation that occured.
+ errors: [UserError]
+}
+
+# Response to stopIgnoringUser mutation
+type StopIgnoringUserResponse implements Response {
+ # An array of errors relating to the mutation that occured.
+ errors: [UserError]
+}
+
# All mutations for the application are defined on this object.
type RootMutation {
@@ -738,6 +756,12 @@ type RootMutation {
# Remove tag from comment.
removeCommentTag(id: ID!, tag: String!): RemoveCommentTagResponse
+
+ # Ignore comments by another user
+ ignoreUser(id: ID!): IgnoreUserResponse
+
+ # Stop Ignoring comments by another user
+ stopIgnoringUser(id: ID!): StopIgnoringUserResponse
}
################################################################################
diff --git a/models/user.js b/models/user.js
index e1cbb466b..2663410a7 100644
--- a/models/user.js
+++ b/models/user.js
@@ -117,7 +117,13 @@ const UserSchema = new mongoose.Schema({
type: String,
default: ''
}
- }
+ },
+
+ ignoresUsers: [{
+
+ // user id of another user
+ type: String,
+ }]
}, {
// This will ensure that we have proper timestamps available on this model.
diff --git a/services/users.js b/services/users.js
index a86a6686d..de9678089 100644
--- a/services/users.js
+++ b/services/users.js
@@ -1,3 +1,4 @@
+const assert = require('assert');
const bcrypt = require('bcrypt');
const url = require('url');
const jwt = require('jsonwebtoken');
@@ -834,4 +835,42 @@ module.exports = class UsersService {
throw err;
});
}
+
+ /**
+ * Ignore another user
+ * @param {String} userId the id of the user that is ignoring another users
+ * @param {String[]} usersToIgnore Array of user IDs to ignore
+ */
+ static ignoreUsers(userId, usersToIgnore) {
+ assert(Array.isArray(usersToIgnore), 'usersToIgnore is an array');
+ assert(usersToIgnore.every(u => typeof u === 'string'), 'usersToIgnore is an array of string user IDs');
+ if (usersToIgnore.includes(userId)) {
+ throw new Error('Users cannot ignore themselves');
+ }
+
+ // TODO: For each usersToIgnore, make sure they exist?
+ return UserModel.update({id: userId}, {
+ $addToSet: {
+ ignoresUsers: {
+ $each: usersToIgnore
+ }
+ }
+ });
+ }
+
+ /**
+ * Stop ignoring other users
+ * @param {String} userId the id of the user that is ignoring another users
+ * @param {String[]} usersToStopIgnoring Array of user IDs to stop ignoring
+ */
+ static async stopIgnoringUsers(userId, usersToStopIgnoring) {
+ assert(Array.isArray(usersToStopIgnoring), 'usersToStopIgnoring is an array');
+ assert(usersToStopIgnoring.every(u => typeof u === 'string'), 'usersToStopIgnoring is an array of string user IDs');
+ await UserModel.update({id: userId}, {
+ $pullAll: {
+ ignoresUsers: usersToStopIgnoring
+ }
+ });
+ console.log('Mongo wrote stopIgnoringUsers', usersToStopIgnoring);
+ }
};
diff --git a/test/graph/mutations/ignoreUser.js b/test/graph/mutations/ignoreUser.js
new file mode 100644
index 000000000..c5633bfb4
--- /dev/null
+++ b/test/graph/mutations/ignoreUser.js
@@ -0,0 +1,129 @@
+const expect = require('chai').expect;
+const {graphql} = require('graphql');
+
+const schema = require('../../../graph/schema');
+const Context = require('../../../graph/context');
+const UsersService = require('../../../services/users');
+const SettingsService = require('../../../services/settings');
+
+const ignoreUserMutation = `
+ mutation ignoreUser ($id: ID!) {
+ ignoreUser(id:$id) {
+ errors {
+ translation_key
+ }
+ }
+ }
+`;
+
+const getMyIgnoredUsersQuery = `
+ query myIgnoredUsers {
+ myIgnoredUsers {
+ id,
+ username
+ }
+ }
+`;
+
+describe('graph.mutations.ignoreUser', () => {
+ beforeEach(async () => {
+ await SettingsService.init();
+ });
+
+ // @TODO (bengo) - test a user can't ignore themselves
+ it('users can ignoreUser', async () => {
+ const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+ const userToIgnore = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
+ const context = new Context({user});
+ const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: userToIgnore.id});
+ if (ignoreUserResponse.errors && ignoreUserResponse.errors.length) {
+ console.error(ignoreUserResponse.errors);
+ }
+ expect(ignoreUserResponse.errors).to.be.empty;
+
+ // now check my ignored users
+ const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
+ if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
+ console.error(myIgnoredUsersResponse.errors);
+ }
+ expect(myIgnoredUsersResponse.errors).to.be.empty;
+ const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
+ expect(myIgnoredUsers.length).to.equal(1);
+ expect(myIgnoredUsers[0].id).to.equal(userToIgnore.id);
+ expect(myIgnoredUsers[0].username).to.equal(userToIgnore.username);
+ });
+
+ it('users cannot ignore themselves', async () => {
+ const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+ const context = new Context({user});
+ const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: user.id});
+ expect(ignoreUserResponse.errors).to.not.be.empty;
+
+ // now check my ignored users
+ const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
+ if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
+ console.error(myIgnoredUsersResponse.errors);
+ }
+ expect(myIgnoredUsersResponse.errors).to.be.empty;
+ const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
+ expect(myIgnoredUsers.length).to.equal(0);
+ });
+
+});
+
+describe('graph.mutations.stopIgnoringUser', () => {
+ beforeEach(async () => {
+ await SettingsService.init();
+ });
+
+ it('users can stop ignoring another user they ignore', async () => {
+
+ // We're going to ignore 2 users,
+ // then stopIgnoring 1 of them
+ // then assert myIgnoredUsers only lists the one remaining
+ const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+ const usersToIgnore = await Promise.all([
+ UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB'),
+ UsersService.createLocalUser('usernameC@example.com', 'password', 'usernameC'),
+ ]);
+ const context = new Context({user});
+
+ // ignore two users
+ const ignoreUserResponses = await Promise.all(usersToIgnore.map(u => graphql(schema, ignoreUserMutation, {}, context, {id: u.id})));
+ ignoreUserResponses.forEach(response => {
+ if (response.errors && response.errors.length) {
+ console.error(response.errors);
+ }
+ expect(response.errors).to.be.empty;
+ });
+
+ const stopIgnoringUserMutation = `
+ mutation stopIgnoringUser ($id: ID!) {
+ stopIgnoringUser(id:$id) {
+ errors {
+ translation_key
+ }
+ }
+ }
+ `;
+
+ // stop ignoring one user
+ const stopIgnoringUserResponse = await graphql(schema, stopIgnoringUserMutation, {}, context, {id: usersToIgnore[0].id});
+ if (stopIgnoringUserResponse.errors && stopIgnoringUserResponse.errors.length) {
+ console.error(stopIgnoringUserResponse.errors);
+ }
+ expect(stopIgnoringUserResponse.errors).to.be.empty;
+
+ // now check my ignored users
+ const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
+ if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
+ console.error(myIgnoredUsersResponse.errors);
+ }
+ expect(myIgnoredUsersResponse.errors).to.be.empty;
+ const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
+ expect(myIgnoredUsers.length).to.equal(1);
+ expect(myIgnoredUsers[0].id).to.equal(usersToIgnore[1].id);
+ expect(myIgnoredUsers[0].username).to.equal(usersToIgnore[1].username);
+ });
+
+});
diff --git a/test/graph/queries/asset.js b/test/graph/queries/asset.js
new file mode 100644
index 000000000..ba31fe330
--- /dev/null
+++ b/test/graph/queries/asset.js
@@ -0,0 +1,93 @@
+const expect = require('chai').expect;
+const {graphql} = require('graphql');
+
+const schema = require('../../../graph/schema');
+const Context = require('../../../graph/context');
+const UsersService = require('../../../services/users');
+const SettingsService = require('../../../services/settings');
+const Asset = require('../../../models/asset');
+const CommentsService = require('../../../services/comments');
+
+describe('graph.queries.asset', () => {
+ beforeEach(async () => {
+ await SettingsService.init();
+ });
+
+ it('can get comments edge', async () => {
+ const assetId = 'fakeAssetId';
+ const assetUrl = 'https://bengo.is';
+ await Asset.create({id: assetId, url: assetUrl});
+
+ const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+ const context = new Context({user});
+
+ await CommentsService.publicCreate([1, 2].map(() => ({
+ author_id: user.id,
+ asset_id: assetId,
+ body: `hello there! ${ String(Math.random()).slice(2)}`,
+ })));
+
+ const assetCommentsQuery = `
+ query assetCommentsQuery($assetId: ID!, $assetUrl: String!) {
+ asset(id: $assetId, url: $assetUrl) {
+ comments(limit: 10) {
+ id,
+ body,
+ }
+ }
+ }
+ `;
+ const assetCommentsResponse = await graphql(schema, assetCommentsQuery, {}, context, {assetId, assetUrl});
+ const comments = assetCommentsResponse.data.asset.comments;
+ expect(comments.length).to.equal(2);
+ });
+
+ it('can query comments edge to exclude comments ignored by user', async () => {
+ const assetId = 'fakeAssetId1';
+ const assetUrl = 'https://bengo.is/1';
+ await Asset.create({id: assetId, url: assetUrl});
+
+ const userA = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+ const userB = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
+ const userC = await UsersService.createLocalUser('usernameC@example.com', 'password', 'usernameC');
+ const context = new Context({user: userA});
+
+ // create 2 comments each for userB, userC
+ await Promise.all([userB, userC].map(user => CommentsService.publicCreate([1, 2].map(() => ({
+ author_id: user.id,
+ asset_id: assetId,
+ body: `hello there! ${ String(Math.random()).slice(2)}`,
+ })))));
+
+ // ignore userB
+ const ignoreUserMutation = `
+ mutation ignoreUser ($id: ID!) {
+ ignoreUser(id:$id) {
+ errors {
+ translation_key
+ }
+ }
+ }
+ `;
+ const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: userB.id});
+ if (ignoreUserResponse.errors && ignoreUserResponse.errors.length) {
+ console.error(ignoreUserResponse.errors);
+ }
+ expect(ignoreUserResponse.errors).to.be.empty;
+
+ const assetCommentsWithoutIgnoredQuery = `
+ query assetCommentsQuery($assetId: ID!, $assetUrl: String!, $excludeIgnored: Boolean!) {
+ asset(id: $assetId, url: $assetUrl) {
+ comments(limit: 10, excludeIgnored: $excludeIgnored) {
+ id,
+ body,
+ }
+ }
+ }
+ `;
+ const assetCommentsResponse = await graphql(schema, assetCommentsWithoutIgnoredQuery, {}, context, {assetId, assetUrl, excludeIgnored: true});
+ const comments = assetCommentsResponse.data.asset.comments;
+ expect(comments.length).to.equal(2);
+ });
+
+});
diff --git a/test/server/services/users.js b/test/server/services/users.js
index 22fe7ddd5..04c5c457e 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -169,6 +169,24 @@ describe('services.UsersService', () => {
});
});
+ describe('#ignoreUser', () => {
+
+ // @TODO: assert cannot ignore yourself
+
+ it('should add user id to ignoredUsers set', async () => {
+ const user = mockUsers[0];
+ const usersToIgnore = [mockUsers[1], mockUsers[2]];
+ await UsersService.ignoreUsers(user.id, usersToIgnore.map(u => u.id));
+ const userAfterIgnoring = await UsersService.findById(user.id);
+ expect(userAfterIgnoring.ignoresUsers.length).to.equal(2);
+
+ // ignore same user another time, make sure it's not added to the list.
+ await UsersService.ignoreUsers(user.id, usersToIgnore.slice(0, 1).map(u => u.id));
+ const userAfterIgnoring2 = await UsersService.findById(user.id);
+ expect(userAfterIgnoring2.ignoresUsers.length).to.equal(2);
+ });
+ });
+
describe('#ban', () => {
it('should set the status to banned', () => {
return UsersService