Don't send multiple error responses in ApiMediaUpload :)

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

diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 749f72e68d2d9b43b59f774d6c102ff56fd073d9..2d32124c42d48bcd984f0423848f1b374cb05322 100644 (file)
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -29,6 +29,7 @@
  * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -37,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Deletes one of the authenticating user's statuses (notices).
  *
@@ -54,7 +53,6 @@ require_once INSTALLDIR . '/lib/apiauth.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 ApiStatusesDestroyAction extends ApiAuthAction
 {
     var $status = null;
@@ -65,9 +63,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -79,7 +75,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
             $this->notice_id = (int)$this->arg('id');
         }
 
-        $this->notice = Notice::staticGet((int)$this->notice_id);
+        $this->notice = Notice::getKV((int)$this->notice_id);
 
         return true;
      }
@@ -93,13 +89,13 @@ class ApiStatusesDestroyAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
+                // TRANS: Client error displayed when coming across a non-supported API method.
                 _('API method not found.'),
                 404
             );
@@ -108,6 +104,8 @@ class ApiStatusesDestroyAction extends ApiAuthAction
 
         if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
             $this->clientError(
+                // TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+                // TRANS: POST and DELETE should not be translated.
                 _('This method requires a POST or DELETE.'),
                 400,
                 $this->format
@@ -117,6 +115,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
 
         if (empty($this->notice)) {
             $this->clientError(
+                // TRANS: Client error displayed trying to delete a status with an invalid ID.
                 _('No status found with that ID.'),
                 404, $this->format
             );
@@ -124,13 +123,14 @@ class ApiStatusesDestroyAction extends ApiAuthAction
         }
 
         if ($this->user->id == $this->notice->profile_id) {
-            $replies = new Reply;
-            $replies->get('notice_id', $this->notice_id);
-            $replies->delete();
-            $this->notice->delete();
+            if (Event::handle('StartDeleteOwnNotice', array($this->user, $this->notice))) {
+                $this->notice->deleteAs($this->scoped);
+                Event::handle('EndDeleteOwnNotice', array($this->user, $this->notice));
+            }
                $this->showNotice();
         } else {
             $this->clientError(
+                // TRANS: Client error displayed trying to delete a status of another user.
                 _('You may not delete another user\'s status.'),
                 403,
                 $this->format
@@ -143,7 +143,6 @@ class ApiStatusesDestroyAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showNotice()
     {
         if (!empty($this->notice)) {
@@ -154,5 +153,4 @@ class ApiStatusesDestroyAction extends ApiAuthAction
             }
         }
     }
-
 }