OStatusPlugin: fix ensureProfile catch-22 in onCheckActivityAuthorship()

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

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 42ee9a43efb86a5299adfff1dfd5249d1e0f4be8..46c49c5f55d2063871bce108edc886d2348eb959 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -48,10 +48,10 @@ class OStatusPlugin extends Plugin
     /**
      * Hook for RouterInitialized event.
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      * @return boolean hook return
      */
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
         // Discovery actions
         $m->connect('main/ostatustag',
@@ -233,36 +233,6 @@ class OStatusPlugin extends Plugin
         return true;
     }
 
-    function onStartShowTagProfileForm($action, $profile)
-    {
-        $action->elementStart('form', array('method' => 'post',
-                                           'id' => 'form_tag_user',
-                                           'class' => 'form_settings',
-                                           'name' => 'tagprofile',
-                                           'action' => common_local_url('tagprofile', array('id' => @$profile->id))));
-
-        $action->elementStart('fieldset');
-        // TRANS: Fieldset legend.
-        $action->element('legend', null, _m('List remote profile'));
-        $action->hidden('token', common_session_token());
-
-        $user = common_current_user();
-
-        $action->elementStart('ul', 'form_data');
-        $action->elementStart('li');
-
-        // TRANS: Field label.
-        $action->input('uri', _m('LABEL','Remote profile'), $action->trimmed('uri'),
-                     // TRANS: Field title.
-                     _m('OStatus user\'s address, like nickname@example.com or http://example.net/nickname.'));
-        $action->elementEnd('li');
-        $action->elementEnd('ul');
-        // TRANS: Button text to fetch remote profile.
-        $action->submit('fetch', _m('BUTTON','Fetch'));
-        $action->elementEnd('fieldset');
-        $action->elementEnd('form');
-    }
-
     function onStartTagProfileAction($action, $profile)
     {
         $err = null;
@@ -356,7 +326,7 @@ class OStatusPlugin extends Plugin
                                                'type' => 'mention',
                                                'text' => $target,
                                                'position' => $pos,
-                                               'url' => $profile->profileurl);
+                                               'url' => $profile->getUrl());
                     }
                 } catch (Exception $e) {
                     $this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage());
@@ -383,7 +353,7 @@ class OStatusPlugin extends Plugin
                                                    'type' => 'mention',
                                                    'text' => $target,
                                                    'position' => $pos,
-                                                   'url' => $profile->profileurl);
+                                                   'url' => $profile->getUrl());
                             break;
                         }
                     } catch (Exception $e) {
@@ -691,8 +661,8 @@ class OStatusPlugin extends Plugin
                                $profile->getBestName(),
                                $other->getBestName());
 
-        $act->actor   = ActivityObject::fromProfile($profile);
-        $act->object  = ActivityObject::fromProfile($other);
+        $act->actor   = $profile->asActivityObject();
+        $act->object  = $other->asActivityObject();
 
         $oprofile->notifyActivity($act, $profile);
 
@@ -728,7 +698,7 @@ class OStatusPlugin extends Plugin
                                 $group->id,
                                 common_date_iso8601(time()));
 
-        $act->actor = ActivityObject::fromProfile($profile);
+        $act->actor = $profile->asActivityObject();
         $act->verb = ActivityVerb::JOIN;
         $act->object = $oprofile->asActivityObject();
 
@@ -782,7 +752,7 @@ class OStatusPlugin extends Plugin
                                 $group->id,
                                 common_date_iso8601(time()));
 
-        $act->actor = ActivityObject::fromProfile($member);
+        $act->actor = $member->asActivityObject();
         $act->verb = ActivityVerb::LEAVE;
         $act->object = $oprofile->asActivityObject();
 
@@ -828,7 +798,7 @@ class OStatusPlugin extends Plugin
                                 $peopletag->id,
                                 common_date_iso8601(time()));
 
-        $act->actor = ActivityObject::fromProfile($sub);
+        $act->actor = $sub->asActivityObject();
         $act->verb = ActivityVerb::FOLLOW;
         $act->object = $oprofile->asActivityObject();
 
@@ -880,7 +850,7 @@ class OStatusPlugin extends Plugin
                                 $peopletag->id,
                                 common_date_iso8601(time()));
 
-        $act->actor = ActivityObject::fromProfile($member);
+        $act->actor = $member->asActivityObject();
         $act->verb = ActivityVerb::UNFOLLOW;
         $act->object = $oprofile->asActivityObject();
 
@@ -973,8 +943,8 @@ class OStatusPlugin extends Plugin
                                 $tagged->getBestName(),
                                 $plist->getBestName());
 
-        $act->actor  = ActivityObject::fromProfile($tagger);
-        $act->objects = array(ActivityObject::fromProfile($tagged));
+        $act->actor  = $tagger->asActivityObject();
+        $act->objects = array($tagged->asActivityObject());
         $act->target = ActivityObject::fromPeopletag($plist);
 
         $oprofile->notifyDeferred($act, $tagger);
@@ -1024,8 +994,8 @@ class OStatusPlugin extends Plugin
                                 $tagged->getBestName(),
                                 $plist->getBestName());
 
-        $act->actor  = ActivityObject::fromProfile($tagger);
-        $act->objects = array(ActivityObject::fromProfile($tagged));
+        $act->actor  = $tagger->asActivityObject();
+        $act->objects = array($tagged->asActivityObject());
         $act->target = ActivityObject::fromPeopletag($plist);
 
         $oprofile->notifyDeferred($act, $tagger);
@@ -1073,8 +1043,8 @@ class OStatusPlugin extends Plugin
                                $profile->getBestName(),
                                $notice->getUrl());
 
-        $act->actor   = ActivityObject::fromProfile($profile);
-        $act->object  = ActivityObject::fromNotice($notice);
+        $act->actor   = $profile->asActivityObject();
+        $act->object  = $notice->asActivityObject();
 
         $oprofile->notifyActivity($act, $profile);
 
@@ -1191,7 +1161,7 @@ class OStatusPlugin extends Plugin
         $act->content = sprintf(_m('%s has updated their profile page.'),
                                $profile->getBestName());
 
-        $act->actor   = ActivityObject::fromProfile($profile);
+        $act->actor   = $profile->asActivityObject();
         $act->object  = $act->actor;
 
         while ($oprofile->fetch()) {
@@ -1350,6 +1320,8 @@ class OStatusPlugin extends Plugin
         if ($magicsig instanceof Magicsig) {
             $xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL,
                                 'data:application/magic-public-key,'. $magicsig->toString());
+            $xrd->links[] = new XML_XRD_Element_Link(Magicsig::DIASPORA_PUBLICKEYREL,
+                                base64_encode($magicsig->exportPublicKey()));
         }
 
         // TODO - finalize where the redirect should go on the publisher
@@ -1360,4 +1332,30 @@ class OStatusPlugin extends Plugin
 
         return true;
     }
+
+    public function onGetLocalAttentions(Profile $actor, array $attention_uris, array &$mentions, array &$groups)
+    {
+        list($mentions, $groups) = Ostatus_profile::filterAttention($actor, $attention_uris);
+    }
+
+    // FIXME: Maybe this shouldn't be so authoritative that it breaks other remote profile lookups?
+    static public function onCheckActivityAuthorship(Activity $activity, Profile &$profile)
+    {
+        try {
+            $oprofile = Ostatus_profile::ensureProfileURL($profile->getUrl());
+            $profile = $oprofile->checkAuthorship($activity);
+        } catch (Exception $e) {
+            common_log(LOG_ERR, 'Could not get a profile or check authorship ('.get_class($e).': "'.$e->getMessage().'") for activity ID: '.$activity->id);
+            $profile = null;
+            return false;
+        }
+        return true;
+    }
+
+    public function onProfileDeleteRelated($profile, &$related)
+    {
+        // Ostatus_profile has a 'profile_id' property, which will be used to find the object
+        $related[] = 'Ostatus_profile';
+        return true;
+    }
 }