Akumatic/Akuma-Matata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed HTTPException: 400 when edited or deleted message is longer than 1024 chars. Also disabled bot answering when command not found

Browse Source
This commit is contained in:
Akumatic 2019-10-04 11:09:41 +02:00
parent 87c67d4280
commit f0889a2fa6
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/core.py
View File

@ -25,7 +25,7 @@ class Core(commands.Cog):
@commands.Cog.listener() @commands.Cog.listener()
async def on_command_error(self, ctx, error): async def on_command_error(self, ctx, error):
if isinstance(error, commands.CommandNotFound): if isinstance(error, commands.CommandNotFound):
return await ctx.author.send("The command you tried to use does not exist.") return #await ctx.author.send("The command you tried to use does not exist.")
if isinstance(error, commands.NotOwner): if isinstance(error, commands.NotOwner):
return await ctx.send("Only the owner of this bot can use this command.") return await ctx.send("Only the owner of this bot can use this command.")
if isinstance(error, commands.MissingPermissions): if isinstance(error, commands.MissingPermissions):

33
extensions/server.py
View File

@ -88,9 +88,32 @@ class Server(commands.Cog):
e = discord.Embed(color=0x32c8c8) e = discord.Embed(color=0x32c8c8)
e.set_author(name = str(before.author) + " edited a message.", icon_url=before.author.avatar_url) e.set_author(name = str(before.author) + " edited a message.", icon_url=before.author.avatar_url)
e.add_field(name="Profile", value=before.author.mention, inline=False) e.add_field(name="Profile", value=before.author.mention, inline=False)
e.add_field(name="Channel", value=str(before.channel.name), inline=False) e.add_field(name="Channel", value=str(before.channel.name), inline=False)
if len(before.content) < 1025:
e.add_field(name="Message before", value=before.content, inline=False) e.add_field(name="Message before", value=before.content, inline=False)
else:
i = 1
temp = before.content
while len(temp) > 1018:
e.add_field(name="Message before ({})".format(i), value="{}[...]".format(temp[:1019],
inline=False))
temp = temp[1019:]
i += 1
e.add_field(name="Message before ({})".format(i), value="{}".format(temp, inline=False))
if len(after.content) < 1025:
e.add_field(name="Message after", value=after.content, inline=False) e.add_field(name="Message after", value=after.content, inline=False)
else:
i = 1
temp = after.content
while len(temp) > 1018:
e.add_field(name="Message after ({})".format(i), value="{}[...]".format(temp[:1019],
inline=False))
temp = temp[1019:]
i += 1
e.add_field(name="Message after ({})".format(i), value="{}".format(temp, inline=False))
chan = self.bot.get_channel(self.bot.serverCfg[str(before.guild.id)]["server"]["messageEventChannel"]) chan = self.bot.get_channel(self.bot.serverCfg[str(before.guild.id)]["server"]["messageEventChannel"])
await chan.send(embed=e) await chan.send(embed=e)
else: else:
@ -121,8 +144,18 @@ class Server(commands.Cog):
e.set_author(name = str(message.author) + "'s message got deleted.", icon_url=message.author.avatar_url) e.set_author(name = str(message.author) + "'s message got deleted.", icon_url=message.author.avatar_url)
e.add_field(name="Profile", value=message.author.mention, inline=False) e.add_field(name="Profile", value=message.author.mention, inline=False)
e.add_field(name="Channel", value=str(message.channel.name), inline=False) e.add_field(name="Channel", value=str(message.channel.name), inline=False)
if message.content: if message.content:
if len(message.content) < 1025:
e.add_field(name="Message", value=message.content, inline=False) e.add_field(name="Message", value=message.content, inline=False)
else:
i = 1
temp = message.content
while len(temp) > 1018:
e.add_field("Message ({})".format(i), value="{}[...]".format(temp[:1019], inline=False))
temp = temp[1019:]
i += 1
e.add_field("Message ({})".format(i), value="{}".format(temp, inline=False))
num = len(message.attachments) num = len(message.attachments)
if num > 0: if num > 0:
e.add_field(name="Attachments", value="The message had {} attachment(s)".format(num),inline=False) e.add_field(name="Attachments", value="The message had {} attachment(s)".format(num),inline=False)