From e90ce7f4c3265cbc052470680d79bf2e6be4915c Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Tue, 16 May 2017 10:20:16 -0600 Subject: [PATCH] fixed merge issue --- graph/resolvers/root_query.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js index 34928ee52..7fd072854 100644 --- a/graph/resolvers/root_query.js +++ b/graph/resolvers/root_query.js @@ -79,19 +79,6 @@ const RootQuery = { return user; }, - myIgnoredUsers: async (_, args, {user, loaders: {Users}}) => { - if (!user) { - return null; - } - - // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser - const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0]; - if (!(currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) { - return []; - } - return await Users.getByQuery({ids: currentUser.ignoresUsers}); - }, - // this returns an arbitrary user user(_, {id}, {user, loaders: {Users}}) { if (user == null || !user.hasRoles('ADMIN')) {