Webpack build for branch master: e677543c30

This commit is contained in:
Travis CI 2017-08-17 16:30:31 +00:00
parent 66829a84df
commit 6a84766db1
2 changed files with 16 additions and 22 deletions

View file

@ -164,13 +164,7 @@ const AllowedImageFormats = [
'gif', 'gif',
]; ];
const AllowedImageSizes = [ const AllowedImageSizes = Array.from({ length: 8 }, (e, i) => 2 ** (i + 4));
128,
256,
512,
1024,
2048,
];
function makeImageUrl(root, { format = 'webp', size } = {}) { function makeImageUrl(root, { format = 'webp', size } = {}) {
if (format && !AllowedImageFormats.includes(format)) throw new Error('IMAGE_FORMAT', format); if (format && !AllowedImageFormats.includes(format)) throw new Error('IMAGE_FORMAT', format);
@ -6791,15 +6785,6 @@ class Game {
this.url = data.url || null; this.url = data.url || null;
} }
/**
* Whether or not the game is being streamed
* @type {boolean}
* @readonly
*/
get streaming() {
return this.type === Constants.GameTypes[1];
}
/** /**
* Whether this game is equal to another game * Whether this game is equal to another game
* @param {Game} game The game to compare with * @param {Game} game The game to compare with
@ -18355,6 +18340,7 @@ class ClientUser extends User {
* @property {boolean} [afk] Whether the user is AFK * @property {boolean} [afk] Whether the user is AFK
* @property {Object} [game] Game the user is playing * @property {Object} [game] Game the user is playing
* @property {string} [game.name] Name of the game * @property {string} [game.name] Name of the game
* @property {GameType|number} [game.type] Type of the game
* @property {string} [game.url] Twitch stream URL * @property {string} [game.url] Twitch stream URL
*/ */
@ -18379,7 +18365,7 @@ class ClientUser extends User {
} }
if (data.status) { if (data.status) {
if (typeof data.status !== 'string') throw new TypeError('STATUS_TYPE'); if (typeof data.status !== 'string') throw new TypeError('INVALID_TYPE', 'status', 'string');
if (this.bot) { if (this.bot) {
status = data.status; status = data.status;
} else { } else {
@ -18390,7 +18376,12 @@ class ClientUser extends User {
if (data.game) { if (data.game) {
game = data.game; game = data.game;
if (game.url) game.type = 1; if (typeof game.type === 'string') {
game.type = Constants.GameTypes.indexOf(game.type);
if (game.type === -1) throw new TypeError('INVALID_TYPE', 'type', 'GameType');
} else if (typeof game.type !== 'number') {
game.type = game.url ? 1 : 0;
}
} else if (typeof data.game !== 'undefined') { } else if (typeof data.game !== 'undefined') {
game = null; game = null;
} }
@ -18434,15 +18425,18 @@ class ClientUser extends User {
/** /**
* Sets the game the client user is playing. * Sets the game the client user is playing.
* @param {?string} game Game being played * @param {?string} game Game being played
* @param {string} [streamingURL] Twitch stream URL * @param {Object} [options] Options for setting the game
* @param {string} [options.url] Twitch stream URL
* @param {GameType|number} [options.type] Type of the game
* @returns {Promise<ClientUser>} * @returns {Promise<ClientUser>}
*/ */
setGame(game, streamingURL) { setGame(game, { url, type } = {}) {
if (!game) return this.setPresence({ game: null }); if (!game) return this.setPresence({ game: null });
return this.setPresence({ return this.setPresence({
game: { game: {
name: game, name: game,
url: streamingURL, type,
url,
}, },
}); });
} }

File diff suppressed because one or more lines are too long