Make the group selectable

2 files changed, 14 insertions, 2 deletions

diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php
index 5dbcc685809..c622b9690a7 100644
--- a/apps/updatenotification/lib/Controller/AdminController.php
+++ b/apps/updatenotification/lib/Controller/AdminController.php
@@ -100,12 +100,17 @@ class AdminController extends Controller {
 			unset($channels[$key]);
 		}
 		$updateState = $this->updateChecker->getUpdateState();
+
+		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'));
+
 		$params = [
 			'isNewVersionAvailable' => ($updateState === []) ? false : true,
 			'lastChecked' => $lastUpdateCheck,
 			'currentChannel' => $currentChannel,
 			'channels' => $channels,
 			'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'],
+
+			'notify_groups' => implode('|', $notifyGroups),
 		];
 
 		return new TemplateResponse($this->appName, 'admin', $params, '');
diff --git a/apps/updatenotification/lib/Notification/BackgroundJob.php b/apps/updatenotification/lib/Notification/BackgroundJob.php
index 7661f073e7b..f2cf7e1cd85 100644
--- a/apps/updatenotification/lib/Notification/BackgroundJob.php
+++ b/apps/updatenotification/lib/Notification/BackgroundJob.php
@@ -28,6 +28,7 @@ use OC\Updater\VersionCheck;
 use OCP\App\IAppManager;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
+use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\Notification\IManager;
@@ -149,8 +150,14 @@ class BackgroundJob extends TimedJob {
 			return $this->users;
 		}
 
-		$groupToNotify = $this->groupManager->get('admin');
-		$this->users = $groupToNotify->getUsers();
+		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'));
+		foreach ($notifyGroups as $group) {
+			$groupToNotify = $this->groupManager->get($group);
+			if ($groupToNotify instanceof IGroup) {
+				$this->users = array_merge($this->users, $groupToNotify->getUsers());
+			}
+		}
+
 		return $this->users;
 	}