Slightly changes naming

classes/holo_user.py

@@ -5,6 +5,7 @@ import discord
 import discord.member
 
 from modules.database import col_users, col_warnings
+from modules.utils import config_get
 
 logger = logging.getLogger(__name__)
 
@@ -98,6 +99,45 @@ class HoloUser:
         )
         logger.info(f"Set attribute {key} of user {self.id} to {value}")
 
+    async def is_moderator(
+        self, member: Union[discord.User, discord.Member, discord.member.Member]
+    ) -> bool:
+        """Check if user is moderator or council member
+
+        ### Args:
+            * `member` (Union[discord.User, discord.Member, discord.member.Member]): Member object
+
+        ### Returns:
+            `bool`: `True` if member is a moderator or member of council and `False` if not
+        """
+        if isinstance(member, discord.User):
+            return False
+        moderator_role = await config_get("moderators", "roles")
+        council_role = await config_get("council", "roles")
+        for role in member.roles:
+            if role.id == moderator_role or role.id == council_role:
+                return True
+        return False
+
+    async def is_council(
+        self, member: Union[discord.User, discord.Member, discord.member.Member]
+    ) -> bool:
+        """Check if user is a member of council
+
+        ### Args:
+            * `member` (Union[discord.User, discord.Member, discord.member.Member]): Member object
+
+        ### Returns:
+            `bool`: `True` if member is a member of council and `False` if not
+        """
+        if isinstance(member, discord.User):
+            return False
+        council_role = await config_get("council", "roles")
+        for role in member.roles:
+            if role.id == council_role:
+                return True
+        return False
+
     # def purge(self) -> None:
     #     """Completely remove data from database. Will not remove transactions logs and warnings."""
     #     col_users.delete_one(filter={"_id": self.db_id})

cogs/admin.py

@@ -83,7 +83,7 @@ class Admin(commands.Cog):
     #             )
     #         )
     #         mod_role = ds_utils.get(
-    #             ctx.user.guild.roles, id=await config_get("moderator", "roles")
+    #             ctx.user.guild.roles, id=await config_get("moderators", "roles")
     #         )
     #         admin_chan = ds_utils.get(
     #             ctx.user.guild.channels,
@@ -136,7 +136,7 @@ class Admin(commands.Cog):
                 )
             )
             mod_role = ds_utils.get(
-                ctx.user.guild.roles, id=await config_get("moderator", "roles")
+                ctx.user.guild.roles, id=await config_get("moderators", "roles")
             )
             admin_chan = ds_utils.get(
                 ctx.user.guild.channels,
@@ -181,7 +181,7 @@ class Admin(commands.Cog):
                 )
             )
             mod_role = ds_utils.get(
-                ctx.user.guild.roles, id=await config_get("moderator", "roles")
+                ctx.user.guild.roles, id=await config_get("moderators", "roles")
             )
             admin_chan = ds_utils.get(
                 ctx.user.guild.channels,

cogs/data.py

@@ -7,6 +7,7 @@ from discord import ApplicationContext, Embed, File, option
 from discord import utils as ds_utils
 from discord.commands import SlashCommandGroup
 from discord.ext import commands
+from classes.holo_user import HoloUser
 
 from enums.colors import Color
 from modules.database import col_users
@@ -32,7 +33,10 @@ class Data(commands.Cog):
     )
     async def data_export_cmd(self, ctx: ApplicationContext, kind: str):
         await ctx.defer()
-        if ctx.user.id in await config_get("admins"):
+        holo_user = HoloUser(ctx.author)
+        if (ctx.user.id in await config_get("admins")) or (
+            await holo_user.is_council(ctx.author)
+        ):
             logging.info(
                 f"Moderator {guild_name(ctx.user)} exported current users list"
             )
@@ -69,7 +73,7 @@ class Data(commands.Cog):
                 )
             )
             mod_role = ds_utils.get(
-                ctx.user.guild.roles, id=await config_get("moderator", "roles")
+                ctx.user.guild.roles, id=await config_get("moderators", "roles")
             )
             admin_chan = ds_utils.get(
                 ctx.user.guild.channels,
@@ -94,7 +98,10 @@ class Data(commands.Cog):
     )
     async def data_migrate_cmd(self, ctx: ApplicationContext, kind: str):
         await ctx.defer()
-        if ctx.user.id in await config_get("admins"):
+        holo_user = HoloUser(ctx.author)
+        if (ctx.user.id in await config_get("admins")) or (
+            await holo_user.is_council(ctx.author)
+        ):
             logging.info(
                 f"Moderator {guild_name(ctx.user)} started migration of all members to the database"
             )
@@ -136,7 +143,7 @@ class Data(commands.Cog):
                 )
             )
             mod_role = ds_utils.get(
-                ctx.user.guild.roles, id=await config_get("moderator", "roles")
+                ctx.user.guild.roles, id=await config_get("moderators", "roles")
             )
             admin_chan = ds_utils.get(
                 ctx.user.guild.channels,

config_example.json

@@ -36,7 +36,8 @@
         "voice": {}
     },
     "roles": {
-        "moderator": 0
+        "council": 0,
+        "moderators": 0
     },
     "bots": {},
     "messages": {

validation/users.json

@@ -0,0 +1,24 @@
+{
+    "$jsonSchema": {
+        "required": [
+            "user",
+            "customrole",
+            "customchannel"
+
+        ],
+        "properties": {
+            "user": {
+                "bsonType": "long",
+                "description": "Discord ID of user"
+            },
+            "customrole": {
+                "bsonType": ["null", "long"],
+                "description": "Discord ID of custom role or 'null' if not set"
+            },
+            "customchannel": {
+                "bsonType": ["null", "long"],
+                "description": "Discord ID of custom channel or 'null' if not set"
+            }
+        }
+    }
+}

validation/warnings.json

@@ -0,0 +1,18 @@
+{
+    "$jsonSchema": {
+        "required": [
+            "user",
+            "warns"
+        ],
+        "properties": {
+            "user": {
+                "bsonType": "long",
+                "description": "Discord ID of user"
+            },
+            "warns": {
+                "bsonType": "int",
+                "description": "Number of warnings on count"
+            }
+        }
+    }
+}