From ffefd56192bf2b5db3192c52e5ff0e942eefa9ef Mon Sep 17 00:00:00 2001
From: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:01:53 +1000
Subject: [PATCH] Reverted dev code

---
 .gitignore                 | 1 +
 api/account/discord.go     | 2 --
 beta.env                   | 6 +++---
 docker-compose.Example.yml | 5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7854bc..58d21fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ secret.key
 *.iws
 .vscode/launch.json
 
+/.vs
diff --git a/api/account/discord.go b/api/account/discord.go
index 33c2921..bf2a00f 100644
--- a/api/account/discord.go
+++ b/api/account/discord.go
@@ -112,8 +112,6 @@ func RetrieveDiscordId(code string) (string, error) {
 }
 
 func IsUserDiscordAdmin(discordId string, discordGuildID string) (bool, error) {
-	return discordId == "256000469158068224", nil
-
 	// fetch all roles from discord
 	roles, err := DiscordSession.GuildRoles(discordGuildID)
 	if err != nil {
diff --git a/beta.env b/beta.env
index f554063..079128a 100644
--- a/beta.env
+++ b/beta.env
@@ -1,6 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=http://192.168.1.101:8001
+VITE_SERVER_URL=http://{serverIP}:8001
 VITE_DISCORD_CLIENT_ID=1248062921129459756
 VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
 VITE_I18N_DEBUG=1
@@ -9,5 +9,5 @@ dbaddr=db
 dbuser=pokerogue
 dbpass=pokerogue
 dbname=pokeroguedb 
-gameurl=http://192.168.1.100:8000 
-callbackurl=http://192.168.1.101:8001
\ No newline at end of file
+gameurl=http://{devMachineIP}:8000 
+callbackurl=http://{serverIP}:8001
\ No newline at end of file
diff --git a/docker-compose.Example.yml b/docker-compose.Example.yml
index 09e46de..480d36d 100644
--- a/docker-compose.Example.yml
+++ b/docker-compose.Example.yml
@@ -1,8 +1,7 @@
 services:
   server:
-    env_file:
-      - beta.env
-    image: rogueserver:latest
+    command: --debug --dbaddr db --dbuser pokerogue --dbpass pokerogue --dbname pokeroguedb --gameurl http://localhost:8000 --callbackurl http://localhost:8001 
+    image: ghcr.io/pagefaultgames/rogueserver:master
     restart: unless-stopped
     depends_on:
       db: