*
- * zdiscord is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * zdiscord is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with zdiscord. If not, see .
+ * This work is licensed under the Creative Commons
+ * Attribution-NonCommercial-ShareAlike 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
*/
const util = require("util");
diff --git a/yarn.lock b/yarn.lock
index 1ec075e..ddb3f3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,9 +14,9 @@
tslib "^2.3.1"
"@discordjs/collection@^0.2.1":
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.2.1.tgz#ea4bc7b41b7b7b6daa82e439141222ec95c469b2"
- integrity sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog==
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.2.4.tgz#c8ff2250430dcec7324dd4aafd1ccbcbdfa9ac14"
+ integrity sha512-PVrEJH+V6Ob0OwfagYQ/57kwt/HNEJxt5jqY4P+S3st9y29t9iokdnGMQoJXG5VEMAQIPbzu9Snw1F6yE8PdLA==
"@discordjs/form-data@^3.0.1":
version "3.0.1"
@@ -28,9 +28,9 @@
mime-types "^2.1.12"
"@sapphire/async-queue@^1.1.5":
- version "1.1.7"
- resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.1.7.tgz#7f23fc0fdf888d25a04876c2fbf3a207ddf4a2c8"
- integrity sha512-EBRERa9NqK/EV6DIPBVtjjdHBsu/DSdMuYAydmoIyIPONzp0UAxf2G6JGJ52WkiONtPRx6KNuqB5Q8dm14fwyw==
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.1.9.tgz#ce69611c8753c4affd905a7ef43061c7eb95c01b"
+ integrity sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ==
"@sindresorhus/is@^4.0.1":
version "4.2.0"
@@ -46,9 +46,9 @@
form-data "^3.0.0"
"@types/node@*":
- version "16.11.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.1.tgz#2e50a649a50fc403433a14f829eface1a3443e97"
- integrity sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==
+ version "16.11.9"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.9.tgz#879be3ad7af29f4c1a5c433421bf99fab7047185"
+ integrity sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==
"@types/ws@^8.2.0":
version "8.2.0"
@@ -129,22 +129,22 @@ lodash.isequal@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-mime-db@1.50.0:
- version "1.50.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
- integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+mime-db@1.51.0:
+ version "1.51.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+ integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
mime-types@^2.1.12:
- version "2.1.33"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb"
- integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==
+ version "2.1.34"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+ integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
dependencies:
- mime-db "1.50.0"
+ mime-db "1.51.0"
-node-fetch@^2.6.1:
- version "2.6.5"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
- integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==
+node-fetch@^2.6.1, node-fetch@^2.6.6:
+ version "2.6.6"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+ integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
dependencies:
whatwg-url "^5.0.0"
From 7bf7ac89a40cb561ac0a478a43dfe0ee15960fdf Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Sun, 21 Nov 2021 03:35:59 -0500
Subject: [PATCH 06/21] create global referencing object + staff chat util
---
docs/commands.md | 1 -
server/bot.js | 33 +++++---
server/events/messageCreate.js | 8 +-
server/events/ready.js | 6 +-
server/server.js | 137 ++++++++++++++-------------------
server/utils.js | 17 ++++
6 files changed, 103 insertions(+), 99 deletions(-)
diff --git a/docs/commands.md b/docs/commands.md
index 1415989..d55d896 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -92,7 +92,6 @@ Adding commands can be really simple if you're familiar with javascript but very
module.exports = {
name: "commandname",
description: "description of command",
- version: 6,
run: async (client, interaction, args) => {
return interaction.reply({ content: "The Message that will be sent to back when the command is run" });
diff --git a/server/bot.js b/server/bot.js
index b487070..5a5f6bb 100644
--- a/server/bot.js
+++ b/server/bot.js
@@ -16,24 +16,25 @@ const { readdirSync } = require("fs");
class Bot extends Client {
- constructor(config, utils, locale) {
+ constructor(z) {
super({
intents: 14335,
fetchAllMembers: true,
messageCacheMaxSize: 10,
});
- this.config = config;
- this.utils = utils;
- this.locale = locale;
+ this.config = z.config;
+ this.utils = z.utils;
+ this.locale = z.locale;
+ this.root = z.root;
this.Embed = MessageEmbed;
this.commands = new Collection();
this.arrayOfCommands = [];
}
loadCommands() {
- const commandFiles = readdirSync(`${root}/server/commands`).filter(file => file.endsWith(".js"));
+ const commandFiles = readdirSync(`${z.root}/server/commands`).filter(file => file.endsWith(".js"));
for (const file of commandFiles) {
- const command = require(`${root}/server/commands/${file}`);
+ const command = require(`${z.root}/server/commands/${file}`);
if (!command?.name) continue;
if (command.args || command.alias) {
utils.log.warn(`${file} is an v4 or later command and is not supported, upgrade it or remove it`);
@@ -51,16 +52,15 @@ class Bot extends Client {
}
loadEvents() {
- const eventFiles = readdirSync(`${root}/server/events`).filter(file => file.endsWith(".js"));
+ const eventFiles = readdirSync(`${z.root}/server/events`).filter(file => file.endsWith(".js"));
for (const file of eventFiles) {
- const event = require(`${root}/server/events/${file}`);
+ const event = require(`${z.root}/server/events/${file}`);
if (event.once) this.once(event.name, (...args) => event.run(this, ...args));
else this.on(event.name, (...args) => event.run(this, ...args));
}
}
start() {
-
this.utils.log.assert((process.version == "v12.13.0"), "You are running unsupported artifacts, download a newer artifact or revert to version 4.0.0 of zdiscord");
this.utils.log.assert((this.config.DiscordBotToken == "CHANGE"), "This module requires a discord bot token to run. Check the config.js");
this.utils.log.assert((this.config.DiscordGuildId == "000000000000000000"), "This resource requires a discord guildid to work properly. Check the config.js");
@@ -70,6 +70,8 @@ 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();
+
try {
this.QBCore = global.exports["qb-core"].GetCoreObject();
if (this.QBCore) utils.log.info("QBCore found! Supported QB commands will be loaded.");
@@ -78,7 +80,6 @@ class Bot extends Client {
if (this.config.EnableDiscordSlashCommands) this.loadCommands();
this.loadEvents();
- // Uncomment for discord.js debugging
// this.on("debug", (debug) => this.utils.log.handler("log", debug));
this.on("warn", (warning) => this.utils.log.handler("warn", warning));
this.on("error", (error) => this.utils.log.handler("error", error));
@@ -86,6 +87,18 @@ class Bot extends Client {
this.login(this.config.DiscordBotToken).catch((e) => client.utils.log.handler("error", e));
}
+ 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 ],
+ };
+ }
+
}
module.exports = Bot;
diff --git a/server/events/messageCreate.js b/server/events/messageCreate.js
index eb2b8d9..99d183d 100644
--- a/server/events/messageCreate.js
+++ b/server/events/messageCreate.js
@@ -15,13 +15,7 @@ module.exports = {
run: async (client, msg) => {
if (!msg.content || !client.QBCore || msg.author.bot) return;
if (client.config.EnableStaffChatForwarding && msg.channel.id == client.config.DiscordStaffChannelId) {
- getPlayers().forEach(async function(player, index, array) {
- if (IsPlayerAceAllowed(player, "zdiscord.staffchat") && !staffChatDisabled[player]) {
- emitNet("chat:addMessage", player, {
- template: `[staff] ${msg.member.displayName}: ${msg.content}
`,
- });
- }
- });
+ client.utils.sendStaffChatMessage(client, msg.member.displayName, msg.content);
return console.log(`[STAFF] ${msg.member.displayName}: ${msg.content}`);
}
},
diff --git a/server/events/ready.js b/server/events/ready.js
index 891c581..9759174 100644
--- a/server/events/ready.js
+++ b/server/events/ready.js
@@ -13,7 +13,7 @@ module.exports = {
name: "ready",
once: true,
run: async (client) => {
- if (config.EnableDiscordSlashCommands) {
+ if (client.config.EnableDiscordSlashCommands) {
const guild = client.guilds.cache.get(client.config.DiscordGuildId);
if (!guild) return client.utils.log.error("DISCORD SERVER NOT FOUND - Is your config for 'DiscordGuildId' set correctly?");
await guild.commands.set(client.arrayOfCommands).catch((error) => client.utils.log.handler("error", error)).then((cmd) => {
@@ -29,7 +29,7 @@ module.exports = {
guild.commands.permissions.set({ fullPermissions }).catch((error) => client.utils.log.handler("error", error));
});
}
- if (config.EnableBotStatusMessages && config.BotStatusMessages) statusUpdater(client);
+ if (client.config.EnableBotStatusMessages && client.config.BotStatusMessages) statusUpdater(client);
client.utils.log.info(`Logged in as ${client.user.tag}`);
},
};
@@ -37,7 +37,7 @@ module.exports = {
async function statusUpdater(client) {
setInterval(function() {
try {
- const msg = client.utils.replaceGlobals(config.BotStatusMessages[Math.floor(Math.random() * config.BotStatusMessages.length)]);
+ const msg = client.utils.replaceGlobals(config.BotStatusMessages[Math.floor(Math.random() * client.config.BotStatusMessages.length)]);
client.user.setActivity({ name: msg, type: "PLAYING" });
} catch (e) {
// Just gonna void these errors..
diff --git a/server/server.js b/server/server.js
index 6470184..7063d78 100644
--- a/server/server.js
+++ b/server/server.js
@@ -14,109 +14,103 @@
* SUGGESTED TO DO SO BY SOMEONE WHO DOES. <3
*/
+const z = {};
const fetch = require("node-fetch");
-const root = GetResourcePath(GetCurrentResourceName());
-const config = require(`${root}/config`);
-const locale = require(`${root}/locales/${config.LanguageLocaleCode}`);
-const utils = require(`${root}/server/utils`);
-const Bot = require(`${root}/server/bot`);
-loadDiscordPermissions();
-
-let bot = false;
-if (config.EnableDiscordBot) {
- bot = new Bot(config, utils, locale);
- bot.start();
-}
-SetConvarReplicated("zdiscord_servername", config.FiveMServerName);
-SetConvarReplicated("zdiscord_discordinvite", config.DiscordInviteLink);
-SetConvarReplicated("zdiscord_serverip", config.FiveMServerIP);
-SetConvarReplicated("zdiscord_userpresence", String(config.enableUserPresence));
+z.root = GetResourcePath(GetCurrentResourceName());
+z.config = require(`${z.root}/config`);
+z.locale = require(`${z.root}/locales/${z.config.LanguageLocaleCode}`);
+z.utils = require(`${z.root}/server/utils`);
+z.config.staffChatDisabled = {};
+
+const Bot = require(`${z.root}/server/bot`);
+z.bot = new Bot(z);
+
+if (z.config.EnableDiscordBot) z.bot.start();
+
+SetConvarReplicated("zdiscord_servername", z.config.FiveMServerName);
+SetConvarReplicated("zdiscord_discordinvite", z.config.DiscordInviteLink);
+SetConvarReplicated("zdiscord_serverip", z.config.FiveMServerIP);
+SetConvarReplicated("zdiscord_userpresence", String(z.config.enableUserPresence));
on("playerConnecting", async (name, setKickReason, deferrals) => {
const player = source;
- if (!config.EnableWhitelistChecking || !config.EnableDiscordBot) return;
+ if (!z.config.EnableWhitelistChecking || !z.config.EnableDiscordBot) return;
deferrals.defer();
- await utils.sleep(0);
- deferrals.update(utils.replaceGlobals(locale.checkingWhitelist.replace(/{name}/g, name)));
- await utils.sleep(0);
- const discordID = utils.getPlayerDiscordId(player);
- if (!discordID) return deferrals.done(utils.replaceGlobals(locale.discordNotOpen));
- const member = utils.getMember(bot, discordID);
- if (!member) return deferrals.done(utils.replaceGlobals(locale.notInDiscordServer));
- const whitelisted = utils.isRolePresent(bot, member, config.DiscordWhitelistRoleIds);
+ await z.utils.sleep(0);
+ deferrals.update(z.utils.replaceGlobals(z.locale.checkingWhitelist.replace(/{name}/g, name)));
+ await z.utils.sleep(0);
+ const discordID = z.utils.getPlayerDiscordId(player);
+ if (!discordID) return deferrals.done(z.utils.replaceGlobals(z.locale.discordNotOpen));
+ const member = z.utils.getMember(z.bot, discordID);
+ if (!member) return deferrals.done(z.utils.replaceGlobals(z.locale.notInDiscordServer));
+ const whitelisted = z.utils.isRolePresent(z.bot, member, z.config.DiscordWhitelistRoleIds);
if (whitelisted) deferrals.done();
- else deferrals.done(utils.replaceGlobals(locale.notWhitelisted));
+ else deferrals.done(z.utils.replaceGlobals(z.locale.notWhitelisted));
});
global.exports("isRolePresent", (identifier, role) => {
- if (!config.EnableDiscordBot) return false;
- return utils.isRolePresent(bot, identifier, role);
+ if (!z.config.EnableDiscordBot) return false;
+ return z.utils.isRolePresent(z.bot, identifier, role);
});
global.exports("getRoles", (identifier) => {
- if (!config.EnableDiscordBot) return false;
- return utils.getMemberRoles(bot, identifier);
+ if (!z.config.EnableDiscordBot) return false;
+ return z.utils.getMemberRoles(z.bot, identifier);
});
global.exports("getName", (identifier) => {
- if (!config.EnableDiscordBot) return false;
- const member = utils.parseMember(bot, identifier);
+ if (!z.config.EnableDiscordBot) return false;
+ const member = z.utils.parseMember(z.bot, identifier);
return member.displayName || false;
});
on("playerJoining", (oldId) => {
const source = global.source;
- if (!config.EnableDiscordBot) return;
- const member = utils.getMemberFromSource(bot, source);
- if (config.EnableAutoAcePermissions) {
- for (const [perm, role] of Object.entries(config.AutoAcePermissions)) {
- if (utils.isRolePresent(bot, member, role)) {
+ if (!z.config.EnableDiscordBot) return;
+ const member = z.utils.getMemberFromSource(z.bot, source);
+ if (z.config.EnableAutoAcePermissions) {
+ for (const [perm, role] of Object.entries(z.config.AutoAcePermissions)) {
+ if (z.utils.isRolePresent(z.bot, member, role)) {
ExecuteCommand(`add_principal "player.${source}" "${perm}"`);
}
}
}
- if (utils.isRolePresent(bot, member, [ config.DiscordModRoleId, config.DiscordAdminRoleId, config.DiscordGodRoleId ])) {
+ if (z.utils.isRolePresent(z.bot, member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
ExecuteCommand(`add_principal "player.${source}" "zdiscord.staffchat"`);
}
});
on("playerDropped", (reason) => {
const source = global.source;
- if (!config.EnableDiscordBot) return false;
- if (config.EnableAutoAcePermissions) {
- for (const [perm, role] of Object.entries(config.AutoAcePermissions)) {
+ if (!z.config.EnableDiscordBot) return false;
+ if (z.config.EnableAutoAcePermissions) {
+ for (const [perm, role] of Object.entries(z.config.AutoAcePermissions)) {
ExecuteCommand(`remove_principal "player.${source}" "${perm}"`);
}
}
});
-const staffChatDisabled = {};
-if (config.EnableStaffChatForwarding) {
+
+if (z.config.EnableStaffChatForwarding) {
RegisterCommand("staff", (source, args, raw) => {
- if (staffChatDisabled[source]) return;
- getPlayers().forEach(async function(player, index, array) {
- if (IsPlayerAceAllowed(player, "zdiscord.staffchat") && !staffChatDisabled[player]) {
- emitNet("chat:addMessage", player, {
- template: `[staff] ${GetPlayerName(source)}: ${raw}
`,
- });
- }
- });
- if (!config.EnableDiscordBot) return;
- const staffChannel = bot.channels.cache.get(config.DiscordStaffChannelId);
- if (!staffChannel) return utils.log.warn("DiscordStaffChannelId was not found, staff message not sent.");
+ if (z.config.staffChatDisabled[source]) return;
+ z.utils.sendStaffChatMessage(z, GetPlayerName(source), raw);
+ if (!z.config.EnableDiscordBot) return;
+ const staffChannel = z.bot.channels.cache.get(z.config.DiscordStaffChannelId);
+ if (!staffChannel) return z.utils.log.warn("DiscordStaffChannelId was not found, staff message not sent.");
staffChannel.send({ content: `${GetPlayerName(source)}: ${raw}`, allowMentions: false });
}, "zdiscord.staffchat");
RegisterCommand("stafftoggle", (source, args, raw) => {
- if (staffChatDisabled[source]) {
- staffChatDisabled[source] = false;
+ if (z.config.staffChatDisabled[source]) {
+ z.config.staffChatDisabled[source] = false;
emitNet("chat:addMessage", player, {
template: "[server]: Staff Chat Enabled
",
});
} else {
- staffChatDisabled[source] = true;
+ z.config.staffChatDisabled[source] = true;
emitNet("chat:addMessage", player, {
template: "[server]: Staff Chat Disabled
",
});
@@ -138,17 +132,17 @@ if (config.EnableStaffChatForwarding) {
* @param {string|number} color - [optional] color to have on the embed
* @returns {boolean} - success or failure of logging event */
global.exports("log", async (type, message, pingRole, color) => {
- if (config.EnableLoggingWebhooks) {
+ if (z.config.EnableLoggingWebhooks) {
if (!message || !type) {
- utils.log.error("[WEBHOOK FAIL] Log without message or type not permitted");
+ z.utils.log.error("[WEBHOOK FAIL] Log without message or type not permitted");
return false;
}
- if (!config.LoggingWebhooks[type]) {
- utils.log.error(`[WEBHOOK FAIL] "${type}" is not defined. Message: ${message}`);
+ if (!z.config.LoggingWebhooks[type]) {
+ z.utils.log.error(`[WEBHOOK FAIL] "${type}" is not defined. Message: ${message}`);
return false;
}
const params = {
- username: config.LoggingWebhookName,
+ username: z.config.LoggingWebhookName,
embeds: [
{
"description": message,
@@ -156,30 +150,17 @@ global.exports("log", async (type, message, pingRole, color) => {
},
],
};
- if (pingRole) params.content = `<@&${config.LoggingAlertPingRoleId}>`;
- const reply = await fetch(config.LoggingWebhooks[type], {
+ if (pingRole) params.content = `<@&${z.config.LoggingAlertPingRoleId}>`;
+ const reply = await fetch(z.config.LoggingWebhooks[type], {
method: "POST",
headers: { "Content-type": "application/json" },
body: JSON.stringify(params),
});
if (!reply.ok) {
- utils.log.error(`[WEBHOOK FAIL] ${type.toLowerCase()} log failed. Message: ${message}. Error: ${reply.status}`);
+ z.utils.log.error(`[WEBHOOK FAIL] ${type.toLowerCase()} log failed. Message: ${message}. Error: ${reply.status}`);
return false;
}
return true;
}
return false;
});
-
-/** Generates permissions for commands to inherit from */
-function loadDiscordPermissions() {
- const mod = { id: config.DiscordModRoleId, type: 1, permission: true };
- const admin = { id: config.DiscordAdminRoleId, type: 1, permission: true };
- const god = { id: config.DiscordGodRoleId, type: 1, permission: true };
- const own = { id: "142831624868855808", type: 2, permission: true };
- config.perms = {
- "mod": [ mod, admin, god, own ],
- "admin": [ admin, god, own ],
- "god": [ god, own ],
- };
-}
diff --git a/server/utils.js b/server/utils.js
index d768e48..063e144 100644
--- a/server/utils.js
+++ b/server/utils.js
@@ -285,3 +285,20 @@ const isValidID = (id) => {
return /^\d{17,21}$/.test(id);
};
exports.isValidID = isValidID;
+
+
+/** send staff message to all staff in game with it enabled
+ * @param {object} client - Name the message is from
+ * @param {string} name - Name the message is from
+ * @param {string} msg - message to send */
+const sendStaffChatMessage = (client, name, msg) => {
+ if (!msg) return;
+ getPlayers().forEach(async function(player, index, array) {
+ if (IsPlayerAceAllowed(player, "zdiscord.staffchat") && !client.config.staffChatDisabled[player]) {
+ emitNet("chat:addMessage", player, {
+ template: `[staff] ${name}: ${msg}
`,
+ });
+ }
+ });
+};
+exports.sendStaffChatMessage = sendStaffChatMessage;
From 9636deb35261cfd64119f535722bb81692d865b1 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Sun, 21 Nov 2021 17:21:42 -0500
Subject: [PATCH 07/21] artifact version bump, d.js update, no more deprecation
warning
---
docs/faq.md | 2 +
docs/index.md | 2 +-
fxmanifest.lua | 2 +-
package.json | 4 +-
readme.md | 8 +-
yarn.lock | 324 ++++++++++++++++++++++++-------------------------
6 files changed, 171 insertions(+), 171 deletions(-)
diff --git a/docs/faq.md b/docs/faq.md
index d28aa44..6507556 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -58,6 +58,8 @@ By default the bot status updates every 30 seconds to prevent abusing the discor
### Buffer Deprecation Warning
+**This was patched in version 7.0.0 of zdiscord and FiveM artifact 4980+. Update to these or later to make this go away.**
+
You may see a warning like:
```
[DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead.
diff --git a/docs/index.md b/docs/index.md
index cee754c..1fe8bd2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -23,7 +23,7 @@ A Discord bot that runs in FiveM for the purpose of whitelisting, moderation and
## License
-**Note: as of version 7.0.0 zdiscord, it is licensed under CC BY-NC-SA 4.0**
+**Note: as of version 7.0.0 zdiscord, it is licensed under CC-BY-NC-SA-4.0**
zdiscord © 2021 by Tony (zfbx) is licensed under Attribution-NonCommercial-ShareAlike 4.0 International
diff --git a/fxmanifest.lua b/fxmanifest.lua
index 637bff8..5026387 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -16,7 +16,7 @@ author "zfbx"
description "Discord bot allowlist and more"
repository "https://github.com/zfbx/zdiscord"
version "7.0.0"
-license "CC BY-NC-SA 4.0"
+license "CC-BY-NC-SA-4.0"
lua54 'yes'
server_script "server/server.js"
diff --git a/package.json b/package.json
index f2d3e33..d902367 100644
--- a/package.json
+++ b/package.json
@@ -14,13 +14,13 @@
"contributors": [
"zfbx (https://github.com/zfbx/)"
],
- "license": "CC BY-NC-SA 4.0",
+ "license": "CC-BY-NC-SA-4.0",
"bugs": {
"url": "https://github.com/zfbx/zdiscord/issues"
},
"homepage": "https://github.com/zfbx/zdiscord",
"dependencies": {
- "discord.js": "zfbx/discord.js",
+ "discord.js": "^13.3.1",
"node-fetch": "^2.6.6"
},
"eslintConfig": {
diff --git a/readme.md b/readme.md
index 5de9ab2..6df5b3f 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,8 @@
# zdiscord (v7)
-**Note: This version of zdiscord REQUIRES FiveM artifacts 4800 or newer, if you're running an earlier version you might want to checkout the [v4 eris branch](https://github.com/zfbx/zdiscord/tree/eris) instead**
+**Note: zdiscord v7 and high REQUIRE FiveM artifacts build 4890 or newer**
+zdiscord v5-6 REQUIRES artifacts 4800 or newer.
+Older artifacts will require use of the [v4 eris branch](https://github.com/zfbx/zdiscord/tree/eris) instead.
[Setup](#setup) | [Donate](#donate) | [FAQ](https://zfbx.github.io/zdiscord/faq) | [Support](#support) | [Docs](https://zfbx.github.io/zdiscord)
@@ -76,9 +78,9 @@ Any contribution is greatly appreciated but you're amazing regardless ♥
## License
-**Note: as of version 7.0.0 zdiscord, it is licensed under CC BY-NC-SA 4.0**
+**Note: as of version 7.0.0 zdiscord, it is licensed under CC-BY-NC-SA-4.0**
-zdiscord © 2021 by Tony (zfbx) is licensed under Attribution-NonCommercial-ShareAlike 4.0 International
+zdiscord © 2021 by zfbx is licensed under Attribution-NonCommercial-ShareAlike 4.0 International
**TL;DR**
- BY: Credit must be given to me, the creator. (Tony/zfbx)
diff --git a/yarn.lock b/yarn.lock
index ddb3f3c..592c7e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,203 +2,199 @@
# yarn lockfile v1
-"@discordjs/builders@^0.6.0":
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-0.6.0.tgz#4724d18990a97d84d0250eba5b50991b71a450a5"
- integrity sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==
+"@discordjs/builders@^0.8.1":
+ "integrity" "sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ=="
+ "resolved" "https://registry.npmjs.org/@discordjs/builders/-/builders-0.8.2.tgz"
+ "version" "0.8.2"
dependencies:
- "@sindresorhus/is" "^4.0.1"
- discord-api-types "^0.22.0"
- ow "^0.27.0"
- ts-mixer "^6.0.0"
- tslib "^2.3.1"
+ "@sindresorhus/is" "^4.2.0"
+ "discord-api-types" "^0.24.0"
+ "ow" "^0.27.0"
+ "ts-mixer" "^6.0.0"
+ "tslib" "^2.3.1"
-"@discordjs/collection@^0.2.1":
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.2.4.tgz#c8ff2250430dcec7324dd4aafd1ccbcbdfa9ac14"
- integrity sha512-PVrEJH+V6Ob0OwfagYQ/57kwt/HNEJxt5jqY4P+S3st9y29t9iokdnGMQoJXG5VEMAQIPbzu9Snw1F6yE8PdLA==
+"@discordjs/collection@^0.3.2":
+ "integrity" "sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg=="
+ "resolved" "https://registry.npmjs.org/@discordjs/collection/-/collection-0.3.2.tgz"
+ "version" "0.3.2"
"@discordjs/form-data@^3.0.1":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@discordjs/form-data/-/form-data-3.0.1.tgz#5c9e6be992e2e57d0dfa0e39979a850225fb4697"
- integrity sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==
+ "integrity" "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg=="
+ "resolved" "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz"
+ "version" "3.0.1"
dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.8"
- mime-types "^2.1.12"
+ "asynckit" "^0.4.0"
+ "combined-stream" "^1.0.8"
+ "mime-types" "^2.1.12"
-"@sapphire/async-queue@^1.1.5":
- version "1.1.9"
- resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.1.9.tgz#ce69611c8753c4affd905a7ef43061c7eb95c01b"
- integrity sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ==
+"@sapphire/async-queue@^1.1.8":
+ "integrity" "sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ=="
+ "resolved" "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.9.tgz"
+ "version" "1.1.9"
-"@sindresorhus/is@^4.0.1":
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.2.0.tgz#667bfc6186ae7c9e0b45a08960c551437176e1ca"
- integrity sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==
+"@sindresorhus/is@^4.0.1", "@sindresorhus/is@^4.2.0":
+ "integrity" "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
+ "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz"
+ "version" "4.2.0"
"@types/node-fetch@^2.5.12":
- version "2.5.12"
- resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
- integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
+ "integrity" "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="
+ "resolved" "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"
+ "version" "2.5.12"
dependencies:
"@types/node" "*"
- form-data "^3.0.0"
+ "form-data" "^3.0.0"
"@types/node@*":
- version "16.11.9"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.9.tgz#879be3ad7af29f4c1a5c433421bf99fab7047185"
- integrity sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==
+ "integrity" "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A=="
+ "resolved" "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz"
+ "version" "16.11.9"
"@types/ws@^8.2.0":
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.0.tgz#75faefbe2328f3b833cb8dc640658328990d04f3"
- integrity sha512-cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg==
+ "integrity" "sha512-cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg=="
+ "resolved" "https://registry.npmjs.org/@types/ws/-/ws-8.2.0.tgz"
+ "version" "8.2.0"
dependencies:
"@types/node" "*"
-asynckit@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
- integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+"asynckit@^0.4.0":
+ "integrity" "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+ "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+ "version" "0.4.0"
-callsites@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
- integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+"callsites@^3.1.0":
+ "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+ "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+ "version" "3.1.0"
-combined-stream@^1.0.8:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
- integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+"combined-stream@^1.0.8":
+ "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
+ "resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
+ "version" "1.0.8"
dependencies:
- delayed-stream "~1.0.0"
-
-delayed-stream@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
- integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-discord-api-types@^0.22.0:
- version "0.22.0"
- resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.22.0.tgz#34dc57fe8e016e5eaac5e393646cd42a7e1ccc2a"
- integrity sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==
-
-discord-api-types@^0.23.1:
- version "0.23.1"
- resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.23.1.tgz#832d0ee2b3c8e2eae02947c1dbf38121d6d357d5"
- integrity sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==
-
-discord.js@zfbx/discord.js:
- version "13.3.0-dev"
- resolved "https://codeload.github.com/zfbx/discord.js/tar.gz/45223966f46d221521ff24b6badd24de35d9bcf9"
+ "delayed-stream" "~1.0.0"
+
+"delayed-stream@~1.0.0":
+ "integrity" "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+ "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+ "version" "1.0.0"
+
+"discord-api-types@^0.24.0":
+ "integrity" "sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A=="
+ "resolved" "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz"
+ "version" "0.24.0"
+
+"discord.js@^13.3.1":
+ "integrity" "sha512-zn4G8tL5+tMV00+0aSsVYNYcIfMSdT2g0nudKny+Ikd+XKv7m6bqI7n3Vji0GIRqXDr5ArPaw+iYFM2I1Iw3vg=="
+ "resolved" "https://registry.npmjs.org/discord.js/-/discord.js-13.3.1.tgz"
+ "version" "13.3.1"
dependencies:
- "@discordjs/builders" "^0.6.0"
- "@discordjs/collection" "^0.2.1"
+ "@discordjs/builders" "^0.8.1"
+ "@discordjs/collection" "^0.3.2"
"@discordjs/form-data" "^3.0.1"
- "@sapphire/async-queue" "^1.1.5"
+ "@sapphire/async-queue" "^1.1.8"
"@types/node-fetch" "^2.5.12"
"@types/ws" "^8.2.0"
- discord-api-types "^0.23.1"
- node-fetch "^2.6.1"
- ws "^8.2.3"
-
-dot-prop@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
- integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
+ "discord-api-types" "^0.24.0"
+ "node-fetch" "^2.6.1"
+ "ws" "^8.2.3"
+
+"dot-prop@^6.0.1":
+ "integrity" "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="
+ "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz"
+ "version" "6.0.1"
dependencies:
- is-obj "^2.0.0"
+ "is-obj" "^2.0.0"
-form-data@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
- integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+"form-data@^3.0.0":
+ "integrity" "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="
+ "resolved" "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"
+ "version" "3.0.1"
dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.8"
- mime-types "^2.1.12"
-
-is-obj@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
- integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
-lodash.isequal@^4.5.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
- integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-mime-db@1.51.0:
- version "1.51.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
- integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-mime-types@^2.1.12:
- version "2.1.34"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
- integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+ "asynckit" "^0.4.0"
+ "combined-stream" "^1.0.8"
+ "mime-types" "^2.1.12"
+
+"is-obj@^2.0.0":
+ "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
+ "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"
+ "version" "2.0.0"
+
+"lodash.isequal@^4.5.0":
+ "integrity" "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+ "resolved" "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"
+ "version" "4.5.0"
+
+"mime-db@1.51.0":
+ "integrity" "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+ "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"
+ "version" "1.51.0"
+
+"mime-types@^2.1.12":
+ "integrity" "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="
+ "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"
+ "version" "2.1.34"
dependencies:
- mime-db "1.51.0"
+ "mime-db" "1.51.0"
-node-fetch@^2.6.1, node-fetch@^2.6.6:
- version "2.6.6"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
- integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+"node-fetch@^2.6.1", "node-fetch@^2.6.6":
+ "integrity" "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="
+ "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"
+ "version" "2.6.6"
dependencies:
- whatwg-url "^5.0.0"
+ "whatwg-url" "^5.0.0"
-ow@^0.27.0:
- version "0.27.0"
- resolved "https://registry.yarnpkg.com/ow/-/ow-0.27.0.tgz#d44da088e8184fa11de64b5813206f9f86ab68d0"
- integrity sha512-SGnrGUbhn4VaUGdU0EJLMwZWSupPmF46hnTRII7aCLCrqixTAC5eKo8kI4/XXf1eaaI8YEVT+3FeGNJI9himAQ==
+"ow@^0.27.0":
+ "integrity" "sha512-SGnrGUbhn4VaUGdU0EJLMwZWSupPmF46hnTRII7aCLCrqixTAC5eKo8kI4/XXf1eaaI8YEVT+3FeGNJI9himAQ=="
+ "resolved" "https://registry.npmjs.org/ow/-/ow-0.27.0.tgz"
+ "version" "0.27.0"
dependencies:
"@sindresorhus/is" "^4.0.1"
- callsites "^3.1.0"
- dot-prop "^6.0.1"
- lodash.isequal "^4.5.0"
- type-fest "^1.2.1"
- vali-date "^1.0.0"
-
-tr46@~0.0.3:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
- integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-ts-mixer@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.0.tgz#4e631d3a36e3fa9521b973b132e8353bc7267f9f"
- integrity sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ==
-
-tslib@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
- integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-type-fest@^1.2.1:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
- integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
-
-vali-date@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
- integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
-webidl-conversions@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
- integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-whatwg-url@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
- integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+ "callsites" "^3.1.0"
+ "dot-prop" "^6.0.1"
+ "lodash.isequal" "^4.5.0"
+ "type-fest" "^1.2.1"
+ "vali-date" "^1.0.0"
+
+"tr46@~0.0.3":
+ "integrity" "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+ "resolved" "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
+ "version" "0.0.3"
+
+"ts-mixer@^6.0.0":
+ "integrity" "sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ=="
+ "resolved" "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.0.tgz"
+ "version" "6.0.0"
+
+"tslib@^2.3.1":
+ "integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+ "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
+ "version" "2.3.1"
+
+"type-fest@^1.2.1":
+ "integrity" "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="
+ "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz"
+ "version" "1.4.0"
+
+"vali-date@^1.0.0":
+ "integrity" "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY="
+ "resolved" "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"
+ "version" "1.0.0"
+
+"webidl-conversions@^3.0.0":
+ "integrity" "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+ "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
+ "version" "3.0.1"
+
+"whatwg-url@^5.0.0":
+ "integrity" "sha1-lmRU6HZUYuN2RNNib2dCzotwll0="
+ "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
+ "version" "5.0.0"
dependencies:
- tr46 "~0.0.3"
- webidl-conversions "^3.0.0"
+ "tr46" "~0.0.3"
+ "webidl-conversions" "^3.0.0"
-ws@^8.2.3:
- version "8.2.3"
- resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
- integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
+"ws@^8.2.3":
+ "integrity" "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="
+ "resolved" "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz"
+ "version" "8.2.3"
From 4c93463d3f13ce3a7a21166ec68de0ab9b023bb6 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Sun, 21 Nov 2021 17:24:45 -0500
Subject: [PATCH 08/21] artifact 4890+ required
---
docs/faq.md | 6 +++---
fxmanifest.lua | 2 +-
readme.md | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/faq.md b/docs/faq.md
index 6507556..a72b184 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -11,7 +11,7 @@ Here's a list of common problems people have run into and how to solve them. If
- [QBCore commands not showing](#qbcore-commands-not-showing)
- [Bot status message updates slow](#bot-status-message-updates-slow)
- [Buffer Deprecation Warning](#buffer-deprecation-warning)
-- [Could not find dependency /server:4800](#could-not-find-dependency-server4800)
+- [Could not find dependency /server:4890](#could-not-find-dependency-server4890)
- [QBCore commands aren't showing](#qbcore-commands-not-showing)
@@ -68,9 +68,9 @@ You may see a warning like:
This is fine.. it's just a warning that future versions may drop support for it. I don't see FiveM updating node again for quite some time so it's nothing to concern yourself with at the moment. This issue comes from a sub-dependency (node-fetch and whatwg) thinking FiveM is a browser so falling back to use `Buffer()`. I hope future updates of those resources will fix it, currently there's nothing I can do about it without forking entire collections of node modules and changing them. And I don't want the responsibility of keeping them updated especially when they're fairly active repositories.
-### Could not find dependency /server:4800
+### Could not find dependency /server:4890
-When trying to start zdiscord you get an error that says `Could not find dependency /server:4800 for resource zdiscord`. This means you aren't running [FiveM artifacts](https://runtime.fivem.net/artifacts/fivem/build_server_windows/master/) version 4800 or later. updating to a version number higher than 4800 will fix this error and allow the resource to start.
+When trying to start zdiscord you get an error that says `Could not find dependency /server:4890 for resource zdiscord`. This means you aren't running [FiveM artifacts](https://runtime.fivem.net/artifacts/fivem/build_server_windows/master/) version 4890 or later. updating to a version number higher than 4890 will fix this error and allow the resource to start.
### QBCore commands aren't loading
diff --git a/fxmanifest.lua b/fxmanifest.lua
index 5026387..dfd2b36 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -23,6 +23,6 @@ server_script "server/server.js"
client_script "client/client.lua"
dependencies {
- '/server:4800', -- Node16+
+ '/server:4890', -- Node16+
'yarn',
}
diff --git a/readme.md b/readme.md
index 6df5b3f..ed48797 100644
--- a/readme.md
+++ b/readme.md
@@ -26,7 +26,7 @@ A Discord bot that runs in FiveM for the purpose of whitelisting, moderation and
## Setup
### Requirements
-- FiveM artifacts build 4800 or higher
+- FiveM artifacts build 4890 or higher
- [cfx-server-data](https://github.com/citizenfx/cfx-server-data) in your resources (yarn (`[system]/[builders]/yarn/`) at least)
- Optional: [screenshot-basic](https://github.com/citizenfx/screenshot-basic) if you want the /screenshot command to work
From d3be9f6d5b532e0959fc8146d04babe67994d1cf Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Sun, 21 Nov 2021 21:14:32 -0500
Subject: [PATCH 09/21] nope, cfx still aint fixed their shit
---
package.json | 2 +-
yarn.lock | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index d902367..70c8e38 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
},
"homepage": "https://github.com/zfbx/zdiscord",
"dependencies": {
- "discord.js": "^13.3.1",
+ "discord.js": "github:zfbx/discord.js",
"node-fetch": "^2.6.6"
},
"eslintConfig": {
diff --git a/yarn.lock b/yarn.lock
index 592c7e7..5d65eb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -84,10 +84,9 @@
"resolved" "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz"
"version" "0.24.0"
-"discord.js@^13.3.1":
- "integrity" "sha512-zn4G8tL5+tMV00+0aSsVYNYcIfMSdT2g0nudKny+Ikd+XKv7m6bqI7n3Vji0GIRqXDr5ArPaw+iYFM2I1Iw3vg=="
- "resolved" "https://registry.npmjs.org/discord.js/-/discord.js-13.3.1.tgz"
- "version" "13.3.1"
+"discord.js@github:zfbx/discord.js":
+ "resolved" "git+ssh://git@github.com/zfbx/discord.js.git#2c56b697c5515024600e59e09c42702170404ead"
+ "version" "13.4.0-dev"
dependencies:
"@discordjs/builders" "^0.8.1"
"@discordjs/collection" "^0.3.2"
From dfc7190628778fce284e4f093a28243207635782 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Mon, 22 Nov 2021 02:51:30 -0500
Subject: [PATCH 10/21] add new translation option
---
locales/ar.js | 1 +
locales/de.js | 1 +
locales/en.js | 1 +
locales/nl.js | 35 ++++++++++++++++++-----------------
locales/pl.js | 1 +
locales/tr.js | 5 +++--
locales/vn.js | 1 +
7 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/locales/ar.js b/locales/ar.js
index c3b383b..76276e4 100644
--- a/locales/ar.js
+++ b/locales/ar.js
@@ -12,6 +12,7 @@ const locale = {
kickedWithoutReason: "لقد تم طردك من قبل المراقب.",
announcement: "اعلان",
directMessage: "الادارة",
+ staffchat: "شات الادارة",
};
module.exports = locale;
diff --git a/locales/de.js b/locales/de.js
index b27d5b6..f1c30ef 100644
--- a/locales/de.js
+++ b/locales/de.js
@@ -12,6 +12,7 @@ const locale = {
kickedWithoutReason: "Du wurdest vom Team gekickt.",
announcement: "ANNOUNCEMENT",
directMessage: "STAFF",
+ staffchat: "STAFFCHAT",
};
module.exports = locale;
diff --git a/locales/en.js b/locales/en.js
index ab541e6..67c0d3b 100644
--- a/locales/en.js
+++ b/locales/en.js
@@ -13,6 +13,7 @@ const locale = {
kickedWithoutReason: "You've been kicked by staff.",
announcement: "ANNOUNCEMENT",
directMessage: "STAFF",
+ staffchat: "STAFFCHAT",
};
module.exports = locale;
diff --git a/locales/nl.js b/locales/nl.js
index fe78511..ae8457c 100644
--- a/locales/nl.js
+++ b/locales/nl.js
@@ -1,17 +1,18 @@
-/*
- Translation strings used by the bot
- Strings wrapped in { } will be auto-replaced with updated values
- Globals: {servername}, {invite}, (all from config) and {playercount} (current connected players)
-*/
-const locale = {
- checkingWhitelist: "Hoi {name}, wij kijken na of je wel gewhitelist bent",
- discordNotOpen: "Je moet Discord open hebben staan voordat je FiveM opstart (Restart beiden als het probleem zich voordoet)",
- fatalError: "Iets ging verkeerd terwijl wij jouw whitelist status nakeken, gelieven even opnieuw te verbinden of contact met ons op te zoeken in discord",
- notInDiscordServer: "Je zit niet in de {servername} Discord, gelieve deze te joinen hier: {invite}",
- notWhitelisted: "Je hebt de benodigde {servername} Discord role niet om te joinen, ben je wel whitelisted?",
- kickedWithoutReason: "Je werd gekickt door staff.",
- announcement: "AANKONDIGING",
- directMessage: "STAFF",
-};
-
-module.exports = locale;
+/*
+ Translation strings used by the bot
+ Strings wrapped in { } will be auto-replaced with updated values
+ Globals: {servername}, {invite}, (all from config) and {playercount} (current connected players)
+*/
+const locale = {
+ checkingWhitelist: "Hoi {name}, wij kijken na of je wel gewhitelist bent",
+ discordNotOpen: "Je moet Discord open hebben staan voordat je FiveM opstart (Restart beiden als het probleem zich voordoet)",
+ fatalError: "Iets ging verkeerd terwijl wij jouw whitelist status nakeken, gelieven even opnieuw te verbinden of contact met ons op te zoeken in discord",
+ notInDiscordServer: "Je zit niet in de {servername} Discord, gelieve deze te joinen hier: {invite}",
+ notWhitelisted: "Je hebt de benodigde {servername} Discord role niet om te joinen, ben je wel whitelisted?",
+ kickedWithoutReason: "Je werd gekickt door staff.",
+ announcement: "AANKONDIGING",
+ directMessage: "STAFF",
+ staffchat: "STAFFCHAT",
+};
+
+module.exports = locale;
diff --git a/locales/pl.js b/locales/pl.js
index e0cef5e..703aef5 100644
--- a/locales/pl.js
+++ b/locales/pl.js
@@ -12,6 +12,7 @@ const locale = {
kickedWithoutReason: "Zostałeś wyrzucony przez administrację.",
announcement: "OGŁOSZENIE",
directMessage: "ADMINISTRACJA",
+ staffchat: "STAFFCHAT",
};
module.exports = locale;
diff --git a/locales/tr.js b/locales/tr.js
index ed5f434..bb514fd 100644
--- a/locales/tr.js
+++ b/locales/tr.js
@@ -10,8 +10,9 @@ const locale = {
notInDiscordServer: "{servername} Discord adresinizde bulunmuyorsunuz, katılmak için: {invite}",
notWhitelisted: "{servername} için whitelist rolünüz bulunmamakta.",
kickedWithoutReason: "Yetkili tarafından sunucudan atıldın.",
- announcement: "Duyuru",
- directMessage: "Yetkili",
+ announcement: "DUYURU",
+ directMessage: "PERSONEL",
+ staffchat: "PERSONELSOHBET",
};
module.exports = locale;
diff --git a/locales/vn.js b/locales/vn.js
index cb91e27..6c52aca 100644
--- a/locales/vn.js
+++ b/locales/vn.js
@@ -12,6 +12,7 @@ const locale = {
kickedWithoutReason: "Bạn Đã Bị Đuổi Bởi Quản Trị Viên.",
announcement: "Thông Báo",
directMessage: "Quản Trị Viên",
+ staffchat: "STAFFCHAT",
};
module.exports = locale;
From 2dfe4ce166b4b8ae2351fd18b0c6393166093d42 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Mon, 22 Nov 2021 02:53:39 -0500
Subject: [PATCH 11/21] staff chat and update replaceGlobals
---
readme.md | 6 ++++-
server/commands/kick.js | 2 +-
server/events/messageCreate.js | 2 +-
server/events/ready.js | 4 +--
server/server.js | 47 +++++++++++++++++-----------------
server/utils.js | 10 ++++----
6 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/readme.md b/readme.md
index ed48797..f4f0ee2 100644
--- a/readme.md
+++ b/readme.md
@@ -45,7 +45,11 @@ A Discord bot that runs in FiveM for the purpose of whitelisting, moderation and
6. In your `server.cfg` do the following:
6a. Add `ensure zdiscord` (after qb-core and/or [convars](https://zfbx.github.io/zdiscord/convars) you may have)
- 6b. Add `add_ace resource.zdiscord command allow` anywhere in the .cfg file
+ 6b. Add the following anywhere in your .cfg:
+ ```
+ add_ace resource.zdiscord command allow
+ add_ace group.zdiscordstaff zdiscord.staffchat allow
+ ```
7. Adjust the `config.js` variables to how you'd like them. (Optionally use [Convars](https://zfbx.github.io/zdiscord/convars))
diff --git a/server/commands/kick.js b/server/commands/kick.js
index c27f77d..9a753a8 100644
--- a/server/commands/kick.js
+++ b/server/commands/kick.js
@@ -32,7 +32,7 @@ module.exports = {
run: async (client, interaction, args) => {
if (!GetPlayerName(args.id)) return interaction.reply({ content: "This ID seems invalid.", ephemeral: true });
- const reason = client.utils.replaceGlobals(args.message || client.locale.kickedWithoutReason);
+ const reason = client.utils.replaceGlobals(client, args.message || client.locale.kickedWithoutReason);
DropPlayer(args.id, reason);
client.utils.log.info(`[${interaction.member.displayName}] Kicked ${GetPlayerName(args.id)} (${args.id}). Reason: ${reason}`);
return interaction.reply({ content: `${GetPlayerName(args.id)} (${args.id}) has been kicked.`, ephemeral: false });
diff --git a/server/events/messageCreate.js b/server/events/messageCreate.js
index 99d183d..29bf985 100644
--- a/server/events/messageCreate.js
+++ b/server/events/messageCreate.js
@@ -13,7 +13,7 @@ module.exports = {
name: "messageCreate",
// msg = https://discord.js.org/#/docs/main/stable/class/Message
run: async (client, msg) => {
- if (!msg.content || !client.QBCore || msg.author.bot) return;
+ if (!msg.content || msg.author.bot) return;
if (client.config.EnableStaffChatForwarding && msg.channel.id == client.config.DiscordStaffChannelId) {
client.utils.sendStaffChatMessage(client, msg.member.displayName, msg.content);
return console.log(`[STAFF] ${msg.member.displayName}: ${msg.content}`);
diff --git a/server/events/ready.js b/server/events/ready.js
index 9759174..74d1db7 100644
--- a/server/events/ready.js
+++ b/server/events/ready.js
@@ -37,10 +37,10 @@ module.exports = {
async function statusUpdater(client) {
setInterval(function() {
try {
- const msg = client.utils.replaceGlobals(config.BotStatusMessages[Math.floor(Math.random() * client.config.BotStatusMessages.length)]);
+ const msg = client.utils.replaceGlobals(client, client.config.BotStatusMessages[Math.floor(Math.random() * client.config.BotStatusMessages.length)]);
client.user.setActivity({ name: msg, type: "PLAYING" });
} catch (e) {
// Just gonna void these errors..
}
- }, 30000);
+ }, 20000);
}
diff --git a/server/server.js b/server/server.js
index 7063d78..48b6ca8 100644
--- a/server/server.js
+++ b/server/server.js
@@ -9,11 +9,6 @@
* or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
*/
-/**
- * DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU'RE DOING OR ARE
- * SUGGESTED TO DO SO BY SOMEONE WHO DOES. <3
- */
-
const z = {};
const fetch = require("node-fetch");
@@ -21,13 +16,14 @@ z.root = GetResourcePath(GetCurrentResourceName());
z.config = require(`${z.root}/config`);
z.locale = require(`${z.root}/locales/${z.config.LanguageLocaleCode}`);
z.utils = require(`${z.root}/server/utils`);
-z.config.staffChatDisabled = {};
const Bot = require(`${z.root}/server/bot`);
z.bot = new Bot(z);
-
if (z.config.EnableDiscordBot) z.bot.start();
+const Queue = require(`${z.root}/server/queue`);
+z.queue = new Queue(z);
+
SetConvarReplicated("zdiscord_servername", z.config.FiveMServerName);
SetConvarReplicated("zdiscord_discordinvite", z.config.DiscordInviteLink);
SetConvarReplicated("zdiscord_serverip", z.config.FiveMServerIP);
@@ -38,15 +34,15 @@ on("playerConnecting", async (name, setKickReason, deferrals) => {
if (!z.config.EnableWhitelistChecking || !z.config.EnableDiscordBot) return;
deferrals.defer();
await z.utils.sleep(0);
- deferrals.update(z.utils.replaceGlobals(z.locale.checkingWhitelist.replace(/{name}/g, name)));
+ deferrals.update(z.utils.replaceGlobals(z, z.locale.checkingWhitelist.replace(/{name}/g, name)));
await z.utils.sleep(0);
const discordID = z.utils.getPlayerDiscordId(player);
- if (!discordID) return deferrals.done(z.utils.replaceGlobals(z.locale.discordNotOpen));
+ if (!discordID) return deferrals.done(z.utils.replaceGlobals(z, z.locale.discordNotOpen));
const member = z.utils.getMember(z.bot, discordID);
- if (!member) return deferrals.done(z.utils.replaceGlobals(z.locale.notInDiscordServer));
+ if (!member) return deferrals.done(z.utils.replaceGlobals(z, z.locale.notInDiscordServer));
const whitelisted = z.utils.isRolePresent(z.bot, member, z.config.DiscordWhitelistRoleIds);
if (whitelisted) deferrals.done();
- else deferrals.done(z.utils.replaceGlobals(z.locale.notWhitelisted));
+ else deferrals.done(z.utils.replaceGlobals(z, z.locale.notWhitelisted));
});
global.exports("isRolePresent", (identifier, role) => {
@@ -77,7 +73,7 @@ on("playerJoining", (oldId) => {
}
}
if (z.utils.isRolePresent(z.bot, member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
- ExecuteCommand(`add_principal "player.${source}" "zdiscord.staffchat"`);
+ ExecuteCommand(`add_principal "player.${source}" group.zdiscordstaff`);
}
});
@@ -95,25 +91,28 @@ on("playerDropped", (reason) => {
if (z.config.EnableStaffChatForwarding) {
RegisterCommand("staff", (source, args, raw) => {
- if (z.config.staffChatDisabled[source]) return;
- z.utils.sendStaffChatMessage(z, GetPlayerName(source), raw);
+ if (!IsPlayerAceAllowed(source, "zdiscord.staffchat")) return;
+ z.utils.sendStaffChatMessage(z, GetPlayerName(source), raw.substring(6));
if (!z.config.EnableDiscordBot) return;
const staffChannel = z.bot.channels.cache.get(z.config.DiscordStaffChannelId);
if (!staffChannel) return z.utils.log.warn("DiscordStaffChannelId was not found, staff message not sent.");
- staffChannel.send({ content: `${GetPlayerName(source)}: ${raw}`, allowMentions: false });
+ staffChannel.send({ content: `${GetPlayerName(source)}: ${raw.substring(6)}`, allowMentions: false });
}, "zdiscord.staffchat");
RegisterCommand("stafftoggle", (source, args, raw) => {
- if (z.config.staffChatDisabled[source]) {
- z.config.staffChatDisabled[source] = false;
- emitNet("chat:addMessage", player, {
- template: "[server]: Staff Chat Enabled
",
- });
- } else {
- z.config.staffChatDisabled[source] = true;
- emitNet("chat:addMessage", player, {
+ if (IsPlayerAceAllowed(source, "zdiscord.staffchat")) {
+ ExecuteCommand(`remove_principal "player.${source}" group.zdiscordstaff`);
+ emitNet("chat:addMessage", source, {
template: "[server]: Staff Chat Disabled
",
});
+ } else {
+ const member = z.utils.getMemberFromSource(z.bot, source);
+ if (z.utils.isRolePresent(z.bot, member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
+ ExecuteCommand(`add_principal "player.${source}" group.zdiscordstaff`);
+ emitNet("chat:addMessage", source, {
+ template: "[server]: Staff Chat Enabled
",
+ });
+ }
}
}, "zdiscord.staffchat");
@@ -164,3 +163,5 @@ global.exports("log", async (type, message, pingRole, color) => {
}
return false;
});
+
+// add_principal "player.1" "zdiscord.staffchat" allow
diff --git a/server/utils.js b/server/utils.js
index 063e144..18a2aaf 100644
--- a/server/utils.js
+++ b/server/utils.js
@@ -141,10 +141,10 @@ exports.uppercaseFirstLetter = (string) => {
/** Replaces common global variables: {servername} {invite} {playercount}
* @param {string} string - string to be converted
* @return {string} - String with { variables } replaced */
-exports.replaceGlobals = (string) => {
+exports.replaceGlobals = (z, string) => {
return string
- .replace(/{servername}/g, config.FiveMServerName)
- .replace(/{invite}/g, config.DiscordInviteLink)
+ .replace(/{servername}/g, z.config.FiveMServerName)
+ .replace(/{invite}/g, z.config.DiscordInviteLink)
.replace(/{playercount}/g, GetNumPlayerIndices());
};
@@ -294,9 +294,9 @@ exports.isValidID = isValidID;
const sendStaffChatMessage = (client, name, msg) => {
if (!msg) return;
getPlayers().forEach(async function(player, index, array) {
- if (IsPlayerAceAllowed(player, "zdiscord.staffchat") && !client.config.staffChatDisabled[player]) {
+ if (IsPlayerAceAllowed(player, "zdiscord.staffchat")) {
emitNet("chat:addMessage", player, {
- template: `[staff] ${name}: ${msg}
`,
+ template: `[${client.locale.staffchat}] ${name}: ${msg}
`,
});
}
});
From f07fd417a2f009f7703d51306f4f6b9e7a629325 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Mon, 22 Nov 2021 02:53:56 -0500
Subject: [PATCH 12/21] docs to match new permission system
---
docs/commands.md | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/commands.md b/docs/commands.md
index d55d896..6b6d4af 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -138,11 +138,11 @@ Adding commands can be really simple if you're familiar with javascript but very
### 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 `server.js`, at the bottom there's a section called `loadDiscordPermissions()`.
+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()`.
It has 2 main parts, The role levels, which look like `const mod = { id:..`
And the role table
```js
-config.perms = {
+this.config.perms = {
"mod": [ mod, admin, god, own ],
"admin": [ admin, god, own ], ...
```
@@ -153,7 +153,7 @@ 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
-config.perms = {
+this.config.perms = {
"trialmod": [ trialmod, mod, admin, god, own ],
"mod": [ mod, admin, god, own ], ...
```
@@ -164,13 +164,13 @@ Then in the command files for the commands you want trial mods to be able to acc
**Full example:**
```js
-function loadDiscordPermissions() {
- const mod = { id: config.DiscordModRoleId, type: 1, permission: true };
- const admin = { id: config.DiscordAdminRoleId, type: 1, permission: true };
- const god = { id: config.DiscordGodRoleId, type: 1, permission: true };
+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 };
- config.perms = {
+ this.config.perms = {
"mod": [ mod, admin, god, god2, own ], // changed
"admin": [ admin, god, god2, own ], // changed
"god": [ god, god2, own ], // changed
From 034df90a8dc2768bba5b99f701cecb800791ef17 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Mon, 22 Nov 2021 02:54:06 -0500
Subject: [PATCH 13/21] unused
---
server/bot.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/server/bot.js b/server/bot.js
index 5a5f6bb..c569abf 100644
--- a/server/bot.js
+++ b/server/bot.js
@@ -10,7 +10,6 @@
*/
const { Client, Collection, MessageEmbed } = require("discord.js");
-const root = GetResourcePath(GetCurrentResourceName());
const { readdirSync } = require("fs");
From 01c720067639b1f20e6d29d52048e60da14833ab Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Mon, 22 Nov 2021 02:54:59 -0500
Subject: [PATCH 14/21] new command, checkonline
---
server/commands/qb-user-checkonline.js | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 server/commands/qb-user-checkonline.js
diff --git a/server/commands/qb-user-checkonline.js b/server/commands/qb-user-checkonline.js
new file mode 100644
index 0000000..5d99f7e
--- /dev/null
+++ b/server/commands/qb-user-checkonline.js
@@ -0,0 +1,25 @@
+/**
+ * This file is part of zdiscord.
+ * Copyright (C) 2021 Tony/zfbx
+ * source:
+ *
+ * This work is licensed under the Creative Commons
+ * Attribution-NonCommercial-ShareAlike 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+module.exports = {
+ name: "onlinecheck",
+ type: "USER",
+ default_permission: false,
+ role: "mod",
+
+ run: async (client, interaction, args) => {
+ const player = await client.utils.getPlayerFromDiscordId(interaction.targetId);
+ if (!player) return interaction.reply({ content: `<@${interaction.targetId}> is offline right now.`, ephemeral: true });
+ const qbplayer = client.QBCore.Functions.GetPlayer(parseInt(player));
+ if (!qbplayer) return interaction.reply({ content: `<@${interaction.targetId}> is online but not loaded in.`, ephemeral: true });
+ return interaction.reply({ content: `<@${interaction.targetId}> is online! Playing as ${qbplayer.PlayerData.charinfo.firstname} ${qbplayer.PlayerData.charinfo.lastname} (${qbplayer.PlayerData.citizenid})`, ephemeral: true });
+ },
+};
From 2cc472578342f5765bd112f3cf7e86ee7ea267e1 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Tue, 23 Nov 2021 02:33:38 -0500
Subject: [PATCH 15/21] major refactor/feature modules/classes
---
server/bot.js | 162 ++++++++++++++++++++++++++------
server/commands/announcement.js | 2 +-
server/commands/kick.js | 2 +-
server/commands/message.js | 2 +-
server/commands/players.js | 2 +-
server/commands/resource.js | 2 +-
server/commands/server.js | 2 +-
server/log.js | 65 +++++++++++++
server/queue.js | 24 +++++
server/server.js | 72 ++++----------
server/utils.js | 120 +----------------------
11 files changed, 249 insertions(+), 206 deletions(-)
create mode 100644 server/log.js
create mode 100644 server/queue.js
diff --git a/server/bot.js b/server/bot.js
index c569abf..8490196 100644
--- a/server/bot.js
+++ b/server/bot.js
@@ -9,7 +9,7 @@
* or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
*/
-const { Client, Collection, MessageEmbed } = require("discord.js");
+const { Client, Collection, MessageEmbed, MessageActionRow, MessageButton } = require("discord.js");
const { readdirSync } = require("fs");
@@ -21,19 +21,48 @@ class Bot extends Client {
fetchAllMembers: true,
messageCacheMaxSize: 10,
});
+ this.enabled = z.config.EnableDiscordBot;
+ this.z = z;
this.config = z.config;
this.utils = z.utils;
- this.locale = z.locale;
- this.root = z.root;
this.Embed = MessageEmbed;
this.commands = new Collection();
this.arrayOfCommands = [];
+
+ if (this.enabled) this.start();
+ }
+
+ start() {
+ this.utils.log.assert((process.version == "v12.13.0"), "You are running unsupported artifacts, download a newer artifact or revert to version 4.0.0 of zdiscord");
+ this.utils.log.assert((this.config.DiscordBotToken == "CHANGE"), "This module requires a discord bot token to run. Check the config.js");
+ this.utils.log.assert((this.config.DiscordGuildId == "000000000000000000"), "This resource requires a discord guildid to work properly. Check the config.js");
+ this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordGuildId)), "Your DiscordGuildId doesn't seem correct");
+ this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordModRoleId)), "Your DiscordModRoleId doesn't seem correct");
+ this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordAdminRoleId)), "Your DiscordAdminRoleId doesn't seem correct");
+ 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();
+
+ try {
+ this.QBCore = global.exports["qb-core"].GetCoreObject();
+ if (this.QBCore) utils.log.info("QBCore found! Supported QB commands will be loaded.");
+ } catch { this.QBCore = false; }
+
+ if (this.config.EnableDiscordSlashCommands) this.loadCommands();
+ this.loadEvents();
+
+ // this.on("debug", (debug) => this.utils.log.handler("log", debug));
+ this.on("warn", (warning) => this.utils.log.handler("warn", warning));
+ this.on("error", (error) => this.utils.log.handler("error", error));
+
+ this.login(this.config.DiscordBotToken).catch((e) => client.utils.log.handler("error", e));
}
loadCommands() {
- const commandFiles = readdirSync(`${z.root}/server/commands`).filter(file => file.endsWith(".js"));
+ const commandFiles = readdirSync(`${this.z.root}/server/commands`).filter(file => file.endsWith(".js"));
for (const file of commandFiles) {
- const command = require(`${z.root}/server/commands/${file}`);
+ const command = require(`${this.z.root}/server/commands/${file}`);
if (!command?.name) continue;
if (command.args || command.alias) {
utils.log.warn(`${file} is an v4 or later command and is not supported, upgrade it or remove it`);
@@ -51,39 +80,118 @@ class Bot extends Client {
}
loadEvents() {
- const eventFiles = readdirSync(`${z.root}/server/events`).filter(file => file.endsWith(".js"));
+ const eventFiles = readdirSync(`${this.z.root}/server/events`).filter(file => file.endsWith(".js"));
for (const file of eventFiles) {
- const event = require(`${z.root}/server/events/${file}`);
+ const event = require(`${this.z.root}/server/events/${file}`);
if (event.once) this.once(event.name, (...args) => event.run(this, ...args));
else this.on(event.name, (...args) => event.run(this, ...args));
}
}
- start() {
- this.utils.log.assert((process.version == "v12.13.0"), "You are running unsupported artifacts, download a newer artifact or revert to version 4.0.0 of zdiscord");
- this.utils.log.assert((this.config.DiscordBotToken == "CHANGE"), "This module requires a discord bot token to run. Check the config.js");
- this.utils.log.assert((this.config.DiscordGuildId == "000000000000000000"), "This resource requires a discord guildid to work properly. Check the config.js");
- this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordGuildId)), "Your DiscordGuildId doesn't seem correct");
- this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordModRoleId)), "Your DiscordModRoleId doesn't seem correct");
- this.utils.log.assert(!(this.utils.isValidID(this.config.DiscordAdminRoleId)), "Your DiscordAdminRoleId doesn't seem correct");
- 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();
+ /**
+ * Creates a pagination embed
+ * credit to https://github.com/ryzyx/discordjs-button-pagination
+ * @param {Interaction} interaction - the message interaction to react to
+ * @param {MessageEmbed[]} pages - array of embeds
+ * @param {MessageButton[]} buttonList - Must be 2 button objects
+ * @param {number} timeout - Optional length of time to allow responses
+ * @returns {Interaction} current page
+ */
+ async paginationEmbed(interaction, pages, buttonList, timeout = 120000) {
+ let page = 0;
+ const row = new MessageActionRow().addComponents(buttonList);
+ if (interaction.deferred == false) await interaction.deferReply();
+ const curPage = await interaction.editReply({
+ embeds: [pages[page].setFooter(`Page ${page + 1} / ${pages.length}`)],
+ components: [row], fetchReply: true,
+ });
+ const filter = (i) => i.customId === buttonList[0].customId || i.customId === buttonList[1].customId;
+ const collector = await curPage.createMessageComponentCollector({ filter, time: timeout });
+ collector.on("collect", async (i) => {
+ switch (i.customId) {
+ case buttonList[0].customId:
+ page = page > 0 ? --page : pages.length - 1;
+ break;
+ case buttonList[1].customId:
+ page = page + 1 < pages.length ? ++page : 0;
+ break;
+ default:
+ break;
+ }
+ await i.deferUpdate();
+ await i.editReply({ embeds: [pages[page].setFooter(`Page ${page + 1} / ${pages.length}`)], components: [row] });
+ collector.resetTimer();
+ });
+ collector.on("end", () => {
+ if (!curPage.deleted) {
+ const disabledRow = new MessageActionRow().addComponents(buttonList[0].setDisabled(true), buttonList[1].setDisabled(true));
+ curPage.edit({ embeds: [pages[page].setFooter(`Page ${page + 1} / ${pages.length}`)], components: [disabledRow] });
+ }
+ });
+ return curPage;
+ }
- try {
- this.QBCore = global.exports["qb-core"].GetCoreObject();
- if (this.QBCore) utils.log.info("QBCore found! Supported QB commands will be loaded.");
- } catch { this.QBCore = false; }
+ /** Get discord member object by userid
+ * @param {number} userid - discordid
+ * @returns {object|boolean} - discord member or false */
+ getMember(userid) {
+ const guild = this.guilds.cache.get(this.config.DiscordGuildId);
+ if (!guild) {
+ this.utils.log.error("Failed to fetch Discord server.");
+ return false;
+ }
+ return guild.members.cache.get(userid) || false;
+ }
- if (this.config.EnableDiscordSlashCommands) this.loadCommands();
- this.loadEvents();
+ /** Get discord member object by source
+ * @param {number} id - Player ID / source
+ * @returns {object|boolean} - discord member or false */
+ getMemberFromSource(id) {
+ const ids = this.utils.getPlayerIdentifiers(id);
+ if (!ids.discord) return false;
+ return this.getMember(ids.discord);
+ }
- // this.on("debug", (debug) => this.utils.log.handler("log", debug));
- this.on("warn", (warning) => this.utils.log.handler("warn", warning));
- this.on("error", (error) => this.utils.log.handler("error", error));
+ /** take any sort of identifier and try to parse a discord member from it
+ * @param {number|string|object} member - source | discordid | member object
+ * @returns {object|boolean} - discord member or false */
+ parseMember(member) {
+ if (!member || !this.enabled) return false;
+ if (typeof member === "number") {
+ return this.getMemberFromSource(member);
+ } else if (typeof member === "string") {
+ return this.getMember(member);
+ } else { return member || false; }
+ }
- this.login(this.config.DiscordBotToken).catch((e) => client.utils.log.handler("error", e));
+ /** Returns true if a role is found by id or array of ids
+ * @param {number|object|string} member - source | member | discordid
+ * @param {string|object} role - Role ID or Role IDs
+ * @returns {boolean} - true if role was found, false otherwise */
+ isRolePresent(member, role) {
+ if (!role || !member || !this.enabled) return false;
+ member = this.parseMember(member);
+ if (!member) return false;
+ if (typeof role === "object") {
+ let found = false;
+ role.forEach(function(item) {
+ if (member.roles.cache.has(item)) found = true;
+ });
+ return found;
+ } else {
+ return member.roles.cache.has(role);
+ }
+ }
+
+ /** get array of discord member roles by id
+ * @param {number|object|string} member - source | member | discordid
+ * @returns {Array} - array of role ids */
+ getMemberRoles(member) {
+ if (!member || !this.enabled) return [];
+ member = this.parseMember(member);
+ if (!member) return [];
+ return member.roles.cache.map(r => r.id);
}
loadDiscordPermissions() {
diff --git a/server/commands/announcement.js b/server/commands/announcement.js
index 2ca7d61..a2b2ab8 100644
--- a/server/commands/announcement.js
+++ b/server/commands/announcement.js
@@ -26,7 +26,7 @@ module.exports = {
run: async (client, interaction, args) => {
emitNet("chat:addMessage", -1, {
- template: `${client.locale.announcement}: ${args.message}
`,
+ template: `${client.z.locale.announcement}: ${args.message}
`,
});
client.utils.log.info(`[${interaction.member.displayName}] Announcement: ${args.message}`);
interaction.reply({ content: "Announcement Sent", ephemeral: false });
diff --git a/server/commands/kick.js b/server/commands/kick.js
index 9a753a8..32be8b2 100644
--- a/server/commands/kick.js
+++ b/server/commands/kick.js
@@ -32,7 +32,7 @@ module.exports = {
run: async (client, interaction, args) => {
if (!GetPlayerName(args.id)) return interaction.reply({ content: "This ID seems invalid.", ephemeral: true });
- const reason = client.utils.replaceGlobals(client, args.message || client.locale.kickedWithoutReason);
+ const reason = client.utils.replaceGlobals(client, args.message || client.z.locale.kickedWithoutReason);
DropPlayer(args.id, reason);
client.utils.log.info(`[${interaction.member.displayName}] Kicked ${GetPlayerName(args.id)} (${args.id}). Reason: ${reason}`);
return interaction.reply({ content: `${GetPlayerName(args.id)} (${args.id}) has been kicked.`, ephemeral: false });
diff --git a/server/commands/message.js b/server/commands/message.js
index 47a9e83..0d8ce9c 100644
--- a/server/commands/message.js
+++ b/server/commands/message.js
@@ -33,7 +33,7 @@ module.exports = {
run: async (client, interaction, args) => {
if (!GetPlayerName(args.id)) return interaction.reply({ content: "This ID seems invalid.", ephemeral: true });
emitNet("chat:addMessage", args.id, {
- template: `${client.locale.directMessage}: ${args.message}
`,
+ template: `${client.z.locale.directMessage}: ${args.message}
`,
});
client.utils.log.info(`[${interaction.member.displayName}] sent a DM to ${GetPlayerName(args.id)} (${args.id}): ${args.message}`);
return interaction.reply({ content: `Message sent to ${GetPlayerName(args.id)} (${args.id}).`, ephemeral: false });
diff --git a/server/commands/players.js b/server/commands/players.js
index 96229f9..39847f1 100644
--- a/server/commands/players.js
+++ b/server/commands/players.js
@@ -42,6 +42,6 @@ module.exports = {
});
const backBtn = new MessageButton().setCustomId("previousbtn").setEmoji("🔺").setStyle("SECONDARY");
const forwardBtn = new MessageButton().setCustomId("nextbtn").setEmoji("🔻").setStyle("SECONDARY");
- client.utils.paginationEmbed(interaction, pages, [backBtn, forwardBtn]);
+ client.paginationEmbed(interaction, pages, [backBtn, forwardBtn]);
},
};
diff --git a/server/commands/resource.js b/server/commands/resource.js
index 13010d5..4da31e9 100644
--- a/server/commands/resource.js
+++ b/server/commands/resource.js
@@ -128,7 +128,7 @@ module.exports = {
});
const backBtn = new MessageButton().setCustomId("previousbtn").setEmoji("🔺").setStyle("SECONDARY");
const forwardBtn = new MessageButton().setCustomId("nextbtn").setEmoji("🔻").setStyle("SECONDARY");
- client.utils.paginationEmbed(interaction, pages, [backBtn, forwardBtn]);
+ client.paginationEmbed(interaction, pages, [backBtn, forwardBtn]);
}
},
};
diff --git a/server/commands/server.js b/server/commands/server.js
index 17c0932..f587a5c 100644
--- a/server/commands/server.js
+++ b/server/commands/server.js
@@ -16,7 +16,7 @@ module.exports = {
// role: "mod",
run: async (client, interaction) => {
- if (client.utils.isRolePresent(client, interaction.member, [client.config.DiscordModRoleId, client.config.DiscordAdminRoleId, client.config.DiscordGodRoleId])) {
+ if (client.isRolePresent(interaction.member, [client.config.DiscordModRoleId, client.config.DiscordAdminRoleId, client.config.DiscordGodRoleId])) {
const embed = new client.Embed()
.setThumbnail(interaction.guild.iconURL({ format: "png", size: 512 }))
.addField("FiveM Server:", `**Version:** ${GetConvar("version", "Unknown")}
diff --git a/server/log.js b/server/log.js
new file mode 100644
index 0000000..0b9069b
--- /dev/null
+++ b/server/log.js
@@ -0,0 +1,65 @@
+/**
+ * This file is part of zdiscord.
+ * Copyright (C) 2021 Tony/zfbx
+ * source:
+ *
+ * This work is licensed under the Creative Commons
+ * Attribution-NonCommercial-ShareAlike 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+const fetch = require("node-fetch");
+
+class Log {
+ constructor(z) {
+ this.z = z;
+ this.enabled = z.config.EnableLoggingWebhooks;
+ this.hooks = z.config.LoggingWebhooks;
+
+ if (this.enabled) {
+ StopResource("qb-logs");
+ }
+ }
+
+ /** Sends a log through to a webhook by name configured in config
+ * @param {string} type - type of log/event to pick which webhook to send
+ * @param {string} message - Message to log
+ * @param {boolean} pingRole - Whether message should ping configured role
+ * @param {string|number} color - [optional] color to have on the embed
+ * @returns {boolean} - success or failure of logging event */
+ async send(type, message, pingRole, color) {
+ if (!this.enabled) return false;
+ if (!message || !type) {
+ this.z.utils.log.error("[WEBHOOK FAIL] Log without message or type not permitted");
+ return false;
+ }
+ if (!this.z.config.LoggingWebhooks[type]) {
+ this.z.utils.log.error(`[WEBHOOK FAIL] "${type}" is not defined. Message: ${message}`);
+ return false;
+ }
+ const params = {
+ username: this.z.config.LoggingWebhookName,
+ embeds: [
+ {
+ "description": message,
+ "color": (color || "#1e90ff"),
+ },
+ ],
+ };
+ if (pingRole) params.content = `<@&${this.z.config.LoggingAlertPingRoleId}>`;
+ const reply = await fetch(z.config.LoggingWebhooks[type], {
+ method: "POST",
+ headers: { "Content-type": "application/json" },
+ body: JSON.stringify(params),
+ });
+ if (!reply.ok) {
+ this.z.utils.log.error(`[WEBHOOK FAIL] ${type.toLowerCase()} log failed. Message: ${message}. Error: ${reply.status}`);
+ return false;
+ }
+ return true;
+ }
+
+}
+
+module.exports = Log;
diff --git a/server/queue.js b/server/queue.js
new file mode 100644
index 0000000..da08d68
--- /dev/null
+++ b/server/queue.js
@@ -0,0 +1,24 @@
+/**
+ * This file is part of zdiscord.
+ * Copyright (C) 2021 Tony/zfbx
+ * source:
+ *
+ * This work is licensed under the Creative Commons
+ * Attribution-NonCommercial-ShareAlike 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+class Queue {
+ constructor(z) {
+ this.connections = {};
+
+ if (z.config.EnableConnectingQueue) {
+ StopResource("hardcap");
+ StopResource("connectqueue");
+ }
+ }
+}
+
+
+module.exports = Queue;
diff --git a/server/server.js b/server/server.js
index 48b6ca8..db6bfae 100644
--- a/server/server.js
+++ b/server/server.js
@@ -10,7 +10,6 @@
*/
const z = {};
-const fetch = require("node-fetch");
z.root = GetResourcePath(GetCurrentResourceName());
z.config = require(`${z.root}/config`);
@@ -18,11 +17,12 @@ z.locale = require(`${z.root}/locales/${z.config.LanguageLocaleCode}`);
z.utils = require(`${z.root}/server/utils`);
const Bot = require(`${z.root}/server/bot`);
-z.bot = new Bot(z);
-if (z.config.EnableDiscordBot) z.bot.start();
-
const Queue = require(`${z.root}/server/queue`);
+const Log = require(`${z.root}/server/log`);
+
+z.bot = new Bot(z);
z.queue = new Queue(z);
+z.log = new Log(z);
SetConvarReplicated("zdiscord_servername", z.config.FiveMServerName);
SetConvarReplicated("zdiscord_discordinvite", z.config.DiscordInviteLink);
@@ -38,41 +38,38 @@ on("playerConnecting", async (name, setKickReason, deferrals) => {
await z.utils.sleep(0);
const discordID = z.utils.getPlayerDiscordId(player);
if (!discordID) return deferrals.done(z.utils.replaceGlobals(z, z.locale.discordNotOpen));
- const member = z.utils.getMember(z.bot, discordID);
+ const member = z.bot.getMember(discordID);
if (!member) return deferrals.done(z.utils.replaceGlobals(z, z.locale.notInDiscordServer));
- const whitelisted = z.utils.isRolePresent(z.bot, member, z.config.DiscordWhitelistRoleIds);
+ const whitelisted = z.bot.isRolePresent(member, z.config.DiscordWhitelistRoleIds);
if (whitelisted) deferrals.done();
else deferrals.done(z.utils.replaceGlobals(z, z.locale.notWhitelisted));
});
global.exports("isRolePresent", (identifier, role) => {
- if (!z.config.EnableDiscordBot) return false;
- return z.utils.isRolePresent(z.bot, identifier, role);
+ return z.bot.isRolePresent(identifier, role);
});
global.exports("getRoles", (identifier) => {
- if (!z.config.EnableDiscordBot) return false;
- return z.utils.getMemberRoles(z.bot, identifier);
+ return z.bot.getMemberRoles(identifier);
});
global.exports("getName", (identifier) => {
- if (!z.config.EnableDiscordBot) return false;
- const member = z.utils.parseMember(z.bot, identifier);
+ const member = z.bot.parseMember(identifier);
return member.displayName || false;
});
on("playerJoining", (oldId) => {
const source = global.source;
if (!z.config.EnableDiscordBot) return;
- const member = z.utils.getMemberFromSource(z.bot, source);
+ const member = z.bot.getMemberFromSource(source);
if (z.config.EnableAutoAcePermissions) {
for (const [perm, role] of Object.entries(z.config.AutoAcePermissions)) {
- if (z.utils.isRolePresent(z.bot, member, role)) {
+ if (z.bot.isRolePresent(member, role)) {
ExecuteCommand(`add_principal "player.${source}" "${perm}"`);
}
}
}
- if (z.utils.isRolePresent(z.bot, member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
+ if (z.bot.isRolePresent(member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
ExecuteCommand(`add_principal "player.${source}" group.zdiscordstaff`);
}
});
@@ -106,8 +103,8 @@ if (z.config.EnableStaffChatForwarding) {
template: "[server]: Staff Chat Disabled
",
});
} else {
- const member = z.utils.getMemberFromSource(z.bot, source);
- if (z.utils.isRolePresent(z.bot, member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
+ const member = z.bot.getMemberFromSource(source);
+ if (z.bot.isRolePresent(member, [ z.config.DiscordModRoleId, z.config.DiscordAdminRoleId, z.config.DiscordGodRoleId ])) {
ExecuteCommand(`add_principal "player.${source}" group.zdiscordstaff`);
emitNet("chat:addMessage", source, {
template: "[server]: Staff Chat Enabled
",
@@ -124,44 +121,7 @@ if (z.config.EnableStaffChatForwarding) {
});
}
-/** Sends a log through to a webhook by name configured in config
- * @param {string} type - type of log/event to pick which webhook to send
- * @param {string} message - Message to log
- * @param {boolean} pingRole - Whether message should ping configured role
- * @param {string|number} color - [optional] color to have on the embed
- * @returns {boolean} - success or failure of logging event */
+
global.exports("log", async (type, message, pingRole, color) => {
- if (z.config.EnableLoggingWebhooks) {
- if (!message || !type) {
- z.utils.log.error("[WEBHOOK FAIL] Log without message or type not permitted");
- return false;
- }
- if (!z.config.LoggingWebhooks[type]) {
- z.utils.log.error(`[WEBHOOK FAIL] "${type}" is not defined. Message: ${message}`);
- return false;
- }
- const params = {
- username: z.config.LoggingWebhookName,
- embeds: [
- {
- "description": message,
- "color": "#1e90ff",
- },
- ],
- };
- if (pingRole) params.content = `<@&${z.config.LoggingAlertPingRoleId}>`;
- const reply = await fetch(z.config.LoggingWebhooks[type], {
- method: "POST",
- headers: { "Content-type": "application/json" },
- body: JSON.stringify(params),
- });
- if (!reply.ok) {
- z.utils.log.error(`[WEBHOOK FAIL] ${type.toLowerCase()} log failed. Message: ${message}. Error: ${reply.status}`);
- return false;
- }
- return true;
- }
- return false;
+ return z.log.send(type, message, pingRole, color);
});
-
-// add_principal "player.1" "zdiscord.staffchat" allow
diff --git a/server/utils.js b/server/utils.js
index 18a2aaf..785b8c5 100644
--- a/server/utils.js
+++ b/server/utils.js
@@ -25,6 +25,7 @@ const getPlayerIdentifiers = (id) => {
};
exports.getPlayerIdentifiers = getPlayerIdentifiers;
+
/** Get player's discord id from source
* @param {number} id - Player ID to get identifiers from
* @returns {string|boolean} - discord id or false */
@@ -34,6 +35,7 @@ const getPlayerDiscordId = (id) => {
};
exports.getPlayerDiscordId = getPlayerDiscordId;
+
/** Get player source from discord id
* @param {string} discordid - Discord ID
* @returns {string|boolean} - source or false */
@@ -51,76 +53,6 @@ const getPlayerFromDiscordId = async (discordid) => {
};
exports.getPlayerFromDiscordId = getPlayerFromDiscordId;
-/** Get discord member object by userid
- * @param {object} client - discord client
- * @param {number} userid - discordid
- * @returns {object|boolean} - discord member or false */
-const getMember = (client, userid) => {
- const guild = client.guilds.cache.get(client.config.DiscordGuildId);
- if (!guild) {
- client.utils.log.error("Failed to fetch Discord server.");
- return false;
- }
- return guild.members.cache.get(userid) || false;
-};
-exports.getMember = getMember;
-
-
-/** Get discord member object by source
- * @param {object} client - discord client
- * @param {number} id - Player ID / source
- * @returns {object|boolean} - discord member or false */
-const getMemberFromSource = (client, id) => {
- const ids = getPlayerIdentifiers(id);
- if (!ids.discord) return false;
- return getMember(client, ids.discord);
-};
-exports.getMemberFromSource = getMemberFromSource;
-
-
-/** take any sort of identifier and try to parse a discord member from it
- * @param {object} client - discord client
- * @param {number|string|object} member - source | discordid | member object
- * @returns {object|boolean} - discord member or false */
-const parseMember = (client, member) => {
- if (typeof member === "number") {
- return getMemberFromSource(client, member);
- } else if (typeof member === "string") {
- return getMember(client, member);
- } else { return member || false; }
-};
-exports.parseMember = parseMember;
-
-
-/** Returns true if a role is found by id or array of ids
- * @param {object} client - discord client
- * @param {number|object|string} member - source | member | discordid
- * @param {string|object} role - Role ID or Role IDs
- * @returns {boolean} - true if role was found, false otherwise */
-exports.isRolePresent = (client, member, role) => {
- member = parseMember(client, member);
- if (!member) return false;
- if (typeof role === "object") {
- let found = false;
- role.forEach(function(item) {
- if (member.roles.cache.has(item)) found = true;
- });
- return found;
- } else {
- return member.roles.cache.has(role);
- }
-};
-
-/** get array of discord member roles by id
- * @param {object} client - discord client
- * @param {number|object|string} member - source | member | discordid
- * @returns {Array} - array of role ids */
-exports.getMemberRoles = (client, member) => {
- member = parseMember(client, member);
- if (!member) return [];
- return member.roles.cache.map(r => r.id);
-};
-
/** Await a set number of miliseconds as a promise for clean 1 line pauses
* @param {number} ms - number of miliseconds to wait
@@ -232,52 +164,6 @@ const log = {
exports.log = log;
-const { MessageActionRow, MessageEmbed, MessageButton } = require("discord.js");
-/**
- * Creates a pagination embed
- * credit to https://github.com/ryzyx/discordjs-button-pagination
- * @param {Interaction} interaction - the message interaction to react to
- * @param {MessageEmbed[]} pages - array of embeds
- * @param {MessageButton[]} buttonList - Must be 2 button objects
- * @param {number} timeout - Optional length of time to allow responses
- * @returns {Interaction} current page
- */
-const paginationEmbed = async (interaction, pages, buttonList, timeout = 120000) => {
- let page = 0;
- const row = new MessageActionRow().addComponents(buttonList);
- if (interaction.deferred == false) await interaction.deferReply();
- const curPage = await interaction.editReply({
- embeds: [pages[page].setFooter(`Page ${page + 1} / ${pages.length}`)],
- components: [row], fetchReply: true,
- });
- const filter = (i) => i.customId === buttonList[0].customId || i.customId === buttonList[1].customId;
- const collector = await curPage.createMessageComponentCollector({ filter, time: timeout });
- collector.on("collect", async (i) => {
- switch (i.customId) {
- case buttonList[0].customId:
- page = page > 0 ? --page : pages.length - 1;
- break;
- case buttonList[1].customId:
- page = page + 1 < pages.length ? ++page : 0;
- break;
- default:
- break;
- }
- await i.deferUpdate();
- await i.editReply({ embeds: [pages[page].setFooter(`Page ${page + 1} / ${pages.length}`)], components: [row] });
- collector.resetTimer();
- });
- collector.on("end", () => {
- if (!curPage.deleted) {
- const disabledRow = new MessageActionRow().addComponents(buttonList[0].setDisabled(true), buttonList[1].setDisabled(true));
- curPage.edit({ embeds: [pages[page].setFooter(`Page ${page + 1} / ${pages.length}`)], components: [disabledRow] });
- }
- });
- return curPage;
-};
-exports.paginationEmbed = paginationEmbed;
-
-
/** Check if role or server id looks at least somewhat correct
* @param {string} id - role id
* @returns {boolean} - whether ID looks correct */
@@ -296,7 +182,7 @@ const sendStaffChatMessage = (client, name, msg) => {
getPlayers().forEach(async function(player, index, array) {
if (IsPlayerAceAllowed(player, "zdiscord.staffchat")) {
emitNet("chat:addMessage", player, {
- template: `[${client.locale.staffchat}] ${name}: ${msg}
`,
+ template: `[${client.z.locale.staffchat}] ${name}: ${msg}
`,
});
}
});
From ea544c881694ed499b32cc64c6bd49a4eb868485 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Wed, 8 Dec 2021 08:10:35 -0500
Subject: [PATCH 16/21] webhook logging is now an addon module
---
server/addons/log.js | 70 ++++++++++++++++++++++++++++++++++++++++++++
server/log.js | 65 ----------------------------------------
2 files changed, 70 insertions(+), 65 deletions(-)
create mode 100644 server/addons/log.js
delete mode 100644 server/log.js
diff --git a/server/addons/log.js b/server/addons/log.js
new file mode 100644
index 0000000..c7cba18
--- /dev/null
+++ b/server/addons/log.js
@@ -0,0 +1,70 @@
+/**
+ * This file is part of zdiscord.
+ * Copyright (C) 2021 Tony/zfbx
+ * source:
+ *
+ * This work is licensed under the Creative Commons
+ * Attribution-NonCommercial-ShareAlike 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+const { MessageEmbed, WebhookClient } = require("discord.js");
+
+class Log {
+ constructor(z) {
+ this.z = z;
+ this.enabled = z.config.EnableLoggingWebhooks;
+ this.hooks = {};
+
+ if (this.enabled) {
+ StopResource("qb-logs");
+ let count = 0;
+ Object.entries(z.config.LoggingWebhooks).forEach(entry => {
+ const [key, value] = entry;
+ const k = key.toLocaleLowerCase();
+ if (this.hooks[k]) return client.z.utils.log.write(`Webhook for ${k} has already been registered. Remove the duplicate key`, { tag: "WEBHOOK", error: true });
+ const id = value.split("/").at(-2);
+ const token = value.split("/").at(-1);
+ if (id.length < 16 || id.length > 28 || token.length < 50 || token.length > 80) {
+ return this.z.utils.log.write(`Webhook for ${k} seems to be incorrect, check it's value.`, { tag: "WEBHOOK", error: true });
+ }
+ this.hooks[k] = new WebhookClient({ id: id, token: token, url: value });
+ count++;
+ });
+ this.z.utils.log.info(`${count} webhooks loaded.`, { tag: "WEBHOOK" });
+ }
+ global.exports("log", async (type, message, pingRole, color) => {
+ return z.log.send(type, message, { pingRole: pingRole, color: color });
+ });
+ }
+
+ /** Sends a log through to a webhook by name configured in config
+ * @param {string} type - type of log/event to pick which webhook to send
+ * @param {string} message - Message to log
+ * @param {boolean} pingRole - Whether message should ping configured role
+ * @param {object} options - pingRole, color, username, pingId
+ * @returns {boolean} - success or failure of logging event */
+ async send(type, message, options) {
+ if (!this.enabled) return false;
+ if (!message || !type) return this.z.utils.log.write("Log without message or type not permitted", { tag: "WEBHOOK", error: true });
+
+ const hook = this.hooks[type.toLocaleLowerCase()];
+ if (!hook) return this.z.utils.log.wrrite(`Webhook "${type}" is not defined. Message: ${message}`, { tag: "WEBHOOK", error: true });
+
+ const embed = new MessageEmbed().setDescription(message).setColor(options.color || "#1e90ff");
+ const data = {
+ username: options.username || this.z.config.LoggingWebhookName,
+ embeds: [ embed ],
+ };
+ if (options.pingRole) data.content = `<@${options.pingId || this.z.config.LoggingAlertPingId}>`;
+
+ await hook.send(data).catch((e) => {
+ return this.z.utils.log.write(`${type.toLowerCase()} log failed. Message: ${message}. Error: ${reply.status}`, { tag: "WEBHOOK", error: true });
+ });
+ return true;
+ }
+
+}
+
+module.exports = Log;
diff --git a/server/log.js b/server/log.js
deleted file mode 100644
index 0b9069b..0000000
--- a/server/log.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * This file is part of zdiscord.
- * Copyright (C) 2021 Tony/zfbx
- * source:
- *
- * This work is licensed under the Creative Commons
- * Attribution-NonCommercial-ShareAlike 4.0 International License.
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
- * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
- */
-
-const fetch = require("node-fetch");
-
-class Log {
- constructor(z) {
- this.z = z;
- this.enabled = z.config.EnableLoggingWebhooks;
- this.hooks = z.config.LoggingWebhooks;
-
- if (this.enabled) {
- StopResource("qb-logs");
- }
- }
-
- /** Sends a log through to a webhook by name configured in config
- * @param {string} type - type of log/event to pick which webhook to send
- * @param {string} message - Message to log
- * @param {boolean} pingRole - Whether message should ping configured role
- * @param {string|number} color - [optional] color to have on the embed
- * @returns {boolean} - success or failure of logging event */
- async send(type, message, pingRole, color) {
- if (!this.enabled) return false;
- if (!message || !type) {
- this.z.utils.log.error("[WEBHOOK FAIL] Log without message or type not permitted");
- return false;
- }
- if (!this.z.config.LoggingWebhooks[type]) {
- this.z.utils.log.error(`[WEBHOOK FAIL] "${type}" is not defined. Message: ${message}`);
- return false;
- }
- const params = {
- username: this.z.config.LoggingWebhookName,
- embeds: [
- {
- "description": message,
- "color": (color || "#1e90ff"),
- },
- ],
- };
- if (pingRole) params.content = `<@&${this.z.config.LoggingAlertPingRoleId}>`;
- const reply = await fetch(z.config.LoggingWebhooks[type], {
- method: "POST",
- headers: { "Content-type": "application/json" },
- body: JSON.stringify(params),
- });
- if (!reply.ok) {
- this.z.utils.log.error(`[WEBHOOK FAIL] ${type.toLowerCase()} log failed. Message: ${message}. Error: ${reply.status}`);
- return false;
- }
- return true;
- }
-
-}
-
-module.exports = Log;
From bac4fc6d0f5f70183e0f2a7f6ab9bb30feb9fdff Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Wed, 8 Dec 2021 08:12:20 -0500
Subject: [PATCH 17/21] fixes, QoL updates, cleanup, refactoring
---
config.js | 42 ++++--------------------
docs/config.md | 7 ++--
server/bot.js | 7 +---
server/events/messageCreate.js | 4 +--
server/queue.js | 24 --------------
server/server.js | 60 ++++++++++++++++++++--------------
server/utils.js | 8 +++--
7 files changed, 53 insertions(+), 99 deletions(-)
delete mode 100644 server/queue.js
diff --git a/config.js b/config.js
index ec8504f..c59d397 100644
--- a/config.js
+++ b/config.js
@@ -50,9 +50,6 @@ const BotStatusMessages = [
// ACE PERMISSIONS
const EnableAutoAcePermissions = false;
const AutoAcePermissions = {
- "group.god": DiscordGodRoleId,
- "group.admin": DiscordAdminRoleId,
- "group.mod": DiscordModRoleId,
// "example": "000000000000000000",
// "example2": [ "000000000000000000", "000000000000000000"],
};
@@ -67,40 +64,16 @@ const SaveScreenshotsToServer = false;
const EnableLoggingWebhooks = false;
const LoggingWebhookName = "zLogs";
-const LoggingAlertPingRoleId = "000000000000000000";
+// put "&" in front of the id if you're to ping a role
+const LoggingAlertPingId = "&000000000000000000";
// example: "bank": "https://discord.com/webhook/...",
const LoggingWebhooks = {
- "example": "",
+ "example": "https://discord.com/api/webhooks/000000000/sEcRRet-ToK3n_5tUfF_tH8t_YUo-S40u1d-n07-sHar3",
+ "test": "https://discord.com/api/webhooks/912921715854704670/1jJ0UJ2MTdDjqcYPa-UNA2rK_kzGZlcHPyfjyFnyh0BH1paP4TPlj-kGavyGuuPb-8wc",
+ "test2": "https://discord.com/api/webhooks/912921913427386420/yW8qoGNDtlxCrCsKK9vJLyVLwMCc0BukcTe7wPSgaBPxSgph_wVnvNjjJ4ew6TZhAPyy",
};
-/** *************************
- * CONNECTION QUEUE SETTINGS (( WIP ))
- ***************************/
-
-// WIP
-const EnableConnectingQueue = false;
-
-// WIP
-// This setting will only take effect if EnableDiscordBot is "true"
-const ConnectingQueuePriorities = {
- 1: DiscordGodRoleId,
- 2: DiscordAdminRoleId,
- 3: DiscordModRoleId,
- // 10: "000000000000000000",
- // 20: [ "000000000000000000", "000000000000000000"],
-};
-
-
-/** **********************
- * USER PRESENCE SETTINGS (( WIP ))
- *************************/
-
-// WIP
-const EnableUserPresenceUpdates = false;
-
-
-
/** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* !! DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING !!
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
@@ -126,12 +99,9 @@ module.exports = {
EnableAutoAcePermissions: getConBool("discord_enable_ace_perms", EnableAutoAcePermissions),
AutoAcePermissions: AutoAcePermissions,
SaveScreenshotsToServer: getConBool("discord_save_screenshots", SaveScreenshotsToServer),
- EnableConnectingQueue: getConBool("discord_enable_connecting_queue", EnableConnectingQueue),
- ConnectingQueuePriorities: ConnectingQueuePriorities,
DiscordStaffChannelId: GetConvar("discord_staff_channel_id", DiscordStaffChannelId),
- EnableUserPresenceUpdates: getConBool("discord_enable_user_presence", EnableUserPresenceUpdates),
LoggingWebhooks: LoggingWebhooks,
- LoggingAlertPingRoleId: GetConvar("discord_logging_alert_role", LoggingAlertPingRoleId),
+ LoggingAlertPingId: GetConvar("discord_logging_ping_id", LoggingAlertPingId),
LoggingWebhookName: GetConvar("discord_logging_name", LoggingWebhookName),
};
diff --git a/docs/config.md b/docs/config.md
index 90a466f..2479134 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -142,9 +142,10 @@ This setting enables the abilty to use the log export. if this is set to false t
**[ Convar: `discord_logging_name` ]**
This is the name to display in discord when the logs come through. Webhooks work slightly different from the normal bot and can have their own names or pictures set without issue, these "bots" however can't read messages or show up in the user list, it's just a one way message
-### LoggingAlertPingRoleId
-**[ Convar: `discord_logging_alert_role` ]**
-This discord id will be pingged in the event a log is sent with `true` for pingRole. This can be used to give attention to an important log that a dedicated staff team might want to know about or deal with for example a monetary transaction over a certain amount might be suspicious and warrent a ping to this role. There can only be one role for this.
+### LoggingAlertPingId
+**[ Convar: `discord_logging_ping_id` ]**
+This discord id will be pingged in the event a log is sent with `true` for pingRole. This can be used to give attention to an important log that a dedicated staff team might want to know about or deal with for example a monetary transaction over a certain amount might be suspicious and warrent a ping to this user or role. There can only be one id for this.
+**IMPORTANT NOTE:** If you want to ping a user just put the ID, if you want to **ping a role** put a `&` in front of the role id**
### LoggingWebhooks
This is the array of webhooks you setup to be used with the log system. it uses `"key": "value",` where `key` is the name (case sensitive) of the webhook for you to be able to call from the logging export as the first value
diff --git a/server/bot.js b/server/bot.js
index 8490196..efb6f61 100644
--- a/server/bot.js
+++ b/server/bot.js
@@ -12,7 +12,6 @@
const { Client, Collection, MessageEmbed, MessageActionRow, MessageButton } = require("discord.js");
const { readdirSync } = require("fs");
-
class Bot extends Client {
constructor(z) {
@@ -24,6 +23,7 @@ class Bot extends Client {
this.enabled = z.config.EnableDiscordBot;
this.z = z;
this.config = z.config;
+ this.QBCore = z.QBCore;
this.utils = z.utils;
this.Embed = MessageEmbed;
this.commands = new Collection();
@@ -44,11 +44,6 @@ class Bot extends Client {
this.loadDiscordPermissions();
- try {
- this.QBCore = global.exports["qb-core"].GetCoreObject();
- if (this.QBCore) utils.log.info("QBCore found! Supported QB commands will be loaded.");
- } catch { this.QBCore = false; }
-
if (this.config.EnableDiscordSlashCommands) this.loadCommands();
this.loadEvents();
diff --git a/server/events/messageCreate.js b/server/events/messageCreate.js
index 29bf985..4c1bb1c 100644
--- a/server/events/messageCreate.js
+++ b/server/events/messageCreate.js
@@ -15,8 +15,8 @@ module.exports = {
run: async (client, msg) => {
if (!msg.content || msg.author.bot) return;
if (client.config.EnableStaffChatForwarding && msg.channel.id == client.config.DiscordStaffChannelId) {
- client.utils.sendStaffChatMessage(client, msg.member.displayName, msg.content);
- return console.log(`[STAFF] ${msg.member.displayName}: ${msg.content}`);
+ client.utils.sendStaffChatMessage(client.z, msg.member.displayName, msg.content);
+ return client.z.utils.log.write(`${msg.member.displayName}: ${msg.content}`, { tag: "STAFFCHAT" });
}
},
};
diff --git a/server/queue.js b/server/queue.js
deleted file mode 100644
index da08d68..0000000
--- a/server/queue.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * This file is part of zdiscord.
- * Copyright (C) 2021 Tony/zfbx
- * source:
- *
- * This work is licensed under the Creative Commons
- * Attribution-NonCommercial-ShareAlike 4.0 International License.
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/
- * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
- */
-
-class Queue {
- constructor(z) {
- this.connections = {};
-
- if (z.config.EnableConnectingQueue) {
- StopResource("hardcap");
- StopResource("connectqueue");
- }
- }
-}
-
-
-module.exports = Queue;
diff --git a/server/server.js b/server/server.js
index db6bfae..e75e53d 100644
--- a/server/server.js
+++ b/server/server.js
@@ -11,18 +11,32 @@
const z = {};
+const { readdirSync } = require("fs");
z.root = GetResourcePath(GetCurrentResourceName());
z.config = require(`${z.root}/config`);
z.locale = require(`${z.root}/locales/${z.config.LanguageLocaleCode}`);
z.utils = require(`${z.root}/server/utils`);
-const Bot = require(`${z.root}/server/bot`);
-const Queue = require(`${z.root}/server/queue`);
-const Log = require(`${z.root}/server/log`);
+try {
+ z.QBCore = global.exports["qb-core"].GetCoreObject();
+ if (z.QBCore) z.utils.log.info("QBCore found! Supported QB commands will be loaded.");
+} catch { z.QBCore = false; }
+const Bot = require(`${z.root}/server/bot`);
z.bot = new Bot(z);
-z.queue = new Queue(z);
-z.log = new Log(z);
+
+const addons = readdirSync(`${z.root}/server/addons`).filter(file => file.endsWith(".js"));
+for (const file of addons) {
+ try {
+ const Addon = require(`${z.root}/server/addons/${file}`);
+ z[file.slice(0, -3)] = new Addon(z);
+ z.utils.log.info(`[ADDON] ${file} addon found and loaded`);
+ } catch (e) {
+ z.utils.log.error(`[ADDON] ${file} errored and could not be loaded`);
+ z.utils.log.error(e);
+ }
+}
+
SetConvarReplicated("zdiscord_servername", z.config.FiveMServerName);
SetConvarReplicated("zdiscord_discordinvite", z.config.DiscordInviteLink);
@@ -45,27 +59,15 @@ on("playerConnecting", async (name, setKickReason, deferrals) => {
else deferrals.done(z.utils.replaceGlobals(z, z.locale.notWhitelisted));
});
-global.exports("isRolePresent", (identifier, role) => {
- return z.bot.isRolePresent(identifier, role);
-});
-
-global.exports("getRoles", (identifier) => {
- return z.bot.getMemberRoles(identifier);
-});
-
-global.exports("getName", (identifier) => {
- const member = z.bot.parseMember(identifier);
- return member.displayName || false;
-});
on("playerJoining", (oldId) => {
const source = global.source;
if (!z.config.EnableDiscordBot) return;
const member = z.bot.getMemberFromSource(source);
if (z.config.EnableAutoAcePermissions) {
- for (const [perm, role] of Object.entries(z.config.AutoAcePermissions)) {
+ for (const [group, role] of Object.entries(z.config.AutoAcePermissions)) {
if (z.bot.isRolePresent(member, role)) {
- ExecuteCommand(`add_principal "player.${source}" "${perm}"`);
+ ExecuteCommand(`add_principal "player.${source}" "${group}"`);
}
}
}
@@ -78,14 +80,12 @@ on("playerDropped", (reason) => {
const source = global.source;
if (!z.config.EnableDiscordBot) return false;
if (z.config.EnableAutoAcePermissions) {
- for (const [perm, role] of Object.entries(z.config.AutoAcePermissions)) {
- ExecuteCommand(`remove_principal "player.${source}" "${perm}"`);
+ for (const [group, role] of Object.entries(z.config.AutoAcePermissions)) {
+ ExecuteCommand(`remove_principal "player.${source}" "${group}"`);
}
}
});
-
-
if (z.config.EnableStaffChatForwarding) {
RegisterCommand("staff", (source, args, raw) => {
if (!IsPlayerAceAllowed(source, "zdiscord.staffchat")) return;
@@ -121,7 +121,17 @@ if (z.config.EnableStaffChatForwarding) {
});
}
+// EXPORTS
+
+global.exports("isRolePresent", (identifier, role) => {
+ return z.bot.isRolePresent(identifier, role);
+});
-global.exports("log", async (type, message, pingRole, color) => {
- return z.log.send(type, message, pingRole, color);
+global.exports("getRoles", (identifier) => {
+ return z.bot.getMemberRoles(identifier);
+});
+
+global.exports("getName", (identifier) => {
+ const member = z.bot.parseMember(identifier);
+ return member.displayName || false;
});
diff --git a/server/utils.js b/server/utils.js
index 785b8c5..c09b497 100644
--- a/server/utils.js
+++ b/server/utils.js
@@ -117,6 +117,7 @@ const log = {
* @param {object} settings - Optional overrides of style and label */
error: (content, { color = "\x1b[1;31m", tag = "ERR" } = {}) => {
log.write(content, { color, tag, error: true });
+ return false;
},
/** Write directly to the console with your own tag and style
@@ -125,6 +126,7 @@ const log = {
write: (content, { color = "\x1b[37m", tag = "LOG", error = false } = {}) => {
const stream = error ? process.stderr : process.stdout;
stream.write(`\x1b[1;36m[${GetCurrentResourceName()}]\x1b[0m[${log.timestamp()}]${color}[${tag}]: ${log.clean(content)}\x1b[0m\n`);
+ return false;
},
/** Sanitize content for console logging
@@ -174,15 +176,15 @@ exports.isValidID = isValidID;
/** send staff message to all staff in game with it enabled
- * @param {object} client - Name the message is from
+ * @param {object} z - z
* @param {string} name - Name the message is from
* @param {string} msg - message to send */
-const sendStaffChatMessage = (client, name, msg) => {
+const sendStaffChatMessage = (z, name, msg) => {
if (!msg) return;
getPlayers().forEach(async function(player, index, array) {
if (IsPlayerAceAllowed(player, "zdiscord.staffchat")) {
emitNet("chat:addMessage", player, {
- template: `[${client.z.locale.staffchat}] ${name}: ${msg}
`,
+ template: `[${z.locale.staffchat}] ${name}: ${msg}
`,
});
}
});
From 241e595ea12b30119fc8abaede8d43f058f3ff8f Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Wed, 8 Dec 2021 08:12:42 -0500
Subject: [PATCH 18/21] Synthethics added Slovenian locales
---
docs/index.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/index.md b/docs/index.md
index 1fe8bd2..30016ec 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -20,6 +20,7 @@ A Discord bot that runs in FiveM for the purpose of whitelisting, moderation and
- ar - Arabic - By RadhwaneDZ
- tr - Turkish - By alp1x
- nl - Dutch - By ChatDisabled
+- sl - Slovenian - By Synthethics
## License
From dfbc707b1fa598dc0c9d50d9ca8e329ea81e1f48 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Wed, 8 Dec 2021 08:13:26 -0500
Subject: [PATCH 19/21] changelog
---
docs/changelog.md | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/docs/changelog.md b/docs/changelog.md
index c6bc261..5d64bc6 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,22 +1,34 @@
## Change log
-**6.0.0 - Refactor!**
+**7.0.0 - Staff chat, new config AND WEBHOOK LOGGING [2021-12-8]**
+
+- added bi-directional staff chat (messages from discord staff channel <-> fiveM staff chat messages)
+- add discord webhook logging export (think qb-logs)
+- Refactored and added to config to be more clear
+- dutch added. Thanks Chatty <3
+- Slovenian added. Thanks Synthetics <3
+- remove command versioning
+- converted bot into class
+- added addon support
+- relicensed under CC-BY-SA-NC-4.0
+
+**6.0.0 - Refactor! [2021-10-25]**
- command arguments have been refactored to pass as an object instead of an array (This is not backwards compatible which is why it's a version bump)
-**5.0.2 - New commands and docs!**
+**5.0.2 - New commands and docs! [2021-10-23]**
- added screenshot command
- added weather, blackout, time commands
- added docs at [zfbx.github.io/zdiscord](https://zfbx.github.io/zdiscord)
- updated/fixed chat events and teleport command
-**5.0.1 - Exports and ace perms**
+**5.0.1 - Exports and ace perms [2021-10-20]**
- Automatic Ace permission granting by discord role
- new and changed exports for checking if role exist and getting roles
-**5.0.0 - Hello discord.js! & Much much more.**
+**5.0.0 - Hello discord.js! & Much much more. [2021-10-18]**
*It should be noted, this is essentially a complete rewrite of the resource and should probably be treated as such.*
@@ -28,7 +40,7 @@
- added client.js for running events client side
- added linting and editorconfig
-**4.0.0 - permissions! bye yarn!.. and esx.**
+**4.0.0 - permissions! bye yarn!.. and esx. [2021-9-15]**
- Dependencies are now embedded libs making the project slimmer on install and not requiring yarn.
- ESX support was dropped, it wasn't getting used and I don't have an esx server for testing.
@@ -36,7 +48,7 @@
- `add/removepermissions` merged into `perms` command
- Convars changed to be more readable using standard FiveM format with `_` spacing
-**3.2.0 - Convars everywhere!**
+**3.2.0 - Convars everywhere! [2021-7-24]**
- Convar hooks added for nearly every config option [Read More](https://github.com/zfbx/zdiscord/wiki/Convars)
- Slimmed up locales by removing console log messages
@@ -44,13 +56,13 @@
- New Add/Remove permissions command for QBCore
-**3.1.0 - QBCore (potential ESX) support added**
+**3.1.0 - QBCore (potential ESX) support added [2021-7-10]**
- Commands starting with `qb-` will load automatically if QBCore is detected.
- Placeholders for `esx-` commands have been added.
-**3.0.0 - Modular commands!**
+**3.0.0 - Modular commands! [2021-7-10]**
- Commands are now loaded dynamically from the `/commands` folder
- Help command now has sub commands `!help commandName`
@@ -58,12 +70,12 @@
- various Error checks and fixes
-**2.0.0 - Github Release**
+**2.0.0 - Github Release [2021-7-9]**
- polished standalone
- Added translation support
-**1.0.0 - First unsupported build**
+**1.0.0 - First unsupported build [2021-6-10]**
- A lot.
From 6832160a5affcfc35ee14c70b177bd38fd6f7c38 Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Wed, 8 Dec 2021 08:14:03 -0500
Subject: [PATCH 20/21] damnit
---
config.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/config.js b/config.js
index c59d397..6e9c291 100644
--- a/config.js
+++ b/config.js
@@ -69,8 +69,6 @@ const LoggingAlertPingId = "&000000000000000000";
// example: "bank": "https://discord.com/webhook/...",
const LoggingWebhooks = {
"example": "https://discord.com/api/webhooks/000000000/sEcRRet-ToK3n_5tUfF_tH8t_YUo-S40u1d-n07-sHar3",
- "test": "https://discord.com/api/webhooks/912921715854704670/1jJ0UJ2MTdDjqcYPa-UNA2rK_kzGZlcHPyfjyFnyh0BH1paP4TPlj-kGavyGuuPb-8wc",
- "test2": "https://discord.com/api/webhooks/912921913427386420/yW8qoGNDtlxCrCsKK9vJLyVLwMCc0BukcTe7wPSgaBPxSgph_wVnvNjjJ4ew6TZhAPyy",
};
From e8e62bd84a39a9b252977e237933438f6d76f99e Mon Sep 17 00:00:00 2001
From: Tony <1414927+zfbx@users.noreply.github.com>
Date: Wed, 8 Dec 2021 08:37:03 -0500
Subject: [PATCH 21/21] update readme and yarn.lock
---
readme.md | 2 +
yarn.lock | 294 +++++++++++++++++++++++++++---------------------------
2 files changed, 149 insertions(+), 147 deletions(-)
diff --git a/readme.md b/readme.md
index f4f0ee2..c658c14 100644
--- a/readme.md
+++ b/readme.md
@@ -22,6 +22,8 @@ A Discord bot that runs in FiveM for the purpose of whitelisting, moderation and
- Can be configured with [convars](https://zfbx.github.io/zdiscord/convars)
- Automatic Ace Permission granting system
- [Helpful exports](https://zfbx.github.io/zdiscord/exports)
+- bi-directional staff chat
+- AND MORE!
## Setup
diff --git a/yarn.lock b/yarn.lock
index 5d65eb4..ea31860 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,90 +3,90 @@
"@discordjs/builders@^0.8.1":
- "integrity" "sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ=="
- "resolved" "https://registry.npmjs.org/@discordjs/builders/-/builders-0.8.2.tgz"
- "version" "0.8.2"
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-0.8.2.tgz#c3ef99caa9ebe70a4196b987011d90136c71054a"
+ integrity sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ==
dependencies:
"@sindresorhus/is" "^4.2.0"
- "discord-api-types" "^0.24.0"
- "ow" "^0.27.0"
- "ts-mixer" "^6.0.0"
- "tslib" "^2.3.1"
+ discord-api-types "^0.24.0"
+ ow "^0.27.0"
+ ts-mixer "^6.0.0"
+ tslib "^2.3.1"
"@discordjs/collection@^0.3.2":
- "integrity" "sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg=="
- "resolved" "https://registry.npmjs.org/@discordjs/collection/-/collection-0.3.2.tgz"
- "version" "0.3.2"
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.3.2.tgz#3c271dd8a93dad89b186d330e24dbceaab58424a"
+ integrity sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg==
"@discordjs/form-data@^3.0.1":
- "integrity" "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg=="
- "resolved" "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz"
- "version" "3.0.1"
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@discordjs/form-data/-/form-data-3.0.1.tgz#5c9e6be992e2e57d0dfa0e39979a850225fb4697"
+ integrity sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==
dependencies:
- "asynckit" "^0.4.0"
- "combined-stream" "^1.0.8"
- "mime-types" "^2.1.12"
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
"@sapphire/async-queue@^1.1.8":
- "integrity" "sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ=="
- "resolved" "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.9.tgz"
- "version" "1.1.9"
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.1.9.tgz#ce69611c8753c4affd905a7ef43061c7eb95c01b"
+ integrity sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ==
"@sindresorhus/is@^4.0.1", "@sindresorhus/is@^4.2.0":
- "integrity" "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
- "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz"
- "version" "4.2.0"
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.2.0.tgz#667bfc6186ae7c9e0b45a08960c551437176e1ca"
+ integrity sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==
"@types/node-fetch@^2.5.12":
- "integrity" "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="
- "resolved" "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"
- "version" "2.5.12"
+ version "2.5.12"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
+ integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
dependencies:
"@types/node" "*"
- "form-data" "^3.0.0"
+ form-data "^3.0.0"
"@types/node@*":
- "integrity" "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A=="
- "resolved" "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz"
- "version" "16.11.9"
+ version "16.11.12"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10"
+ integrity sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==
"@types/ws@^8.2.0":
- "integrity" "sha512-cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg=="
- "resolved" "https://registry.npmjs.org/@types/ws/-/ws-8.2.0.tgz"
- "version" "8.2.0"
+ version "8.2.2"
+ resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
+ integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==
dependencies:
"@types/node" "*"
-"asynckit@^0.4.0":
- "integrity" "sha1-x57Zf380y48robyXkLzDZkdLS3k="
- "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
- "version" "0.4.0"
+asynckit@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+ integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-"callsites@^3.1.0":
- "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
- "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
- "version" "3.1.0"
+callsites@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+ integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-"combined-stream@^1.0.8":
- "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
- "resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
- "version" "1.0.8"
+combined-stream@^1.0.8:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+ integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
dependencies:
- "delayed-stream" "~1.0.0"
+ delayed-stream "~1.0.0"
-"delayed-stream@~1.0.0":
- "integrity" "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
- "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
- "version" "1.0.0"
+delayed-stream@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-"discord-api-types@^0.24.0":
- "integrity" "sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A=="
- "resolved" "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz"
- "version" "0.24.0"
+discord-api-types@^0.24.0:
+ version "0.24.0"
+ resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.24.0.tgz#9e429b8a1ddb4147134dfb3109093422de7ec549"
+ integrity sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A==
"discord.js@github:zfbx/discord.js":
- "resolved" "git+ssh://git@github.com/zfbx/discord.js.git#2c56b697c5515024600e59e09c42702170404ead"
- "version" "13.4.0-dev"
+ version "13.4.0-dev"
+ resolved "https://codeload.github.com/zfbx/discord.js/tar.gz/2c56b697c5515024600e59e09c42702170404ead"
dependencies:
"@discordjs/builders" "^0.8.1"
"@discordjs/collection" "^0.3.2"
@@ -94,106 +94,106 @@
"@sapphire/async-queue" "^1.1.8"
"@types/node-fetch" "^2.5.12"
"@types/ws" "^8.2.0"
- "discord-api-types" "^0.24.0"
- "node-fetch" "^2.6.1"
- "ws" "^8.2.3"
-
-"dot-prop@^6.0.1":
- "integrity" "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="
- "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz"
- "version" "6.0.1"
+ discord-api-types "^0.24.0"
+ node-fetch "^2.6.1"
+ ws "^8.2.3"
+
+dot-prop@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
+ integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
dependencies:
- "is-obj" "^2.0.0"
+ is-obj "^2.0.0"
-"form-data@^3.0.0":
- "integrity" "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="
- "resolved" "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"
- "version" "3.0.1"
+form-data@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+ integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
dependencies:
- "asynckit" "^0.4.0"
- "combined-stream" "^1.0.8"
- "mime-types" "^2.1.12"
-
-"is-obj@^2.0.0":
- "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
- "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"
- "version" "2.0.0"
-
-"lodash.isequal@^4.5.0":
- "integrity" "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
- "resolved" "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"
- "version" "4.5.0"
-
-"mime-db@1.51.0":
- "integrity" "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
- "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"
- "version" "1.51.0"
-
-"mime-types@^2.1.12":
- "integrity" "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="
- "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"
- "version" "2.1.34"
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
+is-obj@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+ integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+lodash.isequal@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+ integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+mime-db@1.51.0:
+ version "1.51.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+ integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+
+mime-types@^2.1.12:
+ version "2.1.34"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+ integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
dependencies:
- "mime-db" "1.51.0"
+ mime-db "1.51.0"
-"node-fetch@^2.6.1", "node-fetch@^2.6.6":
- "integrity" "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="
- "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"
- "version" "2.6.6"
+node-fetch@^2.6.1, node-fetch@^2.6.6:
+ version "2.6.6"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+ integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
dependencies:
- "whatwg-url" "^5.0.0"
+ whatwg-url "^5.0.0"
-"ow@^0.27.0":
- "integrity" "sha512-SGnrGUbhn4VaUGdU0EJLMwZWSupPmF46hnTRII7aCLCrqixTAC5eKo8kI4/XXf1eaaI8YEVT+3FeGNJI9himAQ=="
- "resolved" "https://registry.npmjs.org/ow/-/ow-0.27.0.tgz"
- "version" "0.27.0"
+ow@^0.27.0:
+ version "0.27.0"
+ resolved "https://registry.yarnpkg.com/ow/-/ow-0.27.0.tgz#d44da088e8184fa11de64b5813206f9f86ab68d0"
+ integrity sha512-SGnrGUbhn4VaUGdU0EJLMwZWSupPmF46hnTRII7aCLCrqixTAC5eKo8kI4/XXf1eaaI8YEVT+3FeGNJI9himAQ==
dependencies:
"@sindresorhus/is" "^4.0.1"
- "callsites" "^3.1.0"
- "dot-prop" "^6.0.1"
- "lodash.isequal" "^4.5.0"
- "type-fest" "^1.2.1"
- "vali-date" "^1.0.0"
-
-"tr46@~0.0.3":
- "integrity" "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
- "resolved" "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
- "version" "0.0.3"
-
-"ts-mixer@^6.0.0":
- "integrity" "sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ=="
- "resolved" "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.0.tgz"
- "version" "6.0.0"
-
-"tslib@^2.3.1":
- "integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
- "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
- "version" "2.3.1"
-
-"type-fest@^1.2.1":
- "integrity" "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="
- "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz"
- "version" "1.4.0"
-
-"vali-date@^1.0.0":
- "integrity" "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY="
- "resolved" "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"
- "version" "1.0.0"
-
-"webidl-conversions@^3.0.0":
- "integrity" "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
- "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
- "version" "3.0.1"
-
-"whatwg-url@^5.0.0":
- "integrity" "sha1-lmRU6HZUYuN2RNNib2dCzotwll0="
- "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
- "version" "5.0.0"
+ callsites "^3.1.0"
+ dot-prop "^6.0.1"
+ lodash.isequal "^4.5.0"
+ type-fest "^1.2.1"
+ vali-date "^1.0.0"
+
+tr46@~0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+ integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+ts-mixer@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.0.tgz#4e631d3a36e3fa9521b973b132e8353bc7267f9f"
+ integrity sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ==
+
+tslib@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
+type-fest@^1.2.1:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
+ integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
+
+vali-date@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
+ integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
+
+webidl-conversions@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+ integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+whatwg-url@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+ integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
dependencies:
- "tr46" "~0.0.3"
- "webidl-conversions" "^3.0.0"
+ tr46 "~0.0.3"
+ webidl-conversions "^3.0.0"
-"ws@^8.2.3":
- "integrity" "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="
- "resolved" "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz"
- "version" "8.2.3"
+ws@^8.2.3:
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d"
+ integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==