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

Merge pull request #278 from nicholastay/275_friendfix

Browse Source 
Friend request remove packet fixes
This commit is contained in:
abalabahaha
2016-04-16 23:15:42 -07:00
parent a3cd539eac 41ead870b7
commit 0d2b504bde
2 changed files with 2394 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2490
lib/Client/InternalClient.js
View File

File diff suppressed because one or more lines are too long

24
src/Client/InternalClient.js
View File

@@ -1998,14 +1998,30 @@ export default class InternalClient {
}
user = self.incoming_friend_requests.get("id", data.id);
if (user) { // they rejected friend request
client.emit("friendRequestRejected", self.outgoing_friend_requests.remove(user));
if (user) { // they rejected outgoing friend request OR client user manually deleted incoming thru web client/other clients
var rejectedUser = self.outgoing_friend_requests.get("id", user.id);
if (rejectedUser) {
// other person rejected outgoing
client.emit("friendRequestRejected", self.outgoing_friend_requests.remove(rejectedUser));
return;
}
// incoming deleted manually
self.incoming_friend_requests.remove(user);
return;
}
user = self.outgoing_friend_requests.get("id", data.id);
if (user) {// client cancelled friend request
self.incoming_friend_requests.remove(user);
if (user) { // client cancelled incoming friend request OR client user manually deleted outgoing thru web client/other clients
var incomingCancel = self.incoming_friend_requests.get("id", user.id);
if (incomingCancel) {
// client cancelled incoming
self.incoming_friend_requests.remove(user);
return;
}
// outgoing deleted manually
self.outgoing_friend_requests.remove(user);
return;
}
break;