lauchmelder/JishoBot
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed api interface

Browse source
This commit is contained in:
Robert 2020-08-11 12:09:59 +02:00
parent e2b42cbabc
commit 88d7ea0ac4
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cogs/search.py
View file

@ -12,14 +12,15 @@ class Search(commands.Cog):
if query == None: if query == None:
return return
response = jisho.query(query) response = jisho.JishoResponse(query)
await ctx.send(response["data"][0]["slug"]) await ctx.send(response.nodes[0].slug)
@search.error @search.error
async def search_error(self, ctx, error): async def search_error(self, ctx, error):
if isinstance(error, commands.CommandOnCooldown): if isinstance(error, commands.CommandOnCooldown):
pass # Suppress that annoying exception everytime someone is on cooldown return # Suppress that annoying exception everytime someone is on cooldown
raise error
def setup(bot: commands.Bot): def setup(bot: commands.Bot):

24
utils/jisho.py
View file

@ -16,25 +16,35 @@ class JishoNode():
self.is_common = node["is_common"] self.is_common = node["is_common"]
self.tags = node["tags"] self.tags = node["tags"]
self.jlpt = node["jlpt"] self.jlpt = node["jlpt"]
self.japanese_word = node["japanese"]["word"] self.japanese = []
self.japanese_reading = node["japanese"]["reading"] for entry in node["japanese"]:
if "word" not in entry:
word = entry["reading"]
reading = ""
else:
word = entry["word"]
reading = entry["reading"]
self.japanese.append((word, reading))
self.senses = [] self.senses = []
for sense in node["senses"]
for sense in node["senses"]:
self.senses.append(JishoSenses(sense)) self.senses.append(JishoSenses(sense))
class JishoResponse(): class JishoResponse():
def __init__(self, query: str): def __init__(self, query: str):
self.query = query self.query_string = query
self.raw = query() self.raw = self.query()
self.nodes = [] self.nodes = []
disassemble() self.disassemble()
def query(self): def query(self):
url = TEMPLATE_URL.format(urllib.parse.quote_plus(self.query)) url = TEMPLATE_URL.format(urllib.parse.quote_plus(self.query_string))
r = requests.get(url) r = requests.get(url)
if r.status_code != 200: if r.status_code != 200:
print(f"ERROR: Failed to access Jisho API... {r.status_code}") print(f"ERROR: Failed to access Jisho API... {r.status_code}")
return None
return json.loads(r.text) return json.loads(r.text)