forked from GNUsocial/gnu-social
Account moving is a background activity
This commit is contained in:
Evan Prodromou
parent
64750a6455
commit
fb681990d9
@ -45,17 +45,16 @@ if (!defined('STATUSNET')) {
|
|||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class AccountMover
|
class AccountMover extends QueueHandler
|
||||||
{
|
{
|
||||||
private $_user = null;
|
function transport()
|
||||||
private $_profile = null;
|
|
||||||
private $_remote = null;
|
|
||||||
private $_sink = null;
|
|
||||||
|
|
||||||
function __construct($user, $remote, $password)
|
|
||||||
{
|
{
|
||||||
$this->_user = $user;
|
return 'acctmove';
|
||||||
$this->_profile = $user->getProfile();
|
}
|
||||||
|
|
||||||
|
function handle($object)
|
||||||
|
{
|
||||||
|
list($user, $remote, $password) = $object;
|
||||||
|
|
||||||
$remote = Discovery::normalize($remote);
|
$remote = Discovery::normalize($remote);
|
||||||
|
|
||||||
@ -65,11 +64,33 @@ class AccountMover
|
|||||||
throw new Exception("Can't locate account {$remote}");
|
throw new Exception("Can't locate account {$remote}");
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->_remote = $oprofile->localProfile();
|
|
||||||
|
|
||||||
list($svcDocUrl, $username) = self::getServiceDocument($remote);
|
list($svcDocUrl, $username) = self::getServiceDocument($remote);
|
||||||
|
|
||||||
$this->_sink = new ActivitySink($svcDocUrl, $username, $password);
|
$sink = new ActivitySink($svcDocUrl, $username, $password);
|
||||||
|
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Moving user {$user->nickname} ".
|
||||||
|
"to {$remote}.");
|
||||||
|
|
||||||
|
$stream = new UserActivityStream($user);
|
||||||
|
|
||||||
|
// Reverse activities to run in correct chron order
|
||||||
|
|
||||||
|
$acts = array_reverse($stream->activities);
|
||||||
|
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Got ".count($acts)." activities ".
|
||||||
|
"for {$user->nickname}.");
|
||||||
|
|
||||||
|
$qm = QueueManager::get();
|
||||||
|
|
||||||
|
foreach ($acts as $act) {
|
||||||
|
$qm->enqueue(array($act, $sink, $user->uri, $remote), 'actmove');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Finished moving user {$user->nickname} ".
|
||||||
|
"to {$remote}.");
|
||||||
}
|
}
|
||||||
|
|
||||||
static function getServiceDocument($remote)
|
static function getServiceDocument($remote)
|
||||||
@ -108,104 +129,6 @@ class AccountMover
|
|||||||
return array($svcDocUrl, $username);
|
return array($svcDocUrl, $username);
|
||||||
}
|
}
|
||||||
|
|
||||||
function move()
|
|
||||||
{
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Moving user {$this->_user->nickname} to {$this->_remote->nickname}");
|
|
||||||
|
|
||||||
$stream = new UserActivityStream($this->_user);
|
|
||||||
|
|
||||||
$acts = array_reverse($stream->activities);
|
|
||||||
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Got {count($acts)} activities ".
|
|
||||||
"for {$this->_user->nickname}");
|
|
||||||
|
|
||||||
// Reverse activities to run in correct chron order
|
|
||||||
|
|
||||||
foreach ($acts as $act) {
|
|
||||||
try {
|
|
||||||
$this->_moveActivity($act);
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->log(LOG_ERR,
|
|
||||||
"Error moving activity {$act->id} {$act->verb}: " .
|
|
||||||
$e->getMessage());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Finished moving user {$this->_user->nickname} ".
|
|
||||||
"to {$this->_remote->nickname}");
|
|
||||||
}
|
|
||||||
|
|
||||||
private function _moveActivity($act)
|
|
||||||
{
|
|
||||||
switch ($act->verb) {
|
|
||||||
case ActivityVerb::FAVORITE:
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Moving favorite of {$act->objects[0]->id} by ".
|
|
||||||
"{$act->actor->id} to {$this->_remote->nickname}.");
|
|
||||||
// push it, then delete local
|
|
||||||
$this->_sink->postActivity($act);
|
|
||||||
$notice = Notice::staticGet('uri', $act->objects[0]->id);
|
|
||||||
if (!empty($notice)) {
|
|
||||||
$fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
|
|
||||||
'notice_id' => $notice->id));
|
|
||||||
$fave->delete();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ActivityVerb::POST:
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Moving notice {$act->objects[0]->id} by ".
|
|
||||||
"{$act->actor->id} to {$this->_remote->nickname}.");
|
|
||||||
// XXX: send a reshare, not a post
|
|
||||||
$this->_sink->postActivity($act);
|
|
||||||
$notice = Notice::staticGet('uri', $act->objects[0]->id);
|
|
||||||
if (!empty($notice)) {
|
|
||||||
$notice->delete();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ActivityVerb::JOIN:
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Moving group join of {$act->objects[0]->id} by ".
|
|
||||||
"{$act->actor->id} to {$this->_remote->nickname}.");
|
|
||||||
$this->_sink->postActivity($act);
|
|
||||||
$group = User_group::staticGet('uri', $act->objects[0]->id);
|
|
||||||
if (!empty($group)) {
|
|
||||||
Group_member::leave($group->id, $this->_user->id);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ActivityVerb::FOLLOW:
|
|
||||||
if ($act->actor->id == $this->_user->uri) {
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Moving subscription to {$act->objects[0]->id} by ".
|
|
||||||
"{$act->actor->id} to {$this->_remote->nickname}.");
|
|
||||||
$this->_sink->postActivity($act);
|
|
||||||
$other = Profile::fromURI($act->objects[0]->id);
|
|
||||||
if (!empty($other)) {
|
|
||||||
Subscription::cancel($this->_profile, $other);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$otherUser = User::staticGet('uri', $act->actor->id);
|
|
||||||
if (!empty($otherUser)) {
|
|
||||||
$this->log(LOG_INFO,
|
|
||||||
"Changing sub to {$act->objects[0]->id}".
|
|
||||||
"by {$act->actor->id} to {$this->_remote->nickname}.");
|
|
||||||
$otherProfile = $otherUser->getProfile();
|
|
||||||
Subscription::start($otherProfile, $this->_remote);
|
|
||||||
Subscription::cancel($otherProfile, $this->_user->getProfile());
|
|
||||||
} else {
|
|
||||||
$this->log(LOG_NOTICE,
|
|
||||||
"Not changing sub to {$act->objects[0]->id}".
|
|
||||||
"by remote {$act->actor->id} ".
|
|
||||||
"to {$this->_remote->nickname}.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Log some data
|
* Log some data
|
||||||
*
|
*
|
||||||
|
|||||||
168
lib/activitymover.php
Normal file
168
lib/activitymover.php
Normal file
@ -0,0 +1,168 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* StatusNet - the distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2010, StatusNet, Inc.
|
||||||
|
*
|
||||||
|
* Title of module
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* @category Cache
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @copyright 2010 StatusNet, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('STATUSNET')) {
|
||||||
|
// This check helps protect against security problems;
|
||||||
|
// your code file can't be executed directly from the web.
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class comment
|
||||||
|
*
|
||||||
|
* @category General
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @copyright 2010 StatusNet, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
|
||||||
|
class ActivityMover extends QueueHandler
|
||||||
|
{
|
||||||
|
function transport()
|
||||||
|
{
|
||||||
|
return 'actmove';
|
||||||
|
}
|
||||||
|
|
||||||
|
function handle($data)
|
||||||
|
{
|
||||||
|
list ($act, $sink, $userURI, $remoteURI) = $data;
|
||||||
|
|
||||||
|
$user = User::staticGet('uri', $userURI);
|
||||||
|
$remote = Profile::fromURI($remoteURI);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->moveActivity($act, $sink, $user, $remote);
|
||||||
|
} catch (ClientException $cex) {
|
||||||
|
$this->log(LOG_WARNING,
|
||||||
|
$cex->getMessage());
|
||||||
|
// "don't retry me"
|
||||||
|
return true;
|
||||||
|
} catch (ServerException $sex) {
|
||||||
|
$this->log(LOG_WARNING,
|
||||||
|
$sex->getMessage());
|
||||||
|
// "retry me" (because we think the server might handle it next time)
|
||||||
|
return false;
|
||||||
|
} catch (Exception $ex) {
|
||||||
|
$this->log(LOG_WARNING,
|
||||||
|
$ex->getMessage());
|
||||||
|
// "don't retry me"
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function moveActivity($act, $sink, $user, $remote)
|
||||||
|
{
|
||||||
|
if (empty($user)) {
|
||||||
|
throw new Exception("No such user {$act->actor->id}");
|
||||||
|
}
|
||||||
|
|
||||||
|
switch ($act->verb) {
|
||||||
|
case ActivityVerb::FAVORITE:
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Moving favorite of {$act->objects[0]->id} by ".
|
||||||
|
"{$act->actor->id} to {$remote->nickname}.");
|
||||||
|
// push it, then delete local
|
||||||
|
$sink->postActivity($act);
|
||||||
|
$notice = Notice::staticGet('uri', $act->objects[0]->id);
|
||||||
|
if (!empty($notice)) {
|
||||||
|
$fave = Fave::pkeyGet(array('user_id' => $user->id,
|
||||||
|
'notice_id' => $notice->id));
|
||||||
|
$fave->delete();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ActivityVerb::POST:
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Moving notice {$act->objects[0]->id} by ".
|
||||||
|
"{$act->actor->id} to {$remote->nickname}.");
|
||||||
|
// XXX: send a reshare, not a post
|
||||||
|
$sink->postActivity($act);
|
||||||
|
$notice = Notice::staticGet('uri', $act->objects[0]->id);
|
||||||
|
if (!empty($notice)) {
|
||||||
|
$notice->delete();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ActivityVerb::JOIN:
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Moving group join of {$act->objects[0]->id} by ".
|
||||||
|
"{$act->actor->id} to {$remote->nickname}.");
|
||||||
|
$sink->postActivity($act);
|
||||||
|
$group = User_group::staticGet('uri', $act->objects[0]->id);
|
||||||
|
if (!empty($group)) {
|
||||||
|
Group_member::leave($group->id, $user->id);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ActivityVerb::FOLLOW:
|
||||||
|
if ($act->actor->id == $user->uri) {
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Moving subscription to {$act->objects[0]->id} by ".
|
||||||
|
"{$act->actor->id} to {$remote->nickname}.");
|
||||||
|
$sink->postActivity($act);
|
||||||
|
$other = Profile::fromURI($act->objects[0]->id);
|
||||||
|
if (!empty($other)) {
|
||||||
|
Subscription::cancel($user->getProfile(), $other);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$otherUser = User::staticGet('uri', $act->actor->id);
|
||||||
|
if (!empty($otherUser)) {
|
||||||
|
$this->log(LOG_INFO,
|
||||||
|
"Changing sub to {$act->objects[0]->id}".
|
||||||
|
"by {$act->actor->id} to {$remote->nickname}.");
|
||||||
|
$otherProfile = $otherUser->getProfile();
|
||||||
|
Subscription::start($otherProfile, $remote);
|
||||||
|
Subscription::cancel($otherProfile, $user->getProfile());
|
||||||
|
} else {
|
||||||
|
$this->log(LOG_NOTICE,
|
||||||
|
"Not changing sub to {$act->objects[0]->id}".
|
||||||
|
"by remote {$act->actor->id} ".
|
||||||
|
"to {$remote->nickname}.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log some data
|
||||||
|
*
|
||||||
|
* Add a header for our class so we know who did it.
|
||||||
|
*
|
||||||
|
* @param int $level Log level, like LOG_ERR or LOG_INFO
|
||||||
|
* @param string $message Message to log
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
|
||||||
|
protected function log($level, $message)
|
||||||
|
{
|
||||||
|
common_log($level, "ActivityMover: " . $message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -268,6 +268,8 @@ abstract class QueueManager extends IoManager
|
|||||||
$this->connect('deluser', 'DelUserQueueHandler');
|
$this->connect('deluser', 'DelUserQueueHandler');
|
||||||
$this->connect('feedimp', 'FeedImporter');
|
$this->connect('feedimp', 'FeedImporter');
|
||||||
$this->connect('actimp', 'ActivityImporter');
|
$this->connect('actimp', 'ActivityImporter');
|
||||||
|
$this->connect('acctmove', 'AccountMover');
|
||||||
|
$this->connect('actmove', 'ActivityMover');
|
||||||
|
|
||||||
// Broadcasting profile updates to OMB remote subscribers
|
// Broadcasting profile updates to OMB remote subscribers
|
||||||
$this->connect('profile', 'ProfileQueueHandler');
|
$this->connect('profile', 'ProfileQueueHandler');
|
||||||
|
|||||||
@ -51,9 +51,9 @@ try {
|
|||||||
|
|
||||||
$password = get_option_value('w', 'password');
|
$password = get_option_value('w', 'password');
|
||||||
|
|
||||||
$mover = new AccountMover($user, $remote, $password);
|
$qm = QueueManager::get();
|
||||||
|
|
||||||
$mover->move();
|
$qm->enqueue(array($user, $remote, $password), 'acctmove');
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
print $e->getMessage()."\n";
|
print $e->getMessage()."\n";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user