Add support for other roles to edit clocks

CarlosFdez · CarlosFdez · commit 6297ac984f96 · 2025-09-29T01:59:05.000-04:00
diff --git a/lang/en.json b/lang/en.json
@@ -48,10 +48,17 @@
                     "bottomLeft": "Above Player List"
                 }
             },
+            "minimumEditorRole": {
+                "name": "Minimum Editor Role",
+                "hint": "Minimum role required to edit clock values"
+            },
             "offset": {
                 "name": "Vertical Offset",
                 "hint": "Distance from the top or bottom in pixels. Used to handle module incompatibility."
             }
+        },
+        "Warnings": {
+            "NoActiveGM": "An Active GM must be online to use that feature"
         }
     }
 }
diff --git a/module/clock-panel.js b/module/clock-panel.js
@@ -71,6 +71,7 @@ export class ClockPanel extends fapi.HandlebarsApplicationMixin(fapi.Application
         const defaultColor = game.settings.get(MODULE_ID, "defaultColor");
         const backgroundColor = game.settings.get(MODULE_ID, "defaultBackgroundColor");
         const maxSpokes = 28; // limit when to render spokes to not fill with black
+        const editable = this.db.canUserEdit(game.user);
         return clocks.map((data) => ({
             ...data,
             value: Math.clamp(data.value, 0, data.max),
@@ -79,6 +80,7 @@ export class ClockPanel extends fapi.HandlebarsApplicationMixin(fapi.Application
             spokes: data.max > maxSpokes ? [] : Array(data.max).keys(),
             editable: game.user.isGM,
             visible: !data.private || game.user.isGM,
+            editable,
         }));
     }
 
@@ -136,11 +138,11 @@ export class ClockPanel extends fapi.HandlebarsApplicationMixin(fapi.Application
         this.#sortable?.destroy();
         this.#sortable = null;
         const clockList = html.querySelector(".clock-list");
-        if (clockList) {
+        if (clockList && game.user.isGM) {
             this.#sortable = new SortableJS(clockList, {
                 animation: 200,
                 direction: "vertical",
-                draggable: ".clock-entry.editable",
+                draggable: ".clock-entry",
                 dragClass: "drag-preview",
                 ghostClass: "drag-gap",
                 onEnd: (event) => {
diff --git a/module/database.js b/module/database.js
@@ -1,3 +1,5 @@
+import { MODULE_ID } from "./settings.js";
+
 const DEFAULT_CLOCK = { 
     type: "clock",
     value: 0,
@@ -26,19 +28,30 @@ export class ClockDatabase extends Collection {
     delete(id) {
         const clocks = this.#getClockData();
         delete clocks[id];
-        game.settings.set("global-progress-clocks", "activeClocks", clocks);
+        game.settings.set(MODULE_ID, "activeClocks", clocks);
     }
 
-    update(data) {
+    async update(data) {
         if (!this.#verifyClockData(data)) return;
 
         const clocks = this.#getClockData();
         const existing = clocks[data.id];
         if (!existing) return;
 
-        foundry.utils.mergeObject(existing, data);
-        existing.value = Math.clamp(existing.value, 0, existing.max);
-        game.settings.set("global-progress-clocks", "activeClocks", clocks);
+        const newData = foundry.utils.mergeObject(foundry.utils.duplicate(existing), data);
+        const newValue = Math.clamp(newData.value, 0, newData.max);
+        if (game.user.hasPermission('SETTINGS_MODIFY')) {
+            Object.assign(existing, newData);
+            existing.value = newValue;
+            await game.settings.set(MODULE_ID, "activeClocks", clocks);
+        } else if (this.canUserEdit(game.user)) {
+            const gm = game.users.activeGM;
+            if (gm) {
+                await gm.query("global-progress-clocks", { action: "update", clock: { id: newData.id, value: newValue } });
+            } else {
+                ui.notifications.warn("GlobalProgressClocks.Warnings.NoActiveGM", { localize: true });
+            }
+        }
     }
 
     move(id, idx) {
@@ -50,11 +63,17 @@ export class ClockDatabase extends Collection {
         clocks.splice(idx, 0, item);
         
         const newData = Object.fromEntries(clocks.map((c) => [c.id, c]));
-        game.settings.set("global-progress-clocks", "activeClocks", newData);
+        game.settings.set(MODULE_ID, "activeClocks", newData);
+    }
+
+    canUserEdit(user) {
+        // return user.hasPermission('SETTINGS_MODIFY');
+        const requiredPermission = game.settings.get(MODULE_ID, "minimumEditorRole");
+        return user.role >= requiredPermission;
     }
 
     #getClockData() {
-        const entries = game.settings.get("global-progress-clocks", "activeClocks");
+        const entries = game.settings.get(MODULE_ID, "activeClocks");
         for (const key of Object.keys(entries)) {
             entries[key] = { ...DEFAULT_CLOCK, ...entries[key] };
         }
@@ -72,6 +91,16 @@ export class ClockDatabase extends Collection {
         }
     }
 
+    handleQuery = async (data) => {
+        const action = data.action;
+        if (action === "update") {
+            if (!game.user.isGM) return;
+            const clock = data.clock;
+            await this.update({ id: clock.id, value: clock.value });
+            return { ok: true };
+        }
+    }
+
     // Limit the clock max size to 128
     #verifyClockData(data) {
         const maxSize = data.type === "points" ? 99 : 128;
diff --git a/module/index.js b/module/index.js
@@ -10,6 +10,10 @@ Hooks.once("init", () => {
     window.clockDatabase.refresh();
 });
 
+Hooks.once("setup", () => {
+    CONFIG.queries["global-progress-clocks"] = window.clockDatabase.handleQuery;
+})
+
 Hooks.on("canvasReady", () => {
     window.clockPanel.render(true);
 });
diff --git a/module/settings.js b/module/settings.js
@@ -43,6 +43,22 @@ function registerSettings() {
         config: false,
         onChange: () => window.clockDatabase.refresh(),
     });
+
+    game.settings.register(MODULE_ID, "minimumEditorRole", {
+        name: "GlobalProgressClocks.Settings.minimumEditorRole.name",
+        hint: "GlobalProgressClocks.Settings.minimumEditorRole.hint",
+        scope: "world",
+        config: true,
+        default: CONST.USER_ROLES.GAMEMASTER,
+        type: Number,
+        choices: {
+            1: "USER.RolePlayer",
+            2: "USER.RoleTrusted",
+            3: "USER.RoleAssistant",
+            4: "USER.RoleGamemaster",
+        },
+        onChange: () => window.clockDatabase.refresh(),
+    })
 }
 
 class DisplaySettings extends FormApplication {
diff --git a/styles/style.css b/styles/style.css
@@ -277,17 +277,17 @@ body:has(#effects-panel .effect-item) #clock-panel {
     }
 
     /* Show controls, hide real name, when hovering */
-    &.editable {
-        &:hover {
-            .controls {
-                display: flex;
-            }
+    &:has(.controls):hover {
+        .controls {
+            display: flex;
+        }
 
-            .name > .value {
-                visibility: hidden;
-            }
+        .name > .value {
+            visibility: hidden;
         }
+    }
 
+    &.editable {
         .points,
         .clock {
             cursor: pointer;
diff --git a/templates/clock-panel.hbs b/templates/clock-panel.hbs
@@ -8,7 +8,7 @@
                 <div class="clock-entry ui-control {{#if clock.editable}}editable{{/if}} {{#if clock.private}}private{{/if}} {{#unless clock.visible}}hidden{{/unless}}" data-id="{{clock.id}}">
                     <div class="name">
                         <span class="value">{{#if clock.private}}<i class="fas fa-eye-slash"></i> {{/if}}{{clock.name}}</span>
-                        {{#if clock.editable}}
+                        {{#if @root.options.editable}}
                             <div class="controls">
                                 <a data-action="deleteEntry"><i class="fa-solid fa-fw fa-trash"></i></a>
                                 <a data-action="editEntry"><i class="fa-solid fa-fw fa-edit"></i></a>

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,17 @@`
`48`	`48`	`"bottomLeft": "Above Player List"`
`49`	`49`	`}`
`50`	`50`	`},`
	`51`	`+ "minimumEditorRole": {`
	`52`	`+ "name": "Minimum Editor Role",`
	`53`	`+ "hint": "Minimum role required to edit clock values"`
	`54`	`+ },`
`51`	`55`	`"offset": {`
`52`	`56`	`"name": "Vertical Offset",`
`53`	`57`	`"hint": "Distance from the top or bottom in pixels. Used to handle module incompatibility."`
`54`	`58`	`}`
	`59`	`+ },`
	`60`	`+ "Warnings": {`
	`61`	`+ "NoActiveGM": "An Active GM must be online to use that feature"`
`55`	`62`	`}`
`56`	`63`	`}`
`57`	`64`	`}`