Nikurasu/elk
1
0
Fork 0
forked from Mirrors/elk
Code Pull requests Releases 2 Packages 1 Activity

fix: fix incorrect follow status on followers and following pages (#2669)

Browse source
This commit is contained in:
TAKAHASHI Shuuji 2024-03-10 04:31:40 +09:00 committed by GitHub
parent 1c8e48bee4
commit 0fd9374e8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
composables/masto/relationship.ts
View file

@ -11,9 +11,12 @@ let timeoutHandle: NodeJS.Timeout | undefined
export function useRelationship(account: mastodon.v1.Account): Ref<mastodon.v1.Relationship | undefined> { export function useRelationship(account: mastodon.v1.Account): Ref<mastodon.v1.Relationship | undefined> {
if (!currentUser.value) if (!currentUser.value)
return ref() return ref()
let relationship = requestedRelationships.get(account.id) let relationship = requestedRelationships.get(account.id)
if (relationship) if (relationship)
return relationship return relationship
// allow batch relationship requests
relationship = ref<mastodon.v1.Relationship | undefined>() relationship = ref<mastodon.v1.Relationship | undefined>()
requestedRelationships.set(account.id, relationship) requestedRelationships.set(account.id, relationship)
if (timeoutHandle) if (timeoutHandle)
@ -22,14 +25,19 @@ export function useRelationship(account: mastodon.v1.Account): Ref<mastodon.v1.R
timeoutHandle = undefined timeoutHandle = undefined
fetchRelationships() fetchRelationships()
}, 100) }, 100)
return relationship return relationship
} }
async function fetchRelationships() { async function fetchRelationships() {
const requested = Array.from(requestedRelationships.entries()).filter(([, r]) => !r.value) const requested = Array.from(requestedRelationships.entries()).filter(([, r]) => !r.value)
const relationships = await useMastoClient().v1.accounts.relationships.fetch({ id: requested.map(([id]) => id) }) const relationships = await useMastoClient().v1.accounts.relationships.fetch({ id: requested.map(([id]) => id) })
for (let i = 0; i < requested.length; i++) for (const relationship of relationships) {
requested[i][1].value = relationships[i] const requestedToUpdate = requested.find(([id]) => id === relationship.id)
if (!requestedToUpdate)
continue
requestedToUpdate[1].value = relationship
}
} }
export async function toggleFollowAccount(relationship: mastodon.v1.Relationship, account: mastodon.v1.Account) { export async function toggleFollowAccount(relationship: mastodon.v1.Relationship, account: mastodon.v1.Account) {