Merge branch 'master' into new-flags

2026-09-10 12:43:11 +08:00 · 2017-09-19 17:12:56 -06:00
parent 961111c3f7 cee247f065
commit 4913eda974
10 changed files with 183 additions and 47 deletions
@@ -50,6 +50,14 @@ const RootQuery = {
    return Comments.getCountByQuery(query);
  },

+  async userCount(_, {query}, {user, loaders: {Users}}) {
+    if (user == null || !user.can(SEARCH_OTHER_USERS)) {
+      return null;
+    }
+
+    return Users.getCountByQuery(query);
+  },
+
  assetMetrics(_, query, {user, loaders: {Metrics: {Assets}}}) {
    if (user == null || !user.can(SEARCH_ASSETS)) {
      return null;