Skip to content

Modified Lobby Sort #8001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoahTheDuke merged 5 commits into from
Mar 19, 2025
Merged

Modified Lobby Sort #8001

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f967d72
Modified sorted-lobbies function to prioritise older, open games.
tylerjallen02 Mar 10, 2025
22edf18
Sorted started lobbie so that ones allowing spectators come first.
tylerjallen02 Mar 11, 2025
3321a4c
Removed old test code
tylerjallen02 Mar 11, 2025
9f9a867
Modified lobby sort algorithms to try to guess lobbies that are afk
tylerjallen02 Mar 16, 2025
ac7517c
Merge branch 'master' into sort-lobby
tylerjallen02 Mar 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/clj/web/lobby.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,15 @@
:spectatorhands
:started
:timer
:title])
:title
:old])

(defn lobby-summary
"Strips private server information from a game map, preparing to send the game to clients."
([lobby] (lobby-summary lobby nil))
([lobby participating?]
(-> lobby
(assoc :old (> (count (or (:messages lobby) [])) 10))
(update :password boolean)
(update :players #(prepare-players lobby %))
(update :spectators #(prepare-players lobby %))
Expand Down Expand Up @@ -233,19 +235,24 @@
(not (or user-blocked-players? players-blocked-user?))))
lobbies)))

(defn sorted-lobbies [lobbies]
"ideally we only sort these once"
(->> (map lobby-summary lobbies)
(sort-by :date)
(reverse)
(sort-by :started)))

(comment
(->> (for [x (range 5 10)]
{:date (doto (java.util.Calendar/getInstance)
(.set (+ 2000 (+ (rand-int x) (rand-int x))) 1 2))
:started (rand-nth [true false])})
(summaries-for-lobbies)))
(defn categorize-lobby
"Categorizes the lobby into one of the following categoris:
open-recent, open-old, started-allowing-spectators, or started-no-spectators"
[lobby]
(cond
(not (:started lobby)) (if (:old lobby) :open-old :open-recent)
(:allow-spectator lobby) :allowing-spectators
:else :no-spectators))

(defn sorted-lobbies
"Sorts `lobbies` into a list with opened games on top, and other games below.
Open games will be sorted oldest to newest, other games will be sorted newest to oldest."
[lobbies]
(let [grouped-lobbies (group-by #(categorize-lobby %)
(->> (map lobby-summary lobbies)
(sort-by :date)))
{:keys [open-recent open-old allowing-spectators no-spectators]} grouped-lobbies]
(concat open-recent open-old (reverse allowing-spectators) (reverse no-spectators))))

(defn prepare-lobby-list
[lobbies users]
Expand Down