mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-12-05 08:52:31 -05:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
734ab49f6a | ||
|
|
204d82db8f | ||
|
77a5b4c742 | ||
|
7707fec199 | ||
|
4ef51a165f | ||
|
574dabbeac | ||
|
|
e463c307ea | ||
|
b8e56f3632 | ||
|
dc3fe1f8f8 | ||
|
1dda0f95de | ||
|
5e5687d0bb | ||
|
e0ad67aa3d | ||
|
|
c3eb4abd7a | ||
|
|
d97760997e | ||
|
81193d17c7 | ||
|
|
cf78ea06e2 | ||
|
|
26122e56a0 |
@@ -1,5 +1,44 @@
|
||||
.. 3.3.x Changelogs
|
||||
|
||||
Redbot 3.3.12 (2020-08-18)
|
||||
==========================
|
||||
|
||||
| Thanks to all these amazing people that contributed to this release:
|
||||
| :ghuser:`Dav-Git`, :ghuser:`douglas-cpp`, :ghuser:`flaree`, :ghuser:`jack1142`, :ghuser:`Kowlin`, :ghuser:`MeatyChunks`, :ghuser:`PredaaA`, :ghuser:`Predeactor`, :ghuser:`thisisjvgrace`, :ghuser:`Vexed01`, :ghuser:`zephyrkul`
|
||||
|
||||
End-user changelog
|
||||
------------------
|
||||
|
||||
Core Bot
|
||||
********
|
||||
|
||||
- Red now logs clearer error if it can't find package to load in any cog path during bot startup (:issue:`4079`)
|
||||
|
||||
Mod
|
||||
***
|
||||
|
||||
- ``[p]mute voice`` and ``[p]unmute voice`` now take action instantly if bot has Move Members permission (:issue:`4064`)
|
||||
- Added typing to ``[p](un)mute guild`` to indicate that mute is being processed (:issue:`4066`, :issue:`4172`)
|
||||
|
||||
Streams
|
||||
*******
|
||||
|
||||
- Improve error messages for invalid channel names/IDs (:issue:`4147`, :issue:`4148`)
|
||||
|
||||
Trivia Lists
|
||||
************
|
||||
|
||||
- Added ``whosthatpokemon2`` trivia containing Pokémons from 2nd generation (:issue:`4102`)
|
||||
- Added ``whosthatpokemon3`` trivia containing Pokémons from 3rd generation (:issue:`4141`)
|
||||
|
||||
|
||||
Miscellaneous
|
||||
-------------
|
||||
|
||||
- Updated features list in ``[p]serverinfo`` with the latest changes from Discord (:issue:`4116`)
|
||||
- Simple version of ``[p]serverinfo`` now shows info about more detailed ``[p]serverinfo 1`` (:issue:`4121`)
|
||||
|
||||
|
||||
Redbot 3.3.11 (2020-08-10)
|
||||
==========================
|
||||
|
||||
|
||||
@@ -191,7 +191,7 @@ def _update_event_loop_policy():
|
||||
_asyncio.set_event_loop_policy(_uvloop.EventLoopPolicy())
|
||||
|
||||
|
||||
__version__ = "3.3.11"
|
||||
__version__ = "3.3.12"
|
||||
version_info = VersionInfo.from_str(__version__)
|
||||
|
||||
# Filter fuzzywuzzy slow sequence matcher warning
|
||||
|
||||
@@ -193,7 +193,9 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
|
||||
embed = discord.Embed(
|
||||
colour=await self.bot.get_embed_color(message_channel),
|
||||
title=_("Track Stuck"),
|
||||
description="{}".format(description),
|
||||
description=_(
|
||||
"Playback of the song has stopped due to an unexcepted error.\n{error}"
|
||||
).format(error=description),
|
||||
)
|
||||
else:
|
||||
embed = discord.Embed(
|
||||
|
||||
@@ -374,7 +374,7 @@ class Cleanup(commands.Cog):
|
||||
to_delete.append(ctx.message)
|
||||
|
||||
reason = "{}({}) deleted {} messages in channel {}.".format(
|
||||
author.name, author.id, number, channel.name
|
||||
author.name, author.id, len(to_delete), channel.name
|
||||
)
|
||||
log.info(reason)
|
||||
|
||||
|
||||
@@ -255,7 +255,7 @@ class Filter(commands.Cog):
|
||||
elif isinstance(server_or_channel, discord.TextChannel):
|
||||
async with self.config.channel(server_or_channel).filter() as cur_list:
|
||||
for w in words:
|
||||
if w.lower not in cur_list and w:
|
||||
if w.lower() not in cur_list and w:
|
||||
cur_list.append(w.lower())
|
||||
added = True
|
||||
|
||||
|
||||
@@ -267,7 +267,13 @@ class General(commands.Cog):
|
||||
data.add_field(name=_("Voice Channels"), value=voice_channels)
|
||||
data.add_field(name=_("Roles"), value=humanize_number(len(guild.roles)))
|
||||
data.add_field(name=_("Owner"), value=str(guild.owner))
|
||||
data.set_footer(text=_("Server ID: ") + str(guild.id))
|
||||
data.set_footer(
|
||||
text=_("Server ID: ")
|
||||
+ str(guild.id)
|
||||
+ _(" • Use {command} for more info on the server.").format(
|
||||
command=f"{ctx.clean_prefix}serverinfo 1"
|
||||
)
|
||||
)
|
||||
if guild.icon_url:
|
||||
data.set_author(name=guild.name, url=guild.icon_url)
|
||||
data.set_thumbnail(url=guild.icon_url)
|
||||
@@ -364,7 +370,7 @@ class General(commands.Cog):
|
||||
"VERIFIED": _("Verified"),
|
||||
"DISCOVERABLE": _("Server Discovery"),
|
||||
"FEATURABLE": _("Featurable"),
|
||||
"PUBLIC": _("Public"),
|
||||
"COMMUNITY": _("Community"),
|
||||
"PUBLIC_DISABLED": _("Public disabled"),
|
||||
"INVITE_SPLASH": _("Splash Invite"),
|
||||
"VIP_REGIONS": _("VIP Voice Servers"),
|
||||
|
||||
@@ -3,6 +3,7 @@ from typing import cast, Optional
|
||||
|
||||
import discord
|
||||
from redbot.core import commands, checks, i18n, modlog
|
||||
from redbot.core.utils import AsyncIter
|
||||
from redbot.core.utils.chat_formatting import format_perms_list
|
||||
from redbot.core.utils.mod import get_audit_reason, is_allowed_by_hierarchy
|
||||
from .abc import MixinMeta
|
||||
@@ -207,6 +208,17 @@ class MuteMixin(MixinMeta):
|
||||
await ctx.send(
|
||||
_("Muted {user} in channel {channel.name}").format(user=user, channel=channel)
|
||||
)
|
||||
try:
|
||||
if channel.permissions_for(ctx.me).move_members:
|
||||
await user.move_to(channel)
|
||||
else:
|
||||
raise RuntimeError
|
||||
except (discord.Forbidden, RuntimeError):
|
||||
await ctx.send(
|
||||
_(
|
||||
"Because I don't have the Move Members permission, this will take into effect when the user rejoins."
|
||||
)
|
||||
)
|
||||
else:
|
||||
await ctx.send(issue)
|
||||
|
||||
@@ -255,11 +267,10 @@ class MuteMixin(MixinMeta):
|
||||
audit_reason = get_audit_reason(author, reason)
|
||||
|
||||
mute_success = []
|
||||
for channel in guild.channels:
|
||||
success, issue = await self.mute_user(guild, channel, author, user, audit_reason)
|
||||
mute_success.append((success, issue))
|
||||
await asyncio.sleep(0.1)
|
||||
try:
|
||||
async with ctx.typing():
|
||||
for channel in guild.channels:
|
||||
success, issue = await self.mute_user(guild, channel, author, user, audit_reason)
|
||||
mute_success.append((success, issue))
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
@@ -271,9 +282,7 @@ class MuteMixin(MixinMeta):
|
||||
until=None,
|
||||
channel=None,
|
||||
)
|
||||
except RuntimeError as e:
|
||||
await ctx.send(e)
|
||||
await ctx.send(_("User has been muted in this server."))
|
||||
await ctx.send(_("User has been muted in this server."))
|
||||
|
||||
@commands.group()
|
||||
@commands.guild_only()
|
||||
@@ -322,6 +331,17 @@ class MuteMixin(MixinMeta):
|
||||
await ctx.send(
|
||||
_("Unmuted {user} in channel {channel.name}").format(user=user, channel=channel)
|
||||
)
|
||||
try:
|
||||
if channel.permissions_for(ctx.me).move_members:
|
||||
await user.move_to(channel)
|
||||
else:
|
||||
raise RuntimeError
|
||||
except (discord.Forbidden, RuntimeError):
|
||||
await ctx.send(
|
||||
_(
|
||||
"Because I don't have the Move Members permission, this will take into effect when the user rejoins."
|
||||
)
|
||||
)
|
||||
else:
|
||||
await ctx.send(_("Unmute failed. Reason: {}").format(message))
|
||||
|
||||
@@ -372,11 +392,12 @@ class MuteMixin(MixinMeta):
|
||||
audit_reason = get_audit_reason(author, reason)
|
||||
|
||||
unmute_success = []
|
||||
for channel in guild.channels:
|
||||
success, message = await self.unmute_user(guild, channel, author, user, audit_reason)
|
||||
unmute_success.append((success, message))
|
||||
await asyncio.sleep(0.1)
|
||||
try:
|
||||
async with ctx.typing():
|
||||
for channel in guild.channels:
|
||||
success, message = await self.unmute_user(
|
||||
guild, channel, author, user, audit_reason
|
||||
)
|
||||
unmute_success.append((success, message))
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
@@ -387,9 +408,7 @@ class MuteMixin(MixinMeta):
|
||||
reason,
|
||||
until=None,
|
||||
)
|
||||
except RuntimeError as e:
|
||||
await ctx.send(e)
|
||||
await ctx.send(_("User has been unmuted in this server."))
|
||||
await ctx.send(_("User has been unmuted in this server."))
|
||||
|
||||
async def mute_user(
|
||||
self,
|
||||
|
||||
@@ -282,7 +282,8 @@ class Permissions(commands.Cog):
|
||||
except discord.Forbidden:
|
||||
await ctx.send(_("I'm not allowed to DM you."))
|
||||
else:
|
||||
await ctx.send(_("I've just sent the file to you via DM."))
|
||||
if not isinstance(ctx.channel, discord.DMChannel):
|
||||
await ctx.send(_("I've just sent the file to you via DM."))
|
||||
finally:
|
||||
file.close()
|
||||
|
||||
|
||||
@@ -271,9 +271,16 @@ class Reports(commands.Cog):
|
||||
|
||||
with contextlib.suppress(discord.Forbidden, discord.HTTPException):
|
||||
if val is None:
|
||||
await author.send(
|
||||
_("There was an error sending your report, please contact a server admin.")
|
||||
)
|
||||
if await self.config.guild(ctx.guild).output_channel() is None:
|
||||
await author.send(
|
||||
_(
|
||||
"This server has no reports channel set up. Please contact a server admin."
|
||||
)
|
||||
)
|
||||
else:
|
||||
await author.send(
|
||||
_("There was an error sending your report, please contact a server admin.")
|
||||
)
|
||||
else:
|
||||
await author.send(_("Your report was submitted. (Ticket #{})").format(val))
|
||||
self.antispam[guild.id][author.id].stamp()
|
||||
|
||||
@@ -505,14 +505,13 @@ class Streams(commands.Cog):
|
||||
|
||||
@message.command(name="mention")
|
||||
@commands.guild_only()
|
||||
async def with_mention(self, ctx: commands.Context, message: str = None):
|
||||
async def with_mention(self, ctx: commands.Context, *, message: str = None):
|
||||
"""Set stream alert message when mentions are enabled.
|
||||
|
||||
Use `{mention}` in the message to insert the selected mentions.
|
||||
Use `{stream}` in the message to insert the channel or user name.
|
||||
|
||||
Use `{stream.name}` in the message to insert the channel or user name.
|
||||
|
||||
For example: `[p]streamset message mention "{mention}, {stream.name} is live!"`
|
||||
For example: `[p]streamset message mention {mention}, {stream} is live!`
|
||||
"""
|
||||
if message is not None:
|
||||
guild = ctx.guild
|
||||
@@ -523,12 +522,12 @@ class Streams(commands.Cog):
|
||||
|
||||
@message.command(name="nomention")
|
||||
@commands.guild_only()
|
||||
async def without_mention(self, ctx: commands.Context, message: str = None):
|
||||
async def without_mention(self, ctx: commands.Context, *, message: str = None):
|
||||
"""Set stream alert message when mentions are disabled.
|
||||
|
||||
Use `{stream.name}` in the message to insert the channel or user name.
|
||||
Use `{stream}` in the message to insert the channel or user name.
|
||||
|
||||
For example: `[p]streamset message nomention "{stream.name} is live!"`
|
||||
For example: `[p]streamset message nomention {stream} is live!`
|
||||
"""
|
||||
if message is not None:
|
||||
guild = ctx.guild
|
||||
@@ -724,7 +723,12 @@ class Streams(commands.Cog):
|
||||
channel.guild
|
||||
).live_message_mention()
|
||||
if alert_msg:
|
||||
content = alert_msg.format(mention=mention_str, stream=stream)
|
||||
content = alert_msg # Stop bad things from happening here...
|
||||
content = content.replace(
|
||||
"{stream.name}", str(stream.name)
|
||||
) # Backwards compatability
|
||||
content = content.replace("{stream}", str(stream.name))
|
||||
content = content.replace("{mention}", mention_str)
|
||||
else:
|
||||
content = _("{mention}, {stream} is live!").format(
|
||||
mention=mention_str,
|
||||
@@ -737,7 +741,11 @@ class Streams(commands.Cog):
|
||||
channel.guild
|
||||
).live_message_nomention()
|
||||
if alert_msg:
|
||||
content = alert_msg.format(stream=stream)
|
||||
content = alert_msg # Stop bad things from happening here...
|
||||
content = content.replace(
|
||||
"{stream.name}", str(stream.name)
|
||||
) # Backwards compatability
|
||||
content = content.replace("{stream}", str(stream.name))
|
||||
else:
|
||||
content = _("{stream} is live!").format(
|
||||
stream=escape(
|
||||
|
||||
@@ -190,6 +190,12 @@ class YoutubeStream(Stream):
|
||||
raise StreamNotFound()
|
||||
elif "items" in data:
|
||||
return data["items"][0][resource]
|
||||
elif (
|
||||
"pageInfo" in data
|
||||
and "totalResults" in data["pageInfo"]
|
||||
and data["pageInfo"]["totalResults"] < 1
|
||||
):
|
||||
raise StreamNotFound()
|
||||
raise APIError()
|
||||
|
||||
def __repr__(self):
|
||||
|
||||
@@ -1,303 +1,303 @@
|
||||
AUTHOR: aikaterna
|
||||
Who's that pokemon? https://cdn.discord.red/i/JhaHtAM.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JhaHtAM.png:
|
||||
- Bulbasaur
|
||||
Who's that pokemon? https://cdn.discord.red/i/J42krSc.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/J42krSc.png:
|
||||
- Ivysaur
|
||||
Who's that pokemon? https://cdn.discord.red/i/Y6aQTvu.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Y6aQTvu.png:
|
||||
- Venusaur
|
||||
Who's that pokemon? https://cdn.discord.red/i/GzGY0m5.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GzGY0m5.png:
|
||||
- Charmander
|
||||
Who's that pokemon? https://cdn.discord.red/i/GPqbMp9.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GPqbMp9.png:
|
||||
- Charmeleon
|
||||
Who's that pokemon? https://cdn.discord.red/i/Dpx11Hv.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Dpx11Hv.png:
|
||||
- Charizard
|
||||
Who's that pokemon? https://cdn.discord.red/i/hWxoVFP.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/hWxoVFP.png:
|
||||
- Squirtle
|
||||
Who's that pokemon? https://cdn.discord.red/i/FAXNExP.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/FAXNExP.png:
|
||||
- Wartortle
|
||||
Who's that pokemon? https://cdn.discord.red/i/b8dIcMs.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/b8dIcMs.png:
|
||||
- Blastoise
|
||||
Who's that pokemon? https://cdn.discord.red/i/5THSh9F.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/5THSh9F.png:
|
||||
- Caterpie
|
||||
Who's that pokemon? https://cdn.discord.red/i/g7J4azT.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/g7J4azT.png:
|
||||
- Metapod
|
||||
Who's that pokemon? https://cdn.discord.red/i/Gln47Ns.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Gln47Ns.png:
|
||||
- Butterfree
|
||||
Who's that pokemon? https://cdn.discord.red/i/Nurfd3B.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Nurfd3B.png:
|
||||
- Weedle
|
||||
Who's that pokemon? https://cdn.discord.red/i/RbTimG9.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/RbTimG9.png:
|
||||
- Kakuna
|
||||
Who's that pokemon? https://cdn.discord.red/i/4hqx40k.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/4hqx40k.png:
|
||||
- Beedrill
|
||||
Who's that pokemon? https://cdn.discord.red/i/SH9ogxU.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/SH9ogxU.png:
|
||||
- Pidgey
|
||||
Who's that pokemon? https://cdn.discord.red/i/ciZdrwt.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ciZdrwt.png:
|
||||
- Pidgeotto
|
||||
Who's that pokemon? https://cdn.discord.red/i/8pTnBh7.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/8pTnBh7.png:
|
||||
- Pidgeot
|
||||
Who's that pokemon? https://cdn.discord.red/i/Q9dISQq.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Q9dISQq.png:
|
||||
- Rattata
|
||||
Who's that pokemon? https://cdn.discord.red/i/qu5PdyR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/qu5PdyR.png:
|
||||
- Raticate
|
||||
Who's that pokemon? https://cdn.discord.red/i/FcU64Fe.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/FcU64Fe.png:
|
||||
- Spearow
|
||||
Who's that pokemon? https://cdn.discord.red/i/3RPuh1B.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/3RPuh1B.png:
|
||||
- Fearow
|
||||
Who's that pokemon? https://cdn.discord.red/i/waJYATU.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/waJYATU.png:
|
||||
- Ekans
|
||||
Who's that pokemon? https://cdn.discord.red/i/xpfF1DV.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/xpfF1DV.png:
|
||||
- Arbok
|
||||
Who's that pokemon? https://cdn.discord.red/i/A6KEQ75.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/A6KEQ75.png:
|
||||
- Pikachu
|
||||
Who's that pokemon? https://cdn.discord.red/i/TqzNM9a.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/TqzNM9a.png:
|
||||
- Raichu
|
||||
Who's that pokemon? https://cdn.discord.red/i/8XJouBF.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/8XJouBF.png:
|
||||
- Sandshrew
|
||||
Who's that pokemon? https://cdn.discord.red/i/x0bbRtg.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/x0bbRtg.png:
|
||||
- Sandslash
|
||||
Who's that pokemon? https://cdn.discord.red/i/jkcrKwF.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/jkcrKwF.png:
|
||||
- Nidoran
|
||||
Who's that pokemon? https://cdn.discord.red/i/3EmECpN.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/3EmECpN.png:
|
||||
- Nidorina
|
||||
Who's that pokemon? https://cdn.discord.red/i/r8X77i2.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/r8X77i2.png:
|
||||
- Nidoqueen
|
||||
Who's that pokemon? https://cdn.discord.red/i/5Ny72io.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/5Ny72io.png:
|
||||
- Nidoran
|
||||
Who's that pokemon? https://cdn.discord.red/i/ZhsSCE4.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ZhsSCE4.png:
|
||||
- Nidorino
|
||||
Who's that pokemon? https://cdn.discord.red/i/YVjcgD9.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/YVjcgD9.png:
|
||||
- Nidoking
|
||||
Who's that pokemon? https://cdn.discord.red/i/C0jvtgd.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/C0jvtgd.png:
|
||||
- Clefairy
|
||||
Who's that pokemon? https://cdn.discord.red/i/JAvpC50.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JAvpC50.png:
|
||||
- Clefable
|
||||
Who's that pokemon? https://cdn.discord.red/i/QcxFvi7.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/QcxFvi7.png:
|
||||
- Vulpix
|
||||
Who's that pokemon? https://cdn.discord.red/i/Q3SRhH3.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Q3SRhH3.png:
|
||||
- Ninetales
|
||||
Who's that pokemon? https://cdn.discord.red/i/hKwx2UP.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/hKwx2UP.png:
|
||||
- Jigglypuff
|
||||
Who's that pokemon? https://cdn.discord.red/i/HI6GLIM.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/HI6GLIM.png:
|
||||
- Wigglytuff
|
||||
Who's that pokemon? https://cdn.discord.red/i/ygyr0wR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ygyr0wR.png:
|
||||
- Zubat
|
||||
Who's that pokemon? https://cdn.discord.red/i/7amMKJd.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7amMKJd.png:
|
||||
- Golbat
|
||||
Who's that pokemon? https://cdn.discord.red/i/NMd1UkL.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/NMd1UkL.png:
|
||||
- Oddish
|
||||
Who's that pokemon? https://cdn.discord.red/i/0Pm1MZ6.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/0Pm1MZ6.png:
|
||||
- Gloom
|
||||
Who's that pokemon? https://cdn.discord.red/i/WGjuCBJ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/WGjuCBJ.png:
|
||||
- Vileplume
|
||||
Who's that pokemon? https://cdn.discord.red/i/fHkDxEI.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/fHkDxEI.png:
|
||||
- Paras
|
||||
Who's that pokemon? https://cdn.discord.red/i/JgC6p0O.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JgC6p0O.png:
|
||||
- Parasect
|
||||
Who's that pokemon? https://cdn.discord.red/i/xgElemy.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/xgElemy.png:
|
||||
- Venonat
|
||||
Who's that pokemon? https://cdn.discord.red/i/n69EDYY.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/n69EDYY.png:
|
||||
- Venomoth
|
||||
Who's that pokemon? https://cdn.discord.red/i/gncAD9E.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/gncAD9E.png:
|
||||
- Diglett
|
||||
Who's that pokemon? https://cdn.discord.red/i/XgzUqSP.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/XgzUqSP.png:
|
||||
- Dugtrio
|
||||
Who's that pokemon? https://cdn.discord.red/i/abjRwp0.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/abjRwp0.png:
|
||||
- Meowth
|
||||
Who's that pokemon? https://cdn.discord.red/i/nnDIR3w.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/nnDIR3w.png:
|
||||
- Persian
|
||||
Who's that pokemon? https://cdn.discord.red/i/fAXPqen.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/fAXPqen.png:
|
||||
- Psyduck
|
||||
Who's that pokemon? https://cdn.discord.red/i/rq8Q3HN.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rq8Q3HN.png:
|
||||
- Golduck
|
||||
Who's that pokemon? https://cdn.discord.red/i/vMjgxYs.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/vMjgxYs.png:
|
||||
- Mankey
|
||||
Who's that pokemon? https://cdn.discord.red/i/rLnDp0u.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rLnDp0u.png:
|
||||
- Primeape
|
||||
Who's that pokemon? https://cdn.discord.red/i/IeyfkCU.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/IeyfkCU.png:
|
||||
- Growlithe
|
||||
Who's that pokemon? https://cdn.discord.red/i/35xsszF.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/35xsszF.png:
|
||||
- Arcanine
|
||||
Who's that pokemon? https://cdn.discord.red/i/M5KDU86.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/M5KDU86.png:
|
||||
- Poliwag
|
||||
Who's that pokemon? https://cdn.discord.red/i/K033cK1.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/K033cK1.png:
|
||||
- Poliwhirl
|
||||
Who's that pokemon? https://cdn.discord.red/i/o5Hv7AK.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/o5Hv7AK.png:
|
||||
- Poliwrath
|
||||
Who's that pokemon? https://cdn.discord.red/i/AhNIqr8.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/AhNIqr8.png:
|
||||
- Abra
|
||||
Who's that pokemon? https://cdn.discord.red/i/2L2aPtx.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/2L2aPtx.png:
|
||||
- Kadabra
|
||||
Who's that pokemon? https://cdn.discord.red/i/kGuFJDY.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/kGuFJDY.png:
|
||||
- Alakazam
|
||||
Who's that pokemon? https://cdn.discord.red/i/YQUTREX.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/YQUTREX.png:
|
||||
- Machop
|
||||
Who's that pokemon? https://cdn.discord.red/i/YL7C8i8.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/YL7C8i8.png:
|
||||
- Machoke
|
||||
Who's that pokemon? https://cdn.discord.red/i/1355Vod.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/1355Vod.png:
|
||||
- Machamp
|
||||
Who's that pokemon? https://cdn.discord.red/i/VxA12Ot.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/VxA12Ot.png:
|
||||
- Bellsprout
|
||||
Who's that pokemon? https://cdn.discord.red/i/D6mgIJJ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/D6mgIJJ.png:
|
||||
- Weepinbell
|
||||
Who's that pokemon? https://cdn.discord.red/i/NMSvlCz.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/NMSvlCz.png:
|
||||
- Victreebel
|
||||
Who's that pokemon? https://cdn.discord.red/i/IoJmVzO.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/IoJmVzO.png:
|
||||
- Tentacool
|
||||
Who's that pokemon? https://cdn.discord.red/i/0O9TNYv.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/0O9TNYv.png:
|
||||
- Tentacruel
|
||||
Who's that pokemon? https://cdn.discord.red/i/tFK8d3z.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/tFK8d3z.png:
|
||||
- Geodude
|
||||
Who's that pokemon? https://cdn.discord.red/i/lgew3Ca.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/lgew3Ca.png:
|
||||
- Graveler
|
||||
Who's that pokemon? https://cdn.discord.red/i/mG8wAHs.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/mG8wAHs.png:
|
||||
- Golem
|
||||
Who's that pokemon? https://cdn.discord.red/i/N6un8iO.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/N6un8iO.png:
|
||||
- Ponyta
|
||||
Who's that pokemon? https://cdn.discord.red/i/T7ADHJo.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/T7ADHJo.png:
|
||||
- Rapidash
|
||||
Who's that pokemon? https://cdn.discord.red/i/6RBzLij.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/6RBzLij.png:
|
||||
- Slowpoke
|
||||
Who's that pokemon? https://cdn.discord.red/i/7ju6OBY.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7ju6OBY.png:
|
||||
- Slowbro
|
||||
Who's that pokemon? https://cdn.discord.red/i/KnhQMxQ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/KnhQMxQ.png:
|
||||
- Magnemite
|
||||
Who's that pokemon? https://cdn.discord.red/i/bJDh47R.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/bJDh47R.png:
|
||||
- Magneton
|
||||
Who's that pokemon? https://cdn.discord.red/i/WMJFI92.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/WMJFI92.png:
|
||||
- Farfetch'd
|
||||
Who's that pokemon? https://cdn.discord.red/i/pw6UYNR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/pw6UYNR.png:
|
||||
- Doduo
|
||||
Who's that pokemon? https://cdn.discord.red/i/WE8YHaR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/WE8YHaR.png:
|
||||
- Dodrio
|
||||
Who's that pokemon? https://cdn.discord.red/i/vZlSSqS.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/vZlSSqS.png:
|
||||
- Seel
|
||||
Who's that pokemon? https://cdn.discord.red/i/3erUdvZ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/3erUdvZ.png:
|
||||
- Dewgong
|
||||
Who's that pokemon? https://cdn.discord.red/i/FkecTd4.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/FkecTd4.png:
|
||||
- Grimer
|
||||
Who's that pokemon? https://cdn.discord.red/i/nHl2BrL.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/nHl2BrL.png:
|
||||
- Muk
|
||||
Who's that pokemon? https://cdn.discord.red/i/o9xX4uR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/o9xX4uR.png:
|
||||
- Shellder
|
||||
Who's that pokemon? https://cdn.discord.red/i/oC0mdzt.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/oC0mdzt.png:
|
||||
- Cloyster
|
||||
Who's that pokemon? https://cdn.discord.red/i/xhPTiG2.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/xhPTiG2.png:
|
||||
- Gastly
|
||||
Who's that pokemon? https://cdn.discord.red/i/eLwmupW.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/eLwmupW.png:
|
||||
- Haunter
|
||||
Who's that pokemon? https://cdn.discord.red/i/SpBQNMG.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/SpBQNMG.png:
|
||||
- Gengar
|
||||
Who's that pokemon? https://cdn.discord.red/i/oP8J2tJ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/oP8J2tJ.png:
|
||||
- Onix
|
||||
Who's that pokemon? https://cdn.discord.red/i/oJ3ZHfP.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/oJ3ZHfP.png:
|
||||
- Drowzee
|
||||
Who's that pokemon? https://cdn.discord.red/i/eutXYlt.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/eutXYlt.png:
|
||||
- Hypno
|
||||
Who's that pokemon? https://cdn.discord.red/i/nd7n8su.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/nd7n8su.png:
|
||||
- Krabby
|
||||
Who's that pokemon? https://cdn.discord.red/i/GE9Ddfg.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GE9Ddfg.png:
|
||||
- Kingler
|
||||
Who's that pokemon? https://cdn.discord.red/i/ZTgtF9V.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ZTgtF9V.png:
|
||||
- Voltorb
|
||||
Who's that pokemon? https://cdn.discord.red/i/pQASpgA.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/pQASpgA.png:
|
||||
- Electrode
|
||||
Who's that pokemon? https://cdn.discord.red/i/Fk9QAG4.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Fk9QAG4.png:
|
||||
- Exeggcute
|
||||
Who's that pokemon? https://cdn.discord.red/i/d9VcfpV.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/d9VcfpV.png:
|
||||
- Exeggutor
|
||||
Who's that pokemon? https://cdn.discord.red/i/GZMPoPQ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GZMPoPQ.png:
|
||||
- Cubone
|
||||
Who's that pokemon? https://cdn.discord.red/i/v2pv554.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/v2pv554.png:
|
||||
- Marowak
|
||||
Who's that pokemon? https://cdn.discord.red/i/cg8BnLd.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/cg8BnLd.png:
|
||||
- Hitmonlee
|
||||
Who's that pokemon? https://cdn.discord.red/i/26iLMlQ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/26iLMlQ.png:
|
||||
- Hitmonchan
|
||||
Who's that pokemon? https://cdn.discord.red/i/GRxldku.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GRxldku.png:
|
||||
- Lickitung
|
||||
Who's that pokemon? https://cdn.discord.red/i/y5dbZrK.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/y5dbZrK.png:
|
||||
- Koffing
|
||||
Who's that pokemon? https://cdn.discord.red/i/LFWBBMh.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/LFWBBMh.png:
|
||||
- Weezing
|
||||
Who's that pokemon? https://cdn.discord.red/i/JlDE7HF.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JlDE7HF.png:
|
||||
- Rhyhorn
|
||||
Who's that pokemon? https://cdn.discord.red/i/CtdI8PO.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/CtdI8PO.png:
|
||||
- Rhydon
|
||||
Who's that pokemon? https://cdn.discord.red/i/caw6rxF.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/caw6rxF.png:
|
||||
- Chansey
|
||||
Who's that pokemon? https://cdn.discord.red/i/L2MkNsi.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/L2MkNsi.png:
|
||||
- Tangela
|
||||
Who's that pokemon? https://cdn.discord.red/i/QrbUc6x.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/QrbUc6x.png:
|
||||
- Kangaskhan
|
||||
Who's that pokemon? https://cdn.discord.red/i/rHITC4u.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rHITC4u.png:
|
||||
- Horsea
|
||||
Who's that pokemon? https://cdn.discord.red/i/gmw99bY.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/gmw99bY.png:
|
||||
- Seadra
|
||||
Who's that pokemon? https://cdn.discord.red/i/nlXApwH.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/nlXApwH.png:
|
||||
- Goldeen
|
||||
Who's that pokemon? https://cdn.discord.red/i/IOxPciL.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/IOxPciL.png:
|
||||
- Seaking
|
||||
Who's that pokemon? https://cdn.discord.red/i/rEJK5dk.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rEJK5dk.png:
|
||||
- Staryu
|
||||
Who's that pokemon? https://cdn.discord.red/i/nKMh7m4.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/nKMh7m4.png:
|
||||
- Starmie
|
||||
Who's that pokemon? https://cdn.discord.red/i/zZYsvYZ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/zZYsvYZ.png:
|
||||
- Mr. Mime
|
||||
Who's that pokemon? https://cdn.discord.red/i/987JigM.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/987JigM.png:
|
||||
- Scyther
|
||||
Who's that pokemon? https://cdn.discord.red/i/71vLjQC.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/71vLjQC.png:
|
||||
- Jynx
|
||||
Who's that pokemon? https://cdn.discord.red/i/gyVHrsJ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/gyVHrsJ.png:
|
||||
- Electabuzz
|
||||
Who's that pokemon? https://cdn.discord.red/i/1WTGued.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/1WTGued.png:
|
||||
- Magmar
|
||||
Who's that pokemon? https://cdn.discord.red/i/V8y1cHT.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/V8y1cHT.png:
|
||||
- Pinsir
|
||||
Who's that pokemon? https://cdn.discord.red/i/OG6geA9.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/OG6geA9.png:
|
||||
- Tauros
|
||||
Who's that pokemon? https://cdn.discord.red/i/LsfwWH7.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/LsfwWH7.png:
|
||||
- Magikarp
|
||||
Who's that pokemon? https://cdn.discord.red/i/3FzgA70.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/3FzgA70.png:
|
||||
- Gyarados
|
||||
Who's that pokemon? https://cdn.discord.red/i/Dz7EXjw.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Dz7EXjw.png:
|
||||
- Lapras
|
||||
Who's that pokemon? https://cdn.discord.red/i/LYL4rX1.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/LYL4rX1.png:
|
||||
- Ditto
|
||||
Who's that pokemon? https://cdn.discord.red/i/c9KOJH1.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/c9KOJH1.png:
|
||||
- Eevee
|
||||
Who's that pokemon? https://cdn.discord.red/i/F8uPBoY.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/F8uPBoY.png:
|
||||
- Vaporeon
|
||||
Who's that pokemon? https://cdn.discord.red/i/ChlK8yg.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ChlK8yg.png:
|
||||
- Jolteon
|
||||
Who's that pokemon? https://cdn.discord.red/i/EjAuEZM.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/EjAuEZM.png:
|
||||
- Flareon
|
||||
Who's that pokemon? https://cdn.discord.red/i/lCWdbLS.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/lCWdbLS.png:
|
||||
- Porygon
|
||||
Who's that pokemon? https://cdn.discord.red/i/ajEgvvx.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ajEgvvx.png:
|
||||
- Omanyte
|
||||
Who's that pokemon? https://cdn.discord.red/i/B7wu0zJ.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/B7wu0zJ.png:
|
||||
- Omastar
|
||||
Who's that pokemon? https://cdn.discord.red/i/7fO1Js6.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7fO1Js6.png:
|
||||
- Kabuto
|
||||
Who's that pokemon? https://cdn.discord.red/i/g0h7oas.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/g0h7oas.png:
|
||||
- Kabutops
|
||||
Who's that pokemon? https://cdn.discord.red/i/XgGhtIu.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/XgGhtIu.png:
|
||||
- Aerodactyl
|
||||
Who's that pokemon? https://cdn.discord.red/i/q1vGvnR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/q1vGvnR.png:
|
||||
- Snorlax
|
||||
Who's that pokemon? https://cdn.discord.red/i/7Lb8533.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7Lb8533.png:
|
||||
- Articuno
|
||||
Who's that pokemon? https://cdn.discord.red/i/Dk1StF5.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Dk1StF5.png:
|
||||
- Zapdos
|
||||
Who's that pokemon? https://cdn.discord.red/i/rrcCaAR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rrcCaAR.png:
|
||||
- Moltres
|
||||
Who's that pokemon? https://cdn.discord.red/i/JU0mWkj.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JU0mWkj.png:
|
||||
- Dratini
|
||||
Who's that pokemon? https://cdn.discord.red/i/SsGWg1B.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/SsGWg1B.png:
|
||||
- Dragonair
|
||||
Who's that pokemon? https://cdn.discord.red/i/snr8HO7.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/snr8HO7.png:
|
||||
- Dragonite
|
||||
Who's that pokemon? https://cdn.discord.red/i/RW89rJR.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/RW89rJR.png:
|
||||
- Mewtwo
|
||||
Who's that pokemon? https://cdn.discord.red/i/dezUCAt.png:
|
||||
Who's that Pokémon? https://cdn.discord.red/i/dezUCAt.png:
|
||||
- Mew
|
||||
|
||||
201
redbot/cogs/trivia/data/lists/whosthatpokemon2.yaml
Normal file
201
redbot/cogs/trivia/data/lists/whosthatpokemon2.yaml
Normal file
@@ -0,0 +1,201 @@
|
||||
AUTHOR: aikaterna, owo
|
||||
Who's that Pokémon? https://cdn.discord.red/i/161fDs6.png:
|
||||
- Chikorita
|
||||
Who's that Pokémon? https://cdn.discord.red/i/9mBd4k5.png:
|
||||
- Bayleef
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JK6EdFS.png:
|
||||
- Meganium
|
||||
Who's that Pokémon? https://cdn.discord.red/i/VANqEey.png:
|
||||
- Cyndaquil
|
||||
Who's that Pokémon? https://cdn.discord.red/i/wo3W5f8.png:
|
||||
- Quilava
|
||||
Who's that Pokémon? https://cdn.discord.red/i/la2mCq5.png:
|
||||
- Typhlosion
|
||||
Who's that Pokémon? https://cdn.discord.red/i/NOE3zVe.png:
|
||||
- Totodile
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7mIaKvA.png:
|
||||
- Croconaw
|
||||
Who's that Pokémon? https://cdn.discord.red/i/pkRCy4p.png:
|
||||
- Feraligatr
|
||||
Who's that Pokémon? https://cdn.discord.red/i/R2RQJJD.png:
|
||||
- Sentret
|
||||
Who's that Pokémon? https://cdn.discord.red/i/zVeD6jY.png:
|
||||
- Furret
|
||||
Who's that Pokémon? https://cdn.discord.red/i/tu0igAj.png:
|
||||
- Hoothoot
|
||||
Who's that Pokémon? https://cdn.discord.red/i/qokx2sz.png:
|
||||
- Noctowl
|
||||
Who's that Pokémon? https://cdn.discord.red/i/LqBvwkd.png:
|
||||
- Ledyba
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Ri77MSO.png:
|
||||
- Ledian
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GvFKVrG.png:
|
||||
- Spinarak
|
||||
Who's that Pokémon? https://cdn.discord.red/i/MN7OIfR.png:
|
||||
- Ariados
|
||||
Who's that Pokémon? https://cdn.discord.red/i/e5hYFQF.png:
|
||||
- Crobat
|
||||
Who's that Pokémon? https://cdn.discord.red/i/YOyKw1M.png:
|
||||
- Chinchou
|
||||
Who's that Pokémon? https://cdn.discord.red/i/WZEHcW2.png:
|
||||
- Lanturn
|
||||
Who's that Pokémon? https://cdn.discord.red/i/1YqVBUU.png:
|
||||
- Pichu
|
||||
Who's that Pokémon? https://cdn.discord.red/i/BzyRRM6.png:
|
||||
- Cleffa
|
||||
Who's that Pokémon? https://cdn.discord.red/i/HLzHnoR.png:
|
||||
- Igglybuff
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7eIACOx.png:
|
||||
- Togepi
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Wihw9ed.png:
|
||||
- Togetic
|
||||
Who's that Pokémon? https://cdn.discord.red/i/sEcT1wG.png:
|
||||
- Natu
|
||||
Who's that Pokémon? https://cdn.discord.red/i/WP50IsH.png:
|
||||
- Xatu
|
||||
Who's that Pokémon? https://cdn.discord.red/i/aeU3eLQ.png:
|
||||
- Mareep
|
||||
Who's that Pokémon? https://cdn.discord.red/i/CMjVBM2.png:
|
||||
- Flaaffy
|
||||
Who's that Pokémon? https://cdn.discord.red/i/0rL21y3.png:
|
||||
- Ampharos
|
||||
Who's that Pokémon? https://cdn.discord.red/i/r83gWqG.png:
|
||||
- Bellossom
|
||||
Who's that Pokémon? https://cdn.discord.red/i/nDX9cFZ.png:
|
||||
- Marill
|
||||
Who's that Pokémon? https://cdn.discord.red/i/i8MzcBG.png:
|
||||
- Azumarill
|
||||
Who's that Pokémon? https://cdn.discord.red/i/9lvsmrK.png:
|
||||
- Sudowoodo
|
||||
Who's that Pokémon? https://cdn.discord.red/i/1MOC4py.png:
|
||||
- Politoed
|
||||
Who's that Pokémon? https://cdn.discord.red/i/MtHPKHY.png:
|
||||
- Hoppip
|
||||
Who's that Pokémon? https://cdn.discord.red/i/G3B7gou.png:
|
||||
- Skiploom
|
||||
Who's that Pokémon? https://cdn.discord.red/i/3PqW6d4.png:
|
||||
- Jumpluff
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7E4uSrM.png:
|
||||
- Aipom
|
||||
Who's that Pokémon? https://cdn.discord.red/i/TQp3Nm6.png:
|
||||
- Sunkern
|
||||
Who's that Pokémon? https://cdn.discord.red/i/uz2MQ0c.png:
|
||||
- Sunflora
|
||||
Who's that Pokémon? https://cdn.discord.red/i/NiC8tpF.png:
|
||||
- Yanma
|
||||
Who's that Pokémon? https://cdn.discord.red/i/yvgjiCQ.png:
|
||||
- Wooper
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7NSgVte.png:
|
||||
- Quagsire
|
||||
Who's that Pokémon? https://cdn.discord.red/i/d6xPUYS.png:
|
||||
- Espeon
|
||||
Who's that Pokémon? https://cdn.discord.red/i/1D2T81X.png:
|
||||
- Umbreon
|
||||
Who's that Pokémon? https://cdn.discord.red/i/mdOMOgS.png:
|
||||
- Murkrow
|
||||
Who's that Pokémon? https://cdn.discord.red/i/6ReUa0W.png:
|
||||
- Slowking
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JA1k4GF.png:
|
||||
- Misdreavus
|
||||
Who's that Pokémon? https://cdn.discord.red/i/sLKauTP.png:
|
||||
- Unown
|
||||
Who's that Pokémon? https://cdn.discord.red/i/gtzSsQh.png:
|
||||
- Wobbuffet
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Zz1hdae.png:
|
||||
- Girafarig
|
||||
Who's that Pokémon? https://cdn.discord.red/i/7v0ktVt.png:
|
||||
- Pineco
|
||||
Who's that Pokémon? https://cdn.discord.red/i/dGt2LtM.png:
|
||||
- Forretress
|
||||
Who's that Pokémon? https://cdn.discord.red/i/3d7i0nA.png:
|
||||
- Dunsparce
|
||||
Who's that Pokémon? https://cdn.discord.red/i/EZFfXGQ.png:
|
||||
- Gligar
|
||||
Who's that Pokémon? https://cdn.discord.red/i/FicMmX2.png:
|
||||
- Steelix
|
||||
Who's that Pokémon? https://cdn.discord.red/i/EWlbb3g.png:
|
||||
- Snubbull
|
||||
Who's that Pokémon? https://cdn.discord.red/i/Es7SFIu.png:
|
||||
- Granbull
|
||||
Who's that Pokémon? https://cdn.discord.red/i/qWvJSNs.png:
|
||||
- Qwilfish
|
||||
Who's that Pokémon? https://cdn.discord.red/i/zl9gJ8s.png:
|
||||
- Scizor
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ZSkIWg1.png:
|
||||
- Shuckle
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ivmNVBQ.png:
|
||||
- Heracross
|
||||
Who's that Pokémon? https://cdn.discord.red/i/cVNGBvn.png:
|
||||
- Sneasel
|
||||
Who's that Pokémon? https://cdn.discord.red/i/gwKceRk.png:
|
||||
- Teddiursa
|
||||
Who's that Pokémon? https://cdn.discord.red/i/mShUvcr.png:
|
||||
- Ursaring
|
||||
Who's that Pokémon? https://cdn.discord.red/i/QnOMvBY.png:
|
||||
- Slugma
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rHUlbZ7.png:
|
||||
- Magcargo
|
||||
Who's that Pokémon? https://cdn.discord.red/i/SLVkdUf.png:
|
||||
- Swinub
|
||||
Who's that Pokémon? https://cdn.discord.red/i/rMgYSAy.png:
|
||||
- Piloswine
|
||||
Who's that Pokémon? https://cdn.discord.red/i/fYLQexl.png:
|
||||
- Corsola
|
||||
Who's that Pokémon? https://cdn.discord.red/i/LFKLE7w.png:
|
||||
- Remoraid
|
||||
Who's that Pokémon? https://cdn.discord.red/i/YxMYn4W.png:
|
||||
- Octillery
|
||||
Who's that Pokémon? https://cdn.discord.red/i/QFaIdNN.png:
|
||||
- Delibird
|
||||
Who's that Pokémon? https://cdn.discord.red/i/tRT4c6d.png:
|
||||
- Mantine
|
||||
Who's that Pokémon? https://cdn.discord.red/i/zaFbLo8.png:
|
||||
- Skarmory
|
||||
Who's that Pokémon? https://cdn.discord.red/i/sqAekho.png:
|
||||
- Houndour
|
||||
Who's that Pokémon? https://cdn.discord.red/i/mijoGZI.png:
|
||||
- Houndoom
|
||||
Who's that Pokémon? https://cdn.discord.red/i/XNCoyFy.png:
|
||||
- Kingdra
|
||||
Who's that Pokémon? https://cdn.discord.red/i/2yXKuEh.png:
|
||||
- Phanpy
|
||||
Who's that Pokémon? https://cdn.discord.red/i/eAodrXb.png:
|
||||
- Donphan
|
||||
Who's that Pokémon? https://cdn.discord.red/i/JJkzySs.png:
|
||||
- Porygon2
|
||||
Who's that Pokémon? https://cdn.discord.red/i/FOK8Yla.png:
|
||||
- Stantler
|
||||
Who's that Pokémon? https://cdn.discord.red/i/o2Hb9ck.png:
|
||||
- Smeargle
|
||||
Who's that Pokémon? https://cdn.discord.red/i/NjCcsZh.png:
|
||||
- Tyrogue
|
||||
Who's that Pokémon? https://cdn.discord.red/i/mpUCBUn.png:
|
||||
- Hitmontop
|
||||
Who's that Pokémon? https://cdn.discord.red/i/GPpT5pn.png:
|
||||
- Smoochum
|
||||
Who's that Pokémon? https://cdn.discord.red/i/ELqP5eZ.png:
|
||||
- Elekid
|
||||
Who's that Pokémon? https://cdn.discord.red/i/V7iMoJ4.png:
|
||||
- Magby
|
||||
Who's that Pokémon? https://cdn.discord.red/i/xXU0CvW.png:
|
||||
- Miltank
|
||||
Who's that Pokémon? https://cdn.discord.red/i/QUO0wOi.png:
|
||||
- Blissey
|
||||
Who's that Pokémon? https://cdn.discord.red/i/lC2VuSh.png:
|
||||
- Raikou
|
||||
Who's that Pokémon? https://cdn.discord.red/i/5eIF2yf.png:
|
||||
- Entei
|
||||
Who's that Pokémon? https://cdn.discord.red/i/wRv6jf7.png:
|
||||
- Suicune
|
||||
Who's that Pokémon? https://cdn.discord.red/i/tJJvIYK.png:
|
||||
- Larvitar
|
||||
Who's that Pokémon? https://cdn.discord.red/i/9GZXyuU.png:
|
||||
- Pupitar
|
||||
Who's that Pokémon? https://cdn.discord.red/i/A2ZWKBK.png:
|
||||
- Tyranitar
|
||||
Who's that Pokémon? https://cdn.discord.red/i/QQGb5yJ.png:
|
||||
- Lugia
|
||||
Who's that Pokémon? https://cdn.discord.red/i/d3x47sk.png:
|
||||
- Ho-Oh
|
||||
Who's that Pokémon? https://cdn.discord.red/i/B6oIkT4.png:
|
||||
- Celebi
|
||||
@@ -657,12 +657,20 @@ class RedBase(
|
||||
for package in packages:
|
||||
try:
|
||||
spec = await self._cog_mgr.find_cog(package)
|
||||
if spec is None:
|
||||
log.error(
|
||||
"Failed to load package %s (package was not found in any cog path)",
|
||||
package,
|
||||
)
|
||||
await self.remove_loaded_package(package)
|
||||
to_remove.append(package)
|
||||
continue
|
||||
await asyncio.wait_for(self.load_extension(spec), 30)
|
||||
except asyncio.TimeoutError:
|
||||
log.exception("Failed to load package %s (timeout)", package)
|
||||
to_remove.append(package)
|
||||
except Exception as e:
|
||||
log.exception("Failed to load package {}".format(package), exc_info=e)
|
||||
log.exception("Failed to load package %s", package, exc_info=e)
|
||||
await self.remove_loaded_package(package)
|
||||
to_remove.append(package)
|
||||
for package in to_remove:
|
||||
|
||||
@@ -2629,7 +2629,7 @@ class Core(commands.Cog, CoreLogic):
|
||||
ctx: commands.Context,
|
||||
channel: Optional[Union[discord.TextChannel, discord.CategoryChannel]] = None,
|
||||
):
|
||||
"""Remove a channel or category from ignore the list.
|
||||
"""Remove a channel or category from the ignore list.
|
||||
|
||||
Defaults to the current channel.
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user