diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-13 16:33:07 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 16:33:07 +0900 |
| commit | 5aa58da9180f95fc787d175b9d074d8c22357cf0 (patch) | |
| tree | a80adcb89a360468f8420c6a70e02278d3533b36 /src/server/activitypub | |
| parent | Sort ISSUE_TEMPLATE (#4236) (diff) | |
| download | misskey-5aa58da9180f95fc787d175b9d074d8c22357cf0.tar.gz misskey-5aa58da9180f95fc787d175b9d074d8c22357cf0.tar.bz2 misskey-5aa58da9180f95fc787d175b9d074d8c22357cf0.zip | |
Migrate cafy to 14.0 (#4240)
Diffstat (limited to 'src/server/activitypub')
| -rw-r--r-- | src/server/activitypub/followers.ts | 4 | ||||
| -rw-r--r-- | src/server/activitypub/following.ts | 4 | ||||
| -rw-r--r-- | src/server/activitypub/outbox.ts | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/server/activitypub/followers.ts b/src/server/activitypub/followers.ts index ce7fe94e42..bf5066008d 100644 --- a/src/server/activitypub/followers.ts +++ b/src/server/activitypub/followers.ts @@ -20,10 +20,10 @@ export default async (ctx: Router.IRouterContext) => { const userId = new ObjectID(ctx.params.user); // Get 'cursor' parameter - const [cursor = null, cursorErr] = $.type(ID).optional.get(ctx.request.query.cursor); + const [cursor = null, cursorErr] = $.optional.type(ID).get(ctx.request.query.cursor); // Get 'page' parameter - const pageErr = !$.str.optional.or(['true', 'false']).ok(ctx.request.query.page); + const pageErr = !$.optional.str.or(['true', 'false']).ok(ctx.request.query.page); const page: boolean = ctx.request.query.page === 'true'; // Validate parameters diff --git a/src/server/activitypub/following.ts b/src/server/activitypub/following.ts index da65ee79fa..cb86546f1c 100644 --- a/src/server/activitypub/following.ts +++ b/src/server/activitypub/following.ts @@ -20,10 +20,10 @@ export default async (ctx: Router.IRouterContext) => { const userId = new ObjectID(ctx.params.user); // Get 'cursor' parameter - const [cursor = null, cursorErr] = $.type(ID).optional.get(ctx.request.query.cursor); + const [cursor = null, cursorErr] = $.optional.type(ID).get(ctx.request.query.cursor); // Get 'page' parameter - const pageErr = !$.str.optional.or(['true', 'false']).ok(ctx.request.query.page); + const pageErr = !$.optional.str.or(['true', 'false']).ok(ctx.request.query.page); const page: boolean = ctx.request.query.page === 'true'; // Validate parameters diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts index 41f832aefa..508e7e5ec9 100644 --- a/src/server/activitypub/outbox.ts +++ b/src/server/activitypub/outbox.ts @@ -24,13 +24,13 @@ export default async (ctx: Router.IRouterContext) => { const userId = new ObjectID(ctx.params.user); // Get 'sinceId' parameter - const [sinceId, sinceIdErr] = $.type(ID).optional.get(ctx.request.query.since_id); + const [sinceId, sinceIdErr] = $.optional.type(ID).get(ctx.request.query.since_id); // Get 'untilId' parameter - const [untilId, untilIdErr] = $.type(ID).optional.get(ctx.request.query.until_id); + const [untilId, untilIdErr] = $.optional.type(ID).get(ctx.request.query.until_id); // Get 'page' parameter - const pageErr = !$.str.optional.or(['true', 'false']).ok(ctx.request.query.page); + const pageErr = !$.optional.str.or(['true', 'false']).ok(ctx.request.query.page); const page: boolean = ctx.request.query.page === 'true'; // Validate parameters |