NikolajDanger/Gwendolyn
1
0
Fork 0
Code Issues 50 Pull Requests Packages Projects Releases Wiki Activity

✨

Browse Source
This commit is contained in:
NikolajDanger
2023-03-28 11:40:34 +02:00
parent 72e0514ed0 89d0c0b9fb
commit ba03d4063f
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gwendolyn/cogs/misc_cog.py
View File

@ -61,18 +61,30 @@ class MiscCog(commands.Cog):
@cog_ext.cog_slash(**params["name"]) @cog_ext.cog_slash(**params["name"])
async def name(self, ctx: SlashContext): async def name(self, ctx: SlashContext):
<<<<<<< HEAD
"""_generate a random name.""" """_generate a random name."""
=======
"""Generate a random name."""
>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
await self.generators.name_gen(ctx) await self.generators.name_gen(ctx)
@cog_ext.cog_slash(**params["tavern"]) @cog_ext.cog_slash(**params["tavern"])
async def tavern(self, ctx: SlashContext): async def tavern(self, ctx: SlashContext):
<<<<<<< HEAD
"""_generate a random tavern name.""" """_generate a random tavern name."""
=======
"""Generate a random tavern name."""
>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
await self.generators.tavern_gen(ctx) await self.generators.tavern_gen(ctx)
@cog_ext.cog_slash(**params["wiki"]) @cog_ext.cog_slash(**params["wiki"])
async def wiki(self, ctx: SlashContext, wiki_page=""): async def wiki(self, ctx: SlashContext, wiki_page=""):
"""Get a page on a fandom wiki.""" """Get a page on a fandom wiki."""
<<<<<<< HEAD
await self.bot.other.find_wiki_page(ctx, page) await self.bot.other.find_wiki_page(ctx, page)
=======
await self.bot.other.find_wiki_page(ctx, wiki_page)
>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
@cog_ext.cog_slash(**params["add_movie"]) @cog_ext.cog_slash(**params["add_movie"])
async def add_movie(self, ctx: SlashContext, movie): async def add_movie(self, ctx: SlashContext, movie):

24
requirements.txt
View File

@ -1,12 +1,5 @@
aiohttp==3.8.1
async-timeout==4.0.2
attrs==21.2.0
beautifulsoup4==4.9.3
cachetools==4.2.2
certifi==2021.5.30
chardet==4.0.0
charset-normalizer==2.0.4
d20==1.1.2 d20==1.1.2
<<<<<<< HEAD
discord.py>=1.7.3 discord.py>=1.7.3
discord-py-slash-command==3.0.1 discord-py-slash-command==3.0.1
dnspython==1.16.0 dnspython==1.16.0
@ -33,6 +26,17 @@ SQLAlchemy==1.4.22
typing-extensions==3.10.0.0 typing-extensions==3.10.0.0
urllib3==1.26.6 urllib3==1.26.6
wheel==0.37.0 wheel==0.37.0
=======
discord.py==1.7.3
discord_py_slash_command==3.0.3
fandom_py==0.2.1
finnhub_python==2.4.13
GitPython==3.1.27
IMDbPY==2021.4.18
lxml==4.8.0
Pillow==9.1.0
pymongo==4.1.1
requests==2.27.1
>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
wolframalpha==5.0.0 wolframalpha==5.0.0
xmltodict==0.12.0 xmltodict==0.13.0
yarl==1.6.3