X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2FOStatusPlugin.php;h=3e9a0c58d6cd539ddcff4fd24b34b72350b65200;hb=1c5e364880fa5148dcedb07c331ea5b207fd46a4;hp=c3307f23cbcb021dec2378f4391a146ba59cbca5;hpb=bb0faaea56cef7eac51d80aaf2c4e0c90a0d92e2;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index c3307f23cb..3e9a0c58d6 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -28,8 +28,6 @@ if (!defined('GNUSOCIAL')) { exit(1); } -set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phpseclib'); - class OStatusPlugin extends Plugin { /** @@ -83,20 +81,6 @@ class OStatusPlugin extends Plugin 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 @@ -129,14 +113,14 @@ class OStatusPlugin extends Plugin */ function onStartEnqueueNotice($notice, &$transports) { - if ($notice->inScope(null)) { + if ($notice->inScope(null) && $notice->getProfile()->hasRight(Right::PUBLICNOTICE)) { // 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"); + $this->log(LOG_INFO, "OSTATUS [{$notice->getID()}]: 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}"); + $this->log(LOG_NOTICE, "OSTATUS [{$notice->getID()}]: Not queueing because of privacy; scope = {$notice->scope}"); } return true; } @@ -285,30 +269,45 @@ class OStatusPlugin extends Plugin { $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 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), - 'type' => 'mention', - 'text' => $text, - 'position' => $pos, - 'length' => mb_strlen($target), - 'url' => $profile->getUrl()); + 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 getBestName() 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); } } @@ -461,7 +460,6 @@ 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()); @@ -654,7 +652,7 @@ class OStatusPlugin extends Plugin $other->getBestName()); $act->actor = $profile->asActivityObject(); - $act->object = $other->asActivityObject(); + $act->objects[] = $other->asActivityObject(); $oprofile->notifyActivity($act, $profile); @@ -692,7 +690,7 @@ class OStatusPlugin extends Plugin $act->actor = $profile->asActivityObject(); $act->verb = ActivityVerb::JOIN; - $act->object = $oprofile->asActivityObject(); + $act->objects[] = $oprofile->asActivityObject(); $act->time = time(); // TRANS: Title for joining a remote groep. @@ -746,7 +744,7 @@ class OStatusPlugin extends Plugin $act->actor = $member->asActivityObject(); $act->verb = ActivityVerb::LEAVE; - $act->object = $oprofile->asActivityObject(); + $act->objects[] = $oprofile->asActivityObject(); $act->time = time(); // TRANS: Title for leaving a remote group. @@ -792,7 +790,7 @@ class OStatusPlugin extends Plugin $act->actor = $sub->asActivityObject(); $act->verb = ActivityVerb::FOLLOW; - $act->object = $oprofile->asActivityObject(); + $act->objects[] = $oprofile->asActivityObject(); $act->time = time(); // TRANS: Title for following a remote list. @@ -844,7 +842,7 @@ class OStatusPlugin extends Plugin $act->actor = $member->asActivityObject(); $act->verb = ActivityVerb::UNFOLLOW; - $act->object = $oprofile->asActivityObject(); + $act->objects[] = $oprofile->asActivityObject(); $act->time = time(); // TRANS: Title for unfollowing a remote list. @@ -1036,7 +1034,7 @@ class OStatusPlugin extends Plugin $notice->getUrl()); $act->actor = $profile->asActivityObject(); - $act->object = $notice->asActivityObject(); + $act->objects[] = $notice->asActivityObject(); $oprofile->notifyActivity($act, $profile); @@ -1158,7 +1156,7 @@ class OStatusPlugin extends Plugin $profile->getBestName()); $act->actor = $profile->asActivityObject(); - $act->object = $act->actor; + $act->objects[] = $act->actor; while ($oprofile->fetch()) { $oprofile->notifyDeferred($act, $profile); @@ -1214,7 +1212,7 @@ class OStatusPlugin extends Plugin $versions[] = array('name' => 'OStatus', 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley', - 'homepage' => 'http://status.net/wiki/Plugin:OStatus', + 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OStatus', // TRANS: Plugin description. 'rawdescription' => _m('Follow people across social networks that implement '. 'OStatus.')); @@ -1265,17 +1263,23 @@ class OStatusPlugin extends Plugin 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::getKV('uri', $uri); - - if (!empty($user)) { + 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(); @@ -1287,10 +1291,23 @@ class OStatusPlugin extends Plugin 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); + $salmon_url = null; + $actor = $target->getProfile(); + if ($actor->isLocal()) { + $profiletype = $this->profileTypeString($actor); + $salmon_url = common_local_url("{$profiletype}salmon", array('id' => $actor->getID())); + } else { + try { + $oprofile = Ostatus_profile::fromProfile($actor); + $salmon_url = $oprofile->salmonuri; + } catch (Exception $e) { + // Even though it's not a local user, we couldn't get an Ostatus_profile?! + } + } + // Ostatus_profile salmon URL may be empty + if (!empty($salmon_url)) { + $xrd->links[] = new XML_XRD_Element_Link(Salmon::REL_SALMON, $salmon_url); + } return true; } @@ -1298,6 +1315,12 @@ class OStatusPlugin extends Plugin { if ($target->getObjectType() === ActivityObject::PERSON) { $this->addWebFingerPersonLinks($xrd, $target); + } elseif ($target->getObjectType() === ActivityObject::GROUP) { + $xrd->links[] = new XML_XRD_Element_Link(Discovery::UPDATESFROM, + common_local_url('ApiTimelineGroup', + array('id' => $target->getGroup()->getID(), 'format' => 'atom')), + 'application/atom+xml'); + } // Salmon @@ -1390,7 +1413,12 @@ class OStatusPlugin extends Plugin public function onSalmonSlap($endpoint_uri, MagicEnvelope $magic_env, Profile $target=null) { - $envxml = $magic_env->toXML($target); + try { + $envxml = $magic_env->toXML($target); + } catch (Exception $e) { + common_log(LOG_ERR, sprintf('Could not generate Magic Envelope XML for profile id=='.$target->getID().': '.$e->getMessage())); + return false; + } $headers = array('Content-Type: application/magic-envelope+xml'); @@ -1398,7 +1426,7 @@ class OStatusPlugin extends Plugin $client = new HTTPClient(); $client->setBody($envxml); $response = $client->post($endpoint_uri, $headers); - } catch (HTTP_Request2_Exception $e) { + } catch (Exception $e) { common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage()); return false; }