From c57507cea97e28df873ddc10479af9210c0cc39f Mon Sep 17 00:00:00 2001 From: DJj123dj <80536295+DJj123dj@users.noreply.github.com> Date: Tue, 19 Jul 2022 11:57:14 +0200 Subject: [PATCH] open ticket v2.3 push 1 (doesn't work yet) --- README.md | 6 +++--- commands/close.js | 4 ++-- commands/delete.js | 4 ++-- commands/help.js | 2 +- commands/reopen.js | 2 +- config.json | 2 +- core/closebuttons.js | 28 ++++++++++++++-------------- core/errorLogSystem.js | 15 ++++++++------- core/ticketCloser.js | 12 ++++++------ core/ticketMessageEmbed.js | 8 ++++---- core/ticketOpener.js | 6 +++--- core/ticketReopener.js | 24 ++++++++++++------------ core/utils/getButton.js | 8 ++++---- index.js | 14 ++++++++++++-- package.json | 4 ++-- 15 files changed, 75 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index aa1dcf8..d751cd1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ make a ticket in our server to start! *if you translate, you will come in the credits* # open-ticket -[![discord](https://img.shields.io/badge/discord-join%20our%20server-5865F2.svg?style=flat-square&logo=discord)](https://discord.com/invite/26vT9wt3n3) [![version](https://img.shields.io/badge/version-2.2.0%20stable-brightgreen.svg?style=flat-square)](https://github.com/DJj123dj/open-ticket/releases/tag/v2.2.0) [![npm](https://img.shields.io/badge/npm-external%20libraries%20needed-CB3837.svg?style=flat-square&logo=npm)](#packages) [![license](https://img.shields.io/badge/license-GPL%203.0-important.svg?style=flat-square)](https://github.com/DJj123dj/open-ticket/blob/main/LICENSE) +[![discord](https://img.shields.io/badge/discord-join%20our%20server-5865F2.svg?style=flat-square&logo=discord)](https://discord.com/invite/26vT9wt3n3) [![version](https://img.shields.io/badge/version-2.3.0%20stable-brightgreen.svg?style=flat-square)](https://github.com/DJj123dj/open-ticket/releases/tag/v2.3.0) [![npm](https://img.shields.io/badge/npm-external%20libraries%20needed-CB3837.svg?style=flat-square&logo=npm)](#packages) [![license](https://img.shields.io/badge/license-GPL%203.0-important.svg?style=flat-square)](https://github.com/DJj123dj/open-ticket/blob/main/LICENSE) This is an open-source discord ticket bot, you can configure it and it comes with cool features like transcripts & custom options! @@ -61,7 +61,7 @@ if there are any errors, you can open an **issue on github** or **contact me in ### config Our config documentation is moved to another file: -[click here to view](https://www.github.com/DJj123dj/open-ticket/wiki/config-v2.2.0) +[click here to view](https://www.github.com/DJj123dj/open-ticket/wiki/config-v2.3.0) ### intents & permissions In the discord developer portal in the "bot" panel you will find 3 switches under the title "Gateaway Intents". The following switches should always be turned on @@ -73,7 +73,7 @@ You can also configure your own permissions ## information -_v2.2.0 stable_ +_v2.3.0 stable_ changelog: [click here](https://www.github.com/DJj123dj/open-ticket/wiki/Changelog) diff --git a/commands/close.js b/commands/close.js index 1a4eb0a..94523aa 100644 --- a/commands/close.js +++ b/commands/close.js @@ -17,7 +17,7 @@ module.exports = () => { const closebutton = new discord.MessageActionRow() .addComponents([ - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicketTrue1") .setDisabled(false) .setStyle("SECONDARY") @@ -44,7 +44,7 @@ module.exports = () => { const closebutton = new discord.MessageActionRow() .addComponents([ - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicketTrue1") .setDisabled(false) .setStyle("SECONDARY") diff --git a/commands/delete.js b/commands/delete.js index e3d8dc5..624dcd1 100644 --- a/commands/delete.js +++ b/commands/delete.js @@ -20,7 +20,7 @@ module.exports = () => { const closebutton = new discord.MessageActionRow() .addComponents([ - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicketTrue") .setDisabled(false) .setStyle("SECONDARY") @@ -53,7 +53,7 @@ module.exports = () => { const closebutton = new discord.MessageActionRow() .addComponents([ - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicketTrue") .setDisabled(false) .setStyle("SECONDARY") diff --git a/commands/help.js b/commands/help.js index 50e06ab..5a17a2c 100644 --- a/commands/help.js +++ b/commands/help.js @@ -6,7 +6,7 @@ const log = bot.errorLog.log const l = bot.language module.exports = () => { - const helpEmbed = new discord.MessageEmbed() + const helpEmbed = new discord.EmbedBuilder() .setColor(config.main_color) .setTitle(l.helpMenu.title) diff --git a/commands/reopen.js b/commands/reopen.js index 87273a0..c9c6cbc 100644 --- a/commands/reopen.js +++ b/commands/reopen.js @@ -8,7 +8,7 @@ const l = bot.language module.exports = () => { var reopenCommandBar = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicket1") .setDisabled(false) .setStyle("SECONDARY") diff --git a/config.json b/config.json index 4108d9f..eea4dab 100644 --- a/config.json +++ b/config.json @@ -79,7 +79,7 @@ "name":"Choose Your Ticket", "description":"You can click one of the buttons below!\nYou can also customize all the embeds now!", "enableFooter":true, - "footer":"Open Ticket v2.2.0 - I'm a footer!", + "footer":"Open Ticket v2.3.0 - I'm a footer!", "enableThumbnail":false, "thumbnail":"https://www.example.com/catmemes/cat.png", "color":"#ffffff", diff --git a/core/closebuttons.js b/core/closebuttons.js index cec9b40..a19d32f 100644 --- a/core/closebuttons.js +++ b/core/closebuttons.js @@ -9,14 +9,14 @@ module.exports = () => { //closebar var closeBar = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicketTrue") .setDisabled(false) .setStyle("SECONDARY") .setEmoji("✅") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicketFalse") .setDisabled(false) .setStyle("SECONDARY") @@ -24,14 +24,14 @@ module.exports = () => { ) var deleteBar = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicketTrue") .setDisabled(false) .setStyle("SECONDARY") .setEmoji("✅") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicketFalse") .setDisabled(false) .setStyle("SECONDARY") @@ -39,14 +39,14 @@ module.exports = () => { ) var deleteBar1 = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicketTrue1") .setDisabled(false) .setStyle("SECONDARY") .setEmoji("✅") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicketFalse1") .setDisabled(false) .setStyle("SECONDARY") @@ -55,7 +55,7 @@ module.exports = () => { //closebutton var closeRowNormal = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicket") .setDisabled(false) .setStyle("SECONDARY") @@ -63,7 +63,7 @@ module.exports = () => { .setEmoji("🔒") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket") .setDisabled(false) .setStyle("DANGER") @@ -72,7 +72,7 @@ module.exports = () => { ) var closeRowClosed = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket1") .setDisabled(false) .setStyle("DANGER") @@ -80,7 +80,7 @@ module.exports = () => { .setEmoji("✖️") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("sendTranscript") .setDisabled(false) .setStyle("SECONDARY") @@ -88,7 +88,7 @@ module.exports = () => { .setEmoji("📄") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicket") .setDisabled(false) .setStyle("SUCCESS") @@ -98,7 +98,7 @@ module.exports = () => { var closeRowDisabled = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicket") .setDisabled(true) .setStyle("SECONDARY") @@ -106,7 +106,7 @@ module.exports = () => { .setEmoji("🔒") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket") .setDisabled(true) .setStyle("DANGER") @@ -178,7 +178,7 @@ module.exports = () => { const closedButtonDisabled = new discord.MessageActionRow() .addComponents([ - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicketTrue1") .setDisabled(true) .setStyle("SECONDARY") diff --git a/core/errorLogSystem.js b/core/errorLogSystem.js index c9476f9..8fa8833 100644 --- a/core/errorLogSystem.js +++ b/core/errorLogSystem.js @@ -7,17 +7,18 @@ const l = bot.language const loadChalk = async () => { return await (await import("chalk")).default } -const embed = discord.MessageEmbed +const embed = discord.EmbedBuilder +const c = discord.Colors exports.noPermsMessage = new embed() - .setColor("RED") + .setColor(c.Red) .setTitle(":x: "+l.errors.noPermsTitle+" :x:") .setDescription(l.errors.noPermsDescription) /**@param {String} message */ exports.invalidArgsMessage = (message) => { var x = new embed() - .setColor("RED") + .setColor(c.Red) .setTitle(":x: "+l.errors.missingArgsTitle+" :x:") .setDescription(message) @@ -27,7 +28,7 @@ exports.invalidArgsMessage = (message) => { /**@param {String} message */ exports.serverError = (message) => { var x = new embed() - .setColor("ORANGE") + .setColor(c.Orange) .setTitle(":warning: "+l.errors.boterror+" :warning:") .setDescription(message) @@ -37,14 +38,14 @@ exports.serverError = (message) => { /**@param {String[]} list */ exports.invalidIdChooseFromList = (list) => { var x = new embed() - .setColor("RED") + .setColor(c.Red) .setTitle(":x: "+l.errors.chooseFromListTitle+" :x:") .setDescription(l.errors.chooseFromListDescription+"\n`"+list.join("`\n`")+"`") return x } exports.notInATicket = new embed() - .setColor("RED") + .setColor(c.Red) .setTitle(":x: "+l.errors.notInTicketTitle+" :x:") .setDescription(l.errors.notInTicketDescription) @@ -62,7 +63,7 @@ exports.success = (title,message) => { /**@param {String} message @param {String} title */ exports.warning = (title,message) => { var x = new embed() - .setColor("ORANGE") + .setColor(c.Orange) .setTitle(":warning: "+title+" :warning:") .setDescription(message) diff --git a/core/ticketCloser.js b/core/ticketCloser.js index 8a8baa4..3309fef 100644 --- a/core/ticketCloser.js +++ b/core/ticketCloser.js @@ -102,7 +102,7 @@ exports.closeTicket = async (interaction,prefix,mode) => { //message var closeButtonRow = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket1") .setDisabled(false) .setStyle("DANGER") @@ -110,7 +110,7 @@ exports.closeTicket = async (interaction,prefix,mode) => { .setEmoji("✖️") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("sendTranscript") .setDisabled(false) .setStyle("SECONDARY") @@ -118,7 +118,7 @@ exports.closeTicket = async (interaction,prefix,mode) => { .setEmoji("📄") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicket") .setDisabled(false) .setStyle("SUCCESS") @@ -126,7 +126,7 @@ exports.closeTicket = async (interaction,prefix,mode) => { .setEmoji("✔") ) - const embed = new discord.MessageEmbed() + const embed = new discord.EmbedBuilder() .setColor(config.main_color) .setTitle(":lock: "+l.messages.closedTitle+" :lock:") .setDescription(l.messages.closedDescription) @@ -195,7 +195,7 @@ exports.closeTicket = async (interaction,prefix,mode) => { } if (config.system.enable_transcript){ - const transcriptEmbed = new discord.MessageEmbed() + const transcriptEmbed = new discord.EmbedBuilder() .setColor(config.main_color) .setTitle(l.messages.newTranscriptTitle) .setAuthor({name:interaction.user.username,iconURL:interaction.user.displayAvatarURL({format:"png"})}) @@ -209,7 +209,7 @@ exports.closeTicket = async (interaction,prefix,mode) => { } if (config.system.enable_DM_transcript){ - const transcriptEmbed = new discord.MessageEmbed() + const transcriptEmbed = new discord.EmbedBuilder() .setColor(config.main_color) .setTitle(l.messages.newTranscriptTitle) .setDescription(l.messages.newTranscriptDescription) diff --git a/core/ticketMessageEmbed.js b/core/ticketMessageEmbed.js index ea9b3c3..1b70ac8 100644 --- a/core/ticketMessageEmbed.js +++ b/core/ticketMessageEmbed.js @@ -8,7 +8,7 @@ const l = bot.language /** * * @param {String} id the id from an open-ticket embed - * @returns {{embed:discord.MessageEmbed,componentRows:discord.MessageActionRow[]}} discord embed + * @returns {{embed:discord.EmbedBuilder,componentRows:discord.MessageActionRow[]}} discord embed */ @@ -17,7 +17,7 @@ exports.createEmbed = (id) => { //----------------------------------- //general importing const data = require("./utils/getTicketMessages").getTicketMessage(id) - /**@type {discord.MessageButton[]}*/ + /**@type {discord.ButtonBuilder[]}*/ var buttons = [] /**@type {getButton.rawButtonData[]} */ var buttonData = [] @@ -32,7 +32,7 @@ exports.createEmbed = (id) => { //----------------------------------- //create the embed - const embed = new discord.MessageEmbed() + const embed = new discord.EmbedBuilder() .setColor(data.color) .setTitle(data.name) if (data.enableFooter) embed.setFooter({text:data.footer}) @@ -86,7 +86,7 @@ exports.createEmbed = (id) => { //return everything /** - * @type {{embed:discord.MessageEmbed,componentRows:discord.MessageActionRow[]}} + * @type {{embed:discord.EmbedBuilder,componentRows:discord.MessageActionRow[]}} */ const returnedData = {embed:embed,componentRows:componentRows} return returnedData diff --git a/core/ticketOpener.js b/core/ticketOpener.js index 82ade6b..fe2d7f3 100644 --- a/core/ticketOpener.js +++ b/core/ticketOpener.js @@ -11,7 +11,7 @@ const storage = bot.storage module.exports = () => { var closeButton = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicket") .setDisabled(false) .setStyle("SECONDARY") @@ -19,7 +19,7 @@ module.exports = () => { .setEmoji("🔒") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket") .setDisabled(false) .setStyle("DANGER") @@ -152,7 +152,7 @@ module.exports = () => { }).then((ticketChannel) => { storage.set("userTicketStorage",ticketChannel.id,interaction.member.id) - var ticketEmbed = new discord.MessageEmbed() + var ticketEmbed = new discord.EmbedBuilder() .setAuthor({name:interaction.user.id}) .setColor(config.main_color) .setTitle(currentTicketOptions.name) diff --git a/core/ticketReopener.js b/core/ticketReopener.js index af7a886..c553ca4 100644 --- a/core/ticketReopener.js +++ b/core/ticketReopener.js @@ -9,7 +9,7 @@ const storage = bot.storage module.exports = () => { var closeRowNormal = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("closeTicket") .setDisabled(false) .setStyle("SECONDARY") @@ -17,7 +17,7 @@ module.exports = () => { .setEmoji("🔒") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket") .setDisabled(false) .setStyle("DANGER") @@ -27,7 +27,7 @@ module.exports = () => { var closeRowClosed = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("deleteTicket1") .setDisabled(false) .setStyle("DANGER") @@ -35,7 +35,7 @@ module.exports = () => { .setEmoji("✖️") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("sendTranscript") .setDisabled(false) .setStyle("SECONDARY") @@ -43,7 +43,7 @@ module.exports = () => { .setEmoji("📄") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicket") .setDisabled(false) .setStyle("SUCCESS") @@ -53,14 +53,14 @@ module.exports = () => { var reopenBar = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicketTrue") .setDisabled(false) .setStyle("SECONDARY") .setEmoji("✅") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicketFalse") .setDisabled(false) .setStyle("SECONDARY") @@ -69,14 +69,14 @@ module.exports = () => { var reopenBar1 = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicketTrue1") .setDisabled(false) .setStyle("SECONDARY") .setEmoji("✅") ) .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicketFalse1") .setDisabled(false) .setStyle("SECONDARY") @@ -85,7 +85,7 @@ module.exports = () => { var reopenCommandBar = new discord.MessageActionRow() .addComponents( - new discord.MessageButton() + new discord.ButtonBuilder() .setCustomId("reopenTicket1") .setDisabled(false) .setStyle("SECONDARY") @@ -117,7 +117,7 @@ module.exports = () => { interaction.deferUpdate() - const embed = new discord.MessageEmbed() + const embed = new discord.EmbedBuilder() .setColor(config.main_color) .setTitle(":unlock: "+l.messages.reopenTitle+" :unlock:") .setDescription(l.messages.reopenDescription) @@ -184,7 +184,7 @@ module.exports = () => { interaction.deferUpdate() - const embed = new discord.MessageEmbed() + const embed = new discord.EmbedBuilder() .setColor(config.main_color) .setTitle(":unlock: "+l.messages.reopenTitle+" :unlock:") .setDescription(l.messages.reopenDescription) diff --git a/core/utils/getButton.js b/core/utils/getButton.js index 2223414..081021e 100644 --- a/core/utils/getButton.js +++ b/core/utils/getButton.js @@ -29,13 +29,13 @@ exports.getOption = getOption /** * * @param {String} id - * @returns {discord.MessageButton|false} + * @returns {discord.ButtonBuilder|false} */ exports.getButton = (id) => { const option = getOption(id) if (!option) return false if (option.type == "ticket"){ - var button = new discord.MessageButton() + var button = new discord.ButtonBuilder() .setCustomId("newT"+option.id) .setDisabled(false) .setStyle(getColor(option.color)) @@ -45,7 +45,7 @@ exports.getButton = (id) => { if (!option.label && !option.icon){button.setLabel("no label or emoji")} }else if (option.type == "website"){ - var button = new discord.MessageButton() + var button = new discord.ButtonBuilder() .setDisabled(false) .setStyle("LINK") .setURL(option.url) @@ -55,7 +55,7 @@ exports.getButton = (id) => { if (!option.label && !option.icon){button.setLabel("no label or emoji")} }else if (option.type == "role"){ - var button = new discord.MessageButton() + var button = new discord.ButtonBuilder() .setCustomId("newR"+option.id) .setDisabled(false) .setStyle(getColor(option.color)) diff --git a/index.js b/index.js index 24c0863..96a36f9 100644 --- a/index.js +++ b/index.js @@ -12,8 +12,18 @@ const discord = require('discord.js') const fs = require('fs') -const intents = discord.Intents -const client = new discord.Client({intents:[intents.FLAGS.GUILDS,intents.FLAGS.GUILD_MESSAGES,intents.FLAGS.GUILD_MEMBERS],partials:["CHANNEL"]}) +const {GatewayIntentBits,Partials} = discord +const client = new discord.Client({ + intents:[ + GatewayIntentBits.DirectMessages, + GatewayIntentBits.GuildInvites, + GatewayIntentBits.GuildMembers, + GatewayIntentBits.GuildMessages, + GatewayIntentBits.Guilds, + GatewayIntentBits.MessageContent + ], + partials:[Partials.Channel,Partials.Message] +}) exports.client = client client.setMaxListeners(30) diff --git a/package.json b/package.json index 45c8e37..ee2b307 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "open-ticket", - "version": "2.2.0", + "version": "2.3.0", "description": "This is an open-source discord ticket bot, you can configure it and it comes with cool features like a transcript.", "main": "index.js", "scripts": { @@ -14,7 +14,7 @@ "license": "ISC", "dependencies": { "chalk": "^5.0.1", - "discord.js": "13.8.0", + "discord.js": "^14.0.2", "express": "^4.17.1", "node": "^16.10.0", "node-localstorage": "^2.2.1"