jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

22 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `d604371299fb`

tarball

atagen <boss@atagen.co>2026-10-10 15:15 UTC

5 files changed+95-18

ui: group resources and only link the ones worth visiting

A flat list of every resource offered drawers that were already empty and a diagnosis that only answers 425 off the clinic floor. The server now links resources only when they would do something, and the page groups them by what they are for.

Modified file: src/game/floors.rs+5 additions@@ -190,4 +190,9 @@ impl Run {
         )
         .header(header::LOCATION, self.path("")))
     }
+
+    /// Whether searching the drawer on this floor would turn anything up.
+    pub fn drawer_worth_searching(&self) -> bool {
+        self.here.drawer_searches == 0 || (self.floor == Floor::Nans && self.items.cage)
+    }
 }

Modified file: src/http/resource.rs+10 additions−1 deletions@@ -58,8 +58,17 @@ impl<T> Resource<T> {
     }
 
     pub fn allow(&self, target: &T) -> String {
+        Self::listed(self.verbs.iter().filter(|verb| verb.available(target)))
+    }
+
+    /// The methods with every guard assumed open, for resources that have none.
+    pub fn allow_any(&self) -> String {
+        Self::listed(self.verbs.iter())
+    }
+
+    fn listed<'a>(verbs: impl Iterator<Item = &'a Verb<T>>) -> String {
         let mut methods = Vec::new();
-        for verb in self.verbs.iter().filter(|verb| verb.available(target)) {
+        for verb in verbs {
             methods.push(verb.method);
             if verb.method == "GET" {
                 methods.push("HEAD");

Modified file: src/http/run.rs+22 additions−6 deletions@@ -9,9 +9,9 @@ use axum::{
 use hyper_util::rt::TokioIo;
 use tokio::io::AsyncWriteExt;
 
-use super::{AppState, ctx::Ctx, middleware::Compress, resource::Resource, runs};
+use super::{AppState, ctx::Ctx, meta, middleware::Compress, resource::Resource, runs};
 use crate::{
-    game::{Floor, Run, balance::SUSPICION_LIMIT},
+    game::{Elder, FORUM_THREAD, Floor, Run, balance::SUSPICION_LIMIT},
     headers::{
         X_CASH, X_EQ, X_FLOOR, X_FORESKIN, X_GIRTH, X_OBSERVED_BY, X_SELF_REPORTED_LENGTH, X_SHAME,
         X_STAMINA, X_SUSPICION,
@@ -101,13 +101,21 @@ fn links(run: &Run, now: Instant) -> String {
         ("foreskin", &runs::FORESKIN, run.foreskin.is_some()),
         ("inventory", &runs::INVENTORY, true),
         ("techniques", &runs::TECHNIQUES, true),
-        ("drawer", &runs::DRAWER, true),
+        ("drawer", &runs::DRAWER, run.drawer_worth_searching()),
         ("grip", &runs::GRIP, true),
         ("shop", &runs::SHOP, run.floor.shop_open()),
-        ("portal", &runs::PORTAL, run.floor == Floor::Hotel),
-        ("elder", &runs::ELDER, run.floor == Floor::Forum),
+        (
+            "portal",
+            &runs::PORTAL,
+            run.floor == Floor::Hotel && !run.here.wifi_accepted,
+        ),
+        (
+            "elder",
+            &runs::ELDER,
+            run.floor == Floor::Forum && run.elder != Elder::Beaten,
+        ),
         ("footage", &runs::FOOTAGE, run.filmed_at.is_some()),
-        ("diagnosis", &runs::DIAGNOSIS, true),
+        ("diagnosis", &runs::DIAGNOSIS, run.floor == Floor::Clinic),
     ];
     linked
         .into_iter()
@@ -121,6 +129,14 @@ fn links(run: &Run, now: Instant) -> String {
             let allow = target.resource.allow(run);
             format!("<{path}>; rel=\"{REL_BASE}{name}\"; allow=\"{allow}\"")
         })
+        .chain(
+            (run.forum_read() || run.floor.number() >= Floor::Forum.number()).then(|| {
+                format!(
+                    "<{FORUM_THREAD}>; rel=\"{REL_BASE}thread\"; allow=\"{}\"",
+                    meta::THREAD.allow_any()
+                )
+            }),
+        )
         .chain(run.techniques_now(now).into_iter().map(|technique| {
             let name = technique.name();
             let lubricant = technique

Modified file: src/tests.rs+30 additions@@ -749,3 +749,33 @@ async fn links_offer_only_usable_techniques() {
     let response = send(&forum, "GET", "/runs/cafebabe", &[], "").await;
     assert!(advertised(&response).is_empty());
 }
+
+fn linked_rels(response: &Response) -> Vec<String> {
+    header(response, "link")
+        .split(", <")
+        .filter_map(|entry| {
+            entry
+                .split("rels/")
+                .nth(1)?
+                .split('"')
+                .next()
+                .map(str::to_owned)
+        })
+        .filter(|rel| rel != "technique")
+        .collect()
+}
+
+#[tokio::test]
+async fn links_hide_resources_that_would_do_nothing() {
+    let (bedroom, _) = seeded(Floor::Bedroom);
+    let before = linked_rels(&send(&bedroom, "GET", "/runs/cafebabe", &[], "").await);
+    assert!(before.contains(&"drawer".to_owned()));
+    assert!(!before.contains(&"diagnosis".to_owned()));
+    assert!(!before.contains(&"thread".to_owned()));
+    let searched = send(&bedroom, "POST", "/runs/cafebabe/drawer", &[], "").await;
+    assert!(!linked_rels(&searched).contains(&"drawer".to_owned()));
+
+    let (clinic, _) = seeded(Floor::Clinic);
+    let rels = linked_rels(&send(&clinic, "GET", "/runs/cafebabe", &[], "").await);
+    assert!(rels.contains(&"diagnosis".to_owned()) && rels.contains(&"thread".to_owned()));
+}

Modified file: src/ui.html+28 additions−11 deletions@@ -91,11 +91,19 @@ const BY_TARGET = {
   "grip GET": ["upgrade"],
   "diagnosis GET": ["authorization", "ifNoneMatch"],
 };
+const GROUPS = [
+  ["play", "Play"],
+  ["you", "You"],
+  ["said", "From the last response"],
+  ["reading", "Reading"],
+  ["meta", "Meta"],
+];
+const GROUP_OF = { run: "play", floor: "play", drawer: "play", shop: "play", portal: "play", elder: "play", diagnosis: "play", length: "you", foreskin: "you", grip: "you", inventory: "you", footage: "you", techniques: "reading", thread: "reading" };
+const NAMES = { run: "the run", thread: "the 2009 forum thread" };
 const GLOBALS = [
-  { key: "runs", name: "start a new run", path: "/runs", methods: ["POST"] },
-  { key: "global", name: "leaderboard", path: "/leaderboard", methods: ["GET", "HEAD", "OPTIONS"] },
-  { key: "global", name: "graveyard", path: "/graveyard", methods: ["GET", "HEAD", "OPTIONS"] },
-  { key: "global", name: "the 2009 forum thread", path: "/forum/threads/2009", methods: ["GET", "HEAD", "OPTIONS"] },
+  { key: "runs", group: "play", name: "start a new run", path: "/runs", methods: ["POST"] },
+  { key: "global", group: "meta", name: "leaderboard", path: "/leaderboard", methods: ["GET", "HEAD", "OPTIONS"] },
+  { key: "global", group: "meta", name: "graveyard", path: "/graveyard", methods: ["GET", "HEAD", "OPTIONS"] },
 ];
 
 let run = null;
@@ -170,7 +178,10 @@ function allowedMethods(t) {
 }
 
 function targets() {
-  return (run ? linked : []).concat(offered, GLOBALS);
+  const listed = run ? linked : [];
+  const known = new Set(listed.concat(GLOBALS).map(t => t.path));
+  const fresh = offered.filter((t, i) => !known.has(t.path) && offered.findIndex(o => o.path === t.path) === i);
+  return listed.concat(fresh, GLOBALS);
 }
 
 function current() {
@@ -217,9 +228,15 @@ function renderAlerts(list) {
 function renderTargets() {
   const box = $("targets");
   box.replaceChildren();
-  for (const t of targets()) {
-    const radio = el("input", { type: "radio", name: "target", checked: t.path === target, onchange: () => chooseTarget(t) });
-    box.append(el("label", {}, radio, " " + t.name + " ", el("small", { textContent: short(t.path) })), el("br"));
+  const all = targets();
+  for (const [group, title] of GROUPS) {
+    const members = all.filter(t => t.group === group);
+    if (!members.length) continue;
+    box.append(el("h4", { textContent: title }));
+    for (const t of members) {
+      const radio = el("input", { type: "radio", name: "target", checked: t.path === target, onchange: () => chooseTarget(t) });
+      box.append(el("label", {}, radio, " " + t.name + " ", el("small", { textContent: short(t.path) })), el("br"));
+    }
   }
 }
 
@@ -295,7 +312,7 @@ function parseLinks(header) {
       continue;
     }
     const methods = (params.allow || "GET").split(",").map(s => s.trim());
-    resources.push({ key: name, name: name === "run" ? "the run" : name, path: match[1], methods });
+    resources.push({ key: name, group: GROUP_OF[name] || "play", name: NAMES[name] || name, path: match[1], methods });
   }
   return [resources, moves];
 }
@@ -304,7 +321,7 @@ function hrefs(value, found) {
   if (value && typeof value === "object") {
     if (typeof value.href === "string") {
       const name = value.title || value.item || value.name || value.href.split("/").pop();
-      found.push({ key: "offered", name, path: value.href, methods: [value.method || "GET"] });
+      found.push({ key: "offered", group: "said", name, path: value.href, methods: [value.method || "GET"] });
     }
     for (const key in value) hrefs(value[key], found);
   }
@@ -356,7 +373,7 @@ function absorb(r, sentMethod, sentPath) {
   if (headers.link) [linked, techniques] = parseLinks(headers.link);
   offered = body ? hrefs(body, []) : [];
   if (headers.location && !started) {
-    offered.unshift({ key: "offered", name: "Location", path: headers.location, methods: ["GET"] });
+    offered.unshift({ key: "offered", group: "said", name: short(headers.location).split("/").pop() + " (Location)", path: headers.location, methods: ["GET"] });
   }
   const abandoned = sentMethod === "DELETE" && sentPath === run && r.status === 204;
   if (run && (abandoned || DEATHS.includes(problem))) {

jelq

Commit d604371299fb

Commit `d604371299fb`