diff options
Diffstat (limited to 'web/source/settings/lib')
| -rw-r--r-- | web/source/settings/lib/query/admin/index.ts | 2 | ||||
| -rw-r--r-- | web/source/settings/lib/query/admin/reports/index.ts | 4 | ||||
| -rw-r--r-- | web/source/settings/lib/query/gts-api.ts | 1 | ||||
| -rw-r--r-- | web/source/settings/lib/query/user/interactions.ts | 97 | ||||
| -rw-r--r-- | web/source/settings/lib/types/interaction.ts | 82 |
5 files changed, 183 insertions, 3 deletions
diff --git a/web/source/settings/lib/query/admin/index.ts b/web/source/settings/lib/query/admin/index.ts index fba028853..86388e273 100644 --- a/web/source/settings/lib/query/admin/index.ts +++ b/web/source/settings/lib/query/admin/index.ts @@ -114,7 +114,7 @@ const extended = gtsApi.injectEndpoints({ method: "POST", url: `/api/v1/admin/accounts/${id}/${approve_or_reject}`, asForm: true, - body: approve_or_reject === "reject" ?? formData, + body: approve_or_reject === "reject" && formData, }; }, // Do an optimistic update on this account to mark it approved diff --git a/web/source/settings/lib/query/admin/reports/index.ts b/web/source/settings/lib/query/admin/reports/index.ts index 8937d5358..6430cd6b1 100644 --- a/web/source/settings/lib/query/admin/reports/index.ts +++ b/web/source/settings/lib/query/admin/reports/index.ts @@ -77,8 +77,8 @@ const extended = gtsApi.injectEndpoints({ }), invalidatesTags: (res) => res - ? [{ type: "Report", id: "LIST" }, { type: "Report", id: res.id }] - : [{ type: "Report", id: "LIST" }] + ? [{ type: "Report", id: "TRANSFORMED" }, { type: "Report", id: res.id }] + : [{ type: "Report", id: "TRANSFORMED" }] }) }) }); diff --git a/web/source/settings/lib/query/gts-api.ts b/web/source/settings/lib/query/gts-api.ts index 1c715e284..911ea58c7 100644 --- a/web/source/settings/lib/query/gts-api.ts +++ b/web/source/settings/lib/query/gts-api.ts @@ -168,6 +168,7 @@ export const gtsApi = createApi({ "HTTPHeaderAllows", "HTTPHeaderBlocks", "DefaultInteractionPolicies", + "InteractionRequest", ], endpoints: (build) => ({ instanceV1: build.query<InstanceV1, void>({ diff --git a/web/source/settings/lib/query/user/interactions.ts b/web/source/settings/lib/query/user/interactions.ts new file mode 100644 index 000000000..04e3a74ff --- /dev/null +++ b/web/source/settings/lib/query/user/interactions.ts @@ -0,0 +1,97 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +import { + InteractionRequest, + SearchInteractionRequestsParams, + SearchInteractionRequestsResp, +} from "../../types/interaction"; +import { gtsApi } from "../gts-api"; +import parse from "parse-link-header"; + +const extended = gtsApi.injectEndpoints({ + endpoints: (build) => ({ + getInteractionRequest: build.query<InteractionRequest, string>({ + query: (id) => ({ + method: "GET", + url: `/api/v1/interaction_requests/${id}`, + }), + providesTags: (_result, _error, id) => [ + { type: 'InteractionRequest', id } + ], + }), + + searchInteractionRequests: build.query<SearchInteractionRequestsResp, SearchInteractionRequestsParams>({ + query: (form) => { + const params = new(URLSearchParams); + Object.entries(form).forEach(([k, v]) => { + if (v !== undefined) { + params.append(k, v); + } + }); + + let query = ""; + if (params.size !== 0) { + query = `?${params.toString()}`; + } + + return { + url: `/api/v1/interaction_requests${query}` + }; + }, + // Headers required for paging. + transformResponse: (apiResp: InteractionRequest[], meta) => { + const requests = apiResp; + const linksStr = meta?.response?.headers.get("Link"); + const links = parse(linksStr); + return { requests, links }; + }, + providesTags: [{ type: "InteractionRequest", id: "TRANSFORMED" }] + }), + + approveInteractionRequest: build.mutation<InteractionRequest, string>({ + query: (id) => ({ + method: "POST", + url: `/api/v1/interaction_requests/${id}/authorize`, + }), + invalidatesTags: (res) => + res + ? [{ type: "InteractionRequest", id: "TRANSFORMED" }, { type: "InteractionRequest", id: res.id }] + : [{ type: "InteractionRequest", id: "TRANSFORMED" }] + }), + + rejectInteractionRequest: build.mutation<any, string>({ + query: (id) => ({ + method: "POST", + url: `/api/v1/interaction_requests/${id}/reject`, + }), + invalidatesTags: (res) => + res + ? [{ type: "InteractionRequest", id: "TRANSFORMED" }, { type: "InteractionRequest", id: res.id }] + : [{ type: "InteractionRequest", id: "TRANSFORMED" }] + }), + }) +}); + +export const { + useGetInteractionRequestQuery, + useLazySearchInteractionRequestsQuery, + useApproveInteractionRequestMutation, + useRejectInteractionRequestMutation, +} = extended; diff --git a/web/source/settings/lib/types/interaction.ts b/web/source/settings/lib/types/interaction.ts index 735a20ed2..caedd9544 100644 --- a/web/source/settings/lib/types/interaction.ts +++ b/web/source/settings/lib/types/interaction.ts @@ -17,6 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +import { Links } from "parse-link-header"; +import { Account } from "./account"; +import { Status } from "./status"; + export interface DefaultInteractionPolicies { direct: InteractionPolicy; private: InteractionPolicy; @@ -61,3 +65,81 @@ export { PolicyValueAuthor, PolicyValueMe, }; + + +/** + * Interaction request targeting a status by an account. + */ +export interface InteractionRequest { + /** + * ID of the request. + */ + id: string; + /** + * Type of interaction being requested. + */ + type: "favourite" | "reply" | "reblog"; + /** + * Time when the request was created. + */ + created_at: string; + /** + * Account that created the request. + */ + account: Account; + /** + * Status being interacted with. + */ + status: Status; + /** + * Replying status, if type = "reply". + */ + reply?: Status; +} + +/** + * Parameters for GET to /api/v1/interaction_requests. + */ +export interface SearchInteractionRequestsParams { + /** + * If set, show only requests targeting the given status_id. + */ + status_id?: string; + /** + * If true or not set, include favourites in the results. + */ + favourites?: boolean; + /** + * If true or not set, include replies in the results. + */ + replies?: boolean; + /** + * If true or not set, include reblogs in the results. + */ + reblogs?: boolean; + /** + * If set, show only requests older (ie., lower) than the given ID. + * Request with the given ID will not be included in response. + */ + max_id?: string; + /** + * If set, show only requests newer (ie., higher) than the given ID. + * Request with the given ID will not be included in response. + */ + since_id?: string; + /** + * If set, show only requests *immediately newer* than the given ID. + * Request with the given ID will not be included in response. + */ + min_id?: string; + /** + * If set, limit returned requests to this number. + * Else, fall back to GtS API defaults. + */ + limit?: number; +} + +export interface SearchInteractionRequestsResp { + requests: InteractionRequest[]; + links: Links | null; +} |