accessing a web api in the main thread isn't safe (#1) :/ so made tha…

…t async
aBooDyy · Oct 30, 2020 · 6c0fc55 · 6c0fc55
1 parent c19972f
commit 6c0fc55
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# Project exclude paths
+/target/
diff --git a/pom.xml b/pom.xml
@@ -13,8 +13,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>7</source>
-                    <target>7</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/java/net/aboodyy/localtime/DateManager.java b/src/main/java/net/aboodyy/localtime/DateManager.java
@@ -20,11 +20,13 @@
 
 package net.aboodyy.localtime;
 
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -36,7 +38,7 @@
 
 public class DateManager implements Listener {
 
-    private Map<UUID, String> timezones;
+    private final Map<UUID, String> timezones;
 
     DateManager() {
         timezones = new HashMap<>();
@@ -51,44 +53,53 @@ public String getDate(String format, String timezone) {
         return dateFormat.format(date);
     }
 
-    public String getTimeZone(Player p) {
-        final String FAILED = "[LocalTime] Couldn't get " + p.getName() + "'s timezone. Will use default timezone.";
+    public String getTimeZone(Player player) {
+        final String FAILED = "[LocalTime] Couldn't get " + player.getName() + "'s timezone. Will use default timezone.";
         String timezone = TimeZone.getDefault().getID();
 
-        if (timezones.containsKey(p.getUniqueId()))
-            return timezones.get(p.getUniqueId());
+        if (timezones.containsKey(player.getUniqueId()))
+            return timezones.get(player.getUniqueId());
+
+        InetSocketAddress address = player.getAddress();
+        timezones.put(player.getUniqueId(), timezone);
 
-        InetSocketAddress address = p.getAddress();
         if (address == null) {
             Bukkit.getLogger().info(FAILED);
-
-            timezones.put(p.getUniqueId(), timezone);
             return timezone;
         }
 
-        try {
-            URL api = new URL("https://ipapi.co/" + address.getAddress().getHostAddress() + "/timezone/");
-            URLConnection connection = api.openConnection();
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                String timezone;
 
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            timezone = bufferedReader.readLine();
-        } catch (Exception e) {
-            Bukkit.getLogger().info(FAILED);
-        }
+                try {
+                    URL api = new URL("https://ipapi.co/" + address.getAddress().getHostAddress() + "/timezone/");
+                    URLConnection connection = api.openConnection();
 
-        if (timezone.equalsIgnoreCase("undefined")) {
-            Bukkit.getLogger().info(FAILED);
-            timezone = TimeZone.getDefault().getID();
-        }
+                    BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                    timezone = bufferedReader.readLine();
+                } catch (Exception e) {
+                    timezone = "undefined";
+                }
+
+                if (timezone.equalsIgnoreCase("undefined")) {
+                    Bukkit.getLogger().info(FAILED);
+                    timezone = TimeZone.getDefault().getID();
+                }
+
+                timezones.put(player.getUniqueId(), timezone);
+            }
+        }.runTaskAsynchronously(PlaceholderAPIPlugin.getInstance());
 
-        timezones.put(p.getUniqueId(), timezone);
-        return timezone;
+        return timezones.get(player.getUniqueId());
     }
 
     public void clear() {
         timezones.clear();
     }
 
+    @SuppressWarnings("unused")
     @EventHandler
     public void onLeave(PlayerQuitEvent e) {
         timezones.remove(e.getPlayer().getUniqueId());

diff --git a/src/main/java/net/aboodyy/localtime/LocalTimeExpansion.java b/src/main/java/net/aboodyy/localtime/LocalTimeExpansion.java
@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@SuppressWarnings("unused")
 public class LocalTimeExpansion extends PlaceholderExpansion implements Cacheable, Configurable {
 
     private DateManager dateManager;