e2net/iceshrimp
3
0
Fork 0
forked from mirrors/iceshrimp
Code Pull requests Activity

[mastodon-client] Fix user profile aggregate when only target is self

Browse source
This commit is contained in:
Laura Hausmann 2023-11-25 02:08:48 +01:00
parent f350755721
commit 5490137f44
Signed by: zotan
GPG key ID: D044E84C5BE01605
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/backend/src/server/api/mastodon/converters/user.ts
View file

@ -126,17 +126,21 @@ export class UserConverter {
const userProfileAggregate = new Map<User["id"], UserProfile | null>();
if (user) {
const followings = await Followings.createQueryBuilder('following')
.select('following.followeeId')
.where('following.followerId = :meId', { meId: user.id })
.andWhere('following.followeeId IN (:...targets)', { targets: targets.filter(u => u !== user.id) })
.getMany();
const targetsWithoutSelf = targets.filter(u => u !== user.id);
if (targetsWithoutSelf.length > 0) {
const followings = await Followings.createQueryBuilder('following')
.select('following.followeeId')
.where('following.followerId = :meId', { meId: user.id })
.andWhere('following.followeeId IN (:...targets)', { targets: targetsWithoutSelf })
.getMany();
for (const userId of targetsWithoutSelf) {
followedOrSelfAggregate.set(userId, !!followings.find(f => f.followerId === userId));
}
}
followedOrSelfAggregate.set(user.id, true);
for (const userId of targets.filter(u => u !== user.id)) {
followedOrSelfAggregate.set(userId, !!followings.find(f => f.followerId === userId));
}
}
const profiles = await UserProfiles.findBy({