Updated 10 files and added 11 files (automated)

3 files changed, 5 insertions, 39 deletions

diff --git a/includes/components/2023ui.inc b/includes/components/2023ui.inc
index 556a8b5..81022d5 100644
--- a/includes/components/2023ui.inc
+++ b/includes/components/2023ui.inc
@@ -2,7 +2,7 @@
     <div style="display: grid; grid-template-columns: max-content 1fr;">
         <div style="height: 52px; display: flex; align-items: center;">
             <a href="/" style="color: inherit; text-decoration: inherit;">
-                <img src="/assets/logo/newlogo.png" style="width: 32px;">
+                <img src="/assets/logo/newlogo-ng.png" style="width: 32px;">
                 <span style="margin-left: 5px; vertical-align: middle; position: relative; top: -1px; font-weight: bold;">Cold Haze</span>
                 <span data-bs-toggle="tooltip" data-bs-placement="bottom" title="This is the new Cold Haze experience and it is currently experimental" class="badge bg-warning" style="margin-left: 5px; vertical-align: middle; position: relative; top: -1px; font-weight: bold;">Beta</span>
             </a>
diff --git a/includes/components/header.inc b/includes/components/header.inc
index 0fa60ae..fdae55a 100644
--- a/includes/components/header.inc
+++ b/includes/components/header.inc
@@ -70,7 +70,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/functions.inc";
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
     <title><?= $title && $title !== "-" ? $title . " · " : "" ?>Cold Haze</title>
-    <link rel="shortcut icon" href="/assets/logo/newlogo<?= $isLoggedIn || $isLowerLoggedIn ? "3" : "" ?>.png" type="image/png">
+    <link rel="shortcut icon" href="/assets/logo/<?php if ($use2023UI): ?>newlogo-ng<?php else: ?>newlogo<?= $isLoggedIn || $isLowerLoggedIn ? "3" : "" ?><?php endif; ?>.png" type="image/png">
     <link href="/assets/logo/light<?= $use2023UI ? "-2023" : "" ?>.css" rel="stylesheet">
 </head>
 <body<?php if (!$use2023UI): ?> style="background-color: #000;"<?php else: ?> style="background-color: var(--palette-1);"<?php endif; ?>>
diff --git a/includes/components/pleasure.inc b/includes/components/pleasure.inc
index 0939228..b9f9cd0 100644
--- a/includes/components/pleasure.inc
+++ b/includes/components/pleasure.inc
@@ -1,6 +1,6 @@
 <?php global $app; global $_PROFILE; $front = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/fronters.json"), true)["members"]; ?>
 
-<h2>Sex alert
+<h2>Pleasure alert
     <details style="display: inline-block;font-size:12px;">
         <summary class="text-muted" style="opacity:.5;"></summary>
         <label><input id="test-mode" type="checkbox"> Test Mode</label> · <label><input id="fake-requests" type="checkbox"> Fake Requests</label>
@@ -9,7 +9,7 @@
 
 <?php if ($_PROFILE["login"] === "cloudburst"): ?>
 <div class="alert alert-danger">
-    <b>Notice:</b> Only <?= $app["other"]["name"] ?> can use the sex alert. If you wish to wake somepony up, use the <a href="/-/wakeup" style="filter: invert(1) hue-rotate(180deg);">wake-up alert</a> instead.
+    <b>Notice:</b> Only <?= $app["other"]["name"] ?> can use the pleasure alert. If you wish to wake somepony up, use the <a href="/-/wakeup" style="filter: invert(1) hue-rotate(180deg);">wake-up alert</a> instead.
 </div>
 <?php endif; ?>
 
@@ -45,43 +45,9 @@
     <?php endif; ?>
 <?php endif; ?>
 
-<?php
-
-$school = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/school.json"), true);
-
-if ((int)date('G') > 19) {
-    $day = date('Y-m-d', time() + 86400);
-} else {
-    $day = date('Y-m-d');
-}
-
-if (isset($school[$day]) && $school[$day]["firstClass"]["timestamp"] < time() * 1000) {
-    $day = date('Y-m-d', time() + 86400);
-}
-
-if (!isset($school[$day])) {
-    echo('<div class="alert alert-secondary">No information about Raindrops\'s school schedule for ' . date('F jS', strtotime($day)) . ' currently, try again later.</div>');
-} elseif (isset($school[$day]["firstClass"]["timestamp"])) {
-    $tod = round($school[$day]["firstClass"]["timestamp"] / 1000) - strtotime($day);
-    $hours = $tod / 3600;
-    $time = date('g:i a', $tod);
-
-    if ($hours < 8.5) {
-        echo('<div class="alert alert-danger">Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), it is recommended that you don\'t wake them up to have sex.</div>');
-    } else if ($hours < 9.5) {
-        echo('<div class="alert alert-warning">Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for at most an hour.</div>');
-    } else {
-        echo('<div class="alert alert-success">Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for over an hour.</div>');
-    }
-} else {
-    echo('<div class="alert alert-success">Raindrops does not have school tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for as long as you wish.</div>');
-}
-
-?>
-
 <span data-bs-toggle="modal" <?php if ($_PROFILE["login"] === "cloudburst"): ?>class="disabled"<?php endif; ?> data-bs-target="#turn-on" id="btn-on" style="background: #7f0000;font-size: 48px;padding: 10px 50px;border-radius: 10px;width: max-content;display: block;margin-left: auto;margin-right: auto;cursor: pointer;">Turn <b>ON</b></span>
 <span onclick="disableAlert()" id="btn-off" style="display:none;background: #007f0b;font-size: 48px;padding: 10px 50px;border-radius: 10px;width: max-content;margin-left: auto;margin-right: auto;cursor: pointer;">Turn <b>OFF</b></span>
-<p style="text-align:center;margin-top:10px;">Sending next notification <b><span id="next-notification">never</span></b> · Local time for Raindrops: <span id="raindrops-time">--:--</span><br>Make sure you run the <code>/sex</code> command on the server before turning the alert on.</p>
+<p style="text-align:center;margin-top:10px;">Sending next notification <b><span id="next-notification">never</span></b> · Local time for Raindrops: <span id="raindrops-time">--:--</span></p>
 
 <script>
     function updateTime() {