Updated 11 files and added 3 files (automated)

4 files changed, 30 insertions, 14 deletions

diff --git a/includes/jobs/PKFronters.php b/includes/jobs/PKFronters.php
index b1449a9..3c669d5 100644
--- a/includes/jobs/PKFronters.php
+++ b/includes/jobs/PKFronters.php
@@ -23,19 +23,22 @@ if ($app["other"]["id"] === $system) {
     echo("Not using authentication\n");
     $ctx = stream_context_create([
         'http' => [
-            'method' => 'GET'
+            'method' => 'GET',
+            'headers' => "User-Agent: Mozilla/5.0 (+Cold-Haze/1.1)\r\n"
         ]
     ]);
 }
 
 echo("Fetching...\n");
+sleep(1);
 $data = file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/fronters", false, $ctx);
+json_decode($data);
 
-if (trim($data) !== "" && $data !== false) {
+if (trim($data) !== "" && $data !== false && json_last_error() === JSON_ERROR_NONE) {
     echo("Data is valid, saved it\n");
     file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/fronters.json", $data);
 } else {
-    echo("Data is invalid\n");
+    echo("Data is invalid: " . json_last_error_msg() . ": " . $data . "\n");
 }
 
 chdir($_SERVER['DOCUMENT_ROOT'] . "/includes/external/matrix");
diff --git a/includes/jobs/PKMembers.php b/includes/jobs/PKMembers.php
index c6ad897..83a8a7e 100644
--- a/includes/jobs/PKMembers.php
+++ b/includes/jobs/PKMembers.php
@@ -24,15 +24,18 @@ if ($app["other"]["id"] === $system) {
     echo("Not using authentication\n");
     $ctx = stream_context_create([
         'http' => [
-            'method' => 'GET'
+            'method' => 'GET',
+            'headers' => "User-Agent: Mozilla/5.0 (+Cold-Haze/1.1)\r\n"
         ]
     ]);
 }
 
 echo("Fetching...\n");
+sleep(1);
 $data = file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/members", false, $ctx);
+json_decode($data);
 
-if (trim($data) !== "" && $data !== false) {
+if (trim($data) !== "" && $data !== false && json_last_error() === JSON_ERROR_NONE) {
     echo("Data is valid, saved it\n");
     $parsed = json_decode($data, true);
 
diff --git a/includes/jobs/PKSwitches.php b/includes/jobs/PKSwitches.php
index e13118f..99e4a2c 100644
--- a/includes/jobs/PKSwitches.php
+++ b/includes/jobs/PKSwitches.php
@@ -24,43 +24,50 @@ if ($app["other"]["id"] === $system) {
     echo("Not using authentication\n");
     $ctx = stream_context_create([
         'http' => [
-            'method' => 'GET'
+            'method' => 'GET',
+            'headers' => "User-Agent: Mozilla/5.0 (+Cold-Haze/1.1)\r\n"
         ]
     ]);
 }
 
 echo("Fetching...\n");
 echo("     Part 1/6\n");
+sleep(1);
 $switches1 = json_decode(file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/switches", false, $ctx), true);
 
-if (count($switches1) > 0) {
+if (count($switches1) > 0 && json_last_error() === JSON_ERROR_NONE) {
     $oldest = $switches1[count($switches1) - 1]["timestamp"];
 
     echo("     Part 2/6\n");
+    sleep(1);
     $switches2 = json_decode(file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/switches?before=$oldest", false, $ctx), true);
 
-    if (count($switches2) > 0) {
+    if (count($switches2) > 0 && json_last_error() === JSON_ERROR_NONE) {
         $oldest = $switches2[count($switches2) - 1]["timestamp"];
 
         echo("     Part 3/6\n");
+        sleep(1);
         $switches3 = json_decode(file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/switches?before=$oldest", false, $ctx), true);
 
-        if (count($switches3) > 0) {
+        if (count($switches3) > 0 && json_last_error() === JSON_ERROR_NONE) {
             $oldest = $switches3[count($switches3) - 1]["timestamp"];
 
             echo("     Part 4/6\n");
+            sleep(1);
             $switches4 = json_decode(file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/switches?before=$oldest", false, $ctx), true);
 
-            if (count($switches4) > 0) {
+            if (count($switches4) > 0 && json_last_error() === JSON_ERROR_NONE) {
                 $oldest = $switches4[count($switches4) - 1]["timestamp"];
 
                 echo("     Part 5/6\n");
+                sleep(1);
                 $switches5 = json_decode(file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/switches?before=$oldest", false, $ctx), true);
 
-                if (count($switches5) > 0) {
+                if (count($switches5) > 0 && json_last_error() === JSON_ERROR_NONE) {
                     $oldest = $switches5[count($switches5) - 1]["timestamp"];
 
                     echo("     Part 6/6\n");
+                    sleep(1);
                     $switches6 = json_decode(file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system/switches?before=$oldest", false, $ctx), true);
                 } else {
                     $switches6 = [];
@@ -78,7 +85,7 @@ if (count($switches1) > 0) {
     $switches2 = $switches3 = $switches4 = $switches5 = $switches6 = [];
 }
 
-if ($switches1 !== null && $switches2 !== null && $switches3 !== null && $switches4 !== null && $switches5 !== null && $switches6 !== null) {
+if (json_last_error() === JSON_ERROR_NONE && $switches1 !== null && $switches2 !== null && $switches3 !== null && $switches4 !== null && $switches5 !== null && $switches6 !== null) {
     echo("Data is valid, saved it\n");
     file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/switches.json", json_encode([...$switches1, ...$switches2, ...$switches3, ...$switches4, ...$switches5, ...$switches6], JSON_PRETTY_PRINT));
 } else {
diff --git a/includes/jobs/PKSystem.php b/includes/jobs/PKSystem.php
index 6583e4f..117b6ad 100644
--- a/includes/jobs/PKSystem.php
+++ b/includes/jobs/PKSystem.php
@@ -23,15 +23,18 @@ if ($app["other"]["id"] === $system) {
     echo("Not using authentication\n");
     $ctx = stream_context_create([
         'http' => [
-            'method' => 'GET'
+            'method' => 'GET',
+            'headers' => "User-Agent: Mozilla/5.0 (+Cold-Haze/1.1)\r\n"
         ]
     ]);
 }
 
 echo("Fetching...\n");
+sleep(1);
 $data = file_get_contents("https://pluralkit.equestria.dev/v2/systems/$system", false, $ctx);
+json_decode($data);
 
-if (trim($data) !== "" && $data !== false) {
+if (trim($data) !== "" && $data !== false && json_last_error() === JSON_ERROR_NONE) {
     echo("Data is valid, saved it\n");
     file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/general.json", $data);
 } else {