ish_models 0.0.33.207 → 0.0.33.208

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55cb65ec961e228555cc0e988463cad24df9b5a950d648ce46ad44430094543e
-  data.tar.gz: e42adfd217b60685cf391b15277e0bc2d75d712065fd0feade2e530e80410170
+  metadata.gz: d2b1de33b06b694c8c498fcaf8e9f1be0043cfb671f1320714e161e4a6928b6e
+  data.tar.gz: 8ccd99db6e28a9ae30672596f9d237b2f9e8c191d3e9ca61a4e84010fde64071
 SHA512:
-  metadata.gz: 1892c58dc3b6cb61cbe52bdb2df0cf5d17114f3e921f9db16952e264b46414153630fb9b793141f8c7269808cd3b86f83cea5be33638e2369661c7b0a254b4a5
-  data.tar.gz: d25fa7fc56d4384233dabf83a6a5ffce31238024dfd6fc997c5aab710cf30f0b34e71f44da650919053f4d67afa362d78970b25eef87dff26a5c46f47456e5c4
+  metadata.gz: 5ea0f2df2d7f9de7ddf355400f511148969dea84974f6f6472e09befdb020e7e5859a5195c6c20dcfe42e67c3b4bb1ed36cd1a0fbb6ca57eb68711d4656d4786
+  data.tar.gz: 82460cced11f3de8bcc2963f681c964fbef19fa605ea14a1dd9a5954260d540486a49d7c2fab3227401ff94908953f6438863331b2213c439a3b62001c36a3d7

data/lib/office/email_conversation.rb

@@ -54,17 +54,22 @@ class Office::EmailConversation
     else
       throw "#remove_tag expects a WpTag or string (eg WpTag::EMAILTAG_INBOX) as the only parameter."
     end
-    self[:wp_term_ids].delete( tag.id )
-    self.save!
-  end
-
-  def self.in_inbox
-    ::Office::EmailConversation.where( :wp_term_ids => WpTag.email_inbox_tag.id ).order_by( latest_at: :desc )
+    self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
+    out = self.save!
+    out
   end
+  def rmtag tag; remove_tag tag; end
 
-  def self.in_no_trash
-    trash_id = WpTag.emailtag('trash').id
-    return ::Office::EmailConversation.where( :wp_term_ids.ne => trash_id ).order_by( latest_at: :desc )
+  def self.not_in_emailtag which
+    case which.class.name
+    when 'String'
+      tag_id = WpTag.emailtag(which).id
+    when 'WpTag'
+      tag_id = which.id
+    else
+      throw "unsupported in #not_in_emailtag: #{which}"
+    end
+    return ::Office::EmailConversation.where( :wp_term_ids.ne => tag_id ).order_by( latest_at: :desc )
   end
 
   def self.in_emailtag which

data/lib/office/email_message.rb

@@ -64,7 +64,7 @@ class Office::EmailMessage
     email_conversation
   end
 
-  ## @TODO: reimplement, look at footer instead.
+  ## @TODO: reimplement
   def name
     return 'associate'
     # from[0].split('@')[0].upcase
@@ -77,23 +77,12 @@ class Office::EmailMessage
   def apply_filter filter
     case filter.kind
     when ::Office::EmailFilter::KIND_SKIP_INBOX
-      self.remove_tag( ::WpTag.email_inbox_tag )
+      self.remove_tag( WpTag::INBOX )
     when ::Office::EmailFilter::KIND_AUTORESPOND
       Ish::EmailContext.create({
         email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
         lead: lead,
       })
-    # when 'autorespond-remind'
-    #   Office::EmailAction.create({
-    #     tmpl_slug: 'require-sign-nda',
-    #     next_in_days: -> { rand(1..5) },
-    #     next_at_time: ->{ rand(8..16).hours + rand(1..59).minutes },
-    #     next_action: 're-remind-sign-nda',
-    #   })
-    #   Ish::EmailContext.create({
-    #     email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
-    #     lead: lead,
-    #   })
     else
       raise "unknown filter kind: #{filter.kind}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.207
+  version: 0.0.33.208
 platform: ruby
 authors:
 - piousbox