fixup! feat: mail filters

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

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/lib/Service/MailFilter/FilterBuilder.php b/lib/Service/MailFilter/FilterBuilder.php
@@ -147,6 +147,7 @@ private function sanitizeDefinition(array $filters): array {
 				unset($action['id']);
 				return $action;
 			}, $filter['actions']);
+			$filter['priority'] = (int)$filter['priority'];
 			return $filter;
 		}, $filters);
 	}

diff --git a/tests/data/mail-filter/builder2.sieve b/tests/data/mail-filter/builder2.sieve
@@ -3,7 +3,7 @@ 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"}]
+# 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
 if anyof (header :contains "Subject" ["Project-A", "Project-B"], address :is :all "From" ["[email protected]"]) {
 fileinto "Test Data";

diff --git a/tests/data/mail-filter/builder3.sieve b/tests/data/mail-filter/builder3.sieve
@@ -3,7 +3,7 @@ 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}]
+# 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
 if anyof (header :contains "Subject" ["Project-A", "Project-B"], address :is :all "From" ["[email protected]"]) {
 fileinto "Test Data";

diff --git a/tests/data/mail-filter/parser1.sieve b/tests/data/mail-filter/parser1.sieve
@@ -0,0 +1,11 @@
+### 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
+if address :is :all "From" ["[email protected]", "[email protected]"] {
+addflag "$alice_and_bob";
+}
+### Nextcloud Mail: Filters ### DON'T EDIT ###