add notfound error code, slight refactor to obfio.php

openbroadcaster · Aug 19, 2024 · f555c89 · f555c89
1 parent 419f61a
commit f555c89
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/classes/core/obfio.php b/classes/core/obfio.php
@@ -26,8 +26,13 @@
  */
 class OBFIO
 {
+    private $use_http_status = false;
+
     public function __construct()
     {
+        if (str_starts_with($_SERVER['REQUEST_URI'], '/api/v2/')) {
+            $this->use_http_status = true;
+        }
     }
 
     /**
@@ -59,7 +64,7 @@ public function error($error_no)
     {
         $user = OBFUser::get_instance();
 
-        if (str_starts_with($_SERVER['REQUEST_URI'], '/api/v2/')) {
+        if ($this->use_http_status) {
             http_response_code(400);
         }
 
@@ -77,10 +82,17 @@ public function error($error_no)
                 break;
 
             case OB_ERROR_DENIED:
+                if ($this->use_http_status) {
+                    http_response_code(403);
+                }
                 $msg = 'Access denied.';
-                if (str_starts_with($_SERVER['REQUEST_URI'], '/api/v2/')) {
-                    http_response_code(401);
+                break;
+
+            case OB_ERROR_NOTFOUND:
+                if ($this->use_http_status) {
+                    http_response_code(404);
                 }
+                $msg = 'Not found.';
                 break;
         }
 

diff --git a/components.php b/components.php
@@ -32,6 +32,9 @@
 if (!defined('OB_ERROR_DENIED')) {
     define('OB_ERROR_DENIED', 4);
 }
+if (!defined('OB_ERROR_NOTFOUND')) {
+    define('OB_ERROR_NOTFOUND', 5);
+}
 if (!defined('OB_LOCAL')) {
     define('OB_LOCAL', __DIR__);
 }