GH-1147 Make UserManager use UserRepository

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkKickController.java

@@ -9,6 +9,7 @@
 import com.eternalcode.core.translation.TranslationManager;
 import com.eternalcode.core.user.User;
 import com.eternalcode.core.user.UserManager;
+import java.util.Optional;
 import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -56,7 +57,8 @@ void onAfkSwitch(AfkSwitchEvent event) {
             return;
         }
 
-        User user = this.userManager.getOrCreate(playerUUID, player.getName());
+        Optional<User> optionalUser = this.userManager.getUser(playerUUID);
+        User user = optionalUser.get();
         Translation translation = this.translationManager.getMessages(user.getUniqueId());
 
         Component component = this.miniMessage.deserialize(translation.afk().afkKickReason());

eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/MsgServiceImpl.java

@@ -13,9 +13,9 @@
 import com.google.common.cache.CacheBuilder;
 import java.time.Duration;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 @Service
@@ -27,6 +27,7 @@ class MsgServiceImpl implements MsgService {
     private final MsgPresenter presenter;
     private final EventCaller eventCaller;
     private final MsgToggleService msgToggleService;
+    private final Server server;
 
     private final Cache<UUID, UUID> replies = CacheBuilder.newBuilder()
         .expireAfterWrite(Duration.ofHours(1))
@@ -40,7 +41,7 @@ class MsgServiceImpl implements MsgService {
         IgnoreService ignoreService,
         UserManager userManager,
         EventCaller eventCaller,
-        MsgToggleService msgToggleService
+        MsgToggleService msgToggleService, Server server
     ) {
         this.noticeService = noticeService;
         this.ignoreService = ignoreService;
@@ -49,15 +50,31 @@ class MsgServiceImpl implements MsgService {
         this.msgToggleService = msgToggleService;
 
         this.presenter = new MsgPresenter(noticeService);
+        this.server = server;
     }
 
-    void privateMessage(User sender, User target, String message) {
-        if (target.getClientSettings().isOffline()) {
+    @Override
+    public void reply(Player sender, String message) {
+        UUID uuid = this.replies.getIfPresent(sender.getUniqueId());
+
+        if (uuid == null) {
+            this.noticeService.player(sender.getUniqueId(), translation -> translation.msg().noReply());
+
+            return;
+        }
+
+        Player target = this.server.getPlayer(uuid);
+        if (target == null) {
             this.noticeService.player(sender.getUniqueId(), translation -> translation.argument().offlinePlayer());
 
             return;
         }
 
+        this.sendMessage(sender, target, message);
+    }
+
+    @Override
+    public void sendMessage(Player sender, Player target, String message) {
         UUID uniqueId = target.getUniqueId();
 
         this.msgToggleService.getState(uniqueId).thenAccept(msgState -> {
@@ -75,33 +92,11 @@ void privateMessage(User sender, User target, String message) {
 
                 MsgEvent event = new MsgEvent(sender.getUniqueId(), uniqueId, message);
                 this.eventCaller.callEvent(event);
-                this.presenter.onMessage(new Message(sender, target, event.getContent(), this.socialSpy, isIgnored));
+                this.presenter.onMessage(new Message(toUser(sender), toUser(target), event.getContent(), this.socialSpy, isIgnored));
             });
         });
     }
 
-    void reply(User sender, String message) {
-        UUID uuid = this.replies.getIfPresent(sender.getUniqueId());
-
-        if (uuid == null) {
-            this.noticeService.player(sender.getUniqueId(), translation -> translation.msg().noReply());
-
-            return;
-        }
-
-        Optional<User> targetOption = this.userManager.getUser(uuid);
-
-        if (targetOption.isEmpty()) {
-            this.noticeService.player(sender.getUniqueId(), translation -> translation.argument().offlinePlayer());
-
-            return;
-        }
-
-        User target = targetOption.get();
-
-        this.privateMessage(sender, target, message);
-    }
-
     @Override
     public void enableSpy(UUID player) {
         this.socialSpy.add(player);
@@ -117,14 +112,9 @@ public boolean isSpy(UUID player) {
         return this.socialSpy.contains(player);
     }
 
-    @Override
-    public void reply(Player sender, String message) {
-        this.reply(this.userManager.getOrCreate(sender.getUniqueId(), sender.getName()), message);
+    private User toUser(Player target) {
+        return this.userManager.getUser(target.getUniqueId())
+            .orElseThrow(() -> new IllegalStateException("User not found for player " + target.getName()));
     }
 
-    @Override
-    public void sendMessage(Player sender, Player target, String message) {
-        User user = this.userManager.getOrCreate(target.getUniqueId(), target.getName());
-        this.privateMessage(this.userManager.getOrCreate(sender.getUniqueId(), sender.getName()), user, message);
-    }
 }

eternalcore-core/src/main/java/com/eternalcode/core/user/User.java

@@ -7,12 +7,10 @@
 
 public class User implements Viewer {
 
-    private UserClientSettings userClientSettings = UserClientSettings.NONE;
-
     private final String name;
     private final UUID uuid;
 
-    User(UUID uuid, String name) {
+    public User(UUID uuid, String name) {
         this.name = name;
         this.uuid = uuid;
     }
@@ -32,14 +30,6 @@ public boolean isConsole() {
         return false;
     }
 
-    public UserClientSettings getClientSettings() {
-        return this.userClientSettings;
-    }
-
-    public void setClientSettings(UserClientSettings userClientSettings) {
-        this.userClientSettings = userClientSettings;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -56,4 +46,3 @@ public int hashCode() {
         return Objects.hash(this.name, this.uuid);
     }
 }
-

eternalcore-core/src/main/java/com/eternalcode/core/user/UserController.java

@@ -0,0 +1,56 @@
+package com.eternalcode.core.user;
+
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.injector.annotations.component.Controller;
+import java.util.function.BiConsumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.server.ServerLoadEvent;
+
+@Controller
+class UserController implements Listener {
+
+    private final UserManager userManager;
+    private final Server server;
+    private final Logger logger;
+
+    @Inject
+    UserController(UserManager userManager, Server server, Logger logger) {
+        this.userManager = userManager;
+        this.server = server;
+        this.logger = logger;
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    void onJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        this.userManager.findOrCreate(player.getUniqueId(), player.getName())
+            .whenComplete(this.handleFutureResult(player, "Failed to load user: " + player.getName() + ". Please try again."));
+    }
+
+    private <T> BiConsumer<T, Throwable> handleFutureResult(Player player, String message) {
+        return (user, throwable) -> {
+            if (throwable != null) {
+                player.kickPlayer(message);
+                this.logger.log(Level.SEVERE, message, throwable);
+            }
+        };
+    }
+
+    @EventHandler
+    void onReload(ServerLoadEvent event) {
+        if (event.getType() != ServerLoadEvent.LoadType.RELOAD) {
+            return;
+        }
+
+        for (Player player : this.server.getOnlinePlayers()) {
+            this.userManager.findOrCreate(player.getUniqueId(), player.getName());
+        }
+    }
+}