diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts index a41b058d2c..dc9c20b508 100644 --- a/app/javascript/mastodon/api.ts +++ b/app/javascript/mastodon/api.ts @@ -83,6 +83,7 @@ export default function api(withAuthorization = true) { return instance; } +type ApiUrl = `v${1 | 2}/${string}`; type RequestParamsOrData = Record; export async function apiRequest( @@ -105,28 +106,28 @@ export async function apiRequest( } export async function apiRequestGet( - url: string, + url: ApiUrl, params?: RequestParamsOrData, ) { return apiRequest('GET', url, { params }); } export async function apiRequestPost( - url: string, + url: ApiUrl, data?: RequestParamsOrData, ) { return apiRequest('POST', url, { data }); } export async function apiRequestPut( - url: string, + url: ApiUrl, data?: RequestParamsOrData, ) { return apiRequest('PUT', url, { data }); } export async function apiRequestDelete( - url: string, + url: ApiUrl, params?: RequestParamsOrData, ) { return apiRequest('DELETE', url, { params }); diff --git a/app/javascript/mastodon/api/accounts.ts b/app/javascript/mastodon/api/accounts.ts index 6ce7d7248c..fb99978cad 100644 --- a/app/javascript/mastodon/api/accounts.ts +++ b/app/javascript/mastodon/api/accounts.ts @@ -36,6 +36,6 @@ export const apiGetEndorsedAccounts = (id: string) => apiRequestGet(`v1/accounts/${id}/endorsements`); export const apiGetFamiliarFollowers = (id: string) => - apiRequestGet('/v1/accounts/familiar_followers', { + apiRequestGet('v1/accounts/familiar_followers', { id, }); diff --git a/app/javascript/mastodon/api/polls.ts b/app/javascript/mastodon/api/polls.ts index cb659986f5..d1a97c53c5 100644 --- a/app/javascript/mastodon/api/polls.ts +++ b/app/javascript/mastodon/api/polls.ts @@ -2,9 +2,9 @@ import { apiRequestGet, apiRequestPost } from 'mastodon/api'; import type { ApiPollJSON } from 'mastodon/api_types/polls'; export const apiGetPoll = (pollId: string) => - apiRequestGet(`/v1/polls/${pollId}`); + apiRequestGet(`v1/polls/${pollId}`); export const apiPollVote = (pollId: string, choices: string[]) => - apiRequestPost(`/v1/polls/${pollId}/votes`, { + apiRequestPost(`v1/polls/${pollId}/votes`, { choices, });