.dockerignore

@@ -1,2 +0,0 @@
-node_modules
-npm-debug.log

.gitignore

@@ -1,4 +1 @@
 node_modules/
-.env
-
-.vercel

.vscode/launch.json

@@ -12,6 +12,9 @@
                 "<node_internals>/**"
             ],
             "program": "${workspaceFolder}\\app.js",
+            "env": {
+                "BOTTOKEN": "1012409404:AAE-Vt0W_Cfp6ENnz1aZgPaBW_7_kBD7CJI"
+            }
         }
     ]
 }

Dockerfile

@@ -1,18 +0,0 @@
-FROM node:12
-
-# Create app directory
-WORKDIR /usr/src/app
-
-# Install app dependencies
-# A wildcard is used to ensure both package.json AND package-lock.json are copied
-# where available (npm@5+)
-COPY package*.json ./
-
-RUN npm install
-# If you are building your code for production
-# RUN npm ci --only=production
-
-# Bundle app source
-COPY . .
-
-CMD [ "node", "app.js" ]

app.js

@@ -1,10 +1,6 @@
-require('dotenv').config();
-
 const TelegramBot = require('node-telegram-bot-api');
 
-const token = process.env.BOT_TOKEN;
+const token = process.env.BOTTOKEN;
-const name = process.env.BOT_NAME;
-const channel = process.env.CHANNEL
 
 const bot = new TelegramBot(token, {
     polling: true
@@ -12,18 +8,18 @@ const bot = new TelegramBot(token, {
 
 bot.on('message', (msg) => {
 
-    const help = "help";
+    const hi = "hi";
-    if (msg.text.toString().toLowerCase().includes(help)) {
+    if (msg.text.toString().toLowerCase().indexOf(hi) === 0) {
-        bot.sendMessage(msg.chat.id, "Hello " + msg.from.first_name + " Please PM me @" + process.env.BOT_USERNAME + " and i'll help.");
+        bot.sendMessage(msg.chat.id, "Hello " + msg.from.first_name + " Please press /start");
     }
 
     const bye = "bye";
     if (msg.text.toString().toLowerCase().includes(bye)) {
-        bot.sendMessage(msg.chat.id, "Hope to see you again, Bye " + msg.from.first_name + ".");
+        bot.sendMessage(msg.chat.id, "Hope to see you around again , Bye");
     }
 
-    const subPrice = "-subscription prices";
+    const subPrice = "subscription prices";
-    if (msg.text.toString().toLowerCase() === subPrice) {
+    if (msg.text.toString().toLowerCase().includes(subPrice)) {
         bot.sendMessage(msg.chat.id, "PREMIUM PLUS ----£30\nVIP-----------------------£25\nOLD PREMIUM -----£17\nBLUEMOON ---------£15\nKDB --------------------£14\nGOLD ------------------£13\nTECHNOID -----------£13\nBRONZE --------------£10\nSOL ---------------------£10")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "All of these prices are for 12 Month subscription subs").then(() => {
@@ -32,8 +28,8 @@ bot.on('message', (msg) => {
             })
     }
 
-    const howToSignUp = "-how to get a subscription?";
+    const howToSignUp = "how to get a subscription?";
-    if (msg.text.toString().toLowerCase() === howToSignUp) {
+    if (msg.text.toString().toLowerCase().includes(howToSignUp)) {
         bot.sendMessage(msg.chat.id, "To purchase a subscription you need to send a DM to any of the Admins in the group @Scotslad, @manclad72 or @bob_15.")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "PLEASE ONLY DM ONE ADMIN AND WAIT FOR THEM TO GET BACK TO YOU.").then(() => {
@@ -42,21 +38,21 @@ bot.on('message', (msg) => {
             })
     }
 
-    const suburls = "-subscription urls";
+    const suburls = "subscription urls";
-    if (msg.text.toString().toLowerCase() === suburls) {
+    if (msg.text.toString().toLowerCase().includes(suburls)) {
         bot.sendMessage(msg.chat.id, "In this IPTV room we don't give out sub URLs or m3us. We have dedicated apps to play all subs on your Android box or IPTV player in our FileLinked.");
     }
 
-    const multipleDevices = "-can i stream on multiple devices?";
+    const multipleDevices = "can i stream on multiple devices?";
-    if (msg.text.toString().toLowerCase() === multipleDevices) {
+    if (msg.text.toString().toLowerCase().includes(multipleDevices)) {
         bot.sendMessage(msg.chat.id, "No. All subs sold is this room are one connection subs unless otherwise stated.\n\nThis means that you can have your sub loaded onto as many devices as you want (eg Android phone, tablet, Firestick, Android TV box) BUT you can only play the sub from one device at a time.")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "Otherwise you may lose your sub altogether!")
             })
     }
 
-    const updatesGroup = "-updates group";
+    const updatesGroup = "updates group";
-    if (msg.text.toString().toLowerCase() === updatesGroup) {
+    if (msg.text.toString().toLowerCase().includes(updatesGroup)) {
         bot.sendMessage(msg.chat.id, "The updates groups can be found here")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "https://t.me/joinchat/AAAAAFDxZ2rzgAW5acahxA").then(() => {
@@ -65,8 +61,8 @@ bot.on('message', (msg) => {
             })
     }
 
-    const installOnFire = "-install filelinked on firestick";
+    const installOnFire = "install filelinked on firestick";
-    if (msg.text.toString().toLowerCase() === installOnFire) {
+    if (msg.text.toString().toLowerCase().includes(installOnFire)) {
         bot.sendMessage(msg.chat.id, "Step 1:\n\nGo to Settings > device/my fire tv > developer options > apps from unknown sources on")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "Step 2: download an app called downloader. (Orange icon)").then(() => {
@@ -79,8 +75,8 @@ bot.on('message', (msg) => {
             })
     }
 
-    const installoOnAndroid = "-install filelinked on android";
+    const installoOnAndroid = "install filelinked on android";
-    if (msg.text.toString().toLowerCase() === installoOnAndroid) {
+    if (msg.text.toString().toLowerCase().includes(installoOnAndroid)) {
         bot.sendMessage(msg.chat.id, "First thing you need to do is go to browser on your Android TV  box and enter www.filelinked.com")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "From this browser page, download FileLinked.").then(() => {
@@ -95,13 +91,13 @@ bot.on('message', (msg) => {
             })
     }
 
-    const SurfShark = "-vpn (surfshark)";
+    const SurfShark = "vpn (surfshark)";
-    if (msg.text.toString().toLowerCase() === SurfShark) {
+    if (msg.text.toString().toLowerCase().includes(SurfShark)) {
         bot.sendMessage(msg.chat.id, "SurfShark is the VPN that we advise you use on your device to bypass the blocks,\n\nYou can install this on your device from our FileLinked\n\nWe provide a username and password for you to use in the updates groups. DO NOT SHARE THE DETAILS");
     }
 
-    const iptvGuidance = "-iptv guidance";
+    const iptvGuidance = "iptv guidance";
-    if (msg.text.toString().toLowerCase() === iptvGuidance) {
+    if (msg.text.toString().toLowerCase().includes(iptvGuidance)) {
         bot.sendMessage(msg.chat.id, "🚨Basic IPTV Guidance🚨\n\nPlease see below some very basic IPTV guidance for those who are new to IPTV")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "1. What is a sub? A sub is what provides you with your live tv and movies/VOD... They are called different names e.g. GOLD, PREMIUM, ETC... All offer very similar channels with the difference of VOD, Series and time and money spent on servers.").then(() => {
@@ -116,8 +112,8 @@ bot.on('message', (msg) => {
             })
     }
 
-    const iptvMaintenance = "-basic iptv maintenance";
+    const iptvMaintenance = "basic iptv maintenance";
-    if (msg.text.toString().toLowerCase() === iptvMaintenance) {
+    if (msg.text.toString().toLowerCase().includes(iptvMaintenance)) {
         bot.sendMessage(msg.chat.id, "🚨Basic IPTV Maintenance🚨\n\nReboot Router, Reboot Device.\nClear all app caches - Go to settings - Applications - Manage installed applications - click on app and select clear cache. Do this for all installed applications.")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "To refresh DNS\nClick on add user\nRefresh DNS\nList users\nLog back in").then(() => {
@@ -130,13 +126,13 @@ bot.on('message', (msg) => {
             })
     }
 
-    const doIneedVPN = "-do i need a vpn?";
+    const doIneedVPN = "do i need a vpn?";
-    if (msg.text.toString().toLowerCase() === doIneedVPN) {
+    if (msg.text.toString().toLowerCase().includes(doIneedVPN)) {
         bot.sendMessage(msg.chat.id, "You only need a VPN if your subscription isn't working at the time of use, normally only when the Football is on do the subs get blocked, if they do, connect using SurfShark using the details provided in the updates channel, DO NOT SHARE THESE DETAILS!");
     }
 
-    const iptvBible = "-iptv bible";
+    const iptvBible = "iptv bible";
-    if (msg.text.toString().toLowerCase() === iptvBible) {
+    if (msg.text.toString().toLowerCase().includes(iptvBible)) {
         bot.sendMessage(msg.chat.id, "So the first thing I want to get out of the way is the stigma of download speeds and requirements for download speed. \r\n\r\nIn streaming like we do you will be just fine with at least 5mbps. I myself have streamed tethering off my phone with only 3mbps, but let\u2019s set the standard at 5mbps. If you have at least 5mbps and you are having issues with buffering, the download speed is not your problem. \r\n\r\nA lot of people seem to think that buffering is caused by low download speeds but that is just not true. \r\n\r\nLike I said above you can stream perfectly fine on 5mbps, in the same token you can have GB download speeds and have buffering issues.\r\n\r\nThere are a few things that will cause buffering.")
             .then(() => {
                 return bot.sendMessage(msg.chat.id, "1. HEAVY TRAFFIC ON THE SERVER THE LINK IS COMING FROM:\r\n\r\nYes it\u2019s nice to be able to watch movies and tv shows for free using the free links, I mean free anything is always great. But keep in mind free is not always the best. The servers that the free links come from can get congested with heavy traffic spiking the bandwidth usage of that server. \r\n\r\nThis is common during heavy streaming hours (night time and weekends). Unfortunately there is nothing you can do on your end to fix this, the only thing you can do is try another link. \r\n\r\nI highly suggest spending a few bucks for real-debrid. Real-debrid is a premium service that uses tons of premium servers all over the world. They only allow a small amount of bandwidth usage per server so you the user don\u2019t run into heavy traffic. This helps eliminate buffering. If you\u2019re still having issues with buffering using real-debrid then more then likely it\u2019s on your end. I\u2019m not saying real-debrid doesn\u2019t run into issues but It\u2019s Technology, it does have it\'s down points at times.").then(() => {
@@ -151,104 +147,75 @@ bot.on('message', (msg) => {
             })
     }
 
-    const howToResetCache = "-how do i clear cache?";
+    const howToResetCache = "how do i clear cache?";
-    if (msg.text.toString().toLowerCase() === howToResetCache) {
+    if (msg.text.toString().toLowerCase().includes(howToResetCache)) {
         bot.sendMessage(msg.chat.id, "Cache files are main source of errors and problems in functioning of Apps, by clearing cache may solve most of the problems associated with Apps. To clear cache, go to Settings > Application > Manage apps > Select \"All\" tabs, select the app which was producing error and then tap Clear cache.");
     }
 
-    const whatAppShouldIUse = "-what app should i use?";
+    const whatAppShouldIUse = "what app should i use?";
-    if (msg.text.toString().toLowerCase() === whatAppShouldIUse) {
+    if (msg.text.toString().toLowerCase().includes(whatAppShouldIUse)) {
         bot.sendMessage(msg.chat.id, "What Subscription do you have?", {
             "reply_markup": {
                 "keyboard": [
-                    ["-VIP"],
+                    ["VIP"],
-                    ["-Premium Plus"],
+                    ["Premium Plus"],
-                    ["-Old Premium"],
+                    ["Old Premium"],
-                    ["-Gold"],
+                    ["Gold"],
-                    ["-Bronze"],
+                    ["Bronze"],
-                    ["-New Premium"],
+                    ["New Premium"],
-                    ["-KDB"],
+                    ["KDB"],
-                    ["-Technoid"],
+                    ["Technoid"],
-                    ["-Bluemoon"],
+                    ["Bluemoon"],
-                    ["-SOL"],
+                    ["SOL"],
-                    ["-Gambler"],
+                    ["Gambler"]
-                    ["-Home"]
                 ]
             }
         })
     }
 
-    const vip = "-vip"
-    const premiumPlus = "-premium plus"
-    const oldPremium = "-old premium"
-    if (msg.text.toString().toLowerCase() === vip || msg.text.toString().toLowerCase() === premiumPlus || msg.text.toString().toLowerCase() === oldPremium) {
-        bot.sendMessage(msg.chat.id, "You can use -\nXCIPTV Blue\nSky Q Yellow\nSMARTERS Green\n\nAll can be downloaded from our FileLinked")
-    }
-
-    const gold = "-gold"
-    if (msg.text.toString().toLowerCase() === gold) {
-        bot.sendMessage(msg.chat.id, "You can use -\nXCIPTV Red\nSky Q Yellow\nSMARTERS Green\n\nAll can be downloaded from our FileLinked")
-    }
-
-    const bronze = "-bronze"
-    if (msg.text.toString().toLowerCase() === bronze) {
-        bot.sendMessage(msg.chat.id, "You can use -\nXCIPTV Red\nSMARTERS Green\n\nAll can be downloaded from our FileLinked")
-    }
-
-    const newPremium = "-new premium"
-    const kdb = "-kdb"
-    const technoid = "-technoid"
-    const bluemoon = "-bluemoon"
-    const sol = "-sol"
-    const gambler = "-gambler"
-    if ((msg.text.toString().toLowerCase() === newPremium) || (msg.text.toString().toLowerCase() === kdb) || (msg.text.toString().toLowerCase() === gambler) || (msg.text.toString().toLowerCase() === technoid) || (msg.text.toString().toLowerCase() === bluemoon) || (msg.text.toString().toLowerCase()===sol)) {
-        bot.sendMessage(msg.chat.id, "You can use -\nSMARTERS Green\n\nAll can be downloaded from our FileLinked")
-    }
 
 
 }),
-    bot.onText(/^(\/start|\/help|-Home)$/, (msg) => {
+    bot.onText(/^(\/start|Home)$/, (msg) => {
-        bot.sendMessage(msg.chat.id, "I'm " + name).then(() => {
+
-            return bot.sendMessage(msg.chat.id, "I'm the " + channel + " Bot, and can answer your questions").then(() => {
+        bot.sendMessage(msg.chat.id, "Please use the buttons below to navigate", {
-                return bot.sendMessage(msg.chat.id, "Please use the buttons below to navigate", {
             "reply_markup": {
                 "keyboard": [
-                            ["-FAQ", "-Applications"]
+                    ["FAQ", "Applications"]
                 ]
             }
         })
-            })
+
-        })
     })
 
 
-bot.onText(/^-FAQ$/, (msg) => {
+bot.onText(/^FAQ$/, (msg) => {
     bot.sendMessage(msg.chat.id, "Frequently Asked Questions")
         .then(() => {
             return bot.sendMessage(msg.chat.id, "Please only ask an Admin, if you can't find the answer here..", {
                 "reply_markup": {
                     "keyboard": [
-                        ["-Subscriptions"],
+                        ["Subscriptions"],
-                        ["-IPTV"],
+                        ["IPTV"],
-                        ["-Apps"],
+                        ["Apps"],
-                        ["-Home"]
+                        ["Home"]
                     ]
                 }
             })
         })
 })
 
-bot.onText(/^-Applications$/, (msg) => {
+bot.onText(/Applications/, (msg) => {
     bot.sendMessage(msg.chat.id, "We have a number of different applications that work with our subs, here is an overview of subs/apps colour coded by the icon in our FileLinked").then(() => {
         return bot.sendMessage(msg.chat.id, "There are 2 new XCIPTV apps, Blue and Red.\nEach have 3 different sub DNS (URLs) already embedded in the players.").then(() => {
             return bot.sendMessage(msg.chat.id, "Sky Q app (yellow player) this holds 4 of the room subs.").then(() => {
                 return bot.sendMessage(msg.chat.id, "All of the room subs play on the green smarters player", {
                     "reply_markup": {
                         "keyboard": [
-                            ["-What app should I use?"],
+                            ["What app should I use?"],
-                            ["-VPN (SurfShark)"],
+                            ["VPN (SurfShark)"],
-                            ["-FileLinked"],
+                            ["FileLinked"],
-                            ["-Home"]
+                            ["Home"]
                         ]
                     }
                 })
@@ -260,53 +227,53 @@ bot.onText(/^-Applications$/, (msg) => {
 
 
 
-bot.onText(/^-Subscriptions$/, (msg) => {
+bot.onText(/^Subscriptions$/, (msg) => {
     bot.sendMessage(msg.chat.id, "Subscription FAQ", {
         "reply_markup": {
             "keyboard": [
-                ["-Subscription Prices"],
+                ["Subscription Prices"],
-                ["-How to get a subscription?"],
+                ["How to get a subscription?"],
-                ["-Subscription URLs", "-Can I stream on multiple devices?"],
+                ["Subscription URLs", "Can I stream on multiple devices?"],
-                ["-Updates Group"],
+                ["Updates Group"],
-                ["-Install FileLinked on FireStick", "-Install FileLinked on Android"],
+                ["Install FileLinked on FireStick", "Install FileLinked on Android"],
-                ["-Home"]
+                ["Home"]
             ]
         }
     })
 })
 
 
-bot.onText(/^-IPTV$/, (msg) => {
+bot.onText(/^IPTV$/, (msg) => {
     bot.sendMessage(msg.chat.id, "IPTV FAQ", {
         "reply_markup": {
             "keyboard": [
-                ["-IPTV Guidance"],
+                ["IPTV Guidance"],
-                ["-Basic IPTV Maintenance"],
+                ["Basic IPTV Maintenance"],
-                ["-Do I need a VPN?"],
+                ["Do I need a VPN?"],
-                ["-IPTV Bible"],
+                ["IPTV Bible"],
-                ["-Home"]
+                ["Home"]
             ]
         }
     })
 })
 
-bot.onText(/^-FileLinked$/, (msg) => {
+bot.onText(/^FileLinked$/, (msg) => {
-    bot.sendMessage(msg.chat.id, "The current FileLinked code is - " + process.env.FILELINKED_PIN + "\n\nYou can download all our players from there", {
+    bot.sendMessage(msg.chat.id, "The current FileLinked code is - 47054161\n\nYou can download all our players from there", {
         "reply_markup": {
             "keyboard": [
-                ["-Install FileLinked on FireStick", "-Install FileLinked on Android"],
+                ["Install FileLinked on FireStick", "Install FileLinked on Android"],
-                ["-Home"]
+                ["Home"]
             ]
         }
     })
 })
 
-bot.onText(/^-Apps$/, (msg) => {
+bot.onText(/^Apps$/, (msg) => {
     bot.sendMessage(msg.chat.id, "Apps FAQ", {
         "reply_markup": {
             "keyboard": [
-                ["-How do I clear cache?"],
+                ["How do I clear cache?"],
-                ["-Home"]
+                ["Home"]
             ]
         }
     })

package-lock.json

@@ -126,11 +126,6 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
-    "dotenv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",

package.json

@@ -4,8 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo \"Error: no test specified\" && exit 1"
-    "build:docker": "docker build -t BBLBTV_bot ."
   },
   "repository": {
     "type": "git",
@@ -14,7 +13,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "dotenv": "^8.2.0",
     "node-telegram-bot-api": "^0.50.0"
   }
 }