limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-22 09:57:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[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
No known key found for this signature in database
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

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

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