diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2018-09-04 19:24:23 +0900 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2018-09-04 19:24:23 +0900 |
| commit | 15956839046937bc07f21afb29326ca43856be5c (patch) | |
| tree | 13665b6d8cc5663a1ce3296e48da55ac1d337278 /src/remote | |
| parent | Use string interpolation (diff) | |
| parent | :art: (diff) | |
| download | misskey-15956839046937bc07f21afb29326ca43856be5c.tar.gz misskey-15956839046937bc07f21afb29326ca43856be5c.tar.bz2 misskey-15956839046937bc07f21afb29326ca43856be5c.zip | |
merge upstream
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/renderer/tombstone.ts | 4 | ||||
| -rw-r--r-- | src/remote/activitypub/request.ts | 1 | ||||
| -rw-r--r-- | src/remote/activitypub/resolver.ts | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/remote/activitypub/renderer/tombstone.ts b/src/remote/activitypub/renderer/tombstone.ts new file mode 100644 index 0000000000..553406b93b --- /dev/null +++ b/src/remote/activitypub/renderer/tombstone.ts @@ -0,0 +1,4 @@ +export default (id: string) => ({ + id, + type: 'Tombstone' +}); diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts index d739d08e15..07f0ecca8b 100644 --- a/src/remote/activitypub/request.ts +++ b/src/remote/activitypub/request.ts @@ -27,6 +27,7 @@ export default (user: ILocalUser, url: string, object: any) => new Promise((reso method: 'POST', path: pathname + search, headers: { + 'User-Agent': config.user_agent, 'Content-Type': 'application/activity+json', 'Digest': `SHA-256=${hash}` } diff --git a/src/remote/activitypub/resolver.ts b/src/remote/activitypub/resolver.ts index 0b053ca774..9bbe474d35 100644 --- a/src/remote/activitypub/resolver.ts +++ b/src/remote/activitypub/resolver.ts @@ -1,7 +1,7 @@ import * as request from 'request-promise-native'; import * as debug from 'debug'; import { IObject } from './type'; -//import config from '../../config'; +import config from '../../config'; const log = debug('misskey:activitypub:resolver'); @@ -51,6 +51,7 @@ export default class Resolver { const object = await request({ url: value, headers: { + 'User-Agent': config.user_agent, Accept: 'application/activity+json, application/ld+json' }, json: true |