meta: bump version to 1.1.0

js/pride-settings-global.js

@@ -1,9 +1,10 @@
-const folder_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.folder-flavour select')[0];
+(function(window) {
-const button_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.button-flavour select')[0];
+	const folder_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.folder-flavour select')[0];
-const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
+	const button_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.button-flavour select')[0];
-const container = document.querySelector('.pride_flags_server_settings settings-section')
+	const submit_button = document.querySelectorAll('.pride_flags_server_settings .settings-pride-submit');
+	const container = document.querySelector('.pride_flags_server_settings .settings-section');
 
-function load() {
+	function load() {
 		fetch(OC.generateUrl('/apps/pride_flags/settings/global'))
 			.then(res => res.json())
 			.then(({folderVariant, buttonVariant}) => {
@@ -11,9 +12,9 @@ function load() {
 				button_selector.value = buttonVariant;
 				container.classList.remove('hidden');
 			});
-}
+	}
 
-function save() {
+	function save() {
 		const payload = {
 			folderVariant: folder_selector.value,
 			buttonVariant: button_selector.value,
@@ -30,7 +31,8 @@ function save() {
 				window.location.reload();
 			}
 		})
-}
+	}
-submit_button.forEach(node => node.addEventListener('click', e => save()));
+	submit_button.forEach(node => node.addEventListener('click', e => save()));
 
-load();
+	load();
+})(window);

js/pride-settings.js

@@ -1,11 +1,10 @@
+(function(window) {
+	const folder_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.folder-flavour select')[0];
+	const button_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.button-flavour select')[0];
+	const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
+	const container = document.querySelector('.pride_flags_user_settings .settings-section');
 
-
+	function load() {
-const folder_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.folder-flavour select')[0];
-const button_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.button-flavour select')[0];
-const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
-const container = document.querySelector('.pride_flags_user_settings settings-section')
-
-function load() {
 		fetch(OC.generateUrl('/apps/pride_flags/settings'))
 			.then(res => res.json())
 			.then(({folderVariant, buttonVariant}) => {
@@ -13,9 +12,9 @@ function load() {
 				button_selector.value = buttonVariant;
 				container.classList.remove('hidden');
 			});
-}
+	}
 
-function save() {
+	function save() {
 		const payload = {
 			folderVariant: folder_selector.value,
 			buttonVariant: button_selector.value,
@@ -32,7 +31,8 @@ function save() {
 				window.location.reload();
 			}
 		})
-}
+	}
-submit_button.forEach(node => node.addEventListener('click', e => save()));
+	submit_button.forEach(node => node.addEventListener('click', e => save()));
 
-load();
+	load();
+})(window);

lib/Controller/SettingsController.php

@@ -40,6 +40,11 @@ class SettingsController extends Controller {
 		return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal());
 	}
 
+	#[NoCSRFRequired]
+	public function getGlobal(): JSONResponse {
+		return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal());
+	}
+
 	protected function makeJSONResponse(Closure $closure): JSONResponse {
 		try {
 			return new JSONResponse($closure(), HTTP::STATUS_OK);

lib/Settings/AppSettings.php

@@ -34,8 +34,8 @@ class AppSettings {
 
 	public function getGlobal(): array {
 		return [
-			AppSettings::FOLDER_VARIANT => $this->config->getAppValue(AppSettings::APP_ID, AppSettings::FOLDER_VARIANT, 'pride'),
+			AppSettings::FOLDER_VARIANT => $this->config->getAppValue(AppConstants::APP_ID, AppSettings::FOLDER_VARIANT, 'pride'),
-			AppSettings::BUTTON_VARIANT => $this->config->getAppValue(AppSettings::APP_ID, AppSettings::BUTTON_VARIANT, 'trans'),
+			AppSettings::BUTTON_VARIANT => $this->config->getAppValue(AppConstants::APP_ID, AppSettings::BUTTON_VARIANT, 'trans'),
 		];
 	}
 
@@ -48,9 +48,4 @@ class AppSettings {
 		$this->setAppStringSetting(AppSettings::FOLDER_VARIANT, $folder);
 		$this->setAppStringSetting(AppSettings::BUTTON_VARIANT, $button);
 	}
-
-	public function setGlobal($folder, $button): void {
-		$this->setStringSetting('global', AppSettings::FOLDER_VARIANT, $folder);
-		$this->setStringSetting('global', AppSettings::BUTTON_VARIANT, $button);
-	}
 }