Redesign Daily Email

app/marketing/mails.py

@@ -1155,42 +1155,58 @@ def reject_faucet_request(fr):
 
 
 def new_bounty_daily(bounties, old_bounties, to_emails=None):
-    from marketing.views import trending_quests
-
-    if not bounties:
-        return
-    max_bounties = 10
+    max_bounties = 5
     if len(bounties) > max_bounties:
         bounties = bounties[0:max_bounties]
     if to_emails is None:
         to_emails = []
-    plural = "s" if len(bounties) != 1 else ""
-    worth = round(sum([bounty.value_in_usdt for bounty in bounties if bounty.value_in_usdt]), 2)
-    worth = f"${worth}" if worth else ""
+
+    from marketing.views import quest_of_the_day, upcoming_grant, upcoming_hackathon, latest_activities
+    quest = quest_of_the_day()
+    grant = upcoming_grant()
+    hackathon = upcoming_hackathon()
+
     offers = f""
     if to_emails:
         offers = ""
 
         has_offer = is_email_townsquare_enabled(to_emails[0]) and is_there_an_action_available()
         if has_offer:
-            offers = f"💰 1 New Action"
+            offers = f"💰1 New Action"
 
         new_bounties = ""
-        if bounties.count():
-            new_bounties = f"⚡️ {worth} In New Bounties Available"
-        elif old_bounties.count():
-            new_bounties = f"😁 {len(old_bounties)} Bounties Available"
+        if bounties:
+            plural_bounties = "Bounties" if len(bounties)>1 else "Bounty"
+            new_bounties = f"⚡️{len(bounties)} {plural_bounties}"
+        elif old_bounties:
+            plural_old_bounties = "Bounties" if len(old_bounties)>1 else "Bounty"
+            new_bounties = f"⚡️{len(old_bounties)} {plural_old_bounties}"
+
+        new_quests = ""
+        if quest:
+            new_quests = f"🎯1 Quest"
+
+        new_hackathons = ""
+        if hackathon:
+            plural_hackathon = "Hackathons" if len(hackathon)>1 else "Hackathon"
+            new_hackathons = f"🛠️{len(hackathon)} {plural_hackathon}"
 
-        _and = "&& " if has_offer and new_bounties else ""
+        def comma(a):
+            return ", " if a and (new_bounties or new_quests or new_hackathons) else ""
 
-        subject = f"{offers} {_and}{new_bounties} "
+        subject = f"Gitcoin Daily {offers}{comma(offers)}{new_bounties}{comma(new_bounties)}{new_quests}{comma(new_quests)}{new_hackathons}"
 
     for to_email in to_emails:
         cur_language = translation.get_language()
         try:
             setup_lang(to_email)
             from_email = settings.CONTACT_EMAIL
-            html, text = render_new_bounty(to_email, bounties, old_bounties, trending_quests=trending_quests())
+
+            from django.contrib.auth.models import User
+            user = User.objects.get(email__iexact=to_email)
+            activities = latest_activities(user)
+
+            html, text = render_new_bounty(to_email, bounties, old_bounties='', quest_of_the_day=quest, upcoming_grant=grant, upcoming_hackathon=hackathon, latest_activities=activities)
 
             if not should_suppress_notification_email(to_email, 'new_bounty_notifications'):
                 send_mail(from_email, to_email, subject, text, html, categories=['marketing', func_name()])

app/marketing/views.py

@@ -42,7 +42,7 @@
 from cacheops import cached_view
 from chartit import PivotChart, PivotDataPool
 from chat.tasks import update_chat_notifications
-from dashboard.models import Profile, TokenApproval
+from dashboard.models import Profile, TokenApproval, HackathonEvent, Activity
 from dashboard.utils import create_user_action, get_orgs_perms, is_valid_eth_address
 from enssubdomain.models import ENSSubdomainRegistration
 from gas.utils import recommend_min_gas_price_to_confirm_in_time
@@ -52,6 +52,7 @@
 from marketing.models import AccountDeletionRequest, EmailSubscriber, Keyword, LeaderboardRank
 from marketing.utils import delete_user_from_mailchimp, get_or_save_email_subscriber, validate_slack_integration
 from quests.models import Quest
+from grants.models import Grant
 from retail.emails import ALL_EMAILS, render_new_bounty, render_nth_day_email_campaign
 from retail.helpers import get_ip
 
@@ -983,12 +984,38 @@ def trending_quests():
         ).order_by('-recent_attempts').all()[0:10]
     return quests
 
+def quest_of_the_day():
+    quest = trending_quests()[0]
+    return quest
+
+def upcoming_grant():
+    grant = Grant.objects.order_by('-weighted_shuffle').first()
+    return grant
+
+def upcoming_hackathon():
+    try:
+        return HackathonEvent.objects.filter(end_date__gt=timezone.now()).order_by('-start_date')
+    except HackathonEvent.DoesNotExist:
+        try:
+            return [HackathonEvent.objects.filter(start_date__gte=timezone.now()).order_by('start_date').first()]
+        except HackathonEvent.DoesNotExist:
+            return None
+
+def latest_activities(user):
+    from retail.views import get_specific_activities
+    cutoff_date = timezone.now() - timezone.timedelta(days=7)
+    activities = get_specific_activities('connect', 0, user, 0)[:4]
+    return activities
+
 @staff_member_required
 def new_bounty_daily_preview(request):
     profile = request.user.profile
     keywords = profile.keywords
     hours_back = 2000
+
     new_bounties, all_bounties = get_bounties_for_keywords(keywords, hours_back)
-    quests = trending_quests()
-    response_html, _ = render_new_bounty('[email protected]', new_bounties, all_bounties, offset=3, trending_quests=quests)
+    max_bounties = 5
+    if len(new_bounties) > max_bounties:
+        new_bounties = new_bounties[0:max_bounties]
+    response_html, _ = render_new_bounty(settings.CONTACT_EMAIL, new_bounties, old_bounties='', offset=3, quest_of_the_day=quest_of_the_day(), upcoming_grant=upcoming_grant(), upcoming_hackathon=upcoming_hackathon(), latest_activities=latest_activities(request.user))
     return HttpResponse(response_html)

app/retail/emails.py

@@ -529,10 +529,47 @@ def render_funder_stale(github_username, days=60, time_as_str='a couple months')
     return response_html, response_txt
 
 
-def render_new_bounty(to_email, bounties, old_bounties, offset=3, trending_quests=[]):
+def render_new_bounty(to_email, bounties, old_bounties, offset=3, quest_of_the_day={}, upcoming_grant={}, upcoming_hackathon={}, latest_activities={}, from_date=date.today(), days_ago=7):
     from townsquare.utils import is_email_townsquare_enabled, is_there_an_action_available
-    email_style = (int(timezone.now().strftime("%-j")) + offset) % 24
+    from dashboard.models import Profile
+    from inbox.models import Notification
     sub = get_or_save_email_subscriber(to_email, 'internal')
+
+    email_style = 26
+
+    # Get notifications count from the Profile.User of to_email
+    try:
+        profile = Profile.objects.filter(email__iexact=to_email).last()
+    except Profile.DoesNotExist:
+        pass
+
+    from_date = from_date + timedelta(days=1)
+    to_date = from_date - timedelta(days=days_ago)
+
+    try:
+        notifications_count = Notification.objects.filter(to_user=profile.user.id, is_read=False, created_on__range=[to_date, from_date]).count()
+    except Notification.DoesNotExist:
+        pass        
+
+    upcoming_events = []
+    if upcoming_grant:
+        upcoming_events.append({
+            'event': upcoming_grant,
+            'title': upcoming_grant.title,
+            'image_url': upcoming_grant.logo.url if upcoming_grant.logo else f'{settings.STATIC_URL}v2/images/emails/grants-neg.png',
+            'url': upcoming_grant.url,
+            'date': upcoming_grant.next_clr_calc_date.strftime("%Y-%d-%m") if upcoming_grant.next_clr_calc_date else upcoming_grant.created_on.strftime("%Y-%d-%m")
+        })
+    if upcoming_hackathon:
+        for hackathon in upcoming_hackathon:
+            upcoming_events.append({
+                'event': hackathon,
+                'title': hackathon.name,
+                'image_url': hackathon.logo.url if hackathon.logo else f'{settings.STATIC_URL}v2/images/emails/hackathons-neg.png',
+                'url': hackathon.url,
+                'date': hackathon.start_date.strftime("%Y-%d-%m")
+            })
+
     params = {
         'old_bounties': old_bounties,
         'bounties': bounties,
@@ -542,7 +579,10 @@ def render_new_bounty(to_email, bounties, old_bounties, offset=3, trending_quest
 		'email_type': 'new_bounty_notifications',
         'base_url': settings.BASE_URL,
         'show_action': True,
-        'trending_quests': trending_quests,
+        'quest_of_the_day': quest_of_the_day,
+        'upcoming_events': upcoming_events,
+        'activities': latest_activities,
+        'notifications_count': notifications_count,
         'show_action': is_email_townsquare_enabled(to_email) and is_there_an_action_available()
     }
 
@@ -560,7 +600,7 @@ def render_unread_notification_email_weekly_roundup(to_email, from_date=date.tod
     from_date = from_date + timedelta(days=1)
     to_date = from_date - timedelta(days=days_ago)
 
-    notifications = Notification.objects.filter(to_user=profile.id, is_read=False, created_on__range=[to_date, from_date]).count()
+    notifications = Notification.objects.filter(to_user=profile.user.id, is_read=False, created_on__range=[to_date, from_date]).count()
 
     params = {
         'subscriber': subscriber,
@@ -1146,7 +1186,7 @@ def weekly_recap(request):
 
 @staff_member_required
 def unread_notification_email_weekly_roundup(request):
-    response_html, _ = render_unread_notification_email_weekly_roundup('[email protected]')
+    response_html, _, _ = render_unread_notification_email_weekly_roundup('[email protected]')
     return HttpResponse(response_html)
 
 @staff_member_required
@@ -1224,9 +1264,10 @@ def resend_new_tip(request):
 @staff_member_required
 def new_bounty(request):
     from dashboard.models import Bounty
+    from marketing.views import quest_of_the_day, upcoming_grant, upcoming_hackathon, latest_activities
     bounties = Bounty.objects.current().order_by('-web3_created')[0:3]
     old_bounties = Bounty.objects.current().order_by('-web3_created')[0:3]
-    response_html, _ = render_new_bounty(settings.CONTACT_EMAIL, bounties, old_bounties, int(request.GET.get('offset', 2)))
+    response_html, _ = render_new_bounty(settings.CONTACT_EMAIL, bounties, old_bounties='', offset=int(request.GET.get('offset', 2)), quest_of_the_day=quest_of_the_day(), upcoming_grant=upcoming_grant(), upcoming_hackathon=upcoming_hackathon(), latest_activities=latest_activities(request.user))
     return HttpResponse(response_html)