liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whoops pt. 2

Browse Source
This commit is contained in:
Ske 2018-11-13 14:01:24 +01:00
parent b4c45a7722
commit 3e5357d27f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pluralkit/bot/__init__.py
View File

@ -123,6 +123,8 @@ def run():
embed = None embed = None
traceback_str = "```python\n{}```".format(traceback.format_exc()) traceback_str = "```python\n{}```".format(traceback.format_exc())
if len(traceback.format_exc()) >= (2000 - len("```python\n```")):
traceback_str = "```python\n...{}```".format(traceback.format_exc()[- (2000 - len("```python\n...```")):])
await log_channel.send(content=traceback_str, embed=embed) await log_channel.send(content=traceback_str, embed=embed)
bot_token = os.environ["TOKEN"] bot_token = os.environ["TOKEN"]

11
src/pluralkit/bot/proxy.py
View File

@ -11,6 +11,11 @@ from pluralkit.bot.channel_logger import ChannelLogger
logger = logging.getLogger("pluralkit.bot.proxy") logger = logging.getLogger("pluralkit.bot.proxy")
def fix_webhook(webhook: discord.Webhook) -> discord.Webhook:
# Workaround for https://github.com/Rapptz/discord.py/issues/1242 and similar issues (#1150)
webhook._adapter.store_user = webhook._adapter._store_user
webhook._adapter.http = None
return webhook
def extract_leading_mentions(message_text): def extract_leading_mentions(message_text):
# This regex matches one or more mentions at the start of a message, separated by any amount of spaces # This regex matches one or more mentions at the start of a message, separated by any amount of spaces
@ -75,16 +80,14 @@ async def get_or_create_webhook_for_channel(conn, channel: discord.TextChannel):
session = channel._state.http._session session = channel._state.http._session
hook = discord.Webhook.partial(webhook_id, webhook_token, adapter=discord.AsyncWebhookAdapter(session)) hook = discord.Webhook.partial(webhook_id, webhook_token, adapter=discord.AsyncWebhookAdapter(session))
# Workaround for https://github.com/Rapptz/discord.py/issues/1242
hook._adapter.store_user = hook._adapter._store_user hook._adapter.store_user = hook._adapter._store_user
return hook return fix_webhook(hook)
# If not, we create one and save it # If not, we create one and save it
created_webhook = await channel.create_webhook(name="PluralKit Proxy Webhook") created_webhook = await channel.create_webhook(name="PluralKit Proxy Webhook")
created_webhook._adapter.store_user = created_webhook._adapter._store_user
await db.add_webhook(conn, channel.id, created_webhook.id, created_webhook.token) await db.add_webhook(conn, channel.id, created_webhook.id, created_webhook.token)
return created_webhook return fix_webhook(created_webhook)
async def make_attachment_file(message: discord.Message): async def make_attachment_file(message: discord.Message):