diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-01 23:32:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-01 23:32:46 +0900 |
| commit | 13c2de67a4e5aedc9e70726752c15ff232b7c9fd (patch) | |
| tree | 3da38725843c01e0dddf9a044e8017018b735325 /src/common/remote | |
| parent | Add missing semicolon (diff) | |
| parent | Implement remote follow (diff) | |
| download | sharkey-13c2de67a4e5aedc9e70726752c15ff232b7c9fd.tar.gz sharkey-13c2de67a4e5aedc9e70726752c15ff232b7c9fd.tar.bz2 sharkey-13c2de67a4e5aedc9e70726752c15ff232b7c9fd.zip | |
Merge pull request #1356 from akihikodaki/publickey
Implement remote follow
Diffstat (limited to 'src/common/remote')
| -rw-r--r-- | src/common/remote/activitypub/renderer/follow.ts | 8 | ||||
| -rw-r--r-- | src/common/remote/activitypub/resolve-person.ts | 1 | ||||
| -rw-r--r-- | src/common/remote/webfinger.ts | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/common/remote/activitypub/renderer/follow.ts b/src/common/remote/activitypub/renderer/follow.ts new file mode 100644 index 0000000000..05c0ecca06 --- /dev/null +++ b/src/common/remote/activitypub/renderer/follow.ts @@ -0,0 +1,8 @@ +import config from '../../../../conf'; +import { IRemoteAccount } from '../../../../models/user'; + +export default ({ username }, { account }) => ({ + type: 'Follow', + actor: `${config.url}/@${username}`, + object: (account as IRemoteAccount).uri +}); diff --git a/src/common/remote/activitypub/resolve-person.ts b/src/common/remote/activitypub/resolve-person.ts index b8c507d358..73584946e5 100644 --- a/src/common/remote/activitypub/resolve-person.ts +++ b/src/common/remote/activitypub/resolve-person.ts @@ -66,6 +66,7 @@ export default async (value, usernameLower, hostLower, acctLower) => { id: object.publicKey.id, publicKeyPem: object.publicKey.publicKeyPem }, + inbox: object.inbox, uri: object.id, }, }); diff --git a/src/common/remote/webfinger.ts b/src/common/remote/webfinger.ts index 9f1b916c9f..039156d776 100644 --- a/src/common/remote/webfinger.ts +++ b/src/common/remote/webfinger.ts @@ -1,6 +1,6 @@ const WebFinger = require('webfinger.js'); -const webFinger = new WebFinger({}); +const webFinger = new WebFinger({ tls_only: false }); type ILink = { href: string; |