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

Various bug fixes

Browse Source
This commit is contained in:
Ske 2018-11-08 16:25:58 +01:00
parent 3fca071c1d
commit f4512fc7e9
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pluralkit/bot/commands/message_commands.py
View File

@ -36,7 +36,7 @@ async def message_info(ctx: CommandContext):
original_sender = None original_sender = None
embed = discord.Embed() embed = discord.Embed()
embed.timestamp = discord.utils.snowflake_time(str(mid)) embed.timestamp = discord.utils.snowflake_time(mid)
embed.colour = discord.Colour.blue() embed.colour = discord.Colour.blue()
if message.system_name: if message.system_name:
@ -55,8 +55,7 @@ async def message_info(ctx: CommandContext):
embed.add_field(name="Sent by", value=sender_name) embed.add_field(name="Sent by", value=sender_name)
message_content = await get_message_contents(ctx.client, message.channel, message.mid) message_content = await get_message_contents(ctx.client, message.channel, message.mid)
if message_content: embed.description = message_content or "(unknown, message deleted)"
embed.description = message_content
embed.set_author(name=message.name, icon_url=message.avatar_url or discord.Embed.Empty) embed.set_author(name=message.name, icon_url=message.avatar_url or discord.Embed.Empty)

2
src/pluralkit/bot/commands/misc_commands.py
View File

@ -88,4 +88,4 @@ async def export(ctx: CommandContext):
} }
f = io.BytesIO(json.dumps(data).encode("utf-8")) f = io.BytesIO(json.dumps(data).encode("utf-8"))
await ctx.client.send_file(ctx.message.channel, f, filename="system.json") await ctx.message.channel.send(content="Here you go!", file=discord.File(fp=f, filename="system.json"))

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

@ -82,8 +82,10 @@ async def system_card(conn, client: discord.Client, system: System) -> discord.E
value=system.description, inline=False) value=system.description, inline=False)
# Get names of all members # Get names of all members
all_members = await system.get_members(conn)
if all_members:
member_texts = [] member_texts = []
for member in await system.get_members(conn): for member in all_members:
member_texts.append("{} (`{}`)".format(escape(member.name), member.hid)) member_texts.append("{} (`{}`)".format(escape(member.name), member.hid))
# Interim solution for pagination of large systems # Interim solution for pagination of large systems

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

@ -107,7 +107,7 @@ async def do_proxy_message(conn, original_message: discord.Message, proxy_member
try: try:
sent_message = await webhook.send( sent_message = await webhook.send(
content=inner_text, content=inner_text,
username=proxy_member.name, username="{} {}".format(proxy_member.name, proxy_member.tag),
avatar_url=proxy_member.avatar_url, avatar_url=proxy_member.avatar_url,
file=await make_attachment_file(original_message), file=await make_attachment_file(original_message),
wait=True wait=True