wco_models 3.1.0.281 → 3.1.0.282

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e871389c03f7b7e33798660fe7912956c6fe8566e05dbb81c0bc20141f01e13
-  data.tar.gz: 4c8b4bff79cd331dd2e6787f99d3e3a3903a1fc68a674cf43a23b64e7fa4174c
+  metadata.gz: 4a6fddb4672781a9e3d71d44d8f0deab38445fef5d3eff40f1ca7308625353b8
+  data.tar.gz: a3da8cead3d38d759139ae681429aa3fc8a47141a6ed8923f1cd102005544bab
 SHA512:
-  metadata.gz: 5b3bff49a429b81ec768e795fba286d1e90a9969373969f7dc37e2452bd180e4daa027c3780a5f8e768ae0837de0df7cd3dd4f9a9005e5d46cbee2e319379749
-  data.tar.gz: 4faca2a40bec78da0ea2ad6511f0ea3842745ff32aa95de6edde922773a35a0fbe5210b6a90de1ca0c9847341c9ad41a7d77fa6af03e2d61ab50d731247c712f
+  metadata.gz: bdbfbfb015a96ca4fbf340a916742a88a671c902b48166eb184ac367a8d3f8712a5ce796ee5291cc6151e1e0ed69ea47560a22ae3c856db3cfab630a6329c65e
+  data.tar.gz: 7c81c2ba1884b5467ec74e401a72d97ed5a5fc7f932a0f8e86b6c90a643e7ba5d506b9f5d881f8683405dbac5a9811eb594280cd28d3cbde6c5e256e9a06ea7e

data/app/models/wco/lead.rb

@@ -69,6 +69,9 @@ class Wco::Lead
 
   has_and_belongs_to_many :conversations,           class_name: '::WcoEmail::Conversation', index: true
   def convs; conversations; end
+
+  has_many :office_actions,          class_name: '::Wco::OfficeAction'
+
   has_many                :email_contexts,          class_name: '::WcoEmail::Context'
   def ctxs; email_contexts; end
   has_many                :email_actions,           class_name: '::WcoEmail::EmailAction'

data/app/models/wco/office_action.rb

@@ -11,13 +11,15 @@ class Wco::OfficeAction
   # field :descr, type: :string ## optional
 
   belongs_to :office_action_template, inverse_of: :office_action
+  belongs_to :lead, class_name: '::Wco::Lead'
+
   def tmpl
     office_action_template
   end
 
   STATUS_ACTIVE   = 'active'
   STATUS_INACTIVE = 'inactive'
-  STATUSS         = [ STATUS_ACTIVE, STATUS_INACTIVE ]
+  STATUSES        = [ STATUS_ACTIVE, STATUS_INACTIVE ]
   field :status, type: :string
   scope :active, ->{ where( status: STATUS_ACTIVE ) }
   attr_accessor :deactivate

data/app/models/wco_email/email_filter.rb

@@ -63,9 +63,10 @@ AOL
   end
 
 
+end
+::EF = WcoEmail::EmailFilter
 
-
-
+=begin
 
   ##
   ## deprecated
@@ -84,17 +85,15 @@ AOL
   field :skip_to_exact
 
   ## @deprecated 2026-04-02, use email_filter_action::<KIND>
-  KIND_AUTORESPOND_TMPL = 'autorespond-template'
-  KIND_AUTORESPOND_EACT = 'autorespond-email-action'
-  KIND_REMOVE_TAG       = 'remove-tag'
-  KIND_ADD_TAG          = 'add-tag'
-  KIND_DESTROY_SCHS     = 'destroy-schs'
-  KIND_OAT              = 'office-action'
-
-  ## @deprecated
-  KIND_AUTORESPOND = 'autorespond' ## @deprecated, DO NOT USE!
-  KIND_DELETE      = 'delete'      ## @deprecated, use add-tag
-  KIND_SKIP_INBOX  = 'skip-inbox'  ## @deprecated, use remove-tag
+  # KIND_AUTORESPOND_TMPL = 'autorespond-template'
+  # KIND_AUTORESPOND_EACT = 'autorespond-email-action'
+  # KIND_REMOVE_TAG       = 'remove-tag'
+  # KIND_ADD_TAG          = 'add-tag'
+  # KIND_DESTROY_SCHS     = 'destroy-schs'
+  # KIND_OAT              = 'office-action'
+  # KIND_AUTORESPOND = 'autorespond' ## @deprecated, DO NOT USE!
+  # KIND_DELETE      = 'delete'      ## @deprecated, use add-tag
+  # KIND_SKIP_INBOX  = 'skip-inbox'  ## @deprecated, use remove-tag
 
   KINDS = [ nil, KIND_OAT, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS ]
   field :kind ## @deprecated, use filter.action.aject.kind 2026-04-02
@@ -117,5 +116,7 @@ AOL
   #   return "<EF #{attrs}>#{children}</EF>\n"
   # end
 
-end
-::EF = WcoEmail::EmailFilter
+=end
+
+
+

data/app/models/wco_email/email_filter_action.rb

@@ -6,15 +6,16 @@ class WcoEmail::EmailFilterAction
 
   belongs_to :email_filter
 
-  KIND_AUTORESPOND = 'autorespond-template'
-  # KIND_EXE_RB      = 'exe-rb'
   KIND_ADD_TAG     = 'add-tag'
   KIND_RM_TAG      = 'remove-tag'
-  KIND_EAT         = 'autorespond-email-action'
-  KIND_RM_EAT      = 'rm-email-action'
+  KIND_AUTORESPOND = 'autorespond-template'
+  # KIND_EAT         = 'autorespond-email-action' ## _TODO: not implemented!
+  # KIND_RM_EAT      = 'rm-email-action'          ## _TODO: not implemented!
   KIND_OAT         = 'office-action-template'
   KIND_RM_OAT      = 'rm-office-action-template'
-  KINDS = [ KIND_ADD_TAG, KIND_RM_TAG, KIND_AUTORESPOND, KIND_OAT, KIND_EAT, KIND_RM_EAT ]
+  KINDS = [ KIND_ADD_TAG, KIND_RM_TAG, KIND_AUTORESPOND, KIND_OAT,
+    # KIND_EAT, KIND_RM_EAT,
+  ];
   field :kind
   validates :kind, inclusion: KINDS
 

data/app/models/wco_email/message.rb

@@ -85,22 +85,16 @@ class WcoEmail::Message
 
   def apply_filter_action action
     message = self
-
+    aject = action.aject
     case action.kind
-    when WcoEmail::EmailFilterAction::KIND_OAT
+    when WcoEmail::EmailFilterAction::KIND_ADD_TAG
+      conv.tags.push aject
+      if aject == Wco::Tag.trash || aject == Wco::Tag.spam
+        conv.tags -= [ Wco::Tag.inbox ]
+      end
 
-      config = {
-        'email_message_id' => message.id.to_s,
-        'lead_id'          => message.lead_id.to_s,
-        # 'message_id'       => message.id.to_s,
-        'stub_id'          => message.stub_id.to_s,
-      }
-      oa = Wco::OfficeAction.create!({
-        office_action_template: action.aject,
-        status:                 'active',
-        perform_at:             Time.now,
-        config:                 config,
-      })
+    when WcoEmail::EmailFilterAction::KIND_RM_TAG
+      conv.tags -= [ aject ]
 
     when WcoEmail::EmailFilterAction::KIND_AUTORESPOND
       ctx = WcoEmail::Context.new({
@@ -113,81 +107,30 @@ class WcoEmail::Message
       end
       ctx.save!
 
-    end
-  end
-
-  def apply_filter filter
-    puts! filter, 'WcoEmail::Message#apply_filter' if DEBUG
-    conv.filters << filter
-
-    case filter.kind
-
-    when WcoEmail::EmailFilter::KIND_DESTROY_SCHS
-      conv.tags.push   Wco::Tag.trash
-      conv.tags -= [ Wco::Tag.inbox ]
-      lead.schs.each do |sch|
-        sch.update_attributes!({ state: ::Sch::STATE_TRASH })
-      end
-
-    when WcoEmail::EmailFilter::KIND_ADD_TAG
-      conv.tags.push filter.tag
-      if filter.tag == Wco::Tag.trash || filter.tag == Wco::Tag.spam
-        conv.tags -= [ Wco::Tag.inbox ]
-      end
-
-    when WcoEmail::EmailFilter::KIND_REMOVE_TAG
-      conv.tags -= [ filter.tag ]
-
-    when WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL
-      ctx = WcoEmail::Context.new({
-        email_template: filter.email_template,
-        lead_id:        lead.id,
-        send_at:        Time.now,
+    when WcoEmail::EmailFilterAction::KIND_OAT
+      config = {
+        'email_message_id' => message.id.to_s,
+        # 'lead_id'          => message.lead_id.to_s,
+        # 'stub_id'          => message.stub_id.to_s,
+      }
+      oa = Wco::OfficeAction.create!({
+        office_action_template: aject,
+        lead:                   message.lead,
+        status:                 'active',
+        perform_at:             Time.now,
+        config:                 config,
       })
-      if filter.email_template.respond_inline
-        ctx.reply_to_message_id = self.id
-      end
-      ctx.save!
 
-    when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
-      ##
-      ## This error is normal:
-      ## Mongoid::Errors::Validations `Email action template is already taken`
-      ##
-      out = Sch.create({
-        email_action_template: filter.email_action_template,
-        status:                Sch::STATUS_ACTIVE,
-        lead_id:               lead.id,
-        perform_at:            Time.now,
-      })
+    when WcoEmail::EmailFilterAction::KIND_RM_OAT
+      oa = Wco::OfficeAction.where({
+        office_action_template: aject,
+        lead: message.lead }).first
+      oa.update_attributes!({ status: 'inactive' })
 
-    else
-      if filter.actions.present?
-        filter.actions.each do |act|
-          case act.kind
-          when ::WcoEmail::ACTION_REMOVE_TAG
-            this_tag = Wco::Tag.find( act.value )
-            conv.tags -= [ this_tag ]
-          when ::WcoEmail::ACTION_ADD_TAG
-            this_tag = Wco::Tag.find( act.value )
-            conv.tags += [ this_tag ]
-          when ::WcoEmail::ACTION_AUTORESPOND
-            this_template = WcoEmail::EmailTemplate.find( act.value )
-            WcoEmail::Context.create!({
-              email_template: this_template,
-              lead_id:        lead.id,
-              send_at:        Time.now,
-            })
-          end
-        end
-      else
-        raise "unknown filter kind: #{filter.kind}"
-      end
     end
-
-    conv.save!
   end
 
+
   ## From: https://stackoverflow.com/questions/24672834/how-do-i-remove-emoji-from-string/24673322
   def self.strip_emoji(text)
     text = '' if text.blank?
@@ -323,6 +266,82 @@ class WcoEmail::Message
 end
 ::Msg = WcoEmail::Message
 
+=begin
+
+
+  ## @deprecated, use apply_filter_action ONLY
+  def apply_filter filter
+    puts! filter, 'WcoEmail::Message#apply_filter' if DEBUG
+    conv.filters << filter
+
+    case filter.kind
+
+    when WcoEmail::EmailFilter::KIND_DESTROY_SCHS
+      conv.tags.push   Wco::Tag.trash
+      conv.tags -= [ Wco::Tag.inbox ]
+      lead.schs.each do |sch|
+        sch.update_attributes!({ state: ::Sch::STATE_TRASH })
+      end
+
+    when WcoEmail::EmailFilter::KIND_ADD_TAG
+      conv.tags.push filter.tag
+      if filter.tag == Wco::Tag.trash || filter.tag == Wco::Tag.spam
+        conv.tags -= [ Wco::Tag.inbox ]
+      end
+
+    when WcoEmail::EmailFilter::KIND_REMOVE_TAG
+      conv.tags -= [ filter.tag ]
+
+    when WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL
+      ctx = WcoEmail::Context.new({
+        email_template: filter.email_template,
+        lead_id:        lead.id,
+        send_at:        Time.now,
+      })
+      if filter.email_template.respond_inline
+        ctx.reply_to_message_id = self.id
+      end
+      ctx.save!
+
+    when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
+      ##
+      ## This error is normal:
+      ## Mongoid::Errors::Validations `Email action template is already taken`
+      ##
+      out = Sch.create({
+        email_action_template: filter.email_action_template,
+        status:                Sch::STATUS_ACTIVE,
+        lead_id:               lead.id,
+        perform_at:            Time.now,
+      })
+
+    else
+      if filter.actions.present?
+        filter.actions.each do |act|
+          case act.kind
+          when ::WcoEmail::ACTION_REMOVE_TAG
+            this_tag = Wco::Tag.find( act.value )
+            conv.tags -= [ this_tag ]
+          when ::WcoEmail::ACTION_ADD_TAG
+            this_tag = Wco::Tag.find( act.value )
+            conv.tags += [ this_tag ]
+          when ::WcoEmail::ACTION_AUTORESPOND
+            this_template = WcoEmail::EmailTemplate.find( act.value )
+            WcoEmail::Context.create!({
+              email_template: this_template,
+              lead_id:        lead.id,
+              send_at:        Time.now,
+            })
+          end
+        end
+      else
+        raise "unknown filter kind: #{filter.kind}"
+      end
+    end
+
+    conv.save!
+  end
 
+=end
 
 

data/app/models/wco_email/message_stub.rb

@@ -9,6 +9,7 @@ key = '01070861907736276273039d9ee-c69a3509-5c85-481d-822e-ba65c204e1ba-000000@e
 ## Only object_key, no validations.
 ## 2023-12-28 _vp_ Continue.
 ## 2024-01-05 LFG
+## 2026-07-10 LFG
 ##
 class WcoEmail::MessageStub
   include Mongoid::Document
@@ -131,21 +132,6 @@ class WcoEmail::MessageStub
     email_filters = WcoEmail::EmailFilter.all.active
     email_filters.each do |filter|
       reason = nil
-      if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
-        reason = 'from_regex'
-      end
-      if filter.from_exact.present? && @message.from.downcase.include?( filter.from_exact.downcase )
-        reason = 'from_exact'
-      end
-      if filter.body_exact.present? && @message.part_html&.include?( filter.body_exact )
-        reason = 'body_exact'
-      end
-      if filter.subject_regex.present? && @message.subject.match( filter.subject_regex )
-        reason = 'subject_regex'
-      end
-      if filter.subject_exact.present? && @message.subject.downcase.include?( filter.subject_exact.downcase )
-        reason = 'subject_exact'
-      end
 
       filter.conditions.each do |cond|
         reason ||= cond.apply(leadset: @leadset, message: @message )
@@ -156,19 +142,13 @@ class WcoEmail::MessageStub
 
         ## 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
 
         filter.skip_conditions.each do |scond|
           skip_reason ||= scond.apply(leadset: @leadset, message: @message )
         end
 
         if skip_reason
-          puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
+          puts! "NOT Applying2 filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
         else
           @conv.filters << filter; @conv.save
           filter.actions.each do |action|
@@ -185,6 +165,12 @@ class WcoEmail::MessageStub
   end
 
 
+
+end
+
+=begin
+
+  ## @obsolete - I moved away from amazon.
   def do_process
     @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
 
@@ -461,4 +447,4 @@ class WcoEmail::MessageStub
     message = ''
   end
 
-end
+=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.281
+  version: 3.1.0.282
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -526,7 +526,6 @@ files:
 - app/models/wco_email/email_template.rb
 - app/models/wco_email/message.rb
 - app/models/wco_email/message_stub.rb
-- app/models/wco_email/obfuscated_redirect.rb-trash
 - app/models/wco_email/unsubscribe.rb
 - app/models/wco_hosting/appliance.rb
 - app/models/wco_hosting/appliance_tmpl.rb

data/app/models/wco_email/obfuscated_redirect.rb-trash

@@ -1,13 +0,0 @@
-
-class WcoEmail::ObfuscatedRedirect
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  store_in collection: 'office_obfuscated_redirects'
-
-  field :to,     type: :string
-  validates :to, presence: true
-
-  field :visited_at, type: DateTime
-  field :visits, type: :array, default: []
-
-end