normalize accounts and check for return in HTTP for moving
This commit is contained in:
parent
4be9fe01bf
commit
566f7c42a5
|
@ -57,6 +57,8 @@ class AccountMover
|
||||||
$this->_user = $user;
|
$this->_user = $user;
|
||||||
$this->_profile = $user->getProfile();
|
$this->_profile = $user->getProfile();
|
||||||
|
|
||||||
|
$remote = Discovery::normalize($remote);
|
||||||
|
|
||||||
$oprofile = Ostatus_profile::ensureProfileURI($remote);
|
$oprofile = Ostatus_profile::ensureProfileURI($remote);
|
||||||
|
|
||||||
if (empty($oprofile)) {
|
if (empty($oprofile)) {
|
||||||
|
|
|
@ -151,5 +151,19 @@ class ActivitySink
|
||||||
$client->setBody($activity->asString(true, true, true));
|
$client->setBody($activity->asString(true, true, true));
|
||||||
|
|
||||||
$response = $client->send();
|
$response = $client->send();
|
||||||
|
|
||||||
|
$status = $response->getStatus();
|
||||||
|
$reason = $response->getReasonPhrase();
|
||||||
|
|
||||||
|
if ($status >= 200 && $status < 300) {
|
||||||
|
return true;
|
||||||
|
} else if ($status >= 400 && $status < 500) {
|
||||||
|
throw new ClientException("{$url} {$status} {$reason}");
|
||||||
|
} else if ($status >= 500 && $status < 600) {
|
||||||
|
throw new ServerException("{$url} {$status} {$reason}");
|
||||||
|
} else {
|
||||||
|
// That's unexpected.
|
||||||
|
throw new Exception("{$url} {$status} {$reason}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user