From 9ee0400c18bb9be180925e5c2f2afe37845d8d55 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 8 Apr 2015 21:48:21 -0700 Subject: [PATCH] Updated to just send out tell-a-parent emails, no tell-a-friend emails. --- app/views/play/CampaignView.coffee | 2 +- server/users/user_handler.coffee | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/play/CampaignView.coffee b/app/views/play/CampaignView.coffee index d83abe3a2..b75b7f761 100644 --- a/app/views/play/CampaignView.coffee +++ b/app/views/play/CampaignView.coffee @@ -151,7 +151,7 @@ module.exports = class CampaignView extends RootView @$el.find('#campaign-status').delay(4000).animate({top: "-=58"}, 1000) unless @terrain is 'dungeon' if @terrain and me.get('anonymous') and me.get('lastLevel') is 'shadow-guard' and me.level() < 4 @openModalView new AuthModal supermodel: @supermodel, showSignupRationale: true, mode: 'signup' - else if @terrain and me.get('name') and me.get('lastLevel') in ['forgetful-gemsmith', 'signs-and-portents'] and me.level() < 5 and not (me.get('ageRange') in ['18-24', '25-34', '35-44', '45-100']) and not storage.load('sent-parent-email') + else if @terrain and me.get('name') and me.get('lastLevel') in ['forgetful-gemsmith', 'signs-and-portents'] and me.level() < 5 and not (me.get('ageRange') in ['18-24', '25-34', '35-44', '45-100']) and not storage.load('sent-parent-email') and not me.isPremium() @openModalView new ShareProgressModal() setCampaign: (@campaign) -> diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index 646aa4652..13601fe9c 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -361,7 +361,7 @@ UserHandler = class UserHandler extends Handler # log.warn "sendOneTimeEmail #{type} #{email}" - unless type in ['subscribe modal parent', 'share progress modal parent', 'share progress modal friend'] + unless type in ['subscribe modal parent', 'share progress modal parent'] return @sendBadInputError res, "Unknown one-time email type #{type}" sendMail = (emailParams) => @@ -382,6 +382,7 @@ UserHandler = class UserHandler extends Handler name: req.user.get('name') or '' if codeLanguage = req.user.get('aceConfig.language') codeLanguage = codeLanguage[0].toUpperCase() + codeLanguage.slice(1) + codeLanguage = codeLanguage.replace 'script', 'Script' emailParams['email_data']['codeLanguage'] = codeLanguage if senderEmail = req.user.get('email') emailParams['email_data']['senderEmail'] = senderEmail @@ -389,11 +390,8 @@ UserHandler = class UserHandler extends Handler # Type-specific email data if type is 'subscribe modal parent' emailParams['email_id'] = sendwithus.templates.parent_subscribe_email - else if type in ['share progress modal parent', 'share progress modal friend'] + else if type is 'share progress modal parent' emailParams['email_id'] = sendwithus.templates.share_progress_email - emailParams['email_data']['premium'] = req.user.isPremium() - emailParams['email_data']['parent'] = type is 'share progress modal parent' - emailParams['email_data']['friend'] = type is 'share progress modal friend' sendMail emailParams