diff options
| author | Robin Appelman <robin@icewind.nl> | 2020-06-15 15:01:52 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2020-07-21 17:12:38 +0200 |
| commit | fb5ae20722a29890535296c8871a2edf4201289d (patch) | |
| tree | 9d05b74ad3f3abd3fbd9be81ef59d5288d741172 /lib/private/Activity/Manager.php | |
| parent | d35e8d7b2be708650037bc16f5be4122f5fa1082 (diff) | |
| download | nextcloud-server-fb5ae20722a29890535296c8871a2edf4201289d.tar.gz nextcloud-server-fb5ae20722a29890535296c8871a2edf4201289d.zip | |
basic settings system for activity notifications
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Activity/Manager.php')
| -rw-r--r-- | lib/private/Activity/Manager.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php index ffe6c335b27..6c40f752bc8 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -28,6 +28,7 @@ namespace OC\Activity; +use OCP\Activity\ActivitySettings; use OCP\Activity\IConsumer; use OCP\Activity\IEvent; use OCP\Activity\IFilter; @@ -262,7 +263,7 @@ class Manager implements IManager { } /** - * @return ISetting[] + * @return ActivitySettings[] * @throws \InvalidArgumentException */ public function getSettings(): array { @@ -270,7 +271,9 @@ class Manager implements IManager { /** @var ISetting $setting */ $setting = \OC::$server->query($class); - if (!$setting instanceof ISetting) { + if ($setting instanceof ISetting) { + $setting = new ActivitySettingsAdapter($setting); + } else if (!$setting instanceof ActivitySettings) { throw new \InvalidArgumentException('Invalid activity filter registered'); } @@ -283,11 +286,11 @@ class Manager implements IManager { /** * @param string $id - * @return ISetting + * @return ActivitySettings * @throws \InvalidArgumentException when the setting was not found * @since 11.0.0 */ - public function getSettingById(string $id): ISetting { + public function getSettingById(string $id): ActivitySettings { $settings = $this->getSettings(); if (isset($settings[$id])) { |