From 98586762912de82b64df825aa4850cdc492c8c0b Mon Sep 17 00:00:00 2001
From: JasonReed-2 <Jreed21649@gmail.com>
Date: Wed, 4 Oct 2023 22:20:38 -0500
Subject: [PATCH 1/3] Add icon, filtering, and scoring based on friends.

---
 src/common/model/settings.ts              |  1 +
 src/renderer/views/multiplayer/custom.vue | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/common/model/settings.ts b/src/common/model/settings.ts
index 373084dd..941ff0f6 100644
--- a/src/common/model/settings.ts
+++ b/src/common/model/settings.ts
@@ -12,4 +12,5 @@ export const settingsSchema = Type.Object({
     battlesHidePvE: Type.Boolean({ default: false }),
     battlesHideLocked: Type.Boolean({ default: false }),
     battlesHideEmpty: Type.Boolean({ default: true }),
+    battlesHideNoFriends: Type.Boolean({ default: false })
 });
diff --git a/src/renderer/views/multiplayer/custom.vue b/src/renderer/views/multiplayer/custom.vue
index 7a256601..c243cc1f 100644
--- a/src/renderer/views/multiplayer/custom.vue
+++ b/src/renderer/views/multiplayer/custom.vue
@@ -17,6 +17,7 @@
                 <Checkbox v-model="settings.battlesHideLocked" label="Hide Locked" />
                 <Checkbox v-model="settings.battlesHideEmpty" label="Hide Empty" />
                 <Checkbox v-model="settings.battlesHideInProgress" label="Hide Running" />
+                <Checkbox v-model="settings.battlesHideNoFriends" label="Only Friends" />
                 <SearchBox v-model="searchVal" />
             </div>
 
@@ -60,7 +61,7 @@
                         <template #body="{ data }">
                             <div class="flex-row flex-center-items gap-md">
                                 <div v-if="data.players.value.length > 0" class="flex-row flex-center-items" style="gap: 2px">
-                                    <Icon :icon="account" height="17" />{{ data.players.value.length }}
+                                    <Icon :icon="friendsInBattle(data).length > 0 ? accountMultiple : account" height="17" />{{ data.players.value.length }}
                                 </div>
                                 <div v-if="data.spectators.value.length > 0" class="flex-row flex-center-items gap-xs" style="gap: 4px">
                                     <Icon :icon="eye" height="17" />{{ data.spectators.value.length }}
@@ -104,6 +105,7 @@
 
 import { Icon } from "@iconify/vue";
 import account from "@iconify-icons/mdi/account";
+import accountMultiple from "@iconify-icons/mdi/account-multiple";
 import eye from "@iconify-icons/mdi/eye";
 import lock from "@iconify-icons/mdi/lock";
 import robot from "@iconify-icons/mdi/robot";
@@ -155,6 +157,9 @@ const battles = computed(() => {
                 return false;
             }
         }
+        if (settings.battlesHideNoFriends && friendsInBattle(battle).length === 0) {
+            return false;
+        }
         if (searchVal.value.length > 0) {
             const searchTerm = searchVal.value.toLowerCase();
             if (battle.battleOptions.title.toLowerCase().includes(searchTerm)) {
@@ -189,6 +194,13 @@ const battles = computed(() => {
     return scoredBattles;
 });
 
+function friendsInBattle(battle: SpadsBattle) {
+    const friends = api.session.friends.value;
+    const playersInBattle = battle.players.value;
+    const friendsInBattle = playersInBattle.filter((player) => friends.includes(player));
+    return friendsInBattle;
+}
+
 function battleScoreTooltip(data: ScoredSpadsBattle) {
     const scoreExplanation = `\
 All Sorting Factors: ${data.score.toFixed(2)}
@@ -271,7 +283,10 @@ function scoreBattle(battle: SpadsBattle) {
 
     // TODO: within skill range
     // TODO: median skill close to won
-    // TODO: friend in lobby
+    const friendsInBattleList = friendsInBattle(battle);
+    if (friendsInBattleList.length > 0) {
+        addFactor("Friends In Battle", friendsInBattleList.length * 0.5)
+    }
     // TODO: blocked in lobby
     // TODO: Highly rated map
     // TODO: Downloaded map

From 81a96ba0089b063fea677d792b9e81d531964f78 Mon Sep 17 00:00:00 2001
From: JasonReed-2 <Jreed21649@gmail.com>
Date: Wed, 4 Oct 2023 22:22:47 -0500
Subject: [PATCH 2/3] format

---
 src/common/model/settings.ts              | 2 +-
 src/renderer/views/multiplayer/custom.vue | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/model/settings.ts b/src/common/model/settings.ts
index 941ff0f6..7fe382c1 100644
--- a/src/common/model/settings.ts
+++ b/src/common/model/settings.ts
@@ -12,5 +12,5 @@ export const settingsSchema = Type.Object({
     battlesHidePvE: Type.Boolean({ default: false }),
     battlesHideLocked: Type.Boolean({ default: false }),
     battlesHideEmpty: Type.Boolean({ default: true }),
-    battlesHideNoFriends: Type.Boolean({ default: false })
+    battlesHideNoFriends: Type.Boolean({ default: false }),
 });
diff --git a/src/renderer/views/multiplayer/custom.vue b/src/renderer/views/multiplayer/custom.vue
index c243cc1f..fbd88e98 100644
--- a/src/renderer/views/multiplayer/custom.vue
+++ b/src/renderer/views/multiplayer/custom.vue
@@ -61,7 +61,9 @@
                         <template #body="{ data }">
                             <div class="flex-row flex-center-items gap-md">
                                 <div v-if="data.players.value.length > 0" class="flex-row flex-center-items" style="gap: 2px">
-                                    <Icon :icon="friendsInBattle(data).length > 0 ? accountMultiple : account" height="17" />{{ data.players.value.length }}
+                                    <Icon :icon="friendsInBattle(data).length > 0 ? accountMultiple : account" height="17" />{{
+                                        data.players.value.length
+                                    }}
                                 </div>
                                 <div v-if="data.spectators.value.length > 0" class="flex-row flex-center-items gap-xs" style="gap: 4px">
                                     <Icon :icon="eye" height="17" />{{ data.spectators.value.length }}
@@ -285,7 +287,7 @@ function scoreBattle(battle: SpadsBattle) {
     // TODO: median skill close to won
     const friendsInBattleList = friendsInBattle(battle);
     if (friendsInBattleList.length > 0) {
-        addFactor("Friends In Battle", friendsInBattleList.length * 0.5)
+        addFactor("Friends In Battle", friendsInBattleList.length * 0.5);
     }
     // TODO: blocked in lobby
     // TODO: Highly rated map

From 3061a99f0bd6a16c140a39b63aceeb46cf977186 Mon Sep 17 00:00:00 2001
From: JasonReed-2 <Jreed21649@gmail.com>
Date: Sun, 8 Oct 2023 17:01:11 -0500
Subject: [PATCH 3/3] Make friend icon green

---
 src/renderer/views/multiplayer/custom.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/multiplayer/custom.vue b/src/renderer/views/multiplayer/custom.vue
index fbd88e98..79487433 100644
--- a/src/renderer/views/multiplayer/custom.vue
+++ b/src/renderer/views/multiplayer/custom.vue
@@ -61,9 +61,11 @@
                         <template #body="{ data }">
                             <div class="flex-row flex-center-items gap-md">
                                 <div v-if="data.players.value.length > 0" class="flex-row flex-center-items" style="gap: 2px">
-                                    <Icon :icon="friendsInBattle(data).length > 0 ? accountMultiple : account" height="17" />{{
-                                        data.players.value.length
-                                    }}
+                                    <Icon
+                                        :color="friendsInBattle(data).length > 0 ? 'green' : ''"
+                                        :icon="friendsInBattle(data).length > 0 ? accountMultiple : account"
+                                        height="17"
+                                    />{{ data.players.value.length }}
                                 </div>
                                 <div v-if="data.spectators.value.length > 0" class="flex-row flex-center-items gap-xs" style="gap: 4px">
                                     <Icon :icon="eye" height="17" />{{ data.spectators.value.length }}