From 5b539f558edaaf12a636237c3a03e84b6ffe299b Mon Sep 17 00:00:00 2001 From: Ske Date: Sun, 15 Jul 2018 23:16:17 +0200 Subject: [PATCH] Use id as key for hid --- bot/pluralkit/commands.py | 4 ++-- bot/pluralkit/proxy.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/pluralkit/commands.py b/bot/pluralkit/commands.py index 947d586f..685a1abe 100644 --- a/bot/pluralkit/commands.py +++ b/bot/pluralkit/commands.py @@ -644,7 +644,7 @@ async def export(conn, message, args): data = { "name": system["name"], - "hid": system["hid"], + "id": system["hid"], "description": system["description"], "tag": system["tag"], "avatar_url": system["avatar_url"], @@ -652,7 +652,7 @@ async def export(conn, message, args): "members": [ { "name": member["name"], - "hid": member["hid"], + "id": member["hid"], "color": member["color"], "avatar_url": member["avatar_url"], "birthday": member["birthday"].isoformat() if member["birthday"] else None, diff --git a/bot/pluralkit/proxy.py b/bot/pluralkit/proxy.py index c4a287c8..830eb012 100644 --- a/bot/pluralkit/proxy.py +++ b/bot/pluralkit/proxy.py @@ -137,7 +137,7 @@ async def proxy_message(conn, member, trigger_message, inner): async def handle_proxying(conn, message): # Can't proxy in DMs, webhook creation will explode if message.channel.is_private: - return False + return # Big fat query to find every member associated with this account # Returned member object has a few more keys (system tag, for example)