Merge pull request #2431 from gmt2001/patch-235

Patch 235
PhantomBot · Jan 1, 2021 · 487f078 · 487f078
2 parents 1078029 + 19274ca
commit 487f078
Show file tree

Hide file tree

Showing 607 changed files with 802 additions and 1,760 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 #  
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 #  
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/build.xml b/build.xml
@@ -3,7 +3,7 @@
 
     <!--
 
-    Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+    Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,9 +25,9 @@
 
     <property environment="env" />
     <!-- Please see this for version numbers: https://semver.org/ -->
-    <property name="version" value="3.3.5" />
+    <property name="version" value="3.4.0" />
     <!-- Please see this for version numbers: https://semver.org/ -->
-    <property name="webpanel.version" value="1.3.0" />
+    <property name="webpanel.version" value="1.4.0" />
     <property name="src" location="source" />
     <property name="reference" location="lib" />
     <property name="build" location="build" />
@@ -177,6 +177,7 @@
         <javac target="11" source="11" debug="on" destdir="${classes}" srcdir="${src}" includeantruntime="false" >
             <compilerarg value="-Xlint:unchecked" />
             <compilerarg value="-Xlint:-options" />
+            <compilerarg value="-XDenableSunApiLintControl" />
             <compilerarg line="--add-exports java.base/sun.security.x509=ALL-UNNAMED" />
             <classpath refid="reference.class.path" />
         </javac>
@@ -192,6 +193,7 @@
         <javac target="11" source="11" debug="on" destdir="${classes}" srcdir="${src}" includeantruntime="false" >
             <compilerarg value="-Xlint:all" />
             <compilerarg value="-Xlint:-options" />
+            <compilerarg value="-XDenableSunApiLintControl" />
             <compilerarg line="--add-exports java.base/sun.security.x509=ALL-UNNAMED" />
             <classpath refid="reference.class.path" />
         </javac>

diff --git a/development-resources/jlink-jdk11-linux.sh b/development-resources/jlink-jdk11-linux.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 #  
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/development-resources/jlink-jdk11-macos.sh b/development-resources/jlink-jdk11-macos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 #  
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/development-resources/jlink-jdk11.bat b/development-resources/jlink-jdk11.bat
@@ -1,6 +1,6 @@
 @echo off
 REM  
-REM Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+REM Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 REM  
 REM This program is free software: you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

diff --git a/development-resources/launch-jdb.bat b/development-resources/launch-jdb.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM  
-REM Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+REM Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 REM  
 REM This program is free software: you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

diff --git a/development-resources/parse_commandpath.pl b/development-resources/parse_commandpath.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # 
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/development-resources/parse_commandpath_to_json.pl b/development-resources/parse_commandpath_to_json.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # 
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/development-resources/parse_discordcommandpath.pl b/development-resources/parse_discordcommandpath.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # 
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/development-resources/parse_transformers.py b/development-resources/parse_transformers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+# Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/docs/guides/content/commands/commands.md b/docs/guides/content/commands/commands.md
@@ -195,13 +195,10 @@
 | ./handlers/followHandler.js         | !shoutout                                           | !shoutout [streamer]                                                                                                                      | Give a shout out to a streamer.                                                                                                                                                                          |
 | ./handlers/gameScanHandler.js       | !gamescan                                           | !gamescan [game name]                                                                                                                     | Scan for a recently played game and list the date in which the broadcaster played it.                                                                                                                    |
 | ./handlers/hostHandler.js           | !hosttoggle                                         | !hosttoggle                                                                                                                               | Toggles host announcements.                                                                                                                                                                              |
-| ./handlers/hostHandler.js           | !autohosttoggle                                     | !autohosttoggle                                                                                                                           | Toggles auto host announcements.                                                                                                                                                                         |
 | ./handlers/hostHandler.js           | !hostreward                                         | !hostreward [amount]                                                                                                                      | Set the amount of points to reward when a channel starts hosting                                                                                                                                         |
-| ./handlers/hostHandler.js           | !autohostreward                                     | !autohostreward [amount]                                                                                                                  | Set the amount of points to reward when a channel starts autohosting                                                                                                                                     |
 | ./handlers/hostHandler.js           | !hostrewardminviewers                               | !hostrewardminviewers [amount]                                                                                                            | The number of viewers in the hosted channel required to provide a reward.                                                                                                                                |
 | ./handlers/hostHandler.js           | !hostminviewers                                     | !hostminviewers [amount]                                                                                                                  | The number of viewers in the hosted channel required to trigger the chat alert.                                                                                                                          |
 | ./handlers/hostHandler.js           | !hostmessage                                        | !hostmessage [message]                                                                                                                    | Set a message given when a channel hosts                                                                                                                                                                 |
-| ./handlers/hostHandler.js           | !autohostmessage                                    | !autohostmessage [message]                                                                                                                | Set a message given when a channel autohosts                                                                                                                                                             |
 | ./handlers/hostHandler.js           | !hosthistory                                        | !hosthistory [on/off]                                                                                                                     | Enable or disable collection of host history data for the Panel.                                                                                                                                         |
 | ./handlers/hostHandler.js           | !host                                               | !host [channel name]                                                                                                                      | Will host that channel. Make sure to add your bot as a channel editor on your Twitch dashboard for this to work.                                                                                         |
 | ./handlers/hostHandler.js           | !unhost                                             | !unhost                                                                                                                                   | Will unhost the channel that is being hosted. Make sure to add your bot as a channel editor on your Twitch dashboard for this to work.                                                                   |

diff --git a/docs/guides/content/commands/discord-commands.md b/docs/guides/content/commands/discord-commands.md
@@ -68,7 +68,6 @@
 | ./discord/handlers/followHandler.js         | !followhandler channel                    | !followhandler channel [channel name]                        | Sets the channel that announcements from this module will be said in.                                                                                                |
 | ./discord/handlers/hostHandler.js           | !hosthandler toggle                       | !hosthandler toggle                                          | Toggles the hosts announcements.                                                                                                                                     |
 | ./discord/handlers/hostHandler.js           | !hosthandler hostmessage                  | !hosthandler hostmessage [message]                           | Sets the host announcement message.                                                                                                                                  |
-| ./discord/handlers/hostHandler.js           | !hosthandler hostmessage                  | !hosthandler hostmessage [message]                           | Sets the auto-host announcement message.                                                                                                                             |
 | ./discord/handlers/hostHandler.js           | !hosthandler channel                      | !hosthandler channel [channel name]                          | Sets the channel that announcements from this module will be said in.                                                                                                |
 | ./discord/handlers/keywordHandler.js        | !keyword add                              | !keyword add [keyword] [response]                            | Adds a custom keyword.                                                                                                                                               |
 | ./discord/handlers/keywordHandler.js        | !keyword edit                             | !keyword edit [keyword] [response]                           | Edits a custom keyword.                                                                                                                                              |

diff --git a/docs/guides/index.html b/docs/guides/index.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+    Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or

diff --git a/docs/index.html b/docs/index.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+    Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or

diff --git a/docs/oauth/index.html b/docs/oauth/index.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+    Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or

diff --git a/docs/panel/index.html b/docs/panel/index.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+    Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/docs/panel/js/index.js b/docs/panel/js/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+ * Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/docs/panel/js/pages/alerts/alerts.js b/docs/panel/js/pages/alerts/alerts.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+ * Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -295,8 +295,8 @@ $(function() {
     // Host settings button.
     $('#hostHandlerSettings').on('click', function() {
         socket.getDBValues('alerts_get_host_settings', {
-            tables: ['settings', 'settings', 'settings', 'settings', 'settings', 'settings', 'settings', 'settings', 'settings'],
-            keys: ['hostReward', 'autoHostReward', 'hostMinViewerCount', 'hostMinCount', 'hostMessage', 'autoHostMessage', 'hostHistory', 'hostToggle', 'autoHostToggle']
+            tables: ['settings', 'settings', 'settings', 'settings', 'settings', 'settings'],
+            keys: ['hostReward', 'hostMinViewerCount', 'hostMinCount', 'hostMessage', 'hostHistory', 'hostToggle']
         }, true, function(e) {
             helpers.getModal('host-alert', 'Host Alert Settings', 'Save', $('<form/>', {
                 'role': 'form'
@@ -319,19 +319,6 @@ $(function() {
                 // Appen the reward box
                 .append(helpers.getInputGroup('host-reward', 'number', 'Host Reward', '', e.hostReward,
                     'Reward given to the user when they hosts to the channel.'))))
-            // Append second collapsible accordion.
-            .append(helpers.getCollapsibleAccordion('main-2', 'Auto-Host Settings', $('<form/>', {
-                    'role': 'form'
-                })
-                // Add toggle for normal hosts
-                .append(helpers.getDropdownGroup('autohost-toggle', 'Enable Auto-Host Alerts', (e.autoHostToggle === 'true' ? 'Yes' : 'No'), ['Yes', 'No'],
-                    'If a message should be said in the channel when someone auto-hosts the channel.'))
-                // Append message box for the message
-                .append(helpers.getTextAreaGroup('autohost-msg', 'text', 'Auto-Host Message', '', e.autoHostMessage,
-                    'Message said when someone auto-hosts the channel. Tags: (name), (alert), (playsound), (reward), and (viewers)', false))
-                // Appen the reward box
-                .append(helpers.getInputGroup('autohost-reward', 'number', 'Auto-Host Reward', '', e.autoHostReward,
-                    'Reward given to the user when they auto-hosts the channel.'))))
             // Append third collapsible accordion.
             .append(helpers.getCollapsibleAccordion('main-3', 'Extra Settings', $('<form/>', {
                     'role': 'form'
@@ -349,9 +336,6 @@ $(function() {
                 let hostToggle = $('#host-toggle').find(':selected').text() === 'Yes',
                     hostMsg = $('#host-msg'),
                     hostReward = $('#host-reward'),
-                    autoHostToggle = $('#autohost-toggle').find(':selected').text() === 'Yes',
-                    autoHostMsg = $('#autohost-msg'),
-                    autoHostReward = $('#autohost-reward'),
                     hostHistory = $('#host-history').find(':selected').text() === 'Yes',
                     hostMinPoints = $('#host-minpoint'),
                     hostMinAlert = $('#host-minalert');
@@ -360,19 +344,15 @@ $(function() {
                 switch (false) {
                     case helpers.handleInputString(hostMsg):
                     case helpers.handleInputNumber(hostReward, 0):
-                    case helpers.handleInputString(autoHostMsg):
-                    case helpers.handleInputNumber(autoHostReward, 0):
                     case helpers.handleInputNumber(hostMinPoints, 0):
                     case helpers.handleInputNumber(hostMinAlert, 0):
                         break;
                     default:
                         socket.updateDBValues('alerts_update_host_settings', {
-                            tables: ['settings', 'settings', 'settings', 'settings', 'settings', 'settings', 'settings',
-                                'settings', 'settings'],
-                            keys: ['hostReward', 'autoHostReward', 'hostMinViewerCount', 'hostMinCount', 'hostMessage',
-                                'autoHostMessage', 'hostHistory', 'hostToggle', 'autoHostToggle'],
-                            values: [hostReward.val(), autoHostReward.val(), hostMinPoints.val(), hostMinAlert.val(),
-                                hostMsg.val(), autoHostMsg.val(), hostHistory, hostToggle, autoHostToggle]
+                            tables: ['settings', 'settings', 'settings', 'settings', 'settings', 'settings'],
+                            keys: ['hostReward', 'hostMinViewerCount', 'hostMinCount', 'hostMessage', 'hostHistory', 'hostToggle'],
+                            values: [hostReward.val(), hostMinPoints.val(), hostMinAlert.val(),
+                                hostMsg.val(), hostHistory, hostToggle]
                         }, function() {
                             socket.sendCommand('alerts_update_host_settings_cmd', 'reloadhost', function() {
                                 // Close the modal.

diff --git a/docs/panel/js/pages/audio/audioHooks.js b/docs/panel/js/pages/audio/audioHooks.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+ * Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/docs/panel/js/pages/commands/aliases.js b/docs/panel/js/pages/commands/aliases.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+ * Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/docs/panel/js/pages/commands/custom.js b/docs/panel/js/pages/commands/custom.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020 phantombot.github.io/PhantomBot
+ * Copyright (C) 2016-2021 phantombot.github.io/PhantomBot
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by