diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-09-06 04:28:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-09-06 04:28:42 +0900 |
| commit | ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7 (patch) | |
| tree | c313e84c98b54934ef0f24922610ff5e0f60a751 /src/server/api/endpoints/notes/local-timeline.ts | |
| parent | Improve welcome page (diff) | |
| parent | Show host in local user detail (#2634) (diff) | |
| download | sharkey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.tar.gz sharkey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.tar.bz2 sharkey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server/api/endpoints/notes/local-timeline.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/local-timeline.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts index ce84b4135a..ff10e6fbaa 100644 --- a/src/server/api/endpoints/notes/local-timeline.ts +++ b/src/server/api/endpoints/notes/local-timeline.ts @@ -4,6 +4,7 @@ import Mute from '../../../../models/mute'; import { pack } from '../../../../models/note'; import { ILocalUser } from '../../../../models/user'; import getParams from '../../get-params'; +import { countIf } from '../../../../prelude/array'; export const meta = { desc: { @@ -48,7 +49,7 @@ export default async (params: any, user: ILocalUser) => { if (psErr) throw psErr; // Check if only one of sinceId, untilId, sinceDate, untilDate specified - if ([ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate].filter(x => x != null).length > 1) { + if (countIf(x => x != null, [ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate]) > 1) { throw 'only one of sinceId, untilId, sinceDate, untilDate can be specified'; } |