Fix nextcloud#31303: Make reminder notification behaviour selectable..

Signed-off-by: Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de>
dzatoah · Feb 24, 2022 · 8e5d394 · 8e5d394
1 parent c605ef1
commit 8e5d394
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 5 deletions.
diff --git a/apps/dav/lib/BackgroundJob/EventReminderJob.php b/apps/dav/lib/BackgroundJob/EventReminderJob.php
@@ -63,6 +63,6 @@ public function run($arg):void {
 			return;
 		}
 
-		$this->reminderService->processReminders();
+		$this->reminderService->processReminders($this->config);
 	}
 }
diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -33,6 +33,7 @@
 use DateTimeImmutable;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IConfig;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -110,8 +111,10 @@ public function __construct(Backend $backend,
 	 *
 	 * @throws NotificationProvider\ProviderNotAvailableException
 	 * @throws NotificationTypeDoesNotExistException
+	 *
+	 * @param IConfig $config
 	 */
-	public function processReminders():void {
+	public function processReminders(IConfig $config):void {
 		$reminders = $this->backend->getRemindersToProcess();
 
 		foreach ($reminders as $reminder) {
@@ -141,7 +144,12 @@ public function processReminders():void {
 				continue;
 			}
 
-			$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
+			if ($config->getAppValue('dav', 'dontSendEventRemindersToSharedGroupMembers', 'no') === 'no') {
+				$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
+			} else {
+				$users = array();
+			}
+
 			$user = $this->getUserFromPrincipalURI($reminder['principaluri']);
 			if ($user) {
 				$users[] = $user;

diff --git a/apps/dav/lib/Command/SendEventReminders.php b/apps/dav/lib/Command/SendEventReminders.php
@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
-		$this->reminderService->processReminders();
+		$this->reminderService->processReminders($this->config);
 		return 0;
 	}
 }
diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php
@@ -44,6 +44,7 @@ class CalDAVSettings implements IDelegatedSettings {
 		'generateBirthdayCalendar' => 'yes',
 		'sendEventReminders' => 'yes',
 		'sendEventRemindersPush' => 'no',
+		'dontSendEventRemindersToSharedGroupMembers' => 'no',
 	];
 
 	/**

diff --git a/apps/dav/src/settings.js b/apps/dav/src/settings.js
@@ -16,6 +16,10 @@ const CalDavSettingsView = new View({
 				'generateBirthdayCalendar'
 			),
 			sendEventReminders: loadState('dav', 'sendEventReminders'),
+			dontSendEventRemindersToSharedGroupMembers: loadState(
+				'dav',
+				'dontSendEventRemindersToSharedGroupMembers'
+			),
 			sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
 		}
 	},

diff --git a/apps/dav/src/views/CalDavSettings.vue b/apps/dav/src/views/CalDavSettings.vue
@@ -57,6 +57,28 @@
 				{{ $t('dav', 'Notifications are sent via background jobs, so these must occur often enough.') }}
 			</em>
 		</p>
+		<p>
+			<input id="caldavDontSendEventRemindersToSharedGroupMembers"
+				v-model="dontSendEventRemindersToSharedGroupMembers"
+				type="checkbox"
+				class="checkbox"
+				:disabled="!sendEventReminders">
+			<label for="caldavDontSendEventRemindersToSharedGroupMembers">
+				{{ $t('dav', 'Send reminder notifications not to shared group members.') }}
+			</label>
+			<br>
+			<!-- Can use v-html as:
+				- $t passes the translated string through DOMPurify.sanitize,
+				- replacement strings are not user-controlled. -->
+			<!-- eslint-disable-next-line vue/no-v-html -->
+			<em v-html="sendEventRemindersHelpText" />
+			<br>
+			<em>
+				{{ $t('dav', 'Send notifications only to the event organizer and \
+							  attendees of an event and not to all members \
+							  of a shared group.') }}
+			</em>
+		</p>
 		<p>
 			<input id="caldavSendEventRemindersPush"
 				v-model="sendEventRemindersPush"
@@ -115,6 +137,13 @@ export default {
 		sendEventReminders(value) {
 			OCP.AppConfig.setValue('dav', 'sendEventReminders', value ? 'yes' : 'no')
 		},
+		dontSendEventRemindersToSharedGroupMembers(value) {
+			OCP.AppConfig.setValue(
+				'dav',
+				'dontSendEventRemindersToSharedGroupMembers',
+				value ? 'yes' : 'no'
+			)
+		},
 		sendEventRemindersPush(value) {
 			OCP.AppConfig.setValue('dav', 'sendEventRemindersPush', value ? 'yes' : 'no')
 		},

diff --git a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
@@ -195,6 +195,8 @@ protected function setUp(): void {
 		$this->caldavBackend = $this->createMock(CalDavBackend::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 
+		$this->config = $this->createMock(IConfig::class);
+
 		$this->caldavBackend->method('getShares')->willReturn([]);
 
 		$this->reminderService = new ReminderService($this->backend,
@@ -578,6 +580,6 @@ public function testProcessReminders():void {
 		$this->timeFactory->method('getDateTime')
 			->willReturn(\DateTime::createFromFormat(\DateTime::ATOM, '2016-06-08T00:00:00+00:00'));
 
-		$this->reminderService->processReminders();
+		$this->reminderService->processReminders($this->config);
 	}
 }