feat #4138 Changes requested in review

Author: joemull

src/core/forms/forms.py

@@ -6,6 +6,7 @@
 import uuid
 import json
 import os
+import warnings
 
 from django import forms
 from django.db.models import Q
@@ -131,7 +132,7 @@ def __init__(self, *args, **kwargs):
 
 class JournalContactForm(ContactPersonForm):
     def __init__(self, *args, **kwargs):
-        return DeprecationWarning("Use ContactPersonForm instead.")
+        warnings.warn("Use ContactPersonForm instead.")
         super().__init__(*args, **kwargs)
 
 

src/core/logic.py

@@ -1289,8 +1289,6 @@ def get_contact_form(request, contact_person_id):
 
 
 def send_contact_message(contact_form, request):
-    # Todo: do we need this if the field is bleached rich text?
-    body = contact_form.cleaned_data["body"].replace("\n", "<br>")
     sender_email = contact_form.cleaned_data["sender"]
     contact_person = get_object_or_404(
         models.ContactPerson,
@@ -1318,7 +1316,7 @@ def send_contact_message(contact_form, request):
             "from": sender_email,
             "to": recipient_email,
             "subject": contact_form.cleaned_data["subject"],
-            "body": body,
+            "body": contact_form.cleaned_data["body"],
             "custom_reply_to": contact_form.cleaned_data["sender"],
         },
         log_dict=log_dict,

src/core/migrations/0110_rename_contacts_contactperson_and_more.py

@@ -9,20 +9,6 @@
 logger = get_logger(__name__)
 
 
-def normalize_email(email):
-    """
-    Copied from Django 4.2's AccountManager.
-    """
-    email = email or ""
-    try:
-        email_name, domain_part = email.strip().rsplit("@", 1)
-    except ValueError:
-        pass
-    else:
-        email = email_name + "@" + domain_part.lower()
-    return email
-
-
 def connect_contact_person_to_account(apps, schema_editor):
     ContactPerson = apps.get_model("core", "ContactPerson")
     Account = apps.get_model("core", "Account")
@@ -34,26 +20,34 @@ def connect_contact_person_to_account(apps, schema_editor):
         if matching_accounts.exists():
             account = matching_accounts.first()
         else:
-            normalized_email = normalize_email(email)
+            normalized_email = Account.objects.normalize_email(email)
             account = Account.objects.create(
                 email=normalized_email,
                 username=normalized_email,
                 first_name=" ".join(contact_person.name.split()[:-1]),
                 last_name=contact_person.name.split()[-1],
             )
         contact_person.account = account
+        contact_person.email = ""
         contact_person.save()
 
 
 def infer_contact_message_target(apps, account):
     Journal = apps.get_model("journal", "Journal")
     Press = apps.get_model("press", "Press")
+    ContactPerson = apps.get_model("core", "ContactPerson")
+
+    contact_person_records = ContactPerson.objects.filter(account=account)
+    is_staff = account.is_staff
     journals_where_editor = Journal.objects.filter(
         accountrole__user=account,
         accountrole__role__slug="editor",
     )
-    is_staff = account.is_staff
-    if is_staff and journals_where_editor.count() == 0:
+
+    if contact_person_records.count() == 1:
+        # This person must have been contacted on the same site as their ContactPerson record.
+        target = contact_person_records.first().object
+    elif is_staff and journals_where_editor.count() == 0:
         # This person must have been contacted in their press staff capacity.
         target = Press.objects.first()
     elif not is_staff and journals_where_editor.count() == 1:
@@ -83,7 +77,7 @@ def move_contact_message_to_log_entry(apps, schema_editor):
         if matching_accounts.exists():
             account = matching_accounts.first()
         else:
-            normalized_email = normalize_email(email)
+            normalized_email = Account.objects.normalize_email(email)
             account = Account.objects.create(
                 email=normalized_email,
                 username=normalized_email,

src/core/models.py

@@ -393,6 +393,8 @@ def create(self, **kwargs):
 
 
 class AccountManager(BaseUserManager):
+    use_in_migrations = True
+
     def create_user(self, username=None, password=None, email=None, **kwargs):
         """Creates a user from the given username or email
         In Janeway, users rely on email addresses to log in. For compatibility

src/journal/logic.py

@@ -397,7 +397,7 @@ def set_article_image(request, article):
 
 
 def send_contact_message(new_contact, request):
-    raise DeprecationWarning(
+    warnings.warn(
         "`journal.logic.send_contact_message` is deprecated. "
         "Use `core.logic.send_contact_message` instead."
     )

src/utils/install/journal_defaults.json

@@ -5628,7 +5628,7 @@
             "type": "rich-text"
         },
         "value": {
-            "default": "<p>{{ body|safe }}</p><hr><p>The above was sent from the <a href=\"{% stateless_site_url site 'contact' %}\">contact page for {{ site.name }}</a> by {{ from }}.</p>"
+            "default": "<p>{{ body|safe|linebreaksbr }}</p><hr><p>The above was sent from the <a href=\"{% stateless_site_url site 'contact' %}\">contact page for {{ site.name }}</a> by {{ from }}.</p>"
         },
         "editable_by": [
             "editor",

src/utils/models.py

@@ -20,9 +20,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from utils.logger import get_logger
-from utils.shared import get_ip_address
 from utils.importers.up import get_input_value_by_name
-from utils.shared import get_ip_address
 
 logger = get_logger(__name__)
 
@@ -215,7 +213,7 @@ def viewable_as_contact_message_by(self, account):
         """
         if self.types == "Contact Message":
             if Addressee.objects.filter(
-                email__iexact=account.email,
+                email__iexact=account.__class__.objects.normalize_email(account.email),
             ).exists():
                 return True
         return False