Duplicate URI means we have it already, I assume

[quix0rs-gnu-social.git] / plugins / OStatus / actions / usersalmon.php

diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index fec1ca2be3d5b5ac995fcdc2a6fba007f58c3981..c62556786001a95f3387c72e925ad40d726da97c 100644 (file)
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -43,7 +43,7 @@ class UsersalmonAction extends SalmonAction
             $this->clientError(_m('No such user.'));
         }
 
-        $this->target = $this->user;
+        $this->target = $this->user->getProfile();
 
         return true;
     }
@@ -83,26 +83,23 @@ class UsersalmonAction extends SalmonAction
         }
 
         if ($notice instanceof Notice &&
-            ($notice->profile_id == $this->user->id ||
-             array_key_exists($this->user->id, $notice->getReplies())))
+            ($notice->profile_id == $this->target->id ||
+             array_key_exists($this->target->id, $notice->getReplies())))
         {
             // In reply to a notice either from or mentioning this user.
         } elseif (!empty($context->attention) &&
-                   array_key_exists($this->user->getUri(), $context->attention)) {
-        {
+                   array_key_exists($this->target->getUri(), $context->attention)) {
             // To the attention of this user.
         } else {
             // TRANS: Client exception.
             throw new ClientException(_m('Not to anyone in reply to anything.'));
         }
 
-        $existing = Notice::getKV('uri', $this->activity->objects[0]->id);
-        if ($existing instanceof Notice) {
-            common_log(LOG_ERR, "Not saving notice with duplicate URI '".$existing->getUri()."' (seems it already exists).");
+        try {
+            $this->saveNotice();
+        } catch AlreadyFulfilledException($e) {
             return;
         }
-
-        $this->saveNotice();
     }
 
     /**
@@ -111,14 +108,8 @@ class UsersalmonAction extends SalmonAction
      */
     function handleFollow()
     {
-        $oprofile = $this->ensureProfile();
-        if ($oprofile instanceof Ostatus_profile) {
-            common_log(LOG_INFO, sprintf('Setting up subscription from remote %s to local %s', $oprofile->getUri(), $this->user->getNickname()));
-            Subscription::start($oprofile->localProfile(),
-                                $this->user->getProfile());
-        } else {
-            common_log(LOG_INFO, "Can't set up subscription from remote; missing profile.");
-        }
+        common_log(LOG_INFO, sprintf('Setting up subscription from remote %s to local %s', $this->oprofile->getUri(), $this->target->getNickname()));
+        Subscription::start($this->actor, $this->target);
     }
 
     /**
@@ -129,62 +120,14 @@ class UsersalmonAction extends SalmonAction
      */
     function handleUnfollow()
     {
-        $oprofile = $this->ensureProfile();
-        if ($oprofile instanceof Ostatus_profile) {
-            common_log(LOG_INFO, sprintf('Canceling subscription from remote %s to local %s', $oprofile->getUri(), $this->user->getNickname()));
-            try {
-                Subscription::cancel($oprofile->localProfile(), $this->user->getProfile());
-            } catch (AlreadyFulfilledException $e) {
-                common_debug('Subscription did not exist, so there was nothing to cancel');
-            }
-        } else {
-            common_log(LOG_ERR, "Can't cancel subscription from remote, didn't find the profile");
+        common_log(LOG_INFO, sprintf('Canceling subscription from remote %s to local %s', $this->oprofile->getUri(), $this->target->getNickname()));
+        try {
+            Subscription::cancel($this->actor, $this->target);
+        } catch (NoProfileException $e) {
+            common_debug('Could not find profile for Subscription: '.$e->getMessage());
         }
     }
 
-    /**
-     * Remote user likes one of our posts.
-     * Confirm the post is ours, and save a local favorite event.
-     */
-
-    function handleFavorite()
-    {
-        $notice = $this->getNotice($this->activity->objects[0]);
-        $profile = $this->ensureProfile()->localProfile();
-
-        $old = Fave::pkeyGet(array('user_id' => $profile->id,
-                                   'notice_id' => $notice->id));
-
-        if ($old instanceof Fave) {
-            // TRANS: Client exception.
-            throw new ClientException(_m('This is already a favorite.'));
-        }
-
-        if (!Fave::addNew($profile, $notice)) {
-           // TRANS: Client exception.
-           throw new ClientException(_m('Could not save new favorite.'));
-        }
-    }
-
-    /**
-     * Remote user doesn't like one of our posts after all!
-     * Confirm the post is ours, and save a local favorite event.
-     */
-    function handleUnfavorite()
-    {
-        $notice = $this->getNotice($this->activity->objects[0]);
-        $profile = $this->ensureProfile()->localProfile();
-
-        $fave = Fave::pkeyGet(array('user_id' => $profile->id,
-                                   'notice_id' => $notice->id));
-        if (!$fave instanceof Fave) {
-            // TRANS: Client exception.
-            throw new ClientException(_m('Notice was not favorited!'));
-        }
-
-        $fave->delete();
-    }
-
     function handleTag()
     {
         if ($this->activity->target->type == ActivityObject::_LIST) {
@@ -200,13 +143,12 @@ class UsersalmonAction extends SalmonAction
                 throw new ClientException(_m('Unidentified profile being listed.'));
             }
 
-            if ($tagged->id !== $this->user->id) {
+            if ($tagged->id !== $this->target->id) {
                 // TRANS: Client exception.
                 throw new ClientException(_m('This user is not the one being listed.'));
             }
 
             // save the list
-            $tagger = $this->ensureProfile();
             $list   = Ostatus_profile::ensureActivityObjectProfile($this->activity->target);
 
             $ptag = $list->localPeopletag();
@@ -224,7 +166,6 @@ class UsersalmonAction extends SalmonAction
             if ($this->activity->objects[0]->type != ActivityObject::PERSON) {
                 // TRANS: Client exception.
                 throw new ClientException(_m('Not a person object.'));
-                return false;
             }
             // this is a peopletag
             $tagged = User::getKV('uri', $this->activity->objects[0]->id);
@@ -234,13 +175,12 @@ class UsersalmonAction extends SalmonAction
                 throw new ClientException(_m('Unidentified profile being unlisted.'));
             }
 
-            if ($tagged->id !== $this->user->id) {
+            if ($tagged->id !== $this->target->id) {
                 // TRANS: Client exception.
                 throw new ClientException(_m('This user is not the one being unlisted.'));
             }
 
             // save the list
-            $tagger = $this->ensureProfile();
             $list   = Ostatus_profile::ensureActivityObjectProfile($this->activity->target);
 
             $ptag = $list->localPeopletag();
@@ -279,9 +219,9 @@ class UsersalmonAction extends SalmonAction
             throw new ClientException(sprintf(_m('Notice with ID %s unknown.'),$object->id));
         }
 
-        if ($notice->profile_id != $this->user->id) {
+        if ($notice->profile_id != $this->target->id) {
             // TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-            throw new ClientException(sprintf(_m('Notice with ID %1$s not posted by %2$s.'),$object->id,$this->user->id));
+            throw new ClientException(sprintf(_m('Notice with ID %1$s not posted by %2$s.'), $object->id, $this->target->id));
         }
 
         return $notice;