X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinementions.php;h=07fbdf0b674a3f6cb93a29c3638da21afa6c00e9;hb=59043dca7fb6f974b11797c4d0f20e5b78b0611d;hp=354dc58b6869f1fec229796b3133c1d67d17e4e2;hpb=42dd460d3b9aa9a8ad147d00de9b6c8e209ab4e9;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 354dc58b68..07fbdf0b67 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -55,10 +55,8 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiTimelineMentionsAction extends ApiBareAuthAction
 {
-
     var $notices = null;
 
     /**
@@ -67,9 +65,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -77,6 +73,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
@@ -95,7 +92,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -107,7 +103,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      *
      * @return void
      */
-
     function showTimeline()
     {
         $profile = $this->user->getProfile();
@@ -115,6 +110,8 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(
+            // TRANS: Title for timeline of most recent mentions of a user.
+            // TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
             _('%1$s / Updates mentioning %2$s'),
             $sitename, $this->user->nickname
         );
@@ -128,6 +125,9 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $self = $this->getSelfUri();
 
         $subtitle   = sprintf(
+            // TRANS: Subtitle for timeline of most recent mentions of a user.
+            // TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+            // TRANS: %3$s is a user's full name.
             _('%1$s updates that reply to updates from %2$s / %3$s.'),
             $sitename, $this->user->nickname, $profile->getBestName()
         );
@@ -149,7 +149,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             );
             break;
         case 'atom':
-
             header('Content-Type: application/atom+xml; charset=utf-8');
 
             $atom = new AtomNoticeFeed($this->auth_user);
@@ -170,7 +169,16 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
+            // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
@@ -181,15 +189,22 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      *
      * @return array notices
      */
-
     function getNotices()
     {
         $notices = array();
 
-        $notice = $this->user->getReplies(
-            ($this->page - 1) * $this->count, $this->count,
-            $this->since_id, $this->max_id
-        );
+        if (empty($this->auth_user)) {
+            $profile = null; 
+        } else {
+            $profile = $this->auth_user->getProfile();
+        }
+
+        $stream = new ReplyNoticeStream($this->user->id, $profile);
+
+        $notice = $stream->getNotices(($this->page - 1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
 
         while ($notice->fetch()) {
             $notices[] = clone($notice);
@@ -205,7 +220,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -216,7 +230,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      *
      * @return string datestamp of the latest notice in the stream
      */
-
     function lastModified()
     {
         if (!empty($this->notices) && (count($this->notices) > 0)) {
@@ -234,7 +247,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
      *
      * @return string etag
      */
-
     function etag()
     {
         if (!empty($this->notices) && (count($this->notices) > 0)) {
@@ -255,5 +267,4 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
 
         return null;
     }
-
 }