Fix some stuff

Author: Taaku18

CHANGELOG.md

@@ -31,6 +31,8 @@ however, insignificant breaking changes does not guarantee a major version bump,
 - The look of alias and snippet when previewing.
 - Message ID of the thread embed is saved in DB, instead of the original message.
 - Swapped the position of user and category for `?contact`.
+- The log file will no longer grow infinitely large.
+- Hard limit of maximum 25 steps for alias.
 
 ### Fixed
 

cogs/modmail.py

@@ -17,16 +17,7 @@
 from core.paginator import EmbedPaginatorSession
 from core.thread import Thread
 from core.time import UserFriendlyTime, human_timedelta
-from core.utils import (
-    format_preview,
-    User,
-    create_not_found_embed,
-    format_description,
-    trigger_typing,
-    escape_code_block,
-    match_user_id,
-    format_channel_name,
-)
+from core.utils import *
 
 logger = getLogger(__name__)
 
@@ -161,15 +152,18 @@ async def snippet(self, ctx, *, name: str.lower = None):
             if val is None:
                 embed = create_not_found_embed(name, self.bot.snippets.keys(), "Snippet")
             else:
-                embed = discord.Embed(color=self.bot.main_color)
-                embed.add_field(name=f"`{name}` will send:", value=val)
+                embed = discord.Embed(
+                    title=f'Snippet - "{name}":',
+                    description=val,
+                    color=self.bot.main_color
+                )
             return await ctx.send(embed=embed)
 
         if not self.bot.snippets:
             embed = discord.Embed(
                 color=self.bot.error_color, description="You dont have any snippets at the moment."
             )
-            embed.set_footer(text=f'Check "{self.bot.prefix}help snippet" to add a snippet.')
+            embed.set_footer(text=f'Check "{self.bot.prefix}help snippet add" to add a snippet.')
             embed.set_author(name="Snippets", icon_url=ctx.guild.icon_url)
             return await ctx.send(embed=embed)
 
@@ -194,9 +188,11 @@ async def snippet_raw(self, ctx, *, name: str.lower):
         if val is None:
             embed = create_not_found_embed(name, self.bot.snippets.keys(), "Snippet")
         else:
-            embed = discord.Embed(color=self.bot.main_color)
-            val = escape_code_block(val)
-            embed.add_field(name=f"`{name}` will send:", value=f"```\n{val}```")
+            val = truncate(escape_code_block(val), 2048 - 7)
+            embed = discord.Embed(title=f'Raw snippet - "{name}":',
+                                  description=f"```\n{val}```",
+                                  color=self.bot.main_color)
+
         return await ctx.send(embed=embed)
 
     @snippet.command(name="add")
@@ -205,6 +201,11 @@ async def snippet_add(self, ctx, name: str.lower, *, value: commands.clean_conte
         """
         Add a snippet.
 
+        Simply to add a snippet, do: ```
+        {prefix}snippet add hey hello there :)
+        ```
+        then when you type `{prefix}hey`, "hello there :)" will get sent to the recipient.
+
         To add a multi-word snippet name, use quotes: ```
         {prefix}snippet add "two word" this is a two word snippet.
         ```
@@ -1245,7 +1246,7 @@ async def repair(self, ctx):
                 )
             )
             if len(users) == 1:
-                user = users[0]
+                user = users.pop()
                 name = format_channel_name(
                     user, self.bot.modmail_guild, exclude_channel=ctx.channel
                 )

cogs/utility.py

@@ -916,23 +916,30 @@ async def alias(self, ctx, *, name: str.lower = None):
                     description=f"Alias `{name}` is invalid, this alias will now be deleted."
                     "This alias will now be deleted.",
                 )
-                embed.add_field(name=f"{name}` used to be:", value=val)
+                embed.add_field(name=f"{name}` used to be:", value=utils.truncate(val, 1024))
                 self.bot.aliases.pop(name)
                 await self.bot.config.update()
                 return await ctx.send(embed=embed)
 
             if len(values) == 1:
-                embed = discord.Embed(color=self.bot.main_color)
-                embed.add_field(name=f"`{name}` points to:", value=values[0])
-            else:
                 embed = discord.Embed(
-                    color=self.bot.main_color,
-                    description=f"**`{name}` points to the following steps:**",
+                    title=f'Alias - "{name}":',
+                    description=values[0],
+                    color=self.bot.main_color
                 )
-                for i, val in enumerate(values, start=1):
-                    embed.add_field(name=f"Step {i}:", value=val)
+                return await ctx.send(embed=embed)
 
-            return await ctx.send(embed=embed)
+            else:
+                embeds = []
+                for i, val in enumerate(values, start=1):
+                    embed = discord.Embed(
+                        color=self.bot.main_color,
+                        title=f'Alias - "{name}" - Step {i}:',
+                        description=val
+                    )
+                    embeds += [embed]
+                session = EmbedPaginatorSession(ctx, *embeds)
+                return await session.run()
 
         if not self.bot.aliases:
             embed = discord.Embed(
@@ -964,15 +971,15 @@ async def alias_raw(self, ctx, *, name: str.lower):
             embed = utils.create_not_found_embed(name, self.bot.aliases.keys(), "Alias")
             return await ctx.send(embed=embed)
 
-        embed = discord.Embed(color=self.bot.main_color)
-        val = utils.escape_code_block(val)
-        embed.add_field(name=f"`{name}` points to:", value=f"```\n{val}```")
+        val = utils.truncate(utils.escape_code_block(val), 2048-7)
+        embed = discord.Embed(title=f'Raw alias - "{name}":',
+                              description=f"```\n{val}```",
+                              color=self.bot.main_color)
+
         return await ctx.send(embed=embed)
 
     async def make_alias(self, name, value, action):
         values = utils.parse_alias(value)
-        save_aliases = []
-
         if not values:
             embed = discord.Embed(
                 title="Error",
@@ -982,12 +989,20 @@ async def make_alias(self, name, value, action):
             embed.set_footer(text=f'See "{self.bot.prefix}alias add" for more details.')
             return embed
 
+        if len(values) > 25:
+            embed = discord.Embed(title="Error",
+                                  description="Too many steps, max=25.",
+                                  color=self.bot.error_color)
+            return embed
+
+        save_aliases = []
+
         multiple_alias = len(values) > 1
 
         embed = discord.Embed(title=f"{action} alias", color=self.bot.main_color)
 
         if not multiple_alias:
-            embed.add_field(name=f"`{name}` points to:", value=values[0])
+            embed.add_field(name=f"`{name}` points to:", value=utils.truncate(values[0], 1024))
         else:
             embed.description = f"`{name}` now points to the following steps:"
 
@@ -1018,7 +1033,7 @@ async def make_alias(self, name, value, action):
             else:
                 save_aliases.append(val)
             if multiple_alias:
-                embed.add_field(name=f"Step {i}:", value=val)
+                embed.add_field(name=f"Step {i}:", value=utils.truncate(val, 1024))
 
         self.bot.aliases[name] = " && ".join(f'"{a}"' for a in save_aliases)
         await self.bot.config.update()

core/models.py

@@ -2,6 +2,7 @@
 import re
 import sys
 from enum import IntEnum
+from logging.handlers import RotatingFileHandler
 from string import Formatter
 
 import discord
@@ -120,7 +121,7 @@ def format(self, record):
 
 def configure_logging(name, level=None):
     global ch_debug, log_level
-    ch_debug = logging.FileHandler(name, mode="a+")
+    ch_debug = RotatingFileHandler(name, mode="a+", maxBytes=48000, backupCount=1)
 
     formatter_debug = FileFormatter(
         "%(asctime)s %(name)s[%(lineno)d] - %(levelname)s: %(message)s",

core/utils.py

@@ -11,6 +11,11 @@
 import discord
 from discord.ext import commands
 
+__all__ = ['strtobool', 'User', 'truncate', 'format_preview', 'is_image_url',
+           'parse_image_url', 'human_join', 'days', 'cleanup_code', 'match_user_id',
+           'create_not_found_embed', 'parse_alias', 'normalize_alias', 'format_description', 'trigger_typing',
+           'escape_code_block', 'format_channel_name']
+
 
 def strtobool(val):
     if isinstance(val, bool):