From be169e6d203f67bcf36e3258b8b7ecdce1dd5855 Mon Sep 17 00:00:00 2001
From: jere0500 <123008073+jere0500@users.noreply.github.com>
Date: Sun, 9 Jun 2024 21:14:07 +0200
Subject: [PATCH] Allow friends to join private battles without a password
 (#285)

---
 lib/teiserver/coordinator/consul_server.ex | 2 +-
 lib/teiserver/lobby.ex                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/teiserver/coordinator/consul_server.ex b/lib/teiserver/coordinator/consul_server.ex
index 715050fc8..e731e665c 100644
--- a/lib/teiserver/coordinator/consul_server.ex
+++ b/lib/teiserver/coordinator/consul_server.ex
@@ -1012,7 +1012,7 @@ defmodule Teiserver.Coordinator.ConsulServer do
 
       state.gatekeeper == "friends" ->
         if is_on_friendlist?(userid, state, :all) do
-          {true, nil}
+          {true, :allow_friends}
         else
           {false, "Friends only gatekeeper"}
         end
diff --git a/lib/teiserver/lobby.ex b/lib/teiserver/lobby.ex
index 8e13ca59d..2a087e23a 100644
--- a/lib/teiserver/lobby.ex
+++ b/lib/teiserver/lobby.ex
@@ -565,7 +565,7 @@ defmodule Teiserver.Lobby do
       Enum.any?([
         CacheUser.is_moderator?(user),
         Enum.member?(user.roles, "Caster"),
-        consul_reason == :override_approve
+        consul_reason in [:override_approve, :allow_friends]
       ])
 
     ignore_locked =