Skip to content

Fixed #88 #96

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
merged 4 commits into from
Feb 12, 2021
Merged

Fixed #88 #96

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9060bfd
Not perfect #88 fix
eunwoo1104 Feb 12, 2021
bbde60a
Solved using deepcopy
eunwoo1104 Feb 12, 2021
84b1534
More duplication fix due to same object ID
eunwoo1104 Feb 12, 2021
bf309b7
Completely fixed
eunwoo1104 Feb 12, 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
155 changes: 91 additions & 64 deletions discord_slash/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import copy
import logging
import typing
import discord
Expand Down Expand Up @@ -104,16 +105,16 @@ def get_cog_commands(self, cog: commands.Cog):
self.commands[x.name] = x
else:
if x.base in self.commands:
for i in self.commands[x.base].allowed_guild_ids:
if i not in x.allowed_guild_ids:
x.allowed_guild_ids.append(i)
for i in x.allowed_guild_ids:
if i not in self.commands[x.base].allowed_guild_ids:
self.commands[x.base].allowed_guild_ids.append(i)
self.commands[x.base].has_subcommands = True
else:
_cmd = {
"func": None,
"description": x.base_description,
"auto_convert": {},
"guild_ids": x.allowed_guild_ids,
"guild_ids": x.allowed_guild_ids.copy(),
"api_options": [],
"has_subcommands": True
}
Expand Down Expand Up @@ -188,65 +189,88 @@ async def to_dict(self):
Commands are in the format specified by discord `here <https://discord.com/developers/docs/interactions/slash-commands#applicationcommand>`_
"""
await self._discord.wait_until_ready() # In case commands are still not registered to SlashCommand.
all_guild_ids = []
for x in self.commands:
for i in self.commands[x].allowed_guild_ids:
if i not in all_guild_ids:
all_guild_ids.append(i)
cmds = {
"global": [],
"guild": {}
"guild": {x: [] for x in all_guild_ids}
}
wait = {} # Before merging to return dict, let's first put commands to temporary dict.
for x in self.commands:
selected = self.commands[x]
if selected.has_subcommands and selected.func:
# Registering both subcommand and command with same base name / name
# will result in only subcommand being registered,
# so we will warn this at registering subcommands.
self.logger.warning(f"Detected command name with same subcommand base name! "
f"This command will only have subcommand: {x}")

options = []
if selected.has_subcommands:
tgt = self.subcommands[x]
for y in tgt:
sub = tgt[y]
if isinstance(sub, model.SubcommandObject):
_dict = {
"name": sub.name,
"description": sub.description or "No Description.",
"type": model.SlashCommandOptionType.SUB_COMMAND,
"options": sub.options or []
}
options.append(_dict)
else:
base_dict = {
"name": y,
"description": "No Description.",
"type": model.SlashCommandOptionType.SUB_COMMAND_GROUP,
"options": []
}
for z in sub:
sub_sub = sub[z]
_dict = {
"name": sub_sub.name,
"description": sub_sub.description or "No Description.",
"type": model.SlashCommandOptionType.SUB_COMMAND,
"options": sub_sub.options or []
}
base_dict["options"].append(_dict)
if sub_sub.subcommand_group_description:
base_dict["description"] = sub_sub.subcommand_group_description
options.append(base_dict)

command_dict = {
"name": x,
"description": selected.description or "No Description.",
"options": selected.options if not options else options
"options": selected.options or []
}
if selected.allowed_guild_ids:
for y in selected.allowed_guild_ids:
try:
cmds["guild"][y].append(command_dict)
except KeyError:
cmds["guild"][y] = [command_dict]
if y not in wait:
wait[y] = {}
wait[y][x] = copy.deepcopy(command_dict)
else:
if "global" not in wait:
wait["global"] = {}
wait["global"][x] = copy.deepcopy(command_dict)

# Separated normal command add and subcommand add not to
# merge subcommands to one. More info at Issue #88
# https://github.com/eunwoo1104/discord-py-slash-command/issues/88

for x in self.commands:
if not self.commands[x].has_subcommands:
continue
tgt = self.subcommands[x]
for y in tgt:
sub = tgt[y]
if isinstance(sub, model.SubcommandObject):
_dict = {
"name": sub.name,
"description": sub.description or "No Description.",
"type": model.SlashCommandOptionType.SUB_COMMAND,
"options": sub.options or []
}
if sub.allowed_guild_ids:
for z in sub.allowed_guild_ids:
wait[z][x]["options"].append(_dict)
else:
wait["global"][x]["options"].append(_dict)
else:
queue = {}
base_dict = {
"name": y,
"description": "No Description.",
"type": model.SlashCommandOptionType.SUB_COMMAND_GROUP,
"options": []
}
for z in sub:
sub_sub = sub[z]
_dict = {
"name": sub_sub.name,
"description": sub_sub.description or "No Description.",
"type": model.SlashCommandOptionType.SUB_COMMAND,
"options": sub_sub.options or []
}
if sub_sub.allowed_guild_ids:
for i in sub_sub.allowed_guild_ids:
if i not in queue:
queue[i] = copy.deepcopy(base_dict)
queue[i]["options"].append(_dict)
else:
if "global" not in queue:
queue["global"] = copy.deepcopy(base_dict)
queue["global"]["options"].append(_dict)
for i in queue:
wait[i][x]["options"].append(queue[i])

for x in wait:
if x == "global":
[cmds["global"].append(n) for n in wait["global"].values()]
else:
cmds["global"].append(command_dict)
[cmds["guild"][x].append(n) for n in wait[x].values()]

return cmds

Expand Down Expand Up @@ -326,8 +350,10 @@ def add_slash_command(self,
"connector": connector or {},
"has_subcommands": has_subcommands
}
self.commands[name] = model.CommandObject(name, _cmd)
obj = model.CommandObject(name, _cmd)
self.commands[name] = obj
self.logger.debug(f"Added command `{name}`")
return obj

def add_subcommand(self,
cmd,
Expand Down Expand Up @@ -371,18 +397,17 @@ def add_subcommand(self,
description = description or getdoc(cmd)

if base in self.commands:
tgt = self.commands[base]
for x in tgt.allowed_guild_ids:
if x not in guild_ids:
guild_ids.append(x)
for x in guild_ids:
if x not in self.commands[base].allowed_guild_ids:
self.commands[base].allowed_guild_ids.append(x)

if options is None:
options = manage_commands.generate_options(cmd, description)

_cmd = {
"func": None,
"description": base_description,
"guild_ids": guild_ids,
"guild_ids": guild_ids.copy(),
"api_options": [],
"connector": {},
"has_subcommands": True
Expand All @@ -401,7 +426,6 @@ def add_subcommand(self,
self.commands[base] = model.CommandObject(base, _cmd)
else:
self.commands[base].has_subcommands = True
self.commands[base].allowed_guild_ids = guild_ids
if self.commands[base].description:
_cmd["description"] = self.commands[base].description
if base not in self.subcommands:
Expand All @@ -411,12 +435,15 @@ def add_subcommand(self,
self.subcommands[base][subcommand_group] = {}
if name in self.subcommands[base][subcommand_group]:
raise error.DuplicateCommand(f"{base} {subcommand_group} {name}")
self.subcommands[base][subcommand_group][name] = model.SubcommandObject(_sub, base, name, subcommand_group)
obj = model.SubcommandObject(_sub, base, name, subcommand_group)
self.subcommands[base][subcommand_group][name] = obj
else:
if name in self.subcommands[base]:
raise error.DuplicateCommand(f"{base} {name}")
self.subcommands[base][name] = model.SubcommandObject(_sub, base, name)
obj = model.SubcommandObject(_sub, base, name)
self.subcommands[base][name] = obj
self.logger.debug(f"Added subcommand `{base} {subcommand_group or ''} {name or cmd.__name__}`")
return obj

def slash(self,
*,
Expand Down Expand Up @@ -485,8 +512,8 @@ async def _pick(ctx, choice1, choice2): # Command with 1 or more args.
guild_ids = [guild_id]

def wrapper(cmd):
self.add_slash_command(cmd, name, description, guild_ids, options, connector)
return cmd
obj = self.add_slash_command(cmd, name, description, guild_ids, options, connector)
return obj

return wrapper

Expand Down Expand Up @@ -557,8 +584,8 @@ async def _group_kick_user(ctx, user):
subcommand_group_description = subcommand_group_description or sub_group_desc

def wrapper(cmd):
self.add_subcommand(cmd, base, subcommand_group, name, description, base_description, subcommand_group_description, guild_ids, options, connector)
return cmd
obj = self.add_subcommand(cmd, base, subcommand_group, name, description, base_description, subcommand_group_description, guild_ids, options, connector)
return obj

return wrapper

Expand Down