diff --git a/ReallifeGamemode.Client/Player/reportmenu.ts b/ReallifeGamemode.Client/Player/reportmenu.ts index df75e7d9..88cfb94a 100644 --- a/ReallifeGamemode.Client/Player/reportmenu.ts +++ b/ReallifeGamemode.Client/Player/reportmenu.ts @@ -112,8 +112,7 @@ export default function reportList(globalData: GlobalData) { }); reportMenu.ItemSelect.on((item) => { - if (item.Text === "Annehmen") { - var tickcont; + if (item.Text === "Absenden") { var ticketContentBox = new InputHelper("Worin besteht dein Anliegen?", globalData); ticketContentBox.show(); @@ -121,7 +120,7 @@ export default function reportList(globalData: GlobalData) { var content = data; - mp.events.callRemote("requestReport", content, type); + mp.events.callRemote("requestReport", type, content); mp.events.call("SERVER:CloseReportMenu"); reportMenu.Close(); }); diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index dfcde7c4..01ae8107 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; using ReallifeGamemode.Server.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Finance; @@ -70,8 +70,8 @@ namespace ReallifeGamemode.Server.Report if (player == null) return; - ChatService.SendMessage(player, "!{#008fff}[REPORT]!{#FFFFFF}" Admin " + admin.Name + " hat dein Ticket angenommen! (Benutze /rc)"); - ChatService.BroadcastDutyAdmin("!{#008fff}[REPORT]!{#FFFFFF}" admin.Name + " hat das Ticket von " + player.Name + " angenommen"); + ChatService.SendMessage(player, "!{#008fff}[REPORT]!{#FFFFFF} Admin " + admin.Name + " hat dein Ticket angenommen! (Benutze /rc)"); + ChatService.BroadcastDutyAdmin("!{#008fff}[REPORT]!{#FFFFFF} " + admin.Name + " hat das Ticket von " + player.Name + " angenommen"); for (int a = 0; a < listReports.Count; a++) { @@ -113,8 +113,8 @@ namespace ReallifeGamemode.Server.Report if (text.Equals("quit")) { - ChatService.SendMessage(user, "!{#008fff}[REPORT]!{#FFFFFF}" Chat vom Admin beendet"); - ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF}" Chat beendet"); + ChatService.SendMessage(user, "!{#008fff}[REPORT]!{#FFFFFF} Chat vom Admin beendet"); + ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF} Chat beendet"); for (int a = 0; a < listReports.Count; a++) { @@ -128,8 +128,8 @@ namespace ReallifeGamemode.Server.Report } else { - ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF}" " + client.Name + ": " + text); - ChatService.SendMessage(user, "!{#008fff}[REPORT]!{#FFFFFF}" " + client.Name + ": " + text); + ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF}" + client.Name + ": " + text); + ChatService.SendMessage(user, "!{#008fff}[REPORT]!{#FFFFFF}" + client.Name + ": " + text); } } else @@ -157,13 +157,13 @@ namespace ReallifeGamemode.Server.Report return; } Client admin = ClientService.GetClientByNameOrId(adminname); - ChatService.SendMessage(admin, "!{#008fff}[REPORT]!{#FFFFFF}" " + client.Name + ": " + text); - ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF}" " + client.Name + ": " + text); + ChatService.SendMessage(admin, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text); + ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text); } } [RemoteEvent("requestReport")] - public void RequestReport(Client user, string data, string type) + public void RequestReport(Client user, string type, string data) { if (type == "Ticket Report") { @@ -173,18 +173,18 @@ namespace ReallifeGamemode.Server.Report temp = listReports[a]; if (temp.getUser().Equals(user.Name)) { - ChatService.SendMessage(user, "!{#addc8d}"Du hast bereits ein Ticket erstellt"); + ChatService.SendMessage(user, "!{#addc8d}Du hast bereits ein Ticket erstellt"); return; } } if (UserHelper.dutyAdmins.Count == 0) { - ChatService.SendMessage(user, "!{#addc8d}"Momentan ist kein Administrator verfügbar"); + ChatService.SendMessage(user, "!{#addc8d}Momentan ist kein Administrator verfügbar"); return; } - ChatService.SendMessage(user, "!{#addc8d}"Dein Ticket wurde abgeschickt"); - ChatService.SendMessage(user, "!{#addc8d}"Momentan sind " + UserHelper.dutyAdmins.Count + " Admins verfügbar"); - ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF}" Eingehendes Ticket von~y~ " + user.Name + ": " + data + " (Benutze /showtickets)"); + ChatService.SendMessage(user, "!{#addc8d}Dein Ticket wurde abgeschickt"); + ChatService.SendMessage(user, "!{#addc8d}Momentan sind " + UserHelper.dutyAdmins.Count + " Admins verfügbar"); + ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} Eingehendes Ticket von~y~ " + user.Name + ": " + data + " (Benutze /showtickets)"); ReportManage ticket = new ReportManage(user.Name, data); listReports.Add(ticket); } @@ -205,8 +205,8 @@ namespace ReallifeGamemode.Server.Report if (temp.getUser().Equals(player.Name)) { - ChatService.SendMessage(player, "!{#addc8d}"user.Name + " hat dein Ticket gelöscht!"); - ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF}" "user.Name + " hat das Ticket von " + player.Name + " gelöscht"); + ChatService.SendMessage(player, "!{#addc8d} " + user.Name + " hat dein Ticket gelöscht!"); + ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} " + user.Name + " hat das Ticket von " + player.Name + " gelöscht"); listReports.Remove(temp); } }