Merge pull request #58 from moonstar-x/feature/djs-13-update

Version 4.0.0

.dockerignore

@@ -17,7 +17,8 @@ npm-debug.log
 
 # Development
 config/settings.json
-dev
+dev/
+data/
 
 # Git
 .github
@@ -31,4 +32,4 @@ app.json
 .eslintignore
 .eslintrc
 .gitignore
-jest.config.js
+jest.config.js

.github/workflows/docker-build.yml

@@ -4,7 +4,7 @@ on:
   repository_dispatch:
     types: [docker-build]
   workflow_dispatch:
-    
+
 jobs:
   build_push:
     name: Build Docker Image and Push to Docker Hub
@@ -26,7 +26,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: moonstarx
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -44,12 +44,12 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: moonstarx/discord-tts-bot:latest
+          tags: moonstarx/discord-tts-bot:latest,moonstarx/discord-tts-bot:${{ steps.package-version.outputs.current-version }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           build-args: |
             DATE_CREATED=${{ steps.date.outputs.date }}
             VERSION=${{ steps.package-version.outputs.current-version }}
-            
+
       - name: Image Digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -6,6 +6,11 @@ config/settings.json
 
 # Old files
 *.old
+old/
 
 # Env files
-*.env
+*.env
+
+# Development files
+dev/
+data/

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.20.0-alpine3.12
+FROM node:16.6.1-alpine3.14
 
 ARG DATE_CREATED
 ARG VERSION
@@ -21,4 +21,4 @@ RUN npm ci --only=prod
 
 COPY . .
 
-CMD ["npm", "start"]
+CMD ["npm", "start"]

LICENSE

@@ -1,9 +1,9 @@
 MIT License
 
-Copyright (c) 2018 moonstar-x
+Copyright (c) 2018-2022 moonstar-x
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

app.json

@@ -1,8 +1,8 @@
 {
   "name": "Discord Text-to-Speech Bot",
-  "description": "A small Discord bot sends Text-to-Speech messages in various languages.",
+  "description": "A small Discord bot that sends Text-to-Speech messages in various languages.",
   "repository": "https://github.com/moonstar-x/discord-tts-bot",
-  "logo": "https://i.imgur.com/Tqnk48j.png",
+  "logo": "https://i.imgur.com/jYh0jOT.png",
   "buildpacks": [
     {
       "url": "heroku/nodejs"
@@ -16,11 +16,6 @@
       "description": "Your bot's bot token.",
       "required": true
     },
-    "DISCORD_PREFIX": {
-      "description": "Your bot's command prefix.",
-      "value": "$",
-      "required": true
-    },
     "DISCORD_OWNER_ID": {
       "description": "Your bot's owner's ID.",
       "value": "123123123",
@@ -36,10 +31,25 @@
       "value": "900000",
       "required": false
     },
-    "DISCORD_DISCONNECT_TIMEOUT": {
-      "description": "The time it takes for the bot to leave the channel if inactive (in ms). Can be set to null to disable automatic leaving.",
-      "value": "600000",
+    "DISCORD_DEFAULT_DISCONNECT_TIMEOUT": {
+      "description": "The default time the bot waits before leaving a channel when inactive (in minutes). Can be set between 5 and 300.",
+      "value": "5",
+      "required": false
+    },
+    "DISCORD_PROVIDER_TYPE": {
+      "description": "The type of data provider to use. In heroku, you should set this to redis.",
+      "value": "redis",
+      "required": false
+    },
+    "DISCORD_REDIS_URL": {
+      "description": "The URL of the redis service to be used by this bot. In heroku, you need to have this set.",
+      "value": "redis://ip:port",
+      "required": true
+    },
+    "DISCORD_ENABLE_TTS_CHANNELS": {
+      "description": "Whether to enable the message-only based TTS to send TTS messages on a certain channel with a certain setting without the need to execute a command.",
+      "value": "false",
       "required": false
     }
   }
-}
+}

config/settings.json.example

@@ -4,5 +4,9 @@
   "owner_id": "123123123",
   "owner_reporting": false,
   "presence_refresh_interval": 600000,
-  "disconnect_timeout": 300000
-}
+  "default_disconnect_timeout": 5,
+  "testing_guild_id": null,
+  "provider_type": "level",
+  "redis_url": "redis://ip:port",
+  "enable_tts_channels": false
+}