hammy
/
Enso-Bot
mirror of https://github.com/sgoudham/Enso-Bot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made sure that settings.py file is not used anymore

Browse Source
pull/8/head
sgoudham 4 years ago
parent b1321aebf5
commit edb5be567f
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File

45
cogs/anime.py
Unescape Escape View File

@ -13,16 +13,13 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
from typing import Optional from typing import Optional
import aiohttp import aiohttp
from decouple import config from decouple import config
from discord import Embed from discord import Embed
from discord.ext import menus from discord.ext import menus
from discord.ext.commands import bot_has_permissions, Cog, group from discord.ext.commands import Cog, group, bot_has_permissions
from settings import rndColour, enso_embedmod_colours
my_waifu_list_auth = config('MYWAIFULIST_AUTH') my_waifu_list_auth = config('MYWAIFULIST_AUTH')
@ -33,13 +30,13 @@ def store_waifus(waifus_dict, waifu, value):
waifus_dict[waifu["name"]][value] = waifu[value] waifus_dict[waifu["name"]][value] = waifu[value]
def multiple_waifu_generator(waifus_dict): def multiple_waifu_generator(self, bot):
"""Method to generate embed of multiple waifu's""" """Method to generate embed of multiple waifu's"""
embeds = [] embeds = []
for key in waifus_dict.values(): for key in self.waifus_dict.values():
embed = Embed(title=key["name"], description=f"{key['original_name']} | {key['type']}", embed = Embed(title=key["name"], description=f"{key['original_name']} | {key['type']}",
colour=rndColour(), colour=bot.random_colour(),
url=key["url"]) url=key["url"])
embed.set_image(url=key["display_picture"]) embed.set_image(url=key["display_picture"])
embed.set_footer(text=f"❤️ {key['likes']} 🗑️ {key['trash']} | Powered by MyWaifuList") embed.set_footer(text=f"❤️ {key['likes']} 🗑️ {key['trash']} | Powered by MyWaifuList")
@ -49,7 +46,7 @@ def multiple_waifu_generator(waifus_dict):
return embeds return embeds
def single_waifu_generator(waifu): def single_waifu_generator(self, waifu):
"""Method to generate embed of single waifu's""" """Method to generate embed of single waifu's"""
# Get all the data to be displayed in the embed # Get all the data to be displayed in the embed
@ -63,7 +60,7 @@ def single_waifu_generator(waifu):
# Set up the embed # Set up the embed
embed = Embed(title=name, description=f"{og_name} | {waifu_type}", embed = Embed(title=name, description=f"{og_name} | {waifu_type}",
colour=rndColour(), colour=self.bot.random_colour(),
url=url) url=url)
embed.set_image(url=picture) embed.set_image(url=picture)
embed.set_footer(text=f"❤️ {likes} 🗑️ {trash} | Powered by MyWaifuList") embed.set_footer(text=f"❤️ {likes} 🗑️ {trash} | Powered by MyWaifuList")
@ -73,19 +70,19 @@ def single_waifu_generator(waifu):
# Set up the Cog # Set up the Cog
class HelpMenu(menus.Menu): class HelpMenu(menus.Menu):
def __init__(self, i, waifu, bot, botter): def __init__(self, i, waifu, bot, guild_bot):
super().__init__(timeout=125.0, clear_reactions_after=True) super().__init__(timeout=125.0, clear_reactions_after=True)
self.waifus_dict = waifu self.waifus_dict = waifu
self.i = i self.i = i
self.waifu = multiple_waifu_generator(self.waifus_dict)
self.bot = bot self.bot = bot
self.botter = botter self.waifu = multiple_waifu_generator(self, bot)
self.guild_bot = guild_bot
# Message to be sent on the initial command ~help # Message to be sent on the initial command ~help
async def send_initial_message(self, ctx, channel): async def send_initial_message(self, ctx, channel):
# Set the first embed to the first element in the pages[] # Set the first embed to the first element in the pages[]
initial = multiple_waifu_generator(self.waifus_dict)[self.i] initial = self.waifu[self.i]
cur_page = self.i + 1 cur_page = self.i + 1
pages = len(self.waifu) pages = len(self.waifu)
@ -105,8 +102,8 @@ class HelpMenu(menus.Menu):
# Do nothing if the check does not return true # Do nothing if the check does not return true
if check(self.ctx): if check(self.ctx):
# Set self.i to (i - 1) remainder length of the array # Set self.i to (i - 1) remainder length of the array
self.i = (self.i - 1) % len(multiple_waifu_generator(self.waifus_dict)) self.i = (self.i - 1) % len(self.waifu)
prev_page = multiple_waifu_generator(self.waifus_dict)[self.i] prev_page = self.waifu[self.i]
cur_page = self.i + 1 cur_page = self.i + 1
pages = len(self.waifu) pages = len(self.waifu)
@ -114,7 +111,7 @@ class HelpMenu(menus.Menu):
# Send the embed and remove the reaction of the user # Send the embed and remove the reaction of the user
await self.message.edit(embed=prev_page) await self.message.edit(embed=prev_page)
if self.botter.guild_permissions.manage_messages: if self.guild_bot.guild_permissions.manage_messages:
await self.message.remove_reaction("⬅", self.ctx.author) await self.message.remove_reaction("⬅", self.ctx.author)
# Reaction to allow user to go to the next page in the embed # Reaction to allow user to go to the next page in the embed
@ -128,8 +125,8 @@ class HelpMenu(menus.Menu):
# Do nothing if the check does not return true # Do nothing if the check does not return true
if check(self.ctx): if check(self.ctx):
# Set self.i to (i + 1) remainder length of the array # Set self.i to (i + 1) remainder length of the array
self.i = (self.i + 1) % len(multiple_waifu_generator(self.waifus_dict)) self.i = (self.i + 1) % len(self.waifu)
next_page = multiple_waifu_generator(self.waifus_dict)[self.i] next_page = self.waifu[self.i]
cur_page = self.i + 1 cur_page = self.i + 1
pages = len(self.waifu) pages = len(self.waifu)
@ -137,7 +134,7 @@ class HelpMenu(menus.Menu):
# Send the embed and remove the reaction of the user # Send the embed and remove the reaction of the user
await self.message.edit(embed=next_page) await self.message.edit(embed=next_page)
if self.botter.guild_permissions.manage_messages: if self.guild_bot.guild_permissions.manage_messages:
await self.message.remove_reaction("➡", self.ctx.author) await self.message.remove_reaction("➡", self.ctx.author)
@menus.button('\N{BLACK SQUARE FOR STOP}\ufe0f') @menus.button('\N{BLACK SQUARE FOR STOP}\ufe0f')
@ -212,14 +209,14 @@ class Anime(Cog):
# When no waifu has been retrieved, send error message to the user # When no waifu has been retrieved, send error message to the user
else: else:
embed = Embed(description="**Waifu Not Found!**", embed = Embed(description="**Waifu Not Found!**",
colour=enso_embedmod_colours) colour=self.bot.admin_colour)
await ctx.send(embed=embed) await ctx.send(embed=embed)
# Get the instance of the bot # Get the instance of the bot
bot = ctx.guild.get_member(self.bot.user.id) bot = ctx.guild.get_member(self.bot.user.id)
# Send the menu to the display # Send the menu to the display
menu = HelpMenu(i, waifus_dict, self, bot) menu = HelpMenu(i, waifus_dict, self.bot, bot)
await menu.start(ctx) await menu.start(ctx)
else: else:
@ -233,13 +230,13 @@ class Anime(Cog):
# Store waifu's in dict when request is successful, else send an error # Store waifu's in dict when request is successful, else send an error
if resp.status == 200: if resp.status == 200:
waifu_dict = await resp.json() waifu_dict = await resp.json()
waifu = waifu_dict["data"] waifu3 = waifu_dict["data"]
# Send error if something went wrong internally/while grabbing data from API # Send error if something went wrong internally/while grabbing data from API
else: else:
await ctx.send("Something went wrong!") await ctx.send("Something went wrong!")
await ctx.send(embed=single_waifu_generator(waifu)) await ctx.send(embed=single_waifu_generator(self, waifu3))
@waifu.command(name="daily") @waifu.command(name="daily")
async def daily_waifu(self, ctx): async def daily_waifu(self, ctx):
@ -259,7 +256,7 @@ class Anime(Cog):
else: else:
await ctx.send("Something went wrong!") await ctx.send("Something went wrong!")
await ctx.send(embed=single_waifu_generator(waifu)) await ctx.send(embed=single_waifu_generator(self, waifu))
def setup(bot): def setup(bot):

Write Preview
Loading…
Cancel
Save