fix(CharacterSelection/js): Removed duplicated code

ND_CharacterSelection/source/server.lua

@@ -5,12 +5,12 @@ NDCore = exports["ND_Core"]:GetCoreObject()
 function validateDepartment(player, department)
     local departmentExists = config.departments[department]
     if departmentExists then
-        local discordUserId = string.gsub(NDCore.Functions.GetPlayerIdentifierFromType("discord", player), "discord:", "")
-        local roles = NDCore.Functions.GetUserDiscordInfo(discordUserId).roles
+        local discordUserId = NDCore.Functions.GetPlayerIdentifierFromType("discord", player):gsub("discord:", "")
+        local discordInfo = NDCore.Functions.GetUserDiscordInfo(discordUserId)
 
         -- validate that the player actually has the role that they selected on the client.
         for _, roleId in pairs(departmentExists) do
-            if roles[roleId] or roleId == 0 or roleId == "0" then
+            if roleId == 0 or roleId == "0" or (discordInfo and discordInfo.roles[roleId]) then
                 return true
             end
         end
@@ -53,6 +53,7 @@ AddEventHandler("ND_CharacterSelection:checkPerms", function()
     local discordUserId = NDCore.Functions.GetPlayerIdentifierFromType("discord", player):gsub("discord:", "")
     local allowedRoles = {}
     local discordInfo = NDCore.Functions.GetUserDiscordInfo(discordUserId)
+    
     -- Check if the players discord roles will grant them permission to the department.
     for dept, roleTable in pairs(config.departments) do
         for _, roleId in pairs(roleTable) do
@@ -61,6 +62,5 @@ AddEventHandler("ND_CharacterSelection:checkPerms", function()
             end
         end
     end
-
     TriggerClientEvent("ND_CharacterSelection:permsChecked", player, allowedRoles)
-end)
+end)

ND_CharacterSelection/source/ui/script.js

@@ -213,234 +213,6 @@ $(function() {
         return;
     });
 
-    $("#quitGameButton").click(function() {
-        exitGameMenu(true)
-        return;
-    });
-    $("#exitGameCancel").click(function() {
-        exitGameMenu(false)
-        return;
-    });
-    $("#exitGameConfirm").click(function() {
-        $.post(`https://${GetParentResourceName()}/exitGame`);
-        return;
-    });
-});
-$(function() {
-    function display(bool) {
-        if (bool) {
-            $("body").show();
-        } else {
-            $("body").hide();
-        }
-    }
-    function characterCreatorMenu(bool) {
-        if (bool) {
-            $("#characterCreator").fadeIn("slow");
-            $("#characterEditor, #exitGameMenu, #deleteCharacterMenu, #spawnLocation").hide();
-            return;
-        }
-        $("#characterCreator").fadeOut("slow");
-    }
-    function characterEditorMenu(bool) {
-        if (bool) {
-            $("#characterEditor").fadeIn("slow");
-            $("#characterCreator, #exitGameMenu, #deleteCharacterMenu, #spawnLocation").hide();
-            return;
-        }
-        $("#characterEditor").fadeOut("slow");
-    }
-    function exitGameMenu(bool) {
-        if (bool) {
-            $("#exitGameMenu").fadeIn("slow");
-            $("#characterCreator, #characterEditor, #deleteCharacterMenu, #spawnLocation").hide();
-            return;
-        }
-        $("#exitGameMenu").fadeOut("slow");
-    }
-    function confirmDeleteMenu(bool) {
-        if (bool) {
-            $("#deleteCharacterMenu").fadeIn("slow");
-            $("#characterCreator, #characterEditor, #exitGameMenu, #spawnLocation").hide();
-            return;
-        }
-        $("#deleteCharacterMenu").fadeOut("slow");
-    }
-    function spawnMenu(bool) {
-        if (bool) {
-            $("#spawnLocation").fadeIn("slow");
-            $("#characterCreator, #characterEditor, #exitGameMenu, #deleteCharacterMenu").hide();
-            return;
-        }
-        $("#spawnLocation").fadeOut("slow");
-    }
-
-    window.addEventListener("message", function(event) {
-        const item = event.data;
-        if (item.type === "ui") {
-            if (item.status) {
-                $("#serverName").text(item.serverName);
-                $("body").css("background-image", "url(" + item.background + ")");
-                display(true);
-            } else {
-                display(false);
-            }
-        }
-        
-        $("#playerAmount").text(item.characterAmount);
-
-        if (item.type === "setSpawns") {
-            $("#spawnMenuContainer").empty();
-            setTimeout(function(){
-                $("#tpDoNot").data("id", item.id);
-                $("#spawnMenuContainer").append(`<button class="spawnButtons" data-x="${item.x}" data-y="${item.y}" data-z="${item.z}">${item.name}</button>`);
-                $(".spawnButtons").click(function() {
-                    $.post(`https://${GetParentResourceName()}/tpToLocation`, JSON.stringify({
-                        x: $(this).data("x"),
-                        y: $(this).data("y"),
-                        z: $(this).data("z")
-                    }));
-                    spawnMenu(false);
-                    setTimeout(function(){
-                        $("#spawnMenuContainer").empty();
-                    }, 550);
-                    return;
-                });
-                $("#tpDoNot").click(function() {
-                    $.post(`https://${GetParentResourceName()}/tpDoNot`, JSON.stringify({
-                        id: $("#tpDoNot").data("id")
-                    }));
-                    spawnMenu(false)
-                    setTimeout(function(){
-                        $("#spawnMenuContainer").empty();
-                    }, 550);
-                    return;
-                });
-            }, 10);
-        }
-
-        if (item.type === "givePerms") {
-            JSON.parse(item.deptRoles).forEach((dept) => {
-                $(".departments").append($("<option>", {
-                    text: dept
-                }));
-            });
-        }
-
-        if (item.type === "aop") {
-            $("#aop").text(item.aop);
-        }
-
-        if (item.type === "refresh") {
-            $("#charactersSection").empty();
-            characterCreatorMenu(false);
-            let characters = JSON.parse(item.characters)
-            Object.keys(characters).forEach((id) => {
-                createCharacter(characters[id].firstName, characters[id].lastName, characters[id].dob, characters[id].gender, characters[id].twt, characters[id].job, characters[id].cash, characters[id].bank, characters[id].id);
-            });
-        }
-    })
-
-    function createCharacter(firstName, lastName, dateOfBirth, gender, twtName, department, startingCash, startingBank, id) {
-        $("#charactersSection").append(`<button id="characterButton${id}" class="createdButton">${firstName} ${lastName} (${department})</button><button id="characterButtonEdit${id}" class="createdButtonEdit"><a class="fas fa-edit"></a> Edit</button><button id="characterButtonDelete${id}" class="createdButtonDelete"><a class="fas fa-trash-alt"></a> Delete</button>`);
-        $(`#characterButton${id}`).click(function() {
-            spawnMenu(true)
-            $.post(`https://${GetParentResourceName()}/setMainCharacter`, JSON.stringify({
-                id: id
-            }));
-            return;
-        });
-        $(`#characterButtonEdit${id}`).click(function() {
-            characterEditorMenu(true)
-            $("#newFirstName").val(firstName);
-            $("#newLastName").val(lastName);
-            $("#newDateOfBirth").val(dateOfBirth);
-            $("#newGender").val(gender);
-            $("#newTwtName").val(twtName);
-            $("#newDepartment").val(department);
-            characterEdited = id
-            return;
-        });
-        $(`#characterButtonDelete${id}`).click(function() {
-            confirmDeleteMenu(true)
-            characterDeleting = id
-            return;
-        });
-    }
-
-    $("#characterCreator").submit(function() {
-        $.post(`https://${GetParentResourceName()}/newCharacter`, JSON.stringify({
-            firstName: $("#firstName").val(),
-            lastName: $("#lastName").val(),
-            dateOfBirth: $("#dateOfBirth").val(),
-            gender: $("#gender").val(),
-            twtName: $("#twtName").val(),
-            department: $("#department").val(),
-            startingCash: $("#startingCash").val(),
-            startingBank: $("#startingBank").val()
-        }));
-        characterCreatorMenu(false)
-        $("#firstName, #lastName, #dateOfBirth, #twtName, #startingCash, #startingBank").val("")
-        return false;
-    });
-
-    $("#characterEditor").submit(function() {
-        characterEditorMenu(false)
-        $.post(`https://${GetParentResourceName()}/editCharacter`, JSON.stringify({
-            firstName: $("#newFirstName").val(),
-            lastName: $("#newLastName").val(),
-            dateOfBirth: $("#newDateOfBirth").val(),
-            gender: $("#newGender").val(),
-            twtName: $("#newTwtName").val(),
-            department: $("#newDepartment").val(),
-            id: characterEdited
-        }));
-        return false;
-    });
-
-    $("#deleteCharacterConfirm").click(function() {
-        confirmDeleteMenu(false)
-        $("#characterButton" + characterDeleting).fadeOut("slow",function(){
-            $("#characterButton" + characterDeleting).remove();
-        })
-        $("#characterButtonEdit" + characterDeleting).fadeOut("slow",function(){
-            $("#characterButtonEdit" + characterDeleting).remove();
-        })
-        $("#characterButtonDelete" + characterDeleting).fadeOut("slow",function(){
-            $("#characterButtonDelete" + characterDeleting).remove();
-        })
-        $.post(`https://${GetParentResourceName()}/delCharacter`, JSON.stringify({
-            character: characterDeleting
-        }));
-        return;
-    });
-
-    $("#newCharacterButton").click(function() {
-        characterCreatorMenu(true)
-        return;
-    });
-
-    $("#deleteCharacterCancel").click(function() {
-        confirmDeleteMenu(false)
-        return;
-    });
-    $("#cancelCharacterCreation").click(function() {
-        characterCreatorMenu(false)
-        return;
-    });
-    $("#cancelCharacterEditing").click(function() {
-        characterEditorMenu(false)
-        return;
-    });
-
-    $("#tpCancel").click(function() {
-        spawnMenu(false)
-        setTimeout(function(){
-            $("#spawnMenuContainer").empty();
-        }, 550);
-        return;
-    });
-
     $("#quitGameButton").click(function() {
         exitGameMenu(true)
         return;

ND_Core/server/functions.lua

@@ -6,7 +6,6 @@ function NDCore.Functions.GetPlayers(players)
     cb(NDCore.Players)
 end
 
-
 local discordErrors = {
     [400] = "improper http request",
     [401] = "Discord bot token might be missing or incorrect",
@@ -353,4 +352,4 @@ function NDCore.Functions.VersionChecker(expectedResourceName, resourceName, dow
         end
     end)
 end
-NDCore.Functions.VersionChecker("ND_Core", GetCurrentResourceName(), "https://github.com/Andyyy7666/ND_Framework", "https://raw.githubusercontent.com/Andyyy7666/ND_Framework/main/ND_Core/fxmanifest.lua")
+NDCore.Functions.VersionChecker("ND_Core", GetCurrentResourceName(), "https://github.com/Andyyy7666/ND_Framework", "https://raw.githubusercontent.com/Andyyy7666/ND_Framework/main/ND_Core/fxmanifest.lua")