Merge branch 'profile' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / lib / salmonaction.php

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index f7e9dde067d53ccb08b525b80480787ff11cbfef..4d2144c30056aa7a6512d5626c80e9683acc2f1b 100644 (file)
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -31,6 +31,8 @@ class SalmonAction extends Action
     protected $oprofile = null; // Ostatus_profile of the actor
     protected $actor    = null; // Profile object of the actor
 
+    var $format   = 'text'; // error messages will be printed in plaintext
+
     var $xml      = null;
     var $activity = null;
     var $target   = null;
@@ -43,7 +45,7 @@ class SalmonAction extends Action
 
         if (!isset($_SERVER['CONTENT_TYPE'])) {
             // TRANS: Client error. Do not translate "Content-type"
-            $this->clientError(_m('Salmon requires a Content-type header.'));
+            throw new ClientException(_m('Salmon requires a Content-type header.'));
         }
         $envxml = null;
         switch ($_SERVER['CONTENT_TYPE']) {
@@ -83,6 +85,8 @@ class SalmonAction extends Action
         // Cryptographic verification test, throws exception on failure
         $magic_env->verify($this->actor);
 
+        common_debug('Salmon slap is carrying activity URI=='._ve($this->activity->id));
+
         return true;
     }
 
@@ -99,40 +103,6 @@ class SalmonAction extends Action
 
         common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
 
-        // Notice must either be a) in reply to a notice by this user
-        // or b) in reply to a notice to the attention of this user
-        // or c) to the attention of this user
-        // or d) reference the user as an activity:object
-
-        $notice = null;
-
-        if (!empty($this->activity->context->replyToID)) {
-            try {
-                $notice = Notice::getKV('uri', $this->activity->context->replyToID);
-            } catch (NoResultException $e) {
-                $notice = false;
-            }
-        }
-
-        if ($notice instanceof Notice &&
-                ($this->target->sameAs($notice->getProfile())
-                    || array_key_exists($this->target->getID(), $notice->getAttentionProfileIDs())
-                )) {
-            // In reply to a notice either from or mentioning this user.
-            common_debug('User is the owner or was in the attention list of thr:in-reply-to activity.');
-        } elseif (!empty($this->activity->context->attention) &&
-                   array_key_exists($this->target->getUri(), $this->activity->context->attention)) {
-            // To the attention of this user.
-            common_debug('User was in attention list of salmon slap.');
-        } elseif (!empty($this->activity->objects) && $this->activity->objects[0]->id === $this->target->getUri()) {
-            // The user is the object of this slap (unfollow for example)
-            common_debug('User URI was the id of the salmon slap object.');
-        } else {
-            common_debug('User was NOT found in salmon slap context.');
-            // TRANS: Client exception.
-            throw new ClientException(_m('The owner of this salmon endpoint was not in the context of the carried slap.'));
-        }
-
         try {
             $options = [ 'source' => 'ostatus' ];
             common_debug('Save salmon slap directly with Notice::saveActivity for actor=='.$this->actor->getID());