website Changeset - c287dac43303 · Conservancy Kallithea

Changeset - c287dac43303

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Ben Sturmfels (bsturmfels) - 2 months ago 2024-01-31 01:28:45
ben@sturm.com.au

usethesource: Make email addresses configurable

2 files changed with 21 insertions and 6 deletions:

conservancy/settings.py

conservancy/usethesource/emails.py

0 comments (0 inline, 0 general)

conservancy/settings.py

➞

Show inline comments

@@ ... / @@ -149,3 +149,8 @@ MIDDLEWARE = [ @@
     'conservancy.middleware.ForceCanonicalHostnameMiddleware',
     # 'django.middleware.doc.XViewMiddleware',
+]
 USETHESOURCE = {
     'SENDER': 'compliance@sfconservancy.org',
     'LIST_RECIPIENT': 'nutbush@lists.sfconservancy.org',
+}

conservancy/usethesource/emails.py

➞

Show inline comments

 from django.conf import settings
 from django.core.mail import EmailMessage
 from django.shortcuts import reverse
 SENDER = 'compliance@sfconservancy.org'
 LIST_RECIPIENT = 'nutbush@lists.sfconservancy.org'
 SENDER = settings.USETHESOURCE['SENDER']
 LIST_RECIPIENT = settings.USETHESOURCE['LIST_RECIPIENT']
 def make_candidate_email(candidate, user):
@@ ... / @@ -21,23 +22,32 @@ Released: {candidate.release_date} @@
 {candidate.description}
-To download this candidate's source and binary image, visit:
+To view this candidate and download the source and binary image, visit:
 https://sfconservancy.org{reverse('usethesource:candidate', kwargs={'slug': candidate.slug})}
 --
 {signature}
 '''
+(Via http//sfconservancy.org{reverse('usethesource:landing')})'''
     headers = {'Message-ID': candidate.email_message_id}
     return EmailMessage(subject, body, sender, to, headers=headers)
 def make_comment_email(comment):
     """Email when a comment is added to a candidate."""
     subject = f'Re: {comment.candidate.name}'
     candidate = comment.candidate
     subject = f'Re: {candidate.name}'
     signature = comment.user.get_full_name() or comment.user.username
     sender = f'{signature} <{SENDER}>'
     to = [LIST_RECIPIENT]
     body = f'{comment.message}\n\n--\n{signature}'
     body = f'''\
 {comment.message}
 To view this candidate and download the source and binary image, visit:
 https://sfconservancy.org{reverse('usethesource:candidate', kwargs={'slug': candidate.slug})}
 --
 {signature}
 (Via http//sfconservancy.org{reverse('usethesource:landing')})'''
     headers = {'Message-ID': comment.email_message_id}
     if in_reply_to := comment.in_reply_to():
         # From my testing, both "In-Reply-To" and "References" headers trigger

0 comments (0 inline, 0 general)