summaryrefslogtreecommitdiff
path: root/src/remote/activitypub
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-06-18 19:16:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-06-18 19:16:41 +0900
commit80d8af84ddb5c2e72cc253440d81d3353ae91cdf (patch)
tree09101b4b6d91773d4378397127752009591b4055 /src/remote/activitypub
parentMerge branch 'develop' (diff)
parent11.22.0 (diff)
downloadmisskey-80d8af84ddb5c2e72cc253440d81d3353ae91cdf.tar.gz
misskey-80d8af84ddb5c2e72cc253440d81d3353ae91cdf.tar.bz2
misskey-80d8af84ddb5c2e72cc253440d81d3353ae91cdf.zip
Merge branch 'develop'
Diffstat (limited to 'src/remote/activitypub')
-rw-r--r--src/remote/activitypub/models/person.ts1
-rw-r--r--src/remote/activitypub/request.ts1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index dcd64e0cd7..bfcad100fe 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -6,7 +6,6 @@ import { resolveImage } from './image';
import { isCollectionOrOrderedCollection, isCollection, IPerson } from '../type';
import { DriveFile } from '../../../models/entities/drive-file';
import { fromHtml } from '../../../mfm/fromHtml';
-import { URL } from 'url';
import { resolveNote, extractEmojis } from './note';
import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc';
import { ITag, extractHashtags } from './tag';
diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts
index bde4921c3a..6d18e53281 100644
--- a/src/remote/activitypub/request.ts
+++ b/src/remote/activitypub/request.ts
@@ -1,6 +1,5 @@
import { request } from 'https';
import { sign } from 'http-signature';
-import { URL } from 'url';
import * as crypto from 'crypto';
import { lookup, IRunOptions } from 'lookup-dns-cache';
import * as promiseAny from 'promise-any';