X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=96ab7f6be72ab4cef7bb78d83ec2f183ab4d5b69;hb=72d1c3c73e47bb72e9e69e125ddd222abbee3296;hp=fcef6eb701a3f0f0770faaee59b7546b64e18c05;hpb=f75ddaa8aaec61afd0699171647e26513359b564;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index fcef6eb701..96ab7f6be7 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -63,10 +63,10 @@ class Ostatus_profile extends Managed_DataObject
             ),
             'primary key' => array('uri'),
             'unique keys' => array(
-                'ostatus_profile_profile_id_idx' => array('profile_id'),
-                'ostatus_profile_group_id_idx' => array('group_id'),
-                'ostatus_profile_peopletag_id_idx' => array('peopletag_id'),
-                'ostatus_profile_feeduri_idx' => array('feeduri'),
+                'ostatus_profile_profile_id_key' => array('profile_id'),
+                'ostatus_profile_group_id_key' => array('group_id'),
+                'ostatus_profile_peopletag_id_key' => array('peopletag_id'),
+                'ostatus_profile_feeduri_key' => array('feeduri'),
             ),
             'foreign keys' => array(
                 'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
@@ -76,16 +76,27 @@ class Ostatus_profile extends Managed_DataObject
         );
     }
 
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
     /**
-     * Fetch the StatusNet-side profile for this feed
+     * Fetch the locally stored profile for this feed
      * @return Profile
+     * @throws NoProfileException if it was not found
      */
     public function localProfile()
     {
-        if ($this->profile_id) {
-            return Profile::getKV('id', $this->profile_id);
+        if ($this->isGroup()) {
+            return $this->localGroup()->getProfile();
         }
-        return null;
+
+        $profile = Profile::getKV('id', $this->profile_id);
+        if ($profile instanceof Profile) {
+            return $profile;
+        }
+        throw new NoProfileException($this->profile_id);
     }
 
     /**
@@ -125,7 +136,7 @@ class Ostatus_profile extends Managed_DataObject
         } else if ($this->isPeopletag()) {
             return ActivityObject::fromPeopletag($this->localPeopletag());
         } else {
-            return ActivityObject::fromProfile($this->localProfile());
+            return $this->localProfile()->asActivityObject();
         }
     }
 
@@ -149,7 +160,7 @@ class Ostatus_profile extends Managed_DataObject
             $noun = ActivityObject::fromPeopletag($this->localPeopletag());
             return $noun->asString('activity:' . $element);
         } else {
-            $noun = ActivityObject::fromProfile($this->localProfile());
+            $noun = $this->localProfile()->asActivityObject();
             return $noun->asString('activity:' . $element);
         }
     }
@@ -165,10 +176,10 @@ class Ostatus_profile extends Managed_DataObject
             return true;
         } else if ($this->group_id && ($this->profile_id || $this->peopletag_id)) {
             // TRANS: Server exception. %s is a URI
-            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->uri));
+            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->getUri()));
         } else {
             // TRANS: Server exception. %s is a URI
-            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->uri));
+            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri()));
         }
     }
 
@@ -183,10 +194,10 @@ class Ostatus_profile extends Managed_DataObject
             return true;
         } else if ($this->peopletag_id && ($this->profile_id || $this->group_id)) {
             // TRANS: Server exception. %s is a URI
-            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->uri));
+            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->getUri()));
         } else {
             // TRANS: Server exception. %s is a URI
-            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->uri));
+            throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri()));
         }
     }
 
@@ -194,42 +205,48 @@ class Ostatus_profile extends Managed_DataObject
      * Send a subscription request to the hub for this feed.
      * The hub will later send us a confirmation POST to /main/push/callback.
      *
-     * @return bool true on success, false on failure
-     * @throws ServerException if feed state is not valid
+     * @return void
+     * @throws ServerException if feed state is not valid or subscription fails.
      */
     public function subscribe()
     {
         $feedsub = FeedSub::ensureFeed($this->feeduri);
         if ($feedsub->sub_state == 'active') {
             // Active subscription, we don't need to do anything.
-            return true;
-        } else {
-            // Inactive or we got left in an inconsistent state.
-            // Run a subscription request to make sure we're current!
-            return $feedsub->subscribe();
+            return;
         }
+
+        // Inactive or we got left in an inconsistent state.
+        // Run a subscription request to make sure we're current!
+        return $feedsub->subscribe();
     }
 
     /**
      * Check if this remote profile has any active local subscriptions, and
      * if not drop the PuSH subscription feed.
      *
-     * @return bool true on success, false on failure
+     * @return boolean true if subscription is removed, false if there are still subscribers to the feed
+     * @throws Exception of various kinds on failure.
      */
     public function unsubscribe() {
-        $this->garbageCollect();
+        return $this->garbageCollect();
     }
 
     /**
      * Check if this remote profile has any active local subscriptions, and
      * if not drop the PuSH subscription feed.
      *
-     * @return boolean
+     * @return boolean true if subscription is removed, false if there are still subscribers to the feed
+     * @throws Exception of various kinds on failure.
      */
     public function garbageCollect()
     {
         $feedsub = FeedSub::getKV('uri', $this->feeduri);
-        return $feedsub->garbageCollect();
+        if ($feedsub instanceof FeedSub) {
+            return $feedsub->garbageCollect();
+        }
+        // Since there's no FeedSub we can assume it's already garbage collected
+        return true;
     }
 
     /**
@@ -240,6 +257,7 @@ class Ostatus_profile extends Managed_DataObject
      * FeedSub::garbageCollect().
      *
      * @return int
+     * @throws NoProfileException if there is no local profile for the object
      */
     public function subscriberCount()
     {
@@ -251,9 +269,10 @@ class Ostatus_profile extends Managed_DataObject
             $count = $subscribers->N;
         } else {
             $profile = $this->localProfile();
-            $count = $profile->subscriberCount();
             if ($profile->hasLocalTags()) {
                 $count = 1;
+            } else {
+                $count = $profile->subscriberCount();
             }
         }
         common_log(LOG_INFO, __METHOD__ . " SUB COUNT BEFORE: $count");
@@ -274,59 +293,49 @@ class Ostatus_profile extends Managed_DataObject
      * @param string  $verb   Activity::SUBSCRIBE or Activity::JOIN
      * @param Object  $object object of the action; must define asActivityNoun($tag)
      */
-    public function notify($actor, $verb, $object=null, $target=null)
+    public function notify(Profile $actor, $verb, $object=null, $target=null)
     {
-        if (!($actor instanceof Profile)) {
-            $type = gettype($actor);
-            if ($type == 'object') {
-                $type = get_class($actor);
-            }
-            // TRANS: Server exception.
-            // TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-            throw new ServerException(sprintf(_m('Invalid actor passed to %1$s: %2$s.'),__METHOD__,$type));
-        }
         if ($object == null) {
             $object = $this;
         }
-        if ($this->salmonuri) {
-            $text = 'update';
-            $id = TagURI::mint('%s:%s:%s',
-                               $verb,
-                               $actor->getURI(),
-                               common_date_iso8601(time()));
-
-            // @todo FIXME: Consolidate all these NS settings somewhere.
-            $attributes = array('xmlns' => Activity::ATOM,
-                                'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
-                                'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
-                                'xmlns:georss' => 'http://www.georss.org/georss',
-                                'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
-                                'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
-                                'xmlns:media' => 'http://purl.org/syndication/atommedia');
-
-            $entry = new XMLStringer();
-            $entry->elementStart('entry', $attributes);
-            $entry->element('id', null, $id);
-            $entry->element('title', null, $text);
-            $entry->element('summary', null, $text);
-            $entry->element('published', null, common_date_w3dtf(common_sql_now()));
-
-            $entry->element('activity:verb', null, $verb);
-            $entry->raw($actor->asAtomAuthor());
-            $entry->raw($actor->asActivityActor());
-            $entry->raw($object->asActivityNoun('object'));
-            if ($target != null) {
-                $entry->raw($target->asActivityNoun('target'));
-            }
-            $entry->elementEnd('entry');
-
-            $xml = $entry->getString();
-            common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml");
-
-            $salmon = new Salmon(); // ?
-            return $salmon->post($this->salmonuri, $xml, $actor);
+        if (empty($this->salmonuri)) {
+            return false;
         }
-        return false;
+        $text = 'update';
+        $id = TagURI::mint('%s:%s:%s',
+                           $verb,
+                           $actor->getURI(),
+                           common_date_iso8601(time()));
+
+        // @todo FIXME: Consolidate all these NS settings somewhere.
+        $attributes = array('xmlns' => Activity::ATOM,
+                            'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
+                            'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
+                            'xmlns:georss' => 'http://www.georss.org/georss',
+                            'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
+                            'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
+                            'xmlns:media' => 'http://purl.org/syndication/atommedia');
+
+        $entry = new XMLStringer();
+        $entry->elementStart('entry', $attributes);
+        $entry->element('id', null, $id);
+        $entry->element('title', null, $text);
+        $entry->element('summary', null, $text);
+        $entry->element('published', null, common_date_w3dtf(common_sql_now()));
+
+        $entry->element('activity:verb', null, $verb);
+        $entry->raw($actor->asAtomAuthor());
+        $entry->raw($actor->asActivityActor());
+        $entry->raw($object->asActivityNoun('object'));
+        if ($target != null) {
+            $entry->raw($target->asActivityNoun('target'));
+        }
+        $entry->elementEnd('entry');
+
+        $xml = $entry->getString();
+        common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml");
+
+        Salmon::post($this->salmonuri, $xml, $actor->getUser());
     }
 
     /**
@@ -337,12 +346,12 @@ class Ostatus_profile extends Managed_DataObject
      * @param Profile $actor
      * @return boolean success
      */
-    public function notifyActivity($entry, $actor)
+    public function notifyActivity($entry, Profile $actor)
     {
         if ($this->salmonuri) {
-            $salmon = new Salmon();
-            return $salmon->post($this->salmonuri, $this->notifyPrepXml($entry), $actor);
+            return Salmon::post($this->salmonuri, $this->notifyPrepXml($entry), $actor->getUser());
         }
+        common_debug(__CLASS__.' error: No salmonuri for Ostatus_profile uri: '.$this->uri);
 
         return false;
     }
@@ -473,7 +482,7 @@ class Ostatus_profile extends Managed_DataObject
 
         // The "WithProfile" events were added later.
 
-        if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) &&
+        if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) &&
             Event::handle('StartHandleFeedEntry', array($activity))) {
 
             switch ($activity->verb) {
@@ -511,10 +520,9 @@ class Ostatus_profile extends Managed_DataObject
     {
         $notice = null;
 
-        $oprofile = $this->checkAuthorship($activity);
-
-        if (empty($oprofile)) {
-            common_log(LOG_INFO, "No author matched share activity");
+        try {
+            $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile());
+        } catch (ServerException $e) {
             return null;
         }
 
@@ -534,7 +542,7 @@ class Ostatus_profile extends Managed_DataObject
 
         $shared = $activity->objects[0];
 
-        if (!($shared instanceof Activity)) {
+        if (!$shared instanceof Activity) {
             // TRANS: Client exception thrown when trying to share a non-activity object.
             throw new ClientException(_m('Can only handle shared activities.'));
         }
@@ -543,7 +551,7 @@ class Ostatus_profile extends Managed_DataObject
         if (!empty($shared->objects[0]->id)) {
             // Because StatusNet since commit 8cc4660 sets $shared->id to a TagURI which
             // fucks up federation, because the URI is no longer recognised by the origin.
-            // ...but it might still be empty (not present) because $shared->id is set.
+            // So we set it to the object ID if it exists, otherwise we trust $shared->id
             $sharedId = $shared->objects[0]->id;
         }
         if (empty($sharedId)) {
@@ -554,18 +562,25 @@ class Ostatus_profile extends Managed_DataObject
         // we can't use these functions to "ensureActivityObjectProfile" of a local user,
         // who might be the creator of the shared activity in question.
         $sharedNotice = Notice::getKV('uri', $sharedId);
-        if (!($sharedNotice instanceof Notice)) {
-            // If no local notice is found, process it!
+        if (!$sharedNotice instanceof Notice) {
+            // If no locally stored notice is found, process it!
             // TODO: Remember to check Deleted_notice!
-            $other = Ostatus_profile::ensureActivityObjectProfile($shared->actor);
-            $sharedNotice = $other->processActivity($shared, $method);
-        }
-
-        if (!($sharedNotice instanceof Notice)) {
-            // And if we apparently can't get the shared notice, we'll abort the whole thing.
-            // TRANS: Client exception thrown when saving an activity share fails.
-            // TRANS: %s is a share ID.
-            throw new ClientException(sprintf(_m('Failed to save activity %s.'), $sharedId));
+            // TODO: If a post is shared that we can't retrieve - what to do?
+            try {
+                $other = self::ensureActivityObjectProfile($shared->actor);
+                $sharedNotice = $other->processActivity($shared, $method);
+                if (!$sharedNotice instanceof Notice) {
+                    // And if we apparently can't get the shared notice, we'll abort the whole thing.
+                    // TRANS: Client exception thrown when saving an activity share fails.
+                    // TRANS: %s is a share ID.
+                    throw new ClientException(sprintf(_m('Failed to save activity %s.'), $sharedId));
+                }
+            } catch (FeedSubException $e) {
+                // Remote feed could not be found or verified, should we
+                // transform this into an "RT @user Blah, blah, blah..."?
+                common_log(LOG_INFO, __METHOD__ . ' got a ' . get_class($e) . ': ' . $e->getMessage());
+                return null;
+            }
         }
 
         // We'll want to save a web link to the original notice, if provided.
@@ -596,7 +611,7 @@ class Ostatus_profile extends Managed_DataObject
         // Get (safe!) HTML and text versions of the content
 
         $rendered = $this->purify($sourceContent);
-        $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+        $content = common_strip_html($rendered);
 
         $shortened = common_shorten_links($content);
 
@@ -607,7 +622,7 @@ class Ostatus_profile extends Managed_DataObject
 
         if (Notice::contentTooLong($shortened)) {
             $attachment = $this->saveHTMLFile($activity->title, $rendered);
-            $summary = html_entity_decode(strip_tags($activity->summary), ENT_QUOTES, 'UTF-8');
+            $summary = common_strip_html($activity->summary);
             if (empty($summary)) {
                 $summary = $content;
             }
@@ -658,14 +673,14 @@ class Ostatus_profile extends Managed_DataObject
         if ($activity->context) {
             // TODO: context->attention
             list($options['groups'], $options['replies'])
-                = $this->filterReplies($oprofile, $activity->context->attention);
+                = self::filterAttention($profile, $activity->context->attention);
 
             // Maintain direct reply associations
             // @todo FIXME: What about conversation ID?
             if (!empty($activity->context->replyToID)) {
                 $orig = Notice::getKV('uri',
                                           $activity->context->replyToID);
-                if (!empty($orig)) {
+                if ($orig instanceof Notice) {
                     $options['reply_to'] = $orig->id;
                 }
             }
@@ -701,7 +716,7 @@ class Ostatus_profile extends Managed_DataObject
             $options['urls'][] = $href;
         }
 
-        $notice = Notice::saveNew($oprofile->profile_id,
+        $notice = Notice::saveNew($profile->id,
                                   $content,
                                   'ostatus',
                                   $options);
@@ -720,22 +735,18 @@ class Ostatus_profile extends Managed_DataObject
     {
         $notice = null;
 
-        $oprofile = $this->checkAuthorship($activity);
-
-        if (empty($oprofile)) {
-            return null;
-        }
+        $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile());
 
         // It's not always an ActivityObject::NOTE, but... let's just say it is.
 
         $note = $activity->objects[0];
 
-        // The id URI will be used as a unique identifier for for the notice,
+        // The id URI will be used as a unique identifier for the notice,
         // protecting against duplicate saves. It isn't required to be a URL;
         // tag: URIs for instance are found in Google Buzz feeds.
         $sourceUri = $note->id;
         $dupe = Notice::getKV('uri', $sourceUri);
-        if ($dupe) {
+        if ($dupe instanceof Notice) {
             common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
             return $dupe;
         }
@@ -767,7 +778,7 @@ class Ostatus_profile extends Managed_DataObject
         // Get (safe!) HTML and text versions of the content
 
         $rendered = $this->purify($sourceContent);
-        $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+        $content = common_strip_html($rendered);
 
         $shortened = common_shorten_links($content);
 
@@ -778,7 +789,7 @@ class Ostatus_profile extends Managed_DataObject
 
         if (Notice::contentTooLong($shortened)) {
             $attachment = $this->saveHTMLFile($note->title, $rendered);
-            $summary = html_entity_decode(strip_tags($note->summary), ENT_QUOTES, 'UTF-8');
+            $summary = common_strip_html($note->summary);
             if (empty($summary)) {
                 $summary = $content;
             }
@@ -827,17 +838,20 @@ class Ostatus_profile extends Managed_DataObject
         if ($activity->context) {
             // TODO: context->attention
             list($options['groups'], $options['replies'])
-                = $this->filterReplies($oprofile, $activity->context->attention);
+                = self::filterAttention($profile, $activity->context->attention);
 
             // Maintain direct reply associations
             // @todo FIXME: What about conversation ID?
             if (!empty($activity->context->replyToID)) {
-                $orig = Notice::getKV('uri',
-                                          $activity->context->replyToID);
-                if (!empty($orig)) {
+                $orig = Notice::getKV('uri', $activity->context->replyToID);
+                if ($orig instanceof Notice) {
                     $options['reply_to'] = $orig->id;
                 }
             }
+            if (!empty($activity->context->conversation)) {
+                // we store the URI here, Notice class can look it up later
+                $options['conversation'] = $activity->context->conversation;
+            }
 
             $location = $activity->context->location;
             if ($location) {
@@ -871,11 +885,11 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         try {
-            $saved = Notice::saveNew($oprofile->profile_id,
+            $saved = Notice::saveNew($profile->id,
                                      $content,
                                      'ostatus',
                                      $options);
-            if ($saved) {
+            if ($saved instanceof Notice) {
                 Ostatus_source::saveNew($saved, $this, $method);
                 if (!empty($attachment)) {
                     File_to_post::processNew($attachment->id, $saved->id);
@@ -902,13 +916,13 @@ class Ostatus_profile extends Managed_DataObject
 
     /**
      * Filters a list of recipient ID URIs to just those for local delivery.
-     * @param Ostatus_profile local profile of sender
+     * @param Profile local profile of sender
      * @param array in/out &$attention_uris set of URIs, will be pruned on output
      * @return array of group IDs
      */
-    protected function filterReplies($sender, array $attention)
+    static public function filterAttention(Profile $sender, array $attention)
     {
-        common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', $attention));
+        common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention)));
         $groups = array();
         $replies = array();
         foreach ($attention as $recipient=>$type) {
@@ -927,11 +941,10 @@ class Ostatus_profile extends Managed_DataObject
                 $group = User_group::getKV('id', $id);
                 if ($group instanceof User_group) {
                     // Deliver to all members of this local group if allowed.
-                    $profile = $sender->localProfile();
-                    if ($profile->isMember($group)) {
+                    if ($sender->isMember($group)) {
                         $groups[] = $group->id;
                     } else {
-                        common_log(LOG_DEBUG, "Skipping reply to local group $group->nickname as sender $profile->id is not a member");
+                        common_log(LOG_DEBUG, sprintf('Skipping reply to local group %s as sender %d is not a member', $group->getNickname(), $sender->id));
                     }
                     continue;
                 } else {
@@ -948,7 +961,7 @@ class Ostatus_profile extends Managed_DataObject
                     $groups[] = $oprofile->group_id;
                 } else {
                     // may be canonicalized or something
-                    $replies[] = $oprofile->uri;
+                    $replies[] = $oprofile->getUri();
                 }
                 continue;
             } catch (Exception $e) {
@@ -1067,17 +1080,17 @@ class Ostatus_profile extends Managed_DataObject
             return null;
         }
 
-        // Is it a known Ostatus profile?
-        $oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
-        if ($oprofile instanceof Ostatus_profile) {
+        try {
+            $oprofile = self::getFromProfile($profile);
+            // We found the profile, return it!
             return $oprofile;
-        }
-
-        // Is it a local user?
-        $user = User::getKV('id', $profile->id);
-        if ($user instanceof User) {
-            // @todo i18n FIXME: use sprintf and add i18n (?)
-            throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'.");
+        } catch (NoResultException $e) {
+            // Could not find an OStatus profile, is it instead a local user?
+            $user = User::getKV('id', $profile->id);
+            if ($user instanceof User) {
+                // @todo i18n FIXME: use sprintf and add i18n (?)
+                throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'.");
+            }
         }
 
         // Continue discovery; it's a remote profile
@@ -1087,6 +1100,16 @@ class Ostatus_profile extends Managed_DataObject
         return null;
     }
 
+    static function getFromProfile(Profile $profile)
+    {
+        $oprofile = new Ostatus_profile();
+        $oprofile->profile_id = $profile->id;
+        if (!$oprofile->find(true)) {
+            throw new NoResultException($oprofile);
+        }
+        return $oprofile;
+    }
+
     /**
      * Look up and if necessary create an Ostatus_profile for remote entity
      * with the given update feed. This should never return null -- you will
@@ -1104,7 +1127,10 @@ class Ostatus_profile extends Managed_DataObject
 
         $huburi = $discover->getHubLink();
         $hints['hub'] = $huburi;
-        $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+
+        // XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future.
+        $salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
+                        ?: $discover->getAtomLink(Salmon::NS_REPLIES);
         $hints['salmon'] = $salmonuri;
 
         if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
@@ -1210,15 +1236,17 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         if ($this->isGroup()) {
+            // FIXME: throw exception for localGroup
             $self = $this->localGroup();
         } else {
+            // this throws an exception already
             $self = $this->localProfile();
         }
         if (!$self) {
             throw new ServerException(sprintf(
                 // TRANS: Server exception. %s is a URI.
                 _m('Tried to update avatar for unsaved remote profile %s.'),
-                $this->uri));
+                $this->getUri()));
         }
 
         // @todo FIXME: This should be better encapsulated
@@ -1367,7 +1395,7 @@ class Ostatus_profile extends Managed_DataObject
     public static function ensureActivityObjectProfile($object, $hints=array())
     {
         $profile = self::getActivityObjectProfile($object);
-        if ($profile) {
+        if ($profile instanceof Ostatus_profile) {
             $profile->updateFromActivityObject($object, $hints);
         } else {
             $profile = self::createActivityObjectProfile($object, $hints);
@@ -1450,7 +1478,7 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         $user = User::getKV('uri', $homeuri);
-        if ($user) {
+        if ($user instanceof User) {
             // TRANS: Exception.
             throw new Exception(_m('Local user cannot be referenced as remote.'));
         }
@@ -1461,9 +1489,9 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         $ptag = Profile_list::getKV('uri', $homeuri);
-        if ($ptag) {
+        if ($ptag instanceof Profile_list) {
             $local_user = User::getKV('id', $ptag->tagger);
-            if (!empty($local_user)) {
+            if ($local_user instanceof User) {
                 // TRANS: Exception.
                 throw new Exception(_m('Local list cannot be referenced as remote.'));
             }
@@ -1483,7 +1511,9 @@ class Ostatus_profile extends Managed_DataObject
                 $discover = new FeedDiscovery();
                 $discover->discoverFromFeedURL($hints['feedurl']);
             }
-            $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+            // XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future.
+            $salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
+                            ?: $discover->getAtomLink(Salmon::NS_REPLIES);
         }
 
         if (array_key_exists('hub', $hints)) {
@@ -1900,10 +1930,10 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         // Try looking it up
-        $oprofile = Ostatus_profile::getKV('uri', 'acct:'.$addr);
+        $oprofile = Ostatus_profile::getKV('uri', Discovery::normalize($addr));
 
         if ($oprofile instanceof Ostatus_profile) {
-            self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+            self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
             return $oprofile;
         }
 
@@ -1937,11 +1967,13 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         // If we got a feed URL, try that
+        $feedUrl = null;
         if (array_key_exists('feedurl', $hints)) {
+            $feedUrl = $hints['feedurl'];
             try {
                 common_log(LOG_INFO, "Discovery on acct:$addr with feed URL " . $hints['feedurl']);
                 $oprofile = self::ensureFeedURL($hints['feedurl'], $hints);
-                self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+                self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
                 return $oprofile;
             } catch (Exception $e) {
                 common_log(LOG_WARNING, "Failed creating profile from feed URL '$feedUrl': " . $e->getMessage());
@@ -1950,11 +1982,13 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         // If we got a profile page, try that!
+        $profileUrl = null;
         if (array_key_exists('profileurl', $hints)) {
+            $profileUrl = $hints['profileurl'];
             try {
                 common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
                 $oprofile = self::ensureProfileURL($hints['profileurl'], $hints);
-                self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+                self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
                 return $oprofile;
             } catch (OStatusShadowException $e) {
                 // We've ended up with a remote reference to a local user or group.
@@ -1987,7 +2021,7 @@ class Ostatus_profile extends Managed_DataObject
             $profile->nickname = self::nicknameFromUri($uri);
             $profile->created  = common_sql_now();
 
-            if (isset($profileUrl)) {
+            if (!is_null($profileUrl)) {
                 $profile->profileurl = $profileUrl;
             }
 
@@ -2006,19 +2040,20 @@ class Ostatus_profile extends Managed_DataObject
             $oprofile->profile_id = $profile_id;
             $oprofile->created    = common_sql_now();
 
-            if (isset($feedUrl)) {
-                $profile->feeduri = $feedUrl;
+            if (!is_null($feedUrl)) {
+                $oprofile->feeduri = $feedUrl;
             }
 
             $result = $oprofile->insert();
 
             if ($result === false) {
+                $profile->delete();
                 common_log_db_error($oprofile, 'INSERT', __FILE__);
                 // TRANS: Exception. %s is a webfinger address.
                 throw new Exception(sprintf(_m('Could not save OStatus profile for "%s".'),$addr));
             }
 
-            self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+            self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
             return $oprofile;
         }
 
@@ -2090,12 +2125,12 @@ class Ostatus_profile extends Managed_DataObject
             switch ($protocol) {
             case 'http':
             case 'https':
-                $oprofile = Ostatus_profile::ensureProfileURL($uri);
+                $oprofile = self::ensureProfileURL($uri);
                 break;
             case 'acct':
             case 'mailto':
                 $rest = $match[2];
-                $oprofile = Ostatus_profile::ensureWebfinger($rest);
+                $oprofile = self::ensureWebfinger($rest);
                 break;
             default:
                 // TRANS: Server exception.
@@ -2113,7 +2148,7 @@ class Ostatus_profile extends Managed_DataObject
         return $oprofile;
     }
 
-    function checkAuthorship($activity)
+    public function checkAuthorship(Activity $activity)
     {
         if ($this->isGroup() || $this->isPeopletag()) {
             // A group or propletag feed will contain posts from multiple authors.
@@ -2122,15 +2157,15 @@ class Ostatus_profile extends Managed_DataObject
                 // Groups can't post notices in StatusNet.
                 common_log(LOG_WARNING,
                     "OStatus: skipping post with group listed ".
-                    "as author: $oprofile->uri in feed from $this->uri");
-                return false;
+                    "as author: " . $oprofile->getUri() . " in feed from " . $this->getUri());
+                throw new ServerException('Activity author is a non-actor');
             }
         } else {
             $actor = $activity->actor;
 
             if (empty($actor)) {
                 // OK here! assume the default
-            } else if ($actor->id == $this->uri || $actor->link == $this->uri) {
+            } else if ($actor->id == $this->getUri() || $actor->link == $this->getUri()) {
                 $this->updateFromActivityObject($actor);
             } else if ($actor->id) {
                 // We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner.
@@ -2139,7 +2174,7 @@ class Ostatus_profile extends Managed_DataObject
                 // Most likely this is a plain ol' blog feed of some kind which
                 // doesn't match our expectations. We'll take the entry, but ignore
                 // the <author> info.
-                common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for {$this->uri}");
+                common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for " . $this->getUri());
             } else {
                 // Plain <author> without ActivityStreams actor info.
                 // We'll just ignore this info for now and save the update under the feed's identity.
@@ -2148,7 +2183,7 @@ class Ostatus_profile extends Managed_DataObject
             $oprofile = $this;
         }
 
-        return $oprofile;
+        return $oprofile->localProfile();
     }
 }