Stop using <activity:subject> for atom feeds

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index a85da4b0f35c1dddd62ed132a7d4f0a5ae7e5619..e1bc102e450edc54b2df4fe35b25887a89dac310 100644 (file)
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -125,10 +125,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             header('Content-Type: application/atom+xml; charset=utf-8');
 
             try {
-                $atom->addAuthorRaw($this->group->asAtomAuthor());
-                $atom->setActivitySubject($this->group->asActivitySubject());
-                $atom->setId($self);
-                $atom->setSelfLink($self);
                 $atom->addEntryFromNotices($this->notices);
                 $this->raw($atom->getString());
             } catch (Atom10FeedException $e) {

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 3ae9dc81be077c3b387202ffdb49800cc565245e..881df6605f3d05565afc6d850c666fd94fe9ff9b 100644 (file)
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -146,15 +146,16 @@ class Atom10Feed extends XMLStringer
     }
 
     /**
-     * Add a activity feed subject via raw XML string
+     * Deprecated <activity:subject>; ignored
      *
      * @param string $xmlSubject An XML string representation of the subject
      *
      * @return void
      */
+
     function setActivitySubject($xmlSubject)
     {
-        $this->subject = $xmlSubject;
+        throw new ServerException(_('Don\'t use this method!'));
     }
 
     function getNamespaces()

diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 39a1fd456efa02a3a89f553d4469f8ddbbf705a2..5b6fcf42952b1e24ee255234b16157907b8cfb07 100644 (file)
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -85,8 +85,9 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
         $this->setId($self);
         $this->setSelfLink($self);
 
-        $this->addAuthorRaw($group->asAtomAuthor());
-        $this->setActivitySubject($group->asActivitySubject());
+        $ao = ActivityObject::fromGroup($group);
+
+        $this->addAuthorRaw($ao->asString('author'));
 
         $this->addLink($group->homeUrl());
     }

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index ec368f5ca1648b9c447bbea3abe01a6e800db95c..5ca089b859a85d753f7af13903e598e9eb876d95 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -60,8 +60,8 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         $this->user = $user;
         if (!empty($user)) {
             $profile = $user->getProfile();
-            $this->addAuthor($profile->nickname, $user->uri);
-            $this->setActivitySubject($profile->asActivityNoun('subject'));
+            $ao = ActivityObject::fromProfile($profile);
+            $this->addAuthorRaw($ao->asString('author'));
         }
 
         // TRANS: Title in atom user notice feed. %s is a user name.

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index d0b64e87694d41ffe09fb382820abe6735d8d236..86bd15e0b73491f67619e062e124e1c2d103fa08 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -145,12 +145,10 @@ class OStatusPlugin extends Plugin
             $user = $feed->getUser();
             $id   = $user->id;
             $profile = $user->getProfile();
-            $feed->setActivitySubject($profile->asActivityNoun('subject'));
         } else if ($feed instanceof AtomGroupNoticeFeed) {
             $salmonAction = 'groupsalmon';
             $group = $feed->getGroup();
             $id = $group->id;
-            $feed->setActivitySubject($group->asActivitySubject());
         } else {
             return true;
         }