Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 19:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into indev-prism

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-12-29 23:15:41 -05:00
parent 89cea574be be19a08575
commit b5f51d612a
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@@ -6,7 +6,7 @@ is a great boon to your coding process.
## Setup ## Setup
To get ready to work on the codebase, please do the following: To get ready to work on the codebase, please do the following:
1. Fork & clone the repository, and make sure you're on the **indev** branch 1. Fork & clone the repository, and make sure you're on the **master** branch
2. Run `npm install` 2. Run `npm install`
3. If you're working on voice, also run `npm install node-opus` or `npm install opusscript` 3. If you're working on voice, also run `npm install node-opus` or `npm install opusscript`
4. Code your heart out! 4. Code your heart out!

6
deploy/deploy.sh
View File

@@ -19,10 +19,8 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
fi fi
# Ignore travis checking other branches irrelevant to users # Ignore travis checking other branches irrelevant to users
# Apparently Travis considers tag builds as separate branches so we need to if [ "$TRAVIS_BRANCH" == "gh-pages" -o "$TRAVIS_BRANCH" == "gh-pages-dev" -o "$TRAVIS_BRANCH" == "docs" -o "$TRAVIS_BRANCH" == "webpack" -o "$TRAVIS_BRANCH" == "v8" ]; then
# check for that separately echo "deploy.sh: Ignoring push to blacklisted branch"
if [ "$TRAVIS_BRANCH" != "master" -a "$TRAVIS_BRANCH" != "indev" -a "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ]; then
echo "deploy.sh: Ignoring push to another branch than master/indev"
build build
exit 0 exit 0
fi fi

4
src/structures/Guild.js
View File

@@ -542,12 +542,12 @@ class Guild {
* @example * @example
* // see how many members will be pruned * // see how many members will be pruned
* guild.pruneMembers(12, true) * guild.pruneMembers(12, true)
* .then(pruned => console.log(`This will prune ${pruned} people!`); * .then(pruned => console.log(`This will prune ${pruned} people!`))
* .catch(console.error); * .catch(console.error);
* @example * @example
* // actually prune the members * // actually prune the members
* guild.pruneMembers(12) * guild.pruneMembers(12)
* .then(pruned => console.log(`I just pruned ${pruned} people!`); * .then(pruned => console.log(`I just pruned ${pruned} people!`))
* .catch(console.error); * .catch(console.error);
*/ */
pruneMembers(days, dry = false) { pruneMembers(days, dry = false) {