From b3959e8071f986d5cf1ef69d72f7f8451917b143 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 9 Jul 2021 09:19:06 +0200
Subject: [PATCH] [Rspamd] DeltaChat improvements

---
 data/conf/rspamd/local.d/composites.conf | 2 +-
 data/conf/rspamd/local.d/groups.conf     | 3 +++
 data/conf/rspamd/lua/rspamd.local.lua    | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf
index 3e5886c8..337a2eb1 100644
--- a/data/conf/rspamd/local.d/composites.conf
+++ b/data/conf/rspamd/local.d/composites.conf
@@ -66,5 +66,5 @@ WL_FWD_HOST {
   expression = "-WHITELISTED_FWD_HOST & (^g+:rbl | ^g+:policies | ^g+:hfilter | ^g:neural)";
 }
 ENCRYPTED_CHAT {
-  expression = "CHAT_VERSION_HEADER & ENCRYPTED_PGP & ^DYN_RL_CHECK & ^BCC";
+  expression = "CHAT_VERSION_HEADER & ENCRYPTED_PGP";
 }
diff --git a/data/conf/rspamd/local.d/groups.conf b/data/conf/rspamd/local.d/groups.conf
index b5be5166..9ca3409d 100644
--- a/data/conf/rspamd/local.d/groups.conf
+++ b/data/conf/rspamd/local.d/groups.conf
@@ -15,6 +15,9 @@ symbols {
   "BULK_HEADER" {
     score = 4.0;
   }
+  "ENCRYPTED_CHAT" {
+    score = -20.0;
+  }
 }
 
 group "MX" {
diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua
index fb45c6eb..b007f097 100644
--- a/data/conf/rspamd/lua/rspamd.local.lua
+++ b/data/conf/rspamd/lua/rspamd.local.lua
@@ -331,6 +331,10 @@ rspamd_config:register_symbol({
     local from_table = {}
     local rcpt_table = {}
 
+    if task:has_symbol('ENCRYPTED_CHAT') then
+      return -- stop
+    end
+
     local send_mail = function(task, bcc_dest)
       local lua_smtp = require "lua_smtp"
       local function sendmail_cb(ret, err)