3.8.0: Filters, Room settings and more

.github/workflows/release-alpha.yml

@@ -13,4 +13,4 @@ jobs:
       branch_version: dev
       pre_release: true
     secrets:
-      DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+      DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}

.github/workflows/release-staging.yml

@@ -13,4 +13,4 @@ jobs:
       branch_version: dev
       pre_release: true
     secrets:
-      DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+      DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}

.gitignore

@@ -1 +1,2 @@
+# Ignore test scripts used to test new features
 /test-scripts/

boot/dep_installer.py

@@ -70,7 +70,7 @@
     except:
         continue
 
-    if len(plugin_data['requirements']) > 0:
+    if len(plugin_data.get('requirements', [])) > 0:
         code = os.system(f'{binary} -m pip install{user_arg} -U {" ".join(plugin_data["requirements"])}')
         if not code == 0:
             break

boot/installer.py

@@ -167,20 +167,6 @@ async def on_ready():
 token = getpass.getpass('Token: ')
 
 encryption_password = ''
-salt = ''
-
-print('\x1b[33;1mWe will now ask for the token encryption salt. This must be an integer.\x1b[0m')
-print('\x1b[33;1mAs of Unifier v3.2.0, all tokens must be stored encrypted, even if it\'s stored as an environment variable.\x1b[0m')
-
-while True:
-    try:
-        salt = int(input())
-        break
-    except KeyboardInterrupt:
-        print('\x1b[31;49mAborted.\x1b[0m')
-        sys.exit(1)
-    except:
-        print('\x1b[31;49mThis isn\'t an integer, try again.\x1b[0m')
 
 print('\x1b[33;1mWe will now ask for the token encryption password. This is NOT your bot token.\x1b[0m')
 print(f'\x1b[37;41;1mWARNING: DO NOT SHARE THIS TOKEN, NOT EVEN WITH {internal["maintainer"].upper()}.\x1b[0m')
@@ -202,16 +188,15 @@ async def on_ready():
     print('\x1b[31;49mMake sure Server Members and Message Content intents are enabled for the bot.\x1b[0m')
     sys.exit(1)
 
-tokenstore = secrets.TokenStore(True, password=encryption_password, salt=salt, content_override={'TOKEN': token})
+tokenstore = secrets.TokenStore(True, password=encryption_password, content_override={'TOKEN': token})
 tokenstore.add_token('TOKEN', token)
-tokenstore.save('.encryptedenv', '.ivs')
+tokenstore.save('.encryptedenv')
 print('\x1b[36;1mYour tokens have been stored securely.\x1b[0m')
 
 with open('config.toml', 'rb') as file:
     config = tomli.load(file)
 
 config['roles']['owner'] = user_id
-config['system']['encrypted_env_salt'] = salt
 
 if not internal['skip_server']:
     config['moderation']['home_guild'] = server_id

boot/internal.json

@@ -5,7 +5,8 @@
   "product_name": "Unifier",
   "base_bootfile": "unifier.py",
   "repo": "https://github.com/UnifierHQ/unifier",
-  "required_py_version": 9,
+  "stable_branch": "main",
+  "required_py_version": 12,
   "skip_server": false,
   "options": [
     {
@@ -32,7 +33,7 @@
         "description": "Uses no performance optimizations. May be slower, but has best stability.",
         "default": false,
         "prefix": "stable",
-        "required_py_version": 9,
+        "required_py_version": 12,
         "color": "32"
     }
   ]

boot/tokenmgr.py

@@ -30,19 +30,27 @@
     print('\x1b[31;1mSomething went wrong.\x1b[0m')
     sys.exit(1)
 
-
-with open('config.toml', 'rb') as file:
-    # noinspection PyTypeChecker
-    config = tomli.load(file)
-
-salt = config['system']['encrypted_env_salt']
-
 try:
-    tokenmgr = secrets.TokenStore(True, password=os.environ.get('UNIFIER_ENCPASS'), salt=salt)
+    tokenmgr = secrets.TokenStore(True, password=os.environ.get('UNIFIER_ENCPASS'))
 except ValueError:
     print('\x1b[31;1mYou must provide a password.\x1b[0m')
     sys.exit(1)
 
+if not tokenmgr.test_decrypt() and '.ivs' in os.listdir():
+    print('\x1b[33;1mAES-256-CBC encryption detected, converting to GCM mode...\x1b[0m')
+
+    with open('config.toml', 'rb') as file:
+        # noinspection PyTypeChecker
+        config = tomli.load(file)
+
+    converter = secrets.ToGCMTokenStore(
+        password=os.environ.get('UNIFIER_ENCPASS'),
+        salt=config['system']['encrypted_env_salt']
+    )
+
+    if converter.test_decrypt():
+        tokenmgr = converter.to_gcm()
+
 if not tokenmgr.test_decrypt():
     print('\x1b[31;1mInvalid password. Your encryption password is needed to manage tokens.\x1b[0m')
     print('\x1b[31;1mIf you\'ve forgot your password, run the bootscript again with --clear-tokens\x1b[0m')
@@ -170,7 +178,7 @@ def reencrypt_tokens():
         return
 
     try:
-        tokenmgr.reencrypt(current_password, password, salt)
+        tokenmgr.reencrypt(current_password, password)
     except ValueError:
         print('\x1b[31;1mInvalid password. Your current encryption password is needed to re-encrypt tokens.\x1b[0m')
         return

cogs/badge.py

@@ -17,24 +17,25 @@
 """
 
 import nextcord
-from nextcord.ext import commands
+from nextcord.ext import commands, tasks
 from typing import Optional
 from utils import log, langmgr, restrictions_legacy as r_legacy, slash as slash_handler
 from enum import Enum
+import aiohttp
+import asyncio
 
 restrictions_legacy = r_legacy.Restrictions()
 language = langmgr.partial()
 language.load()
 slash = slash_handler.SlashHelper(language)
 
 class UserRole(Enum):
-    # let values be None until set by langmgr
-    OWNER = language.get('owner','badge.roles')
-    ADMIN = language.get('admin','badge.roles')
-    MODERATOR = language.get('moderator','badge.roles')
-    TRUSTED = language.get('trusted','badge.roles')
-    BANNED = language.get('banned','badge.roles')
-    USER = language.get('user','badge.roles')
+    OWNER = language.get('owner', 'badge.roles')
+    ADMIN = language.get('admin', 'badge.roles')
+    MODERATOR = language.get('moderator', 'badge.roles')
+    TRUSTED = language.get('trusted', 'badge.roles')
+    BANNED = language.get('banned', 'badge.roles')
+    USER = language.get('user', 'badge.roles')
 
 class Badge(commands.Cog, name=':medal: Badge'):
     """Badge contains commands that show you your role in Unifier."""
@@ -46,7 +47,7 @@ def __init__(self, bot):
         language = self.bot.langmgr
         self.embed_colors = {
             UserRole.OWNER: (
-                self.bot.colors.greens_hair if self.bot.user.id==1187093090415149056 else self.bot.colors.unifier
+                self.bot.colors.greens_hair if self.bot.user.id == 1187093090415149056 else self.bot.colors.unifier
             ),
             UserRole.ADMIN: nextcord.Color.green(),
             UserRole.MODERATOR: nextcord.Color.purple(),
@@ -55,6 +56,18 @@ def __init__(self, bot):
             UserRole.USER: nextcord.Color.blurple()
         }
         restrictions_legacy.attach_bot(self.bot)
+        self.unifier_team_data = {}
+        self.check_unifier_team.start()
+
+    @tasks.loop(minutes=30)
+    async def check_unifier_team(self):
+        url = "https://collab.unifierhq.org/data.json"
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url) as response:
+                if response.status == 200:
+                    self.unifier_team_data = await response.json()
+                else:
+                    self.logger.warning(f"Failed to fetch Unifier team data: {response.status}")
 
     @nextcord.slash_command(
         description=language.desc('badge.badge'),
@@ -72,48 +85,61 @@ async def badge(
         user_role = self.get_user_role(user.id)
         embed = nextcord.Embed(
             description=selector.fget("body", values={
-                'mention':f"<@{user.id}>",'role': user_role.value
+                'mention': f"<@{user.id}>", 'role': user_role.value
             }),
             color=self.embed_colors[user_role]
         )
         embed.set_author(
             name=f'@{user.name}',
             icon_url=user.avatar.url if user.avatar else None
         )
-        if user_role==UserRole.BANNED:
+        if user_role == UserRole.BANNED:
             embed.set_footer(text=selector.get("easter_egg"))
 
+        catchedid = user.id
+
+        if str(catchedid) in self.unifier_team_data["aliases"]: 
+            catchedid = self.unifier_team_data["aliases"][str(catchedid)]
+
+        if str(catchedid) in self.unifier_team_data:
+            team_member = self.unifier_team_data[str(catchedid)]
+            embed.add_field(
+                name="Unifier Team",
+                value=f"{team_member['icon']} - **{team_member['displayname']}** is a **{team_member['role']}** in the Unifier team.",
+                inline=False
+            )
+
         await ctx.send(embed=embed)
 
-    @commands.command(hidden=True,aliases=['trust'],description=language.desc('badge.verify'))
+    @commands.command(hidden=True, aliases=['trust'], description=language.desc('badge.verify'))
     @restrictions_legacy.admin()
     async def verify(self, ctx, user: nextcord.User):
         selector = language.get_selector(ctx)
 
         if user.id in self.bot.trusted_group:
-            return await ctx.send(f'{self.bot.ui_emojis.error} '+selector.fget("failed", values={'user': user.name}))
+            return await ctx.send(f'{self.bot.ui_emojis.error} ' + selector.fget("failed", values={'user': user.name}))
 
         self.bot.trusted_group.append(user.id)
 
         self.bot.db['trusted'] = self.bot.trusted_group
         await self.bot.loop.run_in_executor(None, lambda: self.bot.db.save_data())
 
-        await ctx.send(f'{self.bot.ui_emojis.success} '+selector.fget("success", values={'user': user.name}))
+        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'))
     @restrictions_legacy.admin()
     async def unverify(self, ctx, user: nextcord.User):
         selector = language.get_selector(ctx)
 
         if not user.id in self.bot.trusted_group:
-            return await ctx.send(f'{self.bot.ui_emojis.error} '+selector.fget("failed", values={'user': user.name}))
+            return await ctx.send(f'{self.bot.ui_emojis.error} ' + selector.fget("failed", values={'user': user.name}))
 
         self.bot.trusted_group.remove(user.id)
 
         self.bot.db['trusted'] = self.bot.trusted_group
         await self.bot.loop.run_in_executor(None, lambda: self.bot.db.save_data())
 
-        await ctx.send(f'{self.bot.ui_emojis.success} '+selector.fget("success", values={'user': user.name}))
+        await ctx.send(f'{self.bot.ui_emojis.success} ' + selector.fget("success", values={'user': user.name}))
 
     def get_user_role(self, user_id):
         if user_id == self.bot.owner or user_id in self.bot.other_owners:
@@ -134,3 +160,13 @@ async def cog_command_error(self, ctx, error):
 
 def setup(bot):
     bot.add_cog(Badge(bot))
+
+# Happy new 2025, leaving this as an easteregg, with love, ItsAsheer, green., summer., Lezetho, Arhan, Saphire, and arandomguy
+
+# note from green to itsasheer:
+# out of ALL FILES you couldve added the comment to, you chose badge.py...
+# this is downright unacceptable. expect to see me in my totally real office next week
+#
+# (jokes aside happy new year)
+
+# ItsAsheer --> green. : Its bc new update to badge.py soon :eyes:, and bc its not a critical feature (imagine i broke bridge.py. We could create an easter egg file where we leave comments