Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
Brion Vibber
@@ -24,6 +24,8 @@
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
||||
|
||||
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/');
|
||||
|
||||
class FeedSubException extends Exception
|
||||
{
|
||||
}
|
||||
@@ -58,8 +60,6 @@ class OStatusPlugin extends Plugin
|
||||
$m->connect('main/push/callback/:feed',
|
||||
array('action' => 'pushcallback'),
|
||||
array('feed' => '[0-9]+'));
|
||||
$m->connect('settings/feedsub',
|
||||
array('action' => 'feedsubsettings'));
|
||||
|
||||
// Salmon endpoint
|
||||
$m->connect('main/salmon/user/:id',
|
||||
@@ -78,9 +78,18 @@ class OStatusPlugin extends Plugin
|
||||
*/
|
||||
function onEndInitializeQueueManager(QueueManager $qm)
|
||||
{
|
||||
$qm->connect('hubverify', 'HubVerifyQueueHandler');
|
||||
$qm->connect('hubdistrib', 'HubDistribQueueHandler');
|
||||
// Prepare outgoing distributions after notice save.
|
||||
$qm->connect('ostatus', 'OStatusQueueHandler');
|
||||
|
||||
// Outgoing from our internal PuSH hub
|
||||
$qm->connect('hubconf', 'HubConfQueueHandler');
|
||||
$qm->connect('hubout', 'HubOutQueueHandler');
|
||||
|
||||
// Outgoing Salmon replies (when we don't need a return value)
|
||||
$qm->connect('salmon', 'SalmonQueueHandler');
|
||||
|
||||
// Incoming from a foreign PuSH hub
|
||||
$qm->connect('pushin', 'PushInQueueHandler');
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -89,7 +98,7 @@ class OStatusPlugin extends Plugin
|
||||
*/
|
||||
function onStartEnqueueNotice($notice, &$transports)
|
||||
{
|
||||
$transports[] = 'hubdistrib';
|
||||
$transports[] = 'ostatus';
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -132,25 +141,6 @@ class OStatusPlugin extends Plugin
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the feed settings page to the Connect Settings menu
|
||||
*
|
||||
* @param Action &$action The calling page
|
||||
*
|
||||
* @return boolean hook return
|
||||
*/
|
||||
function onEndConnectSettingsNav(&$action)
|
||||
{
|
||||
$action_name = $action->trimmed('action');
|
||||
|
||||
$action->menuItem(common_local_url('feedsubsettings'),
|
||||
_m('Feeds'),
|
||||
_m('Feed subscription options'),
|
||||
$action_name === 'feedsubsettings');
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Automatically load the actions and libraries used by the plugin
|
||||
*
|
||||
@@ -211,94 +201,47 @@ class OStatusPlugin extends Plugin
|
||||
* @fixme push webfinger lookup & sending to a background queue
|
||||
* @fixme also detect short-form name for remote subscribees where not ambiguous
|
||||
*/
|
||||
|
||||
function onEndNoticeSave($notice)
|
||||
{
|
||||
$count = preg_match_all('/(\w+\.)*\w+@(\w+\.)*\w+(\w+\-\w+)*\.\w+/', $notice->content, $matches);
|
||||
if ($count) {
|
||||
foreach ($matches[0] as $webfinger) {
|
||||
|
||||
// FIXME: look up locally first
|
||||
|
||||
// Check to see if we've got an actual webfinger
|
||||
$w = new Webfinger;
|
||||
|
||||
$endpoint_uri = '';
|
||||
|
||||
$result = $w->lookup($webfinger);
|
||||
if (empty($result)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($result->links as $link) {
|
||||
if ($link['rel'] == 'salmon') {
|
||||
$endpoint_uri = $link['href'];
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($endpoint_uri)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// FIXME: this needs to go out in a queue handler
|
||||
|
||||
$xml = '<?xml version="1.0" encoding="UTF-8" ?>';
|
||||
$xml .= $notice->asAtomEntry();
|
||||
|
||||
$salmon = new Salmon();
|
||||
$salmon->post($endpoint_uri, $xml);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Notify remote server and garbage collect unused feeds on unsubscribe.
|
||||
* @fixme send these operations to background queues
|
||||
*
|
||||
* @param User $user
|
||||
* @param Profile $other
|
||||
* @return hook return value
|
||||
*/
|
||||
function onEndUnsubscribe($profile, $other)
|
||||
|
||||
function onStartFindMentions($sender, $text, &$mentions)
|
||||
{
|
||||
$user = User::staticGet('id', $profile->id);
|
||||
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
|
||||
$text,
|
||||
$wmatches,
|
||||
PREG_OFFSET_CAPTURE);
|
||||
|
||||
if (empty($user)) {
|
||||
return true;
|
||||
foreach ($wmatches[1] as $wmatch) {
|
||||
|
||||
$webfinger = $wmatch[0];
|
||||
|
||||
$this->log(LOG_INFO, "Checking Webfinger for address '$webfinger'");
|
||||
|
||||
$oprofile = Ostatus_profile::ensureWebfinger($webfinger);
|
||||
|
||||
if (empty($oprofile)) {
|
||||
|
||||
$this->log(LOG_INFO, "No Ostatus_profile found for address '$webfinger'");
|
||||
|
||||
} else {
|
||||
|
||||
$this->log(LOG_INFO, "Ostatus_profile found for address '$webfinger'");
|
||||
|
||||
$profile = $oprofile->localProfile();
|
||||
|
||||
$mentions[] = array('mentioned' => array($profile),
|
||||
'text' => $wmatch[0],
|
||||
'position' => $wmatch[1],
|
||||
'url' => $profile->profileurl);
|
||||
}
|
||||
}
|
||||
|
||||
$oprofile = Ostatus_profile::staticGet('profile_id', $other->id);
|
||||
|
||||
if (empty($oprofile)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Drop the PuSH subscription if there are no other subscribers.
|
||||
|
||||
if ($other->subscriberCount() == 0) {
|
||||
common_log(LOG_INFO, "Unsubscribing from now-unused feed $oprofile->feeduri");
|
||||
$oprofile->unsubscribe();
|
||||
}
|
||||
|
||||
$act = new Activity();
|
||||
|
||||
$act->verb = ActivityVerb::UNFOLLOW;
|
||||
|
||||
$act->id = TagURI::mint('unfollow:%d:%d:%s',
|
||||
$profile->id,
|
||||
$other->id,
|
||||
common_date_iso8601(time()));
|
||||
|
||||
$act->time = time();
|
||||
$act->title = _("Unfollow");
|
||||
$act->content = sprintf(_("%s stopped following %s."),
|
||||
$profile->getBestName(),
|
||||
$other->getBestName());
|
||||
|
||||
$act->actor = ActivityObject::fromProfile($profile);
|
||||
$act->object = ActivityObject::fromProfile($other);
|
||||
|
||||
$oprofile->notifyActivity($act);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -308,8 +251,10 @@ class OStatusPlugin extends Plugin
|
||||
function onCheckSchema() {
|
||||
$schema = Schema::get();
|
||||
$schema->ensureTable('ostatus_profile', Ostatus_profile::schemaDef());
|
||||
$schema->ensureTable('ostatus_source', Ostatus_source::schemaDef());
|
||||
$schema->ensureTable('feedsub', FeedSub::schemaDef());
|
||||
$schema->ensureTable('hubsub', HubSub::schemaDef());
|
||||
$schema->ensureTable('magicsig', Magicsig::schemaDef());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -336,13 +281,19 @@ class OStatusPlugin extends Plugin
|
||||
function onStartNoticeSourceLink($notice, &$name, &$url, &$title)
|
||||
{
|
||||
if ($notice->source == 'ostatus') {
|
||||
$bits = parse_url($notice->uri);
|
||||
$domain = $bits['host'];
|
||||
if ($notice->url) {
|
||||
$bits = parse_url($notice->url);
|
||||
$domain = $bits['host'];
|
||||
if (substr($domain, 0, 4) == 'www.') {
|
||||
$name = substr($domain, 4);
|
||||
} else {
|
||||
$name = $domain;
|
||||
}
|
||||
|
||||
$name = $domain;
|
||||
$url = $notice->uri;
|
||||
$title = sprintf(_m("Sent from %s via OStatus"), $domain);
|
||||
return false;
|
||||
$url = $notice->url;
|
||||
$title = sprintf(_m("Sent from %s via OStatus"), $domain);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -357,12 +308,56 @@ class OStatusPlugin extends Plugin
|
||||
{
|
||||
$oprofile = Ostatus_profile::staticGet('feeduri', $feedsub->uri);
|
||||
if ($oprofile) {
|
||||
$oprofile->processFeed($feed);
|
||||
$oprofile->processFeed($feed, 'push');
|
||||
} else {
|
||||
common_log(LOG_DEBUG, "No ostatus profile for incoming feed $feedsub->uri");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* When about to subscribe to a remote user, start a server-to-server
|
||||
* PuSH subscription if needed. If we can't establish that, abort.
|
||||
*
|
||||
* @fixme If something else aborts later, we could end up with a stray
|
||||
* PuSH subscription. This is relatively harmless, though.
|
||||
*
|
||||
* @param Profile $subscriber
|
||||
* @param Profile $other
|
||||
*
|
||||
* @return hook return code
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
function onStartSubscribe($subscriber, $other)
|
||||
{
|
||||
$user = User::staticGet('id', $subscriber->id);
|
||||
|
||||
if (empty($user)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$oprofile = Ostatus_profile::staticGet('profile_id', $other->id);
|
||||
|
||||
if (empty($oprofile)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!$oprofile->subscribe()) {
|
||||
throw new Exception(_m('Could not set up remote subscription.'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Having established a remote subscription, send a notification to the
|
||||
* remote OStatus profile's endpoint.
|
||||
*
|
||||
* @param Profile $subscriber
|
||||
* @param Profile $other
|
||||
*
|
||||
* @return hook return code
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
function onEndSubscribe($subscriber, $other)
|
||||
{
|
||||
$user = User::staticGet('id', $subscriber->id);
|
||||
@@ -400,6 +395,145 @@ class OStatusPlugin extends Plugin
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Notify remote server and garbage collect unused feeds on unsubscribe.
|
||||
* @fixme send these operations to background queues
|
||||
*
|
||||
* @param User $user
|
||||
* @param Profile $other
|
||||
* @return hook return value
|
||||
*/
|
||||
function onEndUnsubscribe($profile, $other)
|
||||
{
|
||||
$user = User::staticGet('id', $profile->id);
|
||||
|
||||
if (empty($user)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$oprofile = Ostatus_profile::staticGet('profile_id', $other->id);
|
||||
|
||||
if (empty($oprofile)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Drop the PuSH subscription if there are no other subscribers.
|
||||
$oprofile->garbageCollect();
|
||||
|
||||
$act = new Activity();
|
||||
|
||||
$act->verb = ActivityVerb::UNFOLLOW;
|
||||
|
||||
$act->id = TagURI::mint('unfollow:%d:%d:%s',
|
||||
$profile->id,
|
||||
$other->id,
|
||||
common_date_iso8601(time()));
|
||||
|
||||
$act->time = time();
|
||||
$act->title = _("Unfollow");
|
||||
$act->content = sprintf(_("%s stopped following %s."),
|
||||
$profile->getBestName(),
|
||||
$other->getBestName());
|
||||
|
||||
$act->actor = ActivityObject::fromProfile($profile);
|
||||
$act->object = ActivityObject::fromProfile($other);
|
||||
|
||||
$oprofile->notifyActivity($act);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* When one of our local users tries to join a remote group,
|
||||
* notify the remote server. If the notification is rejected,
|
||||
* deny the join.
|
||||
*
|
||||
* @param User_group $group
|
||||
* @param User $user
|
||||
*
|
||||
* @return mixed hook return value
|
||||
*/
|
||||
|
||||
function onStartJoinGroup($group, $user)
|
||||
{
|
||||
$oprofile = Ostatus_profile::staticGet('group_id', $group->id);
|
||||
if ($oprofile) {
|
||||
if (!$oprofile->subscribe()) {
|
||||
throw new Exception(_m('Could not set up remote group membership.'));
|
||||
}
|
||||
|
||||
$member = Profile::staticGet($user->id);
|
||||
|
||||
$act = new Activity();
|
||||
$act->id = TagURI::mint('join:%d:%d:%s',
|
||||
$member->id,
|
||||
$group->id,
|
||||
common_date_iso8601(time()));
|
||||
|
||||
$act->actor = ActivityObject::fromProfile($member);
|
||||
$act->verb = ActivityVerb::JOIN;
|
||||
$act->object = $oprofile->asActivityObject();
|
||||
|
||||
$act->time = time();
|
||||
$act->title = _m("Join");
|
||||
$act->content = sprintf(_m("%s has joined group %s."),
|
||||
$member->getBestName(),
|
||||
$oprofile->getBestName());
|
||||
|
||||
if ($oprofile->notifyActivity($act)) {
|
||||
return true;
|
||||
} else {
|
||||
$oprofile->garbageCollect();
|
||||
throw new Exception(_m("Failed joining remote group."));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* When one of our local users leaves a remote group, notify the remote
|
||||
* server.
|
||||
*
|
||||
* @fixme Might be good to schedule a resend of the leave notification
|
||||
* if it failed due to a transitory error. We've canceled the local
|
||||
* membership already anyway, but if the remote server comes back up
|
||||
* it'll be left with a stray membership record.
|
||||
*
|
||||
* @param User_group $group
|
||||
* @param User $user
|
||||
*
|
||||
* @return mixed hook return value
|
||||
*/
|
||||
|
||||
function onEndLeaveGroup($group, $user)
|
||||
{
|
||||
$oprofile = Ostatus_profile::staticGet('group_id', $group->id);
|
||||
if ($oprofile) {
|
||||
// Drop the PuSH subscription if there are no other subscribers.
|
||||
$oprofile->garbageCollect();
|
||||
|
||||
|
||||
$member = Profile::staticGet($user->id);
|
||||
|
||||
$act = new Activity();
|
||||
$act->id = TagURI::mint('leave:%d:%d:%s',
|
||||
$member->id,
|
||||
$group->id,
|
||||
common_date_iso8601(time()));
|
||||
|
||||
$act->actor = ActivityObject::fromProfile($member);
|
||||
$act->verb = ActivityVerb::LEAVE;
|
||||
$act->object = $oprofile->asActivityObject();
|
||||
|
||||
$act->time = time();
|
||||
$act->title = _m("Leave");
|
||||
$act->content = sprintf(_m("%s has left group %s."),
|
||||
$member->getBestName(),
|
||||
$oprofile->getBestName());
|
||||
|
||||
$oprofile->notifyActivity($act);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Notify remote users when their notices get favorited.
|
||||
*
|
||||
@@ -487,4 +621,94 @@ class OStatusPlugin extends Plugin
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function onStartGetProfileUri($profile, &$uri)
|
||||
{
|
||||
$oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
|
||||
if (!empty($oprofile)) {
|
||||
$uri = $oprofile->uri;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function onStartUserGroupHomeUrl($group, &$url)
|
||||
{
|
||||
return $this->onStartUserGroupPermalink($group, &$url);
|
||||
}
|
||||
|
||||
function onStartUserGroupPermalink($group, &$url)
|
||||
{
|
||||
$oprofile = Ostatus_profile::staticGet('group_id', $group->id);
|
||||
if ($oprofile) {
|
||||
// @fixme this should probably be in the user_group table
|
||||
// @fixme this uri not guaranteed to be a profile page
|
||||
$url = $oprofile->uri;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function onStartShowSubscriptionsContent($action)
|
||||
{
|
||||
$user = common_current_user();
|
||||
if ($user && ($user->id == $action->profile->id)) {
|
||||
$action->elementStart('div', 'entity_actions');
|
||||
$action->elementStart('p', array('id' => 'entity_remote_subscribe',
|
||||
'class' => 'entity_subscribe'));
|
||||
$action->element('a', array('href' => common_local_url('ostatussub'),
|
||||
'class' => 'entity_remote_subscribe')
|
||||
, _m('Subscribe to remote user'));
|
||||
$action->elementEnd('p');
|
||||
$action->elementEnd('div');
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ping remote profiles with updates to this profile.
|
||||
* Salmon pings are queued for background processing.
|
||||
*/
|
||||
function onEndBroadcastProfile(Profile $profile)
|
||||
{
|
||||
$user = User::staticGet('id', $profile->id);
|
||||
|
||||
// Find foreign accounts I'm subscribed to that support Salmon pings.
|
||||
//
|
||||
// @fixme we could run updates through the PuSH feed too,
|
||||
// in which case we can skip Salmon pings to folks who
|
||||
// are also subscribed to me.
|
||||
$sql = "SELECT * FROM ostatus_profile " .
|
||||
"WHERE profile_id IN " .
|
||||
"(SELECT subscribed FROM subscription WHERE subscriber=%d) " .
|
||||
"OR group_id IN " .
|
||||
"(SELECT group_id FROM group_member WHERE profile_id=%d)";
|
||||
$oprofile = new Ostatus_profile();
|
||||
$oprofile->query(sprintf($sql, $profile->id, $profile->id));
|
||||
|
||||
if ($oprofile->N == 0) {
|
||||
common_log(LOG_DEBUG, "No OStatus remote subscribees for $profile->nickname");
|
||||
return true;
|
||||
}
|
||||
|
||||
$act = new Activity();
|
||||
|
||||
$act->verb = ActivityVerb::UPDATE_PROFILE;
|
||||
$act->id = TagURI::mint('update-profile:%d:%s',
|
||||
$profile->id,
|
||||
common_date_iso8601(time()));
|
||||
$act->time = time();
|
||||
$act->title = _m("Profile update");
|
||||
$act->content = sprintf(_m("%s has updated their profile page."),
|
||||
$profile->getBestName());
|
||||
|
||||
$act->actor = ActivityObject::fromProfile($profile);
|
||||
$act->object = $act->actor;
|
||||
|
||||
while ($oprofile->fetch()) {
|
||||
$oprofile->notifyDeferred($act);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user