From a63f9085f44c7dfcf698224c3c9a3371962bec24 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 19 Oct 2015 10:07:53 -0500
Subject: [PATCH] * VRFS-3664 - dont say dear anonymous in emails

---
 admin/app/admin/affiliates.rb                     |  2 ++
 admin/app/views/email/dump_emailables.csv.erb     |  2 +-
 .../jam_ruby/user_mailer/confirm_email.html.erb   |  2 +-
 .../jam_ruby/user_mailer/confirm_email.text.erb   |  2 +-
 .../jam_ruby/user_mailer/new_musicians.html.erb   |  4 +++-
 .../jam_ruby/user_mailer/new_musicians.text.erb   |  3 ++-
 .../user_mailer/scheduled_session_daily.html.erb  |  5 +++--
 .../user_mailer/scheduled_session_daily.text.erb  |  5 +++--
 .../scheduled_session_reminder_day.html.erb       | 14 ++++++++------
 .../scheduled_session_reminder_day.text.erb       |  3 ++-
 .../scheduled_session_reminder_upcoming.html.erb  | 15 +++++++++------
 .../scheduled_session_reminder_upcoming.text.erb  |  2 ++
 ruby/lib/jam_ruby/models/user.rb                  |  8 +++++---
 13 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/admin/app/admin/affiliates.rb b/admin/app/admin/affiliates.rb
index 0409ee36c..19afd5398 100644
--- a/admin/app/admin/affiliates.rb
+++ b/admin/app/admin/affiliates.rb
@@ -6,6 +6,8 @@ ActiveAdmin.register JamRuby::AffiliatePartner, :as => 'Affiliates' do
   config.batch_actions = false
   # config.clear_action_items!
   config.filters = false
+  config.per_page = 50
+  config.paginate = true
 
   form :partial => 'form'
 
diff --git a/admin/app/views/email/dump_emailables.csv.erb b/admin/app/views/email/dump_emailables.csv.erb
index efa44b0f8..f226e68fa 100644
--- a/admin/app/views/email/dump_emailables.csv.erb
+++ b/admin/app/views/email/dump_emailables.csv.erb
@@ -1,2 +1,2 @@
 <%- headers = ['email', 'name', 'unsubscribe_token'] -%>
-<%= CSV.generate_line headers %><%- @users.each do |user| -%><%= CSV.generate_line([user.email, user.first_name, user.unsubscribe_token]) %><%- end -%>
\ No newline at end of file
+<%= CSV.generate_line headers %><%- @users.each do |user| -%><%= CSV.generate_line([user.email, user.anonymous? ? '-' : user.first_name, user.unsubscribe_token]) %><%- end -%>
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb
index 6f760961e..a79e893e5 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb
@@ -1,5 +1,5 @@
 <% provide(:title, 'Confirm Email') %>
 
-<p>Welcome to JamKazam, <%= @user.first_name %>!</p>
+<p>Welcome to JamKazam<%= @user.anonymous? ? '!' : ", #{@user.first_name}!" %></p>
 
 <p>To confirm this email address, please go to the <a style="color: #ffcc00;" href="<%= @signup_confirm_url %>">signup confirmation page</a>.</p>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb
index d412a7b92..85f6a7f9f 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb
@@ -1,3 +1,3 @@
-Welcome to JamKazam, <%= @user.first_name %>!
+Welcome to JamKazam<%= @user.anonymous? ? '!' : ", #{@user.first_name}!" %>
 
 To confirm this email address, please go to the signup confirmation page at: <%= @signup_confirm_url %>.
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
index be9aa27fb..65bf1295f 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
@@ -1,5 +1,7 @@
 <% provide(:title, 'New Musicians You Should Check Out') %>
-Hi <%= @user.first_name %>,
+<% if !@user.anonymous? %>
+<p>Hi <%= @user.first_name %>,</p>
+<% end %>
 
 <p>The following new musicians have joined JamKazam within the last week, and have Internet connections with low enough latency to you that you can have a good online session together. We'd suggest that you look through the new musicians listed below to see if any match your musical interests, and if so, click through to their profile page on the JamKazam website to send them a message or a request to connect as a JamKazam friend:
 </p>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
index 05fbbd268..ee100dbff 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
@@ -1,7 +1,8 @@
 New Musicians You Should Check Out
 
+<% if !@user.anonymous? %>
 Hi <%= @user.first_name %>,
-
+<% end %>
 The following new musicians have joined JamKazam within the last week, and have Internet connections with low enough latency to you that you can have a good online session together. We'd suggest that you look through the new musicians listed below to see if any match your musical interests, and if so, click through to their profile page on the JamKazam website to send them a message or a request to connect as a JamKazam friend:
 
 <% @new_musicians.each do |user| %>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
index 2fdc11256..769b5bcda 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
@@ -1,7 +1,8 @@
 <% provide(:title, @title) %>
 
-<p>Hello <%= @user.first_name %> --
-</p>
+<% if !@user.anonymous? %>
+<p>Hi <%= @user.first_name %>,</p>
+<% end %>
 
 <p>The following new sessions have been posted within the last 24 hours, and you have good or acceptable latency to the organizer of each session below. If a session looks interesting, click the Details link to see the session page. You can RSVP to a session from the session page, and you'll be notified if/when the session organizer approves your RSVP.</p>
 
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb
index 282c6dd90..3d1e15346 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb
@@ -1,7 +1,8 @@
 <% provide(:title, @title) %>
 
-Hello <%= @user.first_name %> --
-
+<% if !@user.anonymous? %>
+Hi <%= @user.first_name %>,
+<% end %>
 The following new sessions have been posted within the last 24 hours, and you have good or acceptable latency to the organizer of each session below. If a session looks interesting, click the Details link to see the session page. You can RSVP to a session from the session page, and you'll be notified if/when the session organizer approves your RSVP.
 
 GENRE | NAME | DESCRIPTION | LATENCY
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.html.erb
index b72d3c133..cf4816bf1 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.html.erb
@@ -1,18 +1,20 @@
 <% provide(:title, 'JamKazam Session Reminder') %>
 
 
-<div>
+<% if !@user.anonymous? %>
+<p>
 Hi <%= @user.first_name %>,
-</div>
+</p>
+<% end %>
 <br/>
-<div>
+<p>
   <span>This is a reminder that your JamKazam session</span>
   <a href='<%=@session_url%>'><%= @session_name %></a>
   <span>is scheduled for tomorrow. We hope you have fun!</span>
-</div>
+</p>
 <br/>
-<div>
+<p>
 Best Regards,
 <br/>
 Team JamKazam
-</div>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.text.erb
index c3f0576bf..333acdb74 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.text.erb
@@ -1,5 +1,6 @@
+<% if !@user.anonymous? %>
 Hi <%= @user.first_name %>,
-
+<% end %>
 This is a reminder that your JamKazam session <%=@session_name%> is scheduled for tomorrow. We hope you have fun!
 
 Best Regards,
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.html.erb
index 4fbc59ace..119d57b16 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.html.erb
@@ -1,17 +1,20 @@
 <% provide(:title, 'Your JamKazam session starts in 1 hour!') %>
 
-<div>
+<% if !@user.anonymous? %>
+<p>
 Hi <%= @user.first_name %>,
-</div>
+</p>
+<% end %>
+
 <br/>
-<div>
+<p>
   <span>This is a reminder that your JamKazam session</span>
   <a href='<%=@session_url%>'><%= @session_name %></a>
   <span>starts in 1 hour. We hope you have fun!</span>
-</div>
+</p>
 <br/>
-<div>
+<p>
 Best Regards,
 <br/>
 Team JamKazam
-</div>
+</p>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.text.erb
index 70726a9e6..d4719bd4c 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.text.erb
@@ -1,4 +1,6 @@
+<% if !@user.anonymous? %>
 Hi <%= @user.first_name %>,
+<% end %>
 
 This is a reminder that your JamKazam session 
 <%=@session_name%>
diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index c608dc88f..a9c46801a 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -297,8 +297,12 @@ module JamRuby
       online?
     end
 
+    def anonymous?
+      first_name == 'Anonymous' && last_name == 'Anonymous'
+    end
+
     def name
-      if first_name == 'Anonymous' && last_name == 'Anonymous'
+      if anonymous?
         'Anonymous'
       else
         "#{first_name} #{last_name}"
@@ -1684,8 +1688,6 @@ module JamRuby
       else
         false
       end
-
-
     end
     private
       def create_remember_token