double import celery

Author: Johnetordoff

api/institutions/authentication.py

@@ -372,6 +372,7 @@ def authenticate(self, request):
                 name=NotificationType.Type.USER_DUPLICATE_ACCOUNTS_OSF4I,
             ).emit(
                 user=user,
+                subscribed_object=user,
                 event_context={
                     'user_fullname': user.fullname,
                     'user_username': user.username,

framework/auth/views.py

@@ -861,6 +861,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
 
     NotificationType.objects.get(name=notification_type).emit(
         user=user,
+        subscribed_object=user,
         event_context={
             'user_fullname': user.fullname,
             'confirmation_url': confirmation_url,

notifications.yaml

@@ -27,10 +27,6 @@ notification_types:
     __docs__: ...
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/password_reset.html.mako'
-  - name: user_contributor_added_draft_registration
-    __docs__: ...
-    object_content_type_model_name: osfuser
-    template: 'website/templates/emails/contributor_added_draft_registration.html.mako'
   - name: user_contributor_added_preprint_node_from_osf
     __docs__: ...
     object_content_type_model_name: osfuser
@@ -39,10 +35,6 @@ notification_types:
     __docs__: ...
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/contributor_added_access_request.html.mako'
-  - name: user_contributor_added_draft_registration
-    __docs__: ...
-    object_content_type_model_name: osfuser
-    template: 'website/templates/emails/contributor_added_draft_registration.html.mako'
   - name: user_contributor_added_osf_preprint
     subject: 'You have been added as a contributor to an OSF preprint.'
     __docs__: ...

osf/models/user.py

@@ -1061,6 +1061,7 @@ def set_password(self, raw_password, notify=True):
             NotificationType.objects.get(
                 name=NotificationType.Type.USER_PASSWORD_RESET
             ).emit(
+                subscribed_object=self,
                 user=self,
                 message_frequency='instantly',
                 event_context={

website/notifications/listeners.py

@@ -77,6 +77,7 @@ def queue_first_public_project_email(user, node):
     NotificationType.objects.get(
         name=NotificationType.Type.USER_NEW_PUBLIC_PROJECT,
     ).emit(
+        subscribed_object=user,
         user=user,
         event_context={
             'nid': node._id,

website/profile/views.py

@@ -190,6 +190,7 @@ def update_user(auth):
             NotificationType.objects.get(
                 name=NotificationType.Type.USER_PRIMARY_EMAIL_CHANGED
             ).emit(
+                subscribed_object=user,
                 user=user,
                 event_context={
                     'new_address': username,

website/project/views/contributor.py

@@ -453,6 +453,7 @@ def send_claim_registered_email(claimer, unclaimed_user, node, throttle=24 * 360
     NotificationType.objects.get(
         name=NotificationType.Type.USER_PENDING_VERIFICATION_REGISTERED
     ).emit(
+        subscribed_object=claimer,
         user=claimer,
         event_context={
             'claim_url': claim_url,
@@ -534,6 +535,7 @@ def send_claim_email(
             NotificationType.objects.get(
                 name=NotificationType.Type.USER_PENDING_VERIFICATION
             ).emit(
+                subscribed_object=unclaimed_user,
                 user=unclaimed_user,
                 event_context={
                     'user': unclaimed_user.id,

website/settings/defaults.py

@@ -458,6 +458,8 @@ class CeleryConfig:
         'scripts.triggered_mails',
         'website.mailchimp_utils',
         'website.notifications.tasks',
+        'website.notifications.tasks.send_moderators_digest_email',
+        'website.notifications.tasks.send_users_digest_email',
         'website.collections.tasks',
         'website.identifiers.tasks',
         'website.preprints.tasks',
@@ -553,6 +555,8 @@ class CeleryConfig:
         'osf.management.commands.registration_schema_metrics',
         'website.mailchimp_utils',
         'website.notifications.tasks',
+        'website.notifications.tasks.send_users_digest_email',
+        'website.notifications.tasks.send_moderators_digest_email',
         'website.archiver.tasks',
         'website.identifiers.tasks',
         'website.search.search',