1 files changed, 70 insertions, 6 deletions

diff --git a/plugins/OStatus/actions/salmon.php b/plugins/OStatus/actions/salmon.php
index 1ed322ed2..7a4474ff6 100644
--- a/plugins/OStatus/actions/salmon.php
+++ b/plugins/OStatus/actions/salmon.php
@@ -63,11 +63,7 @@ class SalmonAction extends Action
         // XXX: check that document element is Atom entry
         // XXX: check the signature
 
-        $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
-        if ($entries && $entries->length) {
-            // @fixme is it legit to have multiple entries?
-            $this->act = new Activity($entries->item(0), $dom->documentElement);
-        }
+        $this->act = new Activity($dom->documentElement);
 
         return true;
     }
@@ -122,7 +118,28 @@ class SalmonAction extends Action
         case ActivityObject::COMMENT:
             break;
         default:
-            throw new Exception("Can't handle that kind of post.");
+            throw new ClientException("Can't handle that kind of post.");
+        }
+
+        // Notice must either be a) in reply to a notice by this user
+        // or b) to the attention of this user
+
+        $context = $this->act->context;
+
+        if (!empty($context->replyToID)) {
+            $notice = Notice::staticGet('uri', $context->replyToID);
+            if (empty($notice)) {
+                throw new ClientException("In reply to unknown notice");
+            }
+            if ($notice->profile_id != $this->user->id) {
+                throw new ClientException("In reply to a notice not by this user");
+            }
+        } else if (!empty($context->attention)) {
+            if (!in_array($context->attention, $this->user->uri)) {
+                throw new ClientException("To the attention of user(s) not including this one!");
+            }
+        } else {
+            throw new ClientException("Not to anyone in reply to anything!");
         }
 
         $profile = $this->ensureProfile();
@@ -133,6 +150,7 @@ class SalmonAction extends Action
      * We've gotten a follow/subscribe notification from a remote user.
      * Save a subscription relationship for them.
      */
+
     function handleFollow()
     {
         $oprofile = $this->ensureProfile();
@@ -165,8 +183,54 @@ class SalmonAction extends Action
      * Remote user likes one of our posts.
      * Confirm the post is ours, and save a local favorite event.
      */
+
     function handleFavorite()
     {
+        // WORST VARIABLE NAME EVER
+        $object = $this->act->object;
+
+        switch ($this->act->object->type) {
+        case ActivityObject::ARTICLE:
+        case ActivityObject::BLOGENTRY:
+        case ActivityObject::NOTE:
+        case ActivityObject::STATUS:
+        case ActivityObject::COMMENT:
+            break;
+        default:
+            throw new ClientException("Can't handle that kind of object for liking/faving.");
+        }
+
+        $notice = Notice::staticGet('uri', $object->id);
+
+        if (empty($notice)) {
+            throw new ClientException("Notice with ID $object->id unknown.");
+        }
+
+        if ($notice->profile_id != $this->user->id) {
+            throw new ClientException("Notice with ID $object->id not posted by $this->user->id.");
+        }
+
+        $profile = $this->ensureProfile();
+
+        $old = Fave::pkeyGet(array('user_id' => $profile->id,
+                                   'notice_id' => $notice->id));
+
+        if (!empty($old)) {
+            throw new ClientException("We already know that's a fave!");
+        }
+
+        $fave = new Fave();
+
+        // @fixme need to change this attribute name, maybe references
+        $fave->user_id   = $profile->id;
+        $fave->notice_id = $notice->id;
+
+        $result = $fave->insert();
+
+        if (!$result) {
+            common_log_db_error($fave, 'INSERT', __FILE__);
+            throw new ServerException('Could not save new favorite.');
+        }
     }
 
     /**