Upgrades to contact messages #4845

joemull · 2025-07-08T16:33:43Z

Closes #4138.
Closes #1720.

~~Please also review and merge docs PR: https://github.com/openlibhums/memory-alpha/pull/155.~~

Notes

Closes the linked issues
Connects the contact person and contact message models to account, so that we do not have names and emails outside of the Account object
Renames the contact person and contact message models to make them easier to read and work with
Removes stored client IPs to comply with GDPR
Adds the Django auto-documentation views, which are helpful when searching for template tags and filters, and which show you view and url pairs
Documents a few things
Tests for the contact manager and the press and journal contact pages

Screenshots for contact system

Screenshots for admin docs feature

I enabled this in the process of doing this work. It is enormously helpful to view a comprehensive list of things in Janeway sometimes.

ajrbyers

I've added a few comments inline for you to go over, however, I have a fundamental question about this implementation. We have a contact form to obscure email addresses from being scraped. If we require a user to create a URL with the users email address in it we may be defeating this purpose. I think the account UUID field is the least painful option here. The Contacts page could present contact link that a user could simply copy and paste so they don't have to form it themselves?

Open to thoughts on this.

src/core/migrations/0111_rename_contacts_contactperson_and_more.py

src/templates/admin/core/manager/contacts/related_info.html

src/templates/admin/core/manager/contacts/index.html

src/templates/admin/core/manager/contacts/contact_person_form.html

joemull · 2025-09-30T14:34:17Z

I've added a few comments inline for you to go over, however, I have a fundamental question about this implementation. We have a contact form to obscure email addresses from being scraped. If we require a user to create a URL with the users email address in it we may be defeating this purpose. I think the account UUID field is the least painful option here. The Contacts page could present contact link that a user could simply copy and paste so they don't have to form it themselves?

Open to thoughts on this.

All good suggestions, thanks! Updated with some changes:

Used uuid as suggested
Added link copy button as suggested
Went ahead and standardised other buttons and confirm delete behavior for consistency
Fixed other display issues
Updated migration to fix bug, and tested with OLH data

joemull · 2025-10-01T13:13:40Z

Note: Going to rebase this as there are conflicts keeping the CI job from running.

joemull · 2025-10-01T13:37:43Z

One other thing to be aware of in review: the migration in this PR wipes the client IP data on contact messages, for GDPR purposes. This is what we want, right?

joemull · 2025-12-08T10:03:56Z

@mauromsl This is now ready for another review. I had to rebase to get CI to run. The new commits are the last three, starting after 1c2e0e5.

mauromsl

a few comments inline around the complexity of email comparisons and related data migrations.

src/core/forms/forms.py

src/core/janeway_global_settings.py

src/core/logic.py

mauromsl · 2025-12-10T11:37:55Z

src/core/forms/forms.py

+        label=_("Who would you like to contact?"),
+    )
+    sender = forms.EmailField(
+        max_length=200,


we probably want a constant to keep Logentry.actor_email and this in sync.

I can't work out what you mean. In sync in what way?

Sorry, I meant the max_length, by using a constant, so that if one changes, the other does too. (since we copy from one to the other)

src/core/migrations/0110_rename_contacts_contactperson_and_more.py

src/core/migrations/0111_rename_contacts_contactperson_and_more.py

mauromsl · 2025-12-10T12:28:30Z

src/core/migrations/0111_rename_contacts_contactperson_and_more.py

+        matching_accounts = Account.objects.filter(
+            models.Q(username__iexact=email) | models.Q(email__iexact=email),
+        )
+        if matching_accounts.exists():
+            account = matching_accounts.first()
+        else:
+            normalized_email = normalize_email(email)
+            account = Account.objects.create(
+                email=normalized_email,
+                username=normalized_email,
+            )


as above, consider querying against email.lower() and handle potential IntegrityError on Account.objects.create()

src/journal/logic.py

src/utils/models.py

joemull · 2025-12-12T13:45:51Z

@mauromsl I've made some changes and responded above with some questions and comments. Remember to hit the "Load more" under hidden conversations to see the main one.

mauromsl · 2025-12-18T09:25:37Z

src/core/forms/forms.py

+        label=_("Who would you like to contact?"),
+    )
+    sender = forms.EmailField(
+        max_length=200,


Sorry, I meant the max_length, by using a constant, so that if one changes, the other does too. (since we copy from one to the other)

mauromsl

replied to comments, we are nearly there

joemull · 2025-12-18T16:47:02Z

OK @mauromsl, I've addressed your comments. I've also tested it with a larger database and optimized the db access in the migration so it's quicker. There was also a bug with log entry dates because auto_now_add can't be manually overridden, so I made another change to that model.

joemull self-assigned this Jul 8, 2025

joemull changed the base branch from master to a11y-1.9 July 15, 2025 10:15

joemull force-pushed the b-4138-contact-message-upgrades branch from a7107c2 to 138ecfc Compare July 15, 2025 10:16

joemull force-pushed the a11y-1.9 branch 2 times, most recently from c457b14 to 53750df Compare July 16, 2025 13:06

Base automatically changed from a11y-1.9 to master July 16, 2025 13:28

joemull force-pushed the b-4138-contact-message-upgrades branch 3 times, most recently from 70f5a95 to e7c4f6c Compare July 21, 2025 16:46

joemull marked this pull request as ready for review July 21, 2025 16:46

joemull requested a review from ajrbyers July 21, 2025 16:54

joemull assigned ajrbyers and unassigned joemull Jul 21, 2025

ajrbyers requested changes Jul 22, 2025

View reviewed changes

ajrbyers assigned joemull and unassigned ajrbyers Jul 22, 2025

joemull requested a review from ajrbyers September 30, 2025 14:35

joemull assigned ajrbyers and unassigned joemull Sep 30, 2025

joemull assigned joemull and unassigned ajrbyers Oct 1, 2025

joemull force-pushed the b-4138-contact-message-upgrades branch from 4fe988c to 311b196 Compare October 1, 2025 13:35

joemull assigned ajrbyers and unassigned joemull Oct 2, 2025

ajrbyers approved these changes Oct 7, 2025

View reviewed changes

ajrbyers requested a review from StephDriver October 7, 2025 10:18

ajrbyers assigned StephDriver Oct 7, 2025

joemull added 6 commits December 5, 2025 10:52

feat #4138 Avoid relying on model manager in migration

234328d

feat #4138 Change contact URLs to new press view

14f47f8

feat #4138 Make data migration more robust

2a6eede

feat #4138 Make variables in included templates more explicit

1c2e0e5

feat #4138 Store contact messages as log entries and create UI for them

d8a92f5

feat #4138 Document upgraded contact system

a59fde6

joemull force-pushed the b-4138-contact-message-upgrades branch from 27d1754 to a59fde6 Compare December 5, 2025 11:04

feat #4138 Fix rebase bug and update docs

22f9199

joemull removed their assignment Dec 8, 2025

joemull requested a review from mauromsl December 8, 2025 10:01

joemull assigned mauromsl Dec 8, 2025

mauromsl requested changes Dec 10, 2025

View reviewed changes

mauromsl assigned joemull and unassigned mauromsl Dec 10, 2025

feat #4138 Changes requested in review

f3c27b3

joemull requested a review from mauromsl December 12, 2025 13:44

joemull assigned mauromsl and unassigned joemull Dec 12, 2025

feat #4138 Add manager migration and fix GFK error in data migration

82f99c7

mauromsl requested changes Dec 18, 2025

View reviewed changes

mauromsl assigned joemull and unassigned mauromsl Dec 18, 2025

feat #4138 Avoid unforeseen migration errors; optimize; fix date bug

fdfbd8d

joemull requested a review from mauromsl December 18, 2025 16:47

joemull assigned mauromsl and unassigned joemull Dec 18, 2025

Upgrades to contact messages #4845

Are you sure you want to change the base?

Upgrades to contact messages #4845

Uh oh!

Conversation

joemull commented Jul 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Notes

Screenshots for contact system

Screenshots for admin docs feature

Uh oh!

ajrbyers left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

joemull commented Sep 30, 2025

Uh oh!

joemull commented Oct 1, 2025

Uh oh!

joemull commented Oct 1, 2025

Uh oh!

joemull commented Dec 8, 2025

Uh oh!

mauromsl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mauromsl Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

joemull Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

mauromsl Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mauromsl Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

joemull commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mauromsl Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

mauromsl left a comment

Choose a reason for hiding this comment

Uh oh!

joemull commented Dec 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

joemull commented Jul 8, 2025 •

edited

Loading

joemull commented Dec 12, 2025 •

edited

Loading