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

Refactor more db methods into the models

Browse Source
This commit is contained in:
Ske
2018-09-16 19:43:13 +02:00
parent f4f312fd9a
commit f8235370c7
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pluralkit/bot/embeds.py
View File

@@ -69,9 +69,10 @@ async def system_card(conn, client: discord.Client, system: System) -> discord.E
card.add_field(name="Current fronter" if len(fronters) == 1 else "Current fronters", value=fronter_val)
account_names = []
for account_id in await db.get_linked_accounts(conn, system_id=system.id):
account = await client.get_user_info(account_id)
for account_id in await system.get_linked_account_ids(conn):
account = await client.get_user_info(str(account_id))
account_names.append("{}#{}".format(account.name, account.discriminator))
card.add_field(name="Linked accounts", value="\n".join(account_names))
if system.description:
@@ -80,7 +81,7 @@ async def system_card(conn, client: discord.Client, system: System) -> discord.E
# Get names of all members
member_texts = []
for member in await db.get_all_members(conn, system_id=system.id):
for member in await system.get_members(conn):
member_texts.append("{} (`{}`)".format(escape(member.name), member.hid))
if len(member_texts) > 0:
@@ -92,7 +93,7 @@ async def system_card(conn, client: discord.Client, system: System) -> discord.E
async def member_card(conn, member: Member) -> discord.Embed:
system = await db.get_system(conn, system_id=member.system)
system = await member.fetch_system(conn)
card = discord.Embed()
card.colour = discord.Colour.blue()
@@ -105,9 +106,6 @@ async def member_card(conn, member: Member) -> discord.Embed:
if member.avatar_url:
card.set_thumbnail(url=member.avatar_url)
# Get system name and hid
system = await db.get_system(conn, system_id=member.system)
if member.color:
card.colour = int(member.color, 16)
@@ -120,7 +118,7 @@ async def member_card(conn, member: Member) -> discord.Embed:
if member.pronouns:
card.add_field(name="Pronouns", value=member.pronouns)
message_count = await db.get_member_message_count(conn, member.id)
message_count = await member.message_count(conn)
if message_count > 0:
card.add_field(name="Message Count", value=str(message_count), inline=True)