Merge remote-tracking branch 'origin/main'

2026-10-07 19:22:14 +09:00 · 2026-09-24 21:38:07 +00:00
parent 2f3f13cf71 00bf74cef5
commit 91ca92a442
1 changed files with 2 additions and 1 deletions
@@ -303,7 +303,8 @@ export class Channel {
 		const otherOverwrites = Object.keys(other.permissionOverwrites);
 		if (thisOverwrites.length !== otherOverwrites.length) return false;
 		for (const key of thisOverwrites) {
-			if (!this.permissionOverwrites[key].equals(other.permissionOverwrites[key])) {
+			const otherOverwrite = other.permissionOverwrites[key];
+			if (otherOverwrite == null || !this.permissionOverwrites[key].equals(otherOverwrite)) {
 				return false;
 			}
 		}