Merge branch 'master' into new-flags

graph/typeDefs.graphql

@@ -343,6 +343,18 @@ input CommentCountQuery {
   tags: [String!]
 }
 
+# UserCountQuery allows the ability to query user counts by specific
+# methods.
+input UserCountQuery {
+
+  # comments returned will only be ones which have at least one action of this
+  # type.
+  action_type: ACTION_TYPE
+
+  # Current status of a user.
+  statuses: [USER_STATUS]
+}
+
 type EditInfo {
   edited: Boolean!
   editableUntil: Date
@@ -840,6 +852,10 @@ type RootQuery {
   # expensive as it is not batched. Requires the `ADMIN` role.
   commentCount(query: CommentCountQuery!): Int
 
+  # Return the count of users satisfied by the query. Note that this edge is
+  # expensive as it is not batched. This field is restricted.
+  userCount(query: UserCountQuery!): Int
+
   # The currently logged in user based on the request. Requires any logged in
   # role.
   me: User