5 Commits

7 changed files with 30 additions and 25 deletions

View File

@@ -20,7 +20,7 @@ Currently supported pride flags:
- Lesbian pride flag - Lesbian pride flag
more flags to follow soon!</description> more flags to follow soon!</description>
<version>0.1.0</version> <version>1.0.0</version>
<licence>gpl3</licence> <licence>gpl3</licence>
<author mail="transcaffeine@finally.coffee" homepage="https://github.com/finally-coffee-nextcloud-pride-flags">transcaffeine</author> <author mail="transcaffeine@finally.coffee" homepage="https://github.com/finally-coffee-nextcloud-pride-flags">transcaffeine</author>
<namespace>PrideFlags</namespace> <namespace>PrideFlags</namespace>

View File

@@ -1,4 +1,4 @@
<? <?php
return [ return [
'routes' => [ 'routes' => [

View File

@@ -9,6 +9,11 @@ Currently supported "targets":
Currently supported pride flags: Currently supported pride flags:
- Original 6 color rainbow pride flag - Original 6 color rainbow pride flag
- Trans pride flag - Trans pride flag
- Pansexual pride flag
- Non-binary pride flag
- Bisexual pride flag
- Asexual pride flag
- Lesbian pride flag
more flags to follow soon!", more flags to follow soon!",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",

View File

@@ -14,11 +14,10 @@
fill: var(--image-background-pride-button-gradient); fill: var(--image-background-pride-button-gradient);
} }
/* #app-navigation ul > li.active .material-design-icon__svg,
body { .button-vue--vue-primary .material-design-icon__svg,
--image-background-pride-button: var(--image-background-pride-trans); .preview-card__header .material-design-icon__svg,
--image-background-pride-folder: var(--image-background-pride-pride); .profile__primary-action-button .material-design-icon__svg,
--image-background-pride-button-gradient: var(--image-background-pride-gradient-pride); .app-navigation-entry.active .material-design-icon__svg {
--image-background-pride-folder-gradient: var(--image-background-pride-gradient-trans); fill: var(--color-primary-element-text);
} }
*/

View File

@@ -16,20 +16,21 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
class SettingsController extends Controller { class SettingsController extends Controller {
public function __construct($appName, IRequest $request, private AppSettings $appSettings) {
public function __construct($appName, IRequest $request, private AppSettings $appSettings, private $userId) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
} }
#[NoAdminRequired] #[NoAdminRequired]
#[NoCSRFRequired] #[NoCSRFRequired]
public function get(): JSONResponse { public function get(): JSONResponse {
return $this->makeJSONResponse(fn () => $this->appSettings->getAll()); return $this->makeJSONResponse(fn () => $this->appSettings->getAll($this->userId));
} }
#[NoAdminRequired] #[NoAdminRequired]
public function set(string $folderVariant, string $buttonVariant): JSONResponse { public function set(string $folderVariant, string $buttonVariant): JSONResponse {
$this->appSettings->set($folderVariant, $buttonVariant); $this->appSettings->set($this->userId, $folderVariant, $buttonVariant);
return $this->makeJSONResponse(fn () => $this->appSettings->getAll()); return $this->makeJSONResponse(fn () => $this->appSettings->getAll($this->userId));
} }
protected function makeJSONResponse(Closure $closure): JSONResponse { protected function makeJSONResponse(Closure $closure): JSONResponse {

View File

@@ -1,4 +1,4 @@
<? <?php
namespace OCA\PrideFlags\Settings; namespace OCA\PrideFlags\Settings;
@@ -12,23 +12,23 @@ class AppSettings {
public function __construct(private IConfig $config) { public function __construct(private IConfig $config) {
} }
public function getStringSetting(string $key, string $default = ''): string { public function getStringSetting($userId, string $key, string $default = ''): string {
return $this->config->getAppValue(AppConstants::APP_ID, $key) ?: $default; return $this->config->getUserValue(AppConstants::APP_ID, $userId, $key) ?: $default;
} }
public function setStringSetting(string $key, string $value): void { public function setStringSetting($userId, string $key, string $value): void {
$this->config->setAppValue(AppConstants::APP_ID, $key, $value); $this->config->setUserValue(AppConstants::APP_ID, $userId, $key, $value);
} }
public function getAll(): array { public function getAll($userId): array {
return [ return [
AppSettings::FOLDER_VARIANT => $this->getStringSetting(AppSettings::FOLDER_VARIANT, 'pride'), AppSettings::FOLDER_VARIANT => $this->getStringSetting($userId, AppSettings::FOLDER_VARIANT, 'pride'),
AppSettings::BUTTON_VARIANT => $this->getStringSetting(AppSettings::BUTTON_VARIANT, 'trans'), AppSettings::BUTTON_VARIANT => $this->getStringSetting($userId, AppSettings::BUTTON_VARIANT, 'trans'),
]; ];
} }
public function set($folder, $button): void { public function set($userId, $folder, $button): void {
$this->setStringSetting(AppSettings::FOLDER_VARIANT, $folder); $this->setStringSetting($userId, AppSettings::FOLDER_VARIANT, $folder);
$this->setStringSetting(AppSettings::BUTTON_VARIANT, $button); $this->setStringSetting($userId, AppSettings::BUTTON_VARIANT, $button);
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "pride_flags", "name": "pride_flags",
"version": "0.1.0", "version": "1.0.0",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"engines": { "engines": {
"node": "^20.0.0", "node": "^20.0.0",