DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #4800 (#5622)

This commit is contained in:
MeiMei 2019-12-12 00:49:30 +09:00 committed by syuilo
parent 2a9de356db
commit 1d234e10bd
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/api/endpoints/notes/children.ts
View File

@ -66,7 +66,7 @@ export default define(meta, async (ps, user) => {
})) }))
.leftJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (user) generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMuteQuery(query, user); if (user) generateMuteQuery(query, user);
const notes = await query.take(ps.limit!).getMany(); const notes = await query.take(ps.limit!).getMany();

2
src/server/api/endpoints/notes/local-timeline.ts
View File

@ -95,7 +95,7 @@ export default define(meta, async (ps, user) => {
.andWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)') .andWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)')
.leftJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (user) generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMuteQuery(query, user); if (user) generateMuteQuery(query, user);
if (ps.withFiles) { if (ps.withFiles) {

2
src/server/api/endpoints/notes/renotes.ts
View File

@ -70,7 +70,7 @@ export default define(meta, async (ps, user) => {
.andWhere(`note.renoteId = :renoteId`, { renoteId: note.id }) .andWhere(`note.renoteId = :renoteId`, { renoteId: note.id })
.leftJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (user) generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMuteQuery(query, user); if (user) generateMuteQuery(query, user);
const renotes = await query.take(ps.limit!).getMany(); const renotes = await query.take(ps.limit!).getMany();

2
src/server/api/endpoints/notes/replies.ts
View File

@ -61,7 +61,7 @@ export default define(meta, async (ps, user) => {
.andWhere('note.replyId = :replyId', { replyId: ps.noteId }) .andWhere('note.replyId = :replyId', { replyId: ps.noteId })
.leftJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (user) generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMuteQuery(query, user); if (user) generateMuteQuery(query, user);
const timeline = await query.take(ps.limit!).getMany(); const timeline = await query.take(ps.limit!).getMany();

2
src/server/api/endpoints/notes/search-by-tag.ts
View File

@ -95,7 +95,7 @@ export default define(meta, async (ps, me) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.leftJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (me) generateVisibilityQuery(query, me); generateVisibilityQuery(query, me);
if (me) generateMuteQuery(query, me); if (me) generateMuteQuery(query, me);
if (ps.tag) { if (ps.tag) {

2
src/server/api/endpoints/users/notes.ts
View File

@ -133,7 +133,7 @@ export default define(meta, async (ps, me) => {
.andWhere('note.userId = :userId', { userId: user.id }) .andWhere('note.userId = :userId', { userId: user.id })
.leftJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (me) generateVisibilityQuery(query, me); generateVisibilityQuery(query, me);
if (me) generateMuteQuery(query, me, user); if (me) generateMuteQuery(query, me, user);
if (ps.withFiles) { if (ps.withFiles) {