Skip to content

Commit 38e437d

Browse files
committed
Improve info embed appearance
1 parent 7876270 commit 38e437d

File tree

1 file changed

+27
-16
lines changed

1 file changed

+27
-16
lines changed

core/thread.py

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,14 @@ async def send(self, message, destination=None, from_mod=False, note=False):
235235

236236
em = discord.Embed(
237237
description=message.content,
238-
# timestamp=message.created_at
238+
timestamp=message.created_at
239239
)
240240

241241
system_avatar_url = 'https://discordapp.com/assets/f78426a064bc9dd24847519259bc42af.png'
242242

243243
# store message id in hidden url
244244
if not note:
245-
em.set_author(name=author.name,
245+
em.set_author(name=author,
246246
icon_url=author.avatar_url,
247247
url=message.jump_url)
248248
else:
@@ -299,9 +299,11 @@ def is_image_url(u, _):
299299

300300
if from_mod:
301301
em.color = self.bot.mod_color
302+
em.set_footer(text=f'Moderator')
302303
elif note:
303304
em.color = discord.Color.blurple()
304305
else:
306+
em.set_footer(text=f'Recipient')
305307
em.color = self.bot.recipient_color
306308

307309
await destination.trigger_typing()
@@ -425,7 +427,7 @@ async def create(self, recipient, *, creator=None, category=None):
425427

426428
em = discord.Embed(color=self.bot.mod_color)
427429
em.description = thread_creation_response
428-
em.title = 'Thread Created'
430+
em.set_author(name='Thread Created')
429431
em.timestamp = datetime.datetime.utcnow()
430432
em.set_footer(text='Your message has been sent', icon_url=self.bot.guild.icon_url)
431433

@@ -535,10 +537,8 @@ def _format_info_embed(self, user, creator, log_url, log_count, dc):
535537
member = self.bot.guild.get_member(user.id)
536538
avi = user.avatar_url
537539
time = datetime.datetime.utcnow()
538-
desc = f'{creator.mention} has created a thread with {user.mention}' \
539-
if creator else f'{user.mention} has started a thread'
540+
540541
key = log_url.split('/')[-1]
541-
desc = f'{desc} [`{key}`]({log_url})'
542542

543543
role_names = ''
544544
if member:
@@ -551,31 +551,42 @@ def _format_info_embed(self, user, creator, log_url, log_count, dc):
551551
role_names = ' '.join(r.mention for r in roles
552552
if r.name != "@everyone")
553553

554-
em = discord.Embed(colour=dc, description=desc, timestamp=time)
554+
em = discord.Embed(colour=dc, description=user.mention, timestamp=time)
555555

556556
def days(d):
557-
return ' day ago.' if d == '1' else ' days ago.'
557+
if d == '0':
558+
return '**today**'
559+
return f'{d} day ago' if d == '1' else f'{d} days ago'
558560

559561
created = str((time - user.created_at).days)
560-
# em.add_field(name='Mention', value=user.mention)
561-
em.add_field(name='Registered', value=created + days(created))
562+
# if not role_names:
563+
# em.add_field(name='Mention', value=user.mention)
564+
# em.add_field(name='Registered', value=created + days(created))
565+
em.description += f' was created {days(created)}'
566+
562567
footer = 'User ID: ' + str(user.id)
563568
em.set_footer(text=footer)
564-
em.set_author(name=str(user), icon_url=avi)
565-
em.set_thumbnail(url=avi)
569+
em.set_author(name=str(user), icon_url=avi, url=log_url)
570+
# em.set_thumbnail(url=avi)
566571

567572
if member:
568-
if log_count:
569-
em.add_field(name='Past logs', value=f'{log_count}')
570573
joined = str((time - member.joined_at).days)
571-
em.add_field(name='Joined', value=joined + days(joined))
574+
# em.add_field(name='Joined', value=joined + days(joined))
575+
em.description += f', joined {days(joined)}'
576+
572577
if member.nick:
573578
em.add_field(name='Nickname', value=member.nick, inline=True)
574579
if role_names:
575-
em.add_field(name='Roles', value=role_names, inline=False)
580+
em.add_field(name='Roles', value=role_names, inline=True)
576581
else:
577582
em.set_footer(
578583
text=f'{footer} | Note: this member'
579584
f' is not part of this server.')
580585

586+
if log_count:
587+
# em.add_field(name='Past logs', value=f'{log_count}')
588+
em.description += f" with **{log_count}** past {'thread' if log_count == 1 else 'threads'}."
589+
else:
590+
em.description += '.'
591+
581592
return em

0 commit comments

Comments
 (0)