Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / apistatusesshow.php

diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 13cc88c2c73bcc6c53d67ae3e6b4a78c559bf1ca..988ed804e91fddf7c52ea80639afbfb76d84c485 100644 (file)
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -34,11 +34,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Returns the notice specified by id as a Twitter-style status and inline user
@@ -67,7 +63,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -78,11 +74,20 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
 
         $this->notice_id = (int)$this->trimmed('id');
 
-        if (empty($notice_id)) {
-            $this->notice_id = (int)$this->arg('id');
+        $this->notice = Notice::getKV('id', $this->notice_id);
+        if (!$this->notice instanceof Notice) {
+            $deleted = Deleted_notice::getKV('id', $this->notice_id);
+            if ($deleted instanceof Deleted_notice) {
+                // TRANS: Client error displayed trying to show a deleted notice.
+                $this->clientError(_('Notice deleted.'), 410);
+            }
+            // TRANS: Client error displayed trying to show a non-existing notice.
+            $this->clientError(_('No such notice.'), 404);
+        }
+        if (!$this->notice->inScope($this->scoped)) {
+            // TRANS: Client exception thrown when trying a view a notice the user has no access to.
+            throw new ClientException(_('Access restricted.'), 403);
         }
-
-        $this->notice = Notice::staticGet((int)$this->notice_id);
 
         return true;
     }
@@ -92,18 +97,15 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
      *
      * Check the format and show the notice
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json', 'atom'))) {
             // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), 404);
-            return;
         }
 
         switch ($_SERVER['REQUEST_METHOD']) {
@@ -116,7 +118,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         default:
             // TRANS: Client error displayed calling an unsupported HTTP error in API status show.
             $this->clientError(_('HTTP method not supported.'), 405);
-            return;
         }
     }
 
@@ -147,7 +148,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
             // XXX: Twitter just sets a 404 header and doens't bother
             // to return an err msg
 
-            $deleted = Deleted_notice::staticGet($this->notice_id);
+            $deleted = Deleted_notice::getKV($this->notice_id);
 
             if (!empty($deleted)) {
                 $this->clientError(
@@ -175,7 +176,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
      * @return boolean true
      */
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD');
     }
@@ -225,7 +226,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         if ($this->format != 'atom') {
             // TRANS: Client error displayed when trying to delete a notice not using the Atom format.
             $this->clientError(_('Can only delete using the Atom format.'));
-            return;
         }
 
         if (empty($this->auth_user) ||
@@ -233,11 +233,10 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
              !$this->auth_user->hasRight(Right::DELETEOTHERSNOTICE))) {
             // TRANS: Client error displayed when a user has no rights to delete notices of other users.
             $this->clientError(_('Cannot delete this notice.'), 403);
-            return;
         }
 
         if (Event::handle('StartDeleteOwnNotice', array($this->auth_user, $this->notice))) {
-            $this->notice->delete();
+            $this->notice->deleteAs($this->scoped);
             Event::handle('EndDeleteOwnNotice', array($this->auth_user, $this->notice));
         }