fix email templates

Johnetordoff · Johnetordoff · commit 1bfaf2f54d08 · 2025-08-11T09:48:02.000-04:00
diff --git a/api_tests/identifiers/views/test_identifier_detail.py b/api_tests/identifiers/views/test_identifier_detail.py
@@ -155,7 +155,7 @@ def test_identifier_preprint_detail_unpublished(
 
         # test_unpublished_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 200
 
@@ -181,7 +181,7 @@ def test_identifier_preprint_detail_deleted(
 
         # test_deleted_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 404
 
@@ -207,7 +207,7 @@ def test_identifier_preprint_detail_private(
 
         # test_private_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 200
 
@@ -233,7 +233,7 @@ def test_identifier_preprint_detail_abandoned(
 
         # test_abandoned_preprint_identifier_readcontrib_authenticated
         read_user = AuthUserFactory()
-        preprint.add_contributor(read_user, READ, save=True)
+        preprint.add_contributor(read_user, READ, save=True, notification_type=False)
         res = app.get(url, auth=read_user.auth, expect_errors=True)
         assert res.status_code == 403
 
diff --git a/notifications/listeners.py b/notifications/listeners.py
@@ -70,9 +70,9 @@ def queue_first_public_project_email(user, node):
         subscribed_object=user,
         user=user,
         event_context={
+            'user_fullname': user.fullname,
             'domain': settings.DOMAIN,
             'nid': node._id,
-            'fullname': user.fullname,
             'project_title': node.title,
             'osf_url': settings.DOMAIN,
         }
diff --git a/osf/models/collection_submission.py b/osf/models/collection_submission.py
@@ -1,6 +1,7 @@
 import logging
 
 from django.db import models
+from django.utils import timezone
 from django.utils.functional import cached_property
 from framework import sentry
 from framework.exceptions import PermissionsError
@@ -104,17 +105,26 @@ def _notify_contributors_pending(self, event_data):
             NotificationType.objects.get(
                 name=NotificationType.Type.COLLECTION_SUBMISSION_SUBMITTED,
             ).emit(
+                is_digest=True,
                 user=contributor,
                 subscribed_object=self,
                 event_context={
-                    'user': contributor.id,
-                    'submitter': user.id,
+                    'requester_contributor_names': ''.join(
+                        self.guid.referent.contributors.values_list('fullname', flat=True)),
+                    'localized_timestamp': str(timezone.now()),
+                    'user_fullname': contributor.fullname,
+                    'submitter_fullname': user.fullname,
+                    'requester_fullname': self.creator.fullname,
+                    'profile_image_url': user.profile_image_url(),
+                    'submitter_absolute_url': user.get_absolute_url(),
+                    'collections_link': settings.DOMAIN + 'collections/' + self.collection.provider._id,
+                    'collection_provider_name': self.collection.provider.name,
                     'is_initiator': self.creator == contributor,
                     'is_admin': self.guid.referent.has_permission(contributor, ADMIN),
                     'is_registered_contrib': contributor.is_registered,
-                    'collection': self.collection.id,
                     'claim_url': claim_url,
-                    'node': self.guid.referent.id,
+                    'node_title': self.guid.referent.title,
+                    'node_absolute_url': self.guid.referent.get_absolute_url(),
                     'domain': settings.DOMAIN,
                     'osf_contact_email': settings.OSF_CONTACT_EMAIL,
                 },
@@ -128,7 +138,7 @@ def _notify_moderators_pending(self, event_data):
             user=user,
             subscribed_object=self.guid.referent,
             event_context={
-                'submitter': self.creator.id,
+                'submitter_fullname': self.creator.fullname,
                 'requester_contributor_names': ''.join(self.guid.referent.contributors.values_list('fullname', flat=True))
             },
             is_digest=True,
diff --git a/website/templates/emails/collection_submission_accepted.html.mako b/website/templates/emails/collection_submission_accepted.html.mako
@@ -6,9 +6,9 @@
     <p>
         % if is_admin:
             Your request to add <a href="${node.absolute_url}">${node.title}</a> to
-            <a href="${domain + 'collections/' + collection.provider._id}">${collection.provider.name}</a> was approved.
+            <a href="${domain + 'collections/' + collection.provider._id}">${collection_provider_name}</a> was approved.
         % else:
-            <a href="${node.absolute_url}">${node.title}</a> was added to <a href="${domain + 'collections/' + collection.provider._id}">${collection.provider.name}</a>.
+            <a href="${node.absolute_url}">${node.title}</a> was added to <a href="${domain + 'collections/' + collection.provider._id}">${collection_provider_name}</a>.
         % endif
     </p>
     <p>
diff --git a/website/templates/emails/collection_submission_cancel.html.mako b/website/templates/emails/collection_submission_cancel.html.mako
@@ -6,19 +6,19 @@
     <br>
     <p>
         % if is_admin:
-             The request to add <a href="${node.absolute_url}">${node.title}</a> to
+             The request to add <a href="${node_absolute_url}">${node_title}</a> to
              % if collection.provider:
-                <a href="${domain + 'collections/' + collection_provider__id}">${collection_provider_name}</a>
+                <a href="${collections_link}">${collection_provider_name}</a>
             % else:
                 <a href="${domain + 'myprojects/'}">${collection_provider_name}</a>
             % endif
 
             was canceled. If you wish to be associated with the collection, you will need to request to be added again.
         % else:
             <a href="${remover_absolute_url}">${remover.fullname}</a> canceled the request to add
-            <a href="${node_absolute_url}">${node.title}</a>to
+            <a href="${node_absolute_url}">${node_title}</a>to
             % if collection.provider:
-                <a href="${domain + 'collections/' + collection_provider__id}">${collection.provider.name}</a>
+                <a href="${collections_link}">${collection_provider_name}</a>
             % else:
                 <a href="${domain  + 'myprojects/'}">${collection_provider_name}</a>
             % endif
@@ -27,7 +27,7 @@
     </p>
     <p>
         If you are not ${user_fullname} or you have been erroneously associated with
-        <a href="${node.absolute_url}">${node.title}</a>, email ${osf_contact_email} with the subject line
+        <a href="${node_absolute_url}">${node_title}</a>, email ${osf_contact_email} with the subject line
         "Claiming error" to report the problem.
     </p>
     Sincerely,<br>
diff --git a/website/templates/emails/collection_submission_rejected.html.mako b/website/templates/emails/collection_submission_rejected.html.mako
@@ -8,15 +8,15 @@
     <p>
         % if is_admin:
             Your request to add  <a href="${node.absolute_url}">${node.title}</a> to
-            <a href="${domain + 'collections/' + collection_provider__id}">${collection_provider_name}</a> was not accepted.
+            <a href="${collections_link}">${collection_provider_name}</a> was not accepted.
             <p>
                 Rejection Justification:
             </p>
             <p>
                 ${rejection_justification}
             </p>
         % else:
-            <a href="${node.absolute_url}">${node.title}</a> was not accepted  by <a href="${domain + 'collections/' + collection_provider__id}">${collection.provider.name}</a>.
+            <a href="${node.absolute_url}">${node.title}</a> was not accepted  by <a href="${collections_link}">${collection_provider_name}</a>.
         % endif
     </p>
     <p>
diff --git a/website/templates/emails/collection_submission_removed_admin.html.mako b/website/templates/emails/collection_submission_removed_admin.html.mako
@@ -8,7 +8,7 @@
     <p>
         % if is_admin:
             <a href="${node_absolute_url}">${node_title}</a> was removed from
-            <a href="${domain + 'collections/' + collection_provider__id}">${collection_provider_name}</a>. If you wish to be associated with the collection, you
+            <a href="${collections_link}">${collection_provider_name}</a>. If you wish to be associated with the collection, you
             will need to reapply to the collection again.
         % else:
             <a href="${remover_absolute_url}">${remover_fullname}</a> removed
diff --git a/website/templates/emails/collection_submission_removed_moderator.html.mako b/website/templates/emails/collection_submission_removed_moderator.html.mako
@@ -7,7 +7,7 @@
     <br>
     <p>
         % if is_admin:
-            <a href="${node.absolute_url}">${node.title}</a> was  removed by <a href="${domain + 'collections/' + collection.provider._id}">${collection.provider.name}</a>:
+            <a href="${node.absolute_url}">${node.title}</a> was  removed by <a href="${domain + 'collections/' + collection.provider._id}">${collection_provider_name}</a>:
             <br>
             <p>
                 ${rejection_justification}
@@ -16,7 +16,7 @@
             If you wish to be associated with the collection, you will need to reapply to the collection again.
         % else:
             <a href="${node.absolute_url}">${node.title}</a> was removed by
-            <a href="${domain + 'collections/' + collection_provider__id}">${collection_provider_name}</a>
+            <a href="${collections_link}">${collection_provider_name}</a>
         % endif
     </p>
     <p>
diff --git a/website/templates/emails/collection_submission_removed_private.html.mako b/website/templates/emails/collection_submission_removed_private.html.mako
@@ -9,16 +9,16 @@
             You have changed the privacy of <a href="${node.absolute_url}">${node.title}</a> and it has therefore been
             removed from
             % if collection.provider:
-                <a href="${domain + 'collections/' + collection.provider._id}">${collection.provider.name}</a>
+                <a href="${domain + 'collections/' + collection.provider._id}">${collection_provider_name}</a>
             % else:
-                <a href="${domain + 'myprojects/'}">${collection.provider.name}</a>
+                <a href="${domain + 'myprojects/'}">${collection_provider_name}</a>
             % endif
             . If you wish to be associated with the collection, you will need to request addition to the collection again.
         % else:
             <a href="${remover_absolute_url}">${remover_fullname}</a> has changed the privacy settings for
             <a href="${node_absolute_url}">${node_title}</a> it has therefore been removed from
             % if collection.provider:
-                <a href="${domain + 'collections/' + collection_provider__id}">${collection_provider_name}</a>
+                <a href="${collections_link}">${collection_provider_name}</a>
             % else:
                 <a href="${domain + 'myprojects/'}">${collection_provider_name}</a>
             % endif
diff --git a/website/templates/emails/collection_submission_submitted.html.mako b/website/templates/emails/collection_submission_submitted.html.mako
@@ -6,17 +6,17 @@
         <br>
         <p>
             % if is_initator:
-                You just started a request to add <a href="${node_absolute_url}">${node.title}</a>
-                to <a href="${domain + 'collections/' + collection_provider._id}">${collection_provider_name}</a>.
+                You just started a request to add <a href="${node_absolute_url}">${node_title}</a>
+                to <a href="${collections_link}">${collection_provider_name}</a>.
                 All admins and contributors will be notified via email.
             % elif is_registered_contrib:
                  <a href="${submitter_absolute_url}">${submitter_fullname}</a> just included you in <a href="${node_absolute_url}">${node_title}</a> to a request to add
-                  <a href="${node_absolute_url}">${node.title}</a> to
-                  <a href="${domain + 'collections/' + collection_provider__id}">${collection_provider_name}</a>.
+                  <a href="${node_absolute_url}">${node_title}</a> to
+                  <a href="${collections_link}">${collection_provider_name}</a>.
                   All admins and contributors will be notified via email.
             % else:
                 <a href="${submitter_absolute_url}">${submitter_fullname}</a> included you in a request to add
-                <a href="${node_absolute_url}">${node_title}</a> to <a href="${domain + 'collections/' + collection_provider__id}">${collection.provider.name}</a>
+                <a href="${node_absolute_url}">${node_title}</a> to <a href="${collections_link}">${collection_provider_name}</a>
                 <a href="${claim_url}">Click here to claim account link</a>. After you set a password, you will be able to make
                 contributions to the project. You will also be able to easily access this and any other project or
                 component by going to your "My Projects" page. If you decide to not make an account, then it's <b>important
diff --git a/website/templates/emails/fork_completed.html.mako b/website/templates/emails/fork_completed.html.mako
@@ -5,7 +5,7 @@
 <tr>
   <td style="border-collapse: collapse;">
 
-    <h3 class="text-center" style="padding: 0;margin: 30px 0 0 0;border: none;list-style: none;font-weight: 300;text-align: center;">The fork of <b>${title}</b> has been successfully created here: <a href="${settings.DOMAIN + guid}">${settings.DOMAIN + guid}</a> </h3>
+    <h3 class="text-center" style="padding: 0;margin: 30px 0 0 0;border: none;list-style: none;font-weight: 300;text-align: center;">The fork of <b>${title}</b> has been successfully created here: <a href="${domain + guid}">${domain + guid}</a> </h3>
   </td>
 </tr>
 </%def>
diff --git a/website/templates/emails/forward_invite.html.mako b/website/templates/emails/forward_invite.html.mako
@@ -21,7 +21,7 @@
     <br>
     ${claim_url}<br>
     <br>
-    Once you have set a password, you will be able to make contributions to ${node.title}. You will automatically be subscribed to notification emails for this project. To change your email notification preferences, visit your project or your user settings: ${settings.DOMAIN + 'settings/notifications/'}<br>
+    Once you have set a password, you will be able to make contributions to ${node.title}. You will automatically be subscribed to notification emails for this project. To change your email notification preferences, visit your project or your user settings: ${domain + 'settings/notifications/'}<br>
     <br>
     Sincerely,<br>
     <br>
diff --git a/website/templates/emails/invite_default.html.mako b/website/templates/emails/invite_default.html.mako
@@ -12,7 +12,7 @@
     <br>
     ${claim_url}<br>
     <br>
-    Once you have set a password, you will be able to make contributions to "${node.title}" and create your own projects. You will automatically be subscribed to notification emails for this project. To change your email notification preferences, visit your project or your user settings: ${settings.DOMAIN + "settings/notifications/"}<br>
+    Once you have set a password, you will be able to make contributions to "${node.title}" and create your own projects. You will automatically be subscribed to notification emails for this project. To change your email notification preferences, visit your project or your user settings: ${domain + "settings/notifications/"}<br>
     <br>
     To preview "${node.title}" click the following link: ${node.absolute_url}<br>
     <br>
diff --git a/website/templates/emails/invite_preprints_osf.html.mako b/website/templates/emails/invite_preprints_osf.html.mako
@@ -9,7 +9,7 @@
     <br>
     ${claim_url}<br>
     <br>
-    Once you have set a password, you will be able to make contributions to "${node.title}" and create your own preprints and projects. You will automatically be subscribed to notification emails for this preprint. To change your email notification preferences, visit your user settings: ${settings.DOMAIN + "settings/notifications/"}<br>
+    Once you have set a password, you will be able to make contributions to "${node.title}" and create your own preprints and projects. You will automatically be subscribed to notification emails for this preprint. To change your email notification preferences, visit your user settings: ${domain + "settings/notifications/"}<br>
     <br>
     To preview "${node.title}" click the following link: ${node.absolute_url}<br>
     <br>
diff --git a/website/templates/emails/new_public_project.html.mako b/website/templates/emails/new_public_project.html.mako
@@ -11,11 +11,7 @@
             <li><a href="${osf_url}${nid}/analytics/">You can see analytics on how many others are accessing your projects</a></li>
             <li><a href="${osf_url}${nid}/">Visitors to your project can cite your work using the citation widget on your project’s page</a></li>
         </ul>
-        <a href="https://twitter.com/share" class="twitter-share-button" data-url="${osf_url}${nid}/" data-text="Check out my project on OSF!" data-count="none">Tweet</a>
         <br>
-        <script>
-            !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');
-        </script>
         <br>
         If you would like to learn more about how to take advantage of any of these features, visit our <a href="https://help.osf.io" target="_blank" rel="noreferrer">Guides</a>.</a>.
         <br><br>
diff --git a/website/templates/emails/pending_embargo_admin.html.mako b/website/templates/emails/pending_embargo_admin.html.mako
@@ -69,7 +69,7 @@
       <p>
       You will be automatically subscribed to notification emails for this project. To change your email notification
       preferences, visit your project or your user settings:
-      <a href="${domain + "settings/notifications/"}">${settings.DOMAIN}settings/notifications</a>
+      <a href="${domain + "settings/notifications/"}">${domain}settings/notifications</a>
       </p>
     % endif
     <p>
diff --git a/website/templates/emails/pending_embargo_non_admin.html.mako b/website/templates/emails/pending_embargo_non_admin.html.mako
@@ -33,7 +33,7 @@
       <p>
       You will be automatically subscribed to notification emails for this project. To change your email notification
       preferences, visit your project or your user settings:
-	  <a href="${settings.DOMAIN + "settings/notifications/"}">${settings.DOMAIN}settings/notifications</a>
+	  <a href="${domain + "settings/notifications/"}">${domain}settings/notifications</a>
       </p>
     % endif
     <p>
diff --git a/website/templates/emails/pending_embargo_termination_non_admin.html.mako b/website/templates/emails/pending_embargo_termination_non_admin.html.mako
@@ -11,7 +11,7 @@
     </p>
     <p>
     If all admins contributors appove, the registration will be made public as part of the
-    <a href="${settings.DOMAIN}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
+    <a href="${domain}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
     </p>
     <p>
     Admins have ${approval_time_span} hours from midnight tonight (EDT) to approve or cancel this
diff --git a/website/templates/emails/pending_registration_admin.html.mako b/website/templates/emails/pending_registration_admin.html.mako
@@ -17,10 +17,10 @@
     % if is_moderated:
       If approved by all admin contributors, the registration will be submitted for moderator review.
       If the moderators approve, the registration will be made public as part of the
-	  <a href="${settings.DOMAIN}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
+	  <a href="${domain}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
     % else:
       If approved by all admin contributors, the registration will be made public as part of the
-	  <a href="${settings.DOMAIN}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
+	  <a href="${domain}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
     % endif
     </p>
     <p style="color:red;">
@@ -67,7 +67,7 @@
       <p>
       You will be automatically subscribed to notification emails for this project. To change your email notification
       preferences, visit your project or your user settings:
-	  <a href="${settings.DOMAIN + "settings/notifications/"}">${settings.DOMAIN}settings/notifications</a>
+	  <a href="${domain + "settings/notifications/"}">${domain}settings/notifications</a>
       </p>
     % endif
     <p>
diff --git a/website/templates/emails/pending_registration_non_admin.html.mako b/website/templates/emails/pending_registration_non_admin.html.mako
diff --git a/website/templates/emails/pending_retraction_admin.html.mako b/website/templates/emails/pending_retraction_admin.html.mako
diff --git a/website/templates/emails/pending_retraction_non_admin.html.mako b/website/templates/emails/pending_retraction_non_admin.html.mako
diff --git a/website/templates/emails/updates_approved.html.mako b/website/templates/emails/updates_approved.html.mako
diff --git a/website/templates/emails/updates_initiated.html.mako b/website/templates/emails/updates_initiated.html.mako
diff --git a/website/templates/emails/updates_pending_approval.html.mako b/website/templates/emails/updates_pending_approval.html.mako
diff --git a/website/templates/emails/updates_rejected.html.mako b/website/templates/emails/updates_rejected.html.mako
