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

Merge branch 'master' of github.com:coralproject/talk into moderate-bio

Browse Source
This commit is contained in:
David Jay
2017-01-26 16:38:43 -05:00
parent b6d8a90084 b35336d1ed
commit f06edec6a2
50 changed files with 694 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/loaders/comments.js
+39 -25
View File
@@ -7,31 +7,41 @@ const CommentModel = require('../../models/comment');
const CommentsService = require('../../services/comments');
/**
* Retrieves comments by an array of asset id's.
* Retrieves comments by an array of asset id's, results are returned in reverse
* chronological order.
* @param {Array} ids array of ids to lookup
*/
const genCommentsByAssetID = (context, ids) => CommentModel.find({
asset_id: {
$in: ids
},
parent_id: null,
status: {
$in: [null, 'ACCEPTED']
}
}).then(util.arrayJoinBy(ids, 'asset_id'));
const genCommentsByAssetID = (context, ids) => {
return CommentModel.find({
asset_id: {
$in: ids
},
parent_id: null,
status: {
$in: [null, 'ACCEPTED']
}
})
.sort({created_at: -1})
.then(util.arrayJoinBy(ids, 'asset_id'));
};
/**
* Retrieves comments by an array of parent ids.
* Retrieves comments by an array of parent ids, results are returned in
* chronological order.
* @param {Array} ids array of ids to lookup
*/
const genCommentsByParentID = (context, ids) => CommentModel.find({
parent_id: {
$in: ids
},
status: {
$in: [null, 'ACCEPTED']
}
}).then(util.arrayJoinBy(ids, 'parent_id'));
const genCommentsByParentID = (context, ids) => {
return CommentModel.find({
parent_id: {
$in: ids
},
status: {
$in: [null, 'ACCEPTED']
}
})
.sort({created_at: 1})
.then(util.arrayJoinBy(ids, 'parent_id'));
};
const getCommentsByStatusAndAssetID = (context, {status = null, asset_id = null}) => {
@@ -52,7 +62,7 @@ const getCommentsByActionTypeAndAssetID = (context, {action_type, asset_id = nul
id: {
$in: actions.map((action) => action.item_id)
}
});
}).sort({created_at: 1});
if (asset_id) {
comments = comments.where({asset_id});
@@ -62,11 +72,15 @@ const getCommentsByActionTypeAndAssetID = (context, {action_type, asset_id = nul
});
};
const genCommentsByAuthorID = (context, authorIDs) => CommentModel.find({
author_id: {
$in: authorIDs
}
}).then(util.arrayJoinBy(authorIDs, 'author_id'));
const genCommentsByAuthorID = (context, authorIDs) => {
return CommentModel.find({
author_id: {
$in: authorIDs
}
})
.sort({created_at: -1})
.then(util.arrayJoinBy(authorIDs, 'author_id'));
};
/**
* Creates a set of loaders based on a GraphQL context.
graph/mutators/action.js
+1 -1
View File
@@ -42,7 +42,7 @@ module.exports = (context) => {
// TODO: refactor to something that'll return an error in the event an attempt
// is made to mutate state while not logged in. There's got to be a better way
// to do this.
if (context.user) {
if (context.user && context.user.can('mutation:createAction', 'mutation:deleteAction')) {
return {
Action: {
create: (action) => createAction(context, action),
graph/mutators/comment.js
+1 -1
View File
@@ -144,7 +144,7 @@ module.exports = (context) => {
// TODO: refactor to something that'll return an error in the event an attempt
// is made to mutate state while not logged in. There's got to be a better way
// to do this.
if (context.user) {
if (context.user && context.user.can('mutation:createComment')) {
return {
Comment: {
create: (comment) => createPublicComment(context, comment)
graph/mutators/user.js
+1 -1
View File
@@ -15,7 +15,7 @@ module.exports = (context) => {
// TODO: refactor to something that'll return an error in the event an attempt
// is made to mutate state while not logged in. There's got to be a better way
// to do this.
if (context.user) {
if (context.user && context.user.can('mutation:updateUserSettings')) {
return {
User: {
updateSettings: (settings) => updateUserSettings(context, settings)
graph/typeDefs.graphql
+177
View File
@@ -0,0 +1,177 @@
interface ActionableItem {
id: ID!
}
type UserSettings {
# bio of the user.
bio: String
}
input CommentsInput {
# current status of a comment.
status: COMMENT_STATUS
# asset that a comment is on.
asset_id: ID
# action type to find comments that have an action with.
action_type: ACTION_TYPE
}
# Any person who can author comments, create actions, and view comments on a
# stream.
type User {
id: ID!
# display name of a user.
displayName: String!
# actions against a specific user.
actions: [ActionSummary]
# settings for a user.
settings: UserSettings
# returns all comments based on a query.
comments(query: CommentsInput): [Comment]
}
type Comment {
id: ID!
# the actual comment data.
body: String!
# the user who authored the comment.
user: User
# the replies that were made to the comment.
replies(limit: Int = 3): [Comment]
# the actions made against a comment.
actions: [ActionSummary]
# the asset that a comment was made on.
asset: Asset
# the current status of a comment.
status: COMMENT_STATUS
# the time when the comment was created
created_at: String!
}
enum ITEM_TYPE {
ASSETS
COMMENTS
USERS
}
enum ACTION_TYPE {
LIKE
FLAG
}
type Action {
id: ID!
action_type: ACTION_TYPE!
item_id: ID!
item_type: ITEM_TYPE!
item: ActionableItem
user: User!
updated_at: String
created_at: String
}
type ActionSummary {
action_type: ACTION_TYPE!
item_type: ITEM_TYPE!
count: Int
current_user: Action
}
enum MODERATION_MODE {
PRE
POST
}
type Settings {
moderation: MODERATION_MODE!
infoBoxEnable: Boolean
infoBoxContent: String
closeTimeout: Int
closedMessage: String
charCountEnable: Boolean
charCount: Int
requireEmailConfirmation: Boolean
}
type Asset {
id: ID!
title: String
url: String
comments: [Comment]
settings: Settings!
closedAt: String
created_at: String
}
enum COMMENT_STATUS {
ACCEPTED
REJECTED
PREMOD
}
type RootQuery {
# retrieves site wide settings and defaults.
settings: Settings
# retrieves all assets.
assets: [Asset]
# retrieves a specific asset.
asset(id: ID, url: String): Asset
# retrieves comments based on the input query.
comments(query: CommentsInput): [Comment]
# retrieves the current logged in user.
me: User
}
input CreateActionInput {
# the type of action.
action_type: ACTION_TYPE!
# the type of the item.
item_type: ITEM_TYPE!
# the id of the item that is related to the action.
item_id: ID!
}
input UpdateUserSettingsInput {
# user bio
bio: String!
}
type RootMutation {
# creates a comment on the asset.
createComment(asset_id: ID!, parent_id: ID, body: String!): Comment
# creates an action based on an input.
createAction(action: CreateActionInput!): Action
# delete an action based on the action id.
deleteAction(id: ID!): Boolean
# updates a user's settings, it will return if the query was successful.
updateUserSettings(settings: UpdateUserSettingsInput!): Boolean
}
schema {
query: RootQuery
mutation: RootMutation
}
graph/typeDefs.js
+4 -178
View File
@@ -2,184 +2,10 @@
// `RootQuery.asset(id: ID, url: String!)` because we'll always need the url, if
// this change is done now everything will likely break on the front end.
const typeDefs = [`
interface ActionableItem {
id: ID!
}
const fs = require('fs');
const path = require('path');
type UserSettings {
# bio of the user.
bio: String
}
input CommentsInput {
# current status of a comment.
status: COMMENT_STATUS
# asset that a comment is on.
asset_id: ID
# action type to find comments that have an action with.
action_type: ACTION_TYPE
}
# Any person who can author comments, create actions, and view comments on a
# stream.
type User {
id: ID!
# display name of a user.
displayName: String!
# actions against a specific user.
actions: [ActionSummary]
# settings for a user.
settings: UserSettings
# returns all comments based on a query.
comments(query: CommentsInput): [Comment]
}
type Comment {
id: ID!
# the actual comment data.
body: String!
# the user who authored the comment.
user: User
# the replies that were made to the comment.
replies(limit: Int = 3): [Comment]
# the actions made against a comment.
actions: [ActionSummary]
# the asset that a comment was made on.
asset: Asset
# the current status of a comment.
status: COMMENT_STATUS
# the time when the comment was created
created_at: String!
}
enum ITEM_TYPE {
ASSETS
COMMENTS
USERS
}
enum ACTION_TYPE {
LIKE
FLAG
}
type Action {
id: ID!
action_type: ACTION_TYPE!
item_id: ID!
item_type: ITEM_TYPE!
item: ActionableItem
user: User!
updated_at: String
created_at: String
}
type ActionSummary {
action_type: ACTION_TYPE!
item_type: ITEM_TYPE!
count: Int
current_user: Action
}
enum MODERATION_MODE {
PRE
POST
}
type Settings {
moderation: MODERATION_MODE!
infoBoxEnable: Boolean
infoBoxContent: String
closeTimeout: Int
closedMessage: String
charCountEnable: Boolean
charCount: Int
requireEmailConfirmation: Boolean
}
type Asset {
id: ID!
title: String
url: String
comments: [Comment]
settings: Settings!
closedAt: String
created_at: String
}
enum COMMENT_STATUS {
ACCEPTED
REJECTED
PREMOD
}
type RootQuery {
# retrieves site wide settings and defaults.
settings: Settings
# retrieves all assets.
assets: [Asset]
# retrieves a specific asset.
asset(id: ID, url: String): Asset
# retrieves comments based on the input query.
comments(query: CommentsInput): [Comment]
# retrieves the current logged in user.
me: User
}
input CreateActionInput {
# the type of action.
action_type: ACTION_TYPE!
# the type of the item.
item_type: ITEM_TYPE!
# the id of the item that is related to the action.
item_id: ID!
}
input UpdateUserSettingsInput {
# user bio
bio: String!
}
type RootMutation {
# creates a comment on the asset.
createComment(asset_id: ID!, parent_id: ID, body: String!): Comment
# creates an action based on an input.
createAction(action: CreateActionInput!): Action
# delete an action based on the action id.
deleteAction(id: ID!): Boolean
# updates a user's settings, it will return if the query was successful.
updateUserSettings(settings: UpdateUserSettingsInput!): Boolean
}
schema {
query: RootQuery
mutation: RootMutation
}
`];
// Load the typeDefs from the graphql file.
const typeDefs = fs.readFileSync(path.join(__dirname, 'typeDefs.graphql'), 'utf8');
module.exports = typeDefs;