Fix discord queries

Author: Veyronity

src/main/java/net/earthmc/emcapi/endpoint/towny/PlayersEndpoint.java

@@ -6,9 +6,9 @@
 import com.palmergames.bukkit.towny.TownyAPI;
 import com.palmergames.bukkit.towny.TownyEconomyHandler;
 import com.palmergames.bukkit.towny.object.Resident;
-import github.scarsz.discordsrv.DiscordSRV;
 import io.javalin.http.BadRequestResponse;
 import net.earthmc.emcapi.EMCAPI;
+import net.earthmc.emcapi.integration.DiscordIntegration;
 import net.earthmc.emcapi.integration.Integrations;
 import net.earthmc.emcapi.manager.KeyManager;
 import net.earthmc.emcapi.object.endpoint.PostEndpoint;
@@ -22,6 +22,7 @@
 
 public class PlayersEndpoint extends PostEndpoint<Resident> {
     private static final Pattern DISCORD_ID_PATTERN = Pattern.compile("^\\d{17,19}$");
+    private final DiscordIntegration integration = Integrations.getIntegration("DiscordSRV");
 
     public PlayersEndpoint(final EMCAPI plugin) {
         super(plugin);
@@ -39,7 +40,7 @@ public Resident getObjectOrNull(JsonElement element, @Nullable String key) {
             resident = TownyAPI.getInstance().getResident(string);
         }
         if (resident == null && DISCORD_ID_PATTERN.matcher(string).find()) {
-            UUID uuid = getUUIDFromDiscordId(string);
+            UUID uuid = integration.getUUID(string);
             if (uuid != null) {
                 resident = TownyAPI.getInstance().getResident(uuid);
             }
@@ -95,7 +96,7 @@ public JsonElement getJsonElement(Resident resident, @Nullable String key) {
 
         playerObject.add("friends", EndpointUtils.getResidentArray(resident.getFriends()));
 
-        playerObject.addProperty("discord", getDiscordId(resident.getUUID()));
+        playerObject.addProperty("discord", integration.getDiscord(resident.getUUID()));
 
         return playerObject;
     }
@@ -109,20 +110,4 @@ private JsonArray getRankArray(List<String> ranks) {
 
         return jsonArray;
     }
-
-    private String getDiscordId(UUID uuid) {
-        if (!Integrations.getIntegration("DiscordSRV").isEnabled() || DiscordSRV.getPlugin().getAccountLinkManager() == null) {
-            return null;
-        }
-
-        return DiscordSRV.getPlugin().getAccountLinkManager().getDiscordId(uuid);
-    }
-
-    private UUID getUUIDFromDiscordId(String discordId) {
-        if (!Integrations.getIntegration("DiscordSRV").isEnabled() || !DISCORD_ID_PATTERN.matcher(discordId).find() || DiscordSRV.getPlugin().getAccountLinkManager() == null) {
-            return null;
-        }
-
-        return DiscordSRV.getPlugin().getAccountLinkManager().getUuid(discordId);
-    }
 }

src/main/java/net/earthmc/emcapi/integration/DiscordIntegration.java

@@ -1,7 +1,69 @@
 package net.earthmc.emcapi.integration;
 
+import com.palmergames.bukkit.towny.TownyAPI;
+import com.palmergames.bukkit.towny.object.Resident;
+import github.scarsz.discordsrv.DiscordSRV;
+import github.scarsz.discordsrv.api.ListenerPriority;
+import github.scarsz.discordsrv.api.Subscribe;
+import github.scarsz.discordsrv.api.events.AccountLinkedEvent;
+import github.scarsz.discordsrv.api.events.AccountUnlinkedEvent;
+import org.bukkit.OfflinePlayer;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 public class DiscordIntegration extends Integration {
+    private static final Map<UUID, String> UUID_TO_DISCORD = new ConcurrentHashMap<>();
+    private static final Map<String, UUID> DISCORD_TO_UUID = new ConcurrentHashMap<>();
+
     public DiscordIntegration() {
         super("DiscordSRV");
     }
+
+    @Override
+    public void register() {
+        super.register();
+        if (isEnabled()) {
+            plugin.getServer().getAsyncScheduler().runDelayed(plugin, t -> {
+                Set<UUID> uuids = TownyAPI.getInstance().getResidents().stream().filter(res -> !res.isNPC()).map(Resident::getUUID).collect(Collectors.toSet());
+
+                Map<UUID, String> result = DiscordSRV.getPlugin().getAccountLinkManager().getManyDiscordIds(uuids);
+                UUID_TO_DISCORD.putAll(result);
+
+                for (Map.Entry<UUID, String> entry : result.entrySet()) {
+                    DISCORD_TO_UUID.put(entry.getValue(), entry.getKey());
+                }
+            }, 30, TimeUnit.SECONDS);
+        }
+    }
+
+    public UUID getUUID(String discordId) {
+        return DISCORD_TO_UUID.get(discordId);
+    }
+
+    public String getDiscord(UUID uuid) {
+        return UUID_TO_DISCORD.get(uuid);
+    }
+
+    @Subscribe(priority = ListenerPriority.MONITOR)
+    public void onDiscordLink(AccountLinkedEvent event) {
+        OfflinePlayer player = event.getPlayer();
+        String discordId = event.getUser().getId();
+
+        UUID_TO_DISCORD.put(player.getUniqueId(), discordId);
+        DISCORD_TO_UUID.put(discordId, player.getUniqueId());
+    }
+
+    @Subscribe(priority = ListenerPriority.MONITOR)
+    public void onDiscordUnlink(AccountUnlinkedEvent event) {
+        OfflinePlayer player = event.getPlayer();
+        String discordId = event.getDiscordId();
+
+        UUID_TO_DISCORD.remove(player.getUniqueId());
+        DISCORD_TO_UUID.remove(discordId);
+    }
 }