From f61df470eff582f33fb7102f6ef9ca7428f05f19 Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Sat, 16 Dec 2023 01:28:08 +0000
Subject: [PATCH] Remove auto whitelist

This feature is broken and not really something the tool should be doing
Fixes #52
---
 bootstrap/geyser/build.gradle.kts                |  4 ----
 .../geyser/MCXboxBroadcastExtension.java         | 16 ----------------
 bootstrap/geyser/src/main/resources/config.yml   |  3 ---
 .../core/configs/ExtensionConfig.java            |  1 -
 gradle/libs.versions.toml                        |  1 -
 5 files changed, 25 deletions(-)

diff --git a/bootstrap/geyser/build.gradle.kts b/bootstrap/geyser/build.gradle.kts
index fd38a3a..87fb7a5 100644
--- a/bootstrap/geyser/build.gradle.kts
+++ b/bootstrap/geyser/build.gradle.kts
@@ -9,10 +9,6 @@ dependencies {
     api(project(":core"))
     api(libs.bundles.jackson.yaml)
     compileOnly(libs.bundles.geyser)
-    compileOnly(libs.floodgate.spigot) {
-        exclude("dev.folia")
-        exclude("com.mojang")
-    }
 }
 
 nameJar("MCXboxBroadcastExtension")
diff --git a/bootstrap/geyser/src/main/java/com/rtm516/mcxboxbroadcast/bootstrap/geyser/MCXboxBroadcastExtension.java b/bootstrap/geyser/src/main/java/com/rtm516/mcxboxbroadcast/bootstrap/geyser/MCXboxBroadcastExtension.java
index 7e2ac54..4514566 100644
--- a/bootstrap/geyser/src/main/java/com/rtm516/mcxboxbroadcast/bootstrap/geyser/MCXboxBroadcastExtension.java
+++ b/bootstrap/geyser/src/main/java/com/rtm516/mcxboxbroadcast/bootstrap/geyser/MCXboxBroadcastExtension.java
@@ -182,21 +182,5 @@ private void tick() {
         } catch (SessionUpdateException e) {
             sessionManager.logger().error("Failed to update session information!", e);
         }
-
-        // If we are in spigot, using floodgate authentication and have the config option enabled
-        // get the users friends and whitelist them
-        if (this.geyserApi().defaultRemoteServer().authType() == AuthType.FLOODGATE
-                && this.geyserApi().platformType() == PlatformType.SPIGOT // TODO Find API equivalent
-                && config.whitelistFriends()) {
-            try {
-                for (FollowerResponse.Person person : sessionManager.friendManager().get()) {
-                    if (WhitelistUtils.addPlayer(Utils.getJavaUuid(person.xuid), "unknown")) {
-                        sessionManager.logger().info("Added xbox friend " + person.displayName + " to whitelist");
-                    }
-                }
-            } catch (XboxFriendsException e) {
-                sessionManager.logger().error("Failed to fetch xbox friends for whitelist!", e);
-            }
-        }
     }
 }
diff --git a/bootstrap/geyser/src/main/resources/config.yml b/bootstrap/geyser/src/main/resources/config.yml
index 928cb4c..278a20a 100644
--- a/bootstrap/geyser/src/main/resources/config.yml
+++ b/bootstrap/geyser/src/main/resources/config.yml
@@ -11,9 +11,6 @@ remote-port: auto
 # Warning: This can be no lower than 20 due to xbox rate limits
 update-interval: 30
 
-# Should Xbox Live friends automatically be whitelisted
-whitelist-friends: false
-
 # Friend/follower list sync settings
 friend-sync:
   # The amount of time in seconds to check for follower changes
diff --git a/core/src/main/java/com/rtm516/mcxboxbroadcast/core/configs/ExtensionConfig.java b/core/src/main/java/com/rtm516/mcxboxbroadcast/core/configs/ExtensionConfig.java
index c0707ed..919dfa7 100644
--- a/core/src/main/java/com/rtm516/mcxboxbroadcast/core/configs/ExtensionConfig.java
+++ b/core/src/main/java/com/rtm516/mcxboxbroadcast/core/configs/ExtensionConfig.java
@@ -6,6 +6,5 @@ public record ExtensionConfig(
     @JsonProperty("remote-address") String remoteAddress,
     @JsonProperty("remote-port") String remotePort,
     @JsonProperty("update-interval") int updateInterval,
-    @JsonProperty("whitelist-friends") boolean whitelistFriends,
     @JsonProperty("friend-sync") FriendSyncConfig friendSync) {
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e915306..9c32d53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,6 @@ methanol = "1.7.0"
 
 [libraries]
 bedrock-common = { group = "com.nukkitx.protocol", name = "bedrock-common", version.ref = "bedrock-common" }
-floodgate-spigot = { group = "org.geysermc.floodgate", name = "spigot", version.ref = "floodgate" }
 geyser-api = { group = "org.geysermc.geyser", name = "api", version.ref = "geyser" }
 geyser-core = { group = "org.geysermc.geyser", name = "core", version.ref = "geyser" }