ChomeNS/chomens-bot-js
1
0
Fork 0
mirror of https://github.com/ChomeNS/chomens-bot-mc.git synced 2024-11-14 18:54:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

among us console fix + cloop discord fix

Browse source
This commit is contained in:
ChomeNS 2022-11-20 13:00:00 +07:00
parent 7cacc880e0
commit a30eb19759
6 changed files with 111 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bot.js
View file

@ -8,9 +8,6 @@ const generateEaglerUsername = require('./util/generateEaglerUsername');
const {EventEmitter} = require('events'); const {EventEmitter} = require('events');
const {loadPlugins} = require('./util/loadPlugins'); const {loadPlugins} = require('./util/loadPlugins');
const uuid = require('uuid-by-string'); const uuid = require('uuid-by-string');
const readline = require('node:readline');
const {stdin: input, stdout: output} = require('node:process');
const rl = readline.createInterface({input, output});
const moment = require('moment-timezone'); const moment = require('moment-timezone');
const cowsay = require('cowsay2'); const cowsay = require('cowsay2');
const cows = require('cowsay2/cows'); const cows = require('cowsay2/cows');
@ -57,7 +54,7 @@ async function createBot(server, config, getBots, dcclient) {
await sleep(200); await sleep(200);
await loadPlugins(bot, dcclient, config, rl); await loadPlugins(bot, dcclient, config);
const channel = dcclient.channels.cache.get(config.discord.servers[bot.options.host]); const channel = dcclient.channels.cache.get(config.discord.servers[bot.options.host]);

4
commands/cloop.js
View file

@ -104,14 +104,14 @@ module.exports = {
} else if (args[0] === 'list') { } else if (args[0] === 'list') {
list(bot, true, channeldc); list(bot, true, channeldc);
} else if (args[0] === 'remove') { } else if (args[0] === 'remove') {
remove(args[1]); remove(args[1], bot);
const Embed = new MessageEmbed() const Embed = new MessageEmbed()
.setColor('#FFFF00') .setColor('#FFFF00')
.setTitle('Cloop') .setTitle('Cloop')
.setDescription(`Removed cloop \`${args[1]}\``); .setDescription(`Removed cloop \`${args[1]}\``);
channeldc.send({embeds: [Embed]}); channeldc.send({embeds: [Embed]});
} else if (args[0] === 'removeall') { } else if (args[0] === 'removeall') {
clear(); clear(bot);
const Embed = new MessageEmbed() const Embed = new MessageEmbed()
.setColor('#FFFF00') .setColor('#FFFF00')
.setTitle('Cloop') .setTitle('Cloop')

15
index.js
View file

@ -1,3 +1,6 @@
const readline = require('node:readline');
const {stdin: input, stdout: output} = require('node:process');
const rl = readline.createInterface({input, output});
const config = require('./config'); const config = require('./config');
const {createBot} = require('./bot'); const {createBot} = require('./bot');
const { const {
@ -8,13 +11,6 @@ const intents = new Intents(['GUILDS', 'GUILD_MESSAGES']);
const dcclient = new Client({ const dcclient = new Client({
intents, intents,
}); });
// readline > fix on console.log
// const log = console.log;
// console.log = function() {
// rl.output.write('\x1b[2K\r');
// log.apply(console, Array.prototype.slice.call(arguments));
// rl._refreshLine();
// };
const bots = []; const bots = [];
@ -24,12 +20,9 @@ dcclient.on('ready', () => {
// await is important cuz the function is async // await is important cuz the function is async
// VVVVV // VVVVV
const bot = await createBot(server, config, getBots, dcclient); const bot = await createBot(server, config, getBots, dcclient);
bot.console.setRl(rl);
bots.push(bot); bots.push(bot);
}); });
}); });
dcclient.login(config.discord.token); dcclient.login(config.discord.token);
process.on('uncaughtException', (error) => {
console.log(error);
});

43
plugins/console.js
View file

@ -3,7 +3,7 @@
const moment = require('moment-timezone'); const moment = require('moment-timezone');
const util = require('util'); const util = require('util');
function inject(bot, _dcclient, config, rl) { function inject(bot, _dcclient, config) {
if (!config.console) return; if (!config.console) return;
const chatMessage = require('prismarine-chat')(bot.version); const chatMessage = require('prismarine-chat')(bot.version);
@ -16,6 +16,8 @@ function inject(bot, _dcclient, config, rl) {
bot.console = {}; bot.console = {};
bot.console.host = 'all'; bot.console.host = 'all';
bot.console._rl = null;
bot.console.setRl = setRl;
bot.console.log = function(message) { bot.console.log = function(message) {
log(prefix('&6LOG', message)); log(prefix('&6LOG', message));
}; };
@ -26,32 +28,36 @@ function inject(bot, _dcclient, config, rl) {
log(prefix('&cERROR', typeof error === 'string' ? error : error.stack)); log(prefix('&cERROR', typeof error === 'string' ? error : error.stack));
}; };
bot.consoleQueue = []; // bot.consoleQueue = [];
const consoleQueueInterval = setInterval(function() { // const consoleQueueInterval = setInterval(function() {
if (!bot.messageLogging) return; // if (!bot.messageLogging) return;
if (bot.consoleQueue.length > 50) bot.consoleQueue = []; // if (bot.consoleQueue.length > 50) bot.consoleQueue = [];
if (bot.consoleQueue[0] || bot.consoleQueue[0] === '') { // if (bot.consoleQueue[0] || bot.consoleQueue[0] === '') {
bot.console.log(bot.consoleQueue[0].substring(0, 10000)); // bot.console.log(bot.consoleQueue[0].substring(0, 10000));
bot.consoleQueue.shift(); // bot.consoleQueue.shift();
} // }
}, 100); // }, 100);
bot.on('parsed_chat', (message) => { bot.on('parsed_chat', (message) => {
bot.consoleQueue.push(message.toAnsi()); if (!bot.messageLogging) return;
bot.console.log(message.toAnsi());
}); });
bot.once('end', () => { // bot.once('end', () => {
clearInterval(consoleQueueInterval); // clearInterval(consoleQueueInterval);
rl.removeAllListeners(); // rl.removeAllListeners();
}); // });
// readline > fix on log // readline > fix on log
function log(...args) { function log(...args) {
rl.output.write('\x1b[2K\r'); bot.console._rl.output.write('\x1b[2K\r');
console.log(args.toString()); console.log(args.toString());
rl._refreshLine(); bot.console._rl._refreshLine();
}; };
function setRl(rl) {
bot.console._rl = rl;
rl.on('line', function(line) { rl.on('line', function(line) {
try { try {
if (line.toLowerCase() === '' || if (line.toLowerCase() === '' ||
@ -59,7 +65,7 @@ function inject(bot, _dcclient, config, rl) {
if (line.startsWith('.csvr ')) { if (line.startsWith('.csvr ')) {
const host = line.substring(6); const host = line.substring(6);
bot.getBots().forEach((bot) => bot.console.host = host); bot.getBots().forEach((eachBot) => eachBot.console.host = host);
bot.console.info(`Host set to: ${host}`); bot.console.info(`Host set to: ${host}`);
return; return;
} }
@ -135,6 +141,7 @@ function inject(bot, _dcclient, config, rl) {
bot.console.error(e); bot.console.error(e);
} }
}); });
}
}; };
module.exports = {inject}; module.exports = {inject};

2
plugins/discord.js
View file

@ -1,7 +1,7 @@
/* eslint-disable require-jsdoc */ /* eslint-disable require-jsdoc */
/* eslint-disable max-len */ /* eslint-disable max-len */
const {escapeMarkdown} = require('../util/escapeMarkdown'); const {escapeMarkdown} = require('../util/escapeMarkdown');
async function inject(bot, dcclient, config, rl) { async function inject(bot, dcclient, config) {
const channel = dcclient.channels.cache.get(config.discord.servers[bot.options.host]); const channel = dcclient.channels.cache.get(config.discord.servers[bot.options.host]);
let queue = ''; let queue = '';

8
util/loadPlugins.js
View file

@ -8,19 +8,15 @@ const path = require('path');
* @param {object} bot the bot object * @param {object} bot the bot object
* @param {object} dcclient discord client * @param {object} dcclient discord client
* @param {object} config the config * @param {object} config the config
* @param {object} rl readline
* @param {object} targetClient proxy target
* @param {object} client proxy client
* @param {boolean} proxy is proxy
*/ */
async function loadPlugins(bot, dcclient, config, rl) { async function loadPlugins(bot, dcclient, config) {
const dir = path.join(__dirname, '..', 'plugins'); const dir = path.join(__dirname, '..', 'plugins');
const plugins = await fs.readdir(dir); const plugins = await fs.readdir(dir);
plugins.forEach((plugin) => { plugins.forEach((plugin) => {
if (!plugin.endsWith('.js')) return; if (!plugin.endsWith('.js')) return;
try { try {
const plug = require(path.join(dir, plugin)); const plug = require(path.join(dir, plugin));
plug.inject(bot, dcclient, config, rl); plug.inject(bot, dcclient, config);
} catch (e) { } catch (e) {
console.log(`Plugin ${plugin} is having exception loading the plugin:`); console.log(`Plugin ${plugin} is having exception loading the plugin:`);
console.log(util.inspect(e)); console.log(util.inspect(e));