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

Merge branch 'my-comment-reactions' of github.com:coralproject/talk into my-comment-reactions

Browse Source
This commit is contained in:
Belen Curcio
2017-08-29 09:03:02 -03:00
parent 1053c55d19 a76464ea16
commit 9140688c65
6 changed files with 84 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -1,4 +1,5 @@
# Talk [![CircleCI](https://circleci.com/gh/coralproject/talk.svg?style=svg)](https://circleci.com/gh/coralproject/talk)
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://dashboard.heroku.com/new?template=https%3A%2F%2Fgithub.com%2Fcoralproject%2Ftalk&env[TALK_FACEBOOK_APP_ID]=ignore&env[TALK_FACEBOOK_APP_SECRET]=ignore)
Online comments are broken. Our open-source Talk tool rethinks how moderation, comment display, and conversation function, creating the opportunity for safer, smarter discussions around your work. [Read more about Talk here.](https://coralproject.net/products/talk.html)
@@ -19,7 +20,7 @@ endpoint when the server is running with built assets.
- Blog: https://blog.coralproject.net
- Community Guides for Journalism: https://guides.coralproject.net/
- Community Guides for Journalism: https://guides.coralproject.net/
## License
app.json
+9 -5
View File
@@ -1,10 +1,15 @@
{
"name": "The Coral Project: Talk",
"env": {
"TALK_SESSION_SECRET": {
"TALK_JWT_SECRET": {
"description": "The session secret",
"generator": "secret"
},
"TALK_ROOT_URL": {
"description": "Please copy the App Name you choose above. If you did not choose one, please do so now and copy it here. Talk on Heroku will not work without this setting.",
"value":"https://<COPY APP NAME HERE>.herokuapp.com",
"required": true
},
"TALK_FACEBOOK_APP_ID": {
"value": "",
"required": true
@@ -14,8 +19,7 @@
"required": true
},
"NODE_ENV": "production",
"TALK_SMTP_PORT": "2525",
"REWRITE_ENV": "TALK_PORT:PORT,TALK_MONGO_URL:MONGO_URI,TALK_REDIS_URL:REDIS_URL,TALK_SMTP_HOST:POSTMARK_SMTP_SERVER,TALK_SMTP_USERNAME:POSTMARK_API_TOKEN,TALK_SMTP_PASSWORD:POSTMARK_API_TOKEN",
"REWRITE_ENV": "TALK_MONGO_URL:MONGO_URI,TALK_REDIS_URL:REDIS_URL,TALK_SMTP_HOST:MAILGUN_SMTP_SERVER,TALK_SMTP_PORT:MAILGUN_SMTP_PORT,TALK_SMTP_USERNAME:MAILGUN_SMTP_LOGIN,TALK_SMTP_PASSWORD:MAILGUN_SMTP_PASSWORD",
"NPM_CONFIG_PRODUCTION": "false"
},
"addons": [{
@@ -25,8 +29,8 @@
"plan": "rediscloud:30",
"as": "REDIS"
}, {
"plan": "postmark:10k",
"as": "POSTMARK"
"plan": "mailgun:starter",
"as": "MAILGUN"
}],
"image": "heroku/nodejs",
"success_url": "/admin/install"
client/coral-embed-stream/src/components/Comment.js
+8
View File
@@ -447,6 +447,14 @@ export default class Comment extends React.Component {
{isStaff(comment.tags) ? <TagLabel>Staff</TagLabel> : null}
<Slot
className={cn('talk-stream-comment-author-tags')}
fill="commentAuthorTags"
queryData={queryData}
{...slotProps}
inline
/>
<span className={`${styles.bylineSecondary} talk-stream-comment-user-byline`} >
<PubDate created_at={comment.created_at} className={'talk-stream-comment-published-date'} />
{
client/coral-embed-stream/src/containers/Comment.js
+2 -1
View File
@@ -16,7 +16,8 @@ const slots = [
'commentContent',
'commentReactions',
'commentAvatar',
'commentAuthorName'
'commentAuthorName',
'commentAuthorTags'
];
/**
config.js
+1 -1
View File
@@ -108,7 +108,7 @@ const CONFIG = {
//------------------------------------------------------------------------------
// Port to bind to.
PORT: process.env.TALK_PORT || '3000',
PORT: process.env.TALK_PORT || process.env.PORT || '3000',
// The URL for this Talk Instance as viewable from the outside.
ROOT_URL: process.env.TALK_ROOT_URL || null,
test/server/graph/queries/asset.js
+62 -23
View File
@@ -10,10 +10,13 @@ const CommentsService = require('../../../../services/comments');
const {expect} = require('chai');
describe('graph.queries.asset', () => {
let asset, users;
let assets, users, comments;
beforeEach(async () => {
await SettingsService.init();
asset = await Asset.create({id: '1', url: 'https://example.com'});
assets = await Asset.create([
{id: '1', url: 'https://example.com/?id=1'},
{id: '2', url: 'https://example.com/?id=2'}
]);
users = await UsersService.createLocalUsers([
{
email: 'usernameA@example.com',
@@ -31,17 +34,63 @@ describe('graph.queries.asset', () => {
username: 'usernameC'
}
]);
comments = await CommentsService.publicCreate([0, 1, 0, 1].map((idx) => ({
author_id: users[idx].id,
asset_id: assets[idx].id,
body: `hello there! ${String(Math.random()).slice(2)}`,
})));
});
it('will not show the same asset stream across multiple assets', async () => {
const context = new Context({user: users[0]});
const query = `
fragment assetFragment on Asset {
comments(query: {limit: 2}) {
nodes {
id
}
hasNextPage
}
}
query assetQuery($id: ID!, $otherID: ID!) {
asset(id: $id) {
...assetFragment
}
otherAsset: asset(id: $otherID) {
...assetFragment
}
}
`;
let res = await graphql(schema, query, {}, context, {id: assets[0].id, otherID: assets[1].id});
if (res.errors) {
console.error(res.errors);
}
expect(res.errors).is.empty;
let {asset: {comments: asset}, otherAsset: {comments: otherAsset}} = res.data;
expect(asset.nodes).to.have.length(2);
expect(asset.hasNextPage).to.be.false;
expect(asset.nodes[0]).to.have.property('id', comments[2].id);
expect(asset.nodes[1]).to.have.property('id', comments[0].id);
expect(otherAsset.nodes).to.have.length(2);
expect(otherAsset.hasNextPage).to.be.false;
expect(otherAsset.nodes[0]).to.have.property('id', comments[3].id);
expect(otherAsset.nodes[1]).to.have.property('id', comments[1].id);
for (let node of asset.nodes) {
for (let otherNode of otherAsset.nodes) {
expect(node.id).to.not.equal(otherNode.id);
}
}
});
it('can get comments edge', async () => {
const context = new Context({user: users[0]});
await CommentsService.publicCreate([1, 2].map(() => ({
author_id: users[0].id,
asset_id: asset.id,
body: `hello there! ${String(Math.random()).slice(2)}`,
})));
const assetCommentsQuery = `
query assetCommentsQuery($id: ID!) {
asset(id: $id) {
@@ -58,8 +107,7 @@ describe('graph.queries.asset', () => {
}
}
`;
const res = await graphql(schema, assetCommentsQuery, {}, context, {id: asset.id});
expect(res.errors).is.empty;
const res = await graphql(schema, assetCommentsQuery, {}, context, {id: assets[0].id});
const {nodes, startCursor, endCursor, hasNextPage} = res.data.asset.comments;
expect(nodes.length).to.equal(2);
expect(startCursor).to.equal(nodes[0].created_at);
@@ -70,12 +118,6 @@ describe('graph.queries.asset', () => {
it('can query comments edge to exclude comments ignored by user', async () => {
const context = new Context({user: users[0]});
await Promise.all(users.slice(1, 3).map((user) => CommentsService.publicCreate({
author_id: user.id,
asset_id: asset.id,
body: `hello there! ${String(Math.random()).slice(2)}`,
})));
// Add the second user to the list of ignored users.
context.user.ignoresUsers.push(users[1].id);
@@ -94,16 +136,13 @@ describe('graph.queries.asset', () => {
{
const res = await graphql(schema, query, {}, context, {
id: asset.id,
url: asset.url,
id: assets[0].id,
url: assets[0].url,
excludeIgnored: true
});
if (res.errors && res.errors.length) {
console.error(res.errors);
}
expect(res.errors).is.empty;
const nodes = res.data.asset.comments.nodes;
expect(nodes.length).to.equal(1);
const {nodes} = res.data.asset.comments;
expect(nodes.length).to.equal(2);
}
});