ish_models 0.0.33.209 → 0.0.33.211

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d881ee26c3ebc1d7ebd70d700f2f2bb48698e1cf0dc3bccaa892f5c66a05d3
-  data.tar.gz: afb800653429e3c29209199d4da42b566b4a1acf5059e2c03c5d8ae174d06ef2
+  metadata.gz: 846b485fb78f382c7d084c59e34ed913434821c725a22fd83ebc1cf13e65e7c0
+  data.tar.gz: 5f2a09a0a4671ffe36d0986ecc061de33c1a45188c8c9394fc73a04d3ae00b04
 SHA512:
-  metadata.gz: ba5ce659689e9efd867bdd423262afcc4f5a70ab19f5cd1f0d4e6a39a30b3ded49eee02973911d882b6156c265282f103b806a4e6068b5231ec0fad28727c573
-  data.tar.gz: 7c6745e4f7a230fea262b2f9f99da14dd36872afe1bd6ac16ac93f98a932648ae34dc719e87fbe13f9d2fa9b0327182c755ae845367efb9d7dde32bb2a418802
+  metadata.gz: 86344c408514561160296d4b4fc6a3647da3f85028fc3ac41cb9c03d7a7271ea2a4984c8875a9dda412d1306be1d6ffb5a960ce5f2e5a35e7b3259444c4704e6
+  data.tar.gz: aff1681e76aa26eb7d322ebe8988da180b6b20fa42c68c40b235b1ed45957b762f95a31969dfc3b00985c93eff267833415b75a92f06c849442aa7118bc44929

data/lib/office/email_message.rb

@@ -41,23 +41,34 @@ class Office::EmailMessage
 
   ## Copied to email_conversation
   field :wp_term_ids, type: Array, default: []
+
   ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
   def add_tag tag
-    if WpTag == tag.class
-      self[:wp_term_ids] = self[:wp_term_ids].push(tag.id).uniq
-      self.save!
+    case tag.class.name
+    when 'WpTag'
+      ;
+    when 'String'
+      tag = WpTag.emailtag(tag)
     else
-      throw "#add_tag expects a WpTag as the only parameter."
+      throw "#add_tag2 expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
     end
+    self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
+    self.save!
   end
   def remove_tag tag
-    if WpTag == tag.class
-      self[:wp_term_ids].delete( tag.id )
-      self.save!
+    case tag.class.name
+    when 'WpTag'
+      ;
+    when 'String'
+      tag = WpTag.emailtag(tag)
     else
-      throw "#remove_tag expects a WpTag as the only parameter."
+      throw "#remove_tag2 expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
     end
+    self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
+    out = self.save!
+    out
   end
+  def rmtag tag; remove_tag tag; end
 
   belongs_to :email_conversation
   def conv
@@ -74,10 +85,12 @@ class Office::EmailMessage
     from[0].split('@')[1]
   end
 
+  ## @TODO: move to email_conversation _vp_ 2023-03-24
   def apply_filter filter
     case filter.kind
     when ::Office::EmailFilter::KIND_SKIP_INBOX
       self.remove_tag( WpTag::INBOX )
+      self.conv.remove_tag( WpTag::INBOX )
     when ::Office::EmailFilter::KIND_AUTORESPOND
       Ish::EmailContext.create({
         email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),

data/lib/video.rb

@@ -16,6 +16,7 @@ class Video
 
   field :name, :type => String
   field :descr, :type => String, :as => :description
+  field :subhead ## still need it... 2023-03-24
 
   field :is_trash, :type => Boolean, :default => false
   def is_trash
@@ -93,7 +94,7 @@ end
 
 =begin
   field :issue
-  field :subhead
+
   field :is_feature, :type => Boolean, :default => false
   field :lang, :type => String, :default => 'en'
 =end

metadata

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