Start working on Google Search (#18), add support for Sell All instead of erroring (fixes #29)

pull/30/head
Stijn De Clercq 2021-01-23 23:40:49 +01:00
parent 5b78840477
commit 3a6e57db73
4 changed files with 62 additions and 1 deletions

26
cogs/google.py 100644
View File

@ -0,0 +1,26 @@
import discord
from discord.ext import commands
from decorators import help
from enums.help_categories import Category
from functions.scraping import google_search
class Google(commands.Cog):
def __init__(self, client):
self.client = client
# Don't allow any commands to work when locked
def cog_check(self, ctx):
return not self.client.locked
@commands.command(name="Google", aliases=["Gtfm", "Search"])
@help.Category(Category.Other)
async def google(self, ctx, *query):
results, status = google_search(" ".join(query))
if results is None:
return await ctx.send("Er ging iets fout (Response {})".format(status))
def setup(client):
client.add_cog(Google(client))

View File

@ -105,7 +105,7 @@ class Oneliners(commands.Cog):
async def todo(self, ctx, *args):
await ctx.send("https://trello.com/b/PdtsAJea/didier-to-do-list")
@commands.command(name="LMGTFY", aliases=["Dsfr", "Gtfm", "Google"], usage="[Query]")
@commands.command(name="LMGTFY", aliases=["Dsfr"], usage="[Query]")
@help.Category(category=Category.Other)
async def lmgtfy(self, ctx, *, query=None):
if query:

View File

@ -84,6 +84,9 @@ class Store(commands.Cog):
item_tuple = item
break
if amount.lower() == "all":
amount = int(item_tuple[2])
if int(item_tuple[2]) < amount:
return await ctx.send("Je hebt niet zoveel {}s.".format(item_tuple[1]))

View File

@ -0,0 +1,32 @@
from requests import get
from urllib.parse import urlencode
from bs4 import BeautifulSoup
# TODO add Football requests in here as well
def google_search(query):
"""
Function to get Google search results
"""
headers = {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36'
}
query = urlencode({"q": query})
resp = get("https://www.google.com/search?{}&num=10&hl=en".format(query), headers=headers)
print("got here")
if resp.status_code != 200:
return None, resp.status_code
bs = BeautifulSoup(resp.text, "html.parser")
def getContent(element):
link = element.find('a', href=True)
title = element.find('h3')
return link, title
divs = bs.find_all('div', attrs={'class': 'g'})
print(divs)
return list(getContent(d) for d in divs), 200