Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ハイライトでミュートしているユーザーの投稿が含まれる問題を修正

Browse Source
This commit is contained in:
syuilo 2019-02-20 22:31:21 +09:00
parent ed0fdaddbd
commit fe00cb9ad5
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ ChangeLog
unreleased unreleased
---------- ----------
* デッキでユーザーを表示したときにタイムラインが残存する問題を修正 * デッキでユーザーを表示したときにタイムラインが残存する問題を修正
* ハイライトでミュートしているユーザーの投稿が含まれる問題を修正
10.87.5 10.87.5
---------- ----------

6
src/server/api/endpoints/notes/featured.ts
View File

@ -2,6 +2,7 @@ import $ from 'cafy';
import Note from '../../../../models/note'; import Note from '../../../../models/note';
import { packMany } from '../../../../models/note'; import { packMany } from '../../../../models/note';
import define from '../../define'; import define from '../../define';
import { getHideUserIds } from '../../common/get-hide-users';
export const meta = { export const meta = {
desc: { desc: {
@ -25,6 +26,8 @@ export const meta = {
export default define(meta, (ps, user) => new Promise(async (res, rej) => { export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const day = 1000 * 60 * 60 * 24 * 2; const day = 1000 * 60 * 60 * 24 * 2;
const hideUserIds = await getHideUserIds(user);
const notes = await Note const notes = await Note
.find({ .find({
createdAt: { createdAt: {
@ -32,7 +35,8 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
}, },
deletedAt: null, deletedAt: null,
visibility: { $in: ['public', 'home'] }, visibility: { $in: ['public', 'home'] },
'_user.host': null '_user.host': null,
...(hideUserIds && hideUserIds.length > 0 ? { userId: { $nin: hideUserIds } } : {})
}, { }, {
limit: ps.limit, limit: ps.limit,
sort: { sort: {