SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[chore] Settings refactor fix 2 (#1357)

Browse Source 
* fix emoji query tagging

* fix proxy url for gts instance

* fix: don't flash callback error on authorize flow
This commit is contained in:
f0x52
2023-01-18 16:41:00 +01:00
committed by GitHub
parent 13e3aaaed1
commit 747683ba54
11 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/source/settings/lib/query/admin/custom-emoji.js
View File

@@ -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" }]
})
});

2
web/source/settings/lib/query/base.js
View File

@@ -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: () => ({

5
web/source/settings/lib/query/oauth.js
View File

@@ -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;