mirror of
https://github.com/stijndcl/didier.git
synced 2026-04-07 15:48:29 +02:00
Clean google search up a bit
This commit is contained in:
parent
537111d357
commit
ed0649c953
2 changed files with 38 additions and 28 deletions
|
|
@ -3,29 +3,24 @@ from discord.ext import commands
|
|||
from dislash import slash_command, SlashInteraction, Option, OptionType
|
||||
from decorators import help
|
||||
from enums.help_categories import Category
|
||||
from functions.scrapers.google import google_search
|
||||
from functions.scrapers.google import google_search, SearchResult
|
||||
|
||||
|
||||
def _create_google_embed(results) -> discord.Embed:
|
||||
# Filter out all Nones
|
||||
elements = list(filter(lambda x: x is not None, results))
|
||||
|
||||
def _create_google_embed(result: SearchResult) -> discord.Embed:
|
||||
embed = discord.Embed(colour=discord.Colour.blue())
|
||||
embed.set_author(name="Google Search")
|
||||
|
||||
# Empty list of results
|
||||
if len(elements) == 0:
|
||||
if len(result.results) == 0:
|
||||
embed.colour = discord.Colour.red()
|
||||
embed.description = "Geen resultaten gevonden."
|
||||
return embed
|
||||
|
||||
# Cut excess results out
|
||||
if len(elements) > 10:
|
||||
elements = elements[:10]
|
||||
|
||||
# Add results into a field
|
||||
links = []
|
||||
|
||||
for index, (link, title) in enumerate(elements):
|
||||
links.append("{}: [{}]({})".format(index + 1, title, link))
|
||||
for index, link in enumerate(result.results):
|
||||
links.append(f"{index + 1}: {link}")
|
||||
|
||||
embed.description = "\n".join(links)
|
||||
|
||||
|
|
@ -48,30 +43,26 @@ class Google(commands.Cog):
|
|||
guild_ids=[880175869841277008]
|
||||
)
|
||||
async def _google_slash(self, interaction: SlashInteraction, query: str):
|
||||
results, status = google_search(query)
|
||||
result = google_search(query)
|
||||
|
||||
if results is None:
|
||||
return await interaction.reply("Er ging iets fout (Response {})".format(status))
|
||||
if not result.results:
|
||||
return await interaction.reply("Er ging iets fout (Response {})".format(result.status_code))
|
||||
|
||||
embed = _create_google_embed(results)
|
||||
embed = _create_google_embed(result)
|
||||
await interaction.reply(embed=embed)
|
||||
|
||||
@slash_command(name="test", description="Test")
|
||||
async def test(self, interaction):
|
||||
await interaction.reply(":eyes:")
|
||||
|
||||
@commands.command(name="Google", aliases=["Gtfm", "Search"], usage="[Query]", case_insensitive=True)
|
||||
@help.Category(Category.Other)
|
||||
async def google(self, ctx, *query):
|
||||
if not query:
|
||||
return await ctx.reply("Je hebt geen query opgegeven.", mention_author=True)
|
||||
|
||||
results, status = google_search(" ".join(query))
|
||||
result = google_search(" ".join(query))
|
||||
|
||||
if results is None:
|
||||
return await ctx.send("Er ging iets fout (Response {})".format(status))
|
||||
if not result.results:
|
||||
return await ctx.send("Er ging iets fout (Response {})".format(result.status_code))
|
||||
|
||||
embed = _create_google_embed(results)
|
||||
embed = _create_google_embed(result)
|
||||
await ctx.reply(embed=embed, mention_author=False)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue