Merge pull request #11187 from nextcloud/fix/classification/new-messages-global-default

fix(classification): use global default for new messages too

Author: st3iny

lib/Service/Classification/NewMessagesClassifier.php

@@ -12,7 +12,6 @@
 use Horde_Imap_Client;
 use OCA\Mail\Account;
 use OCA\Mail\Contracts\IMailManager;
-use OCA\Mail\Contracts\IUserPreferences;
 use OCA\Mail\Db\Mailbox;
 use OCA\Mail\Db\Message;
 use OCA\Mail\Db\Tag;
@@ -35,7 +34,7 @@ public function __construct(
 		private TagMapper $tagMapper,
 		private LoggerInterface $logger,
 		private IMailManager $mailManager,
-		private IUserPreferences $preferences,
+		private ClassificationSettingsService $classificationSettingsService,
 	) {
 	}
 
@@ -59,8 +58,7 @@ public function classifyNewMessages(
 		Account $account,
 		Tag $importantTag,
 	): void {
-		$allowTagging = $this->preferences->getPreference($account->getUserId(), 'tag-classified-messages');
-		if ($allowTagging === 'false') {
+		if (!$this->classificationSettingsService->isClassificationEnabled($account->getUserId())) {
 			return;
 		}