diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2018-09-15 22:15:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 22:15:56 +0900 |
| commit | 8f8c67ad6d33eb9ced1844bb372d517204df6c6f (patch) | |
| tree | bcaedee83bb5960a6b63291795dd95f9ed603a99 /src/server/api/endpoints/notes/user-list-timeline.ts | |
| parent | fix mk-media darkmode (diff) | |
| parent | 8.41.0 (diff) | |
| download | misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.tar.gz misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.tar.bz2 misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.zip | |
Merge branch 'develop' into improve-media
Diffstat (limited to 'src/server/api/endpoints/notes/user-list-timeline.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/user-list-timeline.ts | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/server/api/endpoints/notes/user-list-timeline.ts b/src/server/api/endpoints/notes/user-list-timeline.ts index a7b43014ed..61192d7d3e 100644 --- a/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/src/server/api/endpoints/notes/user-list-timeline.ts @@ -73,9 +73,15 @@ export const meta = { } }), + withFiles: $.bool.optional.note({ + desc: { + 'ja-JP': 'true にすると、ファイルが添付された投稿だけ取得します' + } + }), + mediaOnly: $.bool.optional.note({ desc: { - 'ja-JP': 'true にすると、メディアが添付された投稿だけ取得します' + 'ja-JP': 'true にすると、ファイルが添付された投稿だけ取得します (このパラメータは廃止予定です。代わりに withFiles を使ってください。)' } }), } @@ -160,7 +166,7 @@ export default async (params: any, user: ILocalUser) => { }, { text: { $ne: null } }, { - mediaIds: { $ne: [] } + fileIds: { $ne: [] } }, { poll: { $ne: null } }] @@ -176,7 +182,7 @@ export default async (params: any, user: ILocalUser) => { }, { text: { $ne: null } }, { - mediaIds: { $ne: [] } + fileIds: { $ne: [] } }, { poll: { $ne: null } }] @@ -192,16 +198,18 @@ export default async (params: any, user: ILocalUser) => { }, { text: { $ne: null } }, { - mediaIds: { $ne: [] } + fileIds: { $ne: [] } }, { poll: { $ne: null } }] }); } - if (ps.mediaOnly) { + const withFiles = ps.withFiles != null ? ps.withFiles : ps.mediaOnly; + + if (withFiles) { query.$and.push({ - mediaIds: { $exists: true, $ne: [] } + fileIds: { $exists: true, $ne: [] } }); } |