Add parsing for pob.party links like pastebins

xKynn · Mar 3, 2020 · bb89359 · bb89359
1 parent 2be0973
commit bb89359
Showing 1 changed file with 38 additions and 16 deletions.
diff --git a/cogs/poe.py b/cogs/poe.py
@@ -357,6 +357,8 @@ async def _info_dict(self, stats, pob=True, pob_party=None):
         if pob_party:
             #print("yes party")
             info.description = f"[*Open in pob.party*]({pob_party})"
+        else:
+            info.description = ""
         if pob:
             if stats['ascendancy'] != "None":
                 info.title = f"Level {stats['level']} {stats['class']}: {stats['ascendancy']}"
@@ -564,25 +566,45 @@ async def charinfo(self, ctx, character=None):
     async def pob(self, ctx):
         """ Fetch character info for valid pob pastebin links posted in chat """
         # Pastebin util is from another discord pob parsing bot, why re-invent the wheel i guess?
-        paste_keys = pastebin.fetch_paste_key(ctx.message.content)
-        if not paste_keys: return
-        xml = None
-        paste_key = paste_keys[0]
-        try:
-            xml = await self.bot.loop.run_in_executor(None, pastebin.get_as_xml, paste_key)
-        except:
-            return
-        if not xml: return
-        raw = await self.bot.loop.run_in_executor(None, pastebin.get_raw_data, f"https://pastebin.com/raw/{paste_key}")
-        #print(raw)
-        async with self.bot.ses.post("https://pob.party/kv/put?ver=latest", data=raw) as resp:
+        if "pastebin.com/" in ctx.message.content:
+            paste_keys = pastebin.fetch_paste_key(ctx.message.content)
+            if not paste_keys: return
+            xml = None
+            paste_key = paste_keys[0]
             try:
-                party_resp = await resp.json()
+                xml = await self.bot.loop.run_in_executor(None, pastebin.get_as_xml, paste_key)
             except:
-                party_resp = None
-        if party_resp:
-            party_url = f"https://pob.party/share/{party_resp['url']}"
+                return
+            if not xml: return
+            raw = await self.bot.loop.run_in_executor(None, pastebin.get_raw_data, f"https://pastebin.com/raw/{paste_key}")
+            #print(raw)
+            async with self.bot.ses.post("https://pob.party/kv/put?ver=latest", data=raw) as resp:
+                try:
+                    party_resp = await resp.json()
+                except:
+                    party_resp = None
+            if party_resp:
+                party_url = f"https://pob.party/share/{party_resp['url']}"
+            else:
+                party_url = None
         else:
+            url = None
+            for part in ctx.message.content.split(" "):
+                if "pob.party/share/" in part:
+                    url = part
+                    break
+            if not url:
+                return
+
+            key = url.split('/')[-1]
+            async with self.bot.ses.get(f"https://pob.party/kv/get/{key}") as resp:
+                try:
+                    party_resp = await resp.json()
+                except:
+                    party_resp = None
+            if not party_resp:
+                return
+            xml = pastebin.decode_to_xml(party_resp['data']).decode('utf-8')
             party_url = None
         #print(party_url)
         stats = await self.bot.loop.run_in_executor(None, cache_pob_xml, xml, self.client)