wco_models 3.1.0.70 → 3.1.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea84f3f0608bb71c99678e1ffd5f37dd626462958602c5acc908f13ebe4e2fed
-  data.tar.gz: 2f6cf3351e15a32df468b665ac0430f6b7d47d92380e9b3b95ca4c404f9f391e
+  metadata.gz: 302a2a1a1d3081af93564469f98f0ae71e307be1dfe55f6434e1e8fe91530d6e
+  data.tar.gz: 473811f82c6920371f5739b7bcc5e8914907ac589a08f6dee0babf77fc4c9973
 SHA512:
-  metadata.gz: 2eef8aff06c8aea4b00686a2a24255f05b8b31b1f5e0d2014577a65da48e82757e7452a41a811c06f51699141ceff2156f3015bd2fa5d54a2ae811f4c79fd4fd
-  data.tar.gz: b4eaf23331ed7186071185c4b80cd425b9e2e1d0dca2459c55bdc41327cd2de658004e2e15376f55e17db5f7e747be8b17c03eb6d0d6170326731afebcdb7e5a
+  metadata.gz: c164f95273599dce14bd7549fbe38b5a3aa0ee4008b2e34ff29f6370af701be4ccf2a3c69485407646465cea79f8c4578b21f5ae3af4e763205110b8bb7cc92e
+  data.tar.gz: 3afb7f8481bd2d87f9e76991347008b70affa6d500d22e4cb0cb82beb3ca5c50aebaeb8521a197306479ba62148a8d6defc1c0b20a8e78c6e1866972cbf68581

data/app/helpers/wco/application_helper.rb

@@ -14,18 +14,18 @@ module Wco::ApplicationHelper
   end
 
   def pretty_date date
-    # date.to_s[0, 10]
-    date&.strftime('%Y-%m-%d')
+    return nil if !date
+    date.in_time_zone( Rails.application.config.time_zone ).strftime('%Y-%m-%d')
   end
   def pp_date a; pretty_date a; end
 
   def pp_datetime date
-    date&.strftime('%Y-%m-%d %l:%M%P %z')
+    return nil if !date
+    return date.in_time_zone( Rails.application.config.time_zone ).strftime('%Y-%m-%d %l:%M%P %Z')
   end
 
   def pp_time date
     return nil if !date
-    # return date.strftime('%l:%M%P %z')
     return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P %Z')
   end
 

data/app/models/wco/tag.rb

@@ -31,6 +31,11 @@ class Wco::Tag
     find_or_create_by({ slug: TRASH })
   end
 
+  SPAM = 'spam'
+  def self.spam
+    find_or_create_by({ slug: SPAM })
+  end
+
   def to_s
     slug
   end

data/app/models/wco_email/context.rb

@@ -71,7 +71,7 @@ class WcoEmail::Context
   end
 
   def self.scheduled
-    where( :send_at.gte => Time.now  )
+    where( :send_at.lte => Time.now  )
   end
 
 

data/app/models/wco_email/message.rb

@@ -89,7 +89,7 @@ class WcoEmail::Message
 
     when WcoEmail::EmailFilter::KIND_ADD_TAG
       conv.tags.push filter.tag
-      if filter.tag == Wco::Tag.trash
+      if filter.tag == Wco::Tag.trash || filter.tag == Wco::Tag.spam
         conv.tags -= [ Wco::Tag.inbox ]
       end
 

metadata

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