diff --git a/.dockerignore b/.dockerignore index 30babd5..3507a4c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1 @@ -node_modules -yarn.lock -package-lock.json -config.toml +config.ini \ No newline at end of file diff --git a/.gitignore b/.gitignore index 00fc96f..1422eef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ # Internal -config/config.toml -local/ -modules/livenp.js - -# Node -node_modules/ -package-lock.json -yarn.lock +config/config.ini \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 25242cb..adebe79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,11 @@ -FROM node:16-alpine +FROM python:3 + +RUN pip --no-cache-dir install \ + discord.py + pynacl WORKDIR /app -COPY ./package.json /app/package.json - RUN apk add --no-cache ffmpeg \ && apk add --no-cache --virtual .build-deps \ g++ \ @@ -17,7 +19,7 @@ RUN apk add --no-cache ffmpeg \ && npm install \ && apk del .build-deps -ENV CONFIG_FILE="./config/config.toml" +ENV CONFIG_FILE="./config/config.ini" COPY . /app diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index 187c757..3a113a6 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,15 @@ # Radiobot -Radio Bot based on codecat/reddit-radio - - ## Features * Live radio re-streaming to voice channels (using multiple bot users), automatically turned on/off when someone joins/leaves the bound channel. * Other cool things. - -## Modules -A module is a class in the `modules` folder. It accepts the following methods: - -* `constructor(config, client, bot)` where `config` is the object directly from the config file, `client` is the Discord client, and `bot` is the `RedditRadio` object. -* `onCmdXxxx(msg, ...)` where `Xxxx` is a command name like `.xxxx`. -* `onTick()` is called every second. -* `onMessage(msg)` is called whenever a message is sent in any channel. Return `false` if the message can pass through to other commands and handlers, or `true` to stop that from happening. - - ## Running using Docker from the repo -1. Clone this repo - `git clone https://github.com/codecat/reddit-radio.git` + 2. Install dependancies `sudo apt install docker-compose` 3. Create a folder called `config` or similiar to keep your configuration in -4. Make a copy of `config.example.toml` called `config.toml` and place it in your `config` folder +4. Make a copy of `config.example.ini` called `config.ini` and place it in your `config` folder 5. Edit the config file 6. Build and execute using docker-compose: `docker-compose up -d --build --remove-orphans` 7. Monitor execution with `docker-compose logs --follow --tail 100` - diff --git a/Radio.js b/Radio.js deleted file mode 100644 index daa7627..0000000 --- a/Radio.js +++ /dev/null @@ -1,118 +0,0 @@ -var discord = require("discord.js"); - -class Radio -{ - constructor(config, radioconfig) - { - this.config = config; - - this.name = radioconfig.name; - this.url = radioconfig.url; - - this.client = new discord.Client({ - intents: [ - // List of intents: https://discord.com/developers/docs/topics/gateway#list-of-intents - discord.Intents.FLAGS.GUILDS, - discord.Intents.FLAGS.GUILD_VOICE_STATES, - ], - }); - - this.running = false; - this.voice_connection = false; - this.voice_dispatcher = false; - - this.channel = false; - - this.client.on("ready", () => { - console.log("Radio client \"" + this.name + "\" connected!"); - - this.client.channels.fetch(radioconfig.channel).then(channel => { - this.channel = channel; - if (channel.members.size > 0) { - this.joinChannel(); - } - }); - }); - - this.client.on("error", (e) => { - console.log("Radio bot error:", e); - }); - - this.client.on("voiceStateUpdate", (o, n) => { - if (n.channel == this.channel) { - console.log("Someone joined \"" + this.name + "\": " + this.channel.members.size); - if (!this.running) { - this.running = true; - this.joinChannel(); - } - } else if (o.channel == this.channel && n.channel != this.channel) { - console.log("Someone left \"" + this.name + "\": " + this.channel.members.size); - if (this.running && this.channel.members.size == 1) { - this.running = false; - this.leaveChannel(); - } - } - }); - - this.client.login(radioconfig.token); - } - - stop() - { - console.log("Stopping radio \"" + this.name + "\"..."); - return this.client.destroy(); - } - - joinChannel() - { - console.log("Joining and starting \"" + this.name + "\"!"); - this.running = true; - - this.channel.join().then((conn) => { - this.voice_connection = conn; - this.voice_connection.on("disconnect", () => { - this.voice_connection = false; - }); - this.voice_connection.on("newSession", () => { - this.startBroadcast(); - }); - this.voice_connection.on("error", (err) => { - console.log("Error: " + err); - }); - this.startBroadcast(); - }).catch(console.error); - } - - leaveChannel() - { - console.log("Leaving \"" + this.name + "\"."); - this.running = false; - - if (this.voice_dispatcher !== false) { - this.voice_dispatcher.end(); - } - - if (this.voice_connection !== false) { - this.voice_connection.disconnect(); - } - } - - startBroadcast() - { - if (this.voice_connection === false) { - return; - } - - if (this.voice_dispatcher !== false) { - this.voice_dispatcher.end(); - } - - this.voice_dispatcher = this.voice_connection.play(this.url, this.config.voice); - this.voice_dispatcher.on("end", (reason) => { - console.log("Radio voice \"" + this.name + "\" ended: \"" + reason + "\""); - this.voice_dispatcher = false; - }); - } -} - -module.exports = Radio; diff --git a/Startup.js b/Startup.js deleted file mode 100644 index 2332768..0000000 --- a/Startup.js +++ /dev/null @@ -1,52 +0,0 @@ -var toml = require("toml"); -var fs = require("fs"); -var Radio = require("./Radio"); - -class Startup -{ - constructor() - { - this.radios = []; - - let configFile = process.env.CONFIG_FILE || "config.toml"; - this.config = toml.parse(fs.readFileSync(configFile, "utf8")); - } - - run() - { - this.setupRadio(); - } - - setupRadio() - { - if (this.config.radios === undefined) { - console.error('No radios are defined in the config file, exiting...'); - process.exit(1); - } - for (let i = 0; i < this.config.radios.length; i++) { - this.startRadio(this.config.radios[i]); - } - this.setupSignals(); - } - - startRadio(radioConfig) - { - this.radios.push(new Radio(this.config, radioConfig)); - } - - setupSignals() - { - var stopHandler = () => { - if (this.bot) { - this.bot.stop(); - } - for (var i = 0; i < this.radios.length; i++) { - this.radios[i].stop(); - } - }; - process.on("SIGINT", stopHandler); // Ctrl+C - process.on("SIGTERM", stopHandler); // Terminate - } -} - -module.exports = Startup; diff --git a/cmdsplit.js b/cmdsplit.js deleted file mode 100644 index f5017fd..0000000 --- a/cmdsplit.js +++ /dev/null @@ -1,54 +0,0 @@ -module.exports = function(str, options) { - var ret = []; - - var buffer = ""; - var inString = false; - - for (var i = 0; i < str.length; i++) { - var c = str[i]; - - // literals - if (c == "\\" && i + 1 < str.length) { - buffer += str[++i]; - continue; - } - - // strings - if (c == "\"") { - if (inString) { - // string ends - inString = false; - ret.push(buffer); - buffer = ""; - if (i + 1 < str.length && str[i + 1] == " ") { - i++; - } - } else { - // string starts - inString = true; - } - continue; - } - - // words - if (c == " ") { - if (inString) { - buffer += " "; - } else { - ret.push(buffer); - buffer = ""; - } - continue; - } - - // characters - buffer += c; - } - - // last word - if (buffer != "") { - ret.push(buffer); - } - - return ret; -}; diff --git a/config/config.example.toml b/config/config.example.ini similarity index 100% rename from config/config.example.toml rename to config/config.example.ini diff --git a/index.js b/index.js deleted file mode 100644 index ecfd9ed..0000000 --- a/index.js +++ /dev/null @@ -1,4 +0,0 @@ -var Startup = require("./Startup"); - -let startup = new Startup(); -startup.run(); diff --git a/package.json b/package.json deleted file mode 100644 index c243fc5..0000000 --- a/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "radiobot", - "version": "1.0.0", - "description": "deflax radiobot", - "main": "index.js", - "dependencies": { - "@discordjs/opus": "^0.3.2", - "colors": "^1.4.0", - "discord.js": "^13.1.0", - "fluent-ffmpeg": "^2.1.2", - "follow-redirects": "^1.14.4", - "moment": "^2.24.0", - "moment-timezone": "^0.5.33", - "mongodb": "^3.7.1", - "sodium": "^3.0.2", - "toml": "^3.0.0" - }, - "devDependencies": {}, - "scripts": { - "start": "node index.js", - "radio": "node index.js --radio", - "radios": "node index.js --radios", - "no-radio": "node index.js --no-radios" - }, - "author": "deflax" -}