Compare commits
29 changed files with 1363 additions and 2701 deletions
4
.github/workflows/CI.yml
vendored
4
.github/workflows/CI.yml
vendored
|
|
@ -16,6 +16,6 @@ jobs:
|
|||
with:
|
||||
node-version: 'latest'
|
||||
- name: install dependencies
|
||||
run: npm ci
|
||||
run: npm install
|
||||
- name: run tests
|
||||
run: npm test
|
||||
run: npm test
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
const savePresence = require("../../util/savePresence");
|
||||
const setPresence = require("../../util/setPresence");
|
||||
|
||||
module.exports = {
|
||||
|
|
@ -11,20 +10,12 @@ module.exports = {
|
|||
,"Updates once a minute if custom variables are used."
|
||||
,""
|
||||
,"Custom Variables:"
|
||||
,"${guilds},${prefix},${uptime},{members}"],
|
||||
,"${guilds},${prefix},${uptime}"],
|
||||
admin: true,
|
||||
execute({message, client, args, prefix}) {
|
||||
let forceUpdate = false;
|
||||
if(args.length > 1 && args[0] === "force") {
|
||||
forceUpdate = true;
|
||||
args.shift();
|
||||
}
|
||||
if(args.length < 1){
|
||||
message.channel.send(`You need at least two arguments for this command, see \`${prefix}help setpresence\``)
|
||||
return;
|
||||
}
|
||||
execute({message, client, args, globalPrefix}) {
|
||||
const savePresence = require("../../util/savePresence");
|
||||
let presenceType = args[0].toLocaleUpperCase();
|
||||
let sendText = "Presence has been set.";
|
||||
let sendText = "Updated presence";
|
||||
|
||||
switch (presenceType) {
|
||||
case "PLAY":
|
||||
|
|
@ -55,11 +46,8 @@ module.exports = {
|
|||
const firstArg = args[0].length + 1;
|
||||
let temp = args.join(" ");
|
||||
let presenceText = temp.slice(firstArg, temp.length)
|
||||
setPresence({presenceText: presenceText,presenceType: presenceType, client: client, globalPrefix: globalPrefix});
|
||||
savePresence(presenceType, presenceText, client);
|
||||
if(forceUpdate)
|
||||
setPresence({presenceText, presenceType, client})
|
||||
else
|
||||
sendText = `${sendText} It will update <t:${Math.floor((client.lastPresenceUpdate + 60000) / 1000)}:R>`
|
||||
}
|
||||
message.channel.send(sendText);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
const calculateReloaded = require("../../util/calculateReloaded");
|
||||
const executeCommand = require("../../util/executeCommand");
|
||||
const reloadCommands = require("../../util/reloadCommands");
|
||||
|
||||
module.exports = {
|
||||
|
|
@ -28,12 +27,10 @@ module.exports = {
|
|||
let commitCount = stdout.split(/\r\n|\r|\n/).length - 1
|
||||
sendText = `${sendText}\n\nLatest commits (${commitCount}):\n${stdout}`
|
||||
if(sendText.length >= 2000){
|
||||
sendText = sendText.slice(1955)
|
||||
sendText.slice(1955)
|
||||
sendText = `${sendText}\n... Message is too long to show everything`
|
||||
}
|
||||
message.channel.send(sendText)
|
||||
const githash = executeCommand(`git`, ["rev-parse", "--short", "HEAD"]);
|
||||
client.githash = githash.error ? "N/A" : githash.output;
|
||||
if (err) console.log(stderr)
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@ module.exports = {
|
|||
let descriptionArr = [`Name: ${client.user.username}`,
|
||||
`Prefix: ${prefix}`,
|
||||
`Total Servers: ${guildInfo.guildCount}`,
|
||||
`Total Members: ${guildInfo.totalMembers} (${guildInfo.uniqueMemberCount} unique)`,
|
||||
`Total Members: ${guildInfo.totalMembers}`,
|
||||
`Total Commands: ${client.commands.size}`,
|
||||
`Creation Date: ${getCreationDate(client)}`,
|
||||
`Source: [Click Here](https://github.com/SileNce5k/discord_bot)`,
|
||||
`Current Version: ${client.githash}`
|
||||
`Source [Click Here](https://github.com/SileNce5k/discord_bot)`
|
||||
]
|
||||
|
||||
let description = "";
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ module.exports = {
|
|||
description: 'Returns guild names',
|
||||
admin: true,
|
||||
execute({message, client}) {
|
||||
let guildNames = client.guilds.cache
|
||||
.sort((a, b) => b.memberCount - a.memberCount)
|
||||
.map(guild => `${guild.name} (${guild.memberCount} members)`)
|
||||
.join("\n");
|
||||
let guildNames = "";
|
||||
client.guilds.cache.each(guild => {
|
||||
guildNames = `${guildNames}${guild.name} (${guild.memberCount} members)\n`
|
||||
});
|
||||
message.channel.send(guildNames)
|
||||
}
|
||||
};
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
// Code is taken from https://github.com/stphnduvall/mcstatus/blob/master/src/index.ts
|
||||
// and converted to pure js.
|
||||
|
||||
const net = require('net')
|
||||
const { EmbedBuilder } = require('discord.js');
|
||||
|
||||
module.exports = {
|
||||
name: 'mc',
|
||||
description: 'get minecraft server information',
|
||||
hidden: true,
|
||||
needsWhitelist: true,
|
||||
async execute({ message, args }) {
|
||||
let host = "";
|
||||
let port = 25565;
|
||||
if (args[0]) host = args[0];
|
||||
|
||||
if (host.includes(":")) {
|
||||
port = host.replace(/.+(?:\:)/g, "");
|
||||
host = host.match(/.+(?:\:)/g, "")[0].replace(":", "");
|
||||
}
|
||||
if(host === "") return message.channel.send("No host provided")
|
||||
let info = await getMinecraftServerInfo(host, port);
|
||||
if (info) {
|
||||
const embed = new EmbedBuilder()
|
||||
embed.setColor("#ee7939")
|
||||
embed.setTimestamp()
|
||||
embed.addFields(
|
||||
{ name: "ping", value: info.ping.toString(), inline: false },
|
||||
{ name: "Player Count", value: info.playercount.toString(), inline: false },
|
||||
{ name: "Max Players", value: info.maxPlayers.toString(), inline: false },
|
||||
{ name: "MOTD", value: info.motd, inline: false },
|
||||
)
|
||||
|
||||
message.channel.send({ embeds: [embed] });
|
||||
} else {
|
||||
message.channel.send("Something went wrong\nThe minecraft server is likely not reachable from the discord bot")
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
async function getMinecraftServerInfo(host, port = 25565) {
|
||||
let serverInfo = {
|
||||
ping: undefined,
|
||||
maxPlayers: undefined,
|
||||
version: undefined,
|
||||
playercount: undefined,
|
||||
motd: undefined
|
||||
}
|
||||
|
||||
let startTime = new Date();
|
||||
let data;
|
||||
let ping;
|
||||
serverInfo = await new Promise((resolve) => {
|
||||
const client = net.connect({ host, port }, () => {
|
||||
ping = Math.round(new Date().getMilliseconds() - startTime.getMilliseconds());
|
||||
|
||||
let buff = Buffer.from([0xFE, 0x01]);
|
||||
client.write(buff);
|
||||
|
||||
})
|
||||
let error = false;
|
||||
client.on('data', (d) => {
|
||||
data = d.toString()
|
||||
client.destroy();
|
||||
|
||||
})
|
||||
client.once('error', (error) => {
|
||||
console.error(error)
|
||||
error = true;
|
||||
})
|
||||
client.once('connectionAttemptFailed', (ip) => {
|
||||
console.error("in attempt failed")
|
||||
error = true;
|
||||
})
|
||||
|
||||
client.once('connectionAttemptTimeout', (ip) => {
|
||||
console.error("in attempt timeout")
|
||||
error = true;
|
||||
})
|
||||
client.on('close', () => {
|
||||
if (!error) {
|
||||
let _serverInfo = data?.split('\x00\x00\x00');
|
||||
|
||||
if (!_serverInfo) {
|
||||
console.log("Something went wrong.")
|
||||
resolve(serverInfo)
|
||||
}
|
||||
serverInfo.version = _serverInfo[2].replace(/\u0000/g, '')
|
||||
serverInfo.motd = _serverInfo[3].replace(/\u0000/g, '')
|
||||
serverInfo.playercount = Number(_serverInfo[4].replace(/\u0000/g, ''))
|
||||
serverInfo.maxPlayers = Number(_serverInfo[5].replace(/\u0000/g, ''))
|
||||
serverInfo.ping = Number(ping)
|
||||
resolve(serverInfo)
|
||||
} else {
|
||||
resolve(0)
|
||||
}
|
||||
})
|
||||
})
|
||||
return serverInfo
|
||||
}
|
||||
|
|
@ -16,9 +16,9 @@ module.exports = {
|
|||
let user = message.guild.members.cache.get(info);
|
||||
let guildPfp = user.avatarURL({format: 'png', dynamic: true, size: 4096});
|
||||
let globalPfp = user.user.avatarURL({format: 'png', dynamic: true, size: 4096});
|
||||
let sendText = `${globalPfp}`;
|
||||
let sendText = `Global pfp:\n${globalPfp}`;
|
||||
if(guildPfp != null){
|
||||
sendText = `Global pfp${sendText}\nGuild pfp:\n${guildPfp}`;
|
||||
sendText = `${sendText}\nGuild pfp:\n${guildPfp}`;
|
||||
}
|
||||
|
||||
message.channel.send(sendText)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ module.exports = {
|
|||
{name: "Server Name", value: message.guild.name, inline: false},
|
||||
{name: "Created", value: convertDateToISOString(message.guild.createdAt), inline: false},
|
||||
{name: "Members", value: message.guild.memberCount.toString(), inline: false},
|
||||
{name: "Channels", value: message.guild.channels.channelCountWithoutThreads.toString(), inline: false},
|
||||
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
const path = require('path');
|
||||
const fs = require('fs')
|
||||
|
||||
const executeCommand = require('../../util/executeCommand');
|
||||
module.exports = {
|
||||
name: 'dl',
|
||||
description: 'Download a video',
|
||||
moreHelp: [
|
||||
"Usage: <prefix>dl <url>"
|
||||
],
|
||||
async execute({message, args}) {
|
||||
const downloadsDir = path.resolve(process.cwd(), 'data', 'downloads', Date.now().toString());
|
||||
const cookieFilepath = path.resolve(process.cwd(), 'data', 'cookies.txt')
|
||||
if(!fs.existsSync(cookieFilepath)) {
|
||||
message.channel.send("Some dependencies are needed for the command to work properly. Please let the bot's owner know.")
|
||||
return;
|
||||
}
|
||||
fs.mkdirSync(downloadsDir, {recursive: true});
|
||||
|
||||
let url;
|
||||
|
||||
if(args.length > 0){
|
||||
if(args[0].charAt(0) === '<' && args[0].charAt(args[0].length - 1) === '>'){
|
||||
args[0] = args[0].slice(1, args[0].length - 1)
|
||||
}
|
||||
try {
|
||||
url = new URL(args[0]);
|
||||
url = url.href;
|
||||
} catch (error) {
|
||||
this.cleanUp(downloadsDir);
|
||||
message.channel.send("Could not parse the provided argument as a URL.");
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
this.cleanUp(downloadsDir);
|
||||
return message.channel.send("You have to provide a URL in an argument.")
|
||||
}
|
||||
|
||||
const originalMessage = await message.channel.send("Downloading video...")
|
||||
|
||||
if(executeCommand("yt-dlp", [url, "-P", downloadsDir, "--cookies", cookieFilepath]).error){
|
||||
originalMessage.edit("An error occurred when downloading the video.");
|
||||
this.cleanUp(downloadsDir);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
let files = fs.readdirSync(downloadsDir);
|
||||
if(files.length < 1) {
|
||||
this.cleanUp(downloadsDir);
|
||||
originalMessage.edit("Something went wrong when downloading the video.")
|
||||
return;
|
||||
}
|
||||
const filename = files[0];
|
||||
|
||||
await originalMessage.edit({
|
||||
content: null,
|
||||
files: [{
|
||||
attachment: path.resolve(downloadsDir, filename)
|
||||
}]})
|
||||
|
||||
this.cleanUp(downloadsDir);
|
||||
|
||||
|
||||
},
|
||||
|
||||
cleanUp(downloadsDir){
|
||||
fs.rmSync(downloadsDir, {force: true, recursive: true});
|
||||
},
|
||||
|
||||
}
|
||||
|
|
@ -87,13 +87,11 @@ module.exports = {
|
|||
if(sendText.embed != null){
|
||||
let parse = parseMention(message.author.id, message.guild)
|
||||
let user = message.guild.members.cache.get(parse);
|
||||
if(!sendText.embed.data.color){
|
||||
let roleColor = 15788778;
|
||||
if (user.roles.color) {
|
||||
roleColor = user.roles.color.color;
|
||||
}
|
||||
sendText.embed.setColor(roleColor);
|
||||
let roleColor = 15788778;
|
||||
if (user.roles.color) {
|
||||
roleColor = user.roles.color.color;
|
||||
}
|
||||
sendText.embed.setColor(roleColor);
|
||||
message.channel.send({embeds :[sendText.embed]})
|
||||
}else{
|
||||
message.channel.send(sendText.text.replaceAll("<prefix>", prefix));
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
|
||||
module.exports = {
|
||||
name: 'ig',
|
||||
description: 'Replaces Instagram links with kkinstagram and deletes the original message',
|
||||
execute({message, args}) {
|
||||
const noUrlErr = "You need to provide an Instagram link to use this command."
|
||||
if(args.length < 1) {
|
||||
message.channel.send(noUrlErr);
|
||||
return;
|
||||
}
|
||||
let replacedLink = "";
|
||||
const regex = /(?<=\/)(instagram)\.com/g
|
||||
if(args[0].startsWith("https://") || args[0].startsWith("http://")){
|
||||
replacedLink = args[0].replace(regex, "kkinstagram.com");
|
||||
}
|
||||
if(replacedLink.length === 0 || args[0] === replacedLink){
|
||||
message.channel.send(noUrlErr);
|
||||
return;
|
||||
}
|
||||
message.channel.send(replacedLink);
|
||||
try{
|
||||
message.delete()
|
||||
}catch(err){
|
||||
console.error(`${this.name}: An error occurred while trying to delete the original message.`)
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
module.exports = {
|
||||
name: 'say',
|
||||
description: 'Repeats arguments',
|
||||
admin: true,
|
||||
execute({message, args}) {
|
||||
|
||||
if(args.length == 0)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ const fs = require('fs');
|
|||
const path = require('path');
|
||||
const { writeFile } = require('node:fs/promises')
|
||||
const { Readable } = require('node:stream')
|
||||
const executeCommand = require('../../util/executeCommand');
|
||||
|
||||
|
||||
module.exports = {
|
||||
name: 'tdoss',
|
||||
|
|
@ -60,8 +60,8 @@ module.exports = {
|
|||
}
|
||||
|
||||
|
||||
const commandArgs = [tdossTemplate, "(", `${directory}/input.png`, "-resize", "800x800^", "-gravity", "center", "-extent", "1000x1000", ")", "-compose", "dst-over", "-composite", `${directory}/tdoss_result.png`]
|
||||
if (executeCommand("magick", commandArgs).error === true) {
|
||||
const command = `magick ${tdossTemplate} \\( ${directory}/input.png -resize 800x800^ -gravity center -extent 1000x1000 \\) -compose dst-over -composite ${directory}/tdoss_result.png`;
|
||||
if (this.executeCommand(command).error === true) {
|
||||
message.channel.send("Something went wrong during image manipulation.\nTry again and if it keeps happening, contact the owner of the bot.")
|
||||
fs.rmSync(`${directory}`, {recursive: true})
|
||||
return
|
||||
|
|
@ -75,6 +75,20 @@ module.exports = {
|
|||
await message.channel.send({files: [final_image]})
|
||||
fs.rmSync(`${directory}`, {recursive: true})
|
||||
},
|
||||
|
||||
|
||||
executeCommand(command) {
|
||||
console.log("Executing:", command)
|
||||
try {
|
||||
const output = execSync(command, { encoding: 'utf-8' })
|
||||
if (output.length != 0)
|
||||
console.log(output)
|
||||
} catch (error) {
|
||||
console.error(`Error executing ${command.split(" ")[0]} command:`, error);
|
||||
return { error: true };
|
||||
}
|
||||
return { error: false };
|
||||
},
|
||||
// https://stackoverflow.com/a/77210219
|
||||
async downloadImage(url, path) {
|
||||
let res;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ module.exports = {
|
|||
sendText = "Please specify a time, and a message to send after the timer has finished";
|
||||
break;
|
||||
}
|
||||
if(!isNaN(parseTime(args[0], Math.floor(new Date() / 1000))) || !isNaN(Date.parse(args[0])))
|
||||
if(!isNaN(parseTime(args[0], Math.floor(new Date() / 1000))) || !isNaN(args[0]))
|
||||
sendText = await createTimer(message, args);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
|
||||
module.exports = {
|
||||
name: 'x',
|
||||
description: 'Replaces X/Twitter links with fxtwitter and deletes the original message',
|
||||
execute({message, args}) {
|
||||
const noUrlErr = "You need to provide an X or twitter link to use this command."
|
||||
if(args.length < 1) {
|
||||
message.channel.send(noUrlErr);
|
||||
return;
|
||||
}
|
||||
let replacedLink = "";
|
||||
const regex = /(?<=\/)(x|twitter)\.com/g
|
||||
if(args[0].startsWith("https://") || args[0].startsWith("http://")){
|
||||
replacedLink = args[0].replace(regex, "fxtwitter.com");
|
||||
}
|
||||
if(replacedLink.length === 0 || args[0] === replacedLink){
|
||||
message.channel.send(noUrlErr);
|
||||
return;
|
||||
}
|
||||
message.channel.send(replacedLink);
|
||||
try{
|
||||
message.delete()
|
||||
}catch(err){
|
||||
console.error(`${this.name}: An error occurred while trying to delete the original message.`)
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
};
|
||||
3354
package-lock.json
generated
3354
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -5,8 +5,8 @@
|
|||
"main": "server.js",
|
||||
"dependencies": {
|
||||
"@zuzak/owo": "^1.14.1",
|
||||
"discord.js": "^14.21.0",
|
||||
"dotenv": "^17.2.1",
|
||||
"discord.js": "^14.19.3",
|
||||
"dotenv": "^16.5.0",
|
||||
"seedrandom": "^3.0.5",
|
||||
"sqlite3": "^5.1.6"
|
||||
},
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
"author": "SileNce5k",
|
||||
"license": "UNLICENSE",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^30.0.0",
|
||||
"jest": "^30.0.5"
|
||||
"@types/jest": "^29.5.14",
|
||||
"jest": "^29.7.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
const fs = require('fs');
|
||||
const createInitialConfig = require("./util/createInitialConfig")
|
||||
const convertJSONToSQL = require('./util/timer/convertJSONToSQL');
|
||||
const executeCommand = require('./util/executeCommand.js');
|
||||
const sqlite3 = require('sqlite3').verbose();
|
||||
if(!fs.existsSync("./data/config.json")) {
|
||||
createInitialConfig();
|
||||
|
|
@ -55,10 +54,6 @@ createAndLoadWhitelistTable(client.whitelist);
|
|||
|
||||
client.settings.set("presenceType", presenceType);
|
||||
client.settings.set("presenceText", presenceText);
|
||||
client.settings.set("globalPrefix", globalPrefix);
|
||||
|
||||
const githash = executeCommand(`git`, ["rev-parse", "--short", "HEAD"]);
|
||||
client.githash = githash.error ? "N/A" : githash.output;
|
||||
|
||||
const reloadCommands = require("./util/reloadCommands.js");
|
||||
const onMessage = require('./server/message');
|
||||
|
|
@ -79,7 +74,7 @@ client.once('disconnect', () => {
|
|||
});
|
||||
|
||||
client.on('messageCreate', async message => {
|
||||
onMessage(client, owners, message);
|
||||
onMessage(client, owners, message, globalPrefix);
|
||||
});
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const isWhitelisted = require('../util/isWhitelisted')
|
||||
module.exports = function(client, owners, message){
|
||||
let prefix = client.settings.get("globalPrefix");
|
||||
module.exports = function(client, owners, message, globalPrefix){
|
||||
let prefix = globalPrefix;
|
||||
let serverPrefix = client.serverPrefixes.get(message.guild.id);
|
||||
if (serverPrefix) {
|
||||
prefix = serverPrefix;
|
||||
|
|
@ -28,7 +28,7 @@ module.exports = function(client, owners, message){
|
|||
if (command.admin && owners.indexOf(message.author.id.toString()) == -1) return;
|
||||
try {
|
||||
console.log(`${message.author.username}(id: ${message.author.id}) executed ${command.name} with '${args}' as arguments`)
|
||||
command.execute({ message: message, args: args, client: client, prefix: prefix, owners: owners})
|
||||
command.execute({ message: message, args: args, client: client, prefix: prefix, owners: owners, globalPrefix: globalPrefix})
|
||||
} catch (error) {
|
||||
let divider = "------------------------"
|
||||
console.log(divider)
|
||||
|
|
|
|||
|
|
@ -3,15 +3,7 @@ const checkTimer = require('../util/timer/checkTimer');
|
|||
const updatePresence = require('../util/updatePresence');
|
||||
|
||||
module.exports = function(client, enableLoginMessage, loginChannel, loginMessage) {
|
||||
|
||||
updatePresence(client)
|
||||
client.lastPresenceUpdate = Date.now()
|
||||
|
||||
setInterval(() => {
|
||||
updatePresence(client)
|
||||
client.lastPresenceUpdate = Date.now()
|
||||
}, 60 * 1000);
|
||||
|
||||
console.log('Ready!');
|
||||
if (enableLoginMessage === true)
|
||||
try{
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue