2 files changed, 192 insertions, 0 deletions
diff --git a/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp
new file mode 100644
index 00000000..d1e995e9
--- /dev/null
+++ b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp
@@ -0,0 +1,173 @@
+#include "stdafx.h"
+
+#include "CliCommandPardon.h"
+
+#include "..\..\ServerCliEngine.h"
+#include "..\..\ServerCliParser.h"
+#include "..\..\..\Access\Access.h"
+#include "..\..\..\Common\StringUtils.h"
+#include "..\..\..\..\Minecraft.Client\ServerPlayer.h"
+
+#include <algorithm>
+
+namespace ServerRuntime
+{
+	namespace
+	{
+		static void AppendUniqueText(const std::string &text, std::vector<std::string> *out)
+		{
+			if (out == nullptr || text.empty())
+			{
+				return;
+			}
+
+			if (std::find(out->begin(), out->end(), text) == out->end())
+			{
+				out->push_back(text);
+			}
+		}
+
+		static void AppendUniqueXuid(PlayerUID xuid, std::vector<PlayerUID> *out)
+		{
+			if (out == nullptr || xuid == INVALID_XUID)
+			{
+				return;
+			}
+
+			if (std::find(out->begin(), out->end(), xuid) == out->end())
+			{
+				out->push_back(xuid);
+			}
+		}
+	}
+
+	const char *CliCommandPardon::Name() const
+	{
+		return "pardon";
+	}
+
+	const char *CliCommandPardon::Usage() const
+	{
+		return "pardon <player>";
+	}
+
+	const char *CliCommandPardon::Description() const
+	{
+		return "Remove a player ban.";
+	}
+
+	/**
+	 * Removes every Access ban entry that matches the requested player name so dual-XUID entries are cleared together
+	 * 名前に一致するBANをまとめて解除する
+	 */
+	bool CliCommandPardon::Execute(const ServerCliParsedLine &line, ServerCliEngine *engine)
+	{
+		if (line.tokens.size() != 2)
+		{
+			engine->LogWarn("Usage: pardon <player>");
+			return false;
+		}
+		if (!ServerRuntime::Access::IsInitialized())
+		{
+			engine->LogWarn("Access manager is not initialized.");
+			return false;
+		}
+
+		std::vector<PlayerUID> xuidsToRemove;
+		std::vector<std::string> matchedNames;
+		std::shared_ptr<ServerPlayer> onlineTarget = engine->FindPlayerByNameUtf8(line.tokens[1]);
+		if (onlineTarget != nullptr)
+		{
+			if (ServerRuntime::Access::IsPlayerBanned(onlineTarget->getXuid()))
+			{
+				AppendUniqueXuid(onlineTarget->getXuid(), &xuidsToRemove);
+			}
+			if (ServerRuntime::Access::IsPlayerBanned(onlineTarget->getOnlineXuid()))
+			{
+				AppendUniqueXuid(onlineTarget->getOnlineXuid(), &xuidsToRemove);
+			}
+		}
+
+		std::vector<ServerRuntime::Access::BannedPlayerEntry> entries;
+		if (!ServerRuntime::Access::SnapshotBannedPlayers(&entries))
+		{
+			engine->LogError("Failed to read banned players.");
+			return false;
+		}
+
+		const std::string loweredTarget = StringUtils::ToLowerAscii(line.tokens[1]);
+		for (const auto &entry : entries)
+		{
+			if (StringUtils::ToLowerAscii(entry.name) == loweredTarget)
+			{
+				PlayerUID parsedXuid = INVALID_XUID;
+				if (ServerRuntime::Access::TryParseXuid(entry.xuid, &parsedXuid))
+				{
+					AppendUniqueXuid(parsedXuid, &xuidsToRemove);
+				}
+				AppendUniqueText(entry.name, &matchedNames);
+			}
+		}
+
+		if (xuidsToRemove.empty())
+		{
+			engine->LogWarn("That player is not banned.");
+			return false;
+		}
+
+		for (const auto xuid : xuidsToRemove)
+		{
+			if (!ServerRuntime::Access::RemovePlayerBan(xuid))
+			{
+				engine->LogError("Failed to remove player ban.");
+				return false;
+			}
+		}
+
+		std::string playerName = line.tokens[1];
+		if (!matchedNames.empty())
+		{
+			playerName = matchedNames[0];
+		}
+		else if (onlineTarget != nullptr)
+		{
+			playerName = StringUtils::WideToUtf8(onlineTarget->getName());
+		}
+
+		engine->LogInfo("Unbanned player " + playerName + ".");
+		return true;
+	}
+
+	/**
+	 * Suggests currently banned player names first and then online names for convenience
+	 * BAN済み名とオンライン名を補完候補に出す
+	 */
+	void CliCommandPardon::Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector<std::string> *out) const
+	{
+		if (context.currentTokenIndex != 1 || out == nullptr)
+		{
+			return;
+		}
+
+		std::vector<ServerRuntime::Access::BannedPlayerEntry> entries;
+		if (ServerRuntime::Access::SnapshotBannedPlayers(&entries))
+		{
+			std::vector<std::string> names;
+			for (const auto &entry : entries)
+			{
+				AppendUniqueText(entry.name, &names);
+			}
+
+			for (const auto &name : names)
+			{
+				if (StringUtils::StartsWithIgnoreCase(name, context.prefix))
+				{
+					out->push_back(context.linePrefix + name);
+				}
+			}
+		}
+
+		engine->SuggestPlayers(context.prefix, context.linePrefix, out);
+	}
+}
+
diff --git a/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h
new file mode 100644
index 00000000..a171d428
--- /dev/null
+++ b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "..\IServerCliCommand.h"
+
+namespace ServerRuntime
+{
+	/**
+	 * Removes dedicated-server player bans using Java Edition style syntax and Access-backed persistence
+	 */
+	class CliCommandPardon : public IServerCliCommand
+	{
+	public:
+		virtual const char *Name() const;
+		virtual const char *Usage() const;
+		virtual const char *Description() const;
+		virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine);
+		virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector<std::string> *out) const;
+	};
+}