This commit is contained in:
Travis CI 2017-01-03 23:50:27 +00:00
parent 9dc4ab6870
commit 9b6797aa92
2 changed files with 16 additions and 10 deletions

View file

@ -2738,8 +2738,8 @@ class TextBasedChannel {
* content: 'discord.js', * content: 'discord.js',
* before: '2016-11-17' * before: '2016-11-17'
* }).then(res => { * }).then(res => {
* const hit = res[0].find(m => m.hit).content; * const hit = res.messages[0].find(m => m.hit).content;
* console.log(`I found: **${hit}**`); * console.log(`I found: **${hit}**, total results: ${res.totalResults}`);
* }).catch(console.error); * }).catch(console.error);
*/ */
search(options) { search(options) {
@ -3289,8 +3289,8 @@ class Guild {
* content: 'discord.js', * content: 'discord.js',
* before: '2016-11-17' * before: '2016-11-17'
* }).then(res => { * }).then(res => {
* const hit = res[0].find(m => m.hit).content; * const hit = res.messages[0].find(m => m.hit).content;
* console.log(`I found: **${hit}**`); * console.log(`I found: **${hit}**, total results: ${res.totalResults}`);
* }).catch(console.error); * }).catch(console.error);
*/ */
search(options) { search(options) {
@ -21957,9 +21957,15 @@ class RESTMethods {
} }
const url = `${Constants.Endpoints[`${type}Search`](target.id)}?${queryString}`; const url = `${Constants.Endpoints[`${type}Search`](target.id)}?${queryString}`;
return this.rest.makeRequest('get', url, true).then(body => return this.rest.makeRequest('get', url, true).then(body => {
body.messages.map(x => x.map(m => new Message(this.client.channels.get(m.channel_id), m, this.client))) const messages = body.messages.map(x =>
); x.map(m => new Message(this.client.channels.get(m.channel_id), m, this.client))
);
return {
totalResults: body.total_results,
messages,
};
});
} }
createChannel(guild, channelName, channelType, overwrites) { createChannel(guild, channelName, channelType, overwrites) {
@ -24403,7 +24409,7 @@ module.exports = function TransformSearchOptions(options, client) {
if (!(options.during instanceof Date)) options.during = new Date(options.during); if (!(options.during instanceof Date)) options.during = new Date(options.during);
const t = options.during.getTime() - 14200704e5; const t = options.during.getTime() - 14200704e5;
options.minID = long.fromNumber(t).shiftLeft(22).toString(); options.minID = long.fromNumber(t).shiftLeft(22).toString();
options.maxID = long.fromNumber(t + 86400000).shift(222).toString(); options.maxID = long.fromNumber(t + 86400000).shiftLeft(22).toString();
} }
if (options.channel) options.channel = client.resolver.resolveChannelID(options.channel); if (options.channel) options.channel = client.resolver.resolveChannelID(options.channel);

File diff suppressed because one or more lines are too long