We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 4b41d05a authored by Evan Prodromou's avatar Evan Prodromou

Make restoreuser use new FeedImporter queue handler

parent 044763cf
......@@ -81,10 +81,10 @@ class ActivityImporter extends QueueHandler
common_log(LOG_WARNING, $ce->getMessage());
return true;
} catch (ServerException $se) {
common_log(LOG_ERR, $ce->getMessage());
common_log(LOG_ERR, $se->getMessage());
return false;
} catch (Exception $e) {
common_log(LOG_ERR, $ce->getMessage());
common_log(LOG_ERR, $e->getMessage());
return false;
}
return true;
......@@ -95,6 +95,11 @@ class ActivityImporter extends QueueHandler
$profile = $user->getProfile();
if ($activity->objects[0]->id == $author->id) {
if (!$this->trusted) {
throw new ClientException(_("Can't force subscription for untrusted user."));
}
$other = $activity->actor;
$otherUser = User::staticGet('uri', $other->id);
......
......@@ -84,12 +84,12 @@ class FeedImporter extends QueueHandler
if (empty($user)) {
if ($trusted) {
$user = $this->userFromAuthor($author);
} else {
throw new ClientException(_("Can't import without a user."));
}
}
$entries = $feed->getElementsByTagNameNS(Activity::ATOM, 'entry');
$activities = $this->entriesToActivities($entries, $feed);
$activities = $this->getActivities($feed);
$qm = QueueManager::get();
......@@ -108,6 +108,36 @@ class FeedImporter extends QueueHandler
}
}
function getActivities($feed)
{
$entries = $feed->getElementsByTagNameNS(Activity::ATOM, 'entry');
$activities = array();
for ($i = 0; $i < $entries->length; $i++) {
$activities[] = new Activity($entries->item($i));
}
usort($activities, array("FeedImporter", "activitySort"));
return $activities;
}
/**
* Sort activities oldest-first
*/
static function activitySort($a, $b)
{
if ($a->time == $b->time) {
return 0;
} else if ($a->time < $b->time) {
return -1;
} else {
return 1;
}
}
function userFromAuthor($author)
{
$user = User::staticGet('uri', $author->id);
......
......@@ -75,9 +75,8 @@ try {
$user = null;
}
$xml = getActivityStreamDocument();
$restorer = new AccountRestorer();
$doc = $restorer->loadXML($xml);
$restorer->importActivityStream($user, $doc);
$qm = QueueManager::get();
$qm->enqueue(array($user, $xml, true), 'feedimp');
} catch (Exception $e) {
print $e->getMessage()."\n";
exit(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment