-
Notifications
You must be signed in to change notification settings - Fork 63
Add admin setting page with users defaults #1266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
f6127d3
Add admin setting page with users defaults
natoponen 828014a
Add copyright
natoponen cd4dc98
Apply suggestions from code review
natoponen 3a54e27
Apply suggestions from code review
natoponen fa9831f
Add copyright, resolve eslint comments
natoponen 3655349
Add declare
natoponen 6809886
Fix identation, add appropriate not equals checks
natoponen 1918bea
Update lib/Listener/PostLoginListener.php
nickvergessen 6952092
Update lib/Listener/UserCreatedListener.php
nickvergessen 0e9b60c
Update lib/Settings/Admin.php
nickvergessen 82a940d
Update lib/Settings/AdminSection.php
nickvergessen 2d8cb05
Update src/views/AdminSettings.vue
nickvergessen 418733d
Fix PHP CS
nickvergessen 6273d0a
Fix ESLint
nickvergessen 0611bc2
Fix import path
nickvergessen cff4eaf
Recompile
nickvergessen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /*! | ||
| * The buffer module from node.js, for the browser. | ||
| * | ||
| * @author Feross Aboukhadijeh <[email protected]> <http://feross.org> | ||
| * @license MIT | ||
| */ | ||
|
|
||
| /*! | ||
| * The buffer module from node.js, for the browser. | ||
| * | ||
| * @author Feross Aboukhadijeh <https://feross.org> | ||
| * @license MIT | ||
| */ | ||
|
|
||
| /*! | ||
| * Vue.js v2.7.10 | ||
| * (c) 2014-2022 Evan You | ||
| * Released under the MIT License. | ||
| */ | ||
|
|
||
| /*! For license information please see NcCheckboxRadioSwitch.js.LICENSE.txt */ | ||
|
|
||
| /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */ | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2022 Nikita Toponen <[email protected]> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2022 Nikita Toponen <[email protected]> | ||
| * | ||
| * @author Nikita Toponen <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Notifications\Listener; | ||
|
|
||
| use OCA\Notifications\AppInfo\Application; | ||
| use OCA\Notifications\Model\Settings; | ||
| use OCA\Notifications\Model\SettingsMapper; | ||
| use OCP\AppFramework\Db\DoesNotExistException; | ||
| use OCP\User\Events\PostLoginEvent; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\IUserManager; | ||
| use OCP\IConfig; | ||
|
|
||
| class PostLoginListener implements IEventListener { | ||
| private IUserManager $userManager; | ||
| private SettingsMapper $settingsMapper; | ||
| private IConfig $config; | ||
|
|
||
| public function __construct(IUserManager $userManager, SettingsMapper $settingsMapper, IConfig $config) { | ||
| $this->userManager = $userManager; | ||
| $this->settingsMapper = $settingsMapper; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!($event instanceof PostLoginEvent)) { | ||
| // Unrelated | ||
| return; | ||
| } | ||
|
|
||
| $userId = $event->getUser()->getUID(); | ||
|
|
||
| try { | ||
| $this->settingsMapper->getSettingsByUser($userId); | ||
| } catch (DoesNotExistException $e) { | ||
| $defaultSoundNotification = $this->config->getAppValue(Application::APP_ID, 'sound_notification') === 'yes' ? 'yes' : 'no'; | ||
| $defaultSoundTalk = $this->config->getAppValue(Application::APP_ID, 'sound_talk') === 'yes' ? 'yes' : 'no'; | ||
| $defaultBatchtime = $this->config->getAppValue(Application::APP_ID, 'setting_batchtime'); | ||
|
|
||
| if ($defaultBatchtime !== Settings::EMAIL_SEND_WEEKLY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_DAILY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_3HOURLY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_HOURLY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_OFF) { | ||
| $defaultBatchtime = Settings::EMAIL_SEND_3HOURLY; | ||
| } | ||
|
|
||
| $this->config->setUserValue($userId, Application::APP_ID, 'sound_notification', $defaultSoundNotification); | ||
| $this->config->setUserValue($userId, Application::APP_ID, 'sound_talk', $defaultSoundTalk); | ||
| $this->settingsMapper->setBatchSettingForUser($userId, $defaultBatchtime); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?php | ||
natoponen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2022 Nikita Toponen <[email protected]> | ||
| * | ||
| * @author Nikita Toponen <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Notifications\Listener; | ||
|
|
||
| use OCA\Notifications\AppInfo\Application; | ||
| use OCA\Notifications\Model\Settings; | ||
| use OCA\Notifications\Model\SettingsMapper; | ||
| use OCP\IUserManager; | ||
| use OCP\User\Events\UserCreatedEvent; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\IConfig; | ||
|
|
||
| class UserCreatedListener implements IEventListener { | ||
| private IUserManager $userManager; | ||
| private SettingsMapper $settingsMapper; | ||
| private IConfig $config; | ||
|
|
||
|
|
||
| public function __construct(IUserManager $userManager, SettingsMapper $settingsMapper, IConfig $config) { | ||
| $this->userManager = $userManager; | ||
| $this->settingsMapper = $settingsMapper; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!($event instanceof UserCreatedEvent)) { | ||
| // Unrelated | ||
| return; | ||
| } | ||
|
|
||
| $userId = $event->getUser()->getUID(); | ||
|
|
||
| $defaultSoundNotification = $this->config->getAppValue(Application::APP_ID, 'sound_notification') === 'yes' ? 'yes' : 'no'; | ||
| $defaultSoundTalk = $this->config->getAppValue(Application::APP_ID, 'sound_talk') === 'yes' ? 'yes' : 'no'; | ||
| $defaultBatchtime = $this->config->getAppValue(Application::APP_ID, 'setting_batchtime'); | ||
|
|
||
| if ($defaultBatchtime !== Settings::EMAIL_SEND_WEEKLY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_DAILY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_3HOURLY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_HOURLY | ||
| && $defaultBatchtime !== Settings::EMAIL_SEND_OFF) { | ||
| $defaultBatchtime = Settings::EMAIL_SEND_3HOURLY; | ||
| } | ||
|
|
||
| $this->config->setUserValue($userId, Application::APP_ID, 'sound_notification', $defaultSoundNotification); | ||
| $this->config->setUserValue($userId, Application::APP_ID, 'sound_talk', $defaultSoundTalk); | ||
| $this->settingsMapper->setBatchSettingForUser($userId, $defaultBatchtime); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
natoponen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2022 Nikita Toponen <[email protected]> | ||
| * | ||
| * @author Nikita Toponen <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Notifications\Settings; | ||
|
|
||
| use OCA\Notifications\AppInfo\Application; | ||
| use OCA\Notifications\Model\Settings; | ||
| use OCA\Notifications\Model\SettingsMapper; | ||
| use OCP\AppFramework\Http\TemplateResponse; | ||
| use OCP\AppFramework\Services\IInitialState; | ||
| use OCP\IConfig; | ||
| use OCP\IL10N; | ||
| use OCP\Settings\ISettings; | ||
| use OCP\IUserSession; | ||
| use OCP\Util; | ||
|
|
||
| class Admin implements ISettings { | ||
| protected IConfig $config; | ||
| protected IL10N $l10n; | ||
| private SettingsMapper$settingsMapper; | ||
| private IUserSession $session; | ||
| private IInitialState $initialState; | ||
|
|
||
| public function __construct(IConfig $config, | ||
| IL10N $l10n, | ||
| IUserSession $session, | ||
| SettingsMapper $settingsMapper, | ||
| IInitialState $initialState) { | ||
| $this->config = $config; | ||
| $this->l10n = $l10n; | ||
| $this->settingsMapper = $settingsMapper; | ||
| $this->session = $session; | ||
| $this->initialState = $initialState; | ||
| } | ||
|
|
||
| public function getForm(): TemplateResponse { | ||
| Util::addScript('notifications', 'notifications-admin-settings'); | ||
|
|
||
| $defaultSoundNotification = $this->config->getAppValue(Application::APP_ID, 'sound_notification') === 'yes' ? 'yes' : 'no'; | ||
| $defaultSoundTalk = $this->config->getAppValue(Application::APP_ID, 'sound_talk') === 'yes' ? 'yes' : 'no'; | ||
| $defaultBatchtime = $this->config->getAppValue(Application::APP_ID, 'setting_batchtime'); | ||
|
|
||
| if ($defaultBatchtime != Settings::EMAIL_SEND_WEEKLY | ||
| && $defaultBatchtime != Settings::EMAIL_SEND_DAILY | ||
| && $defaultBatchtime != Settings::EMAIL_SEND_3HOURLY | ||
| && $defaultBatchtime != Settings::EMAIL_SEND_HOURLY | ||
| && $defaultBatchtime != Settings::EMAIL_SEND_OFF) { | ||
| $defaultBatchtime = Settings::EMAIL_SEND_3HOURLY; | ||
| } | ||
|
|
||
| $this->initialState->provideInitialState('config', [ | ||
| 'setting' => 'admin', | ||
| 'setting_batchtime' => $defaultBatchtime, | ||
| 'sound_notification' => $defaultSoundNotification === 'yes', | ||
| 'sound_talk' => $defaultSoundTalk === 'yes', | ||
| ]); | ||
|
|
||
| return new TemplateResponse('notifications', 'settings/admin'); | ||
| } | ||
|
|
||
| /** | ||
| * @return string the section ID, e.g. 'sharing' | ||
| */ | ||
| public function getSection(): string { | ||
| return 'notifications'; | ||
| } | ||
|
|
||
| /** | ||
| * @return int whether the form should be rather on the top or bottom of | ||
| * the admin section. The forms are arranged in ascending order of the | ||
| * priority values. It is required to return a value between 0 and 100. | ||
| * | ||
| * E.g.: 70 | ||
| */ | ||
| public function getPriority(): int { | ||
| return 20; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.