summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/resolver.ts
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-03 20:39:27 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-03 20:41:54 +0900
commitc22cb377599780666ffe2c7ccdbdcb19a49f1969 (patch)
tree1e5a8d36deceeb1611025ac93f04894178e22774 /src/remote/activitypub/resolver.ts
parentImprove readability (diff)
downloadsharkey-c22cb377599780666ffe2c7ccdbdcb19a49f1969.tar.gz
sharkey-c22cb377599780666ffe2c7ccdbdcb19a49f1969.tar.bz2
sharkey-c22cb377599780666ffe2c7ccdbdcb19a49f1969.zip
Remove resolveRemoteUserObjects method of remote/activitypub/resolver
The value of the value returned by resolveRemoteUserObjects method of remote/activitypub/resolver was inconsistent.
Diffstat (limited to 'src/remote/activitypub/resolver.ts')
-rw-r--r--src/remote/activitypub/resolver.ts33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/remote/activitypub/resolver.ts b/src/remote/activitypub/resolver.ts
index b7e431b910..371ccdcc30 100644
--- a/src/remote/activitypub/resolver.ts
+++ b/src/remote/activitypub/resolver.ts
@@ -1,12 +1,5 @@
-import RemoteUserObject from '../../models/remote-user-object';
-import { IObject } from './type';
const request = require('request-promise-native');
-type IResult = {
- resolver: Resolver;
- object: IObject;
-};
-
export default class Resolver {
private requesting: Set<string>;
@@ -42,7 +35,7 @@ export default class Resolver {
return { resolver, object };
}
- private async resolveCollection(value) {
+ public async resolveCollection(value) {
const resolved = typeof value === 'string' ?
await this.resolveUnrequestedOne(value) :
{ resolver: this, object: value };
@@ -66,14 +59,6 @@ export default class Resolver {
return resolved;
}
- public async resolve(value): Promise<Array<Promise<IResult>>> {
- const { resolver, object } = await this.resolveCollection(value);
-
- return object
- .filter(element => !resolver.requesting.has(element))
- .map(resolver.resolveUnrequestedOne.bind(resolver));
- }
-
public resolveOne(value) {
if (this.requesting.has(value)) {
throw new Error();
@@ -81,20 +66,4 @@ export default class Resolver {
return this.resolveUnrequestedOne(value);
}
-
- public async resolveRemoteUserObjects(value) {
- const { resolver, object } = await this.resolveCollection(value);
-
- return object.filter(element => !resolver.requesting.has(element)).map(element => {
- if (typeof element === 'string') {
- const object = RemoteUserObject.findOne({ uri: element });
-
- if (object !== null) {
- return object;
- }
- }
-
- return resolver.resolveUnrequestedOne(element);
- });
- }
}