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

fixed mentions even though they will be changed in the future... why

Browse Source
This commit is contained in:
Amish Shah
2015-12-19 21:22:06 +00:00
parent 941fd2fe98
commit 90045db92d
7 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Client/InternalClient.js
View File

@@ -393,7 +393,9 @@ export default class InternalClient {
.then(destination => {
//var destination;
var content = this.resolver.resolveString(_content);
var mentions = this.resolver.resolveMentions(content);
var resolved = this.resolver.resolveMentions(content);
var mentions = resolved[0], content = resolved[1];
return this.apiRequest("post", Endpoints.CHANNEL_MESSAGES(destination.id), true, {
content: content,

7
src/Client/Resolver/Resolver.js
View File

@@ -84,10 +84,13 @@ export default class Resolver {
resolveMentions(resource) {
// resource is a string
var _mentions = [];
var changed = resource;
for (var mention of (resource.match(/<@[^>]*>/g) || [])) {
_mentions.push(mention.substring(2, mention.length - 1));
let userID = mention.substring(2, mention.length - 1);
_mentions.push(userID);
changed = changed.replace(new RegExp(mention, "g"), `@${this.internal.client.users.get("id", userID).username}`);
}
return _mentions;
return [_mentions, changed];
}
resolveString(resource) {

3
src/Voice/VoiceConnection.js
View File

@@ -256,9 +256,10 @@ export default class VoiceConnection extends EventEmitter {
init() {
var self = this;
console.log("\n\nendpoint:", this.endpoint, "\n\n");
dns.lookup(this.endpoint, (err, address, family) => {
this.endpoint = address;
var vWS = self.vWS = new WebSocket("wss://" + this.endpoint, null, { rejectUnauthorized: false });
this.endpoint = address;
var udpClient = self.udp = udp.createSocket("udp4");
var firstPacket = true;