Compare commits

..

No commits in common. "f020df5709b5b5f12690726690a67135ffb63485" and "10f22fbe86c9af80b32f203b11b5633c8fc89a48" have entirely different histories.

3 changed files with 5 additions and 9 deletions

10
app.js
View File

@ -22,9 +22,8 @@ app.get('/', basicAuth(users), (req, res) => {
return res.send('Received a GET HTTP method'); return res.send('Received a GET HTTP method');
}); });
const port = process.env.PORT || 3000; app.listen(process.env.PORT, () =>
app.listen(port, () => console.log(`Example app listening on port ${process.env.PORT}!`),
console.log(`Example app listening on port ${port}!`),
); );
const token = process.env.BOT_TOKEN; const token = process.env.BOT_TOKEN;
@ -54,7 +53,6 @@ const bot_faq_whatAppToUse = require('./data/bot/functions/faq/whatAppToUse')
const bot_faq_subscription = require('./data/bot/functions/faq/subscriptions') const bot_faq_subscription = require('./data/bot/functions/faq/subscriptions')
const bot_subStatus = require('./data/bot/functions/requests/updateSubStatus') const bot_subStatus = require('./data/bot/functions/requests/updateSubStatus')
const shortcuts = require('./data/bot/lib/shorcuts') const shortcuts = require('./data/bot/lib/shorcuts')
const bot_joke = require('./data/bot/functions/requests/joke')
// Load group data using utils // Load group data using utils
@ -65,7 +63,7 @@ let chat = utils.loadChat();
let jointArray = navigation.concat(chat); let jointArray = navigation.concat(chat);
const bot = new TelegramBot(token, { polling: true, cancelThrottledRequest: true }); const bot = new TelegramBot(token, { polling: true });
bot.on('new_chat_members', (msg) => { bot.on('new_chat_members', (msg) => {
bot_welcome.welcomeMessage(bot, msg, logger) bot_welcome.welcomeMessage(bot, msg, logger)
@ -81,7 +79,7 @@ bot.on('message', (msg) => {
} }
if (msg.text && msg.text.toString().includes("/joke")) { if (msg.text && msg.text.toString().includes("/joke")) {
bot_joke.tellMe(bot, msg, logger, name) requests.joke(bot, msg, logger)
} }
if (msg.text && msg.text.toString().includes("/updates_page")) { if (msg.text && msg.text.toString().includes("/updates_page")) {

View File

@ -1,5 +1,3 @@
var emoji = require('node-emoji');
module.exports = { module.exports = {
sendShortcutMessage: async (bot, msg, logger, title, description, postNumber, link) => { sendShortcutMessage: async (bot, msg, logger, title, description, postNumber, link) => {
bot.sendMessage(msg.chat.id, `${title} ${description}\n\n ${emoji.get('arrow_right')}<a href='${link}'>PRESS HERE</a>${emoji.get('arrow_left')} ${postNumber}`, { parse_mode: 'HTML', disable_web_page_preview: true }) bot.sendMessage(msg.chat.id, `${title} ${description}\n\n ${emoji.get('arrow_right')}<a href='${link}'>PRESS HERE</a>${emoji.get('arrow_left')} ${postNumber}`, { parse_mode: 'HTML', disable_web_page_preview: true })

View File

@ -1,6 +1,6 @@
{ {
"name": "bblbtv_bot", "name": "bblbtv_bot",
"version": "1.0.9", "version": "1.0.4",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {