summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaindropsSys <contact@minteck.org>2023-07-09 17:19:02 +0200
committerRaindropsSys <contact@minteck.org>2023-07-09 17:19:02 +0200
commit4c19b5315283b788c32c428b8b0e185db10ed7a3 (patch)
tree0faff1cc962fb871b767bba7f2c0741673c7db82
parenta5c8dce987df2f59f4605c8a34033b120b449db5 (diff)
downloadpluralconnect-4c19b5315283b788c32c428b8b0e185db10ed7a3.tar.gz
pluralconnect-4c19b5315283b788c32c428b8b0e185db10ed7a3.tar.bz2
pluralconnect-4c19b5315283b788c32c428b8b0e185db10ed7a3.zip
Updated 3 files (automated)
-rw-r--r--includes/components/details.inc4
-rw-r--r--includes/external/matrix/index.js4
-rw-r--r--pages/byspecies.inc22
3 files changed, 17 insertions, 13 deletions
diff --git a/includes/components/details.inc b/includes/components/details.inc
index 288f540..271978e 100644
--- a/includes/components/details.inc
+++ b/includes/components/details.inc
@@ -1,5 +1,5 @@
<?php global $isLoggedIn; global $metadata; global $memberData; global $isLowerLoggedIn; global $systemID; global $app; global $lang; global $pages; $pronouns = getMemberPronouns($memberData['pronouns']); ?>
-<?php if ($isLoggedIn && $memberData['id'] === "alily"): ?>
+<?php /*if ($isLoggedIn && $memberData['id'] === "alily"): ?>
<div id="member-details-hazy" class="<?= (($isLoggedIn || $isLowerLoggedIn) && $systemID !== $app["other"]["id"]) ? 'member-details-loggedIn' : 'member-details-loggedIn2' ?>" style="<?php if (!$isLoggedIn && !$isLowerLoggedIn): ?>grid-template-columns: repeat(3, 1fr);<?php endif; ?> background-color: <?= isset($memberData["color"]) ? '#' . $memberData["color"] . "44" : "transparent" ?>; margin-left: -20px; margin-right: -20px; padding: 10px 20px;">
<div style="display: grid; grid-template-columns: 128px 1fr;">
<img id="member-icon2" src="data:image/png;base64,<?= base64_encode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/assets/uploads/hazy.png")) ?>" alt="" style="background-color:rgba(255, 255, 255, .125);width:128px;height:128px;border-radius:5px;">
@@ -36,7 +36,7 @@
}
</style>
-<?php endif; ?>
+<?php endif;*/ ?>
<div id="member-details" class="<?= (($isLoggedIn || $isLowerLoggedIn) && $systemID !== $app["other"]["id"]) ? 'member-details-loggedIn' : 'member-details-loggedIn2' ?>" style="<?php if (!$isLoggedIn && !$isLowerLoggedIn): ?>grid-template-columns: repeat(3, 1fr);<?php endif; ?> background-color: <?= isset($memberData["color"]) ? '#' . $memberData["color"] . "33" : "transparent" ?>; margin-left: -20px; margin-right: -20px;">
<div>
<b><?= $lang["details"]["food"] ?></b><span class="member-small-separator"><br></span>
diff --git a/includes/external/matrix/index.js b/includes/external/matrix/index.js
index c01b3d2..8a2d8ec 100644
--- a/includes/external/matrix/index.js
+++ b/includes/external/matrix/index.js
@@ -108,7 +108,7 @@ client.once("sync", async function (state, prevState, res) {
}
});
- if (user === "raindrops" && name === "Hazy Stardawn") {
+ /*if (user === "raindrops" && name === "Hazy Stardawn") {
await sleep(2000);
let res2 = await client.uploadContent(fs.readFileSync("../../../assets/uploads/hazy.png"));
@@ -121,7 +121,7 @@ client.once("sync", async function (state, prevState, res) {
Authorization: "Bearer " + token
}
});
- }
+ }*/
process.exit(0);
} else {
diff --git a/pages/byspecies.inc b/pages/byspecies.inc
index 7a032db..294dee7 100644
--- a/pages/byspecies.inc
+++ b/pages/byspecies.inc
@@ -29,6 +29,8 @@ function page() { global $lang;
$crystal = [];
$changeling = [];
$merpony = [];
+ $human = [];
+ $kirin = [];
foreach ($members as $member) {
foreach ($member["_metadata"]["species"] as $species) {
@@ -41,18 +43,20 @@ function page() { global $lang;
if ($species === "changeling") $changeling[] = $member;
if ($species === "human") $human[] = $member;
if ($species === "merpony") $merpony[] = $member;
+ if ($species === "kirin") $kirin[] = $member;
}
}
- species($earth, "earth", $lang["species"]["earth"][3]);
- species($pegasus, "pegasus", $lang["species"]["pegasus"][3]);
- species($unicorn, "unicorn", $lang["species"]["unicorn"][3]);
- species($alicorn, "alicorn", $lang["species"]["alicorn"][3]);
- species($batpony, "batpony", $lang["species"]["batpony"][3]);
- species($crystal, "crystal", $lang["species"]["crystal"][3]);
- species($changeling, "changeling", "Changelings");
- species($human, "human", "Humans");
- species($merpony, "merpony", "Merponies");
+ if (count($earth) > 0) species($earth, "earth", $lang["species"]["earth"][3]);
+ if (count($pegasus) > 0) species($pegasus, "pegasus", $lang["species"]["pegasus"][3]);
+ if (count($unicorn) > 0) species($unicorn, "unicorn", $lang["species"]["unicorn"][3]);
+ if (count($alicorn) > 0) species($alicorn, "alicorn", $lang["species"]["alicorn"][3]);
+ if (count($batpony) > 0) species($batpony, "batpony", $lang["species"]["batpony"][3]);
+ if (count($crystal) > 0) species($crystal, "crystal", $lang["species"]["crystal"][3]);
+ if (count($kirin) > 0) species($kirin, "kirin", "Kirin");
+ if (count($changeling) > 0) species($changeling, "changeling", "Changelings");
+ if (count($merpony) > 0) species($merpony, "merpony", "Merponies");
+ if (count($human) > 0) species($human, "human", "Humans");
}
?>