LevelUp - settings pre-buildout, leaderboard dash fix

Author: vertyco

levelup/dashboard/integration.py

@@ -4,11 +4,12 @@
 from pathlib import Path
 
 import discord
+import pydantic
 from redbot.core import commands
 from redbot.core.i18n import Translator
 
 from ..abc import MixinMeta
-from ..common import formatter
+from ..common import formatter, models
 
 _ = Translator("LevelUp", __file__)
 log = logging.getLogger("red.levelup.dashboard")
@@ -35,7 +36,6 @@ async def get_dashboard_leaderboard(
         guild: discord.Guild,
         lbtype: t.Literal["lb", "weekly"],
         stat: t.Literal["exp", "messages", "voice", "stars"] = "exp",
-        query: t.Optional[str] = None,
         **kwargs,
     ):
         """
@@ -110,7 +110,6 @@ async def get_dashboard_leaderboard(
             member=guild.get_member(user.id),
             use_displayname=True,
             dashboard=True,
-            query=query,
         )
         data = {
             "user_id": user.id,
@@ -145,3 +144,120 @@ async def weekly_page(
     ) -> t.Dict[str, t.Any]:
         stat = stat if stat is not None and stat in {"exp", "messages", "voice", "stars"} else "exp"
         return await self.get_dashboard_leaderboard(user, guild, "weekly", stat, query, **kwargs)
+
+    async def save_settings(self, user: discord.User, guild: discord.Guild, data: dict, **kwargs):
+        member = guild.get_member(user.id)
+        if not member:
+            return {
+                "status": 1,
+                "error_title": _("Member not found"),
+                "error_message": _("You are not a member of this guild."),
+            }
+        if not await self.bot.is_admin(member):
+            return {
+                "status": 1,
+                "error_title": _("Insufficient permissions"),
+                "error_message": _("You need to be an admin to access this page."),
+            }
+
+        try:
+            new_conf = models.GuildSettings.model_validate(data)
+        except pydantic.ValidationError as e:
+            return {
+                "status": 1,
+                "error_title": _("Validation error"),
+                "error_message": str(e),
+            }
+
+        conf = self.db.get_conf(guild)
+        for k, v in data.items():
+            setattr(conf, k, getattr(new_conf, k, v))
+        self.save()
+        return {
+            "status": 0,
+            "success_title": _("Settings saved"),
+            "success_message": _("The settings have been saved."),
+        }
+
+    # @dashboard_page(name="settings", description="Configure the leveling system.")
+    async def get_cog_settings(self, user: discord.User, guild: discord.Guild, **kwargs):
+        if kwargs.get("save") and (data := kwargs.get("new_data")):
+            log.info(f"Saving settings for {guild.name} by {user.name}")
+            return await self.save_settings(user, guild, data, **kwargs)
+        log.info(f"Getting settings for {guild.name} by {user.name}")
+        member = guild.get_member(user.id)
+        if not member:
+            return {
+                "status": 1,
+                "error_title": _("Member not found"),
+                "error_message": _("You are not a member of this guild."),
+            }
+        if not await self.bot.is_admin(member):
+            return {
+                "status": 1,
+                "error_title": _("Insufficient permissions"),
+                "error_message": _("You need to be an admin to access this page."),
+            }
+
+        conf = self.db.get_conf(guild)
+        settings = conf.model_dump(mode="json", exclude=["users", "users_weekly"])
+
+        users = []
+        for user in guild.members:
+            users.append(
+                {
+                    "id": user.id,
+                    "name": user.name,
+                    "avatar": user.display_avatar.url,
+                }
+            )
+
+        emojis = []
+        for emoji in guild.emojis:
+            emojis.append(
+                {
+                    "id": emoji.id,
+                    "name": emoji.name,
+                    "url": emoji.url,
+                }
+            )
+
+        # Add roles data for the settings page
+        roles = []
+        for role in sorted(guild.roles, reverse=True):
+            if role.is_default():
+                continue
+            roles.append(
+                {
+                    "id": role.id,
+                    "name": role.name,
+                    "color": str(role.color),
+                    "position": role.position,
+                }
+            )
+
+        parent = Path(__file__).parent
+        source_path = parent / "templates" / "settings.html"
+        static_dir = parent / "static"
+        js_path = static_dir / "js" / "settings.js"
+        css_path = static_dir / "css" / "settings.css"
+
+        # Inject JS and CSS into the HTML source for full page loads
+        source = (
+            f"<style>\n{css_path.read_text() if css_path.exists() else ''}\n</style>\n\n"
+            + source_path.read_text().strip()
+            + f"\n\n<script>\n{js_path.read_text()}\n</script>"
+        )
+
+        payload = {
+            "status": 0,
+            "web_content": {
+                "source": source,
+                "expanded": True,
+                "settings": settings,
+                "users": users,
+                "emojis": emojis,
+                "roles": roles,
+            },
+        }
+        return payload

levelup/dashboard/static/css/settings.css

@@ -1,7 +1,7 @@
 document.addEventListener('alpine:init', () => {
     Alpine.data('leaderBoard', (data = {}) => ({
         // DATA INITIALIZATION
-        searchQuery: data.query,
+        searchQuery: '',
         page: data.page,
         perPage: 100,
         users: data.users,

levelup/dashboard/static/js/leaderboard.js

@@ -0,0 +1,46 @@
+document.addEventListener('alpine:init', () => {
+    Alpine.data('levelUpSettings', (data = {}) => ({
+        // DATA INITIALIZATION
+        settings: data.settings || {},
+        users: data.users || [],
+        emojis: data.emojis || [],
+        roles: data.roles || [],
+        newLevelRole: { level: 1, role: '' },
+
+        // METHODS
+        async saveSettings(event) {
+            if (event) event.preventDefault();
+            console.log("Saving settings:", this.settings);
+            try {
+                // Get CSRF token from meta tag
+                const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content;
+
+                if (!csrfToken) {
+                    console.error("CSRF token not found");
+                    alert("CSRF token not found. Please refresh the page and try again.");
+                    return;
+                }
+
+                const response = await fetch(window.location.href, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': csrfToken  // Changed from X-CSRF-Token to X-CSRFToken
+                    },
+                    credentials: 'same-origin',  // Added to ensure cookies are sent
+                    body: JSON.stringify(this.settings)
+                });
+
+                const result = await response.json();
+                if (result.status === 0) {
+                    alert(result.success_message);
+                } else {
+                    alert(`Error: ${result.error_message}`);
+                }
+            } catch (error) {
+                console.error("Error saving settings:", error);
+                alert("An error occurred while saving settings.");
+            }
+        }
+    }));
+});

levelup/dashboard/static/js/settings.js

@@ -0,0 +1,44 @@
+<script
+  defer
+  src="https://cdn.jsdelivr.net/npm/[email protected]/dist/cdn.min.js"
+></script>
+
+<!-- Add CSRF token meta tag -->
+<meta name="csrf-token" content="{{ csrf_token }}" />
+
+<div class="container-fluid" x-data="levelUpSettings({{ data }})">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h3>LevelUp Settings</h3>
+    </div>
+    <div class="card-body">
+      <form @submit.prevent>
+        <!-- Enable/Disable Leveling -->
+        <div class="mb-3">
+          <div class="form-check form-switch ps-0">
+            <input
+              id="setting-enabled"
+              class="form-check-input ms-0"
+              type="checkbox"
+              x-model="settings.enabled"
+              x-bind:checked="settings.enabled"
+            />
+            <label class="form-check-label"
+              >Enable the leveling system in this server.</label
+            >
+          </div>
+        </div>
+        <!-- Submit Button -->
+        <div class="mt-4">
+          <button
+            type="button"
+            class="btn btn-primary"
+            x-bind:href="{{ url_for_query( save=True, new_data=settings ) }}"
+          >
+            Save Settings
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

levelup/dashboard/templates/settings.html

@@ -77,7 +77,7 @@ class LevelUp(
     """
 
     __author__ = "[vertyco](https://github.com/vertyco/vrt-cogs)"
-    __version__ = "4.3.25"
+    __version__ = "4.3.26"
     __contributors__ = [
         "[aikaterna](https://github.com/aikaterna/aikaterna-cogs)",
         "[AAA3A](https://github.com/AAA3A-AAA3A/AAA3A-cogs)",