mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-13 21:40:45 +01:00
Better featured injection
This commit is contained in:
parent
c9f8c12f5b
commit
8aab828c65
1 changed files with 11 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
|||
import rndstr from 'rndstr';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
import { User } from '../../../models/entities/user';
|
||||
import { Notes, UserProfiles } from '../../../models';
|
||||
import { Notes, UserProfiles, NoteReactions } from '../../../models';
|
||||
import { generateMuteQuery } from './generate-mute-query';
|
||||
import { ensure } from '../../../prelude/ensure';
|
||||
|
||||
|
@ -26,9 +26,17 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
|
|||
.andWhere(`note.visibility = 'public'`)
|
||||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
if (user) query.andWhere('note.userId != :userId', { userId: user.id });
|
||||
if (user) {
|
||||
query.andWhere('note.userId != :userId', { userId: user.id });
|
||||
|
||||
if (user) generateMuteQuery(query, user);
|
||||
generateMuteQuery(query, user);
|
||||
|
||||
const reactionQuery = NoteReactions.createQueryBuilder('reaction')
|
||||
.select('reaction.noteId')
|
||||
.where('reaction.userId = :userId', { userId: user.id });
|
||||
|
||||
query.andWhere(`note.id NOT IN (${ reactionQuery.getQuery() })`);
|
||||
}
|
||||
|
||||
const notes = await query
|
||||
.orderBy('note.score', 'DESC')
|
||||
|
|
Loading…
Reference in a new issue