X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=0e12f8fc6e14005b50648b22311c832f320e91f6;hb=2f65fa646acc9a0739e779de9e472b9957c2e7eb;hp=55f347a02904e47d3c6a7ccc8a96b278d4c648ff;hpb=4e90bd34e9aff1abd97a92b62fc7c48bf1ee5a9c;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 55f347a029..0e12f8fc6e 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -327,7 +327,7 @@ class Ostatus_profile extends Memcached_DataObject
             $id = TagURI::mint('%s:%s:%s',
                                $verb,
                                $actor->getURI(),
-                               common_date_iso8601(date()));
+                               common_date_iso8601(time()));
 
             // @fixme consolidate all these NS settings somewhere
             $attributes = array('xmlns' => Activity::ATOM,
@@ -361,7 +361,7 @@ class Ostatus_profile extends Memcached_DataObject
     {
         if ($this->salmonuri) {
 
-            $xml = $activity->asString();
+            $xml = $activity->asString(true);
 
             $salmon = new Salmon(); // ?
 
@@ -508,13 +508,15 @@ class Ostatus_profile extends Memcached_DataObject
             }
         }
 
-        // @fixme save detailed ostatus source info
         // @fixme ensure that groups get handled correctly
 
         $saved = Notice::saveNew($oprofile->localProfile()->id,
                                  $content,
                                  'ostatus',
                                  $params);
+
+        // Record which feed this came through...
+        Ostatus_source::saveNew($saved, $this, 'push');
     }
 
     /**
@@ -522,7 +524,7 @@ class Ostatus_profile extends Memcached_DataObject
      * @return Ostatus_profile
      * @throws FeedSubException
      */
-    public static function ensureProfile($profile_uri)
+    public static function ensureProfile($profile_uri, $hints=array())
     {
         // Get the canonical feed URI and check it
         $discover = new FeedDiscovery();
@@ -537,18 +539,58 @@ class Ostatus_profile extends Memcached_DataObject
             throw new FeedSubNoHubException();
         }
 
-        // Ok this is going to be a terrible hack!
-        // Won't be suitable for groups, empty feeds, or getting
-        // info that's only available on the profile page.
+        // Try to get a profile from the feed activity:subject
+
+        $feedEl = $discover->feed->documentElement;
+
+        $subject = ActivityUtils::child($feedEl, Activity::SUBJECT, Activity::SPEC);
+
+        if (!empty($subject)) {
+            $subjObject = new ActivityObject($subject);
+            return self::ensureActivityObjectProfile($subjObject, $feeduri, $salmonuri, $hints);
+        }
+
+        // Otherwise, try the feed author
+
+        $author = ActivityUtils::child($feedEl, Activity::AUTHOR, Activity::ATOM);
+
+        if (!empty($author)) {
+            $authorObject = new ActivityObject($author);
+            return self::ensureActivityObjectProfile($authorObject, $feeduri, $salmonuri, $hints);
+        }
+
+        // Sheesh. Not a very nice feed! Let's try fingerpoken in the
+        // entries.
+
         $entries = $discover->feed->getElementsByTagNameNS(Activity::ATOM, 'entry');
-        if (!$entries || $entries->length == 0) {
-            throw new FeedSubException('empty feed');
+
+        if (!empty($entries) && $entries->length > 0) {
+
+            $entry = $entries->item(0);
+
+            $actor = ActivityUtils::child($entry, Activity::ACTOR, Activity::SPEC);
+
+            if (!empty($actor)) {
+                $actorObject = new ActivityObject($actor);
+                return self::ensureActivityObjectProfile($actorObject, $feeduri, $salmonuri, $hints);
+
+            }
+
+            $author = ActivityUtils::child($entry, Activity::AUTHOR, Activity::ATOM);
+
+            if (!empty($author)) {
+                $authorObject = new ActivityObject($author);
+                return self::ensureActivityObjectProfile($authorObject, $feeduri, $salmonuri, $hints);
+            }
         }
-        $first = new Activity($entries->item(0), $discover->feed);
-        return self::ensureActorProfile($first, $feeduri, $salmonuri);
+
+        // XXX: make some educated guesses here
+
+        throw new FeedSubException("Can't find enough profile information to make a feed.");
     }
 
     /**
+     *
      * Download and update given avatar image
      * @param string $url
      * @throws Exception in various failure cases
@@ -581,6 +623,12 @@ class Ostatus_profile extends Memcached_DataObject
         }
     }
 
+    protected static function getActivityObjectAvatar($object)
+    {
+        // XXX: go poke around in the feed
+        return $object->avatar;
+    }
+
     /**
      * Get an appropriate avatar image source URL, if available.
      *
@@ -588,6 +636,7 @@ class Ostatus_profile extends Memcached_DataObject
      * @param DOMElement $feed
      * @return string
      */
+
     protected static function getAvatar($actor, $feed)
     {
         $url = '';
@@ -635,11 +684,17 @@ class Ostatus_profile extends Memcached_DataObject
      * @param string $salmonuri if we already know the salmon return channel URI
      * @return Ostatus_profile
      */
+
     public static function ensureActorProfile($activity, $feeduri=null, $salmonuri=null)
     {
-        $profile = self::getActorProfile($activity);
+        return self::ensureActivityObjectProfile($activity->actor, $feeduri, $salmonuri);
+    }
+
+    public static function ensureActivityObjectProfile($object, $feeduri=null, $salmonuri=null, $hints=array())
+    {
+        $profile = self::getActivityObjectProfile($object);
         if (!$profile) {
-            $profile = self::createActorProfile($activity, $feeduri, $salmonuri);
+            $profile = self::createActivityObjectProfile($object, $feeduri, $salmonuri, $hints);
         }
         return $profile;
     }
@@ -650,8 +705,18 @@ class Ostatus_profile extends Memcached_DataObject
      */
     protected static function getActorProfile($activity)
     {
-        $homeuri = self::getActorProfileURI($activity);
-        return self::staticGet('uri', $homeuri);
+        return self::getActivityObjectProfile($activity->actor);
+    }
+
+    protected static function getActivityObjectProfile($object)
+    {
+        $uri = self::getActivityObjectProfileURI($object);
+        return Ostatus_profile::staticGet('uri', $uri);
+    }
+
+    protected static function getActorProfileURI($activity)
+    {
+        return self::getActivityObjectProfileURI($activity->actor);
     }
 
     /**
@@ -659,15 +724,14 @@ class Ostatus_profile extends Memcached_DataObject
      * @return string
      * @throws ServerException
      */
-    protected static function getActorProfileURI($activity)
+    protected static function getActivityObjectProfileURI($object)
     {
         $opts = array('allowed_schemes' => array('http', 'https'));
-        $actor = $activity->actor;
-        if ($actor->id && Validate::uri($actor->id, $opts)) {
-            return $actor->id;
+        if ($object->id && Validate::uri($object->id, $opts)) {
+            return $object->id;
         }
-        if ($actor->link && Validate::uri($actor->link, $opts)) {
-            return $actor->link;
+        if ($object->link && Validate::uri($object->link, $opts)) {
+            return $object->link;
         }
         throw new ServerException("No author ID URI found");
     }
@@ -675,18 +739,37 @@ class Ostatus_profile extends Memcached_DataObject
     /**
      * @fixme validate stuff somewhere
      */
+
     protected static function createActorProfile($activity, $feeduri=null, $salmonuri=null)
     {
         $actor = $activity->actor;
-        $homeuri = self::getActorProfileURI($activity);
-        $nickname = self::getAuthorNick($activity);
-        $avatar = self::getAvatar($actor, $activity->feed);
+
+        self::createActivityObjectProfile($actor, $feeduri, $salmonuri);
+    }
+
+    protected static function createActivityObjectProfile($object, $feeduri=null, $salmonuri=null, $hints=array())
+    {
+        $homeuri  = $object->id;
+        $nickname = self::getActivityObjectNickname($object, $hints);
+        $avatar   = self::getActivityObjectAvatar($object);
 
         if (!$homeuri) {
             common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true));
             throw new ServerException("No profile URI");
         }
 
+        if (empty($feeduri)) {
+            if (array_key_exists('feedurl', $hints)) {
+                $feeduri = $hints['feedurl'];
+            }
+        }
+
+        if (empty($salmonuri)) {
+            if (array_key_exists('salmon', $hints)) {
+                $salmonuri = $hints['salmon'];
+            }
+        }
+
         if (!$feeduri || !$salmonuri) {
             // Get the canonical feed URI and check it
             $discover = new FeedDiscovery();
@@ -703,33 +786,42 @@ class Ostatus_profile extends Memcached_DataObject
 
         $profile = new Profile();
         $profile->nickname   = $nickname;
-        $profile->fullname   = $actor->displayName;
-        $profile->homepage   = $actor->link; // @fixme
-        $profile->profileurl = $homeuri;
+        $profile->fullname   = $object->title;
+        if (!empty($object->link)) {
+            $profile->profileurl = $object->link;
+        } else if (array_key_exists('profileurl', $hints)) {
+            $profile->profileurl = $hints['profileurl'];
+        }
+        $profile->created    = common_sql_now();
+
         // @fixme bio
         // @fixme tags/categories
         // @fixme location?
         // @todo tags from categories
         // @todo lat/lon/location?
 
-        $ok = $profile->insert();
-        if (!$ok) {
+        $profile_id = $profile->insert();
+
+        if (!$profile_id) {
             throw new ServerException("Can't save local profile");
         }
 
         // @fixme either need to do feed discovery here
         // or need to split out some of the feed stuff
         // so we can leave it empty until later.
+
         $oprofile = new Ostatus_profile();
-        $oprofile->uri = $homeuri;
-        $oprofile->feeduri = $feeduri;
-        $oprofile->salmonuri = $salmonuri;
-        $oprofile->profile_id = $profile->id;
 
-        $oprofile->created = common_sql_now();
-        $oprofile->modified = common_sql_now();
+        $oprofile->uri        = $homeuri;
+        $oprofile->feeduri    = $feeduri;
+        $oprofile->salmonuri  = $salmonuri;
+        $oprofile->profile_id = $profile_id;
+
+        $oprofile->created    = common_sql_now();
+        $oprofile->modified   = common_sql_now();
 
         $ok = $oprofile->insert();
+
         if ($ok) {
             $oprofile->updateAvatar($avatar);
             return $oprofile;
@@ -738,24 +830,167 @@ class Ostatus_profile extends Memcached_DataObject
         }
     }
 
-    /**
-     * @fixme move this into Activity?
-     * @param Activity $activity
-     * @return string
-     */
-    protected static function getAuthorNick($activity)
-    {
-        // @fixme not technically part of the actor?
-        foreach (array($activity->entry, $activity->feed) as $source) {
-            $author = ActivityUtils::child($source, 'author', Activity::ATOM);
-            if ($author) {
-                $name = ActivityUtils::child($author, 'name', Activity::ATOM);
-                if ($name) {
-                    return trim($name->textContent);
-                }
+    protected static function getActivityObjectNickname($object, $hints=array())
+    {
+        if (!empty($object->nickname)) {
+            return common_nicknamize($object->nickname);
+        }
+
+        // Try the definitive ID
+
+        $nickname = self::nicknameFromURI($object->id);
+
+        // Try a Webfinger if one was passed (way) down
+
+        if (empty($nickname)) {
+            if (array_key_exists('webfinger', $hints)) {
+                $nickname = self::nicknameFromURI($hints['webfinger']);
             }
         }
-        return false;
+
+        // Try the name
+
+        if (empty($nickname)) {
+            $nickname = common_nicknamize($object->title);
+        }
+
+        return $nickname;
+    }
+
+    protected static function nicknameFromURI($uri)
+    {
+        preg_match('/(\w+):/', $uri, $matches);
+
+        $protocol = $matches[1];
+
+        switch ($protocol) {
+        case 'acct':
+        case 'mailto':
+            if (preg_match("/^$protocol:(.*)?@.*\$/", $uri, $matches)) {
+                return common_canonical_nickname($matches[1]);
+            }
+            return null;
+        case 'http':
+            return common_url_to_nickname($uri);
+            break;
+        default:
+            return null;
+        }
     }
 
+    public static function ensureWebfinger($addr)
+    {
+        // First, look it up
+
+        $oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$addr);
+
+        if (!empty($oprofile)) {
+            return $oprofile;
+        }
+
+        // Now, try some discovery
+
+        $wf = new Webfinger();
+
+        $result = $wf->lookup($addr);
+
+        if (!$result) {
+            return null;
+        }
+
+        foreach ($result->links as $link) {
+            switch ($link['rel']) {
+            case Webfinger::PROFILEPAGE:
+                $profileUrl = $link['href'];
+                break;
+            case 'salmon':
+                $salmonEndpoint = $link['href'];
+                break;
+            case Webfinger::UPDATESFROM:
+                $feedUrl = $link['href'];
+                break;
+            default:
+                common_log(LOG_NOTICE, "Don't know what to do with rel = '{$link['rel']}'");
+                break;
+            }
+        }
+
+        $hints = array('webfinger' => $addr,
+                       'profileurl' => $profileUrl,
+                       'feedurl' => $feedUrl,
+                       'salmon' => $salmonEndpoint);
+
+        // If we got a feed URL, try that
+
+        if (isset($feedUrl)) {
+            try {
+                $oprofile = self::ensureProfile($feedUrl, $hints);
+                return $oprofile;
+            } catch (Exception $e) {
+                common_log(LOG_WARNING, "Failed creating profile from feed URL '$feedUrl': " . $e->getMessage());
+                // keep looking
+            }
+        }
+
+        // If we got a profile page, try that!
+
+        if (isset($profileUrl)) {
+            try {
+                $oprofile = self::ensureProfile($profileUrl, $hints);
+                return $oprofile;
+            } catch (Exception $e) {
+                common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage());
+                // keep looking
+            }
+        }
+
+        // XXX: try hcard
+        // XXX: try FOAF
+
+        if (isset($salmonEndpoint)) {
+
+            // An account URL, a salmon endpoint, and a dream? Not much to go
+            // on, but let's give it a try
+
+            $uri = 'acct:'.$addr;
+
+            $profile = new Profile();
+
+            $profile->nickname = self::nicknameFromUri($uri);
+            $profile->created  = common_sql_now();
+
+            if (isset($profileUrl)) {
+                $profile->profileurl = $profileUrl;
+            }
+
+            $profile_id = $profile->insert();
+
+            if (!$profile_id) {
+                common_log_db_error($profile, 'INSERT', __FILE__);
+                throw new Exception("Couldn't save profile for '$addr'");
+            }
+
+            $oprofile = new Ostatus_profile();
+
+            $oprofile->uri        = $uri;
+            $oprofile->salmonuri  = $salmonEndpoint;
+            $oprofile->profile_id = $profile_id;
+            $oprofile->created    = common_sql_now();
+
+            if (isset($feedUrl)) {
+                $profile->feeduri = $feedUrl;
+            }
+
+            $result = $oprofile->insert();
+
+            if (!$result) {
+                common_log_db_error($oprofile, 'INSERT', __FILE__);
+                throw new Exception("Couldn't save ostatus_profile for '$addr'");
+            }
+
+            return $oprofile;
+        }
+
+        return null;
+    }
 }