Skip to content

Thread perm: fix top-level voice channel bug #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flicksie wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Thread perm: fix top-level voice channel bug #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f080dde
get thread channel permissions from parent
Flicksie Jul 29, 2021
f9e81cc
lint
Flicksie Jul 29, 2021
5af7dc3
invert logic & check for parentID
Flicksie Jul 30, 2021
f266176
include private thread
Flicksie Jul 31, 2021
62b4e34
ts lint
Flicksie Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,9 +1216,9 @@ declare namespace Eris {
GUILD_CATEGORY: 4;
GUILD_NEWS: 5;
GUILD_STORE: 6;
GUILD_NEWS_THREAD: 10,
GUILD_PUBLIC_THREAD: 11,
GUILD_PRIVATE_THREAD: 12,
GUILD_NEWS_THREAD: 10;
GUILD_PUBLIC_THREAD: 11;
GUILD_PRIVATE_THREAD: 12;
GUILD_STAGE: 13;
};
GATEWAY_VERSION: 9;
Expand Down Expand Up @@ -2394,9 +2394,10 @@ declare namespace Eris {
reactions: { [s: string]: { count: number; me: boolean } };
referencedMessage?: Message | null;
roleMentions: string[];
stickerItems?: StickerItems[];
/** @deprecated */
stickers?: Sticker[];
stickerItems?: StickerItems[];

timestamp: number;
tts: boolean;
type: number;
Expand Down Expand Up @@ -2510,7 +2511,7 @@ declare namespace Eris {
unpinMessage(messageID: string): Promise<void>;
unsendMessage(messageID: string): Promise<void>;
}

export class PrivateThreadChannel extends ThreadChannel {
type: 12;
createMessage(content: MessageContent, file?: MessageFile | MessageFile): Promise<Message<PrivateThreadChannel>>;
Expand Down Expand Up @@ -2689,16 +2690,19 @@ declare namespace Eris {
}

export class StageInstance extends Base {
client: Client;
channel: StageChannel | Uncached;
client: Client;

discoverableDisabled: boolean;
guild: Guild | Uncached;
privacyLevel: StageInstancePrivacyLevel;
topic: string;
constructor(data: BaseData, client: Client);
update(data: BaseData): void;
delete(): Promise<void>;
edit(options: StageInstanceOptions): Promise<StageInstance>;
update(data: BaseData): void;


}

export class StoreChannel extends GuildChannel {
Expand All @@ -2720,8 +2724,9 @@ declare namespace Eris {
addMessageReaction(messageID: string, reaction: string, userID: string): Promise<void>;
createInvite(options?: CreateInviteOptions, reason?: string): Promise<Invite<"withMetadata", TextChannel>>;
createMessage(content: MessageContent, file?: MessageFile | MessageFile[]): Promise<Message<TextChannel>>;
createThreadWithoutMessage(options: CreateThreadWithoutMessageOptions): Promise<PrivateThreadChannel>;
createThreadWithMessage(messageID: string, options: CreateThreadOptions): Promise<PublicThreadChannel>;
createThreadWithoutMessage(options: CreateThreadWithoutMessageOptions): Promise<PrivateThreadChannel>;

createWebhook(options: { name: string; avatar?: string | null}, reason?: string): Promise<Webhook>;
deleteMessage(messageID: string, reason?: string): Promise<void>;
deleteMessages(messageIDs: string[], reason?: string): Promise<void>;
Expand Down Expand Up @@ -2790,11 +2795,13 @@ declare namespace Eris {

export class ThreadMember extends Base {
client: Client;
threadID: string;
joinTimestamp: number;
threadID: string;

constructor(data: BaseData, client: Client);
update(data: BaseData): void;
leave(): Promise<void>;
update(data: BaseData): void;

}

export class UnavailableGuild extends Base {
Expand Down
19 changes: 16 additions & 3 deletions lib/structures/GuildChannel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,33 @@ class GuildChannel extends Channel {
if(permission & Permissions.administrator) {
return new Permission(Permissions.all);
}
let overwrite = this.permissionOverwrites.get(this.guild.id);

let channelPermissionOverwrites;
if(this.parentID && (this.type === 10 || this.type === 11 || this.type === 12)){
const parentChannel = this.client.getChannel(this.parentID);
if(parentChannel) {
channelPermissionOverwrites = parentChannel.permissionOverwrites;
} else {
channelPermissionOverwrites = new Collection(PermissionOverwrite);
}
} else {
channelPermissionOverwrites = this.permissionOverwrites;
}

let overwrite = channelPermissionOverwrites.get(this.guild.id);
if(overwrite) {
permission = (permission & ~overwrite.deny) | overwrite.allow;
}
let deny = 0n;
let allow = 0n;
for(const roleID of member.roles) {
if((overwrite = this.permissionOverwrites.get(roleID))) {
if((overwrite = channelPermissionOverwrites.get(roleID))) {
deny |= overwrite.deny;
allow |= overwrite.allow;
}
}
permission = (permission & ~deny) | allow;
overwrite = this.permissionOverwrites.get(member.id);
overwrite = channelPermissionOverwrites.get(member.id);
if(overwrite) {
permission = (permission & ~overwrite.deny) | overwrite.allow;
}
Expand Down