Disallow kicking offline players - Fixes #91

A248 · Nov 27, 2021 · a4b378e · a4b378e
1 parent a119e57
commit a4b378e
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 16 deletions.
diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/AddressPunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/AddressPunishCommands.java
@@ -49,7 +49,7 @@ public PunishmentType parseType(String arg) {
 	}
 
 	@Override
-	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg) {
+	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg, PunishmentType type) {
 		return argumentParser().parseAddressVictim(sender, targetArg);
 	}
 

diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/AddressUnpunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/AddressUnpunishCommands.java
@@ -51,7 +51,7 @@ public PunishmentType parseType(String arg) {
 	}
 
 	@Override
-	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg) {
+	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg, PunishmentType type) {
 		return argumentParser().parseAddressVictim(sender, targetArg);
 	}
 

diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/PlayerPunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/PlayerPunishCommands.java
@@ -21,7 +21,9 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
+import space.arim.libertybans.api.PlayerVictim;
 import space.arim.libertybans.core.commands.extra.TabCompletion;
+import space.arim.libertybans.core.env.EnvUserResolver;
 import space.arim.omnibus.util.concurrent.CentralisedFuture;
 
 import space.arim.libertybans.api.PunishmentType;
@@ -32,15 +34,21 @@
 import space.arim.libertybans.core.env.EnvEnforcer;
 import space.arim.libertybans.core.punish.MiscUtil;
 
+import java.util.UUID;
+
 @Singleton
 public class PlayerPunishCommands extends PunishCommands {
 
+	private final EnvUserResolver envUserResolver;
+
 	@Inject
 	public PlayerPunishCommands(Dependencies dependencies,
 								PunishmentDrafter drafter, InternalFormatter formatter,
-								EnvEnforcer<?> envEnforcer, TabCompletion tabCompletion) {
+								EnvEnforcer<?> envEnforcer, TabCompletion tabCompletion,
+								EnvUserResolver envUserResolver) {
 		super(dependencies, MiscUtil.punishmentTypes().stream().map(PunishmentType::toString),
 				drafter, formatter, envEnforcer, tabCompletion);
+		this.envUserResolver = envUserResolver;
 	}
 
 	@Override
@@ -49,8 +57,28 @@ public PunishmentType parseType(String arg)  {
 	}
 
 	@Override
-	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg) {
-		return argumentParser().parseVictimByName(sender, targetArg);
+	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg, PunishmentType type) {
+		var victimFuture = argumentParser().parseVictimByName(sender, targetArg);
+		switch (type) {
+		case BAN:
+		case MUTE:
+		case WARN:
+			return victimFuture;
+		case KICK:
+			// For kicks, users need to be screened to check that they are online
+			return victimFuture.thenApply((victim) -> {
+				if (victim instanceof PlayerVictim) {
+					UUID uuid = ((PlayerVictim) victim).getUUID();
+					if (envUserResolver.lookupName(uuid).isEmpty()) {
+						sender.sendMessage(messages().additions().kicks().mustBeOnline().replaceText("%TARGET%", targetArg));
+						return null;
+					}
+				}
+				return victim;
+			});
+		default:
+			throw MiscUtil.unknownType(type);
+		}
 	}
 
 }
diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/PlayerUnpunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/PlayerUnpunishCommands.java
@@ -51,7 +51,7 @@ public PunishmentType parseType(String arg) {
 	}
 
 	@Override
-	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg) {
+	public CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg, PunishmentType type) {
 		return argumentParser().parseVictimByName(sender, targetArg);
 	}
 

diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/PunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/PunishCommands.java
@@ -110,7 +110,7 @@ public void execute() {
 
 		private void execute0() {
 			String targetArg = command().next();
-			CentralisedFuture<?> future = parseVictim(sender(), targetArg).thenCompose((victim) -> {
+			CentralisedFuture<?> future = parseVictim(sender(), targetArg, type()).thenCompose((victim) -> {
 				if (victim == null) {
 					return completedFuture(null);
 				}

diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/PunishUnpunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/PunishUnpunishCommands.java
@@ -28,6 +28,6 @@ interface PunishUnpunishCommands {
 
 	PunishmentType parseType(String arg);
 
-	CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg);
+	CentralisedFuture<Victim> parseVictim(CmdSender sender, String targetArg, PunishmentType type);
 
 }
diff --git a/bans-core/src/main/java/space/arim/libertybans/core/commands/UnpunishCommands.java b/bans-core/src/main/java/space/arim/libertybans/core/commands/UnpunishCommands.java
@@ -106,7 +106,7 @@ public void execute() {
 
 		private void execute0() {
 			String targetArg = command().next();
-			CentralisedFuture<?> future = parseVictim(sender(), targetArg).thenCompose((victim) -> {
+			CentralisedFuture<?> future = parseVictim(sender(), targetArg, type()).thenCompose((victim) -> {
 				if (victim == null) {
 					return completedFuture(null);
 				}

diff --git a/...core/src/main/java/space/arim/libertybans/core/commands/extra/StandardArgumentParser.java b/...core/src/main/java/space/arim/libertybans/core/commands/extra/StandardArgumentParser.java
@@ -22,6 +22,7 @@
 
 import jakarta.inject.Inject;
 
+import space.arim.libertybans.core.config.MessagesConfig;
 import space.arim.omnibus.util.concurrent.CentralisedFuture;
 import space.arim.omnibus.util.concurrent.FactoryOfTheFuture;
 
@@ -52,6 +53,10 @@ public StandardArgumentParser(FactoryOfTheFuture futuresFactory, Configs configs
 	private <T> CentralisedFuture<T> completedFuture(T value) {
 		return futuresFactory.completedFuture(value);
 	}
+
+	private MessagesConfig.All.NotFound notFound() {
+		return configs.getMessagesConfig().all().notFound();
+	}
 
 	// UUID from name
 
@@ -62,7 +67,7 @@ private CentralisedFuture<UUID> parseOrLookupUUID(CmdSender sender, String targe
 			try {
 				uuid = UUID.fromString(targetArg);
 			}  catch (IllegalArgumentException ex) {
-				sender.sendMessage(configs.getMessagesConfig().all().notFound().uuid().replaceText("%TARGET%", targetArg));
+				sender.sendMessage(notFound().uuid().replaceText("%TARGET%", targetArg));
 				return completedFuture(null);
 			}
 			return completedFuture(uuid);
@@ -73,7 +78,7 @@ private CentralisedFuture<UUID> parseOrLookupUUID(CmdSender sender, String targe
 				mostSigBits = Long.parseUnsignedLong(targetArg.substring(0, 16), 16);
 				leastSigBits = Long.parseUnsignedLong(targetArg.substring(16, 32), 16);
 			} catch (NumberFormatException ex) {
-				sender.sendMessage(configs.getMessagesConfig().all().notFound().uuid().replaceText("%TARGET%", targetArg));
+				sender.sendMessage(notFound().uuid().replaceText("%TARGET%", targetArg));
 				return completedFuture(null);
 			}
 			return completedFuture(new UUID(mostSigBits, leastSigBits));
@@ -82,7 +87,7 @@ private CentralisedFuture<UUID> parseOrLookupUUID(CmdSender sender, String targe
 		}
 		return uuidManager.lookupUUID(targetArg).thenApply((uuid) -> {
 			if (uuid.isEmpty()) {
-				sender.sendMessage(configs.getMessagesConfig().all().notFound().player().replaceText("%TARGET%", targetArg));
+				sender.sendMessage(notFound().player().replaceText("%TARGET%", targetArg));
 				return null;
 			}
 			return uuid.get();
@@ -118,7 +123,7 @@ public CentralisedFuture<Victim> parseAddressVictim(CmdSender sender, String tar
 		}
 		return uuidManager.lookupAddress(targetArg).thenApply((address) -> {
 			if (address == null) {
-				sender.sendMessage(configs.getMessagesConfig().all().notFound().playerOrAddress().replaceText("%TARGET%", targetArg));
+				sender.sendMessage(notFound().playerOrAddress().replaceText("%TARGET%", targetArg));
 				return null;
 			}
 			return AddressVictim.of(address);

diff --git a/bans-core/src/main/java/space/arim/libertybans/core/config/AdditionsSection.java b/bans-core/src/main/java/space/arim/libertybans/core/config/AdditionsSection.java
@@ -237,7 +237,11 @@ interface KickAddition extends PunishmentAddition {
 				"&c&lReason",
 				"&7%REASON%"})
 		ComponentText layout();
-
+
+		@ConfKey("must-be-online")
+		@DefaultString("&c&o%TARGET%&r&7 must be online.")
+		ComponentText mustBeOnline();
+
 	}
 
 	@SubSection

diff --git a/bans-core/src/test/java/space/arim/libertybans/core/commands/UnspecifiedReasonsTest.java b/bans-core/src/test/java/space/arim/libertybans/core/commands/UnspecifiedReasonsTest.java
@@ -42,6 +42,7 @@
 import space.arim.libertybans.core.config.MessagesConfig;
 import space.arim.libertybans.core.env.CmdSender;
 import space.arim.libertybans.core.env.EnvEnforcer;
+import space.arim.libertybans.core.env.EnvUserResolver;
 import space.arim.omnibus.util.concurrent.impl.IndifferentFactoryOfTheFuture;
 
 import java.util.Set;
@@ -80,7 +81,8 @@ public UnspecifiedReasonsTest(@Mock PunishmentDrafter drafter, @Mock InternalFor
 
 	@BeforeEach
 	public void setConfigSection(AbstractSubCommandGroup.Dependencies dependencies,
-			/* Mock */ Configs configs, /* Mock */ ArgumentParser argParser) {
+			/* Mock */ Configs configs, /* Mock */ ArgumentParser argParser,
+			@Mock EnvUserResolver envUserResolver) {
 		{
 			MainConfig mainConfig = mock(MainConfig.class);
 			when(configs.getMainConfig()).thenReturn(mainConfig);
@@ -102,7 +104,8 @@ public void setConfigSection(AbstractSubCommandGroup.Dependencies dependencies,
 		}
 		when(argParser.parseVictimByName(any(), eq("A248"))).thenReturn(
 				new IndifferentFactoryOfTheFuture().completedFuture(PlayerVictim.of(UUID.randomUUID())));
-		punishCommands = new PlayerPunishCommands(dependencies, drafter, formatter, envEnforcer, tabCompletion);
+
+		punishCommands = new PlayerPunishCommands(dependencies, drafter, formatter, envEnforcer, tabCompletion, envUserResolver);
 	}
 
 	private void executeBan(CmdSender sender) {