Merge branch 'master' into websockets

This commit is contained in:
Jeremy "EndenDragon" Zhang
2017-09-02 12:25:11 -07:00
committed by GitHub
8 changed files with 77 additions and 7 deletions

View File

@ -100,6 +100,8 @@ def get_online_discord_users(guild_id, embed):
for role in mem_roles:
if role["color"] != 0:
member["color"] = '{0:02x}'.format(role["color"]) #int to hex
while len(member["color"]) < 6:
member["color"] = "0" + member["color"]
if role["hoist"]:
member["hoist-role"] = {}
member["hoist-role"]["name"] = role["name"]