diff --git a/app.js b/app.js index f878b70..c561544 100644 --- a/app.js +++ b/app.js @@ -55,7 +55,7 @@ bot.on('message', (msg) => { bot_faq_whatAppToUse.appSwitch(bot, msg, logger) if (msg.text && msg.text.toString() === "- Subscription Options") { - bot_faq_subscription.pricesImageList(bot, msg, logger) + bot_faq_subscription.newPrices(bot, msg, logger) } for (const x of jointArray) { diff --git a/data/bot/functions/chat.js b/data/bot/functions/chat.js index 4c784b2..0a5642e 100644 --- a/data/bot/functions/chat.js +++ b/data/bot/functions/chat.js @@ -7,11 +7,11 @@ module.exports = { bot.sendMessage(msg.chat.id, "Hello " + userMention + " please PM me @" + process.env.BOT_USERNAME + " and i'll try to help.", { parse_mode: "HTML" }); } }, - filelinked_help: (bot, msg, logger) => { - const help_filelinked = "filelinked code"; - if (msg.text && msg.text.toString().toLowerCase().includes(help_filelinked)) { + unlinked_help: (bot, msg, logger) => { + const help_unlinked = "unlinked code"; + if (msg.text && msg.text.toString().toLowerCase().includes(help_unlinked)) { const userMention = "@" + msg.from.first_name + "<\/a>" - logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " Asked for fileLinked code"); + logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " Asked for unlinked code"); bot.sendMessage(msg.chat.id, "Hello " + userMention + " please PM me @" + process.env.BOT_USERNAME + " and i'll give you the code", { parse_mode: "HTML" }); } }, diff --git a/data/bot/functions/faq/subscriptions.js b/data/bot/functions/faq/subscriptions.js index 1f9ca48..6070746 100644 --- a/data/bot/functions/faq/subscriptions.js +++ b/data/bot/functions/faq/subscriptions.js @@ -26,5 +26,20 @@ module.exports = { } } // bot.sendMessage(msg.chat.id, "All of these prices are for 12 Month subscription subs") - } + }, + newPrices: (bot, msg, logger) => { + let string = "" + logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " Got subscription Prices"); + // subs.forEach(element => { + // if (element.COST != "X") { + // let catString = element.SUB + " - £" + element.COST + "." + // string += '\n' + catString; + // } + // }); + bot.sendMessage(msg.chat.id, "With Bob15TV we have many different subscriptions available. Some of these subscriptions have catch up and some do not. All subscriptions will have UK, US, Irish, 3PMs, PPV as standard content but will have lots of other countries too. There will also be different VOD and TV Series on each sub.").then(() => { + return bot.sendMessage(msg.chat.id, "Please DM Sarah @Sarbob15 and she will forward on posters for all of the different subs showing their content.").then(() => { + return bot.sendMessage(msg.chat.id, "Please note with all subs (except Top Vod) live tv is what you are purchasing. Catch up, Vod & Series etc are always a bonus and can go at anytime.\n\nIt is always the suppliers decision to keep or delete these extras.") + }) + }) + }, } diff --git a/data/bot/functions/faq/whatAppToUse.js b/data/bot/functions/faq/whatAppToUse.js index f6972f0..b04d3c1 100644 --- a/data/bot/functions/faq/whatAppToUse.js +++ b/data/bot/functions/faq/whatAppToUse.js @@ -33,7 +33,7 @@ module.exports = { } } ); - bot.sendMessage(msg.chat.id, checkSub + " can use -" + string + "\n\nAll can be downloaded from our FileLinked") + bot.sendMessage(msg.chat.id, checkSub + " can use -" + string + "\n\nAll can be downloaded from our unlinked") } } } diff --git a/data/bot/lib/requests.js b/data/bot/lib/requests.js index 896da9b..2b2e1ab 100644 --- a/data/bot/lib/requests.js +++ b/data/bot/lib/requests.js @@ -12,7 +12,8 @@ module.exports = { var options = { method: 'GET', url: 'https://football-pro.p.rapidapi.com/api/v2.0/livescores', - qs: { tz: 'Europe/London', leagues: '2,5,8,23,24,27,45,81,1326', include: 'localTeam,visitorTeam' }, + // qs: { tz: 'Europe/London', leagues: '2,5,8,23,24,27,45,81,1326', include: 'localTeam,visitorTeam' }, + qs: { tz: 'Europe/London', leagues: '2,5,8', include: 'localTeam,visitorTeam' }, headers: { 'x-rapidapi-host': 'football-pro.p.rapidapi.com', 'x-rapidapi-key': process.env.RAPIDAPI_API_KEY, @@ -45,6 +46,8 @@ Or type https://m.liveonsat.com/ into your browser.`) } }) }, + + joke: (bot, msg, logger, name) => { logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " asked for a joke"); diff --git a/data/group/Irish_Lass.jpg b/data/group/Carbon.jpg similarity index 100% rename from data/group/Irish_Lass.jpg rename to data/group/Carbon.jpg diff --git a/data/group/VIP.jpg b/data/group/Diamond.jpg similarity index 100% rename from data/group/VIP.jpg rename to data/group/Diamond.jpg diff --git a/data/group/FAQ.js b/data/group/FAQ.js index 43d13bd..5a6e564 100644 --- a/data/group/FAQ.js +++ b/data/group/FAQ.js @@ -60,7 +60,7 @@ const chat = [ "TEXT": [ "Apps FAQ" ], - "MENU": '[["- FileLinked"],["- VPN (SurfShark)"],["- Home"]]' + "MENU": '[["- unlinked"],["- VPN (SurfShark)"],["- Home"]]' }, { "NAME": "- How do I clear cache?", @@ -105,30 +105,32 @@ const chat = [ "🚨Basic IPTV Guidance🚨\n\nPlease see below some very basic IPTV guidance for those who are new to IPTV", "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.", "2. What is an APP? An app is something that you load your sub onto, and enables you to view the channels your sub provides.", - "3. For flexibility and ease of use username and password subs are the only way to view your IPTV sub/subs with Bob15tv – All subs have their own dedicated apps and are available to download from my filelinked. I have at least three different apps available for every sub I sell in this room.", + "3. For flexibility and ease of use username and password subs are the only way to view your IPTV sub/subs with Bob15tv – All subs have their own dedicated apps and are available to download from my unlinked. I have at least three different apps available for every sub I sell in this room.", "4. Things you must know when using IPTV – How to refresh DNS – How to change your app player settings – How to change your app player to an external player – How to carry out basic but essential IPTV Maintenance." ], "MENU": '[[]]' }, { - "NAME": "- Install FileLinked on Android", + "NAME": "- Install unlinked on Android", "TEXT": [ - "First thing you need to do is go to browser on your Android TV box and enter http://get.filelinked.com", - "Once the apk has downloaded you can close the browser and go to your apps.", - "Then open file manager or file browser. In here go to downloads, filemanager, press install.", - "Then go back to your apps section on the box and find filelinked app.", - "Open the app and enter the code." + "Step 1: First thing you need to do is go to browser on your Android TV box and enter https://bit.ly/36qiJ0u", + "Step 2: Allow file to download (you will see it downloading at bottom of your screen)", + "Step 3: Once the apk has downloaded you can close the browser and go to your apps.", + "Step 4: Then open file manager or file browser. In here go to downloads, filemanager, press install.", + "Step 5: Then go back to your apps section on the box and find unlinked app.", + "Step 6: Open the app and enter the code.", + "NOTE: If having difficulty with step 2 above and you can't see where to open your downloaded file please open your apps folder on your android device. Look for a folder called file manager or file browser. Open it. In here go to downloads. Scroll down, select 1ruta.apk & press install." ], "MENU": '[[]]' }, { - "NAME": "- Install FileLinked on FireStick", + "NAME": "- Install unlinked on FireStick", "TEXT": [ "Step 1:\n\nGo to Settings > device/my fire tv > developer options > apps from unknown sources on", - "Step 2: download an app called downloader. (Orange icon)", - "Step 3:\nOpen downloader and type in this address\nhttp://get.filelinked.com\nThen when it asks, install that app.", - "Step 4:\nPress and hold home and then click on “Apps” and scroll to the bottom and click on the very last app and open it (filelinked).", - "Step 5: Enter the filelinked code from the Updates page to get the list of apps for your sub" + "Step 2: Download an app called downloader. (Orange icon)", + "Step 3:\nOpen downloader and type in this address\nb.aftvnews.com and install\nNow go back to address bar and enter code 28369\nThen when it asks, install that app.", + "Step 4:\nPress and hold home and then click on “Apps” and scroll to the bottom and click on the very last app and open it (unlinked).", + "Step 5: Enter the unlinked code from the Updates page to get the list of apps for your sub" ], "MENU": '[[]]' }, @@ -152,7 +154,7 @@ const chat = [ { "NAME": "- Subscription URLs", "TEXT": [ - "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." + "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 unlinked." ], "MENU": '[[]]' }, @@ -166,19 +168,19 @@ const chat = [ "MENU": '[[]]' }, { - "NAME": "- FileLinked", + "NAME": "- unlinked", "TEXT": [ - "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", + "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 unlinked", "We also have a room web player that you can watch your subs on http://webservgroup.xyz/playersmart/", - "When you are in the bob15tv In filelinked room please look under each player to know what subs can be played on that particular player. Players will be added and deleted from our room filelinked regularly so do check in on the players we have available for your subs in our room filelinked on a regular basis.", - "The current FileLinked code is - " + process.env.FILELINKED_PIN + "\n\nYou can download all our players from there" + "When you are in the bob15tv In unlinked room please look under each player to know what subs can be played on that particular player. Players will be added and deleted from our room unlinked regularly so do check in on the players we have available for your subs in our room unlinked on a regular basis.", + "The current unlinked code is - " + process.env.unlinked_PIN + "\n\nYou can download all our players from there" ], - "MENU": '[["- Install FileLinked on FireStick", "- Install FileLinked on Android"],["- Home"]]' + "MENU": '[["- Install unlinked on FireStick", "- Install unlinked on Android"],["- Home"]]' }, { "NAME": "- VPN (SurfShark)", "TEXT": [ - "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" + "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 unlinked\n\nWe provide a username and password for you to use in the updates groups. DO NOT SHARE THE DETAILS" ], "MENU": '[[]]' }, diff --git a/data/group/KDB.jpg b/data/group/Ultimate.jpg similarity index 100% rename from data/group/KDB.jpg rename to data/group/Ultimate.jpg diff --git a/data/group/subs.json b/data/group/subs.json index 4b172f9..2064114 100644 --- a/data/group/subs.json +++ b/data/group/subs.json @@ -11,10 +11,10 @@ ] }, { - "SUB": "VIP", + "SUB": "Diamond", "COST": 0, "STATUS": 1, - "IMAGE": "./data/group/VIP.jpg", + "IMAGE": "./data/group/Diamond.jpg", "APPS": [ "Blue XCIPTV", "Yellow Sky Q", @@ -63,10 +63,10 @@ ] }, { - "SUB": "KDB", + "SUB": "Ultimate", "COST": 0, "STATUS": 1, - "IMAGE": "./data/group/KDB.jpg", + "IMAGE": "./data/group/Ultimate.jpg", "APPS": [ "Red XCIPTV", "White&Black IM", @@ -99,10 +99,20 @@ ] }, { - "SUB": "Irish Lass", + "SUB": "Carbon", "COST": 0, "STATUS": 1, - "IMAGE": "./data/group/Irish_Lass.jpg", + "IMAGE": "./data/group/Carbon.jpg", + "APPS": [ + "White&Black IM", + "Green SMARTERS" + ] + }, + { + "SUB": "Graphite", + "COST": 0, + "STATUS": 1, + "IMAGE": "./data/group/Carbon.jpg", "APPS": [ "White&Black IM", "Green SMARTERS"