From a0787538c9a8cfdfa955f7be3cc7b03a922dd98b Mon Sep 17 00:00:00 2001 From: hydrant Date: Tue, 18 Sep 2018 22:38:43 +0200 Subject: [PATCH 1/5] Add some Admin Commands, set default 'Command not found'-message --- Main.cs | 1 + Server/Commands/Admin.cs | 98 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/Main.cs b/Main.cs index 8d56a939..fb113113 100644 --- a/Main.cs +++ b/Main.cs @@ -8,6 +8,7 @@ namespace reallife_gamemode [ServerEvent(Event.ResourceStart)] public void OnResourceStart() { + NAPI.Server.SetCommandErrorMessage("~r~[FEHLER]~s~ Dieser Command existiert nicht."); NAPI.Util.ConsoleOutput("reallife-gamemode resource loaded!"); } } diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index b0af4954..733d24b9 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -2,15 +2,105 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; +using reallife_gamemode.Server.Services; -namespace reallife_gamemode.Server.Command +namespace reallife_gamemode.Server.Commands { public class Admin : Script { - [Command("o")] - public void sendOChat(Client player, string message) + /** + * @overview Life of German Reallife - Admin.cs + * @author VegaZ, hydrant + * @copyright (c) 2008 - 2018 Life of German + */ + + [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] + public void CmdAdminOChat(Client player, string message) { - NAPI.Chat.SendChatMessageToAll("~r~" + player.Name + " sagt:~w~ " + message); + /* + * Alternative: + * Account playerAccount = AccountManager.GetAccount(player); + * if(!playerAccount.IsAdmin(adminLevel)) + * { + * ChatService.NotAuthorized(player); + * return; + * } + */ + int playerAdminLevel = 1; + if(playerAdminLevel < /* Benötigtes Level */ 1) + { + ChatService.NotAuthorized(player); + return; + } + + string publicMessage = "~b~(( " + player.Name + ": " + message + " ))"; + NAPI.Chat.SendChatMessageToAll(publicMessage); + } + + [Command("veh", "~m~Benutzung:~s~ /veh [Fahrzeug] (Farbe 1) (Farbe 2)")] + public void CmdAdminVeh(Client player, VehicleHash hash, int color1 = 111, int color2 = 111) + { + // Alternative: siehe O Chat + int playerAdminLevel = 1; + if (playerAdminLevel < /* Benötigtes Level */ 1) + { + ChatService.NotAuthorized(player); + return; + } + + if(player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs) + { + player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan schon in einem Fahrzeug."); + return; + } + + Vehicle v = NAPI.Vehicle.CreateVehicle(hash, player.Position, player.Rotation.Z, color1, color2); + + player.SetIntoVehicle(v.Handle, -1); + } + + [Command("fixveh")] + public void CmdAdminFixveh(Client player) + { + // Alternative: siehe O Chat + int playerAdminLevel = 1; + if (playerAdminLevel < /* Benötigtes Level */ 1) + { + ChatService.NotAuthorized(player); + return; + } + + if (!player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs) + { + player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug."); + return; + } + + player.Vehicle.Repair(); + } + + [Command("delveh")] + public void CmdAdminDelveh(Client player) + { + int playerAdminLevel = 1; + if (playerAdminLevel < /* Benötigtes Level */ 1) + { + ChatService.NotAuthorized(player); + return; + } + + if (!player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs) + { + player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug."); + return; + } + + /* + * TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto) + * Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat + */ + + player.Vehicle.Delete(); } } } From 8299b6c9003b11e04296d3579c48c6f2ee989b04 Mon Sep 17 00:00:00 2001 From: hydrant Date: Tue, 18 Sep 2018 22:40:14 +0200 Subject: [PATCH 2/5] Add ChatService, Folder for Managers --- Server/Managers/.gitkeep | 10 ++++++++++ Server/Services/ChatService.cs | 15 +++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 Server/Managers/.gitkeep create mode 100644 Server/Services/ChatService.cs diff --git a/Server/Managers/.gitkeep b/Server/Managers/.gitkeep new file mode 100644 index 00000000..d66872d0 --- /dev/null +++ b/Server/Managers/.gitkeep @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace reallife_gamemode.Server.Managers +{ + class _ + { + } +} diff --git a/Server/Services/ChatService.cs b/Server/Services/ChatService.cs new file mode 100644 index 00000000..18fcdf2e --- /dev/null +++ b/Server/Services/ChatService.cs @@ -0,0 +1,15 @@ +using GTANetworkAPI; +using System; +using System.Collections.Generic; +using System.Text; + +namespace reallife_gamemode.Server.Services +{ + class ChatService + { + public static void NotAuthorized(Client player) + { + player.SendChatMessage("~r~[FEHLER]~s~ Du kannst diesen Befehl nicht ausführen."); + } + } +} From 26bfaacd67dcf65f8599b71f2e16db5e567a68b8 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 19 Sep 2018 12:25:49 +0200 Subject: [PATCH 3/5] Add Admin Check, Add AdminLevel Column in database --- Main.cs | 6 +++++ Server/Commands/Admin.cs | 46 ++++++++++++++++++-------------- Server/Entities/User.cs | 6 ++++- Server/Services/ChatService.cs | 5 ++++ Server/Services/ClientService.cs | 36 +++++++++++++++++++++++++ 5 files changed, 78 insertions(+), 21 deletions(-) create mode 100644 Server/Services/ClientService.cs diff --git a/Main.cs b/Main.cs index fb113113..ab154131 100644 --- a/Main.cs +++ b/Main.cs @@ -5,6 +5,12 @@ namespace reallife_gamemode { public class Main : Script { + /** + * @overview Life of German Reallife - Main Class (Main.cs) + * @author VegaZ, hydrant + * @copyright (c) 2008 - 2018 Life of German + */ + [ServerEvent(Event.ResourceStart)] public void OnResourceStart() { diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 733d24b9..2ac3158c 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -2,32 +2,24 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; +using reallife_gamemode.Server.Extensions; using reallife_gamemode.Server.Services; +using reallife_gamemode.Server.Util; namespace reallife_gamemode.Server.Commands { public class Admin : Script { /** - * @overview Life of German Reallife - Admin.cs + * @overview Life of German Reallife - Admin Commands (Admin.cs) * @author VegaZ, hydrant * @copyright (c) 2008 - 2018 Life of German */ [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] - public void CmdAdminOChat(Client player, string message) + public void CmdAdminO(Client player, string message) { - /* - * Alternative: - * Account playerAccount = AccountManager.GetAccount(player); - * if(!playerAccount.IsAdmin(adminLevel)) - * { - * ChatService.NotAuthorized(player); - * return; - * } - */ - int playerAdminLevel = 1; - if(playerAdminLevel < /* Benötigtes Level */ 1) + if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER)) { ChatService.NotAuthorized(player); return; @@ -62,9 +54,7 @@ namespace reallife_gamemode.Server.Commands [Command("fixveh")] public void CmdAdminFixveh(Client player) { - // Alternative: siehe O Chat - int playerAdminLevel = 1; - if (playerAdminLevel < /* Benötigtes Level */ 1) + if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER)) { ChatService.NotAuthorized(player); return; @@ -95,12 +85,28 @@ namespace reallife_gamemode.Server.Commands return; } - /* - * TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto) - * Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat - */ + /* TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto) + * Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat */ player.Vehicle.Delete(); } + + [Command("goto", "~m~Benutzung:~s~ /goto [Name]")] + public void CmdAdminGoto(Client player, string name) + { + if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER)) + { + ChatService.NotAuthorized(player); + return; + } + + Client target = ClientService.GetClientByName(name); + + if(target == null) + { + ChatService.PlayerNotFound(player); + return; + } + } } } diff --git a/Server/Entities/User.cs b/Server/Entities/User.cs index 2cea4e39..133ab2d1 100644 --- a/Server/Entities/User.cs +++ b/Server/Entities/User.cs @@ -1,4 +1,5 @@ -using System; +using reallife_gamemode.Server.Util; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -22,5 +23,8 @@ namespace reallife_gamemode.Server.Entities [EmailAddress] [StringLength(64)] public string Email { get; set; } + public AdminLevel AdminLevel { get; set; } + + public bool IsAdmin(AdminLevel level) => AdminLevel >= level; } } diff --git a/Server/Services/ChatService.cs b/Server/Services/ChatService.cs index 18fcdf2e..9b22be73 100644 --- a/Server/Services/ChatService.cs +++ b/Server/Services/ChatService.cs @@ -11,5 +11,10 @@ namespace reallife_gamemode.Server.Services { player.SendChatMessage("~r~[FEHLER]~s~ Du kannst diesen Befehl nicht ausführen."); } + + internal static void PlayerNotFound(Client player) + { + player.SendChatMessage("~r~[FEHLER]~s~ Der Spieler wurde nicht gefunden."); + } } } diff --git a/Server/Services/ClientService.cs b/Server/Services/ClientService.cs new file mode 100644 index 00000000..d60500f6 --- /dev/null +++ b/Server/Services/ClientService.cs @@ -0,0 +1,36 @@ +using GTANetworkAPI; +using System; +using System.Collections.Generic; +using System.Text; + +namespace reallife_gamemode.Server.Services +{ + class ClientService + { + /** + * @overview Life of German Reallife - Client Service (ClientService.cs) + * @author hydrant + * @copyright (c) 2008 - 2018 Life of German + */ + + public static Client GetClientByName(string name) + { + /* Funktionsaufbau: Prüft erst, ob ein Spieler mit exakt diesem Namen online ist + * Wenn Ja: Wird dieser zurückgegeben + * Wenn Nein: Wird der erste Spieler zurückgegeben, dessen Namen mit dem eingegebenen Parameter übereinstimmt + * Gibt "null" zurück, falls kein Client gefunden wurde + */ + Client toReturn = null; + + List playerList = NAPI.Pools.GetAllPlayers(); + toReturn = playerList.Find(p => p.Name == name); + + if(toReturn == null) + { + toReturn = playerList.Find(p => p.Name.StartsWith(name)); + } + + return toReturn; + } + } +} From 91e2fbe4ecdd60de7cb9a5d32440b0175ede6ec9 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 19 Sep 2018 12:26:35 +0200 Subject: [PATCH 4/5] Add AdminLevel.cs, ClientExtention.cs --- Server/Extensions/ClientExtension.cs | 20 ++++++++++++++++++++ Server/Util/AdminLevel.cs | 13 +++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 Server/Extensions/ClientExtension.cs create mode 100644 Server/Util/AdminLevel.cs diff --git a/Server/Extensions/ClientExtension.cs b/Server/Extensions/ClientExtension.cs new file mode 100644 index 00000000..2670492e --- /dev/null +++ b/Server/Extensions/ClientExtension.cs @@ -0,0 +1,20 @@ +using GTANetworkAPI; +using reallife_gamemode.Model; +using reallife_gamemode.Server.Entities; +using System; +using System.Collections.Generic; +using System.Text; + +namespace reallife_gamemode.Server.Extensions +{ + public static class ClientExtension + { + public static User GetUser(this Client client) + { + using(DatabaseContext dbContext = new DatabaseContext()) + { + return dbContext.Users.Find(client.Name); + } + } + } +} diff --git a/Server/Util/AdminLevel.cs b/Server/Util/AdminLevel.cs new file mode 100644 index 00000000..e0e656d3 --- /dev/null +++ b/Server/Util/AdminLevel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace reallife_gamemode.Server.Util +{ + public enum AdminLevel : int + { + PLAYER, + SUPPORTER, + ADMIN + } +} From e4efbc8ef62d2c0ba400f1cd79f90e2824d175e8 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 19 Sep 2018 12:50:43 +0200 Subject: [PATCH 5/5] Add Header Comments, Add 'null'-Checks on Commands --- Server/Commands/Admin.cs | 15 ++++++--------- Server/Extensions/ClientExtension.cs | 9 ++++++++- Server/Services/ChatService.cs | 6 ++++++ Server/Util/AdminLevel.cs | 6 ++++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 2ac3158c..51a3fd57 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -19,7 +19,7 @@ namespace reallife_gamemode.Server.Commands [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] public void CmdAdminO(Client player, string message) { - if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER)) + if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { ChatService.NotAuthorized(player); return; @@ -32,15 +32,13 @@ namespace reallife_gamemode.Server.Commands [Command("veh", "~m~Benutzung:~s~ /veh [Fahrzeug] (Farbe 1) (Farbe 2)")] public void CmdAdminVeh(Client player, VehicleHash hash, int color1 = 111, int color2 = 111) { - // Alternative: siehe O Chat - int playerAdminLevel = 1; - if (playerAdminLevel < /* Benötigtes Level */ 1) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; } - if(player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs) + if (player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs) { player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan schon in einem Fahrzeug."); return; @@ -54,7 +52,7 @@ namespace reallife_gamemode.Server.Commands [Command("fixveh")] public void CmdAdminFixveh(Client player) { - if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER)) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -72,8 +70,7 @@ namespace reallife_gamemode.Server.Commands [Command("delveh")] public void CmdAdminDelveh(Client player) { - int playerAdminLevel = 1; - if (playerAdminLevel < /* Benötigtes Level */ 1) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -94,7 +91,7 @@ namespace reallife_gamemode.Server.Commands [Command("goto", "~m~Benutzung:~s~ /goto [Name]")] public void CmdAdminGoto(Client player, string name) { - if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER)) + if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { ChatService.NotAuthorized(player); return; diff --git a/Server/Extensions/ClientExtension.cs b/Server/Extensions/ClientExtension.cs index 2670492e..e2ff0861 100644 --- a/Server/Extensions/ClientExtension.cs +++ b/Server/Extensions/ClientExtension.cs @@ -3,17 +3,24 @@ using reallife_gamemode.Model; using reallife_gamemode.Server.Entities; using System; using System.Collections.Generic; +using System.Linq; using System.Text; namespace reallife_gamemode.Server.Extensions { public static class ClientExtension { + /** + * @overview Life of German Reallife - Client Extension (ClientExtension.cs) + * @author VegaZ, hydrant + * @copyright (c) 2008 - 2018 Life of German + */ + public static User GetUser(this Client client) { using(DatabaseContext dbContext = new DatabaseContext()) { - return dbContext.Users.Find(client.Name); + return dbContext.Users.FirstOrDefault(u => u.Name == client.Name); } } } diff --git a/Server/Services/ChatService.cs b/Server/Services/ChatService.cs index 9b22be73..ad81edef 100644 --- a/Server/Services/ChatService.cs +++ b/Server/Services/ChatService.cs @@ -7,6 +7,12 @@ namespace reallife_gamemode.Server.Services { class ChatService { + /** + * @overview Life of German Reallife - Chat Service (ChatService.cs) + * @author hydrant + * @copyright (c) 2008 - 2018 Life of German + */ + public static void NotAuthorized(Client player) { player.SendChatMessage("~r~[FEHLER]~s~ Du kannst diesen Befehl nicht ausführen."); diff --git a/Server/Util/AdminLevel.cs b/Server/Util/AdminLevel.cs index e0e656d3..8a691fe6 100644 --- a/Server/Util/AdminLevel.cs +++ b/Server/Util/AdminLevel.cs @@ -6,6 +6,12 @@ namespace reallife_gamemode.Server.Util { public enum AdminLevel : int { + /** + * @overview Life of German Reallife - Admin Levels (AdminLevel.cs) + * @author VegaZ, hydrant + * @copyright (c) 2008 - 2018 Life of German + */ + PLAYER, SUPPORTER, ADMIN