graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 07:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Better featured injection

Browse source
This commit is contained in:
syuilo 2020-02-22 06:49:12 +09:00
parent c9f8c12f5b
commit 8aab828c65
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/server/api/common/inject-featured.ts
View file

@ -1,7 +1,7 @@
import rndstr from 'rndstr'; import rndstr from 'rndstr';
import { Note } from '../../../models/entities/note'; import { Note } from '../../../models/entities/note';
import { User } from '../../../models/entities/user'; import { User } from '../../../models/entities/user';
import { Notes, UserProfiles } from '../../../models'; import { Notes, UserProfiles, NoteReactions } from '../../../models';
import { generateMuteQuery } from './generate-mute-query'; import { generateMuteQuery } from './generate-mute-query';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
@ -26,9 +26,17 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
.andWhere(`note.visibility = 'public'`) .andWhere(`note.visibility = 'public'`)
.leftJoinAndSelect('note.user', 'user'); .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 const notes = await query
.orderBy('note.score', 'DESC') .orderBy('note.score', 'DESC')