SalmonAction and extensions simplified

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

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index b0365d161dcd7cfae9c3daf37010a6a613e441d7..186d5acfbbafc84a7f1125f68bb96929a15288e5 100644 (file)
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -28,6 +28,9 @@ class SalmonAction extends Action
 {
     protected $needPost = true;
 
+    protected $oprofile = null; // Ostatus_profile of the actor
+    protected $actor    = null; // Profile object of the actor
+
     var $xml      = null;
     var $activity = null;
     var $target   = null;
@@ -63,6 +66,9 @@ class SalmonAction extends Action
             $this->clientError(_m('Salmon signature verification failed.'));
         }
 
+        $this->oprofile = $this->ensureProfile();
+        $this->actor    = $this->oprofile->localProfile();
+
         return true;
     }
 
@@ -216,6 +222,7 @@ class SalmonAction extends Action
             throw new Exception(_m('Received a salmon slap from unidentified actor.'));
         }
 
+        // ensureActivityObjectProfile throws exception on failure
         return Ostatus_profile::ensureActivityObjectProfile($actor);
     }