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,10 @@ 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()) {
-            this.noticeService.player(sender.getUniqueId(), translation -> translation.argument().offlinePlayer());
-
-            return;
-        }
-
         UUID uniqueId = target.getUniqueId();
 
         this.msgToggleService.getState(uniqueId).thenAccept(msgState -> {
@@ -89,17 +85,14 @@ void reply(User sender, String message) {
             return;
         }
 
-        Optional<User> targetOption = this.userManager.getUser(uuid);
-
-        if (targetOption.isEmpty()) {
+        Player target = this.server.getPlayer(uuid);
+        if (target == null) {
             this.noticeService.player(sender.getUniqueId(), translation -> translation.argument().offlinePlayer());
 
             return;
         }
 
-        User target = targetOption.get();
-
-        this.privateMessage(sender, target, message);
+        this.privateMessage(sender, toUser(target), message);
     }
 
     @Override
@@ -119,12 +112,18 @@ public boolean isSpy(UUID player) {
 
     @Override
     public void reply(Player sender, String message) {
-        this.reply(this.userManager.getOrCreate(sender.getUniqueId(), sender.getName()), message);
+        this.reply(toUser(sender), message);
     }
 
     @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);
+        User user = toUser(target);
+        this.privateMessage(toUser(sender), user, message);
+    }
+
+    private User toUser(Player target) {
+        return this.userManager.getUser(target.getUniqueId()).get();
     }
+
+
 }

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

@@ -2,19 +2,23 @@
 
 import com.eternalcode.core.viewer.Viewer;
 
+import java.time.Instant;
 import java.util.Objects;
 import java.util.UUID;
 
 public class User implements Viewer {
 
-    private UserClientSettings userClientSettings = UserClientSettings.NONE;
 
     private final String name;
     private final UUID uuid;
+    private final Instant created;
+    private final Instant lastLogin;
 
-    User(UUID uuid, String name) {
+    public User(UUID uuid, String name, Instant created, Instant lastLogin) {
         this.name = name;
         this.uuid = uuid;
+        this.created = created;
+        this.lastLogin = lastLogin;
     }
 
     @Override
@@ -27,17 +31,17 @@ public UUID getUniqueId() {
         return this.uuid;
     }
 
-    @Override
-    public boolean isConsole() {
-        return false;
+    public Instant getCreated() {
+        return created;
     }
 
-    public UserClientSettings getClientSettings() {
-        return this.userClientSettings;
+    public Instant getLastLogin() {
+        return lastLogin;
     }
 
-    public void setClientSettings(UserClientSettings userClientSettings) {
-        this.userClientSettings = userClientSettings;
+    @Override
+    public boolean isConsole() {
+        return false;
     }
 
     @Override

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

@@ -0,0 +1,55 @@
+package com.eternalcode.core.user;
+
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.injector.annotations.component.Controller;
+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.player.PlayerQuitEvent;
+import org.bukkit.event.server.ServerLoadEvent;
+
+@Controller
+public class UserController implements Listener {
+
+    private final UserManager userManager;
+    private final Server server;
+
+    @Inject
+    public UserController(UserManager userManager, Server server) {
+        this.userManager = userManager;
+        this.server = server;
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        this.userManager.findOrCreate(player.getUniqueId(), player.getName())
+            .exceptionally(throwable -> {
+                player.kickPlayer("Failed to load user data. Please try again.");
+                throw new RuntimeException("Failed to load user: " + player.getName(), throwable);
+            });
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        this.userManager.updateLastSeen(player.getUniqueId(), player.getName())
+            .exceptionally(throwable -> {
+                throw new RuntimeException("Failed to update user: " + player.getName(), 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());
+        }
+    }
+}