From 2d85503ca767508ae456615e285a2e045928053f Mon Sep 17 00:00:00 2001
From: Paul Arterburn <paularterburn@gmail.com>
Date: Sun, 20 Oct 2024 09:12:53 -0600
Subject: [PATCH] Clearer from label

---
 app/jobs/import_job.rb        | 10 +++++-----
 app/mailers/user_mailer.rb    |  2 +-
 config/initializers/devise.rb |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/jobs/import_job.rb b/app/jobs/import_job.rb
index 7e281fc6..bff232c2 100644
--- a/app/jobs/import_job.rb
+++ b/app/jobs/import_job.rb
@@ -1,6 +1,6 @@
 class ImportJob < ActiveJob::Base
   queue_as :default
- 
+
   def perform(user_id,tmp_original_filename)
     user = User.find(user_id)
     dir = "public/ohlife_zips/#{user.user_key}"
@@ -42,7 +42,7 @@ def perform(user_id,tmp_original_filename)
         else
           # no existing_entry
           error_count+=1
-          errors << file          
+          errors << file
         end
       else
         # not the right type of file
@@ -53,17 +53,17 @@ def perform(user_id,tmp_original_filename)
 
     # Delete entire directory
     FileUtils.rm_r dir, :force => true
-    
+
     messages << "Finished importing #{ActionController::Base.helpers.pluralize(count,'photo')}." if count > 0
     messages << "\rError importing #{ActionController::Base.helpers.pluralize(error_count,'photo')}:" if error_count > 0
     errors.each do |error|
       messages << error
     end
 
-    ActionMailer::Base.mail(from: "Dabble Me <hello@#{ENV['MAIN_DOMAIN']}>",
+    ActionMailer::Base.mail(from: "Dabble Me Team <hello@#{ENV['MAIN_DOMAIN']}>",
                             to: user.email,
                             subject: "OhLife Image Import is complete",
                             body: messages.join("\n\n")).deliver
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 8afbc02e..b55d97f0 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -4,7 +4,7 @@ class UserMailer < ActionMailer::Base
   helper EntriesHelper
   helper :application
 
-  default from: "Dabble Me Support <hello@#{ENV['MAIN_DOMAIN']}>"
+  default from: "Dabble Me Team <hello@#{ENV['MAIN_DOMAIN']}>"
 
   def welcome_email(user)
     @user = user
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index f4dd4629..09dfcd53 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = "Dabble Me <hello@#{ENV['MAIN_DOMAIN']}>"
+  config.mailer_sender = "Dabble Me Team <hello@#{ENV['MAIN_DOMAIN']}>"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'