Skip to content

Commit

Permalink
Merge pull request #878 from TheBastionBot/master
Browse files Browse the repository at this point in the history
Bastion 7.8.4
  • Loading branch information
iamtraction authored May 28, 2020
2 parents 1ae0c3f + f4c9cf3 commit 29134a1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
13 changes: 12 additions & 1 deletion .snyk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
version: v1.14.1
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
Expand Down Expand Up @@ -44,3 +44,14 @@ patch:
patched: '2019-10-05T04:47:16.172Z'
- snyk > proxy-agent > pac-proxy-agent > https-proxy-agent:
patched: '2019-10-05T04:47:16.172Z'
SNYK-JS-LODASH-567746:
- cheerio > lodash:
patched: '2020-05-01T04:47:28.685Z'
- sequelize > lodash:
patched: '2020-05-01T04:47:28.685Z'
- gamedig > cheerio > lodash:
patched: '2020-05-01T04:47:28.685Z'
- request-promise-native > request-promise-core > lodash:
patched: '2020-05-01T04:47:28.685Z'
- gamedig > request-promise > request-promise-core > lodash:
patched: '2020-05-01T04:47:28.685Z'
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,3 @@
</a>

</div>

<div align='center'>

<img src="https://i.imgur.com/4C23V1d.png" alt="WARNING" />

</div>
2 changes: 2 additions & 0 deletions commands/music/play.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ exports.exec = async (Bastion, message, args) => {
'--ignore-errors',
'--simulate',
'--no-warnings',
'--force-ipv4',
'--format=bestaudio[protocol^=http]',
`--user-agent=BastionDiscordBot/v${Bastion.package.version} (https://bastion.traction.one)`,
'--referer=https://bastion.traction.one',
Expand Down Expand Up @@ -259,6 +260,7 @@ async function startStreamDispatcher(guild, connection) {
'--ignore-errors',
'--simulate',
'--no-warnings',
'--force-ipv4',
'--format=bestaudio[protocol^=http]',
'--user-agent=BastionDiscordBot (https://bastion.traction.one)',
'--referer=https://bastion.traction.one',
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bastion",
"version": "7.8.3",
"version": "7.8.4",
"description": "Give awesome perks to your Discord server!",
"url": "https://bastion.traction.one/",
"main": "index.js",
Expand Down Expand Up @@ -34,22 +34,22 @@
"color-convert": "~2.0.0",
"command-line-args": "github:k3rn31p4nic/command-line-args",
"cron": "~1.8.2",
"discord.js": "~11.5.0",
"discord.js": "~11.6.1",
"ex.traction": "github:k3rn31p4nic/node-extraction#v1.0.0",
"gamedig": "~2.0.8",
"hirez.js": "~2.0.0",
"locke": "github:TheBastionBot/Locke#v0.9.0",
"lzutf8": "~0.5.5",
"mathjs": "~6.6.0",
"mathjs": "~7.0.0",
"opusscript": "^0.0.7",
"pokedex-api": "~1.1.2",
"request": "~2.88.0",
"request-promise-native": "~1.0.5",
"sequelize": "~5.21.1",
"snekfetch": "~4.0.4",
"snyk": "^1.231.0",
"snyk": "^1.316.1",
"sqlite": "~3.0.0",
"sqlite3": "~4.1.0",
"sqlite3": "~4.2.0",
"tesseract": "github:TheBastionBot/Tesseract#v0.1.1",
"weather-js": "~2.0.0",
"word-definition": "~2.1.6",
Expand Down

0 comments on commit 29134a1

Please sign in to comment.