ishapi 0.1.8.291 → 0.1.8.293

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ce4a2424f89a52445feed0a9eb1ec84c960aed3820bf98e1acd8338337a67a
-  data.tar.gz: a85fa506200f1e92aaf39eb333556aefe621f1420773ade7a519278aa78d7202
+  metadata.gz: 1d72a1d1df005b55a8b87d8cf9a0393e1672559758bfbc807812820ceddd08fb
+  data.tar.gz: 6aef010b6fa8cd4c32d163350f4252664d152f20ac3940cb88817ad59728fe9d
 SHA512:
-  metadata.gz: 808696b157e630761b8405a82ccb98006b1078a1199a1653fba6f7920e1ce4f1a6a09c423db19417eb920d39605fef6d8df383ee4e71c0e75f85189d62b083b1
-  data.tar.gz: 578585f583cc1a941675d278b281f67cbe6c0344baa6861a627197e9712c92b68f0a3e6c136cc7dbb91d4ed6f214e5b0cf51f6507a8e1889ecf15ba0ed50c101
+  metadata.gz: 43271cdf8278e92cd4a821c1a1e18a828e59fb1bd8573e3142dd4dc096c71d9fd089d3379484323a710e44efbfc84d21fc6dffa160cb705f10da459ddf9d2f34
+  data.tar.gz: 8a8e0b3e38ba4d58140be181e83e302324a9fbe731d2dec9edc8edb21e5459949e0208b4b835e85b6a74e9b0477218e2be6914b2c8972bd6e7adbbed4d46d4bb

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

@@ -44,6 +44,28 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     end
   end
 
+  ## From: https://stackoverflow.com/questions/24672834/how-do-i-remove-emoji-from-string/24673322
+  def strip_emoji(text)
+    text = text.force_encoding('utf-8').encode
+    clean = ""
+
+    # symbols & pics
+    regex = /[\u{1f300}-\u{1f5ff}]/
+    clean = text.gsub regex, ""
+
+    # enclosed chars
+    regex = /[\u{2500}-\u{2BEF}]/ # I changed this to exclude chinese char
+    clean = clean.gsub regex, ""
+
+    # emoticons
+    regex = /[\u{1f600}-\u{1f64f}]/
+    clean = clean.gsub regex, ""
+
+    #dingbats
+    regex = /[\u{2702}-\u{27b0}]/
+    clean = clean.gsub regex, ""
+  end
+
   def perform id
     stub = ::Office::EmailMessageStub.find id
     if !Rails.env.test?
@@ -69,6 +91,10 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       the_mail.to = [ 'NO-RECIPIENT' ]
     end
 
+
+    subject   = strip_emoji the_mail.subject
+    subject ||= '(wco no subject)'
+
     @message   = ::Office::EmailMessage.where( message_id: message_id ).first
     @message ||= ::Office::EmailMessage.new
     @message.assign_attributes({
@@ -80,7 +106,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       object_key:  stub.object_key,
       # object_path: stub.object_path,
 
-      subject: the_mail.subject || '(wco no subject)',
+      subject: subject,
       date:    the_mail.date,
 
       from:  the_mail.from ? the_mail.from[0] : "nobody@unknown.domain",
@@ -139,7 +165,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       in_reply_to_msg = ::Office::EmailMessage.where({ message_id: in_reply_to_id }).first
       if !in_reply_to_msg
         conv = ::Office::EmailConversation.find_or_create_by({
-          subject: the_mail.subject,
+          subject: @message.subject,
         })
         in_reply_to_msg = ::Office::EmailMessage.find_or_create_by({
           message_id: in_reply_to_id,
@@ -149,7 +175,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       conv = in_reply_to_msg.email_conversation
     else
       conv = ::Office::EmailConversation.find_or_create_by({
-        subject: the_mail.subject,
+        subject: @message.subject,
       })
     end
     @message.update_attributes({ email_conversation_id: conv.id })

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.291
+  version: 0.1.8.293
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails