eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-09 07:17:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few help/error changes

Browse source
This commit is contained in:
Ske 2018-12-09 16:33:57 +01:00
parent 72590ec92c
commit 478f96770b
2 changed files with 36 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pluralkit/bot/proxy.py
View file

@ -103,6 +103,7 @@ async def send_proxy_message(conn, original_message: discord.Message, system: Sy
await db.add_message(conn, sent_message.id, original_message.channel.id, member.id,
original_message.author.id)
# Log it in the log channel if possible
await logger.log_message_proxied(
conn,
original_message.channel.guild.id,
@ -128,6 +129,11 @@ async def send_proxy_message(conn, original_message: discord.Message, system: Sy
except discord.Forbidden:
raise ProxyError(
"PluralKit does not have permission to delete user messages. Please contact a server administrator.")
except discord.NotFound:
# Sometimes some other thing will delete the original message before PK gets to it
# This is not a problem - message gets deleted anyway :)
# Usually happens when Tupperware and PK conflict
pass
async def try_proxy_message(conn, message: discord.Message, logger: ChannelLogger, bot_user: discord.User) -> bool: