|
8 | 8 | from discord.ext.commands import UserInputError, CommandError
|
9 | 9 |
|
10 | 10 | from core.models import Bot, ThreadManagerABC, ThreadABC
|
11 |
| -from core.utils import is_image_url, days, match_user_id |
| 11 | +from core.utils import is_image_url, days, match_user_id, truncate |
12 | 12 |
|
13 | 13 |
|
14 | 14 | class Thread(ThreadABC):
|
@@ -138,22 +138,22 @@ async def _close(self, closer, silent=False, delete_channel=True,
|
138 | 138 | else:
|
139 | 139 | log_url = f"https://logs.modmail.tk/{log_data['key']}"
|
140 | 140 |
|
141 |
| - if self.recipient is not None: |
142 |
| - user = self.recipient.mention |
143 |
| - else: |
144 |
| - user = f'`{self.id}`' |
145 |
| - |
146 | 141 | if log_data['messages']:
|
147 |
| - msg = str(log_data['messages'][0]['content']) |
148 |
| - sneak_peak = msg if len(msg) < 50 else msg[:48] + '...' |
| 142 | + sneak_peak = str(log_data['messages'][0]['content']) |
149 | 143 | else:
|
150 | 144 | sneak_peak = 'No content'
|
151 | 145 |
|
152 |
| - desc = f"{user} [`{log_data['key']}`]({log_url}): {sneak_peak}" |
| 146 | + desc = f"[`{log_data['key']}`]({log_url}): " |
| 147 | + desc += truncate(sneak_peak, max=75-13) |
153 | 148 | else:
|
154 | 149 | desc = "Could not resolve log url."
|
155 | 150 |
|
156 | 151 | embed = discord.Embed(description=desc, color=discord.Color.red())
|
| 152 | + if self.recipient is not None: |
| 153 | + user = f"{self.recipient} (`{self.id}`)" |
| 154 | + else: |
| 155 | + user = f'`{self.id}`' |
| 156 | + embed.title = user |
157 | 157 |
|
158 | 158 | event = 'Thread Closed as Scheduled' if scheduled else 'Thread Closed'
|
159 | 159 | # embed.set_author(name=f'Event: {event}', url=log_url)
|
|
0 commit comments