diff options
Diffstat (limited to 'web/source/settings/lib/query')
| -rw-r--r-- | web/source/settings/lib/query/admin/custom-emoji.js | 20 | ||||
| -rw-r--r-- | web/source/settings/lib/query/base.js | 2 | ||||
| -rw-r--r-- | web/source/settings/lib/query/oauth.js | 5 |
3 files changed, 14 insertions, 13 deletions
diff --git a/web/source/settings/lib/query/admin/custom-emoji.js b/web/source/settings/lib/query/admin/custom-emoji.js index 94917f382..e8fe08852 100644 --- a/web/source/settings/lib/query/admin/custom-emoji.js +++ b/web/source/settings/lib/query/admin/custom-emoji.js @@ -23,7 +23,7 @@ const Promise = require("bluebird"); const { unwrapRes } = require("../lib"); module.exports = (build) => ({ - getAllEmoji: build.query({ + listEmoji: build.query({ query: (params = {}) => ({ url: "/api/v1/admin/custom_emojis", params: { @@ -33,15 +33,15 @@ module.exports = (build) => ({ }), providesTags: (res) => res - ? [...res.map((emoji) => ({ type: "Emojis", id: emoji.id })), { type: "Emojis", id: "LIST" }] - : [{ type: "Emojis", id: "LIST" }] + ? [...res.map((emoji) => ({ type: "Emoji", id: emoji.id })), { type: "Emoji", id: "LIST" }] + : [{ type: "Emoji", id: "LIST" }] }), getEmoji: build.query({ query: (id) => ({ url: `/api/v1/admin/custom_emojis/${id}` }), - providesTags: (res, error, id) => [{ type: "Emojis", id }] + providesTags: (res, error, id) => [{ type: "Emoji", id }] }), addEmoji: build.mutation({ @@ -56,8 +56,8 @@ module.exports = (build) => ({ }, invalidatesTags: (res) => res - ? [{ type: "Emojis", id: "LIST" }, { type: "Emojis", id: res.id }] - : [{ type: "Emojis", id: "LIST" }] + ? [{ type: "Emoji", id: "LIST" }, { type: "Emoji", id: res.id }] + : [{ type: "Emoji", id: "LIST" }] }), editEmoji: build.mutation({ @@ -74,8 +74,8 @@ module.exports = (build) => ({ }, invalidatesTags: (res) => res - ? [{ type: "Emojis", id: "LIST" }, { type: "Emojis", id: res.id }] - : [{ type: "Emojis", id: "LIST" }] + ? [{ type: "Emoji", id: "LIST" }, { type: "Emoji", id: res.id }] + : [{ type: "Emoji", id: "LIST" }] }), deleteEmoji: build.mutation({ @@ -83,7 +83,7 @@ module.exports = (build) => ({ method: "DELETE", url: `/api/v1/admin/custom_emojis/${id}` }), - invalidatesTags: (res, error, id) => [{ type: "Emojis", id }] + invalidatesTags: (res, error, id) => [{ type: "Emoji", id }] }), searchStatusForEmoji: build.mutation({ @@ -167,7 +167,7 @@ module.exports = (build) => ({ } }); }, - invalidatesTags: () => [{ type: "Emojis", id: "LIST" }] + invalidatesTags: () => [{ type: "Emoji", id: "LIST" }] }) }); diff --git a/web/source/settings/lib/query/base.js b/web/source/settings/lib/query/base.js index 05d31925f..d9d62d356 100644 --- a/web/source/settings/lib/query/base.js +++ b/web/source/settings/lib/query/base.js @@ -72,7 +72,7 @@ function instanceBasedQuery(args, api, extraOptions) { module.exports = createApi({ reducerPath: "api", baseQuery: instanceBasedQuery, - tagTypes: ["Auth"], + tagTypes: ["Auth", "Emoji"], endpoints: (build) => ({ instance: build.query({ query: () => ({ diff --git a/web/source/settings/lib/query/oauth.js b/web/source/settings/lib/query/oauth.js index 4fac50429..34be4ffdc 100644 --- a/web/source/settings/lib/query/oauth.js +++ b/web/source/settings/lib/query/oauth.js @@ -121,10 +121,11 @@ const endpoints = (build) => ({ }).then(unwrapRes).then((app) => { app.scopes = formData.scopes; - api.dispatch(oauth.setInstance({ + api.dispatch(oauth.authorize({ instance: instance, registration: app, - loginState: "callback" + loginState: "callback", + expectingRedirect: true })); return app; |