@@ -136,6 +136,7 @@ def print_debug(message, schedule=None):
136136 """Prints email contents for debugging purposes"""
137137 logger .debug ("Email:" )
138138 logger .debug (f"From: { message ['From' ]['Name' ]} <{ message ['From' ]['Email' ]} >" )
139+ logger .debug (f"ReplyTo: { message ['ReplyTo' ]['Name' ]} <{ message ['ReplyTo' ]['Email' ]} >" )
139140 logger .debug (f"To: { message ['To' ][0 ]['Email' ]} " )
140141 logger .debug (f"Subject: { message ['Subject' ]} " )
141142 logger .debug (f"Body: { message ['TextPart' ]} " )
@@ -149,20 +150,26 @@ def print_debug(message, schedule=None):
149150
150151def send_email (mail_data , sender_email ):
151152 """Sends email using Mailjet API"""
153+ # Create the message with actual content
152154 if mail_data ["schedule" ] != "test" :
153- message = create_message (mail_data , sender_email , HOAGIE_EMAIL )
154- message ["Cc" ] = get_listservs ()
155+ actual_message = create_message (mail_data , sender_email , HOAGIE_EMAIL )
156+ actual_message ["Cc" ] = get_listservs ()
155157 else :
156- message = create_message (mail_data , sender_email , sender_email )
158+ actual_message = create_message (mail_data , sender_email , sender_email )
157159
158- # In debug mode, print email contents instead of sending
159- if settings . DEBUG :
160- print_debug ( message )
160+ print_debug ( actual_message )
161+
162+ if not settings . SEND_EMAIL :
161163 return
162164
165+ # Send email only to self if not in production
166+ to_send = actual_message
167+ if not settings .PROD and mail_data ["schedule" ] != "test" :
168+ to_send = create_message (mail_data , sender_email , sender_email )
169+
163170 # Send email via Mailjet
164171 mailjet = get_mailjet_client ()
165- result = mailjet .send .create (data = {"Messages" : [message ]})
172+ result = mailjet .send .create (data = {"Messages" : [to_send ]})
166173
167174 result_status = result .status_code
168175 if result_status == 200 :
@@ -200,10 +207,8 @@ def handle_scheduled_email(mail_data, user):
200207 return "You already have an email scheduled for this time. If you would like to change your message, please \
201208 delete your mail in the Scheduled Emails page and try again."
202209
203- if settings .DEBUG :
204- message = create_message (mail_data , user .email , HOAGIE_EMAIL )
205- print_debug (message , schedule = schedule_time_et )
206- return
210+ message = create_message (mail_data , user .email , HOAGIE_EMAIL )
211+ print_debug (message , schedule = schedule_time_et )
207212
208213 # Create scheduled email
209214 ScheduledEmail .objects .create (
0 commit comments