dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-19 14:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #342, #321

Browse source
This commit is contained in:
abalabahaha 2016-05-11 20:21:37 -07:00
parent 0e5a1d2df7
commit db7dca65b2
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Client/InternalClient.js
View file

@ -2320,6 +2320,9 @@ var InternalClient = (function () {
break;
case _Constants.PacketType.FRIEND_ADD:
if (_this41.user.bot) {
return;
}
if (data.type === 1) {
// accepted/got accepted a friend request
var inUser = self.incoming_friend_requests.get("id", data.id);
@ -2348,6 +2351,9 @@ var InternalClient = (function () {
}
break;
case _Constants.PacketType.FRIEND_REMOVE:
if (_this41.user.bot) {
return;
}
var user = self.friends.get("id", data.id);
if (user) {
self.friends.remove(user);

2
lib/Client/Resolver/Resolver.js
View file

@ -211,7 +211,7 @@ var Resolver = (function () {
var user = this.internal.users.get("id", mention.substring(3, mention.length - 1));
if (user) {
_mentions.push(user);
var details = channel.server.detailsOf(user);
var details = channel.server && channel.server.detailsOf(user);
if (details) {
changed = changed.replace(new RegExp(mention, "g"), "@" + (details.nick || user.username + "#" + user.discriminator));
}

6
src/Client/InternalClient.js
View file

@ -2003,6 +2003,9 @@ export default class InternalClient {
break;
case PacketType.FRIEND_ADD:
if (this.user.bot) {
return;
}
if (data.type === 1) { // accepted/got accepted a friend request
var inUser = self.incoming_friend_requests.get("id", data.id);
if (inUser) {
@ -2030,6 +2033,9 @@ export default class InternalClient {
}
break;
case PacketType.FRIEND_REMOVE:
if (this.user.bot) {
return;
}
var user = self.friends.get("id", data.id);
if (user) {
self.friends.remove(user);

2
src/Client/Resolver/Resolver.js
View file

@ -140,7 +140,7 @@ export default class Resolver {
var user = this.internal.users.get("id", mention.substring(3, mention.length - 1));
if (user) {
_mentions.push(user);
var details = channel.server.detailsOf(user);
var details = channel.server && channel.server.detailsOf(user);
if (details) {
changed = changed.replace(new RegExp(mention, "g"), `@${details.nick || (user.username + "#" + user.discriminator)}`);
}