*/
/**
+ * OStatusPlugin implementation for GNU Social
+ *
+ * Depends on: WebFinger plugin
+ *
* @package OStatusPlugin
* @maintainer Brion Vibber <brion@status.net>
*/
-if (!defined('STATUSNET')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
-set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/');
-
-class FeedSubException extends Exception
-{
- function __construct($msg=null)
- {
- $type = get_class($this);
- if ($msg) {
- parent::__construct("$type: $msg");
- } else {
- parent::__construct($type);
- }
- }
-}
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phpseclib');
class OStatusPlugin extends Plugin
{
/**
* Hook for RouterInitialized event.
*
- * @param Net_URL_Mapper $m path-to-action mapper
+ * @param URLMapper $m path-to-action mapper
* @return boolean hook return
*/
- function onRouterInitialized($m)
+ public function onRouterInitialized(URLMapper $m)
{
// Discovery actions
- $m->connect('main/ownerxrd',
- array('action' => 'ownerxrd'));
- $m->connect('main/ostatus',
- array('action' => 'ostatusinit'));
$m->connect('main/ostatustag',
array('action' => 'ostatustag'));
$m->connect('main/ostatustag?nickname=:nickname',
array('action' => 'ostatustag'), array('nickname' => '[A-Za-z0-9_-]+'));
- $m->connect('main/ostatus?nickname=:nickname',
+ $m->connect('main/ostatus/nickname/:nickname',
array('action' => 'ostatusinit'), array('nickname' => '[A-Za-z0-9_-]+'));
- $m->connect('main/ostatus?group=:group',
+ $m->connect('main/ostatus/group/:group',
array('action' => 'ostatusinit'), array('group' => '[A-Za-z0-9_-]+'));
- $m->connect('main/ostatus?peopletag=:peopletag&tagger=:tagger',
+ $m->connect('main/ostatus/peopletag/:peopletag/tagger/:tagger',
array('action' => 'ostatusinit'), array('tagger' => '[A-Za-z0-9_-]+',
'peopletag' => '[A-Za-z0-9_-]+'));
+ $m->connect('main/ostatus',
+ array('action' => 'ostatusinit'));
// Remote subscription actions
$m->connect('main/ostatussub',
return true;
}
+ public function onAutoload($cls)
+ {
+ switch ($cls) {
+ case 'Crypt_AES':
+ case 'Crypt_RSA':
+ // Crypt_AES becomes Crypt/AES.php which is found in extlib/phpseclib/
+ // which has been added to our include_path before
+ require_once str_replace('_', '/', $cls) . '.php';
+ return false;
+ }
+
+ return parent::onAutoload($cls);
+ }
+
/**
* Set up queue handlers for outgoing hub pushes
* @param QueueManager $qm
// Incoming from a foreign PuSH hub
$qm->connect('pushin', 'PushInQueueHandler');
+
+ // Re-subscribe feeds that need renewal
+ $qm->connect('pushrenew', 'PushRenewQueueHandler');
return true;
}
*/
function onStartEnqueueNotice($notice, &$transports)
{
- // FIXME: we don't do privacy-controlled OStatus updates yet.
- // once that happens, finer grain of control here.
- if ($notice->isLocal() && $notice->inScope(null)) {
+ if ($notice->inScope(null)) {
// put our transport first, in case there's any conflict (like OMB)
array_unshift($transports, 'ostatus');
+ $this->log(LOG_INFO, "Notice {$notice->id} queued for OStatus processing");
+ } else {
+ // FIXME: we don't do privacy-controlled OStatus updates yet.
+ // once that happens, finer grain of control here.
+ $this->log(LOG_NOTICE, "Not queueing notice {$notice->id} for OStatus because of privacy; scope = {$notice->scope}");
}
return true;
}
- /**
- * Add a link header for LRDD Discovery
- */
- function onStartShowHTML($action)
- {
- if ($action instanceof ShowstreamAction) {
- $acct = 'acct:'. $action->profile->nickname .'@'. common_config('site', 'server');
- $url = common_local_url('userxrd');
- $url.= '?uri='. $acct;
-
- header('Link: <'.$url.'>; rel="'. Discovery::LRDD_REL.'"; type="application/xrd+xml"');
- }
- }
-
/**
* Set up a PuSH hub link to our internal link for canonical timeline
* Atom feeds for users and groups.
$salmon = common_local_url($salmonAction, array('id' => $id));
$feed->addLink($salmon, array('rel' => Salmon::REL_SALMON));
- // XXX: these are deprecated
+ // XXX: these are deprecated, but StatusNet only looks for NS_REPLIES
$feed->addLink($salmon, array('rel' => Salmon::NS_REPLIES));
$feed->addLink($salmon, array('rel' => Salmon::NS_MENTIONS));
}
return true;
}
- /**
- * Automatically load the actions and libraries used by the plugin
- *
- * @param Class $cls the class
- *
- * @return boolean hook return
- *
- */
- function onAutoload($cls)
- {
- $base = dirname(__FILE__);
- $lower = strtolower($cls);
- $map = array('activityverb' => 'activity',
- 'activityobject' => 'activity',
- 'activityutils' => 'activity');
- if (isset($map[$lower])) {
- $lower = $map[$lower];
- }
- $files = array("$base/classes/$cls.php",
- "$base/lib/$lower.php");
- if (substr($lower, -6) == 'action') {
- $files[] = "$base/actions/" . substr($lower, 0, -6) . ".php";
- }
- foreach ($files as $file) {
- if (file_exists($file)) {
- include_once $file;
- return false;
- }
- }
- return true;
- }
-
/**
* Add in an OStatus subscribe button
*/
$cur = common_current_user();
if (empty($cur)) {
- $output->elementStart('li', 'entity_subscribe');
- $profile = $peopletag->getTagger();
+ $widget->out->elementStart('li', 'entity_subscribe');
+
$url = common_local_url('ostatusinit',
array('group' => $group->nickname));
$widget->out->element('a', array('href' => $url,
- 'class' => 'entity_remote_subscribe'),
+ 'class' => 'entity_remote_subscribe'),
+ // TRANS: Link to subscribe to a remote entity.
_m('Subscribe'));
- $output->elementEnd('li');
+ $widget->out->elementEnd('li');
return false;
}
array('tagger' => $profile->nickname, 'peopletag' => $peopletag->tag));
$output->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'),
+ // TRANS: Link to subscribe to a remote entity.
_m('Subscribe'));
$output->elementEnd('li');
return true;
}
- function onStartShowTagProfileForm($action, $profile)
- {
- $action->elementStart('form', array('method' => 'post',
- 'id' => 'form_tag_user',
- 'class' => 'form_settings',
- 'name' => 'tagprofile',
- 'action' => common_local_url('tagprofile', array('id' => @$profile->id))));
-
- $action->elementStart('fieldset');
- $action->element('legend', null, _('Tag remote profile'));
- $action->hidden('token', common_session_token());
-
- $user = common_current_user();
-
- $action->elementStart('ul', 'form_data');
- $action->elementStart('li');
-
- $action->input('uri', _('Remote profile'), $action->trimmed('uri'),
- _('OStatus user\'s address, like nickname@example.com or http://example.net/nickname'));
- $action->elementEnd('li');
- $action->elementEnd('ul');
- $action->submit('fetch', _('Fetch'));
- $action->elementEnd('fieldset');
- $action->elementEnd('form');
- }
-
- function onStartTagProfileAction($action, $profile)
- {
- $err = null;
- $uri = $action->trimmed('uri');
-
- if (!$profile && $uri) {
- try {
- if (Validate::email($uri)) {
- $oprofile = Ostatus_profile::ensureWebfinger($uri);
- } else if (Validate::uri($uri)) {
- $oprofile = Ostatus_profile::ensureProfileURL($uri);
- } else {
- throw new Exception('Invalid URI');
- }
-
- // redirect to the new profile.
- common_redirect(common_local_url('tagprofile', array('id' => $oprofile->profile_id)), 303);
- return false;
-
- } catch (Exception $e) {
- $err = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname");
- }
-
- $action->showForm($err);
- return false;
- }
- return true;
- }
-
/*
* If the field being looked for is URI look for the profile
*/
function onStartProfileCompletionSearch($action, $profile, $search_engine) {
if ($action->field == 'uri') {
- $user = new User();
- $profile->joinAdd($user);
+ $profile->joinAdd(array('id', 'user:id'));
$profile->whereAdd('uri LIKE "%' . $profile->escape($q) . '%"');
$profile->query();
+ $validate = new Validate();
+
if ($profile->N == 0) {
try {
- if (Validate::email($q)) {
+ if ($validate->email($q)) {
$oprofile = Ostatus_profile::ensureWebfinger($q);
- } else if (Validate::uri($q)) {
+ } else if ($validate->uri($q)) {
$oprofile = Ostatus_profile::ensureProfileURL($q);
} else {
- throw new Exception('Invalid URI');
+ // TRANS: Exception in OStatus when invalid URI was entered.
+ throw new Exception(_m('Invalid URI.'));
}
return $this->filter(array($oprofile->localProfile()));
} catch (Exception $e) {
- $this->msg = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname");
+ // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+ // TRANS: and example.net, as these are official standard domain names for use in examples.
+ $this->msg = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
return array();
}
}
* Find any explicit remote mentions. Accepted forms:
* Webfinger: @user@example.com
* Profile link: @example.com/mublog/user
- * @param Profile $sender (os user?)
+ * @param Profile $sender
* @param string $text input markup text
* @param array &$mention in/out param: set of found mentions
* @return boolean hook return value
*/
-
- function onEndFindMentions($sender, $text, &$mentions)
+ function onEndFindMentions(Profile $sender, $text, &$mentions)
{
$matches = array();
- // Webfinger matches: @user@example.com
- if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
+ $wmatches = array();
+ // Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
+ if (preg_match_all('!(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
$text,
$wmatches,
PREG_OFFSET_CAPTURE)) {
foreach ($wmatches[1] as $wmatch) {
list($target, $pos) = $wmatch;
$this->log(LOG_INFO, "Checking webfinger '$target'");
+ $profile = null;
try {
$oprofile = Ostatus_profile::ensureWebfinger($target);
- if ($oprofile && !$oprofile->isGroup()) {
- $profile = $oprofile->localProfile();
- $matches[$pos] = array('mentioned' => array($profile),
- 'text' => $target,
- 'position' => $pos,
- 'url' => $profile->profileurl);
+ if (!$oprofile instanceof Ostatus_profile || !$oprofile->isPerson()) {
+ continue;
}
+ $profile = $oprofile->localProfile();
+ } catch (OStatusShadowException $e) {
+ // This means we got a local user in the webfinger lookup
+ $profile = $e->profile;
} catch (Exception $e) {
$this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage());
+ continue;
}
+
+ assert($profile instanceof Profile);
+
+ $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target)
+ ? $profile->getNickname() // TODO: we could do getFancyName() or getFullname() here
+ : $target;
+ $url = $profile->getUri();
+ if (!common_valid_http_url($url)) {
+ $url = $profile->getUrl();
+ }
+ $matches[$pos] = array('mentioned' => array($profile),
+ 'type' => 'mention',
+ 'text' => $text,
+ 'position' => $pos,
+ 'length' => mb_strlen($target),
+ 'url' => $url);
}
}
// Profile matches: @example.com/mublog/user
- if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)+)!',
+ if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)*)!',
$text,
$wmatches,
PREG_OFFSET_CAPTURE)) {
$this->log(LOG_INFO, "Checking profile address '$url'");
try {
$oprofile = Ostatus_profile::ensureProfileURL($url);
- if ($oprofile && !$oprofile->isGroup()) {
+ if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
$profile = $oprofile->localProfile();
+ $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) ?
+ $profile->nickname : $target;
$matches[$pos] = array('mentioned' => array($profile),
- 'text' => $target,
+ 'type' => 'mention',
+ 'text' => $text,
'position' => $pos,
- 'url' => $profile->profileurl);
+ 'length' => mb_strlen($target),
+ 'url' => $profile->getUrl());
break;
}
} catch (Exception $e) {
function onStartCommandGetProfile($command, $arg, &$profile)
{
$oprofile = $this->pullRemoteProfile($arg);
- if ($oprofile && !$oprofile->isGroup()) {
- $profile = $oprofile->localProfile();
+ if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
+ try {
+ $profile = $oprofile->localProfile();
+ } catch (NoProfileException $e) {
+ // No locally stored profile found for remote profile
+ return true;
+ }
return false;
} else {
return true;
function onStartCommandGetGroup($command, $arg, &$group)
{
$oprofile = $this->pullRemoteProfile($arg);
- if ($oprofile && $oprofile->isGroup()) {
+ if ($oprofile instanceof Ostatus_profile && $oprofile->isGroup()) {
$group = $oprofile->localGroup();
return false;
} else {
return null;
}
+ function onEndProfileSettingsActions($out) {
+ $siteName = common_config('site', 'name');
+ $js = 'navigator.registerContentHandler("application/vnd.mozilla.maybe.feed", "'.addslashes(common_local_url('ostatussub', null, array('profile' => '%s'))).'", "'.addslashes($siteName).'")';
+ $out->elementStart('li');
+ $out->element('a',
+ array('href' => 'javascript:'.$js),
+ // TRANS: Option in profile settings to add this instance to Firefox as a feedreader
+ _('Add to Firefox as feedreader'));
+ $out->elementEnd('li');
+ }
+
/**
* Make sure necessary tables are filled out.
*/
return true;
}
- function onEndShowStatusNetStyles($action) {
+ public function onEndShowStylesheets(Action $action) {
$action->cssLink($this->path('theme/base/css/ostatus.css'));
return true;
}
*/
function onStartNoticeSourceLink($notice, &$name, &$url, &$title)
{
- if ($notice->source == 'ostatus') {
- if ($notice->url) {
- $bits = parse_url($notice->url);
- $domain = $bits['host'];
- if (substr($domain, 0, 4) == 'www.') {
- $name = substr($domain, 4);
- } else {
- $name = $domain;
- }
+ // If we don't handle this, keep the event handler going
+ if (!in_array($notice->source, array('ostatus', 'share'))) {
+ return true;
+ }
- $url = $notice->url;
- // TRANSLATE: %s is a domain.
- $title = sprintf(_m("Sent from %s via OStatus"), $domain);
- return false;
+ try {
+ $url = $notice->getUrl();
+ // If getUrl() throws exception, $url is never set
+
+ $bits = parse_url($url);
+ $domain = $bits['host'];
+ if (substr($domain, 0, 4) == 'www.') {
+ $name = substr($domain, 4);
+ } else {
+ $name = $domain;
}
+
+ // TRANS: Title. %s is a domain name.
+ $title = sprintf(_m('Sent from %s via OStatus'), $domain);
+
+ // Abort event handler, we have a name and URL!
+ return false;
+ } catch (InvalidUrlException $e) {
+ // This just means we don't have the notice source data
+ return true;
}
- return true;
}
/**
*/
function onStartFeedSubReceive($feedsub, $feed)
{
- $oprofile = Ostatus_profile::staticGet('feeduri', $feedsub->uri);
- if ($oprofile) {
+ $oprofile = Ostatus_profile::getKV('feeduri', $feedsub->uri);
+ if ($oprofile instanceof Ostatus_profile) {
$oprofile->processFeed($feed, 'push');
} else {
common_log(LOG_DEBUG, "No ostatus profile for incoming feed $feedsub->uri");
*/
function onFeedSubSubscriberCount($feedsub, &$count)
{
- $oprofile = Ostatus_profile::staticGet('feeduri', $feedsub->uri);
- if ($oprofile) {
+ $oprofile = Ostatus_profile::getKV('feeduri', $feedsub->uri);
+ if ($oprofile instanceof Ostatus_profile) {
$count += $oprofile->subscriberCount();
}
return true;
* @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
+ * @param Profile $profile subscriber
+ * @param Profile $other subscribee
*
* @return hook return code
*
* @throws Exception
*/
- function onStartSubscribe($subscriber, $other)
+ function onStartSubscribe(Profile $profile, Profile $other)
{
- $user = User::staticGet('id', $subscriber->id);
-
- if (empty($user)) {
+ if (!$profile->isLocal()) {
return true;
}
- $oprofile = Ostatus_profile::staticGet('profile_id', $other->id);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $other->id);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
- if (!$oprofile->subscribe()) {
- // TRANS: Exception.
- throw new Exception(_m('Could not set up remote subscription.'));
- }
+ $oprofile->subscribe();
}
/**
* Having established a remote subscription, send a notification to the
* remote OStatus profile's endpoint.
*
- * @param Profile $subscriber
- * @param Profile $other
+ * @param Profile $profile subscriber
+ * @param Profile $other subscribee
*
* @return hook return code
*
* @throws Exception
*/
- function onEndSubscribe($subscriber, $other)
+ function onEndSubscribe(Profile $profile, Profile $other)
{
- $user = User::staticGet('id', $subscriber->id);
-
- if (empty($user)) {
+ if (!$profile->isLocal()) {
return true;
}
- $oprofile = Ostatus_profile::staticGet('profile_id', $other->id);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $other->id);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
- $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
+ $sub = Subscription::pkeyGet(array('subscriber' => $profile->id,
'subscribed' => $other->id));
$act = $sub->asActivity();
- $oprofile->notifyActivity($act, $subscriber);
+ $oprofile->notifyActivity($act, $profile);
return true;
}
/**
* Notify remote server and garbage collect unused feeds on unsubscribe.
- * @fixme send these operations to background queues
+ * @todo FIXME: Send these operations to background queues
*
* @param User $user
* @param Profile $other
* @return hook return value
*/
- function onEndUnsubscribe($profile, $other)
+ function onEndUnsubscribe(Profile $profile, Profile $other)
{
- $user = User::staticGet('id', $profile->id);
-
- if (empty($user)) {
+ if (!$profile->isLocal()) {
return true;
}
- $oprofile = Ostatus_profile::staticGet('profile_id', $other->id);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $other->id);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
common_date_iso8601(time()));
$act->time = time();
- $act->title = _m('Unfollow');
+ // TRANS: Title for unfollowing a remote profile.
+ $act->title = _m('TITLE','Unfollow');
// TRANS: Success message for unsubscribe from user attempt through OStatus.
// TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
$act->content = sprintf(_m('%1$s stopped following %2$s.'),
$profile->getBestName(),
$other->getBestName());
- $act->actor = ActivityObject::fromProfile($profile);
- $act->object = ActivityObject::fromProfile($other);
+ $act->actor = $profile->asActivityObject();
+ $act->object = $other->asActivityObject();
$oprofile->notifyActivity($act, $profile);
* deny the join.
*
* @param User_group $group
- * @param User $user
+ * @param Profile $profile
*
* @return mixed hook return value
+ * @throws Exception of various kinds, some from $oprofile->subscribe();
*/
-
- function onStartJoinGroup($group, $user)
+ function onStartJoinGroup($group, $profile)
{
- $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
- if ($oprofile) {
- if (!$oprofile->subscribe()) {
- throw new Exception(_m('Could not set up remote group membership.'));
- }
-
- // NOTE: we don't use Group_member::asActivity() since that record
- // has not yet been created.
+ $oprofile = Ostatus_profile::getKV('group_id', $group->id);
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- $member = Profile::staticGet($user->id);
+ $oprofile->subscribe();
- $act = new Activity();
- $act->id = TagURI::mint('join:%d:%d:%s',
- $member->id,
- $group->id,
- common_date_iso8601(time()));
+ // NOTE: we don't use Group_member::asActivity() since that record
+ // has not yet been created.
- $act->actor = ActivityObject::fromProfile($member);
- $act->verb = ActivityVerb::JOIN;
- $act->object = $oprofile->asActivityObject();
+ $act = new Activity();
+ $act->id = TagURI::mint('join:%d:%d:%s',
+ $profile->id,
+ $group->id,
+ common_date_iso8601(time()));
- $act->time = time();
- $act->title = _m("Join");
- // TRANS: Success message for subscribe to group attempt through OStatus.
- // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
- $act->content = sprintf(_m('%1$s has joined group %2$s.'),
- $member->getBestName(),
- $oprofile->getBestName());
+ $act->actor = $profile->asActivityObject();
+ $act->verb = ActivityVerb::JOIN;
+ $act->object = $oprofile->asActivityObject();
- if ($oprofile->notifyActivity($act, $member)) {
- return true;
- } else {
- $oprofile->garbageCollect();
- // TRANS: Exception.
- throw new Exception(_m("Failed joining remote group."));
- }
+ $act->time = time();
+ // TRANS: Title for joining a remote groep.
+ $act->title = _m('TITLE','Join');
+ // TRANS: Success message for subscribe to group attempt through OStatus.
+ // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+ $act->content = sprintf(_m('%1$s has joined group %2$s.'),
+ $profile->getBestName(),
+ $oprofile->getBestName());
+
+ if ($oprofile->notifyActivity($act, $profile)) {
+ return true;
+ } else {
+ $oprofile->garbageCollect();
+ // TRANS: Exception thrown when joining a remote group fails.
+ throw new Exception(_m('Failed joining remote group.'));
}
}
* it'll be left with a stray membership record.
*
* @param User_group $group
- * @param Profile $user
+ * @param Profile $profile
*
* @return mixed hook return value
*/
-
- function onEndLeaveGroup($group, $user)
+ function onEndLeaveGroup($group, $profile)
{
- $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
- if ($oprofile) {
- // Drop the PuSH subscription if there are no other subscribers.
- $oprofile->garbageCollect();
+ $oprofile = Ostatus_profile::getKV('group_id', $group->id);
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- $member = Profile::staticGet($user->id);
+ // Drop the PuSH subscription if there are no other subscribers.
+ $oprofile->garbageCollect();
- $act = new Activity();
- $act->id = TagURI::mint('leave:%d:%d:%s',
- $member->id,
- $group->id,
- common_date_iso8601(time()));
+ $member = $profile;
- $act->actor = ActivityObject::fromProfile($member);
- $act->verb = ActivityVerb::LEAVE;
- $act->object = $oprofile->asActivityObject();
+ $act = new Activity();
+ $act->id = TagURI::mint('leave:%d:%d:%s',
+ $member->id,
+ $group->id,
+ common_date_iso8601(time()));
- $act->time = time();
- $act->title = _m("Leave");
- // TRANS: Success message for unsubscribe from group attempt through OStatus.
- // TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
- $act->content = sprintf(_m('%1$s has left group %2$s.'),
- $member->getBestName(),
- $oprofile->getBestName());
+ $act->actor = $member->asActivityObject();
+ $act->verb = ActivityVerb::LEAVE;
+ $act->object = $oprofile->asActivityObject();
- $oprofile->notifyActivity($act, $member);
- }
+ $act->time = time();
+ // TRANS: Title for leaving a remote group.
+ $act->title = _m('TITLE','Leave');
+ // TRANS: Success message for unsubscribe from group attempt through OStatus.
+ // TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+ $act->content = sprintf(_m('%1$s has left group %2$s.'),
+ $member->getBestName(),
+ $oprofile->getBestName());
+
+ $oprofile->notifyActivity($act, $member);
}
/**
* @param User $user
*
* @return mixed hook return value
+ * @throws Exception of various kinds, some from $oprofile->subscribe();
*/
function onStartSubscribePeopletag($peopletag, $user)
{
- $oprofile = Ostatus_profile::staticGet('peopletag_id', $peopletag->id);
- if ($oprofile) {
- if (!$oprofile->subscribe()) {
- throw new Exception(_m('Could not set up remote peopletag subscription.'));
- }
+ $oprofile = Ostatus_profile::getKV('peopletag_id', $peopletag->id);
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- $sub = $user->getProfile();
- $tagger = Profile::staticGet($peopletag->tagger);
+ $oprofile->subscribe();
- $act = new Activity();
- $act->id = TagURI::mint('subscribe_peopletag:%d:%d:%s',
- $sub->id,
- $peopletag->id,
- common_date_iso8601(time()));
+ $sub = $user->getProfile();
+ $tagger = Profile::getKV($peopletag->tagger);
- $act->actor = ActivityObject::fromProfile($sub);
- $act->verb = ActivityVerb::FOLLOW;
- $act->object = $oprofile->asActivityObject();
+ $act = new Activity();
+ $act->id = TagURI::mint('subscribe_peopletag:%d:%d:%s',
+ $sub->id,
+ $peopletag->id,
+ common_date_iso8601(time()));
- $act->time = time();
- $act->title = _m("Follow list");
- $act->content = sprintf(_m("%s is now following people tagged %s by %s."),
- $sub->getBestName(),
- $oprofile->getBestName(),
- $tagger->getBestName());
+ $act->actor = $sub->asActivityObject();
+ $act->verb = ActivityVerb::FOLLOW;
+ $act->object = $oprofile->asActivityObject();
- if ($oprofile->notifyActivity($act, $sub)) {
- return true;
- } else {
- $oprofile->garbageCollect();
- throw new Exception(_m("Failed subscribing to remote peopletag."));
- }
+ $act->time = time();
+ // TRANS: Title for following a remote list.
+ $act->title = _m('TITLE','Follow list');
+ // TRANS: Success message for remote list follow through OStatus.
+ // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+ $act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
+ $sub->getBestName(),
+ $oprofile->getBestName(),
+ $tagger->getBestName());
+
+ if ($oprofile->notifyActivity($act, $sub)) {
+ return true;
+ } else {
+ $oprofile->garbageCollect();
+ // TRANS: Exception thrown when subscription to remote list fails.
+ throw new Exception(_m('Failed subscribing to remote list.'));
}
}
function onEndUnsubscribePeopletag($peopletag, $user)
{
- $oprofile = Ostatus_profile::staticGet('peopletag_id', $peopletag->id);
- if ($oprofile) {
- // Drop the PuSH subscription if there are no other subscribers.
- $oprofile->garbageCollect();
+ $oprofile = Ostatus_profile::getKV('peopletag_id', $peopletag->id);
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- $sub = Profile::staticGet($user->id);
- $tagger = Profile::staticGet($peopletag->tagger);
+ // Drop the PuSH subscription if there are no other subscribers.
+ $oprofile->garbageCollect();
- $act = new Activity();
- $act->id = TagURI::mint('unsubscribe_peopletag:%d:%d:%s',
- $sub->id,
- $peopletag->id,
- common_date_iso8601(time()));
+ $sub = Profile::getKV($user->id);
+ $tagger = Profile::getKV($peopletag->tagger);
- $act->actor = ActivityObject::fromProfile($member);
- $act->verb = ActivityVerb::UNFOLLOW;
- $act->object = $oprofile->asActivityObject();
+ $act = new Activity();
+ $act->id = TagURI::mint('unsubscribe_peopletag:%d:%d:%s',
+ $sub->id,
+ $peopletag->id,
+ common_date_iso8601(time()));
- $act->time = time();
- $act->title = _m("Unfollow peopletag");
- $act->content = sprintf(_m("%s stopped following the list %s by %s."),
- $sub->getBestName(),
- $oprofile->getBestName(),
- $tagger->getBestName());
+ $act->actor = $member->asActivityObject();
+ $act->verb = ActivityVerb::UNFOLLOW;
+ $act->object = $oprofile->asActivityObject();
- $oprofile->notifyActivity($act, $user);
- }
+ $act->time = time();
+ // TRANS: Title for unfollowing a remote list.
+ $act->title = _m('Unfollow list');
+ // TRANS: Success message for remote list unfollow through OStatus.
+ // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+ $act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
+ $sub->getBestName(),
+ $oprofile->getBestName(),
+ $tagger->getBestName());
+
+ $oprofile->notifyActivity($act, $user);
}
/**
*/
function onEndFavorNotice(Profile $profile, Notice $notice)
{
- $user = User::staticGet('id', $profile->id);
-
- if (empty($user)) {
+ // Only distribute local users' favor actions, remote users
+ // will have already distributed theirs.
+ if (!$profile->isLocal()) {
return true;
}
- $oprofile = Ostatus_profile::staticGet('profile_id', $notice->profile_id);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $notice->profile_id);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
- $fav = Fave::pkeyGet(array('user_id' => $user->id,
+ $fav = Fave::pkeyGet(array('user_id' => $profile->id,
'notice_id' => $notice->id));
- if (empty($fav)) {
+ if (!$fav instanceof Fave) {
// That's weird.
+ // TODO: Make pkeyGet throw exception, since this is a critical failure.
return true;
}
return true;
}
+ /**
+ * Notify remote user it has got a new people tag
+ * - tag verb is queued
+ * - the subscription is done immediately if not present
+ *
+ * @param Profile_tag $ptag the people tag that was created
+ * @return hook return value
+ * @throws Exception of various kinds, some from $oprofile->subscribe();
+ */
function onEndTagProfile($ptag)
{
- $oprofile = Ostatus_profile::staticGet('profile_id', $ptag->tagged);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $ptag->tagged);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
$act = new Activity();
$tagger = $plist->getTagger();
- $tagged = Profile::staticGet('id', $ptag->tagged);
+ $tagged = Profile::getKV('id', $ptag->tagged);
$act->verb = ActivityVerb::TAG;
$act->id = TagURI::mint('tag_profile:%d:%d:%s',
$plist->tagger, $plist->id,
common_date_iso8601(time()));
$act->time = time();
- $act->title = _("Tag");
- $act->content = sprintf(_("%s tagged %s in the list %s"),
+ // TRANS: Title for listing a remote profile.
+ $act->title = _m('TITLE','List');
+ // TRANS: Success message for remote list addition through OStatus.
+ // TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
+ $act->content = sprintf(_m('%1$s listed %2$s in the list %3$s.'),
$tagger->getBestName(),
$tagged->getBestName(),
$plist->getBestName());
- $act->actor = ActivityObject::fromProfile($tagger);
- $act->objects = array(ActivityObject::fromProfile($tagged));
+ $act->actor = $tagger->asActivityObject();
+ $act->objects = array($tagged->asActivityObject());
$act->target = ActivityObject::fromPeopletag($plist);
- $oprofile->notifyActivity($act, $tagger);
+ $oprofile->notifyDeferred($act, $tagger);
// initiate a PuSH subscription for the person being tagged
- if (!$oprofile->subscribe()) {
- throw new Exception(sprintf(_('Could not complete subscription to remote '.
- 'profile\'s feed. Tag %s could not be saved.'), $ptag->tag));
- return false;
- }
+ $oprofile->subscribe();
return true;
}
+ /**
+ * Notify remote user that a people tag has been removed
+ * - untag verb is queued
+ * - the subscription is undone immediately if not required
+ * i.e garbageCollect()'d
+ *
+ * @param Profile_tag $ptag the people tag that was deleted
+ * @return hook return value
+ */
function onEndUntagProfile($ptag)
{
- $oprofile = Ostatus_profile::staticGet('profile_id', $ptag->tagged);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $ptag->tagged);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
$act = new Activity();
$tagger = $plist->getTagger();
- $tagged = Profile::staticGet('id', $ptag->tagged);
+ $tagged = Profile::getKV('id', $ptag->tagged);
$act->verb = ActivityVerb::UNTAG;
$act->id = TagURI::mint('untag_profile:%d:%d:%s',
$plist->tagger, $plist->id,
common_date_iso8601(time()));
$act->time = time();
- $act->title = _("Untag");
- $act->content = sprintf(_("%s untagged %s from the list %s"),
+ // TRANS: Title for unlisting a remote profile.
+ $act->title = _m('TITLE','Unlist');
+ // TRANS: Success message for remote list removal through OStatus.
+ // TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
+ $act->content = sprintf(_m('%1$s removed %2$s from the list %3$s.'),
$tagger->getBestName(),
$tagged->getBestName(),
$plist->getBestName());
- $act->actor = ActivityObject::fromProfile($tagger);
- $act->objects = array(ActivityObject::fromProfile($tagged));
+ $act->actor = $tagger->asActivityObject();
+ $act->objects = array($tagged->asActivityObject());
$act->target = ActivityObject::fromPeopletag($plist);
- $oprofile->notifyActivity($act, $tagger);
+ $oprofile->notifyDeferred($act, $tagger);
// unsubscribe to PuSH feed if no more required
$oprofile->garbageCollect();
*
* @return hook return value
*/
-
function onEndDisfavorNotice(Profile $profile, Notice $notice)
{
- $user = User::staticGet('id', $profile->id);
-
- if (empty($user)) {
+ // Only distribute local users' disfavor actions, remote users
+ // will have already distributed theirs.
+ if (!$profile->isLocal()) {
return true;
}
- $oprofile = Ostatus_profile::staticGet('profile_id', $notice->profile_id);
-
- if (empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $notice->profile_id);
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
$notice->id,
common_date_iso8601(time()));
$act->time = time();
- $act->title = _m('Disfavor');
+ // TRANS: Title for unliking a remote notice.
+ $act->title = _m('Unlike');
// TRANS: Success message for remove a favorite notice through OStatus.
// TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
- $act->content = sprintf(_m('%1$s marked notice %2$s as no longer a favorite.'),
+ $act->content = sprintf(_m('%1$s no longer likes %2$s.'),
$profile->getBestName(),
- $notice->uri);
+ $notice->getUrl());
- $act->actor = ActivityObject::fromProfile($profile);
- $act->object = ActivityObject::fromNotice($notice);
+ $act->actor = $profile->asActivityObject();
+ $act->object = $notice->asActivityObject();
$oprofile->notifyActivity($act, $profile);
function onStartGetProfileUri($profile, &$uri)
{
- $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
- if (!empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
+ if ($oprofile instanceof Ostatus_profile) {
$uri = $oprofile->uri;
return false;
}
function onStartUserGroupPermalink($group, &$url)
{
- $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
- if ($oprofile) {
+ $oprofile = Ostatus_profile::getKV('group_id', $group->id);
+ if ($oprofile instanceof Ostatus_profile) {
// @fixme this should probably be in the user_group table
// @fixme this uri not guaranteed to be a profile page
$url = $oprofile->uri;
function showEntityRemoteSubscribe($action, $target='ostatussub')
{
- $user = common_current_user();
- if ($user && ($user->id == $action->profile->id)) {
+ if (!$action->getScoped() instanceof Profile) {
+ // early return if we're not logged in
+ return true;
+ }
+
+ if ($action->getScoped()->sameAs($action->getTarget())) {
$action->elementStart('div', 'entity_actions');
$action->elementStart('p', array('id' => 'entity_remote_subscribe',
'class' => 'entity_subscribe'));
*/
function onEndBroadcastProfile(Profile $profile)
{
- $user = User::staticGet('id', $profile->id);
+ $user = User::getKV('id', $profile->id);
// Find foreign accounts I'm subscribed to that support Salmon pings.
//
common_date_iso8601(time()));
$act->time = time();
// TRANS: Title for activity.
- $act->title = _m("Profile update");
+ $act->title = _m('Profile update');
// TRANS: Ping text for remote profile update through OStatus.
// TRANS: %s is user that updated their profile.
- $act->content = sprintf(_m("%s has updated their profile page."),
+ $act->content = sprintf(_m('%s has updated their profile page.'),
$profile->getBestName());
- $act->actor = ActivityObject::fromProfile($profile);
+ $act->actor = $profile->asActivityObject();
$act->object = $act->actor;
while ($oprofile->fetch()) {
return true;
}
- function onStartProfileListItemActionElements($item, $profile=null)
+ // FIXME: This one can accept both an Action and a Widget. Confusing! Refactor to (HTMLOutputter $out, Profile $target)!
+ function onStartProfileListItemActionElements($item)
{
- if (!common_logged_in()) {
-
- $profileUser = User::staticGet('id', $item->profile->id);
-
- if (!empty($profileUser)) {
-
- if ($item instanceof Action) {
- $output = $item;
- $profile = $item->profile;
- } else {
- $output = $item->out;
- }
+ if (common_logged_in()) {
+ // only non-logged in users get to see the "remote subscribe" form
+ return true;
+ } elseif (!$item->getTarget()->isLocal()) {
+ // we can (for now) only provide remote subscribe forms for local users
+ return true;
+ }
- // Add an OStatus subscribe
- $output->elementStart('li', 'entity_subscribe');
- $url = common_local_url('ostatusinit',
- array('nickname' => $profileUser->nickname));
- $output->element('a', array('href' => $url,
- 'class' => 'entity_remote_subscribe'),
- // TRANS: Link text for a user to subscribe to an OStatus user.
- _m('Subscribe'));
- $output->elementEnd('li');
-
- $output->elementStart('li', 'entity_tag');
- $url = common_local_url('ostatustag',
- array('nickname' => $profileUser->nickname));
- $output->element('a', array('href' => $url,
- 'class' => 'entity_remote_tag'),
- _m('Tag'));
- $output->elementEnd('li');
- }
+ if ($item instanceof ProfileAction) {
+ $output = $item;
+ } elseif ($item instanceof Widget) {
+ $output = $item->out;
+ } else {
+ // Bad $item class, don't know how to use this for outputting!
+ throw new ServerException('Bad item type for onStartProfileListItemActionElements');
}
+ // Add an OStatus subscribe
+ $output->elementStart('li', 'entity_subscribe');
+ $url = common_local_url('ostatusinit',
+ array('nickname' => $item->getTarget()->getNickname()));
+ $output->element('a', array('href' => $url,
+ 'class' => 'entity_remote_subscribe'),
+ // TRANS: Link text for a user to subscribe to an OStatus user.
+ _m('Subscribe'));
+ $output->elementEnd('li');
+
+ $output->elementStart('li', 'entity_tag');
+ $url = common_local_url('ostatustag',
+ array('nickname' => $item->getTarget()->getNickname()));
+ $output->element('a', array('href' => $url,
+ 'class' => 'entity_remote_tag'),
+ // TRANS: Link text for a user to list an OStatus user.
+ _m('List'));
+ $output->elementEnd('li');
+
return true;
}
- function onPluginVersion(&$versions)
+ function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'OStatus',
- 'version' => STATUSNET_VERSION,
+ 'version' => GNUSOCIAL_VERSION,
'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:OStatus',
// TRANS: Plugin description.
*/
public static function localGroupFromUrl($url)
{
- $group = User_group::staticGet('uri', $url);
- if ($group) {
- $local = Local_group::staticGet('group_id', $group->id);
- if ($local) {
+ $group = User_group::getKV('uri', $url);
+ if ($group instanceof User_group) {
+ if ($group->isLocal()) {
return $group->id;
}
} else {
public function onStartProfileGetAtomFeed($profile, &$feed)
{
- $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
+ $oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
function onStartGetProfileFromURI($uri, &$profile)
{
// Don't want to do Web-based discovery on our own server,
- // so we check locally first.
+ // so we check locally first. This duplicates the functionality
+ // in the Profile class, since the plugin always runs before
+ // that local lookup, but since we return false it won't run double.
- $user = User::staticGet('uri', $uri);
-
- if (!empty($user)) {
+ $user = User::getKV('uri', $uri);
+ if ($user instanceof User) {
$profile = $user->getProfile();
return false;
+ } else {
+ $group = User_group::getKV('uri', $uri);
+ if ($group instanceof User_group) {
+ $profile = $group->getProfile();
+ return false;
+ }
}
// Now, check remotely
+ try {
+ $oprofile = Ostatus_profile::ensureProfileURI($uri);
+ $profile = $oprofile->localProfile();
+ return !($profile instanceof Profile); // localProfile won't throw exception but can return null
+ } catch (Exception $e) {
+ return true; // It's not an OStatus profile as far as we know, continue event handling
+ }
+ }
+
+ function onEndWebFingerNoticeLinks(XML_XRD $xrd, Notice $target)
+ {
+ $author = $target->getProfile();
+ $profiletype = $this->profileTypeString($author);
+ $salmon_url = common_local_url("{$profiletype}salmon", array('id' => $author->id));
+ $xrd->links[] = new XML_XRD_Element_Link(Salmon::REL_SALMON, $salmon_url);
+ return true;
+ }
- $oprofile = Ostatus_profile::ensureProfileURI($uri);
+ function onEndWebFingerProfileLinks(XML_XRD $xrd, Profile $target)
+ {
+ if ($target->getObjectType() === ActivityObject::PERSON) {
+ $this->addWebFingerPersonLinks($xrd, $target);
+ }
- if (!empty($oprofile)) {
- $profile = $oprofile->localProfile();
+ // Salmon
+ $profiletype = $this->profileTypeString($target);
+ $salmon_url = common_local_url("{$profiletype}salmon", array('id' => $target->id));
+
+ $xrd->links[] = new XML_XRD_Element_Link(Salmon::REL_SALMON, $salmon_url);
+
+ // XXX: these are deprecated, but StatusNet only looks for NS_REPLIES
+ $xrd->links[] = new XML_XRD_Element_Link(Salmon::NS_REPLIES, $salmon_url);
+ $xrd->links[] = new XML_XRD_Element_Link(Salmon::NS_MENTIONS, $salmon_url);
+
+ // TODO - finalize where the redirect should go on the publisher
+ $xrd->links[] = new XML_XRD_Element_Link('http://ostatus.org/schema/1.0/subscribe',
+ common_local_url('ostatussub') . '?profile={uri}',
+ null, // type not set
+ true); // isTemplate
+
+ return true;
+ }
+
+ protected function profileTypeString(Profile $target)
+ {
+ // This is just used to have a definitive string response to "USERsalmon" or "GROUPsalmon"
+ switch ($target->getObjectType()) {
+ case ActivityObject::PERSON:
+ return 'user';
+ case ActivityObject::GROUP:
+ return 'group';
+ default:
+ throw new ServerException('Unknown profile type for WebFinger profile links');
+ }
+ }
+
+ protected function addWebFingerPersonLinks(XML_XRD $xrd, Profile $target)
+ {
+ $xrd->links[] = new XML_XRD_Element_Link(Discovery::UPDATESFROM,
+ common_local_url('ApiTimelineUser',
+ array('id' => $target->id, 'format' => 'atom')),
+ 'application/atom+xml');
+
+ // Get this profile's keypair
+ $magicsig = Magicsig::getKV('user_id', $target->id);
+ if (!$magicsig instanceof Magicsig && $target->isLocal()) {
+ $magicsig = Magicsig::generate($target->getUser());
+ }
+
+ if (!$magicsig instanceof Magicsig) {
+ return false; // value doesn't mean anything, just figured I'd indicate this function didn't do anything
+ }
+ if (Event::handle('StartAttachPubkeyToUserXRD', array($magicsig, $xrd, $target))) {
+ $xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL,
+ 'data:application/magic-public-key,'. $magicsig->toString());
+ // The following event handles plugins like Diaspora which add their own version of the Magicsig pubkey
+ Event::handle('EndAttachPubkeyToUserXRD', array($magicsig, $xrd, $target));
+ }
+ }
+
+ public function onGetLocalAttentions(Profile $actor, array $attention_uris, array &$mentions, array &$groups)
+ {
+ list($groups, $mentions) = Ostatus_profile::filterAttention($actor, $attention_uris);
+ }
+
+ // FIXME: Maybe this shouldn't be so authoritative that it breaks other remote profile lookups?
+ static public function onCheckActivityAuthorship(Activity $activity, Profile &$profile)
+ {
+ try {
+ $oprofile = Ostatus_profile::ensureProfileURL($profile->getUrl());
+ $profile = $oprofile->checkAuthorship($activity);
+ } catch (Exception $e) {
+ common_log(LOG_ERR, 'Could not get a profile or check authorship ('.get_class($e).': "'.$e->getMessage().'") for activity ID: '.$activity->id);
+ $profile = null;
return false;
}
+ return true;
+ }
- // Still not a hit, so give up.
+ public function onProfileDeleteRelated($profile, &$related)
+ {
+ // Ostatus_profile has a 'profile_id' property, which will be used to find the object
+ $related[] = 'Ostatus_profile';
+ // Magicsig has a "user_id" column instead, so we have to delete it more manually:
+ $magicsig = Magicsig::getKV('user_id', $profile->id);
+ if ($magicsig instanceof Magicsig) {
+ $magicsig->delete();
+ }
return true;
}
- function onEndXrdActionLinks(&$xrd, $user)
+ public function onSalmonSlap($endpoint_uri, MagicEnvelope $magic_env, Profile $target=null)
{
- $xrd->links[] = array('rel' => Discovery::UPDATESFROM,
- 'href' => common_local_url('ApiTimelineUser',
- array('id' => $user->id,
- 'format' => 'atom')),
- 'type' => 'application/atom+xml');
-
- // Salmon
- $salmon_url = common_local_url('usersalmon',
- array('id' => $user->id));
-
- $xrd->links[] = array('rel' => Salmon::REL_SALMON,
- 'href' => $salmon_url);
- // XXX : Deprecated - to be removed.
- $xrd->links[] = array('rel' => Salmon::NS_REPLIES,
- 'href' => $salmon_url);
-
- $xrd->links[] = array('rel' => Salmon::NS_MENTIONS,
- 'href' => $salmon_url);
-
- // Get this user's keypair
- $magickey = Magicsig::staticGet('user_id', $user->id);
- if (!$magickey) {
- // No keypair yet, let's generate one.
- $magickey = new Magicsig();
- $magickey->generate($user->id);
- }
-
- $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL,
- 'href' => 'data:application/magic-public-key,'. $magickey->toString(false));
+ $envxml = $magic_env->toXML($target);
- // TODO - finalize where the redirect should go on the publisher
- $url = common_local_url('ostatussub') . '?profile={uri}';
- $xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe',
- 'template' => $url );
-
- return true;
+ $headers = array('Content-Type: application/magic-envelope+xml');
+
+ try {
+ $client = new HTTPClient();
+ $client->setBody($envxml);
+ $response = $client->post($endpoint_uri, $headers);
+ } catch (Exception $e) {
+ common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
+ return false;
+ }
+ if ($response->getStatus() === 422) {
+ common_debug(sprintf('Salmon (from profile %d) endpoint %s returned status %s. We assume it is a Diaspora seed; will adapt and try again if that plugin is enabled!', $magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus()));
+ return true;
+ }
+
+ // 200 OK is the best response
+ // 202 Accepted is what we get from Diaspora for example
+ if (!in_array($response->getStatus(), array(200, 202))) {
+ common_log(LOG_ERR, sprintf('Salmon (from profile %d) endpoint %s returned status %s: %s',
+ $magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus(), $response->getBody()));
+ return true;
+ }
+
+ // Since we completed the salmon slap, we discontinue the event
+ return false;
+ }
+
+ public function onCronDaily()
+ {
+ try {
+ $sub = FeedSub::renewalCheck();
+ } catch (NoResultException $e) {
+ common_log(LOG_INFO, "There were no expiring feeds.");
+ return;
+ }
+
+ $qm = QueueManager::get();
+ while ($sub->fetch()) {
+ $item = array('feedsub_id' => $sub->id);
+ $qm->enqueue($item, 'pushrenew');
+ }
}
}
projects / quix0rs-gnu-social.git / blobdiff