From 2bdb6c7729d02049cef14d6432a43832f6049851 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Tue, 27 Aug 2019 14:09:29 +0200
Subject: [PATCH] Improve dnditem command

---
 royalnet/commands/royalgames/dnditem.py | 31 +++++++++++++++++--------
 royalnet/royalgames.py                  |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/royalnet/commands/royalgames/dnditem.py b/royalnet/commands/royalgames/dnditem.py
index df19f4a4..e88a6c49 100644
--- a/royalnet/commands/royalgames/dnditem.py
+++ b/royalnet/commands/royalgames/dnditem.py
@@ -21,10 +21,20 @@ class DnditemCommand(Command):
         interface.loop.create_task(self._fetch_dnddata())
 
     async def _fetch_dnddata(self):
+        self._dnddata = self._dnddata = sortedcontainers.SortedKeyList([], key=lambda i: i["name"].lower())
         async with aiohttp.ClientSession() as session:
-            async with session.get("https://scaleway.steffo.eu/dnd/items.json") as response:
+            async with session.get("https://5e.tools/data/items.json") as response:
                 j = await response.json()
-        self._dnddata = sortedcontainers.SortedKeyList(j["item"], key=lambda i: i["name"].lower())
+                for item in j["item"]:
+                    self._dnddata.add(item)
+            async with session.get("https://5e.tools/data/fluff-items.json") as response:
+                j = await response.json()
+                for item in j["item"]:
+                    self._dnddata.add(item)
+            async with session.get("https://5e.tools/data/items-base.json") as response:
+                j = await response.json()
+                for item in j["baseitem"]:
+                    self._dnddata.add(item)
 
     def _parse_entry(self, entry):
         if isinstance(entry, str):
@@ -58,14 +68,15 @@ class DnditemCommand(Command):
             return
         search = args.joined().lower()
         result = self._dnddata[self._dnddata.bisect_key_left(search)]
-        string = f'[b]{result["name"]}[/b]\n' \
-                 f'[i]{result["source"]}, page {result["page"]}[/i]\n' \
-                 f'\n' \
-                 f'Type: [b]{result.get("type", "None")}[/b]\n' \
-                 f'Value: [b]{result.get("value", "Priceless")}[/b]\n' \
-                 f'Weight: [b]{result.get("weight", "0")} lb[/b]\n' \
-                 f'Rarity: [b]{result["rarity"] if result["rarity"] != "None" else "Mundane"}[/b]\n' \
-                 f'\n'
+        string = f'[b]{result["name"]}[/b]\n'
+        if "source" in result:
+            string += f'[i]{result["source"]}, page {result["page"]}[/i]\n'
+        string += f'\n' \
+                  f'Type: [b]{result.get("type", "None")}[/b]\n' \
+                  f'Value: [b]{result.get("value", "Priceless")}[/b]\n' \
+                  f'Weight: [b]{result.get("weight", "0")} lb[/b]\n' \
+                  f'Rarity: [b]{result["rarity"] if result.get("rarity", "None") != "None" else "Mundane"}[/b]\n' \
+                  f'\n'
         for entry in result.get("entries", []):
             string += self._parse_entry(entry)
             string += "\n\n"
diff --git a/royalnet/royalgames.py b/royalnet/royalgames.py
index 400e23a2..2fb4a87c 100644
--- a/royalnet/royalgames.py
+++ b/royalnet/royalgames.py
@@ -11,7 +11,7 @@ from royalnet.database.tables import Royal, Telegram, Discord
 
 loop = asyncio.get_event_loop()
 
-log = logging.root
+log = logging.getLogger("royalnet.bots")
 stream_handler = logging.StreamHandler()
 stream_handler.formatter = logging.Formatter("{asctime}\t{name}\t{levelname}\t{message}", style="{")
 log.addHandler(stream_handler)