Spam filter performance and accuracy improvements (part 2)

crates/directory/src/core/mod.rs

@@ -18,7 +18,7 @@ impl Permission {
             Permission::Impersonate => "Act on behalf of another user",
             Permission::UnlimitedRequests => "Perform unlimited requests",
             Permission::UnlimitedUploads => "Upload unlimited data",
-            Permission::DeleteSystemFolders => "Delete of system folders",
+            Permission::DeleteSystemFolders_ => "",
             Permission::MessageQueueList => "View message queue",
             Permission::MessageQueueGet => "Retrieve specific messages from the queue",
             Permission::MessageQueueUpdate => "Modify queued messages",
@@ -82,8 +82,8 @@ impl Permission {
             Permission::SpamFilterUpdate => "Modify spam filter settings",
             Permission::WebadminUpdate => "Modify web admin interface settings",
             Permission::LogsView => "Access system logs",
-            Permission::SpamFilterTrain => "Train the spam filter",
-            Permission::SpamFilterClassify => "Classify emails with the spam filter",
+            Permission::SpamFilterTrain_ => "",
+            Permission::SpamFilterClassify_ => "",
             Permission::Restart => "Restart the email server",
             Permission::TracingList => "View stored traces",
             Permission::TracingGet => "Retrieve specific trace information",

crates/directory/src/core/principal.rs

@@ -1577,8 +1577,6 @@ impl Permission {
                 | Permission::SieveRenameScript
                 | Permission::SieveCheckScript
                 | Permission::SieveHaveSpace
-                | Permission::SpamFilterClassify
-                | Permission::SpamFilterTrain
                 | Permission::DavSyncCollection
                 | Permission::DavExpandProperty
                 | Permission::DavPrincipalAcl

crates/directory/src/lib.rs

@@ -125,7 +125,7 @@ pub enum Permission {
     Impersonate,
     UnlimitedRequests,
     UnlimitedUploads,
-    DeleteSystemFolders,
+    DeleteSystemFolders_,
     MessageQueueList,
     MessageQueueGet,
     MessageQueueUpdate,
@@ -187,7 +187,7 @@ pub enum Permission {
     SpamFilterUpdate,
     WebadminUpdate,
     LogsView,
-    SpamFilterTrain,
+    SpamFilterTrain_,
     Restart,
     TracingList,
     TracingGet,
@@ -321,7 +321,7 @@ pub enum Permission {
 
     AiModelInteract,
     Troubleshoot,
-    SpamFilterClassify,
+    SpamFilterClassify_,
 
     // WebDAV permissions
     DavSyncCollection,
@@ -423,7 +423,7 @@ pub enum Permission {
     JmapParticipantIdentityGet,
     JmapParticipantIdentitySet,
     JmapParticipantIdentityChanges,
-    // TODO: Reuse DeleteSystemFolders position for new permission
+    // TODO: Reuse _ suffixes for new permissions
     // WARNING: add new ids at the end (TODO: use static ids)
 }