Skip to content
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

Fix - Allow mixing groups and subcommands #244

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix - Allow mixing groups and subcommands #244

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fc283e
Allow some mixing of groups and subcommands
itsthedevman Jul 16, 2023
ebb5e8d
Merge branch 'shardlab:main' into fix/group-subcommand-mixing
itsthedevman Mar 8, 2024
261501b
Merge branch 'shardlab:main' into fix/group-subcommand-mixing
itsthedevman Jun 29, 2024
c6ea7cf
Merge branch 'shardlab:main' into fix/group-subcommand-mixing
itsthedevman Nov 15, 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
4 changes: 2 additions & 2 deletions lib/discordrb/events/interactions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def initialize(attributes, block)
# @yieldparam [SubcommandBuilder]
# @return [ApplicationCommandEventHandler]
def group(name)
raise ArgumentError, 'Unable to mix subcommands and groups' if @subcommands.any? { |_, v| v.is_a? Proc }
raise ArgumentError, 'Unable to mix subcommands and groups' if @subcommands.any? { |n, v| n == name && v.is_a?(Proc) }

builder = SubcommandBuilder.new(name)
yield builder
Expand All @@ -259,7 +259,7 @@ def group(name)
# @yieldparam [SubcommandBuilder]
# @return [ApplicationCommandEventHandler]
def subcommand(name, &block)
raise ArgumentError, 'Unable to mix subcommands and groups' if @subcommands.any? { |_, v| v.is_a? Hash }
raise ArgumentError, 'Unable to mix subcommands and groups' if @subcommands.any? { |n, v| n == name && v.is_a?(Hash) }

@subcommands[name.to_sym] = block

Expand Down