wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-19 12:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user-sort

Browse Source 
Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js
This commit is contained in:
Chi Vinh Le
2017-08-25 21:55:00 +07:00
parent 7f899b0440 0ecf1cedc3
commit 48595a1bbf
91 changed files with 1499 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-featured-comments/client/containers/ModSubscription.js
+2 -2
View File
@@ -21,14 +21,14 @@ class ModSubscription extends React.Component {
assetId: this.props.data.variables.asset_id,
},
updateQuery: (prev, {subscriptionData: {data: {commentFeatured: {user, comment}}}}) => {
const notify = this.props.user.id === user.id
const notifyText = this.props.user.id === user.id
? ''
: t(
'talk-plugin-featured-comments.notify_featured',
user.username,
prepareNotificationText(comment.body),
);
return this.props.handleCommentChange(prev, comment, notify);
return this.props.handleCommentChange(prev, comment, notifyText);
},
},
{