misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

add withReplies option to QueryService.addFollowingUser, .andFollowingUser, and .orFollowingUser

Browse source
This commit is contained in:
Hazelnoot 2025-08-13 11:56:14 -04:00
parent c9fbe58715
commit f26566e844
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/src/core/QueryService.ts
View file

@ -449,27 +449,33 @@ export class QueryService {
/**
* Adds OR condition that followerProp (user ID) is following followeeProp (user ID).
* Both props should be expressions, not raw values.
* If withReplies is set to a boolean, then this method will only count followings with the matching withReplies value.
*/
@bindThis
public orFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string): Q {
return this.addFollowingUser(q, followerProp, followeeProp, 'orWhere');
public orFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, withReplies?: boolean): Q {
return this.addFollowingUser(q, followerProp, followeeProp, 'orWhere', withReplies);
}
/**
* Adds AND condition that followerProp (user ID) is following followeeProp (user ID).
* Both props should be expressions, not raw values.
* If withReplies is set to a boolean, then this method will only count followings with the matching withReplies value.
*/
@bindThis
public andFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string): Q {
return this.addFollowingUser(q, followerProp, followeeProp, 'andWhere');
public andFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, withReplies?: boolean): Q {
return this.addFollowingUser(q, followerProp, followeeProp, 'andWhere', withReplies);
}
private addFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, join: 'andWhere' | 'orWhere'): Q {
private addFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, join: 'andWhere' | 'orWhere', withReplies?: boolean): Q {
const followingQuery = this.followingsRepository.createQueryBuilder('following')
.select('1')
.andWhere(`following.followerId = ${followerProp}`)
.andWhere(`following.followeeId = ${followeeProp}`);
if (withReplies !== undefined) {
followingQuery.andWhere('following.withReplies = :withReplies', { withReplies });
}
return q[join](`EXISTS (${followingQuery.getQuery()})`, followingQuery.getParameters());
};