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

Add long message splitting

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-09-11 01:01:36 -04:00
parent 68879777d8
commit 7da00cf0fe
5 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/actions/MessageCreate.js
View File

@@ -5,12 +5,22 @@ class MessageCreateAction extends Action {
handle(data) {
const client = this.client;
const channel = client.channels.get(data.channel_id);
const channel = client.channels.get((data instanceof Array ? data[0] : data).channel_id);
if (channel) {
const message = channel._cacheMessage(new Message(channel, data, client));
return {
message,
};
if (data instanceof Array) {
const messages = new Array(data.length);
for (let i = 0; i < data.length; i++) {
messages[i] = channel._cacheMessage(new Message(channel, data[i], client));
}
return {
messages,
};
} else {
const message = channel._cacheMessage(new Message(channel, data, client));
return {
message,
};
}
}
return {

49
src/client/rest/RESTMethods.js
View File

@@ -1,5 +1,6 @@
const Constants = require('../../util/Constants');
const Collection = require('../../util/Collection');
const splitMessage = require('../../util/SplitMessage');
const requireStructure = name => require(`../../structures/${name}`);
const User = requireStructure('User');
@@ -46,36 +47,58 @@ class RESTMethods {
});
}
sendMessage(channel, content, tts, nonce, disableEveryone, file) {
sendMessage(channel, content, { tts, nonce, disable_everyone, split } = {}, file = null) {
return new Promise((resolve, reject) => {
const $this = this;
if (typeof content !== 'undefined') content = this.rest.client.resolver.resolveString(content);
if (disableEveryone || (typeof disableEveryone === 'undefined' && this.rest.client.options.disable_everyone)) {
if (disable_everyone || (typeof disable_everyone === 'undefined' && this.rest.client.options.disable_everyone)) {
content = content.replace('@everyone', '@\u200beveryone').replace('@here', '@\u200bhere');
}
function req() {
$this.rest.makeRequest('post', Constants.Endpoints.channelMessages(channel.id), true, {
content, tts, nonce,
}, file)
.then(data => resolve($this.rest.client.actions.MessageCreate.handle(data).message))
.catch(reject);
}
if (split) content = splitMessage(content, typeof split === 'object' ? split : {});
if (channel instanceof User || channel instanceof GuildMember) {
this.createDM(channel).then(chan => {
channel = chan;
req();
this._sendMessageRequest(channel, content, file, tts, nonce, resolve, reject);
})
.catch(reject);
} else {
req();
this._sendMessageRequest(channel, content, file, tts, nonce, resolve, reject);
}
});
}
_sendMessageRequest(channel, content, file, tts, nonce, resolve, reject) {
if (content instanceof Array) {
const datas = [];
const promise = this.rest.makeRequest('post', Constants.Endpoints.channelMessages(channel.id), true, {
content: content[0], tts, nonce,
}, file);
for (let i = 1; i <= content.length; i++) {
if (i < content.length) {
promise.then(data => {
datas.push(data);
return this.rest.makeRequest('post', Constants.Endpoints.channelMessages(channel.id), true, {
content: content[i], tts, nonce,
}, file);
});
} else {
promise.then(data => {
datas.push(data);
resolve(this.rest.client.actions.MessageCreate.handle(datas).messages).catch(reject);
});
}
}
} else {
this.rest.makeRequest('post', Constants.Endpoints.channelMessages(channel.id), true, {
content, tts, nonce,
}, file)
.then(data => resolve(this.rest.client.actions.MessageCreate.handle(data).message))
.catch(reject);
}
}
deleteMessage(message) {
return new Promise((resolve, reject) => {
this.rest.makeRequest('del', Constants.Endpoints.channelMessage(message.channel.id, message.id), true)