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

fix(Channel#startTyping): less breaking (#2232)

Browse Source 
* fix(Channel#startTyping): less breaking

* silent

* appelation suggestion

* space suggestion
This commit is contained in:
Isabella
2018-01-11 10:18:40 -06:00
committed by Amish Shah
parent 0821acfa99
commit 2efe2d28f2
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/structures/interfaces/TextBasedChannel.js
View File

@@ -259,42 +259,31 @@ class TextBasedChannel {
/** /**
* Starts a typing indicator in the channel. * Starts a typing indicator in the channel.
* @param {number} [count] The number of times startTyping should be considered to have been called * @param {number} [count] The number of times startTyping should be considered to have been called
* @returns {Promise}
* @example * @example
* // Start typing in a channel * // Start typing in a channel
* channel.startTyping() * channel.startTyping();
* .then(console.log)
* .catch(console.error);
*/ */
startTyping(count) { startTyping(count) {
if (typeof count !== 'undefined' && count < 1) throw new RangeError('Count must be at least 1.'); if (typeof count !== 'undefined' && count < 1) throw new RangeError('Count must be at least 1.');
if (this.client.user._typing.has(this.id)) { if (this.client.user._typing.has(this.id)) {
const entry = this.client.user._typing.get(this.id); const entry = this.client.user._typing.get(this.id);
entry.count = count || entry.count + 1; entry.count = count || entry.count + 1;
return entry.promise;
} }
const entry = {}; const entry = {
entry.promise = new Promise((resolve, reject) => { count: count || 1,
Object.assign(entry, { interval: this.client.setInterval(() => {
count: count || 1, this.client.rest.methods.sendTyping(this.id).catch(() => {
interval: this.client.setInterval(() => { this.client.clearInterval(entry.interval);
this.client.rest.methods.sendTyping(this.id).catch(error => { this.client.user._typing.delete(this.id);
this.client.clearInterval(entry.interval); });
this.client.user._typing.delete(this.id); }, 9000),
reject(error); };
}); this.client.rest.methods.sendTyping(this.id).catch(() => {
}, 9000), this.client.clearInterval(entry.interval);
resolve, this.client.user._typing.delete(this.id);
});
this.client.rest.methods.sendTyping(this.id).catch(error => {
this.client.clearInterval(entry.interval);
this.client.user._typing.delete(this.id);
reject(error);
});
this.client.user._typing.set(this.id, entry);
}); });
return entry.promise; this.client.user._typing.set(this.id, entry);
} }
/** /**