wco_models 3.1.0.291 → 3.1.0.292

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d97567972e09ac3be4de77758f0f3c830ac600e7783d72adcaa705cb88b477
-  data.tar.gz: 03065e0ceb94809d448841cc755c9afef7b1982e2fefc985e2818564753122c6
+  metadata.gz: c6ed3eeab0711f51c9839597b8a06cffae834ec4a67e2204a75ed336eb9b5ec6
+  data.tar.gz: 9f9b96b2a6a399ef92a6212ecebcfdf719a0a89f751f4e67e2db9b8ec11dd5ce
 SHA512:
-  metadata.gz: b93faf0491c69971dc9139eff68a60e62c91f4bad4483dd3ea19cf756d3ff193ec87227cc41d4fd1ab829f14add184b862202b61d1da9e1c5d49393df4a85d05
-  data.tar.gz: 427067d729c0d9fe7ee29d493061fea303237c8a8c96485ba8b86254ca3f4afc8d025119d1d6184fe903dcf4e674cc005435aca4cedb1b12fa0dcce37ca3222d
+  metadata.gz: 1f2cff251434c46f43086e1dcc38faf5dc2d720ace7d2f483daec9d997fbe9b902a19214aa715558b1ab90802557557b02d48b7ee8462e83e3e3d852587c4d08
+  data.tar.gz: d8a9e784562f8ecb54504df228f80dbedc29f6bbccb7de809c2319264b57870b25d2849c1ca8dd9f1bb3ddaa1a34163887858157547c42cdfe4b7be3f53a82ce

data/app/controllers/wco/newspartials_controller.rb

@@ -55,9 +55,6 @@ class Wco::NewspartialsController < Wco::ApplicationController
   def index
     authorize! :index, Wco::Newspartial
     @newspartials = Wco::Newspartial.all
-    if params[:deleted]
-      @newspartials = Wco::Newspartial.unscoped.where( :deleted_at.ne => nil )
-    end
     @newspartials = @newspartials.page( params[:newspartials_page] ).per( current_profile.per_page )
   end
 

data/app/controllers/wco/newsvideos_controller.rb

@@ -54,9 +54,6 @@ class Wco::NewsvideosController < Wco::ApplicationController
   def index
     authorize! :index, Wco::Newsvideo
     @newsvideos = Wco::Newsvideo.all.order_by( created_at: :desc )
-    if params[:deleted]
-      @newsvideos = Wco::Newsvideo.unscoped.where( :deleted_at.ne => nil )
-    end
     @newsvideos = @newsvideos.page( params[:newsvideos_page] ).per( current_profile.per_page )
   end
 

data/app/controllers/wco/reports_controller.rb

@@ -44,9 +44,6 @@ class Wco::ReportsController < Wco::ApplicationController
   def index
     authorize! :index, Wco::Report
     @reports = Wco::Report.all
-    if params[:deleted]
-      @reports = Wco::Report.unscoped.where( :deleted_at.ne => nil )
-    end
     @reports = @reports.page( params[:reports_page] ).per( current_profile.per_page )
   end
 

data/app/models/iro/position.rb

@@ -30,8 +30,7 @@ class Iro::Position
 
   belongs_to :purse, class_name: 'Iro::Purse',    inverse_of: :positions
   index({ purse_id: 1, ticker: 1 })
-  index({ deleted_at: 1,
-          status: 1,
+  index({ status: 1,
           expires_on: 1,
           ticker: 1,
           long_or_short: 1,

data/app/models/wco/gallery.rb

@@ -20,6 +20,10 @@ class Wco::Gallery
   index({ created_at: -1 })
   index({ created_at: -1, name: -1 })
 
+  field :deleted_at, type: Time
+
+
+
   field :subhead
   field :descr,   :as => :description
 

data/app/models/wco_email/conversation.rb

@@ -21,6 +21,8 @@ class WcoEmail::Conversation
   field :latest_at, type: Time
   index({ latest_at: -1 })
 
+  field :deleted_at, type: Time ## just in case... should be unused. _vp_ 2026-07-19
+
   field :from_emails, type: :array, default: []
   index({ from_emails: -1 })
 

data/app/models/wco_email/message_stub.rb

@@ -70,7 +70,6 @@ class WcoEmail::MessageStub
       @conv = WcoEmail::Conversation.unscoped.find_or_create_by({
         subject: subject,
       })
-      @conv.deleted_at = nil
     end
 
     ## Leadset, Lead
@@ -166,284 +165,3 @@ class WcoEmail::MessageStub
 
 
 end
-
-=begin
-
-  ## @obsolete - I moved away from amazon.
-  def do_process
-    @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
-
-    stub = self
-
-    raw      = @client.get_object( bucket: stub.bucket, key: stub.object_key ).body.read
-    raw      = raw.encode('utf-8', invalid: :replace, undef: :replace, replace: '_' )
-    the_mail = Mail.new( raw )
-    # puts! the_mail, 'the_mail'
-
-    message_id         = the_mail.header['message-id']&.decoded
-    message_id       ||= "#{the_mail.date&.iso8601}::#{the_mail.from}"
-    # puts! message_id, 'message_id'
-
-    in_reply_to_id     = the_mail.header['in-reply-to']&.to_s
-    # puts! in_reply_to_id, 'in_reply_to_id'
-
-    the_mail.to        = [ 'NO-RECIPIENT' ] if !the_mail.to
-    subject            = WcoEmail::Message.strip_emoji( the_mail.subject || '(wco-no-subject)' )
-    # puts! subject, 'subject'
-
-    ## Conversation
-    if in_reply_to_id
-      in_reply_to_msg = WcoEmail::Message.where({ message_id: in_reply_to_id }).first
-      if !in_reply_to_msg
-        conv = WcoEmail::Conversation.find_or_create_by({
-          subject: subject,
-        })
-        in_reply_to_msg = WcoEmail::Message.find_or_create_by({
-          message_id: in_reply_to_id,
-          conversation: conv,
-        })
-      end
-      conv = in_reply_to_msg.conversation
-    else
-      conv = WcoEmail::Conversation.unscoped.find_or_create_by({
-        subject: subject,
-      })
-      conv.deleted_at = nil
-    end
-
-
-    ## Leadset, Lead
-    from      = the_mail.from ? the_mail.from[0] : "nobody@unknown-doma.in"
-    lead      = Wco::Lead.find_or_create_by_email( from )
-    conv.leads.push lead
-    leadset   = Wco::Leadset.from_email from
-    conv.leadsets.push leadset
-
-    message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
-    if message
-      message.message_id = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.message_id}"
-      message.object_key = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.object_key}"
-      message.save( validate: false )
-      message.delete
-    end
-
-    @message = WcoEmail::Message.create!({
-      stub:         stub,
-      conversation: conv,
-      lead:         lead,
-
-      message_id:     message_id,
-      in_reply_to_id: in_reply_to_id,
-      object_key:     stub.object_key,
-
-      subject: subject,
-      date:    the_mail.date,
-
-      from:  from,
-      froms: the_mail.from,
-
-      to:  the_mail.to ? the_mail.to[0] : nil,
-      tos: the_mail.to,
-
-      cc:  the_mail.cc ? the_mail.cc[0] : nil,
-      ccs: the_mail.cc,
-    })
-    # puts! @message, '@message'
-
-    ## Parts
-    the_mail.parts.each do |part|
-      @message.churn_subpart( part )
-    end
-    @message.save
-
-    if the_mail.parts.length == 0
-      body = the_mail.body.decoded.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
-      if the_mail.content_type&.include?('text/html')
-        @message.part_html = body
-      elsif the_mail.content_type&.include?('text/plain')
-        @message.part_html = "<pre>#{body}</pre>"
-      elsif the_mail.content_type.blank?
-        @message.part_html = "<pre>#{body}</pre>"
-      else
-        @message.logs.push "mail body of unknown type: #{the_mail.content_type}"
-        @message.part_html = "<pre>#{body}</pre>"
-      end
-      @message.save
-    end
-
-    ## Attachments, which are parts (omit!)
-    # the_mail.attachments.each do |att|
-    #   @message.save_attachment( att )
-    # end
-
-    if !@message.save
-      puts! @message.errors.full_messages.join(", "), "Could not save @message"
-    end
-
-    the_mail.cc&.each do |cc|
-      Wco::Lead.find_or_create_by_email( cc )
-    end
-
-    conv.update_attributes({
-      status:      WcoEmail::Conversation::STATUS_UNREAD,
-      latest_at:   the_mail.date || Time.now.to_datetime,
-      from_emails: ( conv.from_emails + the_mail.from ).uniq,
-      preview:     @message.preview_str,
-    })
-
-    ##
-    ## Tags
-    ##
-    conv.tags.push Wco::Tag.inbox
-    conv.tags.push stub.tags
-    conv.save
-
-
-    ## Actions & Filters
-    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 )
-      end
-
-      if reason
-        puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
-
-        ## 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 |skip_cond|
-          skip_reason ||= skip_cond.apply(leadset: leadset, message: @message )
-        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
-
-    stub.update_attributes({ status: WcoEmail::MessageStub::STATUS_PROCESSED })
-
-    ## Notification
-    config = JSON.parse(stub.config)
-    if config['skip_notification']
-      ;
-    else
-      ## 2024-07-30 I'm no longer sending these to google.
-      ## 2024-11-03 restarted sending.
-      ## 2025-01-23 no longer sending to google.
-      conv = WcoEmail::Conversation.find( conv.id )
-      if conv.tags.include? Wco::Tag.inbox
-        if defined?(::NOTIFY_TO_GOOGLE) && ::NOTIFY_TO_GOOGLE
-          out = WcoEmail::ApplicationMailer.forwarder_notify( @message.id.to_s )
-          Rails.env.production? ? out.deliver_later : out.deliver_now
-        end
-      end
-    end
-
-    puts 'stub-ok'
-  end
-
-  ## This only saves a local message from mbox to s3.
-  def save_mbox_to_m3 message
-    the_mail = Mail.new(message)
-    key      = the_mail.message_id || "no-key-#{Time.now.to_i}.#{rand(1000)}"
-
-    @stub = WcoEmail::MessageStub.create({
-      bucket:      ::S3_CREDENTIALS[:bucket_ses],
-      object_key:  key,
-      status:      WcoEmail::MessageStub::STATUS_PENDING,
-      tags:        [ @tag ],
-    })
-    if @stub.persisted?
-      @client.put_object({
-        body: message,
-        bucket: ::S3_CREDENTIALS[:bucket_ses],
-        key: key,
-      })
-    else
-      msg = @stub.errors.full_messages.join(", ")
-      puts! msg
-      Wco::Log.create({
-        message:    "Stub duplicate object_key: #{key}",
-        class_name: 'WcoEmail::MessageStub',
-        raw_json:   @stub.attributes.to_json,
-        tags:       [ @tag ],
-      })
-    end
-  end
-
-  def self.mbox2stubs mbox_path, tagname:, skip:
-    skip ||= 0
-    self.new.mbox2stubs mbox_path, tagname: tagname, skip: skip
-  end
-  def mbox2stubs mbox_path, tagname:, skip:
-    puts 'Starting...'
-    skip ||= 0
-
-    @count = 1
-    @client ||= Aws::S3::Client.new({
-      region:            ::S3_CREDENTIALS[:region_ses],
-      access_key_id:     ::S3_CREDENTIALS[:access_key_id_ses],
-      secret_access_key: ::S3_CREDENTIALS[:secret_access_key_ses],
-    })
-    @tag = Wco::Tag.find_or_create_by({ slug: tagname })
-
-    message    = nil
-    File.readlines(mbox_path, encoding: "ISO8859-1" ).each do |line|
-      if (line.match(/\AFrom /))
-
-        if message
-          if skip < @count
-            save_mbox_to_m3 message
-            print "#{@count}."
-          else
-            print "s-#{@count}."
-          end
-          @count += 1
-        end
-        message = ''
-
-      else
-        message << line.sub(/^\>From/, 'From')
-      end
-    end
-
-    if message
-      if skip < @count
-        save_mbox_to_m3 message
-        print "#{@count}."
-      else
-        print "s-#{@count}."
-      end
-      @count += 1
-    end
-    message = ''
-  end
-
-=end

data/app/views/wco/galleries/_form.haml

@@ -8,12 +8,6 @@
     = f.text_field :name
     = f.label :slug
     = f.text_field :slug
-    %label deleted_at
-    = f.text_field :deleted_at
-  -# .col-md-2
-  -#   .field
-  -#     = f.label :premium_tier
-  -#     = f.number_field :premium_tier
 
   .row
     .col-md-4

data/app/views/wco/galleries/_header.haml

@@ -17,6 +17,5 @@
   %ul
     %li slug :: #{gallery.slug}
     %li subhead :: #{gallery.subhead}
-    %li deleted_at ::#{gallery.deleted_at}
 
 

data/app/views/wco/newsvideos/_form.haml

@@ -12,9 +12,6 @@
       = f.text_field :slug, class: 'w-100'
 
     .row
-      .field
-        %label deleted_at
-        = f.text_field :deleted_at
       .field
         %label w_px
         = f.text_field :w_px

data/app/views/wco/reports/_form.haml

@@ -11,10 +11,6 @@
       %label Slug
       = f.text_field :slug, class: 'w-100'
 
-    .field
-      %label deleted_at
-      = f.text_field :deleted_at
-
     .field
       %label Body
       = f.text_area :body, class: 'tinymce'

metadata

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