Fix OpenID discovery in pages using uppercase <HEAD> tag

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

index 70b9a9c27a49427fc3ab6eed4ed5cea7bb92c9d5..ea3453948b14002b4d4167d049d64f40daa78628 100644 (file)
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -74,16 +74,21 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
  
          $this->notice_id = (int)$this->trimmed('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) {
+        $this->notice = null;
+        try {
+            $this->notice = Notice::getByID($this->notice_id);
+        } catch (NoResultException $e) {
+            // No such notice was found, maybe it was deleted?
+            $deleted = null;
+            Event::handle('IsNoticeDeleted', array($this->notice_id, &$deleted));
+            if ($deleted === true) {
                  // TRANS: Client error displayed trying to show a deleted notice.
-                $this->clientError(_('Notice deleted.'), 410);
+                throw new ClientException(_('Notice deleted.'), 410);
              }
              // TRANS: Client error displayed trying to show a non-existing notice.
-            $this->clientError(_('No such notice.'), 404);
+            throw new ClientException(_('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);
@@ -128,43 +133,20 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
       */
      function showNotice()
      {
-        if (!empty($this->notice)) {
-            switch ($this->format) {
-            case 'xml':
-                $this->showSingleXmlStatus($this->notice);
-                break;
-            case 'json':
-                $this->show_single_json_status($this->notice);
-                break;
-            case 'atom':
-                $this->showSingleAtomStatus($this->notice);
-                break;
-            default:
-                // TRANS: Exception thrown requesting an unsupported notice output format.
-                // TRANS: %s is the requested output format.
-                throw new Exception(sprintf(_("Unsupported format: %s."), $this->format));
-            }
-        } else {
-            // XXX: Twitter just sets a 404 header and doens't bother
-            // to return an err msg
-
-            $deleted = Deleted_notice::getKV($this->notice_id);
-
-            if (!empty($deleted)) {
-                $this->clientError(
-                    // TRANS: Client error displayed requesting a deleted status.
-                    _('Status deleted.'),
-                    410,
-                    $this->format
-                );
-            } else {
-                $this->clientError(
-                    // TRANS: Client error displayed requesting a status with an invalid ID.
-                    _('No status with that ID found.'),
-                    404,
-                    $this->format
-                );
-            }
+        switch ($this->format) {
+        case 'xml':
+            $this->showSingleXmlStatus($this->notice);
+            break;
+        case 'json':
+            $this->show_single_json_status($this->notice);
+            break;
+        case 'atom':
+            $this->showSingleAtomStatus($this->notice);
+            break;
+        default:
+            // TRANS: Exception thrown requesting an unsupported notice output format.
+            // TRANS: %s is the requested output format.
+            throw new Exception(sprintf(_("Unsupported format: %s."), $this->format));
          }
      }
  
@@ -188,11 +170,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
       */
      function lastModified()
      {
-        if (!empty($this->notice)) {
-            return strtotime($this->notice->created);
-        }
-
-        return null;
+        return strtotime($this->notice->created);
      }
  
      /**
@@ -205,20 +183,15 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
       */
      function etag()
      {
-        if (!empty($this->notice)) {
-
-            return '"' . implode(
-                ':',
-                array($this->arg('action'),
-                      common_user_cache_hash($this->auth_user),
-                      common_language(),
-                      $this->notice->id,
-                      strtotime($this->notice->created))
-            )
-            . '"';
-        }
-
-        return null;
+        return '"' . implode(
+            ':',
+            array($this->arg('action'),
+                  common_user_cache_hash($this->auth_user),
+                  common_language(),
+                  $this->notice->id,
+                  strtotime($this->notice->created))
+        )
+        . '"';
      }
  
      function deleteNotice()