X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2FOStatusPlugin.php;h=1f76b56a20bd08ed62314692f151d09508c6329f;hb=bb76af4f65fde04e03a12e7e316b1ed975f62b98;hp=17ce8e46236200f5b954f1c44fbe00e58d4b9f99;hpb=5227483855dd7ec64d2dec9323d0d327615c22ce;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 17ce8e4623..1f76b56a20 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;
     }
@@ -272,6 +256,49 @@ class OStatusPlugin extends Plugin
         return true;
     }
 
+    /**
+     * Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
+     *
+     * @return  array   The matching IDs (without @ or acct:) and each respective position in the given string.
+     */
+    static function extractWebfingerIds($text)
+    {
+        $wmatches = array();
+        // Maybe this should harmonize with lib/nickname.php and Nickname::WEBFINGER_FMT
+        $result = preg_match_all('/(?<!\S)@((?:\w+[\w\-\_\.]*)?\w+@'.URL_REGEX_DOMAIN_NAME.')/',
+                       $text,
+                       $wmatches,
+                       PREG_OFFSET_CAPTURE);
+        if ($result === false) {
+            common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').');
+        } else {
+            common_debug(sprintf('Found %i matches for WebFinger IDs: %s', count($wmatches), _ve($wmatches)));
+        }
+        return $wmatches[1];
+    }
+
+    /**
+     * Profile URL matches: @example.com/mublog/user
+     *
+     * @return  array   The matching URLs (without @ or acct:) and each respective position in the given string.
+     */
+    static function extractUrlMentions($text)
+    {
+        $wmatches = array();
+        // In the regexp below we need to match / _before_ URL_REGEX_VALID_PATH_CHARS because it otherwise gets merged
+        // with the TLD before (but / is in URL_REGEX_VALID_PATH_CHARS anyway, it's just its positioning that is important)
+        $result = preg_match_all('/(?:^|\s+)@('.URL_REGEX_DOMAIN_NAME.'(?:\/['.URL_REGEX_VALID_PATH_CHARS.']*)*)/',
+                       $text,
+                       $wmatches,
+                       PREG_OFFSET_CAPTURE);
+        if ($result === false) {
+            common_log(LOG_ERR, __METHOD__ . ': Error parsing profile URL mentions from text (preg_last_error=='.preg_last_error().').');
+        } else {
+            common_debug(sprintf('Found %i matches for profile URL mentions: %s', count($wmatches), _ve($wmatches)));
+        }
+        return $wmatches[1];
+    }
+
     /**
      * Find any explicit remote mentions. Accepted forms:
      *   Webfinger: @user@example.com
@@ -285,76 +312,63 @@ class OStatusPlugin extends Plugin
     {
         $matches = array();
 
-        $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->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());
+        foreach (self::extractWebfingerIds($text) 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->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);
+            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);
+            $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);
         }
 
-        // Profile matches: @example.com/mublog/user
-        if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)*)!',
-                       $text,
-                       $wmatches,
-                       PREG_OFFSET_CAPTURE)) {
-            foreach ($wmatches[1] as $wmatch) {
-                list($target, $pos) = $wmatch;
-                $schemes = array('http', 'https');
-                foreach ($schemes as $scheme) {
-                    $url = "$scheme://$target";
-                    $this->log(LOG_INFO, "Checking profile address '$url'");
-                    try {
-                        $oprofile = Ostatus_profile::ensureProfileURL($url);
-                        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());
-                            break;
-                        }
-                    } catch (Exception $e) {
-                        $this->log(LOG_ERR, "Profile check failed: " . $e->getMessage());
+        foreach (self::extractUrlMentions($text) as $wmatch) {
+            list($target, $pos) = $wmatch;
+            $schemes = array('https', 'http');
+            foreach ($schemes as $scheme) {
+                $url = "$scheme://$target";
+                $this->log(LOG_INFO, "Checking profile address '$url'");
+                try {
+                    $oprofile = Ostatus_profile::ensureProfileURL($url);
+                    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());
+                        break;
                     }
+                } catch (Exception $e) {
+                    $this->log(LOG_ERR, "Profile check failed: " . $e->getMessage());
                 }
             }
         }
@@ -476,7 +490,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());
@@ -1308,10 +1321,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;
     }
 
@@ -1319,6 +1345,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
@@ -1411,7 +1443,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');