From 906bb3c5f3049717ab79a39609c060d6cfb2c8f1 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 14 Dec 2016 21:35:40 +0100 Subject: [PATCH] Utilise Collection#equals for structures' equals (#986) Utilizing Collection.equals in GuildChannel.equals Utilizing Collection.equals in GroupDMChannel.equals --- src/structures/GroupDMChannel.js | 5 +---- src/structures/GuildChannel.js | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/structures/GroupDMChannel.js b/src/structures/GroupDMChannel.js index c79b6dcaa..7f1ab8ea9 100644 --- a/src/structures/GroupDMChannel.js +++ b/src/structures/GroupDMChannel.js @@ -1,7 +1,6 @@ const Channel = require('./Channel'); const TextBasedChannel = require('./interface/TextBasedChannel'); const Collection = require('../util/Collection'); -const arraysEqual = require('../util/ArraysEqual'); /* { type: 3, @@ -101,9 +100,7 @@ class GroupDMChannel extends Channel { this.ownerID === channel.ownerID; if (equal) { - const thisIDs = this.recipients.keyArray(); - const otherIDs = channel.recipients.keyArray(); - return arraysEqual(thisIDs, otherIDs); + return this.recipients.equals(channel.recipients); } return equal; diff --git a/src/structures/GuildChannel.js b/src/structures/GuildChannel.js index db59f7447..807150e9a 100644 --- a/src/structures/GuildChannel.js +++ b/src/structures/GuildChannel.js @@ -4,7 +4,6 @@ const PermissionOverwrites = require('./PermissionOverwrites'); const EvaluatedPermissions = require('./EvaluatedPermissions'); const Constants = require('../util/Constants'); const Collection = require('../util/Collection'); -const arraysEqual = require('../util/ArraysEqual'); /** * Represents a guild channel (i.e. text channels and voice channels) @@ -273,9 +272,7 @@ class GuildChannel extends Channel { if (equal) { if (this.permissionOverwrites && channel.permissionOverwrites) { - const thisIDSet = this.permissionOverwrites.keyArray(); - const otherIDSet = channel.permissionOverwrites.keyArray(); - equal = arraysEqual(thisIDSet, otherIDSet); + equal = this.permissionOverwrites.equals(channel.permissionOverwrites); } else { equal = !this.permissionOverwrites && !channel.permissionOverwrites; }