Skip to content

Commit

Permalink
Merge pull request #2342 from gmt2001/patch-119
Browse files Browse the repository at this point in the history
Patch 119
  • Loading branch information
gmt2001 committed Jul 28, 2020
2 parents bd04f55 + 27615ac commit 44873ee
Show file tree
Hide file tree
Showing 594 changed files with 599 additions and 599 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!--
Copyright (C) 2016-2020 phantombot.tv
Copyright (C) 2016-2020 phantom.bot
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
Expand All @@ -25,7 +25,7 @@

<property environment="env" />
<!-- Please see this for version numbers: https://semver.org/ -->
<property name="version" value="3.2.3" />
<property name="version" value="3.3.0" />
<!-- Please see this for version numbers: https://semver.org/ -->
<property name="webpanel.version" value="1.1.0" />
<property name="src" location="source" />
Expand Down
2 changes: 1 addition & 1 deletion development-resources/jlink-jdk11-linux.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down
2 changes: 1 addition & 1 deletion development-resources/jlink-jdk11-macos.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down
2 changes: 1 addition & 1 deletion development-resources/jlink-jdk11.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off
REM
REM Copyright (C) 2016-2020 phantombot.tv
REM Copyright (C) 2016-2020 phantom.bot
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
Expand Down
2 changes: 1 addition & 1 deletion development-resources/launch-jdb.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off

REM
REM Copyright (C) 2016-2019 phantombot.tv
REM Copyright (C) 2016-2020 phantom.bot
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
Expand Down
2 changes: 1 addition & 1 deletion development-resources/parse_commandpath.pl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl

#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down
2 changes: 1 addition & 1 deletion development-resources/parse_commandpath_to_json.pl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl

#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down
2 changes: 1 addition & 1 deletion development-resources/parse_discordcommandpath.pl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl

#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2016-2020 phantombot.tv
# Copyright (C) 2016-2020 phantom.bot
#
# 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
Expand Down Expand Up @@ -62,7 +62,7 @@ services:
PHANTOMBOT_USER:
# Twitch bot user OAuth token (https://twitchapps.com/tmi/) (Required)
PHANTOMBOT_OAUTH:
# Twitch caster channel OAuth token (https://phantombot.tv/oauth/)
# Twitch caster channel OAuth token (https://phantom.bot/oauth/)
PHANTOMBOT_APIOAUTH:
# Twitch caster channel (Required)
PHANTOMBOT_CHANNEL:
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (C) 2016-2020 phantombot.tv
Copyright (C) 2016-2020 phantom.bot
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
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (C) 2016-2020 phantombot.tv
Copyright (C) 2016-2020 phantom.bot
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
Expand Down
2 changes: 1 addition & 1 deletion docs/oauth/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (C) 2016-2020 phantombot.tv
Copyright (C) 2016-2020 phantom.bot
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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (C) 2016-2020 phantombot.tv
Copyright (C) 2016-2020 phantom.bot
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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/alerts/alerts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/audio/audioHooks.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/commands/aliases.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/commands/custom.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/commands/default.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/dashboard/dashboard.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/discord/discordAlerts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/discord/discordCustomCommands.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/discord/discordDefaultCommands.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/discord/discordGames.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/discord/discordKeywords.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/discord/discordLogs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/betting.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/commercials.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/deathcounter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/dualstream.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/highlights.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/polls.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/extra/queue.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/games/games.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/giveaways/auction.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/giveaways/raffle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
3/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/giveaways/ticketRaffle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/global.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/help/help.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/history/hostHistory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/history/raidHistory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/history/tipsHistory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/keywords/keywords.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/loyalty/currency.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/loyalty/leaderboard.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/loyalty/loyalty.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/moderation/blacklist.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/moderation/filters.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/moderation/whitelist.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/permissions/permissions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion docs/panel/js/pages/quotes/quotes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 phantombot.tv
* Copyright (C) 2016-2020 phantom.bot
*
* 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
Expand Down

0 comments on commit 44873ee

Please sign in to comment.