Updated 6 files and added 3 files (automated)

3 files changed, 27 insertions, 5 deletions

diff --git a/includes/filters.json b/includes/filters.json
index 9f3c62a..adc08c7 100644
--- a/includes/filters.json
+++ b/includes/filters.json
@@ -1,7 +1,7 @@
 {
   "default": ["bipedal","human","anthro","face mask","machine learning generated","comic:pipp's ponyfans adventure","content-aware scale","pony creator","youtube caption","forced meme","fluffy pony grimdark","grimdark","grotesque","obligatory pony","drama bait","questionable","not pony related","text only","deviantart stamp","explicit","exploitable meme","nazi","racial slur","abuse","suggestive","1000 hours in ms paint","politics","semi-grimdark","seizure warning","screencap","edited screencap","vulgar","mockup","fat","sexy","equestria girls","big breasts","large butt","butt","scootadash","pregnant","belly","fetish","drugs","animated","webm","hoof knuckles","your character here","alcohol","cigarette","gmod","them's fightin' herds","meme","gameloft","ponified","ych result","species swap","semi-incest","barely pony related","pixel art","spanish","oc","japan ponycon","semi-anthro","big belly","impossibly large belly","huge belly","belly bed","glory hole","selfie","g1","g2","g3","implied anon","unikitty!","satyr","human on pony action"],
 
-  "nsfw": ["sketch","original species","traditional art","transparent background","opaline","opaline arcana","princess luna","princess cadance","jazz (g5)","queen haven","smolder","machine learning generated","content-aware scale","pony creator","youtube caption","forced meme","fluffy pony grimdark","grimdark","grotesque","obligatory pony","drama bait","questionable","not pony related","text only","deviantart stamp","exploitable meme","nazi","racial slur","abuse","suggestive","1000 hours in ms paint","politics","semi-grimdark","seizure warning","screencap","edited screencap","vulgar","mockup","fat","equestria girls","big breasts","large butt","safe","foalcon","human","anthro","rainbow dash","fluttershy","zoom zephyrwing","thunder (g5)","posey","babs seed","sweetie belle","scootaloo","twilight","twilight sparkle","sweetie bot","thunder","zoom","misty","zipp storm","pipp petals","penis","licking cock","dickgirl","dicks everywhere","dickboop","dick in a box","fart on dick","dick", "flattening","cockblock","male","solo male","masturbation","masturbating in stomach","stallion","balls","big balls","close-up","rope","tied up","ballgag","diaper","diaper fetish","incest","cyborg","bondage","apple bloom","merch sexploitation","fetish","tentacle porn","chastity belt","deer","zebra","big crotchboobs","cat","3d","tentacles","sunny starscout","izzy moonbow","derpy hooves","princess celestia","trixie","starlight glimmer","pinkie pie","applejack","rarity","them's fightin' herds","your character here","alcohol","cigarette","gmod","meme","gameloft","ponified","ych result","species swap","semi-incest","barely pony related","pixel art","spanish","japan ponycon","chastity cage","anal insertion","semi-anthro","big belly","impossibly large belly","huge belly","belly bed","glory hole","selfie","draconequus","g1","g2","g3","implied anon","flurry heart","silverstream","ocellus","yona","gallus","sandbar","unikitty!","satyr","human on pony action"],
+  "nsfw": ["sketch","original species","traditional art","transparent background","opaline","opaline arcana","princess luna","princess cadance","jazz (g5)","queen haven","smolder","machine learning generated","content-aware scale","pony creator","youtube caption","forced meme","fluffy pony grimdark","grimdark","grotesque","obligatory pony","drama bait","questionable","not pony related","text only","deviantart stamp","exploitable meme","nazi","racial slur","abuse","suggestive","1000 hours in ms paint","politics","semi-grimdark","seizure warning","screencap","edited screencap","vulgar","mockup","fat","equestria girls","big breasts","large butt","safe","foalcon","human","anthro","rainbow dash","fluttershy","zoom zephyrwing","thunder (g5)","posey","babs seed","sweetie belle","scootaloo","twilight","twilight sparkle","sweetie bot","thunder","zoom","misty","zipp storm","pipp petals","penis","licking cock","dickgirl","dicks everywhere","dickboop","dick in a box","fart on dick","dick", "flattening","cockblock","male","solo male","masturbation","masturbating in stomach","stallion","balls","big balls","close-up","rope","tied up","ballgag","diaper","diaper fetish","incest","cyborg","bondage","apple bloom","merch sexploitation","fetish","chastity belt","deer","zebra","big crotchboobs","cat","3d","sunny starscout","izzy moonbow","derpy hooves","princess celestia","trixie","starlight glimmer","pinkie pie","applejack","rarity","them's fightin' herds","your character here","alcohol","cigarette","gmod","meme","gameloft","ponified","ych result","species swap","semi-incest","barely pony related","pixel art","spanish","japan ponycon","chastity cage","anal insertion","semi-anthro","big belly","impossibly large belly","huge belly","belly bed","glory hole","selfie","draconequus","g1","g2","g3","implied anon","flurry heart","silverstream","ocellus","yona","gallus","sandbar","unikitty!","satyr","human on pony action"],
 
-  "minimal": ["sketch","original species","traditional art","transparent background","machine learning generated","content-aware scale","pony creator","youtube caption","forced meme","fluffy pony grimdark","grimdark","grotesque","obligatory pony","drama bait","questionable","not pony related","text only","deviantart stamp","exploitable meme","nazi","racial slur","abuse","suggestive","1000 hours in ms paint","politics","semi-grimdark","seizure warning","screencap","edited screencap","vulgar","mockup","fat","big breasts","large butt","foalcon","human","anthro","penis","licking cock","dickgirl","dicks everywhere","dickboop","dick in a box","fart on dick","dick", "flattening","cockblock","male","solo male","masturbation","masturbating in stomach","stallion","balls","big balls","close-up","rope","tied up","ballgag","diaper","diaper fetish","incest","cyborg","bondage","merch sexploitation","fetish","tentacle porn","chastity belt","deer","zebra","big crotchboobs","cat","3d","tentacles","them's fightin' herds","your character here","alcohol","cigarette","gmod","meme","gameloft","ponified","ych result","species swap","semi-incest","barely pony related","pixel art","spanish","japan ponycon","chastity cage","anal insertion","semi-anthro","big belly","impossibly large belly","huge belly","belly bed","glory hole","selfie","g1","g2","g3","implied anon","unikitty!","satyr","human on pony action"]
+  "minimal": ["sketch","original species","traditional art","transparent background","machine learning generated","content-aware scale","pony creator","youtube caption","forced meme","fluffy pony grimdark","grimdark","grotesque","obligatory pony","drama bait","questionable","not pony related","text only","deviantart stamp","exploitable meme","nazi","racial slur","abuse","suggestive","1000 hours in ms paint","politics","semi-grimdark","seizure warning","screencap","edited screencap","vulgar","mockup","fat","big breasts","large butt","foalcon","human","anthro","penis","licking cock","dickgirl","dicks everywhere","dickboop","dick in a box","fart on dick","dick", "flattening","cockblock","male","solo male","masturbation","masturbating in stomach","stallion","balls","big balls","close-up","rope","tied up","ballgag","diaper","diaper fetish","incest","cyborg","bondage","merch sexploitation","fetish","chastity belt","deer","zebra","big crotchboobs","cat","3d","them's fightin' herds","your character here","alcohol","cigarette","gmod","meme","gameloft","ponified","ych result","species swap","semi-incest","barely pony related","pixel art","spanish","japan ponycon","chastity cage","anal insertion","semi-anthro","big belly","impossibly large belly","huge belly","belly bed","glory hole","selfie","g1","g2","g3","implied anon","unikitty!","satyr","human on pony action"]
 }
\ No newline at end of file
diff --git a/includes/header.php b/includes/header.php
index c257e94..94bdf2b 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -233,6 +233,24 @@ function removeFromNsfw($tag) {
             background-color: #222;
         }
     </style>
+
+    <?php if (str_contains($_SERVER['HTTP_USER_AGENT'], "+ColdHazeDesktop")): ?>
+        <style>
+            .navbar {
+                display: none;
+            }
+
+            body, html {
+                background-color: #222 !important;
+            }
+
+            .container {
+                margin-left: 20px;
+                margin-right: 20px;
+                width: calc(100vw - 40px);
+            }
+        </style>
+    <?php endif; ?>
 </head>
 <body>
     <nav class="navbar navbar-expand-sm bg-light navbar-light">
@@ -254,7 +272,7 @@ function removeFromNsfw($tag) {
                     </li>
                     <?php if ($allowNsfwGeneral): ?>
                     <li class="nav-item">
-                        <a class="nav-link" href="/nsfw"><img src="/assets/explicit.png" style="width: 24px; margin-right: 5px;" class="icon"><span style="vertical-align: middle;">Explicit</span></a>
+                        <a class="nav-link" href="/nsfw/home"><img src="/assets/explicit.png" style="width: 24px; margin-right: 5px;" class="icon"><span style="vertical-align: middle;">Explicit</span></a>
                     </li>
                     <?php endif; ?>
                 </ul>
diff --git a/includes/session.php b/includes/session.php
index b1e6753..bcb2bc2 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -9,6 +9,7 @@ $species = [
 ];
 
 $name = null;
+$nameChanged = false;
 
 $names = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/names.json"), true);
 
@@ -64,8 +65,11 @@ if (file_exists("/peh") && file_exists("/peh/gdapd") && file_exists("/peh/ynmuc"
         $name = $fronters["members"][0]["display_name"] ?? $fronters["members"][0]["name"];
         $id = $fronters["members"][0]["id"];
 
+        $originalName = $name;
+
         if (isset($names[$id])) {
             $name = $names[$id];
+            $nameChanged = true;
         }
 
         if ($debug) echo("Pony has metadata:            ");
@@ -172,8 +176,8 @@ if (function_exists("proprietary_nsfw_5")) {
 
 if (str_starts_with($_SERVER['REQUEST_URI'], "/nsfw") && !$allowNsfwGeneral) {
     header("Location: /") and die();
-} else if (str_starts_with($_SERVER['REQUEST_URI'], "/nsfw/") && $_SERVER['REQUEST_URI'] !== "/nsfw/" && (!isset($_COOKIE["booru_consent"]) || time() - strtotime($_COOKIE["booru_consent"]) > 3600)) {
-    header("Location: /nsfw") and die();
+} else if (str_starts_with($_SERVER['REQUEST_URI'], "/nsfw/") && $_SERVER['REQUEST_URI'] !== "/nsfw/" && !str_starts_with($_SERVER["REQUEST_URI"], "/nsfw/?") && $_SERVER['REQUEST_URI'] !== "/nsfw/icon/" && $_SERVER['REQUEST_URI'] !== "/nsfw/icon" && (!isset($_COOKIE["booru_consent"]) || time() - strtotime($_COOKIE["booru_consent"]) > 3600)) {
+    header("Location: /nsfw/?return=" . rawurlencode($_SERVER["REQUEST_URI"])) and die();
 }
 
 if ($debug) {