fixup! feat: mail filters

Signed-off-by: Daniel Kesselberg <[email protected]>
nextcloud · Sep 13, 2024 · c8db6ba · c8db6ba
1 parent 44c2e68
commit c8db6ba
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 10 deletions.
diff --git a/lib/Service/MailFilter/FilterBuilder.php b/lib/Service/MailFilter/FilterBuilder.php
@@ -110,18 +110,15 @@ public function buildSieveScript(array $filters, string $untouchedScript): strin
 			$requireSection[] = self::SEPARATOR;
 			$requireSection[] = 'require ' . SieveUtils::stringList($extensions) . ';';
 			$requireSection[] = self::SEPARATOR;
-			$requireSection[] = '';
 		}
 
 		$stateJsonString = json_encode($this->sanitizeDefinition($filters), JSON_THROW_ON_ERROR);
 
 		$filterSection = [
-			'',
 			self::SEPARATOR,
 			self::DATA_MARKER . $stateJsonString,
 			...$commands,
 			self::SEPARATOR,
-			'',
 		];
 
 		return implode(self::SIEVE_NEWLINE, array_merge(

diff --git a/tests/Unit/Service/MailFilter/FilterBuilderTest.php b/tests/Unit/Service/MailFilter/FilterBuilderTest.php
@@ -42,6 +42,9 @@ public function testBuild(string $testName): void {
 
 		$script = $this->builder->buildSieveScript($filters, $untouchedScript);
 
+		// the .sieve files have \r\n line endings
+		$script .= "\r\n";
+
 		$this->assertStringEqualsFile(
 			$this->testFolder . $testName . '.sieve',
 			$script

diff --git a/tests/data/mail-filter/test1.sieve b/tests/data/mail-filter/test1.sieve
@@ -1,9 +1,7 @@
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 require ["imap4flags"];
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
-
 # Hello, this is a test
-
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 # DATA: [{"name":"Test 1","enable":true,"operator":"allof","tests":[{"operator":"is","values":["[email protected]","[email protected]"],"field":"from"}],"actions":[{"type":"addflag","flag":"Alice and Bob"}],"priority":10}]
 # Filter: Test 1

diff --git a/tests/data/mail-filter/test2.sieve b/tests/data/mail-filter/test2.sieve
@@ -1,9 +1,7 @@
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 require ["fileinto"];
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
-
 # Hello, this is a test
-
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 # DATA: [{"name":"Test 2","enable":true,"operator":"anyof","tests":[{"operator":"contains","values":["Project-A","Project-B"],"field":"subject"},{"operator":"is","values":["[email protected]"],"field":"from"}],"actions":[{"type":"fileinto","flag":"","mailbox":"Test Data"}],"priority":"20"}]
 # Filter: Test 2

diff --git a/tests/data/mail-filter/test3.sieve b/tests/data/mail-filter/test3.sieve
@@ -1,9 +1,7 @@
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 require ["fileinto", "imap4flags"];
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
-
 # Hello, this is a test
-
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 # DATA: [{"name":"Test 3.1","enable":true,"operator":"anyof","tests":[{"operator":"contains","values":["Project-A","Project-B"],"field":"subject"},{"operator":"is","values":["[email protected]"],"field":"from"}],"actions":[{"type":"fileinto","flag":"","mailbox":"Test Data"},{"type":"stop"}],"priority":"20"},{"name":"Test 3.2","enable":true,"operator":"allof","tests":[{"operator":"contains","values":["@example.org"],"field":"to"}],"actions":[{"type":"addflag","flag":"Test A"}],"priority":30}]
 # Filter: Test 3.1

diff --git a/tests/data/mail-filter/test4.sieve b/tests/data/mail-filter/test4.sieve
@@ -1,5 +1,4 @@
 # Hello, this is a test
-
 ### Nextcloud Mail: Filters ### DON'T EDIT ###
 # DATA: [{"actions":[{"flag":"Flag 123","type":"addflag"}],"enable":true,"name":"Test 4","operator":"allof","priority":60,"tests":[]}]
 # Filter: Test 4