Skip to content

fix(ClientPermissions): check app permissions when used with user apps #797

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

Merged
favna merged 3 commits into from
Nov 4, 2024
Merged

fix(ClientPermissions): check app permissions when used with user apps #797

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6548891
fix(ClientPermissions): always return `this.ok` when channel is null
yuansheng1549 Nov 3, 2024
9a78ac1
fix: resolve requested changes
yuansheng1549 Nov 3, 2024
bcb53f6
Merge branch 'main' into fix/fix-client-permissions
favna Nov 4, 2024
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
23 changes: 15 additions & 8 deletions src/preconditions/ClientPermissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,9 @@ export class CorePrecondition extends AllFlowsPrecondition {
): AllFlowsPrecondition.AsyncResult {
const required = context.permissions ?? new PermissionsBitField();

const channel = await this.fetchChannelFromInteraction(interaction);
const availablePermissions = await this.getAvailablePermissions(interaction);

const permissions = await this.getPermissionsForChannel(channel, interaction);

return this.sharedRun(required, permissions, 'chat input');
return this.sharedRun(required, availablePermissions, 'chat input');
}

public async contextMenuRun(
Expand All @@ -69,11 +67,9 @@ export class CorePrecondition extends AllFlowsPrecondition {
): AllFlowsPrecondition.AsyncResult {
const required = context.permissions ?? new PermissionsBitField();

const channel = await this.fetchChannelFromInteraction(interaction);

const permissions = await this.getPermissionsForChannel(channel, interaction);
const availablePermissions = await this.getAvailablePermissions(interaction);

return this.sharedRun(required, permissions, 'context menu');
return this.sharedRun(required, availablePermissions, 'context menu');
}

private async getPermissionsForChannel(channel: TextBasedChannel, messageOrInteraction: Message | BaseInteraction) {
Expand Down Expand Up @@ -113,6 +109,17 @@ export class CorePrecondition extends AllFlowsPrecondition {
});
}

private async getAvailablePermissions(interaction: ChatInputCommandInteraction | ContextMenuCommandInteraction) {
if (interaction.channel) {
if (interaction.channel.isDMBased()) return this.dmChannelPermissions;

const channel = await this.fetchChannelFromInteraction(interaction);
Copy link
Copy Markdown
Member

@vladfrangu vladfrangu Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fetch feels redundant now

Copy link
Copy Markdown
Member

@favna favna Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better safe than sorry and it's gonna come out of the cache anyway if it's there.

return this.getPermissionsForChannel(channel, interaction);
}

return interaction.appPermissions;
}

public static readonly readablePermissions: Record<PermissionsString, string> = {
AddReactions: 'Add Reactions',
Administrator: 'Administrator',
Expand Down