Cleanup

Author: fourjr

bot.py

@@ -45,7 +45,7 @@
 )
 from core.thread import ThreadManager
 from core.time import human_timedelta
-from core.utils import human_join, match_title, normalize_alias
+from core.utils import human_join, normalize_alias, truncate
 
 logger = getLogger(__name__)
 
@@ -996,13 +996,9 @@ async def on_message(self, message):
             and self.config["alert_on_mention"]
             and not message.author.bot
         ):
-            if len(message.content) > 50:
-                extra = "..."
-            else:
-                extra = ""
             em = discord.Embed(
                 title="Bot mention",
-                description=f"[Jump URL]({message.jump_url})\n{message.content[:50]}{extra}",
+                description=f"[Jump URL]({message.jump_url})\n{truncate(message.content, 50)}",
                 color=self.main_color,
                 timestamp=datetime.utcnow(),
             )

cogs/plugins.py

@@ -15,7 +15,6 @@
 
 import discord
 from discord.ext import commands
-from discord.utils import async_all
 
 from pkg_resources import parse_version
 

cogs/utility.py

@@ -31,7 +31,7 @@
     UnseenFormatter,
     getLogger,
 )
-from core.utils import trigger_typing
+from core.utils import trigger_typing, truncate
 from core.paginator import EmbedPaginatorSession, MessagePaginatorSession
 
 
@@ -1902,10 +1902,7 @@ async def update(self, ctx, *, flag: str = ""):
 
                     embed.description = latest.description
                     for name, value in latest.fields.items():
-                        if len(value) > 200:
-                            value = value[:200] + "..."
-
-                        embed.add_field(name=name, value=value)
+                        embed.add_field(name=name, value=truncate(value, 200))
 
                     html_url = commit_data["html_url"]
                     short_sha = commit_data["sha"][:6]
@@ -1936,10 +1933,7 @@ async def update(self, ctx, *, flag: str = ""):
                     )
                     embed.description = latest.description
                     for name, value in latest.fields.items():
-                        if len(value) > 200:
-                            value = value[:200] + "..."
-
-                        embed.add_field(name=name, value=value)
+                        embed.add_field(name=name, value=truncate(value, 200))
 
                     if self.bot.hosting_method == HostingMethod.OTHER:
                         embed.description = (

core/changelog.py

@@ -93,7 +93,7 @@ def embed(self) -> Embed:
         )
 
         for name, value in self.fields.items():
-            embed.add_field(name=name, value=truncate(value, 1024))
+            embed.add_field(name=name, value=truncate(value, 1024), inline=False)
         embed.set_footer(text=f"Current version: v{self.bot.version}")
         embed.set_thumbnail(url=self.bot.user.avatar_url)
         return embed

core/utils.py

@@ -1,5 +1,4 @@
 import base64
-from core.models import HostingMethod
 import functools
 import re
 import string