v3.2.1 push 3
This commit is contained in:
+37
-30
@@ -114,7 +114,7 @@ exports.checker = async () => {
|
||||
})
|
||||
}
|
||||
}
|
||||
/**@param {String} value @param {"string"|"boolean"|"number"} type */
|
||||
/**@param {String} value @param {"string"|"boolean"|"number"|"array"|"object"} type */
|
||||
const checkType = (value,type,path) => {
|
||||
if (type == "boolean"){
|
||||
if (typeof value != "boolean"){
|
||||
@@ -128,6 +128,14 @@ exports.checker = async () => {
|
||||
if (typeof value != "string"){
|
||||
createError("'"+path+"' | invalid type, this must be a string!")
|
||||
}
|
||||
}else if (type == "array"){
|
||||
if (!Array.isArray(value)){
|
||||
createError("'"+path+"' | invalid type, this must be an array!")
|
||||
}
|
||||
}else if (type == "object"){
|
||||
if (typeof value != "object"){
|
||||
createError("'"+path+"' | invalid type, this must be an object!")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,6 +205,7 @@ exports.checker = async () => {
|
||||
checkButtonColor(option.color,path+"/color")
|
||||
|
||||
//adminroles
|
||||
checkType(option.adminroles,"array",path+"/adminroles")
|
||||
checkDiscordArray("roleid",option.adminroles,path+"/adminroles")
|
||||
|
||||
//channelprefix
|
||||
@@ -221,14 +230,22 @@ exports.checker = async () => {
|
||||
checkType(option.ticketmessage,"string",path+"/ticketmessage")
|
||||
|
||||
//thumbnail
|
||||
checkType(option.thumbnail.enable,"boolean",path/"/thumbnail/enable")
|
||||
checkType(option.thumbnail.url,"string",path/"/thumbnail/url")
|
||||
if (option.thumbnail){
|
||||
checkType(option.thumbnail.enable,"boolean",path+"/thumbnail/enable")
|
||||
checkType(option.thumbnail.url,"string",path+"/thumbnail/url")
|
||||
}else{
|
||||
createError("'"+path+"/thumbnail' | there is no thumbnail object!")
|
||||
}
|
||||
|
||||
//closedCategory
|
||||
checkType(option.closedCategory.enable,"boolean",path/"/closedCategory/enable")
|
||||
checkType(option.closedCategory.id,"string",path/"/closedCategory/id")
|
||||
if (option.closedCategory.enable){
|
||||
checkDiscord("roleid",option.closedCategory.id,path+"/closedCategory/id")
|
||||
if (option.closedCategory){
|
||||
checkType(option.closedCategory.enable,"boolean",path/"/closedCategory/enable")
|
||||
checkType(option.closedCategory.id,"string",path/"/closedCategory/id")
|
||||
if (option.closedCategory.enable){
|
||||
checkDiscord("roleid",option.closedCategory.id,path+"/closedCategory/id")
|
||||
}
|
||||
}else{
|
||||
createError("'"+path+"/closedCategory' | there is no closedCategory object!")
|
||||
}
|
||||
|
||||
}else if (type == "website"){
|
||||
@@ -380,6 +397,7 @@ exports.checker = async () => {
|
||||
|
||||
if (!require("./api/api.json").disable.checkerjs.token) checkToken(config.auth_token)
|
||||
|
||||
checkType(config.main_adminroles,"array","/main_adminroles")
|
||||
checkDiscordArray("roleid",config.main_adminroles,"main_adminroles")
|
||||
checkString(config.prefix,1,15,"prefix","prefix")
|
||||
//languagefile
|
||||
@@ -404,19 +422,31 @@ exports.checker = async () => {
|
||||
|
||||
|
||||
//system:
|
||||
//ticket channel
|
||||
if (config.system.ticket_channel){
|
||||
if (config.system.ticket_channel.length < 16 || config.system.ticket_channel.length > 20 || !/^\d+$/.test(config.system.ticket_channel)){
|
||||
createError("'system/ticket_channel' | this channel id is invalid")
|
||||
}
|
||||
}else createWarn("'"+path+"' | you have no ticket channel selected!")
|
||||
|
||||
//max tickets
|
||||
checkType(config.system.max_allowed_tickets,"number","system/max_allowed_tickets")
|
||||
|
||||
//enableDMmessages
|
||||
checkType(config.system.enable_DM_Messages,"boolean","system/enable_DM_Messages")
|
||||
|
||||
//has@everyoneaccess
|
||||
checkType(config.system["has@everyoneaccess"],"boolean","system/has@everyoneaccess")
|
||||
|
||||
//member_role
|
||||
checkType(config.system.member_role,"string","system/member_role")
|
||||
if (config.system.member_role != "" && config.system.member_role != " " && config.system.member_role != "false" && config.system.member_role != "null" && config.system.member_role != "0"){
|
||||
checkDiscord("roleid",config.system.member_role,"system/member_role")
|
||||
}else{
|
||||
createWarn("'system/member_role' | You don't have a member role, but it's recommended!")
|
||||
}
|
||||
|
||||
//closemode
|
||||
checkType(config.system.closeMode,"string","system/closeMode")
|
||||
if (!["normal","adminonly"].includes(config.system.closeMode)){
|
||||
createError("'system/closeMode' | the close mode must be adminonly or normal")
|
||||
@@ -436,29 +466,6 @@ exports.checker = async () => {
|
||||
})
|
||||
|
||||
|
||||
//discord check
|
||||
/**
|
||||
const discord = require("discord.js")
|
||||
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]
|
||||
})
|
||||
await client.guilds.fetch()
|
||||
if (!client.guilds.cache.find(g => g.id == config.server_id)){
|
||||
createError("'server_id' | i'm not in a server with this id!")
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
//the end
|
||||
if (errorList.length > 0 || warnList.length > 0){
|
||||
console.log("REPORT:\n===========================")
|
||||
|
||||
@@ -156,12 +156,13 @@ module.exports = () => {
|
||||
if (config.system.member_role != "" && config.system.member_role != " " && config.system.member_role != "false" && config.system.member_role != "null" && config.system.member_role != "0"){
|
||||
try {
|
||||
const userrole = guild.roles.cache.find(r => r.id == config.system.member_role)
|
||||
if (!userrole) return
|
||||
permissionsArray.push({
|
||||
id:userrole,
|
||||
type:"role",
|
||||
deny:[pfb.ViewChannel]
|
||||
})
|
||||
if (userrole){
|
||||
permissionsArray.push({
|
||||
id:userrole,
|
||||
type:"role",
|
||||
deny:[pfb.ViewChannel]
|
||||
})
|
||||
}
|
||||
}catch{
|
||||
log("system","invalid role! At 'config.json => system/member_role")
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ exports.compile = (guild,channel,user,messagesInv,data) => {
|
||||
author:{
|
||||
name:msg.author.tag,
|
||||
id:Number(msg.author.id),
|
||||
color:msg.author.hexAccentColor || "#ffffff",
|
||||
color:msg.member.displayHexColor || "#ffffff",
|
||||
pfp:msg.author.displayAvatarURL()
|
||||
},
|
||||
content:msg.content || "",
|
||||
|
||||
@@ -45,9 +45,13 @@ exports.tsready = (name,id,url,user) => {
|
||||
.setColor(config.main_color)
|
||||
.setAuthor({name:user.tag,iconURL:user.displayAvatarURL()})
|
||||
.setFooter({text:name})
|
||||
.setURL(url)
|
||||
|
||||
.setDescription("\n["+l.transcripts.available+"]("+url+")\n")
|
||||
if (url){
|
||||
embed.setURL(url)
|
||||
embed.setDescription("\n["+l.transcripts.available+"]("+url+")\n")
|
||||
}else{
|
||||
embed.setDescription("\n"+l.transcripts.available+"\n")
|
||||
}
|
||||
|
||||
return embed
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ const tsdb = require("./tsdb")
|
||||
|
||||
|
||||
const checkAvailability = async () => {
|
||||
if (process.argv.some((v) => v == "--tsoffline")) return true
|
||||
const axios = require("axios").default
|
||||
const res = await axios.get("https://transcripts.dj-dj.be/status.txt")
|
||||
if (!res || !(res.status == 200) || !res.data) return false
|
||||
@@ -48,90 +49,102 @@ module.exports = async (messages,guild,channel,user,reason) => {
|
||||
|
||||
const ticketopener = client.users.cache.find(u => u.id == id)
|
||||
|
||||
|
||||
const JSONDATA = require("./communication/compileJson").compile(guild,channel,user,messages,{
|
||||
style:{
|
||||
titleColor:tsconfig.style.titleColor,
|
||||
enableCustomBackground:tsconfig.style.background.enableCustomBackground,
|
||||
backgroundModus:tsconfig.style.background.backgroundModus,
|
||||
backgroundData:tsconfig.style.background.backgroundData
|
||||
},
|
||||
bot:{
|
||||
name:client.user.username,
|
||||
id:client.user.id,
|
||||
pfp:client.user.displayAvatarURL()
|
||||
},
|
||||
ticket:{
|
||||
creatorid:ticketopener.id,
|
||||
creatorname:ticketopener.tag,
|
||||
openedtime:opentime.getTime(),
|
||||
closedtime:new Date().getTime()
|
||||
}
|
||||
})
|
||||
|
||||
if (!await checkAvailability()){
|
||||
const attachment = await require("./oldTranscript").createTranscript(messages,channel)
|
||||
const errembed = tsembeds.tserror(chName,chId,user)
|
||||
|
||||
if (tsconfig.sendTranscripts.enableChannel){
|
||||
/**@type {discord.TextChannel|undefined} */
|
||||
const tc = guild.channels.cache.find((c) => c.id == tsconfig.sendTranscripts.channel)
|
||||
|
||||
if (!tc) return
|
||||
tc.send({embeds:[errembed],files:[attachment]})
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const TSdata = await require("./communication/index").upload(JSONDATA)
|
||||
if (!TSdata) return false
|
||||
|
||||
if (TSdata.status == "success"){
|
||||
const url = "https://transcripts.dj-dj.be/t/"+TSdata.time+"_"+TSdata.id+".html"
|
||||
|
||||
//calculate estimated time
|
||||
const lastDumpTime = (new Date(TSdata.estimated.lastdump).getTime())
|
||||
const dumpLoopTime = 15000
|
||||
const nextDump = new Date(lastDumpTime+dumpLoopTime)
|
||||
const processtime = TSdata.estimated.processtime+6000 //6sec extra time for overflow
|
||||
|
||||
const finaltime = new Date(nextDump.getTime()+processtime)
|
||||
const duration = finaltime.getTime()-new Date().getTime()
|
||||
|
||||
//waiting
|
||||
if (tsconfig.sendTranscripts.enableChannel){
|
||||
/**@type {discord.TextChannel|undefined} */
|
||||
const tc = guild.channels.cache.find((c) => c.id == tsconfig.sendTranscripts.channel)
|
||||
|
||||
if (!tc) return
|
||||
const embed = tsembeds.beingprocessed(chName,chId,finaltime,user)
|
||||
var msg = await tc.send({embeds:[embed]})
|
||||
}else {var msg = false}
|
||||
|
||||
//ready
|
||||
setTimeout(() => {
|
||||
if (msg){
|
||||
msg.edit({embeds:[tsembeds.tsready(chName,chId,url,user)]})
|
||||
if (tsconfig.sendTranscripts.useHTMLtranscripts){
|
||||
const JSONDATA = require("./communication/compileJson").compile(guild,channel,user,messages,{
|
||||
style:{
|
||||
titleColor:tsconfig.style.titleColor,
|
||||
enableCustomBackground:tsconfig.style.background.enableCustomBackground,
|
||||
backgroundModus:tsconfig.style.background.backgroundModus,
|
||||
backgroundData:tsconfig.style.background.backgroundData
|
||||
},
|
||||
bot:{
|
||||
name:client.user.username,
|
||||
id:client.user.id,
|
||||
pfp:client.user.displayAvatarURL()
|
||||
},
|
||||
ticket:{
|
||||
creatorid:ticketopener.id,
|
||||
creatorname:ticketopener.tag,
|
||||
openedtime:opentime.getTime(),
|
||||
closedtime:new Date().getTime()
|
||||
}
|
||||
})
|
||||
|
||||
if (tsconfig.sendTranscripts.enableDM){
|
||||
if (!user) return
|
||||
const embed = tsembeds.tsready(chName,chId,url,user)
|
||||
try {
|
||||
user.send({embeds:[embed]})
|
||||
}catch{}
|
||||
if (!await checkAvailability()){
|
||||
const attachment = await require("./oldTranscript").createTranscript(messages,channel)
|
||||
const errembed = tsembeds.tserror(chName,chId,user)
|
||||
|
||||
if (tsconfig.sendTranscripts.enableChannel){
|
||||
/**@type {discord.TextChannel|undefined} */
|
||||
const tc = guild.channels.cache.find((c) => c.id == tsconfig.sendTranscripts.channel)
|
||||
|
||||
if (!tc) return
|
||||
tc.send({embeds:[errembed],files:[attachment]})
|
||||
}
|
||||
},duration)
|
||||
return
|
||||
}
|
||||
|
||||
const TSdata = await require("./communication/index").upload(JSONDATA)
|
||||
if (!TSdata) return false
|
||||
|
||||
if (TSdata.status == "success"){
|
||||
const url = "https://transcripts.dj-dj.be/t/"+TSdata.time+"_"+TSdata.id+".html"
|
||||
|
||||
//calculate estimated time
|
||||
const lastDumpTime = (new Date(TSdata.estimated.lastdump).getTime())
|
||||
const dumpLoopTime = 15000
|
||||
const nextDump = new Date(lastDumpTime+dumpLoopTime)
|
||||
const processtime = TSdata.estimated.processtime+6000 //6sec extra time for overflow
|
||||
|
||||
const finaltime = new Date(nextDump.getTime()+processtime)
|
||||
const duration = finaltime.getTime()-new Date().getTime()
|
||||
|
||||
//waiting
|
||||
if (tsconfig.sendTranscripts.enableChannel){
|
||||
/**@type {discord.TextChannel|undefined} */
|
||||
const tc = guild.channels.cache.find((c) => c.id == tsconfig.sendTranscripts.channel)
|
||||
|
||||
if (!tc) return
|
||||
const embed = tsembeds.beingprocessed(chName,chId,finaltime,user)
|
||||
var msg = await tc.send({embeds:[embed]})
|
||||
}else {var msg = false}
|
||||
|
||||
//ready
|
||||
setTimeout(() => {
|
||||
if (msg){
|
||||
msg.edit({embeds:[tsembeds.tsready(chName,chId,url,user)]})
|
||||
}
|
||||
|
||||
if (tsconfig.sendTranscripts.enableDM){
|
||||
if (!user) return
|
||||
const embed = tsembeds.tsready(chName,chId,url,user)
|
||||
try {
|
||||
user.send({embeds:[embed]})
|
||||
}catch{}
|
||||
}
|
||||
},duration)
|
||||
}else{
|
||||
const attachment = await require("./oldTranscript").createTranscript(messages,channel)
|
||||
const errembed = tsembeds.tserror(chName,chId,user,"`error type: transcript API error`")
|
||||
|
||||
if (tsconfig.sendTranscripts.enableChannel){
|
||||
/**@type {discord.TextChannel|undefined} */
|
||||
const tc = guild.channels.cache.find((c) => c.id == tsconfig.sendTranscripts.channel)
|
||||
|
||||
if (!tc) return
|
||||
tc.send({embeds:[errembed],files:[attachment]})
|
||||
}
|
||||
}
|
||||
}else{
|
||||
const attachment = await require("./oldTranscript").createTranscript(messages,channel)
|
||||
const errembed = tsembeds.tserror(chName,chId,user,"`error type: transcript API error`")
|
||||
const embed = tsembeds.tsready(chName,chId,false,user)
|
||||
|
||||
if (tsconfig.sendTranscripts.enableChannel){
|
||||
/**@type {discord.TextChannel|undefined} */
|
||||
const tc = guild.channels.cache.find((c) => c.id == tsconfig.sendTranscripts.channel)
|
||||
|
||||
if (!tc) return
|
||||
tc.send({embeds:[errembed],files:[attachment]})
|
||||
tc.send({embeds:[embed],files:[attachment]})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,15 +7,19 @@ const l = bot.language
|
||||
/**
|
||||
*
|
||||
* @param {discord.Message[]} messagecollection
|
||||
* @param {discord.TextChannel} channel
|
||||
* @param {Boolean} backup
|
||||
* @returns new `discord.attachmentBuilder`
|
||||
*/
|
||||
|
||||
exports.createTranscript = async (messagecollection) => {
|
||||
exports.createTranscript = async (messagecollection,channel,backup) => {
|
||||
try {
|
||||
const cd = new Date()
|
||||
const months = ["January","February","March","April","May","June","July","August","September","October","November","December"]
|
||||
const dateString = cd.getDate()+" "+months[cd.getMonth()-1]+" "+cd.getFullYear()+" - "+cd.getHours()+":"+cd.getMinutes()+":"+cd.getSeconds()
|
||||
const filearray = ["BACKUP TRANSCRIPT:\n"]
|
||||
let backuptitle = backup ? "BACKUP " : ""
|
||||
let backupfilename = backup ? "backup" : ""
|
||||
const filearray = [backuptitle+"TRANSCRIPT:\n"]
|
||||
|
||||
messagecollection.reverse()
|
||||
|
||||
@@ -23,15 +27,20 @@ exports.createTranscript = async (messagecollection) => {
|
||||
const timestamp = new Date(msg.createdTimestamp)
|
||||
|
||||
if (msg.content){var content = msg.content}else{var content = "*empty message*"}
|
||||
|
||||
const fileurls = []
|
||||
const rawfiles = Array.from(msg.attachments)
|
||||
rawfiles.forEach((file) => {
|
||||
fileurls.push("attachment: "+file[1].url)
|
||||
})
|
||||
const filestring = fileurls.length > 0 ? fileurls.join("\n")+"\n" : ""
|
||||
const msgstats = "files: "+msg.attachments.size+", embeds: "+msg.embeds.length
|
||||
filearray.push("["+timestamp.getDate()+"/"+timestamp.getMonth()+"/"+timestamp.getFullYear()+", "+timestamp.getHours()+":"+timestamp.getMinutes()+":"+timestamp.getSeconds()+"|"+msg.author.tag+"] ["+msgstats+"]\n"+content+"\n")
|
||||
filearray.push("["+timestamp.getDate()+"/"+timestamp.getMonth()+"/"+timestamp.getFullYear()+", "+timestamp.getHours()+":"+timestamp.getMinutes()+":"+timestamp.getSeconds()+"|"+msg.author.tag+"] ["+msgstats+"]\n"+content+"\n"+filestring)
|
||||
})
|
||||
|
||||
if (filearray.length < 2) filearray.push("transcript is empty")
|
||||
const filestring = filearray.join("\n")
|
||||
const filebuff = Buffer.from(filestring,"utf-8")
|
||||
return new discord.AttachmentBuilder(filebuff,{name:"backuptranscript.txt",description:"Open Ticket transcript"})
|
||||
return new discord.AttachmentBuilder(filebuff,{name:backupfilename+"transcript.txt",description:"Open Ticket transcript"})
|
||||
}catch{
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ exports.createEmbed = (id) => {
|
||||
embed.setColor(config.main_color)
|
||||
}
|
||||
|
||||
if (data.other.embedTitleURL.enable) embed.setURL(data.other.embedTitleURL)
|
||||
if (data.other.embedTitleURL.enable) embed.setURL(data.other.embedTitleURL.url)
|
||||
|
||||
var description = data.description
|
||||
if (data.other.enableTicketExplaination){
|
||||
|
||||
Reference in New Issue
Block a user