GetAllCommands

client/chat.lua

@@ -1,22 +1,28 @@
--- Staff Chat
-RegisterNUICallback("GetMessages", function(data, cb)
-	local data = lib.callback.await('ps-adminmenu:callback:GetMessages', false)
-	SendNUIMessage({
-		action = "setMessages",
-		data = data
-	})
-	if not data then return end
+local function getMessagesCallBack()
+	return lib.callback.await('ps-adminmenu:callback:GetMessages', false)
+end
+
+RegisterNUICallback("GetMessages", function(_, cb)
+	local data = getMessagesCallBack()
+	if next(data) then
+		SendNUIMessage({
+			action = "setMessages",
+			data = data
+		})
+	end
+	cb(1)
 end)
 
-RegisterNUICallback("SendMessage", function(data, cb)
-	local message = data.message
+RegisterNUICallback("SendMessage", function(msgData, cb)
+	local message = msgData.message
 	print(message, PlayerData.citizenid, PlayerData.charinfo.firstname .. " " .. PlayerData.charinfo.lastname )
 
 	TriggerServerEvent("ps-adminmenu:server:sendMessageServer", message, PlayerData.citizenid, PlayerData.charinfo.firstname .. " " .. PlayerData.charinfo.lastname)
 
-	local data = lib.callback.await('ps-adminmenu:callback:GetMessages', false)
+	local data = getMessagesCallBack()
 	SendNUIMessage({
 		action = "setMessages",
 		data = data
 	})
+	cb(1)
 end)

client/main.lua

@@ -6,13 +6,15 @@ local function setupMenu()
 	Wait(500)
 	PlayerData = QBCore.Functions.GetPlayerData()
 	local resources = lib.callback.await('ps-adminmenu:callback:GetResources', false)
+	local commands = lib.callback.await('ps-adminmenu:callback:GetCommands', false)
 	GetData()
 	SendNUIMessage({
 		action = "setupUI",
 		data = {
 			actions = Config.Actions,
 			resources = resources,
 			playerData = PlayerData,
+			commands = commands
 		}
 	})
 end

server/chat.lua

@@ -2,25 +2,23 @@ local messages = {}
 
 -- Staff Chat
 RegisterNetEvent('ps-adminmenu:server:sendMessageServer', function(message, citizenid, fullname)
+    if not CheckPerms('mod') then return end
+
     local time = os.time() * 1000
     local players = QBCore.Functions.GetPlayers()
 
     for i = 1, #players, 1 do
         local player = players[i]
-        if QBCore.Functions.HasPermission(player, 'mod') or IsPlayerAceAllowed(player, 'command') then
             if QBCore.Functions.IsOptin(player) then
                 QBCore.Functions.Notify(player, locale("new_staffchat", 'inform', 7500))
             end
         end
-    end
 
     messages[#messages + 1] = { message = message, citizenid = citizenid, fullname = fullname, time = time }
 end)
 
-lib.callback.register('ps-adminmenu:callback:GetMessages', function(source)
-    if QBCore.Functions.HasPermission(player, 'mod') or IsPlayerAceAllowed(player, 'command') then
-        return messages
-    end
 
-    return {}
+lib.callback.register('ps-adminmenu:callback:GetMessages', function()
+    if not CheckPerms('mod') then return {} end
+    return messages
 end)

server/regcommands.lua

@@ -0,0 +1,32 @@
+local commandsTable, addedCommands = {}, {}
+local blacklistCommands = {
+    "sv_", "adhesive_", "citizen_", "con_", "endpoint_", "fileserver", "load_server",
+    "mysql_connection", "net_tcp", "netPort", "netlib", "onesync", "onesync_",
+    "rateLimiter_", "svgui", "web_base", "temp_", "txAdmin", "txa",
+}
+
+local function isCommandBlacklisted(commandName)
+    for _, bcommand in pairs(blacklistCommands) do
+        if string.match(commandName, '^' .. bcommand) then
+            return true
+        end
+    end
+    return false
+end
+
+lib.callback.register('ps-adminmenu:callback:GetCommands', function()
+    if not CheckPerms(Config.ShowCommandsPerms) then return {} end
+
+    local allCommands = GetRegisteredCommands()
+
+    for _, command in ipairs(allCommands) do
+        if not isCommandBlacklisted(command.name) and not addedCommands[command.name] then
+            commandsTable[#commandsTable + 1] = {
+                name = '/' .. command.name
+            }
+            addedCommands[command.name] = true -- prevent duplicates
+        end
+    end
+
+    return commandsTable
+end)

shared/config.lua

@@ -2,6 +2,7 @@ Config = Config or {}
 
 Config.Fuel = "ps-fuel"        -- "ps-fuel", "LegacyFuel"
 Config.ResourcePerms = 'admin' -- permission to control resource(start stop restart)
+Config.ShowCommandsPerms = 'admin' -- permission to show all commands
 Config.RenewedPhone = false    -- if you use qb-phone from renewed. (multijob)
 
 -- Key Bindings

ui/src/layout/Main.svelte

@@ -7,6 +7,7 @@
 	import Server from '@pages/Server/Server.svelte'
 	import StaffChat from '@pages/Chat/Chat.svelte'
 	import Players from '@pages/Players/Players.svelte'
+	import Commands from '@pages/Commands/Commands.svelte'
 </script>
 
 <div
@@ -22,6 +23,8 @@
 			<StaffChat />
 		{:else if $ACTIVE_PAGE == 'Players'}
 			<Players />
+		{:else if $ACTIVE_PAGE == 'Commands'}
+			<Commands />
 		{/if}
 	</div>
 </div>

ui/src/layout/Sidebar/Components/Button.svelte

@@ -14,6 +14,8 @@
 		before:absolute
 		before:-right-3 before:top-1/2
 		before:w-max before:max-w-xs
+		before:px-[1vh]
+		before:py-[0.5vh]
 		before:-translate-x-full before:-translate-y-1/2
 		before:bg-tertiary before:text-white
 		before:rounded-md before:opacity-0

ui/src/layout/Sidebar/Sidebar.svelte

@@ -7,6 +7,7 @@
 		{ value: 'Staffchat', icon: 'fas fa-message' },
 		{ value: 'Players', icon: 'fas fa-users' },
 		{ value: 'Server', icon: 'fas fa-server' },
+		{ value: 'Commands', icon: 'fas fa-slash' },
 		{ value: 'Actions', icon: 'fas fa-wand-magic-sparkles' },
 	]
 </script>
@@ -40,6 +41,8 @@
 		before:absolute
 		before:-right-3 before:top-1/2
 		before:w-max before:max-w-xs
+		before:px-[1vh]
+		before:py-[0.5vh]
 		before:-translate-x-full before:-translate-y-1/2
 		before:bg-tertiary before:text-white
 		before:rounded-md before:opacity-0

ui/src/pages/Commands/Commands.svelte

@@ -0,0 +1,37 @@
+<script>
+	import { MENU_WIDE } from '@store/stores'
+	import { COMMANDS } from '@store/server'
+
+	import Header from '@components/Header.svelte'
+	import CommandsCard from './components/CommandsCard.svelte'
+
+	let search = ''
+
+	let SortedCommands = $COMMANDS ? $COMMANDS.slice().sort((a, b) => a.name.localeCompare(b.name)) : []
+</script>
+
+<div class="h-full w-[33vh] px-[2vh]">
+	<Header
+		title={'Commands'}
+		hasSearch={true}
+		onSearchInput={event => (search = event.target.value)}
+	/>
+	<div class="w-full h-[84%] flex flex-col gap-[1vh] mt-[1vh] overflow-auto">
+		{#if $COMMANDS}
+			{#if $COMMANDS && $COMMANDS.filter((commands) => commands.name.toLowerCase().includes(search.toLowerCase())).length === 0}
+				<div class="text-tertiary text-center text-[1.7vh] font-medium mt-[1vh]">No Commands Found.</div>
+			{:else}
+				<small class="font-medium">Total Commands: {SortedCommands.length}</small>
+				{#each SortedCommands.filter((commands) => commands.name.toLowerCase().includes(search.toLowerCase())) as commands}
+					<CommandsCard label={commands.name} />
+				{/each}
+			{/if}
+		{/if}
+	</div>
+</div>
+
+{#if $MENU_WIDE}
+	<div class="h-full w-[66vh] border-l-[0.2vh] border-tertiary px-[2vh]">
+		<Header title={'Dashboard'} />
+	</div>
+{/if}

ui/src/pages/Commands/components/CommandsCard.svelte

@@ -0,0 +1,10 @@
+<script>
+	export let label
+</script>
+
+<button class="w-full flex justify-between rounded-[0.5vh] bg-tertiary items-center">
+    <div class="flex items-center p-[2vh]">
+        <i class="fas fa-angle-right mr-[1vh]"></i>
+        <p class="text-[1.5vh]">{label ? label : ''}</p>
+    </div>
+</button>

ui/src/providers/AlwaysListener.svelte

@@ -2,7 +2,7 @@
 	import { ACTION } from '@store/actions'
 	import { ITEM_DATA, VEHICLE_DATA, JOB_DATA, GANG_DATA, LOCATION_DATA, PED_LIST } from '@store/data'
 	import { PLAYER, PLAYER_DATA } from '@store/players'
-	import { RESOURCE, RESOURCES } from '@store/server'
+	import { RESOURCE, RESOURCES, COMMANDS } from '@store/server'
 	import { VEHICLE_DEV } from '@store/vehicle_dev'
 	import { TOGGLE_COORDS } from '@store/togglecoords'
 	import { Message, Messages } from "@store/staffchat";
@@ -29,6 +29,7 @@
 		$ACTION = data.actions
 		$RESOURCE = data.resources
 		$PLAYER_DATA = data.playerData
+		$COMMANDS = data.commands
 	})
 
 	ReceiveNUI('setResourceData', (data: any) => {

ui/src/store/server.ts

@@ -2,6 +2,7 @@ import { writable } from "svelte/store";
 
 export const RESOURCE = writable<RESOURCE_DATA[]>(null);
 export const RESOURCES = writable<RESOURCE_DATA>(null);
+export const COMMANDS = writable<COMMANDS_DATA[]>(null);
 
 export const SERVER = writable<SERVER_DATA[]>(null);
 
@@ -12,7 +13,7 @@ interface RESOURCE_DATA {
     description?: string;
     resourceState?: string;
 }
-  
+
 interface SERVER_DATA {
     TotalCash?: string;
     TotalBank?: string;
@@ -22,4 +23,7 @@ interface SERVER_DATA {
     BansCount?: string;
     UniquePlayers?: string;
 }
-
+
+interface COMMANDS_DATA {
+    name?: string;
+}