From 4b9ed6d2c0b74120204d823ac4e89a1d9dbb1f7c Mon Sep 17 00:00:00 2001 From: Lucas Gabriel <90426410+lucmsilva651@users.noreply.github.com> Date: Sun, 2 Jun 2024 14:24:03 +0000 Subject: [PATCH] Added bam + some other code fixes --- src/blocklist.js | 22 ++++++++++----------- src/commands/bam.js | 8 ++++++++ src/logger.js | 48 ++++++++++++++++++++++----------------------- src/main.js | 6 ++---- 4 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 src/commands/bam.js diff --git a/src/blocklist.js b/src/blocklist.js index d9e7055..6786b1d 100644 --- a/src/blocklist.js +++ b/src/blocklist.js @@ -6,21 +6,21 @@ const blocklistPath = path.join(__dirname, '../blocklist.txt'); let blocklist = []; const readBlocklist = () => { - try { - const data = fs.readFileSync(blocklistPath, 'utf8'); - blocklist = data.split('\n').map(id => id.trim()).filter(id => id !== ''); - } catch (error) { - if (error.code === 'ENOENT') { - console.log('WARN: Blocklist file not found. Creating a new one.'); - fs.writeFileSync(blocklistPath, ''); - } else { - console.error('WARN: Error reading blocklist:', error); - } + try { + const data = fs.readFileSync(blocklistPath, 'utf8'); + blocklist = data.split('\n').map(id => id.trim()).filter(id => id !== ''); + } catch (error) { + if (error.code === 'ENOENT') { + console.log('WARN: Blocklist file not found. Creating a new one.'); + fs.writeFileSync(blocklistPath, ''); + } else { + console.error('WARN: Error reading blocklist:', error); } + } }; const isBlocked = (userId) => { - return blocklist.includes(String(userId)); + return blocklist.includes(String(userId)); }; readBlocklist(); diff --git a/src/commands/bam.js b/src/commands/bam.js new file mode 100644 index 0000000..9789e66 --- /dev/null +++ b/src/commands/bam.js @@ -0,0 +1,8 @@ +module.exports = function(bot, msg) { + const chatId = msg.chat.id; + + const message = `O usuario foi bamido com sucesso`; + + bot.sendMessage(chatId, message, { parse_mode: 'Markdown' }) + .catch(error => console.error('WARN: Message cannot be sent: ', error)); +} \ No newline at end of file diff --git a/src/logger.js b/src/logger.js index b77ea70..0fbb0ac 100644 --- a/src/logger.js +++ b/src/logger.js @@ -5,37 +5,37 @@ const logFile = 'log.txt'; const logStream = fs.createWriteStream(logFile, { flags: 'a' }); const getFormattedDate = () => { - const date = new Date(); - const year = date.getFullYear(); - const month = ('0' + (date.getMonth() + 1)).slice(-2); - const day = ('0' + date.getDate()).slice(-2); - const hours = ('0' + date.getHours()).slice(-2); - const minutes = ('0' + date.getMinutes()).slice(-2); - const seconds = ('0' + date.getSeconds()).slice(-2); - return `[${year}-${month}-${day} ${hours}:${minutes}:${seconds}]`; + const date = new Date(); + const year = date.getFullYear(); + const month = ('0' + (date.getMonth() + 1)).slice(-2); + const day = ('0' + date.getDate()).slice(-2); + const hours = ('0' + date.getHours()).slice(-2); + const minutes = ('0' + date.getMinutes()).slice(-2); + const seconds = ('0' + date.getSeconds()).slice(-2); + return `[${year}-${month}-${day} ${hours}:${minutes}:${seconds}]`; }; const logMessage = async (message) => { - const timestamp = getFormattedDate(); - const formattedMessage = `${timestamp} ${util.format(message)}`; - - process.stdout.write(formattedMessage + '\n'); - - return new Promise((resolve, reject) => { - logStream.write(formattedMessage + '\n', (err) => { - if (err) { - reject(err); - } else { - resolve(); - } - }); + const timestamp = getFormattedDate(); + const formattedMessage = `${timestamp} ${util.format(message)}`; + + process.stdout.write(formattedMessage + '\n'); + + return new Promise((resolve, reject) => { + logStream.write(formattedMessage + '\n', (err) => { + if (err) { + reject(err); + } else { + resolve(); + } }); + }); }; console.log = (message) => { - logMessage(message).catch(err => { - process.stderr.write(`WARN: Error writing to log: ${err}\n`); - }); + logMessage(message).catch(err => { + process.stderr.write(`WARN: Error writing to log: ${err}\n`); + }); }; module.exports = logMessage; diff --git a/src/main.js b/src/main.js index 118e34a..c183121 100644 --- a/src/main.js +++ b/src/main.js @@ -3,9 +3,8 @@ const fs = require('fs'); const path = require('path'); const token = process.env.TGBOT_TOKEN; const bot = new TelegramBot(token, { polling: true }); - -const logMessage = require('./logger'); const { isBlocked } = require('./blocklist'); +require('./logger'); const commandsPath = path.join(__dirname, 'commands'); const commandHandlers = {}; @@ -30,7 +29,7 @@ bot.on('message', (msg) => { commandHandlers[messageText](bot, msg); } - console.log(`INFO: User ${userName}, ${userId} sended a message with the content: + console.log(`INFO: User ${userName}, ${userId} sended a command or message with the content: • ${messageText}\n`) }); @@ -38,5 +37,4 @@ bot.on('polling_error', (error) => { console.error('WARN: Polling error:', error); }); -const date = new Date().toString(); console.log(`INFO: Lynx started\n`);