From 9875d49181770d5e14d7ef1b5ded77982505047c Mon Sep 17 00:00:00 2001
From: Oliver <oliver@noreply.localhost>
Date: Sat, 6 Dec 2025 23:30:12 -0700
Subject: [PATCH] Update the startSidebarExpanded setting to bring it inline
 with the rest of the settings

---
 module/hooks/init.mjs                    |  7 -----
 module/hooks/ready.mjs                   |  3 +-
 module/hooks/renderSidebar.mjs           | 15 ---------
 module/oft.mjs                           | 14 +++++++--
 module/settings/startSidebarExpanded.mjs | 39 ++++++++++++++----------
 5 files changed, 36 insertions(+), 42 deletions(-)
 delete mode 100644 module/hooks/init.mjs
 delete mode 100644 module/hooks/renderSidebar.mjs

diff --git a/module/hooks/init.mjs b/module/hooks/init.mjs
deleted file mode 100644
index e459bd6..0000000
--- a/module/hooks/init.mjs
+++ /dev/null
@@ -1,7 +0,0 @@
-import { __ID } from "../consts.mjs";
-import { startSidebarExpanded } from "../settings/startSidebarExpanded.mjs";
-
-Hooks.once(`init`, () => {
-	console.log(`${__ID} | Initializing`);
-	startSidebarExpanded.register();
-});
diff --git a/module/hooks/ready.mjs b/module/hooks/ready.mjs
index c5e280e..e00543c 100644
--- a/module/hooks/ready.mjs
+++ b/module/hooks/ready.mjs
@@ -1,5 +1,6 @@
 import { __ID } from "../consts.mjs";
+import { Logger } from "../utils/Logger.mjs";
 
 Hooks.once(`ready`, () => {
-	console.log(`${__ID} | Ready`);
+	Logger.log(`Ready`);
 });
diff --git a/module/hooks/renderSidebar.mjs b/module/hooks/renderSidebar.mjs
deleted file mode 100644
index 6ba60a8..0000000
--- a/module/hooks/renderSidebar.mjs
+++ /dev/null
@@ -1,15 +0,0 @@
-import { __ID, inDev } from "../consts.mjs";
-import { startSidebarExpanded } from "../settings/startSidebarExpanded.mjs";
-
-// #region Once
-Hooks.once(`renderSidebar`, (app) => {
-
-	// MARK: Sidebar Expansion
-	if (startSidebarExpanded.value()) {
-		if (inDev()) {
-			console.log(`${__ID} | setting:startSidebarExpanded | Expanding Sidebar`);
-		}
-		app.toggleExpanded(true);
-	};
-});
-// #endregion Once
diff --git a/module/oft.mjs b/module/oft.mjs
index 693a85b..2069fe1 100644
--- a/module/oft.mjs
+++ b/module/oft.mjs
@@ -1,13 +1,21 @@
 // Hooks
-import "./hooks/init.mjs";
 import "./hooks/ready.mjs";
-import "./hooks/renderSidebar.mjs";
+
+// Settings
 import { chatSidebarBackground } from "./settings/chatSidebarBackground.mjs";
 import { preventUserConfigOpen } from "./settings/preventUserConfigOpen.mjs";
 import { startingSidebarTab } from "./settings/startingSidebarTab.mjs";
+import { startSidebarExpanded } from "./settings/startSidebarExpanded.mjs";
 
 Hooks.once(`init`, () => {
+
+	// Sidebar Settings
 	chatSidebarBackground();
-	preventUserConfigOpen();
+	startSidebarExpanded();
 	startingSidebarTab();
+
+	// App Settings
+	preventUserConfigOpen();
+
+	// Dev Settings
 });
diff --git a/module/settings/startSidebarExpanded.mjs b/module/settings/startSidebarExpanded.mjs
index 43beada..9ac3fe3 100644
--- a/module/settings/startSidebarExpanded.mjs
+++ b/module/settings/startSidebarExpanded.mjs
@@ -1,22 +1,29 @@
 import { __ID } from "../consts.mjs";
+import { Logger } from "../utils/Logger.mjs";
 
 const key = `startSidebarExpanded`;
 
-const config = {
-	name: `OFT.setting.${key}.name`,
-	hint: `OFT.setting.${key}.hint`,
-	scope: `user`,
-	type: Boolean,
-	default: true,
-	config: true,
-	requiresReload: false,
-};
+export function startSidebarExpanded() {
+	Logger.log(`Registering setting: ${key}`);
 
-export const startSidebarExpanded = {
-	value() {
-		return game.settings.get(__ID, key);
-	},
-	register() {
-		game.settings.register(__ID, key, config);
-	},
+	// #region Registration
+	game.settings.register(__ID, key, {
+		name: `OFT.setting.${key}.name`,
+		hint: `OFT.setting.${key}.hint`,
+		scope: `user`,
+		type: Boolean,
+		default: true,
+		config: true,
+		requiresReload: false,
+	});
+	// #endregion Registration
+
+	// #region Implementation
+	Hooks.once(`renderSidebar`, (app) => {
+		if (game.settings.get(__ID, key) && !game.ready) {
+			Logger.debug(`setting:${key} | Expanding sidebar`);
+			app.toggleExpanded(true);
+		};
+	});
+	// #endregion Implementation
 };