Updated 46 files and deleted 19 files (automated)

1 files changed, 14 insertions, 44 deletions

diff --git a/includes/util/functions.inc b/includes/util/functions.inc
index 67b1786..87954ea 100644
--- a/includes/util/functions.inc
+++ b/includes/util/functions.inc
@@ -127,9 +127,9 @@ if (!function_exists("getAsset")) {
                 $id = $id1 . $id2;
 
                 if (str_ends_with((getMemberWithoutSystem($memberID) ?? ['name' => ''])["name"], "-travelling")) {
-                    $id1 = preg_replace("/^([\da-f]{8})-([\da-f]{4})-([\da-f]{4})-([\da-f]{4})-([\da-f]{12})$/", "$1$2$3$4$5", json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "ynmuc" : "gdapd") . "/general.json"), true)["uuid"]);
+                    $id1 = preg_replace("/^([\da-f]{8})-([\da-f]{4})-([\da-f]{4})-([\da-f]{4})-([\da-f]{12})$/", "$1$2$3$4$5", json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "hrbom" : "gdapd") . "/general.json"), true)["uuid"]);
 
-                    $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "ynmuc" : "gdapd") . "/members.json"), true);
+                    $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($systemID === "gdapd" ? "hrbom" : "gdapd") . "/members.json"), true);
                     $list = array_map(function ($i) {
                         return $i["name"];
                     }, $members);
@@ -322,13 +322,6 @@ if (!function_exists("getMemberWithoutSystem")) {
         global $isLowerLoggedIn; global $isLoggedIn;
         $member = null;
 
-        $members1 = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/ynmuc/members.json"), true);
-        foreach ($members1 as $m) {
-            $m["_system"] = "ynmuc";
-            $m["system"] = "ynmuc";
-            if ($m["id"] === $id) $member = $m;
-        }
-
         $members2 = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/members.json"), true);
         foreach ($members2 as $m) {
             $m["_system"] = "gdapd";
@@ -345,9 +338,9 @@ if (!function_exists("getMemberWithoutSystem")) {
 
         if ($isLowerLoggedIn || $isLoggedIn) {
             $app = $GLOBALS["ColdHazeApp"] ?? json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/app.json"), true);
-            $members3 = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/other/members.json"), true);
+            $members4 = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/other/members.json"), true);
 
-            foreach ($members3 as $m) {
+            foreach ($members4 as $m) {
                 $m["_system"] = $app["other"]["id"];
                 $m["system"] = $app["other"]["id"];
                 if ($m["id"] === $id) $member = $m;
@@ -396,11 +389,11 @@ if (!function_exists("showSystem")) {
         $global = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . (isset($app["other"]) && $id === $app["other"]["id"] ? "other" : $id) . "/general.json"), true);
 
         if ($hideTitle) {
-            echo('<div id="hpd-' . ($id === "gdapd" ? "raindrops" : ($id === "ynmuc" ? "cloudburst" : "other")) . '" style="background:rgba(255, 255, 255, .1);border-radius:10px;padding:10px;display:grid;grid-template-columns: 1fr;margin-bottom:10px;">');
+            echo('<div id="hpd-' . ($id === "gdapd" ? "raindrops" : ($id === "hrbom" ? "moonglow" : "other")) . '" style="background:rgba(255, 255, 255, .1);border-radius:10px;padding:10px;display:grid;grid-template-columns: 1fr;margin-bottom:10px;">');
         } else {
-            echo('<div id="hpd-' . ($id === "gdapd" ? "raindrops" : ($id === "ynmuc" ? "cloudburst" : "other")) . '" style="background:rgba(255, 255, 255, .1);border-radius:10px;padding:10px 10px 10px 20px;display:grid;grid-template-columns: 128px 1fr;margin-bottom:10px;">');
+            echo('<div id="hpd-' . ($id === "gdapd" ? "raindrops" : ($id === "hrbom" ? "moonglow" : "other")) . '" style="background:rgba(255, 255, 255, .1);border-radius:10px;padding:10px 10px 10px 20px;display:grid;grid-template-columns: 128px 1fr;margin-bottom:10px;">');
         }
-        if (!$hideTitle) echo('<a style="display:flex;margin: -10px -20px;align-items:center;justify-content:center;text-align:center;padding: 10px 20px;border-radius: 10px;background: #' . $global['color'] . '55;width: 148px;text-decoration:none;color:white;filter:none !important;" href="/' . ($id === "gdapd" ? "raindrops" : ($id === $app["other"]["id"] ? $app["other"]["slug"] : "cloudburst")) . '" class="hpd-system">
+        if (!$hideTitle) echo('<a style="display:flex;margin: -10px -20px;align-items:center;justify-content:center;text-align:center;padding: 10px 20px;border-radius: 10px;background: #' . $global['color'] . '55;width: 148px;text-decoration:none;color:white;filter:none !important;" href="/' . ($id === "gdapd" ? "raindrops" : ($id === $app["other"]["id"] ? $app["other"]["slug"] : "moonglow")) . '" class="hpd-system">
 <div style="text-align:center;"><img src="' . getAsset($id) . '" style="width:64px;"><br>' . $name . '</div>
 </a>');
 
@@ -410,29 +403,12 @@ if (!function_exists("showSystem")) {
             echo(' <div style="display:grid;grid-template-columns:repeat(6, 1fr);padding-left:10px;grid-gap:10px;">');
         }
 
-        if ($id === $app["other"]["id"]) {
-            showMembersFromList(scoreOrder([...array_map(function ($i) use ($id, $travelling) {
-                $i["travelling"] = false;
-                $i["system"] = $id;
-                $i["equestria"] = false;
-                return $i;
-            }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . (isset($app["other"]) && $id === $app["other"]["id"] ? "other" : $id) . "/members.json"), true))], $id));
-        } else {
-            showMembersFromList(scoreOrder([...array_map(function ($i) use ($id, $travelling) {
-                $i["travelling"] = false;
-                $i["system"] = $id;
-                if (isset($travelling[$i['id']])) $i["equestria"] = $travelling[$i['id']]['travelling'] && $travelling[$i['id']]['equestria'];
-                return $i;
-            }, array_filter(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . (isset($app["other"]) && $id === $app["other"]["id"] ? "other" : $id) . "/members.json"), true), function ($i) use ($travelling) {
-                return !(isset($travelling[$i['id']]) && $travelling[$i['id']]['travelling'] && (!isset($travelling[$i['id']]['equestria']) || !$travelling[$i['id']]['equestria']));
-            })), ...array_map(function ($i) use ($id) {
-                $i["travelling"] = true;
-                $i["system"] = ($id === "gdapd" ? "ynmuc" : "gdapd");
-                return $i;
-            }, array_filter(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . ($id === "gdapd" ? "ynmuc" : "gdapd") . "/members.json"), true), function ($i) use ($travelling) {
-                return isset($travelling[$i['id']]) && $travelling[$i['id']]['travelling'] && (!isset($travelling[$i['id']]['equestria']) || !$travelling[$i['id']]['equestria']);
-            }))], $id));
-        }
+        showMembersFromList(scoreOrder([...array_map(function ($i) use ($id, $travelling) {
+            $i["travelling"] = false;
+            $i["system"] = $id;
+            $i["equestria"] = false;
+            return $i;
+        }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/" . (isset($app["other"]) && $id === $app["other"]["id"] ? "other" : $id) . "/members.json"), true))], $id));
 
         echo('</div>
 
@@ -440,12 +416,6 @@ if (!function_exists("showSystem")) {
     }
 }
 
-if (!function_exists("cloudburst")) {
-    function cloudburst(bool $hideTitle): void {
-        showSystem("ynmuc", "Cloudburst System", "#5f08a9a6", $hideTitle);
-    }
-}
-
 if (!function_exists("raindrops")) {
     function raindrops(bool $hideTitle): void {
         showSystem("gdapd", "Raindrops System", "#a95f08a6", $hideTitle);
@@ -647,7 +617,7 @@ if (!function_exists("getMemberSystem")) {
 
 if (!function_exists("getMemberFromName")) {
     function getMemberFromName(string $name) {
-        $list = [...json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/members.json"), true), ...json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/ynmuc/members.json"), true), ...json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/other/members.json"), true)];
+        $list = [...json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/members.json"), true), ...json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/hrbom/members.json"), true), ...json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/other/members.json"), true)];
 
         foreach ($list as $item) {
             if ($item["name"] === $name) return getMemberWithoutSystem($item["id"]);