etc/SmoOnlineServer
0
0
Fork 0
mirror of https://github.com/Sanae6/SmoOnlineServer.git synced 2024-11-22 03:05:16 +00:00
Code Issues Projects Releases Wiki Activity

Added quotable arguments, potential fix for ban * not banning anyone.

Browse source
This commit is contained in:
TheUbMunster 2022-07-26 17:09:44 -06:00 committed by Sanae
parent 5ca5b10db8
commit d604c59a77
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Server/CommandHandler.cs
View file

@ -1,4 +1,5 @@
namespace Server; using System.Text;
namespace Server;
public static class CommandHandler { public static class CommandHandler {
public delegate Response Handler(string[] args); public delegate Response Handler(string[] args);
@ -19,10 +20,39 @@ public static class CommandHandler {
} }
} }
public static Response GetResult(string input) { /// <summary>
/// Modified by <b>TheUbMunster</b>
/// </summary>
public static Response GetResult(string input)
{
try { try {
string[] args = input.Split(' '); string[] args = input.Split(' ');
if (args.Length == 0) return "No command entered, see help command for valid commands"; if (args.Length == 0) return "No command entered, see help command for valid commands";
//this part is to allow single arguments that contain spaces (since the game seems to be able to handle usernames with spaces, we need to as well)
List<string> newArgs = new List<string>();
newArgs.Add(args[0]);
for (int i = 1; i < args.Length; i++) {
if (args[i].Length == 0) continue; //empty string (>1 whitespace between arguments).
else if (args[i][0] == '\"') {
//concatenate args until a string ends with a quote
StringBuilder sb = new StringBuilder();
i--; //fix off-by-one issue
do
{
i++;
sb.Append(args[i] + " "); //add space back removed by the string.Split(' ')
if (i >= args.Length) {
return "Unmatching quotes, make sure that whenever quotes are used, another quote is present to close it (no action was performed).";
}
} while (args[i][^1] != '\"');
newArgs.Add(sb.ToString(1, sb.Length - 3)); //remove quotes and extra space at the end.
}
else
{
newArgs.Add(args[i]);
}
}
args = newArgs.ToArray();
string commandName = args[0]; string commandName = args[0];
return Handlers.TryGetValue(commandName, out Handler? handler) ? handler(args[1..]) : $"Invalid command {args[0]}, see help command for valid commands"; return Handlers.TryGetValue(commandName, out Handler? handler) ? handler(args[1..]) : $"Invalid command {args[0]}, see help command for valid commands";
} }

6
Server/Program.cs
View file

@ -202,7 +202,7 @@ CommandHandler.RegisterCommand("rejoin", args => {
} }
bool moreThanOne = false; bool moreThanOne = false;
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
Client[] clients = (args[0] == "*" Client[] clients = (args[0].Trim() == "*"
? server.Clients.Where(c => c.Connected) ? server.Clients.Where(c => c.Connected)
: server.Clients.Where(c => : server.Clients.Where(c =>
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray(); c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray();
@ -222,7 +222,7 @@ CommandHandler.RegisterCommand("crash", args => {
} }
bool moreThanOne = false; bool moreThanOne = false;
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
Client[] clients = (args[0] == "*" Client[] clients = (args[0].Trim() == "*"
? server.Clients.Where(c => c.Connected) ? server.Clients.Where(c => c.Connected)
: server.Clients.Where(c => : server.Clients.Where(c =>
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray(); c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray();
@ -251,7 +251,7 @@ CommandHandler.RegisterCommand("ban", args => {
bool moreThanOne = false; bool moreThanOne = false;
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
Client[] clients = (args[0] == "*" Client[] clients = (args[0].Trim() == "*"
? server.Clients.Where(c => c.Connected) ? server.Clients.Where(c => c.Connected)
: server.Clients.Where(c => : server.Clients.Where(c =>
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray(); c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray();