summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-06-09 11:37:51 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-06-09 11:37:51 -0400
commited766e98e1cdc20839a633e4a4784592a5b0e9f9 (patch)
tree2d42e6d21cc7cd0261a9f26fef91af365df44b2e /packages/backend/src/core
parentfix refactoring mistake in CacheService.ts (diff)
downloadsharkey-ed766e98e1cdc20839a633e4a4784592a5b0e9f9.tar.gz
sharkey-ed766e98e1cdc20839a633e4a4784592a5b0e9f9.tar.bz2
sharkey-ed766e98e1cdc20839a633e4a4784592a5b0e9f9.zip
fix mixed-up userFollowingsCache / userFollowersCache
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/activitypub/ApDeliverManagerService.ts2
-rw-r--r--packages/backend/src/core/entities/UserEntityService.ts8
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
index 86747f2508..91f6f2d9fc 100644
--- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
+++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
@@ -113,7 +113,7 @@ class DeliverManager {
if (this.recipes.some(r => isFollowers(r))) {
// followers deliver
// ただ、sharedInboxがnullなリモートユーザーも稀におり、その対応ができなさそう?
- const followers = await this.cacheService.userFollowingsCache
+ const followers = await this.cacheService.userFollowersCache
.fetch(this.actor.id)
.then(f => Array
.from(f.values())
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index aecbaa7fd5..91bf258ff4 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -250,8 +250,8 @@ export class UserEntityService implements OnModuleInit {
@bindThis
public async getRelations(me: MiUser['id'], targets: MiUser['id'][]): Promise<Map<MiUser['id'], UserRelation>> {
const [
- followers,
- followees,
+ myFollowing,
+ myFollowers,
followersRequests,
followeesRequests,
blockers,
@@ -300,7 +300,7 @@ export class UserEntityService implements OnModuleInit {
return new Map(
targets.map(target => {
- const following = followers.get(target) ?? null;
+ const following = myFollowing.get(target) ?? null;
return [
target,
@@ -308,7 +308,7 @@ export class UserEntityService implements OnModuleInit {
id: target,
following: following,
isFollowing: following != null,
- isFollowed: followees.has(target),
+ isFollowed: myFollowers.has(target),
hasPendingFollowRequestFromYou: followersRequests.includes(target),
hasPendingFollowRequestToYou: followeesRequests.includes(target),
isBlocking: blockees.has(target),