Skip to content
Closed
Changes from 29 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
886e483
Disable role list temporarily
infinitepower18 Mar 18, 2019
964ff0f
Move disabled message to footer
infinitepower18 Mar 18, 2019
c8b2132
Revert changes, bot crashing
infinitepower18 Mar 18, 2019
9738833
Update thread.py
infinitepower18 Mar 18, 2019
a22aca7
Update thread.py
infinitepower18 Mar 18, 2019
defc31d
Add files via upload
infinitepower18 Mar 18, 2019
20243ee
Update thread.py
infinitepower18 Mar 18, 2019
c7c22d9
Update thread.py
infinitepower18 Mar 18, 2019
965a4d6
Reduce number of roles to show
infinitepower18 Mar 18, 2019
0e279da
set value to 36
infinitepower18 Mar 19, 2019
775006f
testing with value 41, edit too many roles msg
infinitepower18 Mar 19, 2019
08a6119
add role counter.
infinitepower18 Mar 19, 2019
ef8fccb
set value to 41, update too many roles msg
infinitepower18 Mar 19, 2019
20040a0
add space, now testing with 46 value
infinitepower18 Mar 19, 2019
4a7f95c
Update thread.py
infinitepower18 Mar 19, 2019
72ad551
Set limit for separate server mode to 21
infinitepower18 Mar 19, 2019
8b536c3
Add files via upload
infinitepower18 Mar 19, 2019
1a264df
Add files via upload
infinitepower18 Mar 19, 2019
aaa9ef0
Add files via upload
infinitepower18 Mar 19, 2019
1b9e2b0
fix crash
infinitepower18 Mar 19, 2019
6fb1032
Update thread.py
infinitepower18 Mar 19, 2019
f29590b
Set character count to 800
infinitepower18 Mar 19, 2019
7426484
Merge pull request #1 from codeinteger6/testing
infinitepower18 Mar 19, 2019
8024647
Update thread.py
infinitepower18 Mar 19, 2019
6e40b3a
field.value limit 1024
infinitepower18 Mar 19, 2019
a390a7a
Update thread.py
infinitepower18 Mar 19, 2019
0e8eef1
Update thread.py
infinitepower18 Mar 19, 2019
3e3c047
Merge pull request #2 from codeinteger6/codeinteger6-patch-1
infinitepower18 Mar 19, 2019
9fb31e3
Grammar
infinitepower18 Mar 19, 2019
a88063b
clean
infinitepower18 Mar 20, 2019
5bc8d9d
Add files via upload
infinitepower18 Mar 20, 2019
78999cc
Update thread.py
infinitepower18 Mar 20, 2019
bcb0b47
Merge pull request #3 from codeinteger6/codeinteger6-patch-1
infinitepower18 Mar 20, 2019
c05846b
Use Python 3.7.2
infinitepower18 Mar 26, 2019
b44bc97
Updating bot
infinitepower18 Apr 1, 2019
f3e9eac
Merge pull request #4 from codeinteger6/master
infinitepower18 Apr 1, 2019
f50a013
Merge pull request #5 from codeinteger6/botupdate
infinitepower18 Apr 1, 2019
7f71c77
Use Python 3.7.3
infinitepower18 Apr 5, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions core/thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ async def reply(self, message, anonymous=False):
return await message.channel.send(
embed=discord.Embed(
color=discord.Color.red(),
description='Your message could not be delivered since'
'the recipient shares no servers with the bot'
description='Your message could not be delivered since '
'the recipient shares no servers with the bot.'
))

tasks = []
Expand Down Expand Up @@ -645,15 +645,30 @@ def _format_info_embed(self, user, log_url, log_count, color):
# key = log_url.split('/')[-1]

role_names = ''
count = 0
if member:
separate_server = self.bot.guild != self.bot.modmail_guild
roles = sorted(member.roles, key=lambda c: c.position)
if separate_server:
role_names = ', '.join(r.name for r in roles
if r.name != "@everyone")
for r in roles:
count = count + 1
charCounter = ', '.join(r.name for r in roles
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use snake_case

if r.name != "@everyone")
if len(charCounter) <= 1024:
role_names = ', '.join(r.name for r in roles
if r.name != "@everyone")
else:
role_names = "Due to Discord limitations the bot can't display roles that contain more than 1024 characters in total."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think it's best to show what we can & put ellipsis after

else:
role_names = ' '.join(r.mention for r in roles
if r.name != "@everyone")
for r in roles:
count = count + 1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

count += 1

charCounter = ', '.join(r.mention for r in roles
if r.name != "@everyone")
if len(charCounter) <= 1024:
role_names = ' '.join(r.mention for r in roles
if r.name != "@everyone")
else:
role_names = "Due to Discord limitations the bot can't display roles that contain more than 1024 characters in total."

embed = discord.Embed(color=color,
description=user.mention,
Expand All @@ -680,7 +695,8 @@ def _format_info_embed(self, user, log_url, log_count, color):
value=member.nick,
inline=True)
if role_names:
embed.add_field(name='Roles',
count = count - 1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

count -= 1

embed.add_field(name='Roles ['+str(count)+"]",
value=role_names,
inline=True)
else:
Expand Down