diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /server/helpers/webfinger.ts | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'server/helpers/webfinger.ts')
| -rw-r--r-- | server/helpers/webfinger.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts index 10fcec462..156376943 100644 --- a/server/helpers/webfinger.ts +++ b/server/helpers/webfinger.ts | |||
| @@ -12,7 +12,10 @@ const webfinger = new WebFinger({ | |||
| 12 | request_timeout: 3000 | 12 | request_timeout: 3000 |
| 13 | }) | 13 | }) |
| 14 | 14 | ||
| 15 | async function loadActorUrlOrGetFromWebfinger (uri: string) { | 15 | async function loadActorUrlOrGetFromWebfinger (uriArg: string) { |
| 16 | // Handle strings like @toto@example.com | ||
| 17 | const uri = uriArg.startsWith('@') ? uriArg.slice(1) : uriArg | ||
| 18 | |||
| 16 | const [ name, host ] = uri.split('@') | 19 | const [ name, host ] = uri.split('@') |
| 17 | let actor: ActorModel | 20 | let actor: ActorModel |
| 18 | 21 | ||