ishapi 0.1.8.292 → 0.1.8.294

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0eccc109ec40b082e8f36531cda0b97d004b21dd4ecaa6e5631614fdc8d9051
-  data.tar.gz: de11d35fa75d9752c32dc8d6e0ee83b31a3cbfc5df3d05e11305931bb34ca555
+  metadata.gz: eb5a51286eeecf1dee4e39e0d2d44036c5742b3882da47f40c63499af4665c0a
+  data.tar.gz: cbd4c3e159da811dd7a1934500631fe6520cc2e514f32772587bb0a3d76bb106
 SHA512:
-  metadata.gz: c1b9e369a9dd15f3aa8dbba842bddf94ab5ea3c3d99df44f452b90da7b906a9f65e69475814aaf7cf04d78c79c7d1862047b3138e1b7d0d27b6ed411b8e952b0
-  data.tar.gz: 8d461fc7c5ba44dc92c1e27bb1a5ede8188b9387578341a5848cd0d29155aa30b6e004b4cdac4cd580a756561c4b4c45d80a13562a3665dd8855975b244c600a
+  metadata.gz: 04c4841782096b5057b2b6ecba91b06de8309104847149f473654ed3b009c0bd19b2eee54b0c5104f92c090a57bbe4cbd1f04f6461580dc1313707df2220a8f8
+  data.tar.gz: 5a45e7c3183bb1a26b0c9716c99841ee479bc2b832565c4ae6008046b9d1416f74c09c4cda26ca81bf6fed359f3a7279369e19d8d29b4b9ea0bcc13cd2a42847

data/app/controllers/ishapi/application_controller.rb

@@ -116,5 +116,26 @@ class ::Ishapi::ApplicationController < ActionController::Base
     @current_ability ||= Ishapi::Ability.new( @current_profile )
   end
 
+  def flash_alert what
+    flash[:alert] ||= []
+    if String == what.class
+      str = what
+    else
+      str = "Cannot create/update #{what.class.name}: #{what.errors.full_messages.join(', ')} ."
+    end
+    flash[:alert] << str
+  end
+
+  def flash_notice what
+    flash[:notice] ||= []
+    if String == what.class
+      str = what
+    else
+      str = "Created/updated #{what.class.name} ."
+    end
+    flash[:notice] << str
+  end
+
+
 end
 

data/app/controllers/ishapi/email_unsubscribes_controller.rb

@@ -20,9 +20,15 @@ module ::Ishapi
         template_id: params[:template_id],
         campaign_id: params[:campaign_id],
       })
-      @unsubscribe.update_attributes({
+      flag = @unsubscribe.update_attributes({
         unsubscribed_at: Time.now,
       })
+      if flag
+        flash_notice "You have been unsubscribed."
+      else
+        flash_alert "We're sorry, but something went wrong. Please try again later."
+      end
+
     end
   end
 

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -202,7 +202,9 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
         # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
 
-        conv.apply_filter( filter )
+        # puts! "applying filter #{filter} to conv #{conv}" if DEBUG
+
+        @message.apply_filter( filter )
       end
     end
 

data/app/views/ishapi/email_unsubscribes/create.haml

@@ -1,2 +1,5 @@
 
-Thanks! You have been unsubscribed.
+= flash[:notice]
+= flash[:alert]
+
+-# Thanks! You have been unsubscribed.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.292
+  version: 0.1.8.294
 platform: ruby
 authors:
 - piousbox