mirror of
https://github.com/wassname/talk.git
synced 2026-08-17 11:27:52 +08:00
Merge branch 'master' into user-sort
This commit is contained in:
@@ -22,13 +22,6 @@ const User = {
|
||||
}
|
||||
|
||||
},
|
||||
created_at({roles, created_at}, _, {user}) {
|
||||
if (user && user.can(SEARCH_OTHER_USERS)) {
|
||||
return created_at;
|
||||
}
|
||||
|
||||
return null;
|
||||
},
|
||||
comments({id}, {query}, {loaders: {Comments}, user}) {
|
||||
|
||||
// If the user is not an admin, only return comment list for the owner of
|
||||
|
||||
@@ -79,7 +79,7 @@ type User {
|
||||
username: String!
|
||||
|
||||
# creation date of user
|
||||
created_at: String!
|
||||
created_at: Date!
|
||||
|
||||
# Action summaries against the user.
|
||||
action_summaries: [ActionSummary!]!
|
||||
|
||||
Reference in New Issue
Block a user