From 52a440ff3edbb6dc1ed55f3e70a676a4a62306da Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Thu, 1 Feb 2024 18:46:59 -0500
Subject: [PATCH] fix(bible): working on the bible random command

---
 bible/bible.py | 39 +++++++--------------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/bible/bible.py b/bible/bible.py
index 43db59a..3f600d2 100644
--- a/bible/bible.py
+++ b/bible/bible.py
@@ -73,7 +73,7 @@ class Bible(commands.Cog):
 
     async def _get_verses(self, bible_id: str, book_id: str, chapter: int) -> dict:
         """Get the verses of a chapter from the API.bible API."""
-        url = f"https://api.scripture.api.bible/v1/bibles/{bible_id}/books/{book_id}/chapters/{chapter}/verses"
+        url = f"https://api.scripture.api.bible/v1/bibles/{bible_id}/chapters/{book_id}.{chapter}/verses"
         headers = await self.bot.get_shared_api_tokens("api.bible")
         async with self.session.get(url, headers=headers) as response:
             data = await response.json()
@@ -82,35 +82,12 @@ class Bible(commands.Cog):
             return data["data"]
 
     @commands.group(autohelp=True)
-    async def bible(self, ctx: commands.Context):
-        """Core command for the Bible cog."""
-
-    @bible.command(name="verse")
-    async def bible_verse(
-        self, ctx: commands.Context, book: str, chapter: int, verse: int
-    ) -> str:
-        """Get a Bible verse."""
-        bible_id = await self.config.bible()
-        try:
-            book_id = await self.translate_book_name(bible_id, book)
-        except ValueError as e:
-            await ctx.send(str(e))
-            return
-        passage = await self._get_passage(bible_id, f"{book_id}.{chapter}.{verse}")
-        embed = Embed(
-            title=f"{passage['reference']}",
-            description=passage["content"].replace("¶ ", ""),
-            color=await self.bot.get_embed_color(ctx.channel),
-        )
-        embed.set_footer(text=f"{ctx.prefix}bible verse - Powered by API.bible")
-        await ctx.send(embed=embed)
-
-    @bible.command(name="passage")
-    async def bible_passage(self, ctx: commands.Context, book: str, passage: str):
+    async def bible(self, ctx: commands.Context, book: str, passage: str):
         """Get a Bible passage.
 
         Example usage:
-            `[p]bible passage John 3:16-3:17`"""
+            `[p]bible Genesis 1:1`
+            `[p]bible John 3:16-3:17`"""
         bible_id = await self.config.bible()
 
         try:
@@ -140,7 +117,7 @@ class Bible(commands.Cog):
             description=passage["content"].replace("¶ ", ""),
             color=await self.bot.get_embed_color(ctx.channel),
         )
-        embed.set_footer(text=f"{ctx.prefix}bible passage - Powered by API.bible")
+        embed.set_footer(text=f"{ctx.prefix}bible - Powered by API.bible")
         await ctx.send(embed=embed)
 
     @bible.command(name="random")
@@ -152,10 +129,8 @@ class Bible(commands.Cog):
         chapters = await self._get_chapters(bible_id, book["id"])
         chapter = random.choice(chapters)
         verses = await self._get_verses(bible_id, book["id"], chapter["number"])
-        verse = random.choice(verses)
-        passage = await self._get_passage(
-            bible_id, f"{book['id']}.{chapter['number']}.{verse['number']}"
-        )
+        verse = random.choice(verses)["id"]
+        passage = await self._get_passage(bible_id, verse)
         embed = Embed(
             title=f"{passage['reference']}",
             description=passage["content"].replace("¶ ", ""),