From 2f945af866db61d7467a9ba702c55c3d27119e97 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Thu, 1 Feb 2024 18:39:10 -0500 Subject: [PATCH] feat(bible): added bible random (and formatted with black) --- bible/bible.py | 79 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 12 deletions(-) diff --git a/bible/bible.py b/bible/bible.py index 91f888a..e1a1c9d 100644 --- a/bible/bible.py +++ b/bible/bible.py @@ -5,14 +5,16 @@ # ____) | __/ (_| \__ \\ V V /| | | | | | | | | | | | __/ | # |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_| -import aiohttp import json import logging +import random +import aiohttp from discord import Embed -from redbot.core import commands, Config +from redbot.core import Config, commands from redbot.core.bot import Red + class Bible(commands.Cog): """Retrieve Bible verses from the API.bible API.""" @@ -23,7 +25,9 @@ class Bible(commands.Cog): super().__init__() self.bot = bot self.session = aiohttp.ClientSession() - self.config = Config.get_conf(self, identifier=481923957134912, force_registration=True) + self.config = Config.get_conf( + self, identifier=481923957134912, force_registration=True + ) self.logger = logging.getLogger("red.sea.bible") self.config.register_global(bible="de4e12af7f28f599-01") self.config.register_user(bible=None) @@ -33,8 +37,8 @@ class Bible(commands.Cog): book_name = book_name.title() books = await self._get_books(bible_id) for book in books: - if book_name == book['abbreviation'] or book_name == book['name']: - return book['id'] + if book_name == book["abbreviation"] or book_name == book["name"]: + return book["id"] raise ValueError(f"Book {book_name} not found.") async def _get_passage(self, bible_id: str, passage_id: str) -> dict: @@ -55,12 +59,30 @@ class Bible(commands.Cog): data = await response.json() return data["data"] + async def _get_chapters(self, bible_id: str, book_id: str) -> dict: + """Get the chapters of a book from the API.bible API.""" + url = f"https://api.scripture.api.bible/v1/bibles/{bible_id}/books/{book_id}/chapters" + headers = await self.bot.get_shared_api_tokens("api.bible") + async with self.session.get(url, headers=headers) as response: + data = await response.json() + return data["data"] + + 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" + headers = await self.bot.get_shared_api_tokens("api.bible") + async with self.session.get(url, headers=headers) as response: + data = await response.json() + 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: + 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: @@ -69,7 +91,11 @@ class Bible(commands.Cog): 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 = 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) @@ -87,18 +113,47 @@ class Bible(commands.Cog): await ctx.send(str(e)) return - if len(passage.split('-')) == 2: + if len(passage.split("-")) == 2: from_verse, to_verse = passage.replace(":", ".").split("-") - if '.' not in to_verse: + if "." not in to_verse: to_verse = f"{from_verse.split('.')[0]}.{to_verse}" - passage = await self._get_passage(bible_id, f"{book_id}.{from_verse}-{book_id}.{to_verse}") + passage = await self._get_passage( + bible_id, f"{book_id}.{from_verse}-{book_id}.{to_verse}" + ) else: - passage = await self._get_passage(bible_id, f"{book_id}.{passage.replace(':', '.')}") + passage = await self._get_passage( + bible_id, f"{book_id}.{passage.replace(':', '.')}" + ) if len(passage["content"]) > 4096: await ctx.send("The passage is too long to send.") return - embed = Embed(title=f"{passage['reference']}", description=passage["content"].replace('¶ ', ''), color=await self.bot.get_embed_color(ctx.channel)) + 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 passage - Powered by API.bible") await ctx.send(embed=embed) + + @bible.command(name="random") + async def bible_random(self, ctx: commands.Context): + """Get a random Bible verse.""" + bible_id = await self.config.bible() + books = await self._get_books(bible_id) + book = random.choice(books) + 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']}" + ) + 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 random - Powered by API.bible") + await ctx.send(embed=embed)