Merge pull request #240 from UnifierHQ/dev

3.11.4: Filter improvements

Author: greeeen-dev

cogs/badge.py

@@ -79,7 +79,7 @@ async def badge(self, ctx: Union[nextcord.Interaction, commands.Context], user:
 
         await ctx.send(embed=embed)
 
-    @commands.command(hidden=True, aliases=['trust'], description=language.desc('badge.verify'))
+    @commands.command(aliases=['trust'], description=language.desc('badge.verify'))
     @restrictions_legacy.admin()
     async def verify(self, ctx, user: nextcord.User):
         selector = language.get_selector(ctx)
@@ -94,7 +94,7 @@ async def verify(self, ctx, user: nextcord.User):
 
         await ctx.send(f'{self.bot.ui_emojis.success} ' + selector.fget("success", values={'user': user.name}))
 
-    @commands.command(hidden=True, aliases=['untrust'], description=language.desc('badge.unverify'))
+    @commands.command(aliases=['untrust'], description=language.desc('badge.unverify'))
     @restrictions_legacy.admin()
     async def unverify(self, ctx, user: nextcord.User):
         selector = language.get_selector(ctx)

cogs/bridge.py

@@ -1636,6 +1636,7 @@ async def can_send_forward(self, room, content):
 
                     message_data = {
                         'author': '',
+                        'server': '',
                         'bot': False,
                         'webhook_id': None,
                         'content': content,
@@ -1777,11 +1778,13 @@ async def can_send(self, room, message, content, files, source='discord', is_fir
 
                     message_data = {
                         'author': str(author),
+                        'server': str(server),
                         'bot': is_bot,
                         'webhook_id': str(webhook_id) if webhook_id else None,
                         'content': content,
                         'files': files,
-                        'suspected_spammer': is_spammer
+                        'suspected_spammer': is_spammer,
+                        'is_first': is_first
                     }
 
                     try:
@@ -2864,11 +2867,15 @@ async def stickers_to_urls(stickers):
                         else:
                             trimmed_length = 0
 
+                        compact_text = f'{author_text} / {trimmed}' if trimmed_length >= 0 else f'{author_text} / \U0001F3DE'
+                        if len(compact_text) > 80:
+                            compact_text = compact_text[:-(len(compact_text)-77)] + '...'
+
                         components.add_rows(
                             ui.ActionRow(
                                 nextcord.ui.Button(
                                     style=nextcord.ButtonStyle.url,
-                                    label=f'{author_text} / {trimmed}' if trimmed_length >= 0 else f'{author_text} / \U0001F3DE',
+                                    label=compact_text,
                                     emoji='\U000021AA\U0000FE0F',
                                     url=url,
                                     disabled=url is None

cogs/lockdown.py

@@ -79,7 +79,7 @@ async def preunload(self, extension):
         script = importlib.import_module('utils.' + plugin_name + '_check')
         await script.check(self.bot)
 
-    @commands.command(hidden=True,aliases=['globalkill'],description=language.desc('lockdown.lockdown'))
+    @commands.command(aliases=['globalkill'],description=language.desc('lockdown.lockdown'))
     @restrictions.owner()
     async def lockdown(self,ctx):
         selector = language.get_selector(ctx)

cogs/sysmgr.py

@@ -1130,6 +1130,12 @@ def allow_storage(plugin, cog):
             requires_storage[plugin].append(cog)
 
         for cog in cogs:
+            if cog == 'system':
+                toload.append('system')
+                skip.append('system')
+                failed.update({cog: 'Cannot manage the entire system plugin, manage the individual modules instead'})
+                continue
+
             cog_exists = f'{cog}.py' in os.listdir('cogs')
             plugin_exists = f'{cog}.json' in os.listdir('plugins')
 
@@ -1512,7 +1518,7 @@ async def system(self, ctx):
     async def system_legacy(self, ctx):
         pass
 
-    @system_legacy.command(aliases=['reload-services'], hidden=True, description=language.desc('sysmgr.reload_services'))
+    @system_legacy.command(aliases=['reload-services'], description=language.desc('sysmgr.reload_services'))
     @restrictions_legacy.owner()
     async def reload_services(self,ctx,*,services=None):
         selector = language.get_selector(ctx)
@@ -1555,9 +1561,8 @@ async def reload_services(self,ctx,*,services=None):
                     return await ctx.author.send(selector.get("too_long"))
             await ctx.author.send(f'**{selector.get("fail_logs")}**\n{text}')
 
-    @system_legacy.command(hidden=True, description=language.desc('sysmgr.eval'))
-    @restrictions_legacy.owner()
-    async def eval(self, ctx, *, body):
+    # Eval command
+    async def eval(self, ctx, body):
         selector = language.get_selector(ctx)
         env = {
             'ctx': ctx,
@@ -1613,13 +1618,11 @@ async def eval(self, ctx, *, body):
             else:
                 await ctx.send(f'{self.bot.ui_emojis.success} {selector.fget("success", values={"exec_time": exec_time})}\n```\n{value}\n```')
 
-    @system_legacy.command(aliases=['poweroff'], hidden=True, description=language.desc('sysmgr.shutdown'))
-    @restrictions_legacy.owner()
+    # Shutdown command
     async def shutdown(self, ctx):
         await self.bot_shutdown(ctx)
 
-    @system_legacy.command(aliases=['reboot'], hidden=True, description=language.desc('sysmgr.restart'))
-    @restrictions_legacy.owner()
+    # Restart command
     async def restart(self, ctx):
         await self.bot_shutdown(ctx, restart=True)
 
@@ -1648,7 +1651,7 @@ async def modifiers(self, ctx: Union[nextcord.Interaction, commands.Context]):
         ))
         return await ctx.send(embed=embed)
 
-    @system_legacy.command(hidden=True, aliases=['cogs'], description=language.desc('sysmgr.extensions'))
+    @system_legacy.command(aliases=['cogs'], description=language.desc('sysmgr.extensions'))
     @restrictions_legacy.owner()
     async def extensions(self, ctx, *, extension=None):
         selector = language.get_selector(ctx)
@@ -1703,22 +1706,21 @@ async def extensions(self, ctx, *, extension=None):
             embed.description = embed.description + selector.get('system_module')
         await ctx.send(embed=embed)
 
-    @system_legacy.command(hidden=True,description=language.desc('sysmgr.reload'))
-    @restrictions_legacy.owner()
-    async def reload(self, ctx, *, extensions):
+    # Reload command
+    async def reload(self, ctx, extensions):
         await self.manage_cog_cmd(ctx, CogAction.reload, extensions)
 
-    @system_legacy.command(hidden=True,description=language.desc('sysmgr.load'))
+    @system_legacy.command(description=language.desc('sysmgr.load'))
     @restrictions_legacy.owner()
     async def load(self, ctx, *, extensions):
         await self.manage_cog_cmd(ctx, CogAction.load, extensions)
 
-    @system_legacy.command(hidden=True,description='Unloads an extension.')
+    @system_legacy.command(description='Unloads an extension.')
     @restrictions_legacy.owner()
     async def unload(self, ctx, *, extensions):
         await self.manage_cog_cmd(ctx, CogAction.unload, extensions)
 
-    @system_legacy.command(hidden=True,description='Installs a plugin.')
+    @system_legacy.command(description='Installs a plugin.')
     @restrictions_legacy.owner()
     async def install(self, ctx, url):
         if self.bot.devmode:
@@ -1974,7 +1976,7 @@ def check(interaction):
             await msg.edit(embed=embed)
             return
 
-    @system_legacy.command(hidden=True,description='Uninstalls a plugin.')
+    @system_legacy.command(description='Uninstalls a plugin.')
     @restrictions_legacy.owner()
     async def uninstall(self, ctx, plugin):
         if self.bot.devmode:
@@ -2068,9 +2070,8 @@ def check(interaction):
             await msg.edit(embed=embed)
             return
 
-    @system_legacy.command(hidden=True,description='Upgrades Unifier or a plugin.')
-    @restrictions_legacy.owner()
-    async def upgrade(self, ctx, plugin='system', *, args=''):
+    # Upgrade command
+    async def upgrade(self, ctx, plugin='system', args=''):
         if self.bot.devmode:
             return await ctx.send('Command unavailable in devmode')
         if not ctx.author.id == self.bot.config['owner']:
@@ -3082,14 +3083,15 @@ def search_filter(query, query_cmd):
 
                 for index in range(len(cmds)):
                     cmd = cmds[index-offset]
+                    hidden = False
                     if permissions=='owner':
                         canrun = True
                     else:
                         try:
                             if (
                                     isinstance(cmd, nextcord.BaseApplicationCommand) or
                                     isinstance(cmd, nextcord.SlashApplicationSubcommand)
-                            ) and not is_legacy or type(cmd) is commands.command and is_legacy:
+                            ) and not is_legacy or type(cmd) is commands.Command and is_legacy:
                                 canrun = await cmd.can_run(ctx)
                             else:
                                 canrun = (
@@ -3099,7 +3101,11 @@ def search_filter(query, query_cmd):
                                 ) # legacy commands can only be used by owners and admins
                         except:
                             canrun = False or cmd.qualified_name in overrides[permissions]
-                    if not canrun or (cogname=='search' and not search_filter(query,cmd)):
+
+                    if type(cmd) is commands.Command:
+                        hidden = cmd.hidden
+
+                    if not canrun or (cogname=='search' and not search_filter(query,cmd)) or hidden:
                         cmds.pop(index-offset)
                         offset += 1
 
@@ -3549,7 +3555,7 @@ def check(interaction):
             else:
                 await ctx.send(response)
 
-    @system_legacy.command(name='register-commands', hidden=True, description='Registers commands.')
+    @system_legacy.command(name='register-commands', description='Registers commands.')
     @restrictions_legacy.owner()
     async def register_commands(self, ctx, *, args=''):
         selector = language.get_selector(ctx)
@@ -3559,7 +3565,7 @@ async def register_commands(self, ctx, *, args=''):
         await self.bot.sync_application_commands()
         return await ctx.send(selector.get("registered"))
 
-    @system_legacy.command(hidden=True, description='Views cloud backup status.')
+    @system_legacy.command(description='Views cloud backup status.')
     @restrictions_legacy.owner()
     async def cloud(self, ctx):
         selector = language.get_selector(ctx)
@@ -3916,8 +3922,7 @@ async def help_autocomplete(self, ctx: nextcord.Interaction, query: str):
 
             if query.lower() in cmd.qualified_name or has_alias:
                 try:
-                    if isinstance(cmd, nextcord.BaseApplicationCommand) or isinstance(cmd,
-                                                                                      nextcord.SlashApplicationSubcommand):
+                    if isinstance(cmd, nextcord.BaseApplicationCommand) or isinstance(cmd, nextcord.SlashApplicationSubcommand):
                         canrun = await cmd.can_run(ctx)
                     else:
                         canrun = (
@@ -3927,6 +3932,10 @@ async def help_autocomplete(self, ctx: nextcord.Interaction, query: str):
                         )  # legacy commands can only be used by owners and admins
                 except:
                     canrun = False or cmd.qualified_name in overrides[permissions]
+
+                if type(cmd) is commands.Command and cmd.hidden:
+                    continue
+
                 if canrun:
                     if not cmd.qualified_name in possible:
                         possible.append(cmd.qualified_name)
@@ -3983,6 +3992,60 @@ async def uptime_slash(self, ctx: nextcord.Interaction):
     async def uptime_legacy(self, ctx: commands.Context):
         await self.uptime(ctx)
 
+    # system upgrade
+    @system_legacy.command(name='upgrade', description='Upgrades Unifier or a plugin.')
+    @restrictions_legacy.owner()
+    async def upgrade_legacy(self, ctx, plugin='system', *, args=''):
+        await self.upgrade(ctx, plugin=plugin, args=args)
+
+    @commands.command(name='upgrade', description='Upgrades Unifier or a plugin.', hidden=True)
+    @restrictions_legacy.owner()
+    async def upgrade_legacy_alt(self, ctx, plugin='system', *, args=''):
+        await self.upgrade(ctx, plugin=plugin, args=args)
+
+    # system shutdown
+    @system_legacy.command(name='shutdown', aliases=['poweroff'], description=language.desc('sysmgr.shutdown'))
+    @restrictions_legacy.owner()
+    async def shutdown_legacy(self, ctx):
+        await self.shutdown(ctx)
+
+    @commands.command(name='shutdown', aliases=['poweroff'], description=language.desc('sysmgr.shutdown'), hidden=True)
+    async def shutdown_legacy_alt(self, ctx):
+        await self.shutdown(ctx)
+
+    # system restart
+    @system_legacy.command(name='restart', aliases=['reboot'], description=language.desc('sysmgr.restart'))
+    @restrictions_legacy.owner()
+    async def restart_legacy(self, ctx):
+        await self.restart(ctx)
+
+    @commands.command(name='restart', aliases=['reboot'], description=language.desc('sysmgr.restart'), hidden=True)
+    @restrictions_legacy.owner()
+    async def restart_legacy_alt(self, ctx):
+        await self.restart(ctx)
+
+    # system reload
+    @system_legacy.command(name='reload', description=language.desc('sysmgr.reload'))
+    @restrictions_legacy.owner()
+    async def reload_legacy(self, ctx, *, extensions):
+        await self.reload(ctx, extensions)
+
+    @commands.command(name='reload', description=language.desc('sysmgr.reload'), hidden=True)
+    @restrictions_legacy.owner()
+    async def reload_legacy_alt(self, ctx, *, extensions):
+        await self.reload(ctx, extensions)
+
+    # system eval
+    @system_legacy.command(name='eval', description=language.desc('sysmgr.eval'))
+    @restrictions_legacy.owner()
+    async def eval_legacy(self, ctx, *, body):
+        await self.eval(ctx, body)
+
+    @commands.command(name='eval', description=language.desc('sysmgr.eval'), hidden=True)
+    @restrictions_legacy.owner()
+    async def eval_legacy_alt(self, ctx, *, body):
+        await self.eval(ctx, body)
+
     # Error handling
 
     async def cog_command_error(self, ctx, error):

config.toml

@@ -27,7 +27,7 @@ custom_slogan = ""
 
 [backups]
 compress_cache = true
-cache_backup_limit = 200000 # number of messages to cache
+cache_backup_limit = 100000 # number of messages to cache
 encrypted_backups = true # enables encryption for local backups (cloud backups are always encrypted)
 zstd_level = 1 # compression level, -7 (best performance) - 22 (best compression). 1 is recommended.
 zstd_chunk_size = 4194304 # chunk size in bytes. default is 4MB (4 * 1024 * 1024).

filters/known_spammer.py

@@ -4,7 +4,7 @@ class Filter(BaseFilter):
     def __init__(self):
         super().__init__(
             'known-spammers',
-            'Suspected Spammers Filter',
+            'Block Suspected Spammers',
             'Prevents users that are suspected to have engaged in spam activities from talking.'
         )
 

filters/slowmode.py

@@ -17,6 +17,9 @@ def __init__(self):
         )
 
     def check(self, message, data) -> FilterResult:
+        if not message['is_first']:
+            return FilterResult(True, data)
+
         if message['author'] in data['data']:
             if time.time() < data['data'][message['author']]:
                 return FilterResult(