wco_models 3.1.0.149 → 3.1.0.150

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ee4313ebc6b594dd44a3b5393ccf9495fb2e475c42c5677e1bf285361b81f89
-  data.tar.gz: f6cf48e41de6a37250064ffff72f78db0e9d142651d54aefafbcff18dcd0bc53
+  metadata.gz: e4caf3551289f4e93e12b347077fe099d408423f006c898c6f0a52de21ba83b9
+  data.tar.gz: 6c791312ee20c155590aab0f4979df3f00494cc5b67e3569bdfae0d041547ff1
 SHA512:
-  metadata.gz: c962c417116006e454cf1a3001027592af407c37f8368189db155678f2bdc3ef588eeb7fe4af9c140a760299d22a2080132b0db441a08446e6839a43aa749ceb
-  data.tar.gz: 5ae5fff70b299b0b8cee57b8c16997580a8a98989dba824a2129629ec18a10b59e3bd67c265bc6ad5174edccdc1811bde790068f3f2b015d8f44fb67b67fd6b7
+  metadata.gz: 88fefaaff4c84e73dce70b323bd1700d44c0bf247f0fc302e81b26029a366dfa57a79cd349d0bcce2f46dc7f85457ad900939e61dd0859f48bc09aad8e3f97ce
+  data.tar.gz: 3cbd9b1eff2acc6511c74f383b6f35c8c4f30725ebe0fc79e0db3263ed532e92430975a63f71715a32a8ece1fbd81203684d85b8e7bde877a5277816a660d65f

data/app/models/wco_email/email_filter.rb

@@ -17,6 +17,9 @@ class WcoEmail::EmailFilter
   field :body_regex
   field :body_exact
 
+  field :skip_from_regex
+  field :skip_to_exact
+
   belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
 
   KIND_AUTORESPOND_TMPL = 'autorespond-template'

data/app/models/wco_email/message_stub.rb

@@ -194,7 +194,22 @@ class WcoEmail::MessageStub
 
       if reason
         puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
-        @message.apply_filter( filter )
+
+        ## skip
+        skip_reason = nil
+        if filter.skip_to_exact.present? && @message.to&.downcase.include?( filter.skip_to_exact.downcase )
+          skip_reason = 'skip_to_exact'
+        end
+        if filter.skip_from_regex.present? && @message.from.downcase.match( filter.skip_from_regex )
+          skip_reason = 'skip_from_regex'
+        end
+
+        if skip_reason
+          puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
+        else
+          @message.apply_filter( filter )
+        end
+
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.149
+  version: 3.1.0.150
 platform: ruby
 authors:
 - Victor Pudeyev