diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-02 03:32:24 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-02 03:32:24 +0900 |
| commit | 931bdc6aace5e7aa71ffdfb470e208ead78a2a53 (patch) | |
| tree | eee6d7bf5f5480b883bb601517b4d9db03f31e9f /src/server/activitypub | |
| parent | Refactoring (diff) | |
| download | sharkey-931bdc6aace5e7aa71ffdfb470e208ead78a2a53.tar.gz sharkey-931bdc6aace5e7aa71ffdfb470e208ead78a2a53.tar.bz2 sharkey-931bdc6aace5e7aa71ffdfb470e208ead78a2a53.zip | |
Refactoring, Clean up and bug fixes
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 fcc75fc5b1..5c809424cc 100644 --- a/src/server/activitypub/followers.ts +++ b/src/server/activitypub/followers.ts @@ -1,7 +1,7 @@ import * as mongo from 'mongodb'; import * as Router from 'koa-router'; import config from '../../config'; -import $ from 'cafy'; import ID from '../../misc/cafy-id'; +import $ from 'cafy'; import ID, { transform } from '../../misc/cafy-id'; import User from '../../models/user'; import Following from '../../models/following'; import pack from '../../remote/activitypub/renderer'; @@ -49,7 +49,7 @@ export default async (ctx: Router.IRouterContext) => { // カーソルが指定されている場合 if (cursor) { query._id = { - $lt: cursor + $lt: transform(cursor) }; } diff --git a/src/server/activitypub/following.ts b/src/server/activitypub/following.ts index 2c739ff07d..a46bb9c7ff 100644 --- a/src/server/activitypub/following.ts +++ b/src/server/activitypub/following.ts @@ -1,7 +1,7 @@ import * as mongo from 'mongodb'; import * as Router from 'koa-router'; import config from '../../config'; -import $ from 'cafy'; import ID from '../../misc/cafy-id'; +import $ from 'cafy'; import ID, { transform } from '../../misc/cafy-id'; import User from '../../models/user'; import Following from '../../models/following'; import pack from '../../remote/activitypub/renderer'; @@ -49,7 +49,7 @@ export default async (ctx: Router.IRouterContext) => { // カーソルが指定されている場合 if (cursor) { query._id = { - $lt: cursor + $lt: transform(cursor) }; } diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts index aeb6f25dd4..24d4e3730e 100644 --- a/src/server/activitypub/outbox.ts +++ b/src/server/activitypub/outbox.ts @@ -1,7 +1,7 @@ import * as mongo from 'mongodb'; import * as Router from 'koa-router'; import config from '../../config'; -import $ from 'cafy'; import ID from '../../misc/cafy-id'; +import $ from 'cafy'; import ID, { transform } from '../../misc/cafy-id'; import User from '../../models/user'; import pack from '../../remote/activitypub/renderer'; import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection'; @@ -61,11 +61,11 @@ export default async (ctx: Router.IRouterContext) => { if (sinceId) { sort._id = 1; query._id = { - $gt: sinceId + $gt: transform(sinceId) }; } else if (untilId) { query._id = { - $lt: untilId + $lt: transform(untilId) }; } //#endregion |