Remove self setting checking which can not be set anymore

Signed-off-by: Joas Schilling <[email protected]>

lib/Consumer.php

@@ -72,11 +72,8 @@ public function receive(IEvent $event) {
 			$this->notificationGenerator->sendNotificationForEvent($event, $activityId);
 		}
 
-		// User is not the author or wants to see their own actions
-		$createEmail = !$selfAction || $this->userSettings->getUserSetting($event->getAffectedUser(), 'setting', 'selfemail');
-
-		// Add activity to mail queue
-		if ($emailSetting !== false && $createEmail) {
+		// Add activity to mail queue and user is not the author
+		if ($emailSetting !== false && !$selfAction) {
 			$latestSend = $event->getTimestamp() + $emailSetting;
 			$this->data->storeMail($event, $latestSend);
 		}

lib/Data.php

@@ -185,18 +185,6 @@ public function get(GroupHelper $groupHelper, UserSettings $userSettings, $user,
 		} elseif ($filter === 'by') {
 			$query->andWhere($query->expr()->neq('user', $query->createNamedParameter($user)));
 		} elseif ($filter === 'filter') {
-			if (!$userSettings->getUserSetting($user, 'setting', 'self')) {
-				$query->andWhere($query->expr()->orX(
-					$query->expr()->neq('user', $query->createNamedParameter($user)),
-					$query->expr()->notIn('type', $query->createNamedParameter([
-						'file_created',
-						'file_changed',
-						'file_deleted',
-						'file_restored',
-					], IQueryBuilder::PARAM_STR_ARRAY))
-				));
-			}
-
 			$query->andWhere($query->expr()->eq('object_type', $query->createNamedParameter($objectType)));
 			$query->andWhere($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
 		}

lib/FilesHooks.php

@@ -1190,7 +1190,7 @@ protected function addNotificationsForUser($user, $subject, $subjectParams, $fil
 		}
 
 		// Add activity to mail queue
-		if ($emailSetting !== false && (!$selfAction || $this->userSettings->getUserSetting($this->currentUser->getUID(), 'setting', 'selfemail'))) {
+		if ($emailSetting !== false && !$selfAction) {
 			$latestSend = time() + $emailSetting;
 			$this->activityData->storeMail($event, $latestSend);
 		}

lib/Settings/Admin.php

@@ -128,9 +128,6 @@ public function getForm() {
 
 			'setting_batchtime' => $settingBatchTime,
 
-			'notify_self' => $this->userSettings->getConfigSetting('setting', 'self'),
-			'notify_selfemail' => $this->userSettings->getConfigSetting('setting', 'selfemail'),
-
 			'methods' => [
 				IExtension::METHOD_MAIL => $this->l10n->t('Mail'),
 				IExtension::METHOD_NOTIFICATION => $this->l10n->t('Push'),

lib/Settings/Personal.php

@@ -154,9 +154,6 @@ public function getForm() {
 
 			'setting_batchtime' => $settingBatchTime,
 
-			'notify_self' => $this->userSettings->getUserSetting($this->user, 'setting', 'self'),
-			'notify_selfemail' => $this->userSettings->getUserSetting($this->user, 'setting', 'selfemail'),
-
 			'methods' => $methods,
 
 			'activity_digest_enabled' => $this->userSettings->getUserSetting($this->user, 'setting', 'activity_digest')

tests/ConsumerTest.php

@@ -87,12 +87,8 @@ protected function setUp(): void {
 			->willReturnMap([
 				['affectedUser', 'notification', 'type', true],
 				['affectedUser2', 'notification', 'type', true],
-				['affectedUser', 'setting', 'self', true],
-				['affectedUser2', 'setting', 'self', false],
 				['affectedUser', 'email', 'type', true],
 				['affectedUser2', 'email', 'type', true],
-				['affectedUser', 'setting', 'selfemail', true],
-				['affectedUser2', 'setting', 'selfemail', false],
 				['affectedUser', 'setting', 'batchtime', 10],
 				['affectedUser2', 'setting', 'batchtime', 10],
 			]);

tests/FilesHooksTest.php

@@ -1001,12 +1001,6 @@ public function dataAddNotificationsForUser(): array {
 	 * @param bool $sentEmail
 	 */
 	public function testAddNotificationsForUser(string $user, string $subject, array $parameter, int $fileId, string $path, string $urlPath, bool $isFile, bool $notification, bool $email, string $type, bool $selfSetting, bool $selfEmailSetting, string $app, bool $sentStream, bool $sentEmail): void {
-		$this->settings->expects($this->any())
-			->method('getUserSetting')
-			->willReturnMap([
-				[$user, 'setting', 'self', $selfSetting],
-				[$user, 'setting', 'selfemail', $selfEmailSetting],
-			]);
 
 		$this->urlGenerator->expects($this->once())
 			->method('linkToRouteAbsolute')

tests/UserSettingsTest.php

@@ -47,8 +47,6 @@ protected function setUp(): void {
 	public function getDefaultSettingData(): array {
 		return [
 			['email', 'type1', false],
-			['setting', 'self', true],
-			['setting', 'selfemail', false],
 			['setting', 'batchtime', 3600],
 			['setting', 'not-exists', false],
 		];