more unification
This commit is contained in:
parent
f4f83bc26f
commit
08541b672b
1 changed files with 5 additions and 19 deletions
|
|
@ -68,8 +68,8 @@ const MASTODON_STATUS_REBLOGGEDBY_URL = (id) =>
|
||||||
`/api/v1/statuses/${id}/reblogged_by`
|
`/api/v1/statuses/${id}/reblogged_by`
|
||||||
const MASTODON_SEARCH_2 = ({ q, resolve, limit, offset, following, type, withRelationships, accountId, excludeUnreviewed }) =>
|
const MASTODON_SEARCH_2 = ({ q, resolve, limit, offset, following, type, withRelationships, accountId, excludeUnreviewed }) =>
|
||||||
`/api/v2/search${paramsString({ q, resolve, limit, offset, following, type, withRelationships, accountId, excludeUnreviewed })}`
|
`/api/v2/search${paramsString({ q, resolve, limit, offset, following, type, withRelationships, accountId, excludeUnreviewed })}`
|
||||||
const MASTODON_USER_SEARCH_URL = '/api/v1/accounts/search'
|
const MASTODON_USER_SEARCH_URL = ({ q, resolve }) => `/api/v1/accounts/search${paramsString({ q, resolve })}`
|
||||||
const MASTODON_STREAMING = '/api/v1/streaming'
|
const MASTODON_STREAMING = ({ accessToken, stream }) => `/api/v1/streaming${paramsString({accessToken, stream })}`
|
||||||
const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
|
const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
|
||||||
const PLEROMA_EMOJI_REACTIONS_URL = (id) =>
|
const PLEROMA_EMOJI_REACTIONS_URL = (id) =>
|
||||||
`/api/v1/pleroma/statuses/${id}/reactions`
|
`/api/v1/pleroma/statuses/${id}/reactions`
|
||||||
|
|
@ -376,11 +376,7 @@ export const fetchEmojiReactions = ({ id, credentials }) =>
|
||||||
|
|
||||||
export const searchUsers = ({ credentials, query }) =>
|
export const searchUsers = ({ credentials, query }) =>
|
||||||
promisedRequest({
|
promisedRequest({
|
||||||
url: MASTODON_USER_SEARCH_URL,
|
url: MASTODON_USER_SEARCH_URL({ q: query, resolve: true }),
|
||||||
params: {
|
|
||||||
q: query,
|
|
||||||
resolve: true,
|
|
||||||
},
|
|
||||||
credentials,
|
credentials,
|
||||||
}).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) }))
|
}).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) }))
|
||||||
|
|
||||||
|
|
@ -419,20 +415,10 @@ export const fetchKnownDomains = ({ credentials }) =>
|
||||||
promisedRequest({ url: MASTODON_KNOWN_DOMAIN_LIST_URL, credentials })
|
promisedRequest({ url: MASTODON_KNOWN_DOMAIN_LIST_URL, credentials })
|
||||||
|
|
||||||
export const getMastodonSocketURI = (
|
export const getMastodonSocketURI = (
|
||||||
{ credentials, stream, args = {} },
|
{ credentials, stream },
|
||||||
base,
|
base,
|
||||||
) => {
|
) => {
|
||||||
const url = new URL(MASTODON_STREAMING, base)
|
return base + MASTODON_STREAMING({ accessToken: credentials, stream })
|
||||||
if (credentials) {
|
|
||||||
url.searchParams.append('access_token', credentials)
|
|
||||||
}
|
|
||||||
if (stream) {
|
|
||||||
url.searchParams.append('stream', stream)
|
|
||||||
}
|
|
||||||
Object.entries(args).forEach(([key, val]) => {
|
|
||||||
url.searchParams.append(key, val)
|
|
||||||
})
|
|
||||||
return url
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const MASTODON_STREAMING_EVENTS = new Set([
|
const MASTODON_STREAMING_EVENTS = new Set([
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue