summaryrefslogtreecommitdiff
path: root/src/api/endpoints/posts/search.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-09 03:50:09 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-09 03:50:09 +0900
commit31f36fa618e02bab9776a943366167e1009ede48 (patch)
tree386dbaa963b3695f6a0febf9b5076e8d42006536 /src/api/endpoints/posts/search.ts
parentMerge pull request #237 from syuilo/greenkeeper/cafy-1.2.0 (diff)
downloadmisskey-31f36fa618e02bab9776a943366167e1009ede48.tar.gz
misskey-31f36fa618e02bab9776a943366167e1009ede48.tar.bz2
misskey-31f36fa618e02bab9776a943366167e1009ede48.zip
:v:
Diffstat (limited to '')
-rw-r--r--src/api/endpoints/posts/search.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/api/endpoints/posts/search.ts b/src/api/endpoints/posts/search.ts
index 04b845bc3a..b434f64342 100644
--- a/src/api/endpoints/posts/search.ts
+++ b/src/api/endpoints/posts/search.ts
@@ -2,7 +2,7 @@
* Module dependencies
*/
import * as mongo from 'mongodb';
-import it from 'cafy';
+import $ from 'cafy';
const escapeRegexp = require('escape-regexp');
import Post from '../../models/post';
import serialize from '../../serializers/post';
@@ -17,18 +17,18 @@ import config from '../../../conf';
*/
module.exports = (params, me) => new Promise(async (res, rej) => {
// Get 'query' parameter
- const [query, queryError] = it(params.query).expect.string().required().trim().validate(x => x != '').get();
+ const [query, queryError] = $(params.query).string().pipe(x => x != '').$;
if (queryError) return rej('invalid query param');
// Get 'offset' parameter
- const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
+ const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$;
if (offsetErr) return rej('invalid offset param');
// Get 'max' parameter
- const [max = 10, maxErr] = it(params.max).expect.number().range(1, 30).get();
+ const [max = 10, maxErr] = $(params.max).optional.number().range(1, 30).$;
if (maxErr) return rej('invalid max param');
- // If Elasticsearch is available, search by it
+ // If Elasticsearch is available, search by $
// If not, search by MongoDB
(config.elasticsearch.enable ? byElasticsearch : byNative)
(res, rej, me, query, offset, max);