From 85f8b489d67b2a0812aebde39515d5bbe1a584ea Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 28 Aug 2026 17:08:35 -0500
Subject: [PATCH] Fix a web announcement thingy

---
 src/router/web.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/router/web.rs b/src/router/web.rs
index e298eab..3d5c21a 100644
--- a/src/router/web.rs
+++ b/src/router/web.rs
@@ -57,13 +57,21 @@ fn query_i64(req: &HttpRequest, key: &str, def: i64) -> i64 {
 
 fn player_key(req: &HttpRequest) -> Option<String> {
     let key = global::get_login(req.headers(), "");
+    if !key.is_empty() {
+        return Some(key);
+    }
+    let uid = global::get_uid(req.headers());
+    if uid == 0 {
+        return None;
+    }
+    let key = userdata::get_login_token(uid);
     if key.is_empty() { None } else { Some(key) }
 }
 
 fn read_set(req: &HttpRequest) -> HashSet<i64> {
     match player_key(req) {
-    Some(key) => { println!("Player has key"); userdata::get_acc_home(&key)["home"]["read_announcement_ids"].members().filter_map(|v| v.as_i64()).collect()},
-        None => { println!("No player key"); HashSet::new() }
+        Some(key) => userdata::get_acc_home(&key)["home"]["read_announcement_ids"].members().filter_map(|v| v.as_i64()).collect(),
+        None => HashSet::new()
     }
 }