Merge pull request #245 from UnifierHQ/dev

3.11.7: Another bugfix release

Author: greeeen-dev

cogs/bridge.py

@@ -612,6 +612,10 @@ class AgeGateUnsupported(BridgeError):
         """Platform does not support age gate."""
         pass
 
+    class AgeGateDisabled(BridgeError):
+        """NSFW rooms are disabled."""
+        pass
+
     def verify_message_content(self, message: UnifierMessageContent):
         """Verifies a UnifierMessageContent object to ensure it is valid."""
 
@@ -1049,6 +1053,8 @@ async def join_room(self, user, room, channel, webhook_id=None, platform='discor
             raise self.NotAgeGated('room is NSFW but channel is not NSFW')
         elif nsfw and not roominfo['meta'].get('settings', {}).get('nsfw', False):
             raise self.IsAgeGated('room is not NSFW but channel is NSFW')
+        elif nsfw and not self.__bot.config['allow_nsfw_rooms']:
+            raise self.AgeGateDisabled('NSFW rooms are disabled')
 
         limit = self.get_connections_limit(guild_id)
 
@@ -2106,6 +2112,8 @@ async def can_send(self, room, message, content, files, source='discord', is_fir
             raise self.NotAgeGated('room is NSFW but channel is not NSFW')
         elif nsfw and not roomdata['meta'].get('settings', {}).get('nsfw', False):
             raise self.IsAgeGated('room is not NSFW but channel is NSFW')
+        elif nsfw and not self.__bot.config['allow_nsfw_rooms']:
+            raise self.AgeGateDisabled('NSFW rooms are disabled')
 
         # Check if server is banned from the room
         if str(server) in roomdata['meta']['banned']:

cogs/config.py

@@ -612,6 +612,8 @@ def check(interaction):
 # Could've used inheritance here, but I'd need to override every method anyway, so better off not
 class SettingsDialog:
     def __init__(self, bot, ctx: Union[nextcord.Interaction, commands.Context], room=None, query=None):
+        global settings_keys
+
         self.ctx = ctx
         self.__bot = bot
         self.room = room
@@ -628,6 +630,9 @@ def __init__(self, bot, ctx: Union[nextcord.Interaction, commands.Context], room
         self.match_desc = True
         self.title = self.__bot.ui_emojis.rooms + ' ' + self.selector.fget('title',values={'room':self.room})
 
+        if not self.__bot.config['allow_nsfw_rooms']:
+            settings_keys.remove('nsfw')
+
     @property
     def author(self):
         if type(self.ctx) is nextcord.Interaction:

cogs/moderation.py

@@ -929,7 +929,7 @@ async def warn(self, ctx: Union[nextcord.Interaction, commands.Context], target:
         log_embed.set_author(name=f'@{user.name}', icon_url=user.avatar.url if user.avatar else None)
         log_embed.add_field(
             name=language.get("modlogs_title", "moderation.ban"),
-            value=language.fget("modlogs_body", "moderation.ban", values={"recent_warns": actions_count_recent["warns"],"total_bans": actions_count["bans"]}),
+            value=language.fget("modlogs_body", "moderation.ban",values={"recent_warns": actions_count_recent["warns"],"total_warns": actions_count["warns"],"recent_bans": actions_count_recent["bans"],"total_bans": actions_count["bans"]}),
             inline=False
         )
         try:

config.toml

@@ -56,6 +56,7 @@ reports_channel = -1
 moderator_role = -1
 
 [bridge]
+allow_nsfw_rooms = false # Strongly recommended to be kept false for public instances.
 use_multicore = true
 enable_exp = false
 exp_cooldown = 30

languages/english.json

@@ -753,6 +753,7 @@
         "too_many": "Server has reached maximum number of Private Rooms connections.",
         "not_agegate": "This Room is marked as NSFW. Only age-gated channels can connect to this Room.",
         "is_agegate": "This Room is not marked as NSFW. Age-gated channels may not connect to this Room.",
+        "agegate_disabled": "NSFW Rooms are disabled on this instance.",
         "already_linked_server": "Your server is already binded to this room. Unbind the room and try again.",
         "success": "Connected to room!",
         "say_hi": "You're now connected! Say hi!"

plugins/system.json

@@ -2,9 +2,9 @@
   "id": "system",
   "name": "System extensions",
   "description": "Unifier system extensions",
-  "version": "v3.11.6",
-  "release": 160,
-  "reboot": 159,
+  "version": "v3.11.7",
+  "release": 161,
+  "reboot": 160,
   "b_reboot": 158,
   "minimum": 0,
   "shutdown": false,

unifier.py

@@ -654,7 +654,8 @@ def no_presence(cls) -> Self:
     sys.exit(1)
 
 # Create pre-boot copy of good data file
-shutil.copy2(bot.db.file_path, 'data-preboot.json')
+if os.path.exists(bot.db.file_path):
+    shutil.copy2(bot.db.file_path, 'data-preboot.json')
 
 if not bot.test_decrypt():
     del os.environ['UNIFIER_ENCPASS']