From aee83e27e5f9dcc4d0e6aaa6df0f5bdb4b1231b2 Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Fri, 23 Oct 2026 15:41:37 -0400
Subject: [PATCH 1/2] feature: friends' online status and the online count come
 from the api, and tabs stop holding everyone online

---
 components/hub/SocialPanel.vue                |  47 +----
 components/matchmaking-lobby/PlayersList.vue  |  90 ++------
 .../matchmaking/MatchmakingSettingsPanel.vue  |   2 +
 components/play/PlayMatchmaking.vue           |   4 +-
 graphql/messageRequests.ts                    |  12 --
 i18n/locales/en.json                          |   1 +
 layouts/components/OnlinePlayers.vue          |   4 +-
 layouts/components/SystemStatus.vue           |  46 +++-
 pages/players/index.vue                       |  46 ----
 stores/MatchmakingStore.ts                    | 196 ++++++++----------
 stores/SearchStore.ts                         |  24 +--
 .../components/hub/SocialPanelOthers.spec.ts  |  29 +++
 .../SystemStatusOnlineCount.spec.ts           |  61 ++++++
 tests/pages/players/playersTwitch.spec.ts     |  13 +-
 tests/stores/friendsPresence.spec.ts          | 158 ++++++++++++++
 tests/stores/onlineRosterAsksOnce.spec.ts     | 108 ----------
 web-sockets/Socket.ts                         |  16 +-
 17 files changed, 437 insertions(+), 420 deletions(-)
 create mode 100644 tests/components/hub/SocialPanelOthers.spec.ts
 create mode 100644 tests/layouts/components/SystemStatusOnlineCount.spec.ts
 create mode 100644 tests/stores/friendsPresence.spec.ts
 delete mode 100644 tests/stores/onlineRosterAsksOnce.spec.ts

diff --git a/components/hub/SocialPanel.vue b/components/hub/SocialPanel.vue
index 80775edbb..9ea10ae5c 100644
--- a/components/hub/SocialPanel.vue
+++ b/components/hub/SocialPanel.vue
@@ -4,42 +4,18 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs";
 import PlayersList from "~/components/matchmaking-lobby/PlayersList.vue";
 import HubEmptyState from "~/components/hub/HubEmptyState.vue";
 import { useMatchmakingStore } from "~/stores/MatchmakingStore";
-import { useAuthStore } from "~/stores/AuthStore";
 import { useInvites } from "@/composables/useInvites";
 
 const activeTab = ref("friends");
 
 const matchmakingStore = useMatchmakingStore();
-const authStore = useAuthStore();
 const { hasSocialInvites } = useInvites();
 
 const onlineFriends = computed(() => matchmakingStore.onlineFriends);
 const offlineFriends = computed(() => matchmakingStore.offlineFriends);
 
-const otherOnlineCount = computed(() => {
-  const me = authStore.me;
-  const friends = matchmakingStore.friends;
-
-  return matchmakingStore.playersOnline.filter((player: any) => {
-    if (me && String(player.steam_id) === String(me.steam_id)) {
-      return false;
-    }
-
-    // Mirror PlayersList "Others" filter: accepted friends and incoming
-    // requests live in the Friends tab; outgoing requests stay here.
-    const entry = friends?.find(
-      (f: any) => String(f.steam_id) === String(player.steam_id),
-    );
-    if (entry) {
-      if (entry.status !== "Pending") return false;
-      if (String(entry.invited_by_steam_id) !== String(me?.steam_id)) {
-        return false;
-      }
-    }
-
-    return true;
-  }).length;
-});
+// The paged list of everyone else online comes later; the tab shows the count.
+const othersCount = computed(() => matchmakingStore.onlineCount);
 </script>
 
 <template>
@@ -73,7 +49,7 @@ const otherOnlineCount = computed(() => {
           >
             {{ $t("matchmaking.others.title") }}
             <span class="font-mono text-[0.6rem] ml-1 opacity-65 tabular-nums">
-              {{ otherOnlineCount }}
+              {{ othersCount }}
             </span>
           </TabsTrigger>
         </TabsList>
@@ -84,21 +60,16 @@ const otherOnlineCount = computed(() => {
         value="friends"
         class="mt-0 flex flex-1 flex-col overflow-y-auto min-h-0 px-3 data-[state=inactive]:hidden"
       >
-        <PlayersList :friends-only="true" />
+        <PlayersList />
       </TabsContent>
       <TabsContent
         value="online"
-        class="mt-0 flex flex-1 flex-col overflow-y-auto min-h-0 px-3 data-[state=inactive]:hidden"
+        class="mt-0 flex flex-1 flex-col min-h-0 px-3 data-[state=inactive]:hidden"
       >
-        <template v-if="otherOnlineCount > 0">
-          <PlayersList />
-        </template>
-        <template v-else>
-          <HubEmptyState
-            :title="$t('layouts.hub.empty.others_title')"
-            :description="$t('layouts.hub.empty.others_description')"
-          />
-        </template>
+        <HubEmptyState
+          :title="$t('layouts.hub.empty.others_title')"
+          :description="$t('layouts.hub.empty.others_description')"
+        />
       </TabsContent>
     </Tabs>
   </div>
diff --git a/components/matchmaking-lobby/PlayersList.vue b/components/matchmaking-lobby/PlayersList.vue
index 4f2dcf46f..8f850b0b8 100644
--- a/components/matchmaking-lobby/PlayersList.vue
+++ b/components/matchmaking-lobby/PlayersList.vue
@@ -49,7 +49,7 @@ const rowTransition = computed(() =>
           class="pl-8"
         />
       </div>
-      <div v-if="friendsOnly" class="flex shrink-0 items-center gap-0.5">
+      <div class="flex shrink-0 items-center gap-0.5">
         <!-- Steam friends who have never signed in here are still added, so
              this hides them without changing who gets synced. -->
         <Tooltip>
@@ -103,7 +103,7 @@ const rowTransition = computed(() =>
          goes, the leaving subtree is frozen mid-fold and the row rides the
          section shut instead of being torn down before its own leave. -->
     <div class="flex flex-1 flex-col">
-      <!-- Incoming friend requests (friends tab) -->
+      <!-- Incoming friend requests -->
       <Transition
         enter-active-class="friend-section-fold"
         enter-from-class="friend-section-fold-collapsed"
@@ -111,7 +111,7 @@ const rowTransition = computed(() =>
         leave-to-class="friend-section-fold-collapsed"
       >
       <section
-        v-if="friendsOnly && incomingRequests.length > 0"
+        v-if="incomingRequests.length > 0"
         class="grid grid-rows-[1fr]"
       >
         <div class="min-h-0">
@@ -185,7 +185,7 @@ const rowTransition = computed(() =>
       </section>
       </Transition>
 
-      <!-- Offline (friends tab only) -->
+      <!-- Offline -->
       <Transition
         enter-active-class="friend-section-fold"
         enter-from-class="friend-section-fold-collapsed"
@@ -193,7 +193,7 @@ const rowTransition = computed(() =>
         leave-to-class="friend-section-fold-collapsed"
       >
       <section
-        v-if="friendsOnly && filteredOfflinePlayers.length > 0"
+        v-if="filteredOfflinePlayers.length > 0"
         class="grid grid-rows-[1fr]"
       >
         <div class="min-h-0">
@@ -221,7 +221,7 @@ const rowTransition = computed(() =>
       </section>
       </Transition>
 
-      <!-- Sent requests (friends tab only) -->
+      <!-- Sent requests -->
       <Transition
         enter-active-class="friend-section-fold"
         enter-from-class="friend-section-fold-collapsed"
@@ -229,7 +229,7 @@ const rowTransition = computed(() =>
         leave-to-class="friend-section-fold-collapsed"
       >
       <section
-        v-if="friendsOnly && outgoingRequests.length > 0"
+        v-if="outgoingRequests.length > 0"
         class="grid grid-rows-[1fr]"
       >
         <div class="min-h-0">
@@ -268,16 +268,10 @@ const rowTransition = computed(() =>
           :title="
             searchQuery
               ? $t('layouts.hub.empty.no_match', { query: searchQuery })
-              : friendsOnly
-                ? $t('layouts.hub.empty.friends_title')
-                : $t('layouts.hub.empty.others_title')
+              : $t('layouts.hub.empty.friends_title')
           "
           :description="
-            searchQuery
-              ? null
-              : friendsOnly
-                ? $t('layouts.hub.empty.friends_description')
-                : $t('layouts.hub.empty.others_description')
+            searchQuery ? null : $t('layouts.hub.empty.friends_description')
           "
         />
       </Transition>
@@ -298,12 +292,6 @@ function matchesSearch(player: any, query: string) {
 }
 
 export default {
-  props: {
-    friendsOnly: {
-      type: Boolean,
-      default: false,
-    },
-  },
   data() {
     return {
       searchQuery: "",
@@ -317,9 +305,6 @@ export default {
     me() {
       return useAuthStore().me;
     },
-    onlinePlayers() {
-      return useMatchmakingStore().playersOnline;
-    },
     // Writable so the toggle drives the store's own ref, keeping both the
     // online and offline lists in step.
     registeredFriendsOnly: {
@@ -338,11 +323,9 @@ export default {
     },
     // Friends who came online since you last looked, marked for this visit.
     justOnlineIds(): Set<string> {
-      if (!this.friendsOnly) return new Set();
       return new Set(useFriendArrivals().visitArrivals.value);
     },
     incomingRequests(): any[] {
-      if (!this.friendsOnly) return [];
       return this.friends.filter(
         (f: any) =>
           f.status === "Pending" &&
@@ -351,7 +334,6 @@ export default {
       );
     },
     outgoingRequests(): any[] {
-      if (!this.friendsOnly) return [];
       return this.friends.filter(
         (f: any) =>
           f.status === "Pending" &&
@@ -359,58 +341,30 @@ export default {
           matchesSearch(f, this.searchQuery),
       );
     },
+    // Applied here rather than in the store: the shared friend lists also
+    // feed the hub badge and social panel, which have no such toggle.
     filteredOnlinePlayers() {
-      if (this.friendsOnly) {
-        // Applied here rather than in the store: the shared friend lists also
-        // feed the hub badge and social panel, which have no such toggle.
-        return this.onlineFriends.filter(
-          (p: any) =>
-            matchesSearch(p, this.searchQuery) &&
-            this.passesRegisteredFilter(p),
-        );
-      }
-
-      // Others tab: online players who aren't me and aren't an accepted friend
-      // or an incoming request. Outgoing requests STAY here so adding someone
-      // doesn't make them jump out of the list mid-action.
-      return this.onlinePlayers.filter((player: any) => {
-        if (String(player.steam_id) === String(this.me?.steam_id)) return false;
-
-        const entry = this.friends?.find(
-          (f: any) => String(f.steam_id) === String(player.steam_id),
-        );
-        if (entry) {
-          if (entry.status !== "Pending") return false;
-          const outgoing =
-            String(entry.invited_by_steam_id) === String(this.me?.steam_id);
-          if (!outgoing) return false;
-        }
-
-        return matchesSearch(player, this.searchQuery);
-      });
+      return this.onlineFriends.filter(
+        (p: any) =>
+          matchesSearch(p, this.searchQuery) && this.passesRegisteredFilter(p),
+      );
     },
     filteredOfflinePlayers() {
-      if (!this.friendsOnly) return [];
       return this.offlineFriends.filter(
         (p: any) =>
           matchesSearch(p, this.searchQuery) && this.passesRegisteredFilter(p),
       );
     },
     isEmpty(): boolean {
-      if (this.friendsOnly) {
-        return (
-          this.incomingRequests.length === 0 &&
-          this.filteredOnlinePlayers.length === 0 &&
-          this.filteredOfflinePlayers.length === 0 &&
-          this.outgoingRequests.length === 0
-        );
-      }
-      return this.filteredOnlinePlayers.length === 0;
+      return (
+        this.incomingRequests.length === 0 &&
+        this.filteredOnlinePlayers.length === 0 &&
+        this.filteredOfflinePlayers.length === 0 &&
+        this.outgoingRequests.length === 0
+      );
     },
     searchPlaceholder() {
-      return this.friendsOnly
-        ? this.$t("matchmaking.friends.search_placeholder")
-        : this.$t("player.search.placeholder");
+      return this.$t("matchmaking.friends.search_placeholder");
     },
   },
   methods: {
diff --git a/components/matchmaking/MatchmakingSettingsPanel.vue b/components/matchmaking/MatchmakingSettingsPanel.vue
index 3e0bab4e8..0d54d6168 100644
--- a/components/matchmaking/MatchmakingSettingsPanel.vue
+++ b/components/matchmaking/MatchmakingSettingsPanel.vue
@@ -38,6 +38,7 @@ const isPhone = useMediaQuery("(max-width: 767px)");
       :collision-padding="12"
       class="w-[min(92vw,520px)] p-4"
     >
+      <slot name="header" />
       <MatchmakingSettings>
         <slot name="extra" />
       </MatchmakingSettings>
@@ -56,6 +57,7 @@ const isPhone = useMediaQuery("(max-width: 767px)");
         <DrawerDescription class="sr-only">{{
           $t("pages.play.matchmaking.settings")
         }}</DrawerDescription>
+        <slot name="header" />
         <MatchmakingSettings>
           <slot name="extra" />
         </MatchmakingSettings>
diff --git a/components/play/PlayMatchmaking.vue b/components/play/PlayMatchmaking.vue
index 478e98eb7..df13310c2 100644
--- a/components/play/PlayMatchmaking.vue
+++ b/components/play/PlayMatchmaking.vue
@@ -395,9 +395,7 @@ const searchInQueue = computed(
 
 const canControl = computed(() => !isMember.value);
 
-const playersOnline = computed(
-  () => (matchmaking.playersOnline as unknown[]).length,
-);
+const playersOnline = computed(() => matchmaking.onlineCount as number);
 
 function openParty() {
   setActiveHub("lobby");
diff --git a/graphql/messageRequests.ts b/graphql/messageRequests.ts
index 7a1cfe39c..abdc77a04 100644
--- a/graphql/messageRequests.ts
+++ b/graphql/messageRequests.ts
@@ -23,15 +23,3 @@ export const SET_MESSAGE_REQUESTS_SETTING_MUTATION = gql`
     }
   }
 `;
-
-// Who among these players takes message requests from non-friends, for the
-// Message buttons in the online list. Its own document so an api without the
-// column only loses this, not the list.
-export const PLAYERS_MESSAGE_REQUESTS_QUERY = gql`
-  query PlayersMessageRequests($steamIds: [bigint!]!) {
-    players(where: { steam_id: { _in: $steamIds } }) {
-      steam_id
-      allow_message_requests
-    }
-  }
-`;
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 5a84897f1..d6ca17c7a 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -8565,6 +8565,7 @@
       "regions": "Server regions",
       "ping_by_region": "Ping by region",
       "online_count": "{online}/{total} online",
+      "players_online": "{count} online",
       "partial": "Partial",
       "preferred": "Preferred region",
       "skips_over": "Matchmaking skips regions over {ms} ms.",
diff --git a/layouts/components/OnlinePlayers.vue b/layouts/components/OnlinePlayers.vue
index 42217e72a..c0718f1a1 100644
--- a/layouts/components/OnlinePlayers.vue
+++ b/layouts/components/OnlinePlayers.vue
@@ -7,9 +7,7 @@ import { computed } from "vue";
 
 const { setRightSidebarOpen, rightSidebarOpen } = useRightSidebar();
 const matchmakingStore = useMatchmakingStore();
-const playersOnlineCount = computed(
-  () => matchmakingStore.playersOnline.length,
-);
+const playersOnlineCount = computed(() => matchmakingStore.onlineCount);
 </script>
 
 <template>
diff --git a/layouts/components/SystemStatus.vue b/layouts/components/SystemStatus.vue
index 393be9542..0e48fc836 100644
--- a/layouts/components/SystemStatus.vue
+++ b/layouts/components/SystemStatus.vue
@@ -12,6 +12,7 @@ import MatchmakingSettingsPanel from "~/components/matchmaking/MatchmakingSettin
 import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
 import { useMatchmakingStore } from "~/stores/MatchmakingStore";
 import { useAuthStore } from "~/stores/AuthStore";
+import { e_player_roles_enum } from "~/generated/zeus";
 
 type Tone = "ok" | "warn" | "bad";
 
@@ -29,6 +30,12 @@ const toneText: Record<Tone, string> = {
 const statusTone = (status: string): Tone =>
   status === "Online" ? "ok" : status === "Offline" ? "bad" : "warn";
 
+// Admins also see how many players are online across the instance.
+const isAdmin = computed(() =>
+  authStore.isRoleAbove(e_player_roles_enum.administrator),
+);
+const playersOnline = computed(() => matchmaking.onlineCount);
+
 // Guests never run the latency probe, so they get status only.
 const canMeasure = computed(() => !!authStore.me?.steam_id);
 
@@ -80,12 +87,30 @@ const statusLabel = computed(() =>
     <template #trigger>
       <button
         type="button"
-        class="inline-flex h-8 w-8 shrink-0 animate-in fade-in-0 items-center justify-center rounded-md transition-colors duration-150 [animation-duration:240ms] focus-visible:bg-[hsl(var(--tac-amber)/0.08)] focus-visible:outline-none data-[state=open]:bg-[hsl(var(--tac-amber)/0.1)]"
+        class="inline-flex h-8 shrink-0 animate-in fade-in-0 items-center justify-center rounded-md transition-colors duration-150 [animation-duration:240ms] focus-visible:bg-[hsl(var(--tac-amber)/0.08)] focus-visible:outline-none data-[state=open]:bg-[hsl(var(--tac-amber)/0.1)]"
+        :class="isAdmin ? 'gap-1 px-1.5' : 'w-8'"
         :aria-label="statusLabel"
       >
         <Globe class="h-4 w-4" :class="toneText[overallTone]" />
+        <span
+          v-if="isAdmin"
+          data-testid="players-online-count"
+          class="font-mono text-[0.7rem] tabular-nums text-muted-foreground"
+        >
+          {{ playersOnline }}
+        </span>
       </button>
     </template>
+    <template v-if="isAdmin" #header>
+      <p
+        data-testid="players-online-line"
+        class="mb-3 font-mono text-[0.7rem] uppercase tracking-[0.12em] tabular-nums text-muted-foreground"
+      >
+        {{
+          $t("layouts.system_status.players_online", { count: playersOnline })
+        }}
+      </p>
+    </template>
     <template #extra>
       <FormSection
         v-if="statusRegions.length"
@@ -155,10 +180,18 @@ const statusLabel = computed(() =>
     <PopoverTrigger as-child>
       <button
         type="button"
-        class="inline-flex h-8 w-8 shrink-0 animate-in fade-in-0 items-center justify-center rounded-md transition-colors duration-150 [animation-duration:240ms] focus-visible:bg-[hsl(var(--tac-amber)/0.08)] focus-visible:outline-none data-[state=open]:bg-[hsl(var(--tac-amber)/0.1)]"
+        class="inline-flex h-8 shrink-0 animate-in fade-in-0 items-center justify-center rounded-md transition-colors duration-150 [animation-duration:240ms] focus-visible:bg-[hsl(var(--tac-amber)/0.08)] focus-visible:outline-none data-[state=open]:bg-[hsl(var(--tac-amber)/0.1)]"
+        :class="isAdmin ? 'gap-1 px-1.5' : 'w-8'"
         :aria-label="statusLabel"
       >
         <Globe class="h-4 w-4" :class="toneText[overallTone]" />
+        <span
+          v-if="isAdmin"
+          data-testid="players-online-count"
+          class="font-mono text-[0.7rem] tabular-nums text-muted-foreground"
+        >
+          {{ playersOnline }}
+        </span>
       </button>
     </PopoverTrigger>
 
@@ -168,6 +201,15 @@ const statusLabel = computed(() =>
       :collision-padding="12"
       class="w-[320px] max-w-[calc(100vw-1.5rem)] space-y-4"
     >
+      <p
+        v-if="isAdmin"
+        data-testid="players-online-line"
+        class="font-mono text-[0.7rem] uppercase tracking-[0.12em] tabular-nums text-muted-foreground"
+      >
+        {{
+          $t("layouts.system_status.players_online", { count: playersOnline })
+        }}
+      </p>
       <FormSection
         v-if="statusRegions.length"
         :title="$t('layouts.system_status.regions')"
diff --git a/pages/players/index.vue b/pages/players/index.vue
index 400e41a1c..1035411e3 100644
--- a/pages/players/index.vue
+++ b/pages/players/index.vue
@@ -287,7 +287,6 @@ const { isMobile } = useSidebar();
               v-model="onlyPlayedMatches"
               :label="$t('pages.players.played_matches')"
             />
-            <FilterToggle v-model="onlyOnline" :label="$t('common.online')" />
             <FilterToggle
               v-if="supportsTwitch"
               v-model="onlyLiveOnTwitch"
@@ -637,7 +636,6 @@ export default {
       sortDirection: this.loadFiltersFromStorage().sortDirection || "asc",
       onlyPlayedMatches:
         this.loadFiltersFromStorage().onlyPlayedMatches || false,
-      onlyOnline: this.loadFiltersFromStorage().onlyOnline || false,
       onlyLiveOnTwitch:
         this.loadFiltersFromStorage().onlyLiveOnTwitch || false,
       twitchLive: useTwitchLiveSteamIds(),
@@ -710,12 +708,6 @@ export default {
     canViewAdditionalDetails() {
       return useAuthStore().isRoleAbove(e_player_roles_enum.match_organizer);
     },
-    onlinePlayerSteamIds() {
-      return useMatchmakingStore().onlinePlayerSteamIds as string[];
-    },
-    presenceLoaded() {
-      return useMatchmakingStore().presenceLoaded as boolean;
-    },
     supportsTwitch() {
       return useApplicationSettingsStore().supportsTwitch;
     },
@@ -822,16 +814,6 @@ export default {
           },
         });
       }
-      if (this.onlyOnline) {
-        chips.push({
-          id: "online",
-          label: this.$t("common.online"),
-          value: "yes",
-          clear: () => {
-            this.onlyOnline = false;
-          },
-        });
-      }
       if (this.liveOnTwitchFilter) {
         chips.push({
           id: "live-on-twitch",
@@ -956,10 +938,6 @@ export default {
       this.resetPage();
       this.onFilterChange();
     },
-    onlyOnline() {
-      this.resetPage();
-      this.onFilterChange();
-    },
     onlyRegistered() {
       this.resetPage();
       this.onFilterChange();
@@ -979,21 +957,6 @@ export default {
         this.queueSearch();
       }
     },
-    // Presence is pushed in live, so a player going on or offline has to
-    // re-run the search while the filter is on. Deliberately not
-    // onFilterChange(): that resets to page 1, and someone anywhere on the
-    // instance connecting would yank you back to the top of the list.
-    onlinePlayerSteamIds() {
-      if (this.onlyOnline) {
-        this.queueSearch();
-      }
-    },
-    // The first presence payload is what makes the filter applicable at all.
-    presenceLoaded() {
-      if (this.onlyOnline) {
-        this.queueSearch();
-      }
-    },
     sortField(value: string) {
       // The server forces the registered filter for this sort -- an unregistered
       // player has no sign-in to order by. Reflect it in the toggle and chip
@@ -1058,7 +1021,6 @@ export default {
         isMuted: false,
       });
       this.onlyPlayedMatches = false;
-      this.onlyOnline = false;
       this.onlyLiveOnTwitch = false;
       this.onlyRegistered = false;
       this.sortField = "name";
@@ -1118,7 +1080,6 @@ export default {
             isGagged: this.form.values.isGagged,
             isMuted: this.form.values.isMuted,
             onlyPlayedMatches: this.onlyPlayedMatches,
-            onlyOnline: this.onlyOnline,
             onlyLiveOnTwitch: this.onlyLiveOnTwitch,
             onlyRegistered: this.onlyRegistered,
             sortField: this.sortField,
@@ -1252,13 +1213,6 @@ export default {
                 : undefined,
             only_played_matches: this.onlyPlayedMatches,
             registeredOnly: this.onlyRegistered || undefined,
-            // Held back until presence has actually arrived. Sending an empty
-            // roster means "nobody is online" and returns nothing, which on a
-            // reload is indistinguishable from a broken filter.
-            online_steam_ids:
-              this.onlyOnline && this.presenceLoaded
-                ? this.onlinePlayerSteamIds
-                : undefined,
             live_steam_ids:
               this.liveOnTwitchFilter && this.twitchLive.loaded
                 ? this.twitchLive.steamIds
diff --git a/stores/MatchmakingStore.ts b/stores/MatchmakingStore.ts
index b6b24b7a8..aa5597977 100644
--- a/stores/MatchmakingStore.ts
+++ b/stores/MatchmakingStore.ts
@@ -1,21 +1,21 @@
-import { ref, watch, computed } from "vue";
+import { ref, shallowRef, watch, computed } from "vue";
 import { defineStore, acceptHMRUpdate } from "pinia";
 import { useSubscriptionManager } from "~/composables/useSubscriptionManager";
 import { e_match_types_enum, $ } from "~/generated/zeus";
 import getGraphqlClient from "~/graphql/getGraphqlClient";
-import { PLAYERS_MESSAGE_REQUESTS_QUERY } from "~/graphql/messageRequests";
 import {
   MY_FRIENDS_ROW_STATE_SUBSCRIPTION,
   MY_FRIENDS_SUBSCRIPTION,
 } from "~/graphql/myFriends";
 import { schemaHasField } from "~/utilities/schemaHasType";
-import { generateQuery, generateSubscription } from "~/graphql/graphqlGen";
+import { generateSubscription } from "~/graphql/graphqlGen";
 import { playerFields } from "~/graphql/playerFields";
 import debounce from "~/utilities/debounce";
 import { isInCs2 } from "~/utilities/cs2Presence";
 import type { RegionStats } from "~/utilities/matchmakingPartySize";
 import { typedGql } from "~/generated/zeus/typedDocumentNode";
 import { setActiveHub } from "~/composables/useHubState";
+import socket from "~/web-sockets/Socket";
 
 const REGION_LATENCY_PREFIX = "5stack_region_latency_";
 const MAX_LATENCY_KEY = "5stack_max_acceptable_latency";
@@ -36,12 +36,14 @@ function safeParseLocalStorage<T>(key: string): T | null {
 }
 
 export const useMatchmakingStore = defineStore("matchmaking", () => {
-  const playersOnline = ref([]);
+  // Who among my friends is online, plus me. The api no longer sends who else
+  // is: a roster of everyone online sent to every tab doesn't scale.
   const onlinePlayerSteamIds = ref<string[]>([]);
+  const onlineCount = ref(0);
 
-  // Whether the players-online event has landed at least once. Before it does,
-  // an empty roster is indistinguishable from nobody being online, and callers
-  // that filter on presence have to tell those two apart.
+  // Whether presence has landed at least once. Before it does, an empty list
+  // is indistinguishable from nobody being online, and callers that filter on
+  // presence have to tell those two apart.
   const presenceLoaded = ref(false);
 
   const joinedMatchmakingQueues = ref<{
@@ -67,116 +69,69 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
 
   const regionStats = ref<RegionStats>({});
 
-  // Presence arrives as a full roster on every change, so asking for the whole
-  // roster each time meant one player connecting re-ran elo and the three
-  // sanction checks for everyone online, in every open tab. A profile doesn't
-  // change while its player sits in the list, so keep the ones already
-  // fetched and only ask the API for steam ids never seen before.
-  const profiles = new Map<string, any>();
-  // Every steam id already asked for, found or not: the api broadcasts the
-  // roster to every tab whenever anyone connects, so asking again for ids the
-  // api didn't return re-ran these queries in every tab on every broadcast.
-  const askedSteamIds = new Set<string>();
-  const MAX_ASKED_STEAM_IDS = 5000;
-
-  const rebuildPlayersOnline = () => {
-    playersOnline.value = onlinePlayerSteamIds.value
-      .map((steamId) => profiles.get(String(steamId)))
-      .filter(Boolean) as any;
-  };
-
-  const queryPlayers = async () => {
-    const steamIds = onlinePlayerSteamIds.value;
+  // An api from before friends presence only sends the roster of everyone
+  // online; until it sends anything newer, that roster is used as before.
+  let friendsPresenceFromApi = false;
+  const FRIENDS_RESYNC_MS = 5 * 60 * 1000;
+  let friendsResync: ReturnType<typeof setTimeout> | undefined;
 
-    if (askedSteamIds.size > MAX_ASKED_STEAM_IDS) {
-      askedSteamIds.clear();
-      profiles.clear();
-    }
-
-    const missing = steamIds.filter(
-      (steamId) => !askedSteamIds.has(String(steamId)),
-    );
+  const sendFriendsOnlineRequest = shallowRef(() => {
+    socket.event("friends-online", {});
+  });
 
-    // Players only left, or they are all already known -- no round trip, but
-    // the list still has to drop whoever went offline.
-    if (missing.length === 0) {
-      rebuildPlayersOnline();
-      return;
-    }
+  const withMe = (steamIds: Array<string>) => {
+    const me = useAuthStore().me?.steam_id;
+    const ids = steamIds.map(String);
+    return me && !ids.includes(String(me)) ? [...ids, String(me)] : ids;
+  };
 
-    for (const steamId of missing) {
-      askedSteamIds.add(String(steamId));
-    }
+  const setFriendsOnline = (steamIds: Array<string>) => {
+    friendsPresenceFromApi = true;
+    onlinePlayerSteamIds.value = withMe(steamIds);
+    presenceLoaded.value = true;
 
-    let data: any;
-    try {
-      ({ data } = await getGraphqlClient().query({
-        query: generateQuery({
-          players: [
-            {
-              where: {
-                steam_id: {
-                  _in: $("steam_ids", "[bigint]!"),
-                },
-              },
-            },
-            playerFields,
-          ],
-        }),
-        variables: {
-          steam_ids: missing,
-        },
-      }));
-    } catch (error) {
-      for (const steamId of missing) {
-        askedSteamIds.delete(String(steamId));
+    clearTimeout(friendsResync);
+    friendsResync = setTimeout(() => {
+      if (useAuthStore().me) {
+        sendFriendsOnlineRequest.value();
       }
-      throw error;
-    }
+    }, FRIENDS_RESYNC_MS);
+  };
 
-    for (const player of data.players) {
-      profiles.set(String(player.steam_id), player);
+  const setFriendPresence = ({
+    steam_id,
+    online,
+  }: {
+    steam_id: string;
+    online: boolean;
+  }) => {
+    friendsPresenceFromApi = true;
+    const steamId = String(steam_id);
+    const present = onlinePlayerSteamIds.value.includes(steamId);
+
+    if (online && !present) {
+      onlinePlayerSteamIds.value = [...onlinePlayerSteamIds.value, steamId];
+    } else if (!online && present) {
+      onlinePlayerSteamIds.value = onlinePlayerSteamIds.value.filter(
+        (id) => id !== steamId,
+      );
     }
-
-    rebuildPlayersOnline();
-
-    void loadMessageRequestSettings(missing);
   };
 
-  // Whether each newly seen player takes message requests, folded into their
-  // profile so the online list can grey out Message for those who do not.
-  // Optional: unknown just leaves the button enabled and the server decides.
-  const loadMessageRequestSettings = async (steamIds: Array<string>) => {
-    try {
-      const { data } = await getGraphqlClient().query({
-        query: PLAYERS_MESSAGE_REQUESTS_QUERY,
-        variables: { steamIds },
-        context: { optional: true },
-      });
-
-      for (const row of data?.players ?? []) {
-        const profile = profiles.get(String(row.steam_id));
-
-        if (profile) {
-          profiles.set(String(row.steam_id), {
-            ...profile,
-            allow_message_requests: row.allow_message_requests,
-          });
-        }
-      }
+  const setOnlineCount = (count: number) => {
+    friendsPresenceFromApi = true;
+    onlineCount.value = Number(count) || 0;
+  };
 
-      rebuildPlayersOnline();
-    } catch {
-      // An api from before message requests: nothing to fold in.
+  const setLegacyRoster = (steamIds: Array<string>) => {
+    if (friendsPresenceFromApi) {
+      return;
     }
+    onlinePlayerSteamIds.value = steamIds.map(String);
+    onlineCount.value = steamIds.length;
+    presenceLoaded.value = true;
   };
 
-  // Presence churns in bursts -- a match ending drops ten players at once, and
-  // each drop is its own roster push.
-  const queryPlayersDebounced = debounce(() => {
-    void queryPlayers();
-  }, 250);
-
   const friends = ref([]);
   const lobbies = ref([]);
   const friendsLoaded = ref(false);
@@ -301,15 +256,23 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
     );
   };
 
+  // A new friend, or one removed, changes who the api would count as online
+  // for me. Not on the first load: the api sends that when the socket opens.
+  let friendSteamIds: string | undefined;
+
   watch(
     () => useAuthStore().me?.steam_id,
     (steamId) => {
       friendsLoaded.value = false;
       lobbiesLoaded.value = false;
+      friendSteamIds = undefined;
       if (steamId) {
         subscribeToFriends(steamId);
         subscribeToLobbies(steamId);
       } else {
+        onlinePlayerSteamIds.value = [];
+        presenceLoaded.value = false;
+        clearTimeout(friendsResync);
         const { unsubscribe } = useSubscriptionManager();
         unsubscribe("matchmaking:friends");
         unsubscribe("matchmaking:lobbies");
@@ -318,13 +281,19 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
     { immediate: true },
   );
 
-  watch(onlinePlayerSteamIds, (newSteamIds, oldSteamIds) => {
-    if (
-      newSteamIds.length !== oldSteamIds.length ||
-      !newSteamIds.every((id, index) => id === oldSteamIds[index])
-    ) {
-      queryPlayersDebounced();
+  const requestFriendsOnline = debounce(() => {
+    sendFriendsOnlineRequest.value();
+  }, 500);
+  watch(friends, (rows: Array<any>) => {
+    const next = (rows ?? [])
+      .map((friend) => String(friend.steam_id))
+      .sort()
+      .join(",");
+
+    if (friendSteamIds !== undefined && next !== friendSteamIds) {
+      requestFriendsOnline();
     }
+    friendSteamIds = next;
   });
 
   const creatingLobby = ref(false);
@@ -769,9 +738,14 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
     lobbiesLoaded,
     currentLobby,
     regionStats,
-    playersOnline,
     onlinePlayerSteamIds,
+    onlineCount,
     presenceLoaded,
+    setFriendsOnline,
+    setFriendPresence,
+    setOnlineCount,
+    setLegacyRoster,
+    sendFriendsOnlineRequest,
     joinedMatchmakingQueues,
 
     checkLatenies,
diff --git a/stores/SearchStore.ts b/stores/SearchStore.ts
index f706c58fa..5df528f0a 100644
--- a/stores/SearchStore.ts
+++ b/stores/SearchStore.ts
@@ -7,8 +7,9 @@ export const useSearchStore = defineStore("searchStore", () => {
 
   let miniSearch: MiniSearch;
 
+  // Online now means online friends, so searching everyone is the default.
   const onlineOnly = ref<boolean>(
-    localStorage.getItem("playerSearchOnlineOnly") !== "false",
+    localStorage.getItem("playerSearchOnlineOnly") === "true",
   );
 
   // Off by default: searching an unregistered Steam account is the point of
@@ -21,25 +22,10 @@ export const useSearchStore = defineStore("searchStore", () => {
     const onlineIds = new Set(
       matchMakingStore.onlinePlayerSteamIds as string[],
     );
-    const merged = new Map<string, any>();
 
-    for (const player of matchMakingStore.playersOnline as any[]) {
-      if (player?.steam_id && onlineIds.has(player.steam_id)) {
-        merged.set(player.steam_id, player);
-      }
-    }
-
-    for (const friend of (matchMakingStore.friends as any[]) || []) {
-      if (
-        friend?.steam_id &&
-        onlineIds.has(friend.steam_id) &&
-        !merged.has(friend.steam_id)
-      ) {
-        merged.set(friend.steam_id, friend);
-      }
-    }
-
-    return Array.from(merged.values());
+    return ((matchMakingStore.friends as any[]) || []).filter(
+      (friend) => friend?.steam_id && onlineIds.has(String(friend.steam_id)),
+    );
   });
 
   watch(
diff --git a/tests/components/hub/SocialPanelOthers.spec.ts b/tests/components/hub/SocialPanelOthers.spec.ts
new file mode 100644
index 000000000..a5a35dc55
--- /dev/null
+++ b/tests/components/hub/SocialPanelOthers.spec.ts
@@ -0,0 +1,29 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { flushPromises } from "@vue/test-utils";
+import { mountSuspended } from "@nuxt/test-utils/runtime";
+import SocialPanel from "~/components/hub/SocialPanel.vue";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+
+let unmount: (() => void) | undefined;
+
+afterEach(() => {
+  unmount?.();
+  unmount = undefined;
+});
+
+describe("the social panel's Others tab", () => {
+  it("counts everyone online from the api's count, with no roster", async () => {
+    useMatchmakingStore().setOnlineCount(17);
+
+    const wrapper = await mountSuspended(SocialPanel, {
+      global: { stubs: { PlayersList: true } },
+    });
+    unmount = () => wrapper.unmount();
+    await flushPromises();
+
+    const others = wrapper
+      .findAll('[role="tab"]')
+      .find((tab) => tab.text().includes("Others"));
+    expect(others?.text()).toContain("17");
+  });
+});
diff --git a/tests/layouts/components/SystemStatusOnlineCount.spec.ts b/tests/layouts/components/SystemStatusOnlineCount.spec.ts
new file mode 100644
index 000000000..7cec589ef
--- /dev/null
+++ b/tests/layouts/components/SystemStatusOnlineCount.spec.ts
@@ -0,0 +1,61 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { flushPromises } from "@vue/test-utils";
+import { mountSuspended } from "@nuxt/test-utils/runtime";
+import SystemStatus from "~/layouts/components/SystemStatus.vue";
+import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useAuthStore } from "~/stores/AuthStore";
+import { e_player_roles_enum } from "~/generated/zeus";
+
+let unmount: (() => void) | undefined;
+
+afterEach(() => {
+  unmount?.();
+  unmount = undefined;
+  useAuthStore().me = undefined;
+});
+
+async function mountAs(role: e_player_roles_enum) {
+  useAuthStore().me = {
+    steam_id: "76561198000000401",
+    name: "Viewer",
+    role,
+  } as any;
+  useApplicationSettingsStore().availableRegions = [
+    { value: "US", description: "US", status: "Online" },
+  ] as any;
+  useMatchmakingStore().setOnlineCount(42);
+
+  const wrapper = await mountSuspended(SystemStatus, {
+    attachTo: document.body,
+  });
+  unmount = () => wrapper.unmount();
+  await flushPromises();
+  return wrapper;
+}
+
+describe("the online count on the status globe", () => {
+  it("shows an administrator how many players are online", async () => {
+    const wrapper = await mountAs(e_player_roles_enum.administrator);
+
+    expect(wrapper.get('[data-testid="players-online-count"]').text()).toBe(
+      "42",
+    );
+
+    await wrapper.get("button").trigger("click");
+    await flushPromises();
+
+    expect(
+      document.body.querySelector('[data-testid="players-online-line"]')
+        ?.textContent,
+    ).toContain("42 online");
+  });
+
+  it("shows a player no online count", async () => {
+    const wrapper = await mountAs(e_player_roles_enum.user);
+
+    expect(wrapper.find('[data-testid="players-online-count"]').exists()).toBe(
+      false,
+    );
+  });
+});
diff --git a/tests/pages/players/playersTwitch.spec.ts b/tests/pages/players/playersTwitch.spec.ts
index f40f94d2d..4995ab786 100644
--- a/tests/pages/players/playersTwitch.spec.ts
+++ b/tests/pages/players/playersTwitch.spec.ts
@@ -89,7 +89,7 @@ describe("players page, Live on Twitch", () => {
     expect(lastSearch().live_steam_ids).toBeUndefined();
   });
 
-  it("offers the filter next to Online", async () => {
+  it("offers the filter next to Played matches", async () => {
     const wrapper = await mountPage();
     (wrapper.vm as any).filtersPopoverOpen = true;
     await flushPromises();
@@ -97,8 +97,9 @@ describe("players page, Live on Twitch", () => {
     const labels = wrapper
       .findAllComponents(FilterToggle)
       .map((toggle) => toggle.props("label"));
+    expect(labels).not.toContain("Online");
     expect(labels.indexOf("Live on Twitch")).toBe(
-      labels.indexOf("Online") + 1,
+      labels.indexOf("Played Matches") + 1,
     );
   });
 
@@ -107,9 +108,7 @@ describe("players page, Live on Twitch", () => {
     const before = searches().length;
 
     (wrapper.vm as any).onlyLiveOnTwitch = true;
-    await vi.waitFor(() =>
-      expect(searches().length).toBeGreaterThan(before),
-    );
+    await vi.waitFor(() => expect(searches().length).toBeGreaterThan(before));
 
     expect(lastSearch().live_steam_ids).toEqual([LIVE]);
     expect(
@@ -123,9 +122,7 @@ describe("players page, Live on Twitch", () => {
   it("searches again by itself when someone goes live", async () => {
     const wrapper = await mountPage();
     (wrapper.vm as any).onlyLiveOnTwitch = true;
-    await vi.waitFor(() =>
-      expect(lastSearch().live_steam_ids).toEqual([LIVE]),
-    );
+    await vi.waitFor(() => expect(lastSearch().live_steam_ids).toEqual([LIVE]));
 
     (wrapper.vm as any).twitchLive.steamIds = [LIVE, LATER];
     await vi.waitFor(() =>
diff --git a/tests/stores/friendsPresence.spec.ts b/tests/stores/friendsPresence.spec.ts
new file mode 100644
index 000000000..b339b4c9c
--- /dev/null
+++ b/tests/stores/friendsPresence.spec.ts
@@ -0,0 +1,158 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { nextTick } from "vue";
+import { createPinia, setActivePinia } from "pinia";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useAuthStore } from "~/stores/AuthStore";
+import { e_player_roles_enum } from "~/generated/zeus";
+
+vi.mock("~/web-sockets/Socket", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("~/web-sockets/Socket")>()),
+  default: {
+    connect() {},
+    rejoinAll() {},
+    event() {},
+    listen: () => ({ stop() {} }),
+    joinLobby: () => ({ messages: [], on() {}, leave() {} }),
+    markLobbyRead() {},
+  },
+}));
+
+const ME = "76561198000000301";
+const ALPHA = "76561198000000302";
+const BRAVO = "76561198000000303";
+const CHARLIE = "76561198000000304";
+
+let requests = 0;
+
+function freshStore() {
+  setActivePinia(createPinia());
+  const store = useMatchmakingStore();
+  store.sendFriendsOnlineRequest = () => {
+    requests++;
+  };
+  return store;
+}
+
+const signIn = () => {
+  useAuthStore().me = {
+    steam_id: ME,
+    role: e_player_roles_enum.user,
+  } as any;
+};
+
+beforeEach(() => {
+  requests = 0;
+  const client = useApollo().clients!.default;
+  vi.spyOn(client, "query").mockResolvedValue({
+    data: { __type: { fields: [] } },
+  } as any);
+  vi.spyOn(client, "subscribe").mockImplementation(
+    () =>
+      ({
+        subscribe: () => ({ unsubscribe() {}, closed: false }),
+      }) as any,
+  );
+});
+
+afterEach(() => {
+  vi.useRealTimers();
+  vi.restoreAllMocks();
+});
+
+describe("friends' presence from the api", () => {
+  it("takes who is online from friends-online, with me in it", async () => {
+    const store = freshStore();
+    signIn();
+    await nextTick();
+
+    store.setFriendsOnline([ALPHA, BRAVO]);
+    expect(store.onlinePlayerSteamIds).toEqual([ALPHA, BRAVO, ME]);
+    expect(store.presenceLoaded).toBe(true);
+
+    store.setFriendsOnline([BRAVO]);
+    expect(store.onlinePlayerSteamIds).toEqual([BRAVO, ME]);
+  });
+
+  it("adds and drops a friend on friend-presence", () => {
+    const store = freshStore();
+
+    store.setFriendsOnline([ALPHA]);
+    store.setFriendPresence({ steam_id: BRAVO, online: true });
+    store.setFriendPresence({ steam_id: BRAVO, online: true });
+    store.setFriendPresence({ steam_id: ALPHA, online: false });
+
+    expect(store.onlinePlayerSteamIds).toEqual([BRAVO]);
+  });
+
+  it("takes the online count from players-online:count", () => {
+    const store = freshStore();
+
+    store.setOnlineCount(1234);
+
+    expect(store.onlineCount).toBe(1234);
+  });
+
+  it("uses the full roster only from an api that sends nothing newer", () => {
+    const store = freshStore();
+
+    store.setLegacyRoster([ALPHA, BRAVO, CHARLIE]);
+    expect(store.onlinePlayerSteamIds).toEqual([ALPHA, BRAVO, CHARLIE]);
+    expect(store.onlineCount).toBe(3);
+
+    store.setOnlineCount(7);
+    store.setFriendsOnline([ALPHA]);
+    store.setLegacyRoster([CHARLIE]);
+
+    expect(store.onlinePlayerSteamIds).toEqual([ALPHA]);
+    expect(store.onlineCount).toBe(7);
+  });
+
+  it("asks again when the friends list changes, not on its first load", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "Date"] });
+    const store = freshStore();
+
+    store.friends = [{ steam_id: ALPHA }] as any;
+    await nextTick();
+    await vi.advanceTimersByTimeAsync(600);
+    expect(requests).toBe(0);
+
+    store.friends = [{ steam_id: ALPHA }, { steam_id: BRAVO }] as any;
+    await nextTick();
+    await vi.advanceTimersByTimeAsync(600);
+    expect(requests).toBe(1);
+
+    store.friends = [{ steam_id: BRAVO }, { steam_id: ALPHA }] as any;
+    await nextTick();
+    await vi.advanceTimersByTimeAsync(600);
+    expect(requests).toBe(1);
+  });
+
+  it("asks again five minutes after the last answer", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "Date"] });
+    const store = freshStore();
+    signIn();
+    await nextTick();
+
+    store.setFriendsOnline([ALPHA]);
+    await vi.advanceTimersByTimeAsync(4 * 60 * 1000);
+    store.setFriendsOnline([ALPHA]);
+    await vi.advanceTimersByTimeAsync(4 * 60 * 1000);
+    expect(requests).toBe(0);
+
+    await vi.advanceTimersByTimeAsync(60 * 1000);
+    expect(requests).toBe(1);
+  });
+
+  it("forgets who is online when signing out", async () => {
+    const store = freshStore();
+    signIn();
+    await nextTick();
+    store.setFriendsOnline([ALPHA]);
+
+    useAuthStore().me = undefined;
+    await nextTick();
+
+    expect(store.onlinePlayerSteamIds).toEqual([]);
+    expect(store.presenceLoaded).toBe(false);
+  });
+});
diff --git a/tests/stores/onlineRosterAsksOnce.spec.ts b/tests/stores/onlineRosterAsksOnce.spec.ts
deleted file mode 100644
index a97ead62d..000000000
--- a/tests/stores/onlineRosterAsksOnce.spec.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { print } from "graphql";
-import { flushPromises } from "@vue/test-utils";
-import { useMatchmakingStore } from "~/stores/MatchmakingStore";
-
-vi.mock("~/web-sockets/Socket", async (importOriginal) => ({
-  ...(await importOriginal<typeof import("~/web-sockets/Socket")>()),
-  default: {
-    connect() {},
-    rejoinAll() {},
-    listen: () => ({ stop() {} }),
-    joinLobby: () => ({ messages: [], on() {}, leave() {} }),
-    markLobbyRead() {},
-  },
-}));
-
-const ALPHA = "76561198000000101";
-const BRAVO = "76561198000000102";
-const CHARLIE = "76561198000000103";
-const UNKNOWN = "76561198000000199";
-const DELTA = "76561198000000104";
-const ECHO = "76561198000000105";
-const KNOWN = new Set([ALPHA, BRAVO, CHARLIE, DELTA, ECHO]);
-let failNextPlayers = false;
-
-let asked: Array<{ kind: "players" | "message_requests"; ids: string[] }> = [];
-
-beforeEach(() => {
-  const client = useApollo().clients!.default;
-  vi.spyOn(client, "query").mockImplementation((async (options: any) => {
-    const document = print(options.query);
-    if (/allow_message_requests/.test(document)) {
-      asked.push({
-        kind: "message_requests",
-        ids: options.variables.steamIds.map(String),
-      });
-      return { data: { players: [] } };
-    }
-    if (options.variables?.steam_ids) {
-      const ids = options.variables.steam_ids.map(String);
-      if (failNextPlayers) {
-        failNextPlayers = false;
-        throw new Error("offline");
-      }
-      asked.push({ kind: "players", ids });
-      return {
-        data: {
-          players: ids
-            .filter((id: string) => KNOWN.has(id))
-            .map((steam_id: string) => ({ steam_id, name: steam_id })),
-        },
-      };
-    }
-    return { data: { __type: { fields: [] } } };
-  }) as any);
-});
-
-afterEach(() => {
-  asked = [];
-  vi.restoreAllMocks();
-});
-
-async function roster(
-  store: ReturnType<typeof useMatchmakingStore>,
-  ids: string[],
-) {
-  store.onlinePlayerSteamIds = ids;
-  await new Promise((resolve) => setTimeout(resolve, 300));
-  await flushPromises();
-}
-
-describe("the online roster", () => {
-  it("asks about each player once, however often the roster is broadcast", async () => {
-    const store = useMatchmakingStore();
-
-    await roster(store, [ALPHA, BRAVO, UNKNOWN]);
-    await roster(store, [UNKNOWN, BRAVO, ALPHA]);
-    await roster(store, [ALPHA, UNKNOWN]);
-    await roster(store, [ALPHA, BRAVO, UNKNOWN]);
-    await roster(store, [ALPHA, BRAVO, UNKNOWN, CHARLIE]);
-
-    expect(asked.filter((a) => a.kind === "players")).toEqual([
-      { kind: "players", ids: [ALPHA, BRAVO, UNKNOWN] },
-      { kind: "players", ids: [CHARLIE] },
-    ]);
-    expect(asked.filter((a) => a.kind === "message_requests")).toHaveLength(2);
-    expect(store.playersOnline.map((p: any) => p.steam_id)).toEqual([
-      ALPHA,
-      BRAVO,
-      CHARLIE,
-    ]);
-  });
-
-  it("asks again for players whose lookup failed", async () => {
-    const store = useMatchmakingStore();
-    failNextPlayers = true;
-    const unhandled = vi.fn();
-    process.on("unhandledRejection", unhandled);
-
-    await roster(store, [DELTA]);
-    await roster(store, [DELTA, ECHO]);
-    process.off("unhandledRejection", unhandled);
-
-    expect(asked.filter((a) => a.kind === "players")).toEqual([
-      { kind: "players", ids: [DELTA, ECHO] },
-    ]);
-  });
-});
diff --git a/web-sockets/Socket.ts b/web-sockets/Socket.ts
index f7092fcb1..2fbb565cc 100644
--- a/web-sockets/Socket.ts
+++ b/web-sockets/Socket.ts
@@ -1304,9 +1304,21 @@ socket.listen("matchmaking:region-stats", (data) => {
   useMatchmakingStore().regionStats = data;
 });
 
+socket.listen("friends-online", (steamIds) => {
+  useMatchmakingStore().setFriendsOnline(steamIds);
+});
+
+socket.listen("friend-presence", (presence) => {
+  useMatchmakingStore().setFriendPresence(presence);
+});
+
+socket.listen("players-online:count", (count) => {
+  useMatchmakingStore().setOnlineCount(count);
+});
+
+// Only read from an api that predates friends presence.
 socket.listen("players-online", (onlinePlayerSteamIds) => {
-  useMatchmakingStore().onlinePlayerSteamIds = onlinePlayerSteamIds;
-  useMatchmakingStore().presenceLoaded = true;
+  useMatchmakingStore().setLegacyRoster(onlinePlayerSteamIds);
 });
 
 // The api sends a code with its English message. A code this build doesn't

From 13e711c7d470ca62ea9c60bbb75e8af6fbe7790f Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Fri, 23 Oct 2026 16:19:50 -0400
Subject: [PATCH 2/2] feature: the social panel shows your teams and, on a LAN,
 everyone at it; search results say who is online

---
 components/PlayerDisplay.vue                  |  10 +
 components/PlayerSearch.vue                   |  26 +++
 components/PlayerSearchRow.vue                |  22 +-
 components/hub/LanPlayersList.vue             | 156 ++++++++++++++
 components/hub/SocialPanel.vue                |  37 ++--
 components/matchmaking-lobby/PlayersList.vue  |  63 ++++++
 i18n/locales/ar_SA.json                       |  16 +-
 i18n/locales/da_DK.json                       |  16 +-
 i18n/locales/de_DE.json                       |  16 +-
 i18n/locales/en.json                          |  13 +-
 i18n/locales/es_ES.json                       |  16 +-
 i18n/locales/fr_FR.json                       |  16 +-
 i18n/locales/it_IT.json                       |  16 +-
 i18n/locales/ja_JP.json                       |  16 +-
 i18n/locales/ko_KR.json                       |  16 +-
 i18n/locales/pl_PL.json                       |  16 +-
 i18n/locales/pt_BR.json                       |  16 +-
 i18n/locales/ru_RU.json                       |  16 +-
 i18n/locales/sv_SE.json                       |  16 +-
 i18n/locales/tr_TR.json                       |  16 +-
 i18n/locales/uk_UA.json                       |  16 +-
 i18n/locales/zh_Hans.json                     |  16 +-
 i18n/locales/zh_Hant.json                     |  16 +-
 layouts/components/SystemStatus.vue           |  18 +-
 stores/MatchmakingStore.ts                    | 199 +++++++++++++++++-
 tests/components/PlayerSearchOnline.spec.ts   |  92 ++++++++
 tests/components/hub/SocialPanelLan.spec.ts   | 129 ++++++++++++
 .../components/hub/SocialPanelOthers.spec.ts  |  29 ---
 .../PlayersListTeams.spec.ts                  |  79 +++++++
 .../SystemStatusOnlineCount.spec.ts           |  17 +-
 tests/stores/lanPresence.spec.ts              | 128 +++++++++++
 web-sockets/Socket.ts                         |  12 ++
 32 files changed, 1186 insertions(+), 100 deletions(-)
 create mode 100644 components/hub/LanPlayersList.vue
 create mode 100644 tests/components/PlayerSearchOnline.spec.ts
 create mode 100644 tests/components/hub/SocialPanelLan.spec.ts
 delete mode 100644 tests/components/hub/SocialPanelOthers.spec.ts
 create mode 100644 tests/components/matchmaking-lobby/PlayersListTeams.spec.ts
 create mode 100644 tests/stores/lanPresence.spec.ts

diff --git a/components/PlayerDisplay.vue b/components/PlayerDisplay.vue
index fcda6ffc0..3d01f5e73 100644
--- a/components/PlayerDisplay.vue
+++ b/components/PlayerDisplay.vue
@@ -352,6 +352,12 @@ export default {
       type: Boolean,
       default: true,
     },
+    // Presence from elsewhere (a search result's check); otherwise only
+    // friends and teammates are known.
+    online: {
+      type: Boolean,
+      default: undefined,
+    },
     pingStatus: {
       type: Boolean,
       default: false,
@@ -518,6 +524,10 @@ export default {
         return false;
       }
 
+      if (this.online !== undefined) {
+        return this.online;
+      }
+
       return useMatchmakingStore().onlinePlayerSteamIds.includes(
         this.player.steam_id,
       );
diff --git a/components/PlayerSearch.vue b/components/PlayerSearch.vue
index 7610906ae..c441568cc 100644
--- a/components/PlayerSearch.vue
+++ b/components/PlayerSearch.vue
@@ -87,6 +87,7 @@ const { height: viewportHeight } = useVisualViewport();
                         : undefined
                     "
                     :player="player"
+                    :online="onlineFor(player)"
                     :active="indexOfPlayer(player) === selectedIndex"
                     :reason="reasonFor(player)"
                     :tag="tagFor(player)"
@@ -112,6 +113,7 @@ const { height: viewportHeight } = useVisualViewport();
                 :key="`player-${player.steam_id}`"
                 :ref="index === selectedIndex ? setActiveRow : undefined"
                 :player="player"
+                :online="onlineFor(player)"
                 :active="index === selectedIndex"
                 :reason="reasonFor(player)"
                 :tag="tagFor(player)"
@@ -288,6 +290,7 @@ const { height: viewportHeight } = useVisualViewport();
                         : undefined
                     "
                     :player="player"
+                    :online="onlineFor(player)"
                     :active="indexOfPlayer(player) === selectedIndex"
                     :reason="reasonFor(player)"
                     :tag="tagFor(player)"
@@ -319,6 +322,7 @@ const { height: viewportHeight } = useVisualViewport();
                   :key="`player-${player.steam_id}`"
                   :ref="index === selectedIndex ? setActiveRow : undefined"
                   :player="player"
+                  :online="onlineFor(player)"
                   :active="index === selectedIndex"
                   :reason="reasonFor(player)"
                   :tag="tagFor(player)"
@@ -462,6 +466,8 @@ export default {
       visibleCount: PAGE_SIZE,
       // Guards against a slow early request overwriting a newer one.
       searchToken: 0,
+      // Which loaded results the api says are online.
+      onlineResultIds: new Set<string>(),
       observer: null as IntersectionObserver | null,
       debouncedSearch: debounce((query: string) => {
         this.searchPlayers(query);
@@ -789,6 +795,7 @@ export default {
       this.page = 1;
       this.visibleCount = PAGE_SIZE;
       this.searchToken += 1;
+      this.onlineResultIds = new Set();
       const token = this.searchToken;
 
       if (this.onlineOnly) {
@@ -807,6 +814,7 @@ export default {
         this.players = players;
         this.totalFound = found;
         this.selectedIndex = this.firstSelectableIndex();
+        void this.checkOnline(players, token);
       } finally {
         if (token === this.searchToken) {
           this.searching = false;
@@ -843,6 +851,7 @@ export default {
         this.players = (this.players ?? []).concat(
           players.filter((p) => !seen.has(String(p.steam_id))),
         );
+        void this.checkOnline(players, token);
       } finally {
         this.loadingMore = false;
         // If the freshly appended page didn't push the sentinel out of the
@@ -851,6 +860,23 @@ export default {
         this.$nextTick(() => this.ensureObserver());
       }
     },
+    async checkOnline(players: Player[], token: number) {
+      if (!players.length || !this.me) {
+        return;
+      }
+      const { online } = await useMatchmakingStore().checkOnline(
+        players.map((player) => String(player.steam_id)),
+      );
+      if (token !== this.searchToken) {
+        return;
+      }
+      this.onlineResultIds = new Set([...this.onlineResultIds, ...online]);
+    },
+    onlineFor(player: Player) {
+      return this.onlineResultIds.has(String(player.steam_id))
+        ? true
+        : undefined;
+    },
     ensureObserver() {
       this.observer?.disconnect();
       this.observer = null;
diff --git a/components/PlayerSearchRow.vue b/components/PlayerSearchRow.vue
index aa2d9695a..1b42fb68b 100644
--- a/components/PlayerSearchRow.vue
+++ b/components/PlayerSearchRow.vue
@@ -1,14 +1,18 @@
 <script setup lang="ts">
 import PlayerDisplay from "~/components/PlayerDisplay.vue";
 
-defineProps<{
-  player: any;
-  active?: boolean;
-  // When set the row is rendered dimmed and non-selectable, and this sentence
-  // is shown underneath explaining why.
-  reason?: string;
-  tag?: string;
-}>();
+withDefaults(
+  defineProps<{
+    player: any;
+    active?: boolean;
+    // When set the row is rendered dimmed and non-selectable, and this
+    // sentence is shown underneath explaining why.
+    reason?: string;
+    tag?: string;
+    online?: boolean;
+  }>(),
+  { online: undefined },
+);
 
 const emit = defineEmits<{ select: []; hover: [] }>();
 </script>
@@ -28,7 +32,7 @@ const emit = defineEmits<{ select: []; hover: [] }>();
     @mouseenter="emit('hover')"
   >
     <div class="flex items-center justify-between gap-2">
-      <PlayerDisplay :player="player" />
+      <PlayerDisplay :player="player" :online="online" />
       <span
         v-if="tag"
         class="shrink-0 rounded-full border border-[hsl(var(--tac-amber)_/_0.4)] px-2 py-0.5 font-mono text-[0.6rem] uppercase tracking-[0.14em] text-[hsl(var(--tac-amber))]"
diff --git a/components/hub/LanPlayersList.vue b/components/hub/LanPlayersList.vue
new file mode 100644
index 000000000..0a054cb61
--- /dev/null
+++ b/components/hub/LanPlayersList.vue
@@ -0,0 +1,156 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import { Search } from "lucide-vue-next";
+import { Input } from "~/components/ui/input";
+import HubEmptyState from "~/components/hub/HubEmptyState.vue";
+import FriendListItem from "~/components/matchmaking-lobby/FriendListItem.vue";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
+
+const matchmakingStore = useMatchmakingStore();
+const authStore = useAuthStore();
+const searchQuery = ref("");
+
+const regionName = computed(() => {
+  const region = useApplicationSettingsStore().availableRegions.find(
+    (candidate: any) => candidate.value === matchmakingStore.lanRegion,
+  );
+  return region?.description || matchmakingStore.lanRegion;
+});
+
+// Like Others before it: accepted friends and incoming requests live in the
+// Friends tab, and an outgoing request stays here so adding someone doesn't
+// move them mid-action.
+const listed = computed(() => {
+  const me = String(authStore.me?.steam_id);
+  const q = searchQuery.value.toLowerCase();
+
+  return (matchmakingStore.lanPlayers as any[]).filter((player) => {
+    if (String(player.steam_id) === me) {
+      return false;
+    }
+    const entry = (matchmakingStore.friends as any[])?.find(
+      (friend) => String(friend.steam_id) === String(player.steam_id),
+    );
+    if (
+      entry &&
+      (entry.status !== "Pending" || String(entry.invited_by_steam_id) !== me)
+    ) {
+      return false;
+    }
+    return (
+      !q ||
+      player.name?.toLowerCase().includes(q) ||
+      String(player.steam_id).includes(searchQuery.value)
+    );
+  });
+});
+
+const left = computed(() => new Set(matchmakingStore.lanLeft as string[]));
+const arrivals = computed(
+  () => new Set(matchmakingStore.lanArrivals as string[]),
+);
+
+const justArrived = computed(() =>
+  listed.value.filter(
+    (player) =>
+      arrivals.value.has(player.steam_id) && !left.value.has(player.steam_id),
+  ),
+);
+const atLan = computed(() =>
+  listed.value.filter(
+    (player) =>
+      !arrivals.value.has(player.steam_id) || left.value.has(player.steam_id),
+  ),
+);
+</script>
+
+<template>
+  <div class="flex min-h-full flex-1 flex-col gap-3 p-2">
+    <div class="flex items-center gap-2 text-xs text-muted-foreground">
+      <span
+        data-testid="lan-region"
+        class="rounded border border-[hsl(var(--tac-amber)/0.4)] px-1.5 py-px font-mono text-[0.65rem] text-[hsl(var(--tac-amber))]"
+      >
+        {{ regionName }}
+      </span>
+      {{ $t("matchmaking.lan.everyone_here") }}
+    </div>
+    <div class="relative">
+      <Search class="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
+      <Input
+        v-model="searchQuery"
+        :placeholder="$t('matchmaking.lan.search_placeholder')"
+        class="pl-8"
+      />
+    </div>
+
+    <section v-if="justArrived.length > 0" data-testid="lan-arrived">
+      <div class="lan-section-label">
+        {{ $t("matchmaking.lan.just_arrived") }}
+        <span class="ml-auto tabular-nums opacity-70">
+          {{ justArrived.length }}
+        </span>
+      </div>
+      <FriendListItem
+        v-for="player in justArrived"
+        :key="`arrived-${player.steam_id}`"
+        :player="player"
+        :online="true"
+      />
+    </section>
+
+    <section v-if="atLan.length > 0" data-testid="lan-players">
+      <div class="lan-section-label">
+        {{ $t("matchmaking.lan.at_this_lan") }}
+        <span class="ml-auto tabular-nums opacity-70">
+          {{ atLan.length }}
+        </span>
+      </div>
+      <div
+        v-for="player in atLan"
+        :key="`lan-${player.steam_id}`"
+        :data-left="left.has(player.steam_id) || undefined"
+      >
+        <FriendListItem
+          :player="player"
+          :online="!left.has(player.steam_id)"
+          :muted="left.has(player.steam_id)"
+        />
+        <p
+          v-if="left.has(player.steam_id)"
+          class="-mt-1 pb-1 pl-12 text-[0.65rem] text-muted-foreground"
+        >
+          {{ $t("matchmaking.lan.left") }}
+        </p>
+      </div>
+    </section>
+
+    <HubEmptyState
+      v-if="listed.length === 0"
+      :title="
+        searchQuery
+          ? $t('layouts.hub.empty.no_match', { query: searchQuery })
+          : $t('matchmaking.lan.empty_title')
+      "
+      :description="
+        searchQuery ? null : $t('matchmaking.lan.empty_description')
+      "
+    />
+  </div>
+</template>
+
+<style scoped>
+.lan-section-label {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  margin-bottom: 0.4rem;
+  font-family: var(--font-mono, ui-monospace, monospace);
+  font-size: 0.6rem;
+  font-weight: 700;
+  letter-spacing: 0.18em;
+  text-transform: uppercase;
+  color: hsl(var(--muted-foreground));
+}
+</style>
diff --git a/components/hub/SocialPanel.vue b/components/hub/SocialPanel.vue
index 9ea10ae5c..a05c483ae 100644
--- a/components/hub/SocialPanel.vue
+++ b/components/hub/SocialPanel.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { ref, computed } from "vue";
+import { ref, computed, watch } from "vue";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs";
 import PlayersList from "~/components/matchmaking-lobby/PlayersList.vue";
-import HubEmptyState from "~/components/hub/HubEmptyState.vue";
+import LanPlayersList from "~/components/hub/LanPlayersList.vue";
 import { useMatchmakingStore } from "~/stores/MatchmakingStore";
 import { useInvites } from "@/composables/useInvites";
 
@@ -14,8 +14,19 @@ const { hasSocialInvites } = useInvites();
 const onlineFriends = computed(() => matchmakingStore.onlineFriends);
 const offlineFriends = computed(() => matchmakingStore.offlineFriends);
 
-// The paged list of everyone else online comes later; the tab shows the count.
-const othersCount = computed(() => matchmakingStore.onlineCount);
+// Only while this tab is on a LAN: everyone online at it.
+const onLan = computed(() => !!matchmakingStore.lanRegion);
+const lanCount = computed(
+  () =>
+    (matchmakingStore.lanPlayers as any[]).length -
+    (matchmakingStore.lanLeft as string[]).length,
+);
+
+watch(onLan, (on) => {
+  if (!on && activeTab.value === "lan") {
+    activeTab.value = "friends";
+  }
+});
 </script>
 
 <template>
@@ -44,12 +55,14 @@ const othersCount = computed(() => matchmakingStore.onlineCount);
             />
           </TabsTrigger>
           <TabsTrigger
-            value="online"
+            v-if="onLan"
+            value="lan"
+            data-testid="lan-tab"
             class="flex-1 text-[0.7rem] font-semibold tracking-[0.1em] uppercase px-2 py-[0.35rem]"
           >
-            {{ $t("matchmaking.others.title") }}
+            {{ $t("matchmaking.lan.title") }}
             <span class="font-mono text-[0.6rem] ml-1 opacity-65 tabular-nums">
-              {{ othersCount }}
+              {{ lanCount }}
             </span>
           </TabsTrigger>
         </TabsList>
@@ -63,13 +76,11 @@ const othersCount = computed(() => matchmakingStore.onlineCount);
         <PlayersList />
       </TabsContent>
       <TabsContent
-        value="online"
-        class="mt-0 flex flex-1 flex-col min-h-0 px-3 data-[state=inactive]:hidden"
+        v-if="onLan"
+        value="lan"
+        class="mt-0 flex flex-1 flex-col overflow-y-auto min-h-0 px-3 data-[state=inactive]:hidden"
       >
-        <HubEmptyState
-          :title="$t('layouts.hub.empty.others_title')"
-          :description="$t('layouts.hub.empty.others_description')"
-        />
+        <LanPlayersList />
       </TabsContent>
     </Tabs>
   </div>
diff --git a/components/matchmaking-lobby/PlayersList.vue b/components/matchmaking-lobby/PlayersList.vue
index 8f850b0b8..0e6cd7c1b 100644
--- a/components/matchmaking-lobby/PlayersList.vue
+++ b/components/matchmaking-lobby/PlayersList.vue
@@ -185,6 +185,28 @@ const rowTransition = computed(() =>
       </section>
       </Transition>
 
+      <!-- A section per team I'm on -->
+      <section
+        v-for="team in teamSections"
+        :key="`team-${team.id}`"
+        class="pb-4"
+      >
+        <div class="friend-section-label">
+          <span class="h-[2px] w-2 bg-muted-foreground/40" />
+          {{ $t("matchmaking.friends.team_section", { name: team.name }) }}
+          <span class="ml-auto tabular-nums opacity-70">
+            {{ team.online }}/{{ team.members.length }}
+          </span>
+        </div>
+        <div class="flex flex-col">
+          <FriendListItem
+            v-for="member in team.members"
+            :key="`team-${team.id}-${member.steam_id}`"
+            :player="member"
+            :muted="!isOnline(member)"
+          />
+        </div>
+      </section>
       <!-- Offline -->
       <Transition
         enter-active-class="friend-section-fold"
@@ -298,6 +320,9 @@ export default {
       syncing: false,
     };
   },
+  mounted() {
+    useMatchmakingStore().ensureMyTeams();
+  },
   computed: {
     friends() {
       return useMatchmakingStore().friends as any[];
@@ -355,8 +380,41 @@ export default {
           matchesSearch(p, this.searchQuery) && this.passesRegisteredFilter(p),
       );
     },
+    // Every team I'm on, with its other members online first.
+    teamSections(): Array<{
+      id: string;
+      name: string;
+      members: any[];
+      online: number;
+    }> {
+      const me = String(this.me?.steam_id);
+      return (useMatchmakingStore().myTeams as any[])
+        .map((team: any) => {
+          const members = (team.roster ?? [])
+            .map((member: any) => member.player)
+            .filter(
+              (player: any) =>
+                player &&
+                String(player.steam_id) !== me &&
+                matchesSearch(player, this.searchQuery),
+            )
+            .sort(
+              (a: any, b: any) =>
+                Number(this.isOnline(b)) - Number(this.isOnline(a)),
+            );
+          return {
+            id: team.id,
+            name: team.name,
+            members,
+            online: members.filter((member: any) => this.isOnline(member))
+              .length,
+          };
+        })
+        .filter((team) => team.members.length > 0);
+    },
     isEmpty(): boolean {
       return (
+        this.teamSections.length === 0 &&
         this.incomingRequests.length === 0 &&
         this.filteredOnlinePlayers.length === 0 &&
         this.filteredOfflinePlayers.length === 0 &&
@@ -368,6 +426,11 @@ export default {
     },
   },
   methods: {
+    isOnline(player: any) {
+      return useMatchmakingStore().onlinePlayerSteamIds.includes(
+        String(player.steam_id),
+      );
+    },
     passesRegisteredFilter(player: any) {
       if (!this.registeredFriendsOnly) {
         return true;
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 38c67e6d8..e69bc317d 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -8569,7 +8569,8 @@
       "preferred": "منطقة مفضلة",
       "skips_over": "يتخطى التوفيق المناطق التي يتجاوز زمن استجابتها {ms} ms.",
       "uses_starred": "يستخدم التوفيق مناطقك المميزة بنجمة.",
-      "sign_in": "سجّل الدخول لرؤية زمن الاستجابة لكل منطقة."
+      "sign_in": "سجّل الدخول لرؤية زمن الاستجابة لكل منطقة.",
+      "players_online": "{count} متصل"
     },
     "match_lobby": {
       "versus": "ضد"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "تم الإرسال، ألغِ الطلب",
       "incoming_requests": "الطلبات",
       "sent_requests": "المُرسلة",
-      "just_online": "اتصل للتو"
+      "just_online": "اتصل للتو",
+      "team_section": "الفريق · {name}"
     },
     "others": {
       "title": "آخرون"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "المطابقة غير مسموح بها.",
       "role_required": "ليس لديك صلاحية للانضمام إلى طابور الانتظار هذا.",
       "queue_busy": "لا يزال اللوبي الخاص بك ينضم إلى طابور الانتظار، حاول مرة أخرى."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "كل المتصلين هنا",
+      "search_placeholder": "ابحث في هذه الشبكة...",
+      "just_arrived": "وصل للتو",
+      "at_this_lan": "في هذه الشبكة",
+      "left": "غادر الشبكة",
+      "empty_title": "لا أحد غيرك هنا بعد",
+      "empty_description": "يظهر هنا اللاعبون على هذه الشبكة أثناء اتصالهم."
     }
   },
   "game_server": {
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 52b28335a..2bc82a9dc 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -8569,7 +8569,8 @@
       "preferred": "Foretrukken region",
       "skips_over": "Matchmaking springer regioner over {ms} ms over.",
       "uses_starred": "Matchmaking bruger dine stjernemarkerede regioner.",
-      "sign_in": "Log ind for at se dit ping til hver region."
+      "sign_in": "Log ind for at se dit ping til hver region.",
+      "players_online": "{count} online"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Anmodet, Annuller anmodning",
       "incoming_requests": "Anmodninger",
       "sent_requests": "Sendt",
-      "just_online": "Lige kommet online"
+      "just_online": "Lige kommet online",
+      "team_section": "Hold · {name}"
     },
     "others": {
       "title": "Andre"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Matchmaking er ikke tilladt.",
       "role_required": "Du har ikke tilladelse til at deltage i denne kø.",
       "queue_busy": "Din lobby er stadig ved at komme i kø, prøv igen."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "alle online her",
+      "search_placeholder": "Søg på dette LAN...",
+      "just_arrived": "Lige ankommet",
+      "at_this_lan": "På dette LAN",
+      "left": "Har forladt LAN'et",
+      "empty_title": "Ingen andre er her endnu",
+      "empty_description": "Spillere på dette LAN vises her, mens de er online."
     }
   },
   "game_server": {
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index c49e29d8f..1e5d9dd27 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -8569,7 +8569,8 @@
       "preferred": "Bevorzugte Region",
       "skips_over": "Matchmaking überspringt Regionen über {ms} ms.",
       "uses_starred": "Matchmaking nutzt deine markierten Regionen.",
-      "sign_in": "Melde dich an, um deinen Ping zu jeder Region zu sehen."
+      "sign_in": "Melde dich an, um deinen Ping zu jeder Region zu sehen.",
+      "players_online": "{count} online"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Angefragt, Anfrage abbrechen",
       "incoming_requests": "Anfragen",
       "sent_requests": "Gesendet",
-      "just_online": "Gerade online gekommen"
+      "just_online": "Gerade online gekommen",
+      "team_section": "Team · {name}"
     },
     "others": {
       "title": "Andere"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Matchmaking ist nicht erlaubt.",
       "role_required": "Du hast keine Berechtigung, dieser Queue beizutreten.",
       "queue_busy": "Deine Lobby tritt der Queue noch bei, versuch es erneut."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "alle, die hier online sind",
+      "search_placeholder": "Dieses LAN durchsuchen...",
+      "just_arrived": "Gerade angekommen",
+      "at_this_lan": "Auf diesem LAN",
+      "left": "Hat das LAN verlassen",
+      "empty_title": "Noch niemand sonst hier",
+      "empty_description": "Spieler in diesem LAN erscheinen hier, solange sie online sind."
     }
   },
   "game_server": {
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index d6ca17c7a..6ec86665b 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -12479,7 +12479,8 @@
       "cancel_request_aria": "Requested, Cancel Request",
       "incoming_requests": "Requests",
       "sent_requests": "Sent",
-      "just_online": "Just came online"
+      "just_online": "Just came online",
+      "team_section": "Team · {name}"
     },
     "others": {
       "title": "Others"
@@ -12518,6 +12519,16 @@
       "queue_disabled": "Matchmaking is not allowed.",
       "role_required": "You do not have permission to join this queue.",
       "queue_busy": "Your lobby is still joining the queue, try again."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "everyone online here",
+      "search_placeholder": "Search this LAN...",
+      "just_arrived": "Just arrived",
+      "at_this_lan": "At this LAN",
+      "left": "Left the LAN",
+      "empty_title": "Nobody else is here yet",
+      "empty_description": "Players on this LAN show up here while they're online."
     }
   },
   "game_server": {
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 07360f46f..b173dd0a4 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -8569,7 +8569,8 @@
       "preferred": "Región preferida",
       "skips_over": "El emparejamiento omite las regiones de más de {ms} ms.",
       "uses_starred": "El emparejamiento usa tus regiones marcadas con estrella.",
-      "sign_in": "Inicia sesión para ver tu ping a cada región."
+      "sign_in": "Inicia sesión para ver tu ping a cada región.",
+      "players_online": "{count} en línea"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Solicitado, Cancelar solicitud",
       "incoming_requests": "Solicitudes",
       "sent_requests": "Enviadas",
-      "just_online": "Acaba de conectarse"
+      "just_online": "Acaba de conectarse",
+      "team_section": "Equipo · {name}"
     },
     "others": {
       "title": "Otros"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "El emparejamiento no está permitido.",
       "role_required": "No tienes permiso para unirte a esta cola.",
       "queue_busy": "Tu lobby todavía se está uniendo a la cola, inténtalo de nuevo."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "todos los que están en línea aquí",
+      "search_placeholder": "Buscar en esta LAN...",
+      "just_arrived": "Recién llegados",
+      "at_this_lan": "En esta LAN",
+      "left": "Ha salido de la LAN",
+      "empty_title": "Todavía no hay nadie más aquí",
+      "empty_description": "Los jugadores de esta LAN aparecen aquí mientras están en línea."
     }
   },
   "game_server": {
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index efb17e5ff..ac0e6b449 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -8569,7 +8569,8 @@
       "preferred": "Région préférée",
       "skips_over": "Le matchmaking ignore les régions au-delà de {ms} ms.",
       "uses_starred": "Le matchmaking utilise vos régions favorites.",
-      "sign_in": "Connectez-vous pour voir votre ping vers chaque région."
+      "sign_in": "Connectez-vous pour voir votre ping vers chaque région.",
+      "players_online": "{count} en ligne"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Demandé, Annuler la demande",
       "incoming_requests": "Demandes",
       "sent_requests": "Envoyées",
-      "just_online": "Vient de se connecter"
+      "just_online": "Vient de se connecter",
+      "team_section": "Équipe · {name}"
     },
     "others": {
       "title": "Autres"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Le matchmaking n'est pas autorisé.",
       "role_required": "Tu n'as pas la permission de rejoindre cette file d'attente.",
       "queue_busy": "Ton lobby rejoint encore la file d'attente, réessaie."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "tous ceux en ligne ici",
+      "search_placeholder": "Rechercher sur ce LAN...",
+      "just_arrived": "Vient d'arriver",
+      "at_this_lan": "Sur ce LAN",
+      "left": "A quitté le LAN",
+      "empty_title": "Personne d'autre ici pour l'instant",
+      "empty_description": "Les joueurs de ce LAN apparaissent ici tant qu'ils sont en ligne."
     }
   },
   "game_server": {
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index 1fd15cf52..d6c39c0dd 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -8569,7 +8569,8 @@
       "preferred": "Regione preferita",
       "skips_over": "Il matchmaking esclude le regioni oltre {ms} ms.",
       "uses_starred": "Il matchmaking usa le regioni contrassegnate con la stella.",
-      "sign_in": "Accedi per vedere il tuo ping verso ogni regione."
+      "sign_in": "Accedi per vedere il tuo ping verso ogni regione.",
+      "players_online": "{count} online"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Richiesta inviata, Annulla richiesta",
       "incoming_requests": "Richieste",
       "sent_requests": "Inviate",
-      "just_online": "Appena online"
+      "just_online": "Appena online",
+      "team_section": "Squadra · {name}"
     },
     "others": {
       "title": "Altri"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Il matchmaking non è consentito.",
       "role_required": "Non hai il permesso di entrare in questa coda.",
       "queue_busy": "La tua lobby sta ancora entrando in coda, riprova."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "tutti quelli online qui",
+      "search_placeholder": "Cerca in questa LAN...",
+      "just_arrived": "Appena arrivati",
+      "at_this_lan": "In questa LAN",
+      "left": "Ha lasciato la LAN",
+      "empty_title": "Non c'è ancora nessun altro qui",
+      "empty_description": "I giocatori di questa LAN compaiono qui finché sono online."
     }
   },
   "game_server": {
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index eddb04934..892e864fd 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -8569,7 +8569,8 @@
       "preferred": "優先リージョン",
       "skips_over": "マッチメイキングは {ms} ms を超えるリージョンを除外します。",
       "uses_starred": "マッチメイキングはスターを付けたリージョンを使用します。",
-      "sign_in": "ログインすると各リージョンへのPingを確認できます。"
+      "sign_in": "ログインすると各リージョンへのPingを確認できます。",
+      "players_online": "{count}人がオンライン"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "申請中、申請を取消",
       "incoming_requests": "申請",
       "sent_requests": "送信済み",
-      "just_online": "オンラインになったばかり"
+      "just_online": "オンラインになったばかり",
+      "team_section": "チーム · {name}"
     },
     "others": {
       "title": "その他"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "マッチメイキングは許可されていません。",
       "role_required": "このキューに参加する権限がありません。",
       "queue_busy": "ロビーはまだキューに参加中です。もう一度お試しください。"
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "ここでオンラインの全員",
+      "search_placeholder": "このLANを検索...",
+      "just_arrived": "到着したばかり",
+      "at_this_lan": "このLAN内",
+      "left": "LANから離れました",
+      "empty_title": "まだ他に誰もいません",
+      "empty_description": "このLANのプレイヤーはオンライン中ここに表示されます。"
     }
   },
   "game_server": {
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index b85a58534..acd87630c 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -8569,7 +8569,8 @@
       "preferred": "선호 지역",
       "skips_over": "매치메이킹은 {ms} ms를 초과하는 지역을 제외합니다.",
       "uses_starred": "매치메이킹은 별표한 지역을 사용합니다.",
-      "sign_in": "로그인하면 각 지역의 핑을 확인할 수 있습니다."
+      "sign_in": "로그인하면 각 지역의 핑을 확인할 수 있습니다.",
+      "players_online": "{count}명 온라인"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "요청함, 요청 취소",
       "incoming_requests": "받은 요청",
       "sent_requests": "보낸 요청",
-      "just_online": "방금 접속함"
+      "just_online": "방금 접속함",
+      "team_section": "팀 · {name}"
     },
     "others": {
       "title": "기타"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "매치메이킹이 허용되지 않습니다.",
       "role_required": "이 대기열에 참가할 권한이 없습니다.",
       "queue_busy": "로비가 아직 대기열에 참가하는 중입니다. 다시 시도해 주세요."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "여기 접속 중인 모두",
+      "search_placeholder": "이 LAN 검색...",
+      "just_arrived": "방금 도착",
+      "at_this_lan": "이 LAN에 있음",
+      "left": "LAN을 떠남",
+      "empty_title": "아직 다른 사람이 없습니다",
+      "empty_description": "이 LAN의 플레이어가 온라인일 때 여기에 표시됩니다."
     }
   },
   "game_server": {
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index 1d1a6e799..5222d8e06 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -8569,7 +8569,8 @@
       "preferred": "Preferowany region",
       "skips_over": "Matchmaking pomija regiony powyżej {ms} ms.",
       "uses_starred": "Matchmaking korzysta z regionów oznaczonych gwiazdką.",
-      "sign_in": "Zaloguj się, aby zobaczyć swój ping do każdego regionu."
+      "sign_in": "Zaloguj się, aby zobaczyć swój ping do każdego regionu.",
+      "players_online": "{count} online"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Wysłano, Anuluj zaproszenie",
       "incoming_requests": "Zaproszenia",
       "sent_requests": "Wysłane",
-      "just_online": "Właśnie online"
+      "just_online": "Właśnie online",
+      "team_section": "Drużyna · {name}"
     },
     "others": {
       "title": "Inni"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Matchmaking jest niedozwolony.",
       "role_required": "Nie masz uprawnień, aby dołączyć do tej kolejki.",
       "queue_busy": "Twoje lobby wciąż dołącza do kolejki, spróbuj ponownie."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "wszyscy online tutaj",
+      "search_placeholder": "Szukaj w tym LAN...",
+      "just_arrived": "Właśnie dołączyli",
+      "at_this_lan": "W tym LAN",
+      "left": "Opuścił LAN",
+      "empty_title": "Nikogo innego jeszcze tu nie ma",
+      "empty_description": "Gracze z tego LAN pojawiają się tutaj, gdy są online."
     }
   },
   "game_server": {
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index 03cf4cf6b..20a2454ff 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -8569,7 +8569,8 @@
       "preferred": "Região preferida",
       "skips_over": "O matchmaking ignora regiões acima de {ms} ms.",
       "uses_starred": "O matchmaking usa suas regiões marcadas com estrela.",
-      "sign_in": "Entre para ver seu ping para cada região."
+      "sign_in": "Entre para ver seu ping para cada região.",
+      "players_online": "{count} online"
     },
     "match_lobby": {
       "versus": "vs"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Solicitado, Cancelar Pedido",
       "incoming_requests": "Pedidos",
       "sent_requests": "Enviados",
-      "just_online": "Acabou de ficar online"
+      "just_online": "Acabou de ficar online",
+      "team_section": "Time · {name}"
     },
     "others": {
       "title": "Outros"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "O matchmaking não é permitido.",
       "role_required": "Você não tem permissão para entrar nesta fila.",
       "queue_busy": "Sua lobby ainda está entrando na fila, tente novamente."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "todos online aqui",
+      "search_placeholder": "Buscar nesta LAN...",
+      "just_arrived": "Acabaram de chegar",
+      "at_this_lan": "Nesta LAN",
+      "left": "Saiu da LAN",
+      "empty_title": "Ninguém mais aqui ainda",
+      "empty_description": "Jogadores desta LAN aparecem aqui enquanto estiverem online."
     }
   },
   "game_server": {
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index 0351fdccf..3183bec64 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -8569,7 +8569,8 @@
       "preferred": "Предпочтительный регион",
       "skips_over": "Подбор матчей пропускает регионы с пингом выше {ms} ms.",
       "uses_starred": "Подбор матчей использует отмеченные звёздочкой регионы.",
-      "sign_in": "Войдите, чтобы увидеть свой пинг до каждого региона."
+      "sign_in": "Войдите, чтобы увидеть свой пинг до каждого региона.",
+      "players_online": "{count} в сети"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Отправлено, Отменить заявку",
       "incoming_requests": "Заявки",
       "sent_requests": "Отправленные",
-      "just_online": "Только что в сети"
+      "just_online": "Только что в сети",
+      "team_section": "Команда · {name}"
     },
     "others": {
       "title": "Другие"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Подбор матчей запрещён.",
       "role_required": "У вас нет прав, чтобы присоединиться к этой очереди.",
       "queue_busy": "Ваше лобби ещё встаёт в очередь, попробуйте снова."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "все, кто здесь в сети",
+      "search_placeholder": "Поиск в этой LAN...",
+      "just_arrived": "Только что пришли",
+      "at_this_lan": "В этой LAN",
+      "left": "Покинул LAN",
+      "empty_title": "Здесь пока больше никого",
+      "empty_description": "Игроки этой LAN появляются здесь, пока они в сети."
     }
   },
   "game_server": {
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 24d4ba3d7..8b388693f 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -8569,7 +8569,8 @@
       "preferred": "Föredragen region",
       "skips_over": "Matchmaking hoppar över regioner över {ms} ms.",
       "uses_starred": "Matchmaking använder dina stjärnmärkta regioner.",
-      "sign_in": "Logga in för att se din ping till varje region."
+      "sign_in": "Logga in för att se din ping till varje region.",
+      "players_online": "{count} online"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Skickad, Avbryt förfrågan",
       "incoming_requests": "Förfrågningar",
       "sent_requests": "Skickade",
-      "just_online": "Har just loggat in"
+      "just_online": "Har just loggat in",
+      "team_section": "Lag · {name}"
     },
     "others": {
       "title": "Övriga"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Matchmaking är inte tillåtet.",
       "role_required": "Du har inte behörighet att gå med i den här kön.",
       "queue_busy": "Din lobby håller fortfarande på att gå med i kön, försök igen."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "alla som är online här",
+      "search_placeholder": "Sök på detta LAN...",
+      "just_arrived": "Precis anlänt",
+      "at_this_lan": "På detta LAN",
+      "left": "Har lämnat LAN:et",
+      "empty_title": "Ingen annan är här än",
+      "empty_description": "Spelare på detta LAN visas här medan de är online."
     }
   },
   "game_server": {
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index 55c077570..58160aaaa 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -8569,7 +8569,8 @@
       "preferred": "Tercih edilen bölge",
       "skips_over": "Eşleştirme {ms} ms üzerindeki bölgeleri atlar.",
       "uses_starred": "Eşleştirme yıldızladığın bölgeleri kullanır.",
-      "sign_in": "Her bölgeye pingini görmek için giriş yap."
+      "sign_in": "Her bölgeye pingini görmek için giriş yap.",
+      "players_online": "{count} çevrimiçi"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "İstek gönderildi, İsteği iptal et",
       "incoming_requests": "İstekler",
       "sent_requests": "Gönderilen",
-      "just_online": "Az önce çevrimiçi oldu"
+      "just_online": "Az önce çevrimiçi oldu",
+      "team_section": "Takım · {name}"
     },
     "others": {
       "title": "Diğerleri"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Eşleştirmeye izin verilmiyor.",
       "role_required": "Bu sıraya katılma izniniz yok.",
       "queue_busy": "Lobiniz hâlâ sıraya giriyor, tekrar deneyin."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "burada çevrimiçi olan herkes",
+      "search_placeholder": "Bu LAN'da ara...",
+      "just_arrived": "Yeni geldi",
+      "at_this_lan": "Bu LAN'da",
+      "left": "LAN'dan ayrıldı",
+      "empty_title": "Henüz burada başka kimse yok",
+      "empty_description": "Bu LAN'daki oyuncular çevrimiçiyken burada görünür."
     }
   },
   "game_server": {
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index 9e173f3be..f818ac11e 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -8569,7 +8569,8 @@
       "preferred": "Бажаний регіон",
       "skips_over": "Підбір матчів пропускає регіони з пінгом понад {ms} ms.",
       "uses_starred": "Підбір матчів використовує регіони, позначені зірочкою.",
-      "sign_in": "Увійдіть, щоб побачити свій пінг до кожного регіону."
+      "sign_in": "Увійдіть, щоб побачити свій пінг до кожного регіону.",
+      "players_online": "{count} у мережі"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "Запит надіслано, Скасувати запит",
       "incoming_requests": "Запити",
       "sent_requests": "Надіслані",
-      "just_online": "Щойно в мережі"
+      "just_online": "Щойно в мережі",
+      "team_section": "Команда · {name}"
     },
     "others": {
       "title": "Інші"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "Добір матчів заборонено.",
       "role_required": "У вас немає дозволу приєднатися до цієї черги.",
       "queue_busy": "Ваше лобі ще стає в чергу, спробуйте знову."
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "усі, хто тут у мережі",
+      "search_placeholder": "Пошук у цій LAN...",
+      "just_arrived": "Щойно прийшли",
+      "at_this_lan": "У цій LAN",
+      "left": "Покинув LAN",
+      "empty_title": "Тут поки більше нікого",
+      "empty_description": "Гравці цієї LAN з'являються тут, поки вони в мережі."
     }
   },
   "game_server": {
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index 677156a66..ba49fccae 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -8569,7 +8569,8 @@
       "preferred": "首选区域",
       "skips_over": "匹配会跳过延迟超过 {ms} ms 的区域。",
       "uses_starred": "匹配会使用你标星的区域。",
-      "sign_in": "登录后可查看你到各区域的延迟。"
+      "sign_in": "登录后可查看你到各区域的延迟。",
+      "players_online": "{count} 人在线"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "已请求，取消请求",
       "incoming_requests": "收到的请求",
       "sent_requests": "已发送的请求",
-      "just_online": "刚刚上线"
+      "just_online": "刚刚上线",
+      "team_section": "战队 · {name}"
     },
     "others": {
       "title": "其他"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "不允许匹配。",
       "role_required": "你没有加入此队列的权限。",
       "queue_busy": "你的大厅仍在加入队列，请重试。"
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "这里所有在线的人",
+      "search_placeholder": "搜索此 LAN...",
+      "just_arrived": "刚刚到达",
+      "at_this_lan": "在此 LAN",
+      "left": "已离开 LAN",
+      "empty_title": "这里还没有其他人",
+      "empty_description": "此 LAN 上的玩家在线时会显示在这里。"
     }
   },
   "game_server": {
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 42d4e6e3e..0e266e299 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -8569,7 +8569,8 @@
       "preferred": "偏好區域",
       "skips_over": "配對會略過延遲超過 {ms} ms 的區域。",
       "uses_starred": "配對會使用你加星號的區域。",
-      "sign_in": "登入後即可查看你到各區域的延遲。"
+      "sign_in": "登入後即可查看你到各區域的延遲。",
+      "players_online": "{count} 人在線"
     },
     "match_lobby": {
       "versus": "VS"
@@ -12478,7 +12479,8 @@
       "cancel_request_aria": "已請求，取消請求",
       "incoming_requests": "收到的請求",
       "sent_requests": "已送出",
-      "just_online": "剛剛上線"
+      "just_online": "剛剛上線",
+      "team_section": "戰隊 · {name}"
     },
     "others": {
       "title": "其他"
@@ -12517,6 +12519,16 @@
       "queue_disabled": "不允許配對。",
       "role_required": "你沒有加入此佇列的權限。",
       "queue_busy": "你的大廳仍在加入佇列，請重試。"
+    },
+    "lan": {
+      "title": "LAN",
+      "everyone_here": "這裡所有在線的人",
+      "search_placeholder": "搜尋此 LAN...",
+      "just_arrived": "剛剛到達",
+      "at_this_lan": "在此 LAN",
+      "left": "已離開 LAN",
+      "empty_title": "這裡還沒有其他人",
+      "empty_description": "此 LAN 上的玩家在線時會顯示在這裡。"
     }
   },
   "game_server": {
diff --git a/layouts/components/SystemStatus.vue b/layouts/components/SystemStatus.vue
index 0e48fc836..08a2bbf0b 100644
--- a/layouts/components/SystemStatus.vue
+++ b/layouts/components/SystemStatus.vue
@@ -30,9 +30,9 @@ const toneText: Record<Tone, string> = {
 const statusTone = (status: string): Tone =>
   status === "Online" ? "ok" : status === "Offline" ? "bad" : "warn";
 
-// Admins also see how many players are online across the instance.
-const isAdmin = computed(() =>
-  authStore.isRoleAbove(e_player_roles_enum.administrator),
+// Match organizers and above also see how many players are online.
+const seesOnlineCount = computed(() =>
+  authStore.isRoleAbove(e_player_roles_enum.match_organizer),
 );
 const playersOnline = computed(() => matchmaking.onlineCount);
 
@@ -88,12 +88,12 @@ const statusLabel = computed(() =>
       <button
         type="button"
         class="inline-flex h-8 shrink-0 animate-in fade-in-0 items-center justify-center rounded-md transition-colors duration-150 [animation-duration:240ms] focus-visible:bg-[hsl(var(--tac-amber)/0.08)] focus-visible:outline-none data-[state=open]:bg-[hsl(var(--tac-amber)/0.1)]"
-        :class="isAdmin ? 'gap-1 px-1.5' : 'w-8'"
+        :class="seesOnlineCount ? 'gap-1 px-1.5' : 'w-8'"
         :aria-label="statusLabel"
       >
         <Globe class="h-4 w-4" :class="toneText[overallTone]" />
         <span
-          v-if="isAdmin"
+          v-if="seesOnlineCount"
           data-testid="players-online-count"
           class="font-mono text-[0.7rem] tabular-nums text-muted-foreground"
         >
@@ -101,7 +101,7 @@ const statusLabel = computed(() =>
         </span>
       </button>
     </template>
-    <template v-if="isAdmin" #header>
+    <template v-if="seesOnlineCount" #header>
       <p
         data-testid="players-online-line"
         class="mb-3 font-mono text-[0.7rem] uppercase tracking-[0.12em] tabular-nums text-muted-foreground"
@@ -181,12 +181,12 @@ const statusLabel = computed(() =>
       <button
         type="button"
         class="inline-flex h-8 shrink-0 animate-in fade-in-0 items-center justify-center rounded-md transition-colors duration-150 [animation-duration:240ms] focus-visible:bg-[hsl(var(--tac-amber)/0.08)] focus-visible:outline-none data-[state=open]:bg-[hsl(var(--tac-amber)/0.1)]"
-        :class="isAdmin ? 'gap-1 px-1.5' : 'w-8'"
+        :class="seesOnlineCount ? 'gap-1 px-1.5' : 'w-8'"
         :aria-label="statusLabel"
       >
         <Globe class="h-4 w-4" :class="toneText[overallTone]" />
         <span
-          v-if="isAdmin"
+          v-if="seesOnlineCount"
           data-testid="players-online-count"
           class="font-mono text-[0.7rem] tabular-nums text-muted-foreground"
         >
@@ -202,7 +202,7 @@ const statusLabel = computed(() =>
       class="w-[320px] max-w-[calc(100vw-1.5rem)] space-y-4"
     >
       <p
-        v-if="isAdmin"
+        v-if="seesOnlineCount"
         data-testid="players-online-line"
         class="font-mono text-[0.7rem] uppercase tracking-[0.12em] tabular-nums text-muted-foreground"
       >
diff --git a/stores/MatchmakingStore.ts b/stores/MatchmakingStore.ts
index aa5597977..1f7f7bbcd 100644
--- a/stores/MatchmakingStore.ts
+++ b/stores/MatchmakingStore.ts
@@ -1,14 +1,14 @@
 import { ref, shallowRef, watch, computed } from "vue";
 import { defineStore, acceptHMRUpdate } from "pinia";
 import { useSubscriptionManager } from "~/composables/useSubscriptionManager";
-import { e_match_types_enum, $ } from "~/generated/zeus";
+import { e_match_types_enum, order_by, $ } from "~/generated/zeus";
 import getGraphqlClient from "~/graphql/getGraphqlClient";
 import {
   MY_FRIENDS_ROW_STATE_SUBSCRIPTION,
   MY_FRIENDS_SUBSCRIPTION,
 } from "~/graphql/myFriends";
 import { schemaHasField } from "~/utilities/schemaHasType";
-import { generateSubscription } from "~/graphql/graphqlGen";
+import { generateQuery, generateSubscription } from "~/graphql/graphqlGen";
 import { playerFields } from "~/graphql/playerFields";
 import debounce from "~/utilities/debounce";
 import { isInCs2 } from "~/utilities/cs2Presence";
@@ -92,8 +92,12 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
 
     clearTimeout(friendsResync);
     friendsResync = setTimeout(() => {
-      if (useAuthStore().me) {
+      const steamId = useAuthStore().me?.steam_id;
+      if (steamId) {
         sendFriendsOnlineRequest.value();
+        if (myTeamsFor === String(steamId)) {
+          void loadMyTeams(steamId);
+        }
       }
     }, FRIENDS_RESYNC_MS);
   };
@@ -123,6 +127,136 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
     onlineCount.value = Number(count) || 0;
   };
 
+  // Everyone online at the LAN this tab is on, which the api sends only to tabs
+  // on that LAN. A player who leaves stays a moment, greyed, before dropping.
+  const LAN_LEFT_LINGER_MS = 30_000;
+  const lanRegion = ref<string | null>(null);
+  const lanPlayers = ref<Array<any>>([]);
+  const lanArrivals = ref<Array<string>>([]);
+  const lanLeft = ref<Array<string>>([]);
+  const lanLeaveTimers = new Map<string, ReturnType<typeof setTimeout>>();
+
+  const forgetLanLeaver = (steamId: string) => {
+    clearTimeout(lanLeaveTimers.get(steamId));
+    lanLeaveTimers.delete(steamId);
+    lanLeft.value = lanLeft.value.filter((id) => id !== steamId);
+  };
+
+  const clearLan = () => {
+    for (const steamId of lanLeaveTimers.keys()) {
+      forgetLanLeaver(steamId);
+    }
+    lanRegion.value = null;
+    lanPlayers.value = [];
+    lanArrivals.value = [];
+  };
+
+  const setLanRoster = ({
+    region,
+    players,
+  }: {
+    region: string | null;
+    players: Array<any>;
+  }) => {
+    friendsPresenceFromApi = true;
+    clearLan();
+    lanRegion.value = region ?? null;
+    lanPlayers.value = region
+      ? (players ?? []).map((player) => ({
+          ...player,
+          steam_id: String(player.steam_id),
+        }))
+      : [];
+    lanArrivals.value = [];
+  };
+
+  const applyLanPresence = ({
+    region,
+    joined,
+    left,
+  }: {
+    region: string | null;
+    joined?: Array<any>;
+    left?: Array<string>;
+  }) => {
+    if (!region || region !== lanRegion.value) {
+      return;
+    }
+
+    for (const player of joined ?? []) {
+      const steamId = String(player.steam_id);
+      forgetLanLeaver(steamId);
+      lanPlayers.value = [
+        ...lanPlayers.value.filter((row) => row.steam_id !== steamId),
+        { ...player, steam_id: steamId },
+      ];
+      lanArrivals.value = [
+        steamId,
+        ...lanArrivals.value.filter((id) => id !== steamId),
+      ];
+    }
+
+    for (const id of left ?? []) {
+      const steamId = String(id);
+      if (
+        !lanPlayers.value.some((row) => row.steam_id === steamId) ||
+        lanLeft.value.includes(steamId)
+      ) {
+        continue;
+      }
+      lanLeft.value = [...lanLeft.value, steamId];
+      lanLeaveTimers.set(
+        steamId,
+        setTimeout(() => {
+          forgetLanLeaver(steamId);
+          lanPlayers.value = lanPlayers.value.filter(
+            (row) => row.steam_id !== steamId,
+          );
+          lanArrivals.value = lanArrivals.value.filter((id) => id !== steamId);
+        }, LAN_LEFT_LINGER_MS),
+      );
+    }
+  };
+
+  // Which of a page of players are online, for search results. The api answers
+  // by request id, so a reply for an older page is dropped.
+  const onlineChecks = new Map<string, (online: Array<string>) => void>();
+  let onlineCheckId = 0;
+
+  const sendOnlineCheck = shallowRef(
+    (requestId: string, steamIds: Array<string>) => {
+      socket.event("players-online:check", { requestId, steamIds });
+    },
+  );
+
+  const checkOnline = (steamIds: Array<string>) => {
+    const requestId = String(++onlineCheckId);
+    const ids = [...new Set(steamIds.map(String))].slice(0, 50);
+
+    return new Promise<{ requestId: string; online: Set<string> }>(
+      (resolve) => {
+        onlineChecks.set(requestId, (online) =>
+          resolve({ requestId, online: new Set(online.map(String)) }),
+        );
+        // An api from before the check never answers.
+        setTimeout(() => onlineChecks.delete(requestId), 10_000);
+        sendOnlineCheck.value(requestId, ids);
+      },
+    );
+  };
+
+  const setOnlineCheck = ({
+    requestId,
+    online,
+  }: {
+    requestId: string;
+    online: Array<string>;
+  }) => {
+    const resolve = onlineChecks.get(String(requestId));
+    onlineChecks.delete(String(requestId));
+    resolve?.(online ?? []);
+  };
+
   const setLegacyRoster = (steamIds: Array<string>) => {
     if (friendsPresenceFromApi) {
       return;
@@ -132,6 +266,50 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
     presenceLoaded.value = true;
   };
 
+  // Every team I am on with its roster, shown beside my friends. Their online
+  // status comes with my friends' from the api. Loaded once the friends list
+  // is shown, not for every tab.
+  const myTeams = ref<Array<any>>([]);
+  let myTeamsFor: string | undefined;
+
+  const ensureMyTeams = () => {
+    const steamId = useAuthStore().me?.steam_id;
+    if (steamId && myTeamsFor !== String(steamId)) {
+      myTeamsFor = String(steamId);
+      void loadMyTeams(steamId);
+    }
+  };
+
+  const loadMyTeams = async (steamId: bigint | string) => {
+    try {
+      const { data } = await getGraphqlClient().query({
+        query: generateQuery({
+          teams: [
+            {
+              where: {
+                roster: { player_steam_id: { _eq: $("steamId", "bigint!") } },
+              },
+              order_by: [{ name: order_by.asc }],
+            },
+            {
+              id: true,
+              name: true,
+              short_name: true,
+              roster: [{}, { player: playerFields }],
+            },
+          ],
+        }),
+        variables: { steamId },
+        fetchPolicy: "network-only",
+      });
+      if (String(useAuthStore().me?.steam_id) === String(steamId)) {
+        myTeams.value = data?.teams ?? [];
+      }
+    } catch (error) {
+      console.error("[matchmaking] unable to load my teams", error);
+    }
+  };
+
   const friends = ref([]);
   const lobbies = ref([]);
   const friendsLoaded = ref(false);
@@ -272,6 +450,9 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
       } else {
         onlinePlayerSteamIds.value = [];
         presenceLoaded.value = false;
+        myTeams.value = [];
+        myTeamsFor = undefined;
+        clearLan();
         clearTimeout(friendsResync);
         const { unsubscribe } = useSubscriptionManager();
         unsubscribe("matchmaking:friends");
@@ -746,6 +927,18 @@ export const useMatchmakingStore = defineStore("matchmaking", () => {
     setOnlineCount,
     setLegacyRoster,
     sendFriendsOnlineRequest,
+    lanRegion,
+    lanPlayers,
+    lanArrivals,
+    lanLeft,
+    setLanRoster,
+    applyLanPresence,
+    checkOnline,
+    setOnlineCheck,
+    sendOnlineCheck,
+    myTeams,
+    loadMyTeams,
+    ensureMyTeams,
     joinedMatchmakingQueues,
 
     checkLatenies,
diff --git a/tests/components/PlayerSearchOnline.spec.ts b/tests/components/PlayerSearchOnline.spec.ts
new file mode 100644
index 000000000..35a651fdd
--- /dev/null
+++ b/tests/components/PlayerSearchOnline.spec.ts
@@ -0,0 +1,92 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { flushPromises } from "@vue/test-utils";
+import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
+import { readBody } from "h3";
+import PlayerSearch from "~/components/PlayerSearch.vue";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useAuthStore } from "~/stores/AuthStore";
+import { useSearchStore } from "~/stores/SearchStore";
+
+const ALPHA = "76561198000000801";
+const BRAVO = "76561198000000802";
+
+registerEndpoint("/api/players-search", {
+  method: "POST",
+  handler: async (event: any) => {
+    const body = await readBody(event);
+    const steamId = body.query === "alpha" ? ALPHA : BRAVO;
+    return {
+      hits: [{ document: { steam_id: steamId, name: body.query } }],
+      found: 1,
+    };
+  },
+});
+
+let unmount: (() => void) | undefined;
+
+afterEach(() => {
+  unmount?.();
+  unmount = undefined;
+  useAuthStore().me = undefined;
+});
+
+async function mountSearch() {
+  useAuthStore().me = {
+    steam_id: "76561198000000800",
+    name: "me",
+    role: "user",
+  } as any;
+  useSearchStore().onlineOnly = false;
+  const checks: Array<{ requestId: string; steamIds: Array<string> }> = [];
+  useMatchmakingStore().sendOnlineCheck = (
+    requestId: string,
+    steamIds: Array<string>,
+  ) => {
+    checks.push({ requestId, steamIds });
+  };
+
+  const wrapper = await mountSuspended(PlayerSearch, {
+    props: { label: "Find a player" },
+  });
+  unmount = () => wrapper.unmount();
+  return { vm: wrapper.vm as any, checks };
+}
+
+describe("player search results' online status", () => {
+  it("asks once which of the results are online and shows it", async () => {
+    const { vm, checks } = await mountSearch();
+
+    await vm.searchPlayers("alpha");
+    await flushPromises();
+    expect(checks.map((check) => check.steamIds)).toEqual([[ALPHA]]);
+
+    useMatchmakingStore().setOnlineCheck({
+      requestId: checks[0].requestId,
+      online: [ALPHA],
+    });
+    await flushPromises();
+
+    expect(vm.onlineFor({ steam_id: ALPHA })).toBe(true);
+  });
+
+  it("drops an answer for a search that has since been replaced", async () => {
+    const { vm, checks } = await mountSearch();
+
+    await vm.searchPlayers("alpha");
+    await vm.searchPlayers("bravo");
+    await flushPromises();
+
+    useMatchmakingStore().setOnlineCheck({
+      requestId: checks[0].requestId,
+      online: [ALPHA],
+    });
+    useMatchmakingStore().setOnlineCheck({
+      requestId: checks[1].requestId,
+      online: [],
+    });
+    await flushPromises();
+
+    expect(vm.onlineFor({ steam_id: ALPHA })).toBeUndefined();
+    expect(vm.onlineFor({ steam_id: BRAVO })).toBeUndefined();
+  });
+});
diff --git a/tests/components/hub/SocialPanelLan.spec.ts b/tests/components/hub/SocialPanelLan.spec.ts
new file mode 100644
index 000000000..630c4bb92
--- /dev/null
+++ b/tests/components/hub/SocialPanelLan.spec.ts
@@ -0,0 +1,129 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { flushPromises } from "@vue/test-utils";
+import { mountSuspended } from "@nuxt/test-utils/runtime";
+import SocialPanel from "~/components/hub/SocialPanel.vue";
+import LanPlayersList from "~/components/hub/LanPlayersList.vue";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useAuthStore } from "~/stores/AuthStore";
+import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
+
+const ME = "76561198000000601";
+const FRIEND = "76561198000000602";
+const STRANGER = "76561198000000603";
+const ASKED = "76561198000000604";
+const NEWCOMER = "76561198000000605";
+
+let unmount: (() => void) | undefined;
+
+afterEach(() => {
+  unmount?.();
+  unmount = undefined;
+  const store = useMatchmakingStore();
+  store.setLanRoster({ region: null, players: [] });
+  store.friends = [];
+  useAuthStore().me = undefined;
+});
+
+const player = (steam_id: string, name: string) => ({ steam_id, name });
+
+function atLan() {
+  useAuthStore().me = { steam_id: ME, name: "me", role: "user" } as any;
+  useApplicationSettingsStore().availableRegions = [
+    { value: "vulkan", description: "Vulkan LAN", is_lan: true },
+  ] as any;
+  const store = useMatchmakingStore();
+  store.friends = [
+    { steam_id: FRIEND, name: "friend", status: "Accepted" },
+    {
+      steam_id: ASKED,
+      name: "asked",
+      status: "Pending",
+      invited_by_steam_id: ME,
+    },
+  ] as any;
+  store.setLanRoster({
+    region: "vulkan",
+    players: [
+      player(ME, "me"),
+      player(FRIEND, "friend"),
+      player(STRANGER, "stranger"),
+      player(ASKED, "asked"),
+    ],
+  });
+  return store;
+}
+
+describe("the social panel's LAN tab", () => {
+  it("is not there when this tab isn't on a LAN", async () => {
+    const wrapper = await mountSuspended(SocialPanel, {
+      global: { stubs: { PlayersList: true } },
+    });
+    unmount = () => wrapper.unmount();
+
+    expect(wrapper.find('[data-testid="lan-tab"]').exists()).toBe(false);
+    expect(wrapper.findAll('[role="tab"]')).toHaveLength(1);
+  });
+
+  it("counts everyone at the LAN the api says this tab is on", async () => {
+    atLan();
+    const wrapper = await mountSuspended(SocialPanel, {
+      global: { stubs: { PlayersList: true, LanPlayersList: true } },
+    });
+    unmount = () => wrapper.unmount();
+    await flushPromises();
+
+    const tab = wrapper.get('[data-testid="lan-tab"]');
+    expect(tab.text()).toContain("LAN");
+    expect(tab.text()).toContain("4");
+  });
+});
+
+describe("the LAN list", () => {
+  async function mountList() {
+    const wrapper = await mountSuspended(LanPlayersList, {
+      global: {
+        stubs: {
+          FriendListItem: {
+            props: ["player", "online", "muted"],
+            template:
+              '<div class="lan-row" :data-online="String(online)">{{ player.name }}</div>',
+          },
+        },
+      },
+    });
+    unmount = () => wrapper.unmount();
+    await flushPromises();
+    return wrapper;
+  }
+
+  const names = (wrapper: any, section: string) =>
+    wrapper
+      .findAll(`[data-testid="${section}"] .lan-row`)
+      .map((row: any) => row.text());
+
+  it("lists who's at the LAN like Others did: not me, not my friends, but someone I asked", async () => {
+    atLan();
+    const wrapper = await mountList();
+
+    expect(wrapper.get('[data-testid="lan-region"]').text()).toBe("Vulkan LAN");
+    expect(names(wrapper, "lan-players")).toEqual(["stranger", "asked"]);
+  });
+
+  it("shows arrivals as just arrived and a leaver as having left", async () => {
+    const store = atLan();
+    const wrapper = await mountList();
+
+    store.applyLanPresence({
+      region: "vulkan",
+      joined: [player(NEWCOMER, "newcomer")],
+      left: [STRANGER],
+    });
+    await flushPromises();
+
+    expect(names(wrapper, "lan-arrived")).toEqual(["newcomer"]);
+    expect(
+      wrapper.get('[data-left="true"] .lan-row').attributes("data-online"),
+    ).toBe("false");
+    expect(wrapper.text()).toContain("Left the LAN");
+  });
+});
diff --git a/tests/components/hub/SocialPanelOthers.spec.ts b/tests/components/hub/SocialPanelOthers.spec.ts
deleted file mode 100644
index a5a35dc55..000000000
--- a/tests/components/hub/SocialPanelOthers.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-import { flushPromises } from "@vue/test-utils";
-import { mountSuspended } from "@nuxt/test-utils/runtime";
-import SocialPanel from "~/components/hub/SocialPanel.vue";
-import { useMatchmakingStore } from "~/stores/MatchmakingStore";
-
-let unmount: (() => void) | undefined;
-
-afterEach(() => {
-  unmount?.();
-  unmount = undefined;
-});
-
-describe("the social panel's Others tab", () => {
-  it("counts everyone online from the api's count, with no roster", async () => {
-    useMatchmakingStore().setOnlineCount(17);
-
-    const wrapper = await mountSuspended(SocialPanel, {
-      global: { stubs: { PlayersList: true } },
-    });
-    unmount = () => wrapper.unmount();
-    await flushPromises();
-
-    const others = wrapper
-      .findAll('[role="tab"]')
-      .find((tab) => tab.text().includes("Others"));
-    expect(others?.text()).toContain("17");
-  });
-});
diff --git a/tests/components/matchmaking-lobby/PlayersListTeams.spec.ts b/tests/components/matchmaking-lobby/PlayersListTeams.spec.ts
new file mode 100644
index 000000000..f9d0f67c4
--- /dev/null
+++ b/tests/components/matchmaking-lobby/PlayersListTeams.spec.ts
@@ -0,0 +1,79 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { defineComponent, h } from "vue";
+import { flushPromises } from "@vue/test-utils";
+import { mountSuspended } from "@nuxt/test-utils/runtime";
+import PlayersList from "~/components/matchmaking-lobby/PlayersList.vue";
+import { TooltipProvider } from "~/components/ui/tooltip";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useAuthStore } from "~/stores/AuthStore";
+
+const ME = "76561198000000701";
+const ONLINE = "76561198000000702";
+const OFFLINE = "76561198000000703";
+
+let unmount: (() => void) | undefined;
+
+afterEach(() => {
+  unmount?.();
+  unmount = undefined;
+  const store = useMatchmakingStore();
+  store.myTeams = [];
+  store.friends = [];
+  useAuthStore().me = undefined;
+});
+
+const member = (steam_id: string, name: string) => ({
+  player: { steam_id, name },
+});
+
+describe("teams in the friends list", () => {
+  it("lists each team I'm on with its other members, online first", async () => {
+    useAuthStore().me = { steam_id: ME, name: "me", role: "user" } as any;
+    const store = useMatchmakingStore();
+    store.ensureMyTeams = () => {};
+    store.friends = [];
+    store.myTeams = [
+      {
+        id: "team-1",
+        name: "Austrian Force",
+        roster: [
+          member(ME, "me"),
+          member(OFFLINE, "wiesel"),
+          member(ONLINE, "alex"),
+        ],
+      },
+      { id: "team-2", name: "Just Me", roster: [member(ME, "me")] },
+    ] as any;
+    store.setFriendsOnline([ONLINE]);
+
+    const InProvider = defineComponent({
+      render: () => h(TooltipProvider, () => h(PlayersList)),
+    });
+    const wrapper = await mountSuspended(InProvider, {
+      global: {
+        stubs: {
+          FriendListItem: {
+            props: ["player", "muted"],
+            template:
+              '<div class="team-row" :data-muted="String(muted)">{{ player.name }}</div>',
+          },
+        },
+      },
+    });
+    unmount = () => wrapper.unmount();
+    await flushPromises();
+
+    const text = wrapper.text();
+    expect(text).toContain("Team · Austrian Force");
+    expect(text).toContain("1/2");
+    expect(text).not.toContain("Just Me");
+    expect(
+      wrapper
+        .findAll(".team-row")
+        .map((row) => [row.text(), row.attributes("data-muted")]),
+    ).toEqual([
+      ["alex", "false"],
+      ["wiesel", "true"],
+    ]);
+  });
+});
diff --git a/tests/layouts/components/SystemStatusOnlineCount.spec.ts b/tests/layouts/components/SystemStatusOnlineCount.spec.ts
index 7cec589ef..106aedd8c 100644
--- a/tests/layouts/components/SystemStatusOnlineCount.spec.ts
+++ b/tests/layouts/components/SystemStatusOnlineCount.spec.ts
@@ -35,8 +35,12 @@ async function mountAs(role: e_player_roles_enum) {
 }
 
 describe("the online count on the status globe", () => {
-  it("shows an administrator how many players are online", async () => {
-    const wrapper = await mountAs(e_player_roles_enum.administrator);
+  it.each([
+    e_player_roles_enum.match_organizer,
+    e_player_roles_enum.tournament_organizer,
+    e_player_roles_enum.administrator,
+  ])("shows a %s how many players are online", async (role) => {
+    const wrapper = await mountAs(role);
 
     expect(wrapper.get('[data-testid="players-online-count"]').text()).toBe(
       "42",
@@ -51,8 +55,13 @@ describe("the online count on the status globe", () => {
     ).toContain("42 online");
   });
 
-  it("shows a player no online count", async () => {
-    const wrapper = await mountAs(e_player_roles_enum.user);
+  it.each([
+    e_player_roles_enum.user,
+    e_player_roles_enum.verified_user,
+    e_player_roles_enum.streamer,
+    e_player_roles_enum.moderator,
+  ])("shows a %s no online count", async (role) => {
+    const wrapper = await mountAs(role);
 
     expect(wrapper.find('[data-testid="players-online-count"]').exists()).toBe(
       false,
diff --git a/tests/stores/lanPresence.spec.ts b/tests/stores/lanPresence.spec.ts
new file mode 100644
index 000000000..4ffb1e2c5
--- /dev/null
+++ b/tests/stores/lanPresence.spec.ts
@@ -0,0 +1,128 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createPinia, setActivePinia } from "pinia";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { useAuthStore } from "~/stores/AuthStore";
+import { e_player_roles_enum } from "~/generated/zeus";
+
+vi.mock("~/web-sockets/Socket", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("~/web-sockets/Socket")>()),
+  default: {
+    connect() {},
+    rejoinAll() {},
+    event() {},
+    listen: () => ({ stop() {} }),
+    joinLobby: () => ({ messages: [], on() {}, leave() {} }),
+    markLobbyRead() {},
+  },
+}));
+
+const ME = "76561198000000501";
+const ALPHA = "76561198000000502";
+const BRAVO = "76561198000000503";
+
+const profile = (steam_id: string) => ({ steam_id, name: `p${steam_id}` });
+const ids = (rows: Array<any>) => rows.map((row) => row.steam_id);
+
+function freshStore() {
+  setActivePinia(createPinia());
+  useAuthStore().me = { steam_id: ME, role: e_player_roles_enum.user } as any;
+  return useMatchmakingStore();
+}
+
+beforeEach(() => {
+  const client = useApollo().clients!.default;
+  vi.spyOn(client, "query").mockResolvedValue({ data: {} } as any);
+  vi.spyOn(client, "subscribe").mockImplementation(
+    () =>
+      ({
+        subscribe: () => ({ unsubscribe() {}, closed: false }),
+      }) as any,
+  );
+});
+
+afterEach(() => {
+  vi.useRealTimers();
+  vi.restoreAllMocks();
+});
+
+describe("the LAN this tab is on", () => {
+  it("takes everyone at the LAN from the api's roster", () => {
+    const store = freshStore();
+
+    store.setLanRoster({
+      region: "vulkan",
+      players: [profile(ME), profile(ALPHA)],
+    });
+
+    expect(store.lanRegion).toBe("vulkan");
+    expect(ids(store.lanPlayers)).toEqual([ME, ALPHA]);
+  });
+
+  it("adds arrivals as just arrived and keeps a leaver greyed for 30 seconds", () => {
+    vi.useFakeTimers();
+    const store = freshStore();
+    store.setLanRoster({ region: "vulkan", players: [profile(ALPHA)] });
+
+    store.applyLanPresence({
+      region: "vulkan",
+      joined: [profile(BRAVO)],
+      left: [ALPHA],
+    });
+
+    expect(ids(store.lanPlayers)).toEqual([ALPHA, BRAVO]);
+    expect(store.lanArrivals).toEqual([BRAVO]);
+    expect(store.lanLeft).toEqual([ALPHA]);
+
+    vi.advanceTimersByTime(30_000);
+    expect(ids(store.lanPlayers)).toEqual([BRAVO]);
+    expect(store.lanLeft).toEqual([]);
+  });
+
+  it("keeps someone who comes back before their 30 seconds are up", () => {
+    vi.useFakeTimers();
+    const store = freshStore();
+    store.setLanRoster({ region: "vulkan", players: [profile(ALPHA)] });
+
+    store.applyLanPresence({ region: "vulkan", left: [ALPHA] });
+    store.applyLanPresence({ region: "vulkan", joined: [profile(ALPHA)] });
+    vi.advanceTimersByTime(30_000);
+
+    expect(ids(store.lanPlayers)).toEqual([ALPHA]);
+    expect(store.lanLeft).toEqual([]);
+  });
+
+  it("ignores presence for another LAN, and drops the LAN when the api says none", () => {
+    const store = freshStore();
+    store.setLanRoster({ region: "vulkan", players: [profile(ALPHA)] });
+
+    store.applyLanPresence({ region: "haag", joined: [profile(BRAVO)] });
+    expect(ids(store.lanPlayers)).toEqual([ALPHA]);
+
+    store.setLanRoster({ region: null, players: [] });
+    expect(store.lanRegion).toBeNull();
+    expect(store.lanPlayers).toEqual([]);
+  });
+});
+
+describe("checking which search results are online", () => {
+  it("answers each check by its own request id", async () => {
+    const store = freshStore();
+    const sent: Array<[string, Array<string>]> = [];
+    store.sendOnlineCheck = (requestId: string, steamIds: Array<string>) => {
+      sent.push([requestId, steamIds]);
+    };
+
+    const first = store.checkOnline([ALPHA, BRAVO, ALPHA]);
+    const second = store.checkOnline([BRAVO]);
+
+    expect(sent.map(([, steamIds]) => steamIds)).toEqual([
+      [ALPHA, BRAVO],
+      [BRAVO],
+    ]);
+    store.setOnlineCheck({ requestId: sent[1][0], online: [BRAVO] });
+    store.setOnlineCheck({ requestId: sent[0][0], online: [ALPHA] });
+
+    expect([...(await first).online]).toEqual([ALPHA]);
+    expect([...(await second).online]).toEqual([BRAVO]);
+  });
+});
diff --git a/web-sockets/Socket.ts b/web-sockets/Socket.ts
index 2fbb565cc..dc39c8b36 100644
--- a/web-sockets/Socket.ts
+++ b/web-sockets/Socket.ts
@@ -1312,6 +1312,18 @@ socket.listen("friend-presence", (presence) => {
   useMatchmakingStore().setFriendPresence(presence);
 });
 
+socket.listen("lan-roster", (roster) => {
+  useMatchmakingStore().setLanRoster(roster);
+});
+
+socket.listen("lan-presence", (presence) => {
+  useMatchmakingStore().applyLanPresence(presence);
+});
+
+socket.listen("players-online:check", (reply) => {
+  useMatchmakingStore().setOnlineCheck(reply);
+});
+
 socket.listen("players-online:count", (count) => {
   useMatchmakingStore().setOnlineCount(count);
 });