@@ -173,31 +173,45 @@ async def delete(self, message_id: typing.Union[int, str] = "@original"):
173
173
class CommandObject :
174
174
def __init__ (self , name , cmd , * subcommands ): # Let's reuse old command formatting.
175
175
self .name = name
176
- self .invoke = cmd ["func" ]
176
+ self .func = cmd ["func" ]
177
177
self .description = cmd ["description" ]
178
178
self .auto_convert = cmd ["auto_convert" ]
179
179
self .allowed_guild_ids = cmd ["guild_ids" ]
180
180
self .options = cmd ["api_options" ]
181
181
self .has_subcommands = cmd ["has_subcommands" ]
182
182
self .subcommands = subcommands
183
183
184
+ def invoke (self , * args ):
185
+ return self .func (* args )
186
+
184
187
185
188
class SubcommandObject :
186
189
def __init__ (self , sub , base , name , sub_group = None ):
187
190
self .base = base
188
191
self .subcommand_group = sub_group
189
192
self .name = name
190
- self .invoke = sub ["func" ]
193
+ self .func = sub ["func" ]
191
194
self .description = sub ["description" ]
192
195
self .auto_convert = sub ["auto_convert" ]
193
196
self .allowed_guild_ids = sub ["guild_ids" ]
194
197
198
+ def invoke (self , * args ):
199
+ return self .func (* args )
200
+
195
201
196
202
class CogCommandObject (CommandObject ):
197
203
def __init__ (self , * args ):
198
204
super ().__init__ (* args )
205
+ self .cog = None # Manually set this later.
206
+
207
+ def invoke (self , * args ):
208
+ return self .func (self .cog , * args )
199
209
200
210
201
211
class CogSubcommandObject (SubcommandObject ):
202
212
def __init__ (self , * args ):
203
213
super ().__init__ (* args )
214
+ self .cog = None # Manually set this later.
215
+
216
+ def invoke (self , * args ):
217
+ return self .func (self .cog , * args )
0 commit comments