CRITICAL - Fixes what discord broke and version bump

.gitignore

@@ -61,3 +61,4 @@ typings/
 
 # dotenv environment variables file
 .env
+test.js

docs/changelog.md

@@ -1,5 +1,8 @@
 ## Change log
 
+**7.3.0 - Emergency fix for discord api [2022-04-28]**
+- Discord broke everything without warning this fixes that
+
 **7.2.1 - Fixes and support [2022-04-15]**
 - update links
 - added swedish from ayatollah

docs/commands.md

@@ -80,8 +80,6 @@ There's currently only 3 permission tiers (mod, admin, god). Permissions are gra
 3. Change what is in the quotes `" "` to the permission you want to access the command. ie. `role: "admin",`
 4. save and restart the resource or server.
 
-To remove permissions from a command all together where anyone can use them delete both the `default_permission:` and `role:` lines from the command
-
 *Please note that permissions are synced across whole base commands so if you wanted `/money inspect` to be mod+ and `/money add` to be admin+ you'd need to separate them into separate commands to achieve that.*
 
 ### Add commands
@@ -106,7 +104,6 @@ Adding commands can be really simple if you're familiar with javascript but very
 3. If you wanted to make it so only admin or god could run your command you'd add the following 2 lines under your description line:
 
     ```js
-    default_permission: false,
     role: "admin",
     ```
 
@@ -141,44 +138,3 @@ Adding commands can be really simple if you're familiar with javascript but very
     **This resource itself** - Honestly there's so many features and practices being used actively here in commands and utils that you can take note from or in many cases just copy and paste and use so have at it and don't be afraid to break things to help learn more.. as long as you're not working on a live server while you're breaking things ;)
 
 
-### Add permission levels
-
-By defaults there is mod, admin and god but if you wanted to add another level, for like trial mods, it's actually quite easy to do. In `bot.js`, at the bottom there's a section called `loadDiscordPermissions()`.<br>
-It has 2 main parts, The role levels, which look like `const mod = { id:..`<br>
-And the role table
-```js
-this.config.perms = {
-    "mod": [ mod, admin, god, own ],
-    "admin": [ admin, god, own ], ...
-```
-you first would add a role level like:
-```js
-// You would replace "000000000000000" with the trialmod role id from discord
-const trialmod = { id: "000000000000000", type: 1, permission: true };
-```
-then you would add it to the role table with all the other roles you want to inherit permissions from trialmod:
-```js
-this.config.perms = {
-    "trialmod": [ trialmod, mod, admin, god, own ],
-    "mod": [ mod, admin, god, own ], ...
-```
-
-Then in the command files for the commands you want trial mods to be able to access change what was like `role: "mod",` to `role: "trialmod",`, save and restart the resource or server.
-
-**Note:** If you don't add the extra role levels to the trialmod list those roles wont be able to access the commands set with `role: "trialmod"`
-
-**Full example:**
-```js
-loadDiscordPermissions() {
-    const mod = { id: this.config.DiscordModRoleId, type: 1, permission: true };
-    const admin = { id: this.config.DiscordAdminRoleId, type: 1, permission: true };
-    const god = { id: this.config.DiscordGodRoleId, type: 1, permission: true };
-    const god2 = { id: "000000000000000000", type: 1, permission: true }; // Added
-    const own = { id: "142831624868855808", type: 2, permission: true };
-    this.config.perms = {
-        "mod": [ mod, admin, god, god2, own ], // changed
-        "admin": [ admin, god, god2, own ], // changed
-        "god": [ god, god2, own ], // changed
-    };
-}
-```

fxmanifest.lua

@@ -15,7 +15,7 @@ games { "gta5" }
 author "zfbx"
 description "Discord bot allowlist and more"
 repository "https://github.com/zfbx/zdiscord"
-version "7.2.1"
+version "7.3.0"
 license "CC-BY-NC-SA-4.0"
 lua54 'yes'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zdiscord",
-  "version": "7.2.1",
+  "version": "7.3.0",
   "description": "Advanced Discord Bot Allowlist that's simple to use",
   "main": "server.js",
   "scripts": {

server/bot.js

@@ -43,8 +43,6 @@ class Bot extends Client {
         this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordGodRoleId)), "Your DiscordGodRoleId doesn't seem correct");
         this.utils.log.assert(this.config.EnableStaffChatForwarding && !(this.utils.isValidID(this.config.DiscordStaffChannelId)), "Your DiscordStaffChannelId doesn't seem correct");
 
-        this.loadDiscordPermissions();
-
         if (this.config.EnableDiscordSlashCommands) this.loadCommands();
         this.loadEvents();
 
@@ -188,16 +186,22 @@ class Bot extends Client {
         return member.roles.cache.map(r => r.id);
     }
 
-    loadDiscordPermissions() {
-        const mod = { id: this.config.DiscordModRoleId, type: 1, permission: true };
-        const admin = { id: this.config.DiscordAdminRoleId, type: 1, permission: true };
-        const god = { id: this.config.DiscordGodRoleId, type: 1, permission: true };
-        const own = { id: "142831624868855808", type: 2, permission: true };
-        this.config.perms = {
-            "mod": [ mod, admin, god, own ],
-            "admin": [ admin, god, own ],
-            "god": [ god, own ],
-        };
+    hasPermission(member, level) {
+        switch (level) {
+        case "mod":
+            return (
+                member.roles.cache.has(this.config.DiscordModRoleId) ||
+                member.roles.cache.has(this.config.DiscordAdminRoleId) ||
+                member.roles.cache.has(this.config.DiscordGodRoleId));
+        case "admin":
+            return (
+                member.roles.cache.has(this.config.DiscordAdminRoleId) ||
+                member.roles.cache.has(this.config.DiscordGodRoleId));
+        case "god":
+            return (member.roles.cache.has(this.config.DiscordGodRoleId));
+        default:
+            return true;
+        }
     }
 
 }

server/commands/announcement.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "announcement",
     description: "Send in city announcement",
-    default_permission: false,
     role: "mod",
 
     options: [

server/commands/embed.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "embed",
     description: "Send an embedded (fancy) message in a specified channel",
-    default_permission: false,
     role: "god",
 
     options: [

server/commands/identifiers.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "identifiers",
     description: "Get all of a player's identifiers",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/kick.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "kick",
     description: "Kick a player from the city",
-    default_permission: false,
     role: "mod",
 
     options: [

server/commands/kickall.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "kickall",
     description: "Kick every player in the city",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/kill.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "kill",
     description: "kill a player in city",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/message.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "message",
     description: "direct a message to a specific player",
-    default_permission: false,
     role: "mod",
 
     options: [

server/commands/players.js

@@ -14,7 +14,6 @@ const { MessageButton } = require("discord.js");
 module.exports = {
     name: "players",
     description: "Get list of current players in city",
-    default_permission: false,
     role: "mod",
 
     run: async (client, interaction) => {

server/commands/qb-ban.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "ban",
     description: "ban a player",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-clothingmenu.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "clothing-menu",
     description: "Give a player the clothing menu",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-gang.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "gang",
     description: "Manage player's in-city gang",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-inventory.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "inventory",
     description: "Manage player's in-city items",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-jail.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "jail",
     description: "Manage a player's jail sentence",
-    default_permission: false,
     role: "mod",
 
     options: [

server/commands/qb-job.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "job",
     description: "Manage player's in-city job",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-logout.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "logout",
     description: "send a player back to the character selection screen",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-money.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "money",
     description: "Manage player's in-city money",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-permissions.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "permissions",
     description: "Manage player's in-city permissions",
-    default_permission: false,
     role: "god",
 
     options: [

server/commands/qb-revive.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "revive",
     description: "Raise a downed player to full health and stats",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-reviveall.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "revive-all",
     description: "Raise all downed players to full health and stats",
-    default_permission: false,
     role: "god",
 
     run: async (client, interaction, args) => {

server/commands/qb-time.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "time",
     description: "set city time",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/qb-user-checkonline.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "onlinecheck",
     type: "USER",
-    default_permission: false,
     role: "mod",
 
     run: async (client, interaction, args) => {

server/commands/qb-vehicle.js

@@ -20,7 +20,6 @@ const vehicleStates = {
 module.exports = {
     name: "vehicle",
     description: "Give user a vehicle with a fixed plate",
-    default_permission: false,
     role: "god",
 
     options: [

server/commands/qb-weather.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "weather",
     description: "Manage city weather",
-    default_permission: false,
     role: "admin",
 
     options: [

server/commands/resource.js

@@ -14,7 +14,6 @@ const { MessageButton } = require("discord.js");
 module.exports = {
     name: "resource",
     description: "Manage server resources / scripts",
-    default_permission: false,
     role: "god",
 
     options: [

server/commands/screenshot.js

@@ -15,7 +15,6 @@ const Buffer = require("buffer").Buffer;
 module.exports = {
     name: "screenshot",
     description: "Screenshot player's POV",
-    default_permission: false,
     role: "god",
 
     options: [

server/commands/server.js

@@ -12,8 +12,6 @@
 module.exports = {
     name: "server",
     description: "Get FiveM and Discord Stats",
-    // default_permission: false,
-    // role: "mod",
 
     run: async (client, interaction) => {
         if (client.isRolePresent(interaction.member, [client.config.DiscordModRoleId, client.config.DiscordAdminRoleId, client.config.DiscordGodRoleId])) {
@@ -34,15 +32,15 @@ module.exports = {
                     **Channels:** ${interaction.guild.channels.cache.filter((chan) => chan.type === "GUILD_TEXT").size}
                     **Members:** ${interaction.guild.memberCount}${getWhitelisted(client, interaction)}
                     **Owner:** <@${interaction.guild.ownerId}> (${interaction.guild.ownerId})`, true)
-                .setFooter({ text: `${GetCurrentResourceName()} by zfbx` });
+                .setFooter({ text: "zdiscord by zfbx" });
             return interaction.reply({ embeds: [ embed ] });
         } else {
             const embed = new client.Embed()
                 .setThumbnail(interaction.guild.iconURL({ format: "png", size: 512 }))
                 .addField(client.config.FiveMServerName, `**Server IP:** ${client.config.FiveMServerIP}
                     **Uptime:** ${(GetGameTimer() / 1000 / 60).toFixed(2)} minutes
                     **Players:** ${GetNumPlayerIndices()}/${GetConvar("sv_maxClients", "Unknown")}`, false)
-                .setFooter({ text: `${GetCurrentResourceName()} by zfbx` });
+                .setFooter({ text: "zdiscord by zfbx" });
             return interaction.reply({ embeds: [ embed ] });
         }
     },

server/commands/teleport.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "teleport",
     description: "teleport a player",
-    default_permission: false,
     role: "mod",
 
     options: [

server/commands/teleportall.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "teleport-all",
     description: "teleport everyone",
-    default_permission: false,
     role: "god",
 
     options: [

server/commands/whitelist.js

@@ -12,7 +12,6 @@
 module.exports = {
     name: "whitelist",
     description: "Manage whitelist",
-    default_permission: false,
     role: "god",
 
     options: [

server/events/interactionCreate.js

@@ -18,6 +18,10 @@ module.exports = {
             if (!command) {
                 return interaction.reply({ content: "An error has occurred ", ephemeral: true }).catch((error) => client.utils.log.handler("error", error));
             }
+            if (!client.hasPermission(interaction.member, command.role)) {
+                return interaction.reply({ content: "You don't have permission to use this command", ephemeral: true }).catch();
+            }
+
             const args = {};
             for (const option of interaction.options.data) {
                 if (option.type === "SUB_COMMAND") {