mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-19 21:13:30 +01:00
fix(GuildChannel): Add missing 'cache' property (#6019)
This commit is contained in:
@@ -98,12 +98,15 @@ class GuildChannel extends Channel {
|
|||||||
if (!this.parent) return null;
|
if (!this.parent) return null;
|
||||||
|
|
||||||
// Get all overwrites
|
// Get all overwrites
|
||||||
const overwriteIds = new Set([...this.permissionOverwrites.keys(), ...this.parent.permissionOverwrites.keys()]);
|
const overwriteIds = new Set([
|
||||||
|
...this.permissionOverwrites.cache.keys(),
|
||||||
|
...this.parent.permissionOverwrites.cache.keys(),
|
||||||
|
]);
|
||||||
|
|
||||||
// Compare all overwrites
|
// Compare all overwrites
|
||||||
return [...overwriteIds].every(key => {
|
return [...overwriteIds].every(key => {
|
||||||
const channelVal = this.permissionOverwrites.get(key);
|
const channelVal = this.permissionOverwrites.cache.get(key);
|
||||||
const parentVal = this.parent.permissionOverwrites.get(key);
|
const parentVal = this.parent.permissionOverwrites.cache.get(key);
|
||||||
|
|
||||||
// Handle empty overwrite
|
// Handle empty overwrite
|
||||||
if (
|
if (
|
||||||
@@ -158,7 +161,7 @@ class GuildChannel extends Channel {
|
|||||||
let memberOverwrites;
|
let memberOverwrites;
|
||||||
let everyoneOverwrites;
|
let everyoneOverwrites;
|
||||||
|
|
||||||
for (const overwrite of this.permissionOverwrites.values()) {
|
for (const overwrite of this.permissionOverwrites.cache.values()) {
|
||||||
if (overwrite.id === this.guild.id) {
|
if (overwrite.id === this.guild.id) {
|
||||||
everyoneOverwrites = overwrite;
|
everyoneOverwrites = overwrite;
|
||||||
} else if (roles.has(overwrite.id)) {
|
} else if (roles.has(overwrite.id)) {
|
||||||
@@ -210,8 +213,8 @@ class GuildChannel extends Channel {
|
|||||||
rolePermissions(role) {
|
rolePermissions(role) {
|
||||||
if (role.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) return new Permissions(Permissions.ALL).freeze();
|
if (role.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) return new Permissions(Permissions.ALL).freeze();
|
||||||
|
|
||||||
const everyoneOverwrites = this.permissionOverwrites.get(this.guild.id);
|
const everyoneOverwrites = this.permissionOverwrites.cache.get(this.guild.id);
|
||||||
const roleOverwrites = this.permissionOverwrites.get(role.id);
|
const roleOverwrites = this.permissionOverwrites.cache.get(role.id);
|
||||||
|
|
||||||
return role.permissions
|
return role.permissions
|
||||||
.remove(everyoneOverwrites?.deny ?? Permissions.defaultBit)
|
.remove(everyoneOverwrites?.deny ?? Permissions.defaultBit)
|
||||||
@@ -518,7 +521,7 @@ class GuildChannel extends Channel {
|
|||||||
*/
|
*/
|
||||||
clone(options = {}) {
|
clone(options = {}) {
|
||||||
return this.guild.channels.create(options.name ?? this.name, {
|
return this.guild.channels.create(options.name ?? this.name, {
|
||||||
permissionOverwrites: this.permissionOverwrites,
|
permissionOverwrites: this.permissionOverwrites.cache,
|
||||||
topic: this.topic,
|
topic: this.topic,
|
||||||
type: this.type,
|
type: this.type,
|
||||||
nsfw: this.nsfw,
|
nsfw: this.nsfw,
|
||||||
@@ -549,7 +552,7 @@ class GuildChannel extends Channel {
|
|||||||
|
|
||||||
if (equal) {
|
if (equal) {
|
||||||
if (this.permissionOverwrites && channel.permissionOverwrites) {
|
if (this.permissionOverwrites && channel.permissionOverwrites) {
|
||||||
equal = this.permissionOverwrites.equals(channel.permissionOverwrites);
|
equal = this.permissionOverwrites.cache.equals(channel.permissionOverwrites.cache);
|
||||||
} else {
|
} else {
|
||||||
equal = !this.permissionOverwrites && !channel.permissionOverwrites;
|
equal = !this.permissionOverwrites && !channel.permissionOverwrites;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user