Simplify Messages#seen

Author: zefir-git

src/main/java/pro/cloudnode/smp/smpcore/Messages.java

@@ -144,28 +144,27 @@ public Messages() {
                         .ofNullable(alt.player().getName()).orElse(alt.player().getUniqueId().toString())));
     }
 
-    public @NotNull Component seenOnline(final @NotNull OfflinePlayer player) {
+    public @NotNull Component seen(final @NotNull Member member) {
+        final @NotNull Date lastSeen = new Date(member.player().getLastSeen());
         return MiniMessage.miniMessage()
-                .deserialize(Objects.requireNonNull(config.getString("seen.online")), Placeholder.unparsed("player", Optional
-                        .ofNullable(player.getName()).orElse(player.getUniqueId().toString())));
-    }
-
-    public @NotNull Component seen(final @NotNull Member player, final boolean active, final @NotNull Date lastSeen, final @NotNull Component lastSeenRelative) {
-        return MiniMessage.miniMessage()
-                .deserialize(Objects.requireNonNull(config.getString(active ? "seen.active" : "seen.inactive")), Placeholder.unparsed("player", Optional
-                        .ofNullable(player.player().getName())
-                        .orElse(player.uuid.toString())), Formatter.date("last-seen", lastSeen.toInstant()
+                .deserialize(Objects.requireNonNull(config.getString(member.isActive() ? "seen.active" : "seen.inactive")), Placeholder.unparsed("player", Optional
+                        .ofNullable(member.player().getName())
+                        .orElse(member.uuid.toString())), Formatter.date("last-seen", lastSeen.toInstant()
                         .atZone(ZoneOffset.UTC)
-                        .toLocalDateTime()), Placeholder.component("last-seen-relative", lastSeenRelative));
+                        .toLocalDateTime()), Placeholder.component("last-seen-relative", SMPCore.relativeTime(lastSeen)));
     }
 
-    public @NotNull Component seen(final @NotNull OfflinePlayer player, final @NotNull Date lastSeen, final @NotNull Component lastSeenRelative) {
+    public @NotNull Component seen(final @NotNull OfflinePlayer player) {
+        if (player.isOnline()) return MiniMessage.miniMessage()
+                .deserialize(Objects.requireNonNull(config.getString("seen.online")), Placeholder.unparsed("player", Optional
+                        .ofNullable(player.getName()).orElse(player.getUniqueId().toString())));
+        final @NotNull Date lastSeen = new Date(player.getLastSeen());
         return MiniMessage.miniMessage()
                 .deserialize(Objects.requireNonNull(config.getString("seen.non-member")), Placeholder.unparsed("player", Optional
                         .ofNullable(player.getName())
                         .orElse(player.getUniqueId().toString())), Formatter.date("last-seen", lastSeen.toInstant()
                         .atZone(ZoneOffset.UTC)
-                        .toLocalDateTime()), Placeholder.component("last-seen-relative", lastSeenRelative));
+                        .toLocalDateTime()), Placeholder.component("last-seen-relative", SMPCore.relativeTime(lastSeen)));
     }
 
     // errors

src/main/java/pro/cloudnode/smp/smpcore/command/SeenCommand.java

@@ -7,7 +7,6 @@
 import pro.cloudnode.smp.smpcore.Permission;
 import pro.cloudnode.smp.smpcore.SMPCore;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -20,15 +19,13 @@ public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNul
         if (args.length != 1) return sendMessage(sender, SMPCore.messages().usage(label, "<player>"));
 
         final @NotNull OfflinePlayer player = sender.getServer().getOfflinePlayer(args[0]);
-        if (player.isOnline()) return sendMessage(sender, SMPCore.messages().seenOnline(player));
 
         if (!player.hasPlayedBefore()) return sendMessage(sender, SMPCore.messages().errorNeverJoined(player));
+        if (player.isOnline()) return sendMessage(sender, SMPCore.messages().seen(player));
 
         final @NotNull Optional<@NotNull Member> member = Member.get(player.getUniqueId());
-
-        return member.map(value -> sendMessage(sender, SMPCore.messages()
-                        .seen(value, value.isActive(), new Date(member.get().player().getLastSeen()), SMPCore.relativeTime(new Date(member.get().player().getLastSeen())))))
-                .orElseGet(() -> sendMessage(sender, SMPCore.messages().seen(player, new Date(player.getLastSeen()), SMPCore.relativeTime(new Date(player.getLastSeen())))));
+        return member.map(m -> sendMessage(sender, SMPCore.messages().seen(m)))
+                .orElseGet(() -> sendMessage(sender, SMPCore.messages().seen(player)));
     }
 
     @Override