...

1 files changed, 3 insertions, 40 deletions

diff --git a/ymir.nix b/ymir.nix
index 9f6eec48..fb2e7d74 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -1118,22 +1118,9 @@ in rec {
         expire = 8640000;
         new_schema = true;
         backend = "redis";
-        autolearn = true;
-
-        per_user = <<EOD
-        return function(task)
-            local rcpt = task:get_recipients(1)
-
-        if rcpt then
-            one_rcpt = rcpt[1]
-            if one_rcpt['domain'] then
-                return one_rcpt['domain']
-            end
-        end
-
-        return nil
-        end
-        EOD
+        per_user = true;
+
+        autolearn = [-5, 15];
         
         statfile {
             symbol = "BAYES_HAM";
@@ -1143,30 +1130,6 @@ in rec {
             symbol = "BAYES_SPAM";
             spam = true;
         }
-        learn_condition =<<EOD
-        return function(task, is_spam, is_unlearn)
-            local prob = task:get_mempool():get_variable('bayes_prob', 'double')
-
-            if prob then
-                local in_class = false
-                local cl
-                if is_spam then
-                    cl = 'spam'
-                    in_class = prob >= 0.95
-                else
-                    cl = 'ham'
-                    in_class = prob <= 0.05
-                end
-
-                if in_class then
-                    return false,string.format('already in class %s; probability %.2f%%',
-                    cl, math.abs((prob - 0.5) * 200.0))
-                end
-            end
-
-            return true
-        end
-        EOD
       '';
     };
   };