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

fix travis bugs and mentions

Browse Source
This commit is contained in:
Amish Shah
2015-12-23 22:36:22 +00:00
parent 7d9b8a9b5b
commit 2253560631
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Client/InternalClient.js
View File

@@ -494,14 +494,9 @@ var InternalClient = (function () {
return this.resolver.resolveChannel(where).then(function (destination) { return this.resolver.resolveChannel(where).then(function (destination) {
//var destination; //var destination;
var content = _this10.resolver.resolveString(_content); var content = _this10.resolver.resolveString(_content);
var resolved = _this10.resolver.resolveMentions(content);
var mentions = resolved[0],
content = resolved[1];
return _this10.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(destination.id), true, { return _this10.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(destination.id), true, {
content: content, content: content,
mentions: mentions,
tts: options.tts tts: options.tts
}).then(function (res) { }).then(function (res) {
return destination.messages.add(new _StructuresMessage2["default"](res, destination, _this10.client)); return destination.messages.add(new _StructuresMessage2["default"](res, destination, _this10.client));
@@ -543,12 +538,10 @@ var InternalClient = (function () {
} }
var content = this.resolver.resolveString(_content); var content = this.resolver.resolveString(_content);
var mentions = this.resolver.resolveMentions(content);
return this.apiRequest("patch", _Constants.Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id), true, { return this.apiRequest("patch", _Constants.Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id), true, {
content: content, content: content,
tts: options.tts, tts: options.tts
mentions: mentions
}).then(function (res) { }).then(function (res) {
return message.channel.messages.update(message, new _StructuresMessage2["default"](res, message.channel, _this12.client)); return message.channel.messages.update(message, new _StructuresMessage2["default"](res, message.channel, _this12.client));
}); });

8
src/Client/InternalClient.js
View File

@@ -392,13 +392,9 @@ export default class InternalClient {
.then(destination => { .then(destination => {
//var destination; //var destination;
var content = this.resolver.resolveString(_content); var content = this.resolver.resolveString(_content);
var resolved = this.resolver.resolveMentions(content);
var mentions = resolved[0], content = resolved[1];
return this.apiRequest("post", Endpoints.CHANNEL_MESSAGES(destination.id), true, { return this.apiRequest("post", Endpoints.CHANNEL_MESSAGES(destination.id), true, {
content: content, content: content,
mentions: mentions,
tts: options.tts tts: options.tts
}) })
.then(res => .then(res =>
@@ -432,7 +428,6 @@ export default class InternalClient {
} }
var content = this.resolver.resolveString(_content); var content = this.resolver.resolveString(_content);
var mentions = this.resolver.resolveMentions(content);
return this.apiRequest( return this.apiRequest(
"patch", "patch",
@@ -440,8 +435,7 @@ export default class InternalClient {
true, true,
{ {
content: content, content: content,
tts: options.tts, tts: options.tts
mentions: mentions
} }
) )
.then(res => message.channel.messages.update( .then(res => message.channel.messages.update(