Merge branch 'master' into indev-prism

This commit is contained in:
Amish Shah
2017-02-22 20:37:59 +00:00
48 changed files with 738 additions and 420 deletions

View File

@@ -6,6 +6,8 @@ exports.Package = require('../../package.json');
* @property {string} [apiRequestMethod='sequential'] One of `sequential` or `burst`. The sequential handler executes
* all requests in the order they are triggered, whereas the burst handler runs multiple in parallel, and doesn't
* provide the guarantee of any particular order.
* <warn>Burst mode is more likely to hit a 429 ratelimit by its nature,
* be advised if you are very unlucky you could be IP banned</warn>
* @property {number} [shardId=0] ID of the shard to run
* @property {number} [shardCount=0] Total number of shards
* @property {number} [messageCacheMaxSize=200] Maximum number of messages to cache per channel
@@ -156,7 +158,7 @@ const Endpoints = exports.Endpoints = {
webhook: (webhookID, token) => `${API}/webhooks/${webhookID}${token ? `/${token}` : ''}`,
// oauth
myApplication: `${API}/oauth2/applications/@me`,
oauth2Application: (appID) => `${API}/oauth2/applications/${appID}`,
getApp: (id) => `${API}/oauth2/authorize?client_id=${id}`,
// emoji
@@ -200,10 +202,10 @@ exports.VoiceStatus = {
};
exports.ChannelTypes = {
text: 0,
TEXT: 0,
DM: 1,
voice: 2,
groupDM: 3,
VOICE: 2,
GROUP_DM: 3,
};
exports.OPCodes = {