X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2FOStatusPlugin.php;h=7c0530eb6611c2ed13da417e0eb562c7f2482c0b;hb=261ccfac8699534ff584a2f93d5dcd384529d855;hp=75d4fb74bc0f191aee973f5d643326ea8802482f;hpb=c0f65f6ea76ffa035cbf2c4126bedaae9d8752c8;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 75d4fb74bc..7c0530eb66 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -48,10 +48,10 @@ 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/ostatustag', @@ -123,7 +123,7 @@ class OStatusPlugin extends Plugin /** * Put saved notices into the queue for pubsub distribution. */ - function onStartEnqueueNotice($notice, &$transports) + function onStartEnqueueNotice(Notice $notice, array &$transports) { if ($notice->inScope(null)) { // put our transport first, in case there's any conflict (like OMB) @@ -233,36 +233,6 @@ class OStatusPlugin extends Plugin 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'); - // TRANS: Fieldset legend. - $action->element('legend', null, _m('List remote profile')); - $action->hidden('token', common_session_token()); - - $user = common_current_user(); - - $action->elementStart('ul', 'form_data'); - $action->elementStart('li'); - - // TRANS: Field label. - $action->input('uri', _m('LABEL','Remote profile'), $action->trimmed('uri'), - // TRANS: Field title. - _m('OStatus user\'s address, like nickname@example.com or http://example.net/nickname.')); - $action->elementEnd('li'); - $action->elementEnd('ul'); - // TRANS: Button text to fetch remote profile. - $action->submit('fetch', _m('BUTTON','Fetch')); - $action->elementEnd('fieldset'); - $action->elementEnd('form'); - } - function onStartTagProfileAction($action, $profile) { $err = null; @@ -281,7 +251,6 @@ class OStatusPlugin extends Plugin // redirect to the new profile. common_redirect(common_local_url('tagprofile', array('id' => $oprofile->profile_id)), 303); - return false; } catch (Exception $e) { // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com @@ -337,7 +306,7 @@ class OStatusPlugin extends Plugin * @param array &$mention in/out param: set of found mentions * @return boolean hook return value */ - function onEndFindMentions(Profile $sender, $text, &$mentions) + function onEndFindMentions($sender, $text, &$mentions) { $matches = array(); @@ -351,13 +320,13 @@ class OStatusPlugin extends Plugin $this->log(LOG_INFO, "Checking webfinger '$target'"); try { $oprofile = Ostatus_profile::ensureWebfinger($target); - if ($oprofile && !$oprofile->isGroup()) { + if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) { $profile = $oprofile->localProfile(); $matches[$pos] = array('mentioned' => array($profile), 'type' => 'mention', 'text' => $target, 'position' => $pos, - 'url' => $profile->profileurl); + 'url' => $profile->getUrl()); } } catch (Exception $e) { $this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage()); @@ -378,13 +347,13 @@ class OStatusPlugin extends Plugin $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(); $matches[$pos] = array('mentioned' => array($profile), 'type' => 'mention', 'text' => $target, 'position' => $pos, - 'url' => $profile->profileurl); + 'url' => $profile->getUrl()); break; } } catch (Exception $e) { @@ -423,8 +392,13 @@ class OStatusPlugin extends Plugin 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; @@ -445,7 +419,7 @@ class OStatusPlugin extends Plugin 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 { @@ -524,23 +498,32 @@ class OStatusPlugin extends Plugin */ 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 ($notice->source != 'ostatus') { + return true; + } - $url = $notice->url; - // TRANS: Title. %s is a domain name. - $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; } /** @@ -556,7 +539,7 @@ class OStatusPlugin extends Plugin if ($oprofile instanceof Ostatus_profile) { $oprofile->processFeed($feed, 'push'); } else { - common_log(LOG_DEBUG, "No ostatus profile for incoming feed $feedsub->uri"); + common_debug("No ostatus profile for incoming feed $feedsub->uri"); } } @@ -572,7 +555,7 @@ class OStatusPlugin extends Plugin function onFeedSubSubscriberCount($feedsub, &$count) { $oprofile = Ostatus_profile::getKV('feeduri', $feedsub->uri); - if ($oprofile) { + if ($oprofile instanceof Ostatus_profile) { $count += $oprofile->subscriberCount(); } return true; @@ -599,15 +582,11 @@ class OStatusPlugin extends Plugin } $oprofile = Ostatus_profile::getKV('profile_id', $other->id); - - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } - if (!$oprofile->subscribe()) { - // TRANS: Exception thrown when setup of remote subscription fails. - throw new Exception(_m('Could not set up remote subscription.')); - } + $oprofile->subscribe(); } /** @@ -628,8 +607,7 @@ class OStatusPlugin extends Plugin } $oprofile = Ostatus_profile::getKV('profile_id', $other->id); - - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } @@ -658,8 +636,7 @@ class OStatusPlugin extends Plugin } $oprofile = Ostatus_profile::getKV('profile_id', $other->id); - - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } @@ -684,8 +661,8 @@ class OStatusPlugin extends Plugin $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); @@ -701,45 +678,45 @@ class OStatusPlugin extends Plugin * @param Profile $profile * * @return mixed hook return value + * @throws Exception of various kinds, some from $oprofile->subscribe(); */ function onStartJoinGroup($group, $profile) { $oprofile = Ostatus_profile::getKV('group_id', $group->id); - if ($oprofile) { - if (!$oprofile->subscribe()) { - // TRANS: Exception thrown when setup of remote group membership fails. - throw new Exception(_m('Could not set up remote group membership.')); - } + if (!$oprofile instanceof Ostatus_profile) { + return true; + } - // NOTE: we don't use Group_member::asActivity() since that record - // has not yet been created. - - $act = new Activity(); - $act->id = TagURI::mint('join:%d:%d:%s', - $profile->id, - $group->id, - common_date_iso8601(time())); - - $act->actor = ActivityObject::fromProfile($profile); - $act->verb = ActivityVerb::JOIN; - $act->object = $oprofile->asActivityObject(); - - $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.')); - } + $oprofile->subscribe(); + + // NOTE: we don't use Group_member::asActivity() since that record + // has not yet been created. + + $act = new Activity(); + $act->id = TagURI::mint('join:%d:%d:%s', + $profile->id, + $group->id, + common_date_iso8601(time())); + + $act->actor = $profile->asActivityObject(); + $act->verb = ActivityVerb::JOIN; + $act->object = $oprofile->asActivityObject(); + + $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.')); } } @@ -760,33 +737,35 @@ class OStatusPlugin extends Plugin function onEndLeaveGroup($group, $profile) { $oprofile = Ostatus_profile::getKV('group_id', $group->id); - if ($oprofile) { - // Drop the PuSH subscription if there are no other subscribers. - $oprofile->garbageCollect(); + if (!$oprofile instanceof Ostatus_profile) { + return true; + } - $member = $profile; + // 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(); - // 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()); + $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); } /** @@ -798,47 +777,47 @@ class OStatusPlugin extends Plugin * @param User $user * * @return mixed hook return value + * @throws Exception of various kinds, some from $oprofile->subscribe(); */ function onStartSubscribePeopletag($peopletag, $user) { $oprofile = Ostatus_profile::getKV('peopletag_id', $peopletag->id); - if ($oprofile) { - if (!$oprofile->subscribe()) { - // TRANS: Exception thrown when setup of remote list subscription fails. - throw new Exception(_m('Could not set up remote list subscription.')); - } + if (!$oprofile instanceof Ostatus_profile) { + return true; + } - $sub = $user->getProfile(); - $tagger = Profile::getKV($peopletag->tagger); - - $act = new Activity(); - $act->id = TagURI::mint('subscribe_peopletag:%d:%d:%s', - $sub->id, - $peopletag->id, - common_date_iso8601(time())); - - $act->actor = ActivityObject::fromProfile($sub); - $act->verb = ActivityVerb::FOLLOW; - $act->object = $oprofile->asActivityObject(); - - $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.')); - } + $oprofile->subscribe(); + + $sub = $user->getProfile(); + $tagger = Profile::getKV($peopletag->tagger); + + $act = new Activity(); + $act->id = TagURI::mint('subscribe_peopletag:%d:%d:%s', + $sub->id, + $peopletag->id, + common_date_iso8601(time())); + + $act->actor = $sub->asActivityObject(); + $act->verb = ActivityVerb::FOLLOW; + $act->object = $oprofile->asActivityObject(); + + $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.')); } } @@ -855,35 +834,37 @@ class OStatusPlugin extends Plugin function onEndUnsubscribePeopletag($peopletag, $user) { $oprofile = Ostatus_profile::getKV('peopletag_id', $peopletag->id); - if ($oprofile) { - // Drop the PuSH subscription if there are no other subscribers. - $oprofile->garbageCollect(); - - $sub = Profile::getKV($user->id); - $tagger = Profile::getKV($peopletag->tagger); - - $act = new Activity(); - $act->id = TagURI::mint('unsubscribe_peopletag:%d:%d:%s', - $sub->id, - $peopletag->id, - common_date_iso8601(time())); - - $act->actor = ActivityObject::fromProfile($member); - $act->verb = ActivityVerb::UNFOLLOW; - $act->object = $oprofile->asActivityObject(); - - $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); + if (!$oprofile instanceof Ostatus_profile) { + return true; } + + // Drop the PuSH subscription if there are no other subscribers. + $oprofile->garbageCollect(); + + $sub = Profile::getKV($user->id); + $tagger = Profile::getKV($peopletag->tagger); + + $act = new Activity(); + $act->id = TagURI::mint('unsubscribe_peopletag:%d:%d:%s', + $sub->id, + $peopletag->id, + common_date_iso8601(time())); + + $act->actor = $member->asActivityObject(); + $act->verb = ActivityVerb::UNFOLLOW; + $act->object = $oprofile->asActivityObject(); + + $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); } /** @@ -895,23 +876,23 @@ class OStatusPlugin extends Plugin */ function onEndFavorNotice(Profile $profile, Notice $notice) { - $user = User::getKV('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::getKV('profile_id', $notice->profile_id); - - if (empty($oprofile)) { + 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; } @@ -929,12 +910,12 @@ class OStatusPlugin extends Plugin * * @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::getKV('profile_id', $ptag->tagged); - - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } @@ -962,19 +943,14 @@ class OStatusPlugin extends Plugin $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->notifyDeferred($act, $tagger); // initiate a PuSH subscription for the person being tagged - if (!$oprofile->subscribe()) { - // TRANS: Exception thrown when subscribing to a remote list fails. - throw new Exception(sprintf(_m('Could not complete subscription to remote '. - 'profile\'s feed. List %s could not be saved.'), $ptag->tag)); - return false; - } + $oprofile->subscribe(); return true; } @@ -990,8 +966,7 @@ class OStatusPlugin extends Plugin function onEndUntagProfile($ptag) { $oprofile = Ostatus_profile::getKV('profile_id', $ptag->tagged); - - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } @@ -1019,8 +994,8 @@ class OStatusPlugin extends Plugin $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->notifyDeferred($act, $tagger); @@ -1041,15 +1016,14 @@ class OStatusPlugin extends Plugin */ function onEndDisfavorNotice(Profile $profile, Notice $notice) { - $user = User::getKV('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::getKV('profile_id', $notice->profile_id); - - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } @@ -1067,10 +1041,10 @@ class OStatusPlugin extends Plugin // 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 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); @@ -1095,7 +1069,7 @@ class OStatusPlugin extends Plugin function onStartUserGroupPermalink($group, &$url) { $oprofile = Ostatus_profile::getKV('group_id', $group->id); - if ($oprofile) { + 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; @@ -1169,7 +1143,7 @@ class OStatusPlugin extends Plugin $oprofile->query(sprintf($sql, $profile->id, $profile->id)); if ($oprofile->N == 0) { - common_log(LOG_DEBUG, "No OStatus remote subscribees for $profile->nickname"); + common_debug("No OStatus remote subscribees for $profile->nickname"); return true; } @@ -1187,7 +1161,7 @@ class OStatusPlugin extends Plugin $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()) { @@ -1236,7 +1210,7 @@ class OStatusPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OStatus', 'version' => GNUSOCIAL_VERSION, @@ -1259,9 +1233,8 @@ class OStatusPlugin extends Plugin public static function localGroupFromUrl($url) { $group = User_group::getKV('uri', $url); - if ($group) { - $local = Local_group::getKV('group_id', $group->id); - if ($local) { + if ($group instanceof User_group) { + if ($group->isLocal()) { return $group->id; } } else { @@ -1282,7 +1255,7 @@ class OStatusPlugin extends Plugin { $oprofile = Ostatus_profile::getKV('profile_id', $profile->id); - if (empty($oprofile)) { + if (!$oprofile instanceof Ostatus_profile) { return true; } @@ -1316,21 +1289,21 @@ class OStatusPlugin extends Plugin function onEndWebFingerNoticeLinks(XML_XRD $xrd, Notice $target) { $author = $target->getProfile(); - $salmon_url = common_local_url('usersalmon', array('id' => $author->id)); + $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; } function onEndWebFingerProfileLinks(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'); + if ($target->getObjectType() === ActivityObject::PERSON) { + $this->addWebFingerPersonLinks($xrd, $target); + } - // Salmon - $salmon_url = common_local_url('usersalmon', - array('id' => $target->id)); + // 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); @@ -1338,17 +1311,6 @@ class OStatusPlugin extends Plugin $xrd->links[] = new XML_XRD_Element_Link(Salmon::NS_REPLIES, $salmon_url); $xrd->links[] = new XML_XRD_Element_Link(Salmon::NS_MENTIONS, $salmon_url); - // Get this user's keypair - $magickey = Magicsig::getKV('user_id', $target->id); - if (!($magickey instanceof Magicsig)) { - // No keypair yet, let's generate one. - $magickey = new Magicsig(); - $magickey->generate($target->id); - } - - $xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL, - 'data:application/magic-public-key,'. $magickey->toString(false)); - // 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}', @@ -1357,4 +1319,70 @@ class OStatusPlugin extends Plugin 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) { + $xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL, + 'data:application/magic-public-key,'. $magicsig->toString()); + $xrd->links[] = new XML_XRD_Element_Link(Magicsig::DIASPORA_PUBLICKEYREL, + base64_encode($magicsig->exportPublicKey())); + } + } + + public function onGetLocalAttentions(Profile $actor, array $attention_uris, array &$mentions, array &$groups) + { + list($mentions, $groups) = 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; + } + + public function onProfileDeleteRelated(Profile $profile, array &$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; + } }