octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fetch remote user's toots

Browse Source
This commit is contained in:
xmflsct
2023-02-25 23:42:04 +01:00
parent f505f78193
commit 702ecef243
16 changed files with 184 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils/helpers/appendRemote.ts
View File

@ -1,23 +1,23 @@
// Central place appending _remote internal prop
export const appendRemote = {
status: (status: Mastodon.Status) => ({
status: (status: Mastodon.Status, domain: string) => ({
...status,
...(status.reblog && {
reblog: {
...status.reblog,
account: appendRemote.account(status.reblog.account),
mentions: appendRemote.mentions(status.reblog.mentions)
account: appendRemote.account(status.reblog.account, domain),
mentions: appendRemote.mentions(status.reblog.mentions, domain)
}
}),
account: appendRemote.account(status.account),
mentions: appendRemote.mentions(status.mentions),
account: appendRemote.account(status.account, domain),
mentions: appendRemote.mentions(status.mentions, domain),
_remote: true
}),
account: (account: Mastodon.Account) => ({
account: (account: Mastodon.Account, domain: string) => ({
...account,
_remote: true
_remote: domain
}),
mentions: (mentions: Mastodon.Mention[]) =>
mentions?.map(mention => ({ ...mention, _remote: true }))
mentions: (mentions: Mastodon.Mention[], domain: string) =>
mentions?.map(mention => ({ ...mention, _remote: domain }))
}

2
src/utils/helpers/urlMatcher.ts
View File

@ -75,7 +75,7 @@ export const urlMatcher = (
return {
domain,
...(accountAcct && { account: { acct: accountAcct, _remote } }),
...(accountAcct && { account: { acct: accountAcct, _remote: domain } }),
...(statusId && { status: { id: statusId, _remote } })
}
}

8
src/utils/queryHooks/account.ts
View File

@ -33,16 +33,16 @@ const accountQueryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyA
if (id) {
matchedAccount = await apiGeneral<Mastodon.Account>({
method: 'get',
domain: domain,
domain,
url: `api/v1/accounts/${id}`
}).then(res => appendRemote.account(res.body))
}).then(res => appendRemote.account(res.body, domain))
} else if (acct) {
matchedAccount = await apiGeneral<Mastodon.Account>({
method: 'get',
domain: domain,
domain,
url: 'api/v1/accounts/lookup',
params: { acct }
}).then(res => appendRemote.account(res.body))
}).then(res => appendRemote.account(res.body, domain))
}
} catch {}
}

2
src/utils/queryHooks/status.ts
View File

@ -27,7 +27,7 @@ const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyStatus>)
method: 'get',
domain,
url: `api/v1/statuses/${id}`
}).then(res => appendRemote.status(res.body))
}).then(res => appendRemote.status(res.body, domain))
} catch {}
}

174
src/utils/queryHooks/timeline.ts
View File

@ -46,6 +46,9 @@ export type QueryKeyTimeline = [
id?: Mastodon.Account['id']
exclude_reblogs: boolean
only_media: boolean
// remote info
remote_id?: Mastodon.Account['id']
remote_domain?: string
}
| {
page: 'Toot'
@ -107,10 +110,7 @@ export const queryFunctionTimeline = async ({
return apiInstance<Mastodon.Status[]>({
method: 'get',
url: 'timelines/public',
params: {
...params,
local: 'true'
}
params: { ...params, local: true }
})
case 'LocalPublic':
@ -126,11 +126,11 @@ export const queryFunctionTimeline = async ({
method: 'get',
domain: page.domain,
url: 'api/v1/timelines/public',
params: {
...params,
local: 'true'
}
}).then(res => ({ ...res, body: res.body.map(status => appendRemote.status(status)) }))
params: { ...params, local: true }
}).then(res => ({
...res,
body: res.body.map(status => appendRemote.status(status, page.domain!))
}))
} else {
return apiInstance<Mastodon.Status[]>({
method: 'get',
@ -163,61 +163,137 @@ export const queryFunctionTimeline = async ({
})
case 'Account':
if (!page.id) return Promise.reject('Timeline query account id not provided')
const reject = Promise.reject('Timeline query account id not provided')
if (page.only_media) {
return apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: {
only_media: 'true',
...params
}
})
} else if (page.exclude_reblogs) {
if (pageParam && pageParam.hasOwnProperty('max_id')) {
return apiInstance<Mastodon.Status[]>({
let res
if (page.remote_domain && page.remote_id) {
res = await apiGeneral<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
domain: page.remote_domain,
url: `api/v1/accounts/${page.remote_id}/statuses`,
params: {
exclude_replies: 'true',
only_media: true,
...params
}
})
} else {
const res1 = await apiInstance<(Mastodon.Status & { _pinned: boolean })[]>({
.then(res => ({
...res,
body: res.body.map(status => appendRemote.status(status, page.remote_domain!))
}))
.catch(() => {})
}
if (!res && page.id) {
res = await apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: {
pinned: 'true'
only_media: true,
...params
}
})
res1.body = res1.body.map(status => {
status._pinned = true
return status
})
const res2 = await apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: {
exclude_replies: 'true'
}
})
return {
body: uniqBy([...res1.body, ...res2.body], 'id'),
...(res2.links?.next && { links: { next: res2.links.next } })
}
return res || reject
} else if (page.exclude_reblogs) {
if (pageParam && pageParam.hasOwnProperty('max_id')) {
let res
if (page.remote_domain && page.remote_id) {
res = await apiGeneral<Mastodon.Status[]>({
method: 'get',
domain: page.remote_domain,
url: `api/v1/accounts/${page.remote_id}/statuses`,
params: {
exclude_replies: true,
...params
}
})
.then(res => ({
...res,
body: res.body.map(status => appendRemote.status(status, page.remote_domain!))
}))
.catch(() => {})
}
if (!res && page.id) {
res = await apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: {
exclude_replies: true,
...params
}
})
}
return res || reject
} else {
let res
if (page.remote_domain && page.remote_id) {
res = await apiGeneral<Mastodon.Status[]>({
method: 'get',
domain: page.remote_domain,
url: `api/v1/accounts/${page.remote_id}/statuses`,
params: { exclude_replies: true }
})
.then(res => ({
...res,
body: res.body.map(status => appendRemote.status(status, page.remote_domain!))
}))
.catch(() => {})
}
if (!res && page.id) {
const resPinned = await apiInstance<(Mastodon.Status & { _pinned: boolean })[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: { pinned: true }
}).then(res => ({
...res,
body: res.body.map(status => {
status._pinned = true
return status
})
}))
const resDefault = await apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: { exclude_replies: true }
})
return {
body: uniqBy([...resPinned.body, ...resDefault.body], 'id'),
links: resDefault.links
}
}
return res || reject
}
} else {
return apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: {
...params,
exclude_replies: false,
only_media: false
}
})
let res
if (page.remote_domain && page.remote_id) {
res = await apiGeneral<Mastodon.Status[]>({
method: 'get',
domain: page.remote_domain,
url: `api/v1/accounts/${page.remote_id}/statuses`,
params: {
...params,
exclude_replies: false,
only_media: false
}
})
.then(res => ({
...res,
body: res.body.map(status => appendRemote.status(status, page.remote_domain!))
}))
.catch(() => {})
}
if (!res && page.id) {
res = await apiInstance<Mastodon.Status[]>({
method: 'get',
url: `accounts/${page.id}/statuses`,
params: {
...params,
exclude_replies: false,
only_media: false
}
})
}
return res || reject
}
case 'Hashtag':

2
src/utils/queryHooks/users.ts
View File

@ -57,7 +57,7 @@ const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<Query
})
return {
...res,
body: res.body.map(account => appendRemote.account(account)),
body: res.body.map(account => appendRemote.account(account, domain)),
remoteData: true
}
} else {