Skip to content

Commit 2db8b85

Browse files
committed
Add role limit in thread creation embed fixes #191
1 parent 2c06cdb commit 2db8b85

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

core/thread.py

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,14 +648,24 @@ def _format_info_embed(self, user, log_url, log_count, color):
648648

649649
role_names = ''
650650
if member:
651-
separate_server = self.bot.guild != self.bot.modmail_guild
652-
roles = sorted(member.roles, key=lambda c: c.position)
653-
if separate_server:
654-
role_names = ', '.join(r.name for r in roles
655-
if r.name != "@everyone")
656-
else:
657-
role_names = ' '.join(r.mention for r in roles
658-
if r.name != "@everyone")
651+
sep_server = self.bot.using_multiple_server_setup
652+
seperator = ', ' if sep_server else ' '
653+
654+
roles = []
655+
656+
for role in sorted(member.roles, key=lambda r: r.position):
657+
if role.name == '@everyone':
658+
continue
659+
660+
fmt = role.name if sep_server else role.mention
661+
roles.append(fmt)
662+
663+
if len(seperator.join(roles)) > 1000:
664+
roles.pop()
665+
roles.append('...')
666+
break
667+
668+
role_names = seperator.join(roles)
659669

660670
embed = discord.Embed(color=color,
661671
description=user.mention,

0 commit comments

Comments
 (0)