dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-05-26 13:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1996 commits 8 branches 50 tags 70 MiB
Commit graph

670 commits

Author SHA1 Message Date
Schuyler Cebulskie
36f4df2931 Capitalise two letters 2016-09-26 23:18:39 -04:00
Schuyler Cebulskie
ecbc591c95 Update setStatus docs for DND, other docs - setStatus code needs updating 2016-09-26 23:16:29 -04:00
Schuyler Cebulskie
9ebe5e64b7 Fix Hydra's disregard of the alphabet 2016-09-26 22:58:23 -04:00
Schuyler Cebulskie
ef63f0ee8b Merge branch 'indev' of https://github.com/hydrabolt/discord.js into indev 2016-09-26 22:56:11 -04:00
Schuyler Cebulskie
e5f4823bd4 Document do not disturb 2016-09-26 22:56:07 -04:00
Schuyler Cebulskie
0c0c1da0d5 Fix Presence/Game.equals with null/undefined 2016-09-26 22:53:35 -04:00
Schuyler Cebulskie
909af2084f Clean up Presence 2016-09-26 22:53:08 -04:00
Schuyler Cebulskie
f2cd48d94b Reorganise Presence 2016-09-26 22:50:26 -04:00
Gus Caplan
3e9253827f add manage emojis constant (#744) 
* add manage emojis constant

* this is why you don't commit on github i guess
 2016-09-26 21:07:16 -04:00
Gus Caplan
c8761d72de add guild emoji methods (#742) 
* add guild emoji methods

* run docs

* crawl pointed out some things about the docs, so i fixed

* actually run the docs on the changes 🤦
 2016-09-26 21:39:07 +01:00
Gus Caplan
b4f3575335 i am facepalming so hard right now (#740) 2016-09-26 03:55:54 -07:00
Amish Shah
f1cb39a319 Expose Presence and Game structures 2016-09-25 20:17:35 +01:00
Amish Shah
534d7af8c3 Fix resuming sessions (fixes #699) 2016-09-25 15:03:54 +01:00
Amish Shah
761b8cfb8d fix docs 2016-09-25 14:28:51 +01:00
Amish Shah
03651fd6e3 Change how presences are handled 2016-09-25 14:16:03 +01:00
Amish Shah
0e8f1bef97 Stop comparing for equality on update events and just emit for performance 2016-09-25 11:24:02 +01:00
Gus Caplan
c8636fd277 fix heartbeat (#737) 2016-09-24 23:56:18 -07:00
Amish Shah
725da8d8a5 Merge branch 'bugfix/docs' of https://github.com/hkwu/discord.js into hkwu-bugfix/docs 2016-09-24 19:53:23 +01:00
Amish Shah
14b8360453 fix doc issue with role 2016-09-24 19:47:50 +01:00
Kelvin Wu
a38f34899d Merge remote-tracking branch 'upstream/indev' into bugfix/docs 2016-09-24 14:10:04 -04:00
Amish Shah
aef0b83c34 comply to the latest rate limit stuff (hammerandchisel/discord-api-docs#108) 2016-09-24 18:19:18 +01:00
Gus Caplan
bd1449bc5a make login sane (#735) 2016-09-24 17:55:31 +01:00
Kelvin Wu
bd465108a7 Fix return type in docs. 2016-09-24 11:58:51 -04:00
Schuyler Cebulskie
116e6bb4c8 Clean up totalShards default 2016-09-24 02:46:55 -04:00
Schuyler Cebulskie
d9bc5cea1e Small cleanups 2016-09-24 02:43:27 -04:00
Schuyler Cebulskie
13e2b923e8 Return existing promise instead of failing, mark 2 2016-09-24 02:29:15 -04:00
Schuyler Cebulskie
f1bfd55233 Fix Guild.createChannel example 2016-09-24 02:21:06 -04:00
Schuyler Cebulskie
d62551bea2 Remove old code 2016-09-24 02:20:48 -04:00
Schuyler Cebulskie
1008f601f4 Add shard client prop fetching, remove guild count fetching, improve eval 2016-09-24 02:12:45 -04:00
Schuyler Cebulskie
e4f416ae6c Add shard eval, broadcastEval, and fix fetchGuildCount response 2016-09-24 01:21:41 -04:00
Schuyler Cebulskie
65b93532ce Add additional shard count checks 2016-09-24 00:51:31 -04:00
Schuyler Cebulskie
5ea62e63ab Improve sharding some more 2016-09-24 00:44:47 -04:00
Kelvin Wu
fa18b0c6c9 Handle DM messages in cleanContent getter. (#726) 
* Handle DM messages in cleanContent getter. Closes #725.

* Fix build error, improve handling for user IDs.

* Update docblock to be more specific about behaviour.

* Handle group DMs in cleanContent.

* Regen docs.
 2016-09-24 00:23:12 -04:00
Gus Caplan
063be5cee2 smarter sharding™ (#732) 2016-09-23 21:43:16 +01:00
Gus Caplan
fc9d049cc1 make shardmanager better (#731) 
* add respawn thing for shards, and make it easier to recieve messages from shards

* run docs
 2016-09-23 18:36:14 +01:00
Schuyler Cebulskie
4bf6ad30f3 Remove a line 2016-09-22 23:10:00 -04:00
Schuyler Cebulskie
90f05a34cb Return the existing promise instead of erroring 2016-09-22 23:01:37 -04:00
Schuyler Cebulskie
7f652f7df8 Add delay param to ShardingManager.spawn 2016-09-22 22:51:58 -04:00
Schuyler Cebulskie
3fa4ff13e3 Add ShardingManager.fetchGuildCount 2016-09-22 22:48:21 -04:00
Schuyler Cebulskie
9d94fbfbcb Document and change launch event params 2016-09-22 22:06:56 -04:00
Schuyler Cebulskie
b795ed8109 Overhaul sharding broadcast/send 2016-09-22 22:03:10 -04:00
Schuyler Cebulskie
737ad8e92b Slightly improve some Collection docs 2016-09-22 21:36:06 -04:00
Gus Caplan
edd174a5eb Add ShardingManager#send and ShardingManager#broadcast (#730) 
* add ShardingManager#send and ShardingManager#broadcast

* make gawdl3y happy

* Fix a thing
 2016-09-22 21:35:08 -04:00
Gus Caplan
e86b93b34f fix docs because gawdl3y forgot >:( (#724) 2016-09-22 02:25:08 -07:00
Schuyler Cebulskie
8af96810dd Rename Guild.prune to pruneMembers 2016-09-21 16:05:33 -04:00
Schuyler Cebulskie
6ba0dd26a6 Reorganise Guild methods 2016-09-21 16:04:33 -04:00
Schuyler Cebulskie
e9a7a06d52 Improve docs for voiceConnection/connection 2016-09-21 16:03:05 -04:00
Schuyler Cebulskie
a27f6c96bb Fix & clean up Guild.voiceConnection and VoiceChannel.connection 2016-09-21 16:01:08 -04:00
Gus Caplan
15d7f8e2fe Add Guild#prune (#723) 
* make all changes neat

* run docs build
 2016-09-21 15:57:14 -04:00
Schuyler Cebulskie
529d7207da Add Role.mentionable 2016-09-21 15:15:47 -04:00
Jacob
126865384e Compensate for API's stupid-ass positions in highestRole (#721) 
* fix edge cases of highestRole not returning the highest role

* fix line length

* move space

* Fix formatting
 2016-09-21 01:31:33 -04:00
Schuyler Cebulskie
46c28c0d05 Add Role.members 2016-09-20 23:27:56 -04:00
Schuyler Cebulskie
aa9fdf2e26 Small cleanups 2016-09-20 23:09:02 -04:00
Schuyler Cebulskie
468077ce96 Merge branch 'master' into indev 2016-09-20 23:02:56 -04:00
Matteo Rizzo
f383c78414 Fix VoiceConnection.playConvertedStream not playing anything (#708) 2016-09-20 23:01:02 -04:00
Schuyler Cebulskie
e5bac1339d Improve Client.sweepMessages 2016-09-20 10:57:39 -04:00
Schuyler Cebulskie
6075ec0e19 Add more detail to debug message 2016-09-20 01:25:19 -04:00
Schuyler Cebulskie
8f1bc5edab Add swept messages counter and debug message 2016-09-20 01:14:15 -04:00
Schuyler Cebulskie
5a9753e461 Double-fix my double-derp 2016-09-19 20:07:30 -04:00
Schuyler Cebulskie
0559aaf00b Fix my derp 2016-09-19 20:01:20 -04:00
Schuyler Cebulskie
718f61a732 Fix various Guild properties getting unset 2016-09-19 19:36:14 -04:00
Schuyler Cebulskie
9ad4e27ce5 Add note about bot accounts to bulkDelete 2016-09-19 18:12:21 -04:00
Schuyler Cebulskie
9503990a86 Rename max_message_lifetime to message_cache_lifetime 2016-09-19 17:52:11 -04:00
Schuyler Cebulskie
a2778d4a96 Fix resolveFile on nonexistent paths (#717) 2016-09-19 16:58:15 -04:00
Schuyler Cebulskie
afc8e5bee0 Add message sweeping 2016-09-19 16:52:46 -04:00
Schuyler Cebulskie
46d7dedc85 Add Message.editCode 2016-09-19 15:14:51 -04:00
Gus Caplan
e0b614c3b2 weee add clyde because we all love clyde (#716) 
* update to work with clyde's avatar image ;)

* add clyde to user cache on ready

* Update Ready.js

* Update Ready.js
 2016-09-19 14:56:52 -04:00
Schuyler Cebulskie
7957bc82cd Fix member nicknames being unset (#703) 2016-09-19 14:45:30 -04:00
Schuyler Cebulskie
3441e2384f Fix tiny-ass typo 2016-09-19 14:42:22 -04:00
Schuyler Cebulskie
3e114b9af7 Normalise some GuildMember values 2016-09-19 14:41:36 -04:00
Schuyler Cebulskie
f3bab30cce Add missing MessageCollector export 2016-09-19 13:52:59 -04:00
Schuyler Cebulskie
c5982b0b90 Made MessageEmbedThumbnail/Provider/Author accessible 2016-09-19 13:46:37 -04:00
Schuyler Cebulskie
cb80d69649 Move MessageCollector into its own file 2016-09-19 13:41:17 -04:00
Schuyler Cebulskie
221fc7a103 Exposed all structures 2016-09-19 13:31:44 -04:00
Schuyler Cebulskie
47d873a8ca Move and improve debug/warn docs 2016-09-19 05:11:35 -04:00
Schuyler Cebulskie
6a94658dd7 Clean up some stuff 2016-09-19 04:32:24 -04:00
Schuyler Cebulskie
6ede7a32fd Switch timeouts/intervals to Sets 2016-09-19 04:16:32 -04:00
Schuyler Cebulskie
7d8667694d Fix massive timeout/interval memory leaks 2016-09-19 03:49:42 -04:00
Schuyler Cebulskie
6f7deba4b3 Fix VoiceConnection client#voiceStateUpdate leak 2016-09-19 02:49:30 -04:00
Schuyler Cebulskie
039315a9a3 Replace local usages of GuildMember.id with user.id 2016-09-19 01:44:46 -04:00
Schuyler Cebulskie
9288cd8563 Replace usages of owner.id with ownerID, and fix GroupDMChannel.equals 2016-09-19 01:43:24 -04:00
Schuyler Cebulskie
77e171e599 Document Guild.ownerID 2016-09-19 01:38:18 -04:00
Schuyler Cebulskie
3fcc5183dc Made GroupDMChannel.owner a getter and add ownerID 2016-09-19 01:36:01 -04:00
Schuyler Cebulskie
b8e3094b14 Add GuildMember.highestRole/kickable/bannable 2016-09-19 01:31:53 -04:00
Schuyler Cebulskie
d8542b3365 Made Message.guild a getter 2016-09-19 00:47:42 -04:00
Schuyler Cebulskie
8603759b5e Add Message.editable/deletable/pinnable 2016-09-19 00:42:58 -04:00
Schuyler Cebulskie
5f9204f57c Improve resolvePermission failure check 2016-09-19 00:19:15 -04:00
Schuyler Cebulskie
336366d653 Bad Hydra. 2016-09-18 23:46:59 -04:00
Schuyler Cebulskie
6c6da43da3 Fix ban/unban with IDs 2016-09-18 23:07:30 -04:00
Schuyler Cebulskie
bbddfef7f6 Add resolveUserID and improve other resolutions 2016-09-18 22:59:38 -04:00
Schuyler Cebulskie
ab7682f921 Tiny text changes 2016-09-17 23:22:15 -04:00
meew0
74b9e5d643 Update default permissions (#706) 
During the nickname update the default value was changed from
36953089 to 104324097 to include some of the new nickname permissions.
 2016-09-15 17:09:57 -07:00
Amish Shah
420f2ecdd4 Add Guild.voiceConnection and VoiceChannel.connection 2016-09-15 15:38:32 +01:00
Schuyler Cebulskie
0405b1a59f Make TextBasedChannel.sendCode escape codeblocks 2016-09-14 21:20:58 -04:00
Amish Shah
9308d2ead3 Address #700 2016-09-14 16:35:38 +01:00
Amish Shah
69f947dfcb Fix #701 2016-09-14 16:24:18 +01:00
Gus Caplan
7cb2e8eef7 add disconnect event, document warn and debug events (#702) 
* add documentation for events, and add a disconnect event, because i know people use that

* generate docs, and fix a hastily copied docstring

* fix permissions freak out
 2016-09-14 00:12:10 -04:00
Schuyler Cebulskie
25531170ec Fix catch in _sendMessageRequest 2016-09-13 21:29:45 -04:00
Schuyler Cebulskie
bb0ca11776 De-stupify RESTMethods.getExistingDM 2016-09-13 20:50:18 -04:00
Amish Shah
b0adc881f3 Maybe fix #694? 2016-09-13 20:30:44 +01:00
Amish Shah
fbcea236c5 Fix avatars not being set on selfbots - fixes #697 2016-09-13 20:21:12 +01:00
Amish Shah
f7e89f61e6 Fix channelCreate being emitted twice - fixes #698 2016-09-13 20:00:00 +01:00
Schuyler Cebulskie
cdf3136cde Make version a regular property instead of getter 2016-09-13 01:34:45 -04:00
Schuyler Cebulskie
ec6453a191 Add version export, and cleanup 2016-09-13 01:32:54 -04:00
Schuyler Cebulskie
136cf66eb0 Fix split prefix with undefined/null lang 2016-09-13 01:18:51 -04:00
Schuyler Cebulskie
862ec6a5be Allow null/undefined TextBasedChannel.sendCode lang 2016-09-13 01:01:11 -04:00
Schuyler Cebulskie
9cd249342b Teensy reorganisation 2016-09-12 21:40:15 -04:00
Schuyler Cebulskie
ac85ffce4b Add Collection.keyArray/firstKey/lastKey/randomKey 2016-09-12 21:39:41 -04:00
Schuyler Cebulskie
84b33f9b66 Add Collection.reduce 2016-09-12 21:33:29 -04:00
Schuyler Cebulskie
0bd00b12b7 Add Invite.url and toString 2016-09-12 21:07:05 -04:00
Schuyler Cebulskie
8bcb670920 Spit-polishing ClientOptions docs 2016-09-12 17:50:24 -04:00
Schuyler Cebulskie
6aa9bfd7f9 More ClientOptions docs cleanup 2016-09-12 17:17:16 -04:00
Schuyler Cebulskie
168ecdf8a9 Reorganise client options and use typedef properties 2016-09-12 17:04:19 -04:00
Schuyler Cebulskie
5464ee7e64 Clean up MessageOptions JSDoc 2016-09-12 16:23:15 -04:00
Amish Shah
02b257e1fc Fix audio playing stupidly fast - fixes #689 2016-09-12 18:23:38 +01:00
Schuyler Cebulskie
5dd25ac1f1 Rename User typing methods 2016-09-12 13:08:11 -04:00
Schuyler Cebulskie
6fb0691a2b Add label for permission strings docs 2016-09-12 13:06:11 -04:00
Schuyler Cebulskie
961346dcaa Inline a line 2016-09-12 13:04:09 -04:00
Schuyler Cebulskie
8984bf332c Capitalised some letters 2016-09-12 13:02:56 -04:00
Amish Shah
ac2ad0dd23 Document PermissionResolvables 2016-09-12 17:58:57 +01:00
Amish Shah
ea55b0efbd Fix receiver.recreate() 2016-09-12 17:43:45 +01:00
Amish Shah
95369b0a89 Add VoiceReceiver.destroy()/recreate(), addresses #693 2016-09-12 17:01:15 +01:00
Amish Shah
b39d959cdf Maybe fix voice and #650? 2016-09-12 16:39:18 +01:00
Schuyler Cebulskie
fba3508079 Add a little more detail about value 2016-09-12 02:52:32 -04:00
Schuyler Cebulskie
2aae20085b Key -> Property 2016-09-12 02:20:53 -04:00
Schuyler Cebulskie
e24c1e55a0 Remove wholly unnecessary example 2016-09-12 00:33:24 -04:00
Schuyler Cebulskie
7457985e60 Fix Collection.findKey doc link 2016-09-12 00:28:27 -04:00
Schuyler Cebulskie
95605863c7 Add Collection.findKey 2016-09-12 00:26:02 -04:00
Schuyler Cebulskie
ac1f5f32e2 Add Collection.find with function 2016-09-12 00:18:21 -04:00
Schuyler Cebulskie
774b4d4694 Fix GuildMember.hasPermission(s) explicit for owner 2016-09-12 00:08:12 -04:00
Schuyler Cebulskie
38c85dc076 Add Role.hasPermissions 2016-09-12 00:06:21 -04:00
Schuyler Cebulskie
46b7628d59 Made hasPermission(s) docs a bit more consistent 2016-09-12 00:04:07 -04:00
Schuyler Cebulskie
ebaaa65741 Make GuildMember.hasPermissions check owner 2016-09-11 23:58:01 -04:00
Schuyler Cebulskie
b88498271c Fix Message.isMentioned(null/undefined) 2016-09-11 23:56:31 -04:00
Schuyler Cebulskie
95de09f389 Reorganised a bunch of methods 2016-09-11 23:55:50 -04:00
Schuyler Cebulskie
ce6cb626dc Add Message.toString 2016-09-11 23:36:24 -04:00
Schuyler Cebulskie
d7bcf9564f Clean up recent User changes a bit 2016-09-11 23:34:09 -04:00
Gus Caplan
032d6613f7 add a message, because WHY THE HELL DID NO ONE EVER DO THIS (#690) 
* add a message, because WHY THE HELL DID NO ONE EVER DO THIS

!!!

* make message better

* make linter happy

* disable max-len rule for line 37

* make gawdl3y be happy

* gawdl3y triggers me

* Update FfmpegConverterEngine.js
 2016-09-11 21:28:17 -04:00
Amish Shah
9059eb13a2 Add passes to streaming voice 2016-09-11 18:49:18 +01:00
Amish Shah
d365eb95e2 document game data #687 2016-09-11 18:23:58 +01:00
Amish Shah
3dab19a3bc Add Client.fetchInvite 2016-09-11 18:19:55 +01:00
Amish Shah
8f1216d9a5 Add StreamDispatcher#start event 2016-09-11 17:39:07 +01:00
Amish Shah
aa5df43c50 Force user.bot to be a boolean 2016-09-11 17:25:16 +01:00
Amish Shah
f0a9a1353f prevent further user inaccuracies 2016-09-11 16:57:09 +01:00
Amish Shah
77e83fb85a Fix voice 😄 2016-09-11 16:41:05 +01:00
Schuyler Cebulskie
a52beaa78d Improve GuildMember.permissionsIn failure 2016-09-11 11:08:54 -04:00
Schuyler Cebulskie
e7eee3410a This is unnecessary. 2016-09-11 10:59:34 -04:00
Schuyler Cebulskie
7ff9ac2bcc Add TextBasedChannel.sendCode and make User/GuildMember partial implementations 2016-09-11 10:55:41 -04:00
Amish Shah
9e05caec0d Add GuildMember.hasPermissions 2016-09-11 12:58:56 +01:00
Amish Shah
3fba72107b Add GuildMember.permissionsIn and make ChannelResolvables more lenient 2016-09-11 12:51:32 +01:00
Amish Shah
7933d755be Fix docs generator and add EvaluatedPermissions.hasPermissions() 2016-09-11 12:44:31 +01:00
Amish Shah
af33b2b5bb fix #684 2016-09-11 12:38:57 +01:00
Amish Shah
5b8f882a0f fix avatars being set to undefined 2016-09-11 11:50:19 +01:00
Schuyler Cebulskie
272555d9ae Better. 2016-09-11 02:18:22 -04:00
Schuyler Cebulskie
350c893ead Add GuildMember.toString 2016-09-11 02:13:49 -04:00
Schuyler Cebulskie
47d71d32f3 Make grammer gooder 2016-09-11 01:40:37 -04:00
Schuyler Cebulskie
0833500d60 Made most object typedefs specify their properties 2016-09-11 01:21:49 -04:00
Schuyler Cebulskie
7da00cf0fe Add long message splitting 2016-09-11 01:01:36 -04:00
Schuyler Cebulskie
68879777d8 Rename EvaluatedPermissions.permission to .raw 2016-09-10 22:37:38 -04:00
Amish Shah
e75dd2638c Add Burst requests - addresses #656 2016-09-10 22:12:10 +01:00
Amish Shah
48f84c6178 Fix nicknames not changing 2016-09-10 21:39:09 +01:00
Amish Shah
de6042a4d7 Merge branch 'master' into indev 2016-09-10 19:30:47 +01:00
Schuyler Cebulskie
3e39861534 Fix #677 2016-09-10 14:22:09 -04:00
Yannick Linke
6a53255ed5 Fixes typo in GuildRoleUpdate's documentation (#679) 
See https://github.com/hydrabolt/discord.js/blob/7fe032c785/src/util/Constants.js#L156
 2016-09-10 14:20:43 -04:00
Schuyler Cebulskie
537b372b42 Fix another ESLint failure 2016-09-10 12:46:22 -04:00
Schuyler Cebulskie
a5a269b940 Fix Hydra's ESLint failure 2016-09-10 12:42:04 -04:00
Schuyler Cebulskie
91a7d4f80e Move channel type to constructors 2016-09-10 12:39:28 -04:00
Amish Shah
3f52ba27c9 DMChannel now uses data manager to instantiate users 2016-09-10 17:31:56 +01:00
Amish Shah
78673139ca Move _typing to constructor 2016-09-10 17:30:20 +01:00
Amish Shah
fd564176ff Have block in place for rare weird typing in voice channel bug 2016-09-10 17:28:51 +01:00
Amish Shah
d7bf40cab0 Simplify APIRequest endpoint 2016-09-10 17:21:15 +01:00
Amish Shah
894115758c Stricter rate-limiting to avoid unlikely 429s 2016-09-10 17:21:04 +01:00
Amish Shah
c6aa16277a Add TextChannel.members 2016-09-10 17:06:10 +01:00
Amish Shah
8c0685fa9a Add StreamDispatcher.time and totalStreamTime, addresses #674 2016-09-10 14:44:52 +01:00
Amish Shah
0d417b6432 Fix voice speed issues, fixes #672 2016-09-10 14:22:14 +01:00
Amish Shah
4255dcd3ca Fix multipart for requests, fixes #675 2016-09-10 12:40:51 +01:00
Amish Shah
84fe65ec78 Fix members being recreated after leaving - fixes #667 2016-09-10 11:38:48 +01:00
Amish Shah
cd404fc7d3 Merge branch 'master' into indev 2016-09-10 11:35:36 +01:00
bdistin
9b45294814 Update Guild.js (#673) 2016-09-10 07:31:37 +01:00
Schuyler Cebulskie
c405d67e09 Add User typing methods 2016-09-09 14:11:30 -04:00
Amish Shah
4278a37e3c maybe fix voice idk 2016-09-09 18:45:33 +01:00
Amish Shah
b7204f33b9 some voice fixes 2016-09-09 18:35:27 +01:00
Amish Shah
f192d16b5b Fix delays inbetween audio streams (#632) 2016-09-09 18:28:21 +01:00
Amish Shah
dd623891e2 websocket should silently error if there are no listeners for error 2016-09-09 17:05:38 +01:00
Amish Shah
e44853ee6d Fix weird bot bug #612 2016-09-09 16:41:57 +01:00
Schuyler Cebulskie
8f9923976f Fix stuff 2016-09-09 11:35:59 -04:00
Amish Shah
dbaaa8dc93 Fix null game objects being defaulted to current game - fixes #666 2016-09-09 16:28:40 +01:00
Amish Shah
85fae72b7b Fix #657 2016-09-09 16:23:07 +01:00
Schuyler Cebulskie
01d032abee Merge remote-tracking branch 'refs/remotes/origin/master' into indev 
# Conflicts:
#	src/structures/Guild.js
 2016-09-09 00:45:35 -04:00
Schuyler Cebulskie
9682adb9fe Clean up PR a bit 2016-09-08 22:59:10 -04:00
Perry Berman
f7a542f12b Add optional streamOptions to playStream() functions (#663) 
* Adding playStream options

Added optional volume and seek properties

* fixed code formatting

Edited my code styling to match with the rest of d.js

* Added Default Variable

* Added Documentation

Added documentation for the streamOptions parameter
Added a default value for seek in FFmpegConverterEngine
Removed redundantcy

* Fixed docs for voiceConnection

* Change _updateMember's notSame check from && to || (#665)

* Fixed git merge fail

* Built Docs. Again.........

* Hopefully finally fixed
 2016-09-08 22:49:52 -04:00
Schuyler Cebulskie
4be7a1bfd1 My ESLint is broken 2016-09-08 22:30:27 -04:00
Schuyler Cebulskie
d42b589528 Rename emailOrToken -> tokenOrEmail 2016-09-08 22:27:38 -04:00
Schuyler Cebulskie
9309b702eb Remove unnecessary default in docs 2016-09-08 22:06:53 -04:00
Schuyler Cebulskie
bbc9df0b0d Improve cleanContent code 2016-09-08 22:05:30 -04:00
Tim Hwang
8f04fae4c0 Change _updateMember's notSame check from && to || (#665) 2016-09-08 21:55:50 -04:00
Kelvin Wu
9888cef486 Add content parameter to sendFile() (#664) 
* Add content arg to sendFile(). Closes #658.

* Shorten this a bit.
 2016-09-08 21:55:18 -04:00
Brian Tanner
47a164bd36 fix epipe when skipping songs, probably fixes econnreset (#662) 2016-09-08 21:53:49 -04:00
Schuyler Cebulskie
a5dfa08777 Revert "Hopefully fix type showing in GuildChannel docs" 
This reverts commit 5563af0da5.
 2016-09-08 19:56:21 -04:00
Schuyler Cebulskie
5563af0da5 Hopefully fix type showing in GuildChannel docs 2016-09-08 19:54:55 -04:00