Owner-only commands won't interfere w/ search
This commit is contained in:
parent
422796b91f
commit
8c29e6683a
|
@ -130,7 +130,8 @@ class Search(commands.Cog):
|
||||||
async def on_command_error(self, ctx, error):
|
async def on_command_error(self, ctx, error):
|
||||||
"""Listener makes no command fallback to searching."""
|
"""Listener makes no command fallback to searching."""
|
||||||
|
|
||||||
if isinstance(error, commands.CommandNotFound):
|
if isinstance(error, commands.CommandNotFound) or \
|
||||||
|
isinstance(error, commands.CheckFailure):
|
||||||
# Logging
|
# Logging
|
||||||
print(f"\n\nNEW CALL: {ctx.author} from {ctx.guild}.\n")
|
print(f"\n\nNEW CALL: {ctx.author} from {ctx.guild}.\n")
|
||||||
|
|
||||||
|
@ -144,38 +145,6 @@ class Search(commands.Cog):
|
||||||
# Sends result
|
# Sends result
|
||||||
await ctx.send(msg)
|
await ctx.send(msg)
|
||||||
|
|
||||||
def _create_cat_func(name: str, desc: str):
|
|
||||||
'''Creates functions for our categories.'''
|
|
||||||
|
|
||||||
async def cat_generic(self, ctx, *, query: str):
|
|
||||||
f'''{desc}'''
|
|
||||||
async with ctx.typing():
|
|
||||||
msg = await self._search_logic(
|
|
||||||
query, ctx.channel.is_nsfw(), name)
|
|
||||||
await ctx.send(msg)
|
|
||||||
|
|
||||||
return cat_generic
|
|
||||||
|
|
||||||
_categories = {
|
|
||||||
'it': 'Search computer-related resources.',
|
|
||||||
'images': 'Search for images.',
|
|
||||||
'video': 'Search for videos.',
|
|
||||||
'music': 'Search for music.',
|
|
||||||
'files': 'Search for files.',
|
|
||||||
'maps': 'Search for map results.',
|
|
||||||
'news': 'Search for new articles.',
|
|
||||||
'science': 'Search for scientific knowledge.',
|
|
||||||
'social+media': 'Search for social media results.',
|
|
||||||
}
|
|
||||||
|
|
||||||
for c, d in _categories.items():
|
|
||||||
print(c)
|
|
||||||
print(d)
|
|
||||||
c_good = c.replace('+', '')
|
|
||||||
c_funcname = c.replace('+', '_')
|
|
||||||
made_func = _create_cat_func(c, d)
|
|
||||||
setattr(Search, c_funcname, made_func)
|
|
||||||
commands.command(name=c_good)(made_func)
|
|
||||||
|
|
||||||
def setup(bot):
|
def setup(bot):
|
||||||
bot.add_cog(Search(bot))
|
bot.add_cog(Search(bot))
|
2
main.py
2
main.py
|
@ -126,7 +126,7 @@ async def on_command_error(ctx, error):
|
||||||
title=f"{type(error).__name__}",
|
title=f"{type(error).__name__}",
|
||||||
color=0xFF0000,
|
color=0xFF0000,
|
||||||
description=(
|
description=(
|
||||||
"This is (probably) a bug. This has been not been automatically "
|
"This is (probably) a bug. This has not been automatically "
|
||||||
f"reported, so please give **{appinfo.owner}** a heads-up in DMs.")
|
f"reported, so please give **{appinfo.owner}** a heads-up in DMs.")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue