Merge pull request #7792 from NBKelly/rework-threading-model

fix lobby list not filtering right on manual request
mtgred · Oct 5, 2024 · 1096025 · 1096025
2 parents 1e5b0d1 + f2a865f
commit 1096025
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/clj/web/lobby.clj b/src/clj/web/lobby.clj
@@ -246,11 +246,12 @@
        (summaries-for-lobbies)))
 
 (defn prepare-lobby-list
-  [in-order-lobbies users]
-  (for [user users
-        :let [uid (:uid user)]]
-    (let [filtered-lobbies (into [] (filter-lobby-list in-order-lobbies user))]
-      [uid [:lobby/list filtered-lobbies]])))
+  [lobbies users]
+  (let [in-order-lobbies (sorted-lobbies lobbies)]
+    (for [user users
+          :let [uid (:uid user)]]
+      (let [filtered-lobbies (into [] (filter-lobby-list in-order-lobbies user))]
+        [uid [:lobby/list filtered-lobbies]]))))
 
 (defn lobby-update-uids
   []
@@ -266,9 +267,8 @@
      (broadcast-lobby-list users)))
   ([users]
    (assert (or (sequential? users) (nil? users)) (str "Users must be a sequence: " (pr-str users)))
-   (let [lobbies (app-state/get-lobbies)
-         in-order (sorted-lobbies lobbies)]
-     (doseq [[uid ev] (prepare-lobby-list in-order users)]
+   (let [lobbies (app-state/get-lobbies)]
+     (doseq [[uid ev] (prepare-lobby-list lobbies users)]
        (when uid
          (ws/chsk-send! uid ev))))))