Merge branch 'hotfix/26.1.2'

Author: cslzchen

CHANGELOG

@@ -2,6 +2,15 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.1.2 (2026-01-05)
+===================
+
+- Notifications Refactor Phase 2 - UAT Hotfix Part 2
+  * Fix adding moderator email in admin
+  * Fix preprint/registration withdrawal request email in digest
+  * Fix subjects for schema response update emails
+  * Update defauls for triggered emails
+
 26.1.1 (2026-01-02)
 ===================
 

admin/providers/views.py

@@ -1,7 +1,8 @@
 from django.shortcuts import redirect
 from django.views.generic import TemplateView
 from django.contrib import messages
-from osf.models import RegistrationProvider, OSFUser
+from osf.models import RegistrationProvider, OSFUser, CollectionProvider, NotificationType
+from website.settings import DOMAIN
 
 
 class AddAdminOrModerator(TemplateView):
@@ -32,16 +33,41 @@ def post(self, request, *args, **kwargs):
         if target_user.has_groups(provider.group_names):
             messages.error(request, f'User with guid: {data["add-moderators-form"][0]} is already a moderator or admin')
             return redirect(f'{self.url_namespace}:add_admin_or_moderator', provider_id=provider.id)
+        context = {}
+        context['user_fullname'] = target_user.fullname
+        context['referrer_fullname'] = self.request.user.username
+        context['provider_name'] = provider.name
 
         if 'admin' in data:
             provider.add_to_group(target_user, 'admin')
             target_type = 'admin'
+            context['is_admin'] = True
         else:
             provider.add_to_group(target_user, 'moderator')
             target_type = 'moderator'
+            context['is_admin'] = False
+
+        context['provider_name'] = provider.name
+        context['provider__id'] = provider._id
+        context['is_reviews_moderator_notification'] = True
+
+        if isinstance(provider, RegistrationProvider):
+            provider_type_word = 'registries'
+            context['notification_settings_url'] = f'{DOMAIN}registries/{provider._id}/moderation/settings'
+        elif isinstance(provider, CollectionProvider):
+            provider_type_word = 'collections'
+            context['notification_settings_url'] = f'{DOMAIN}registries/{provider._id}/moderation/settings'
+        else:
+            provider_type_word = 'preprints'
+            context['notification_settings_url'] = f'{DOMAIN}preprints/{provider._id}/moderation/notifications'
 
+        context['provider_url'] = f'{provider.domain or DOMAIN}{provider_type_word}/{(provider._id if not provider.domain else '').strip('/')}'
         messages.success(request, f'The following {target_type} was successfully added: {target_user.fullname} ({target_user.username})')
-
+        notification_type = NotificationType.Type.PROVIDER_MODERATOR_ADDED
+        notification_type.instance.emit(
+            user=target_user,
+            event_context=context,
+        )
         return redirect(f'{self.url_namespace}:add_admin_or_moderator', provider_id=provider.id)
 
 

admin_tests/preprint_providers/test_views.py

@@ -31,6 +31,7 @@
 from admin.base.forms import ImportFileForm
 from django.contrib.messages.storage.fallback import FallbackStorage
 import website
+from tests.utils import capture_notifications
 
 pytestmark = pytest.mark.django_db
 
@@ -504,7 +505,8 @@ def test_post_add(self, add_moderator_view, req, user, provider):
         messages = FallbackStorage(req)
         setattr(req, '_messages', messages)
 
-        res = add_moderator_view.post(req)
+        with capture_notifications():
+            res = add_moderator_view.post(req)
         assert res.status_code == 302
         assert user in provider.get_group('moderator').user_set.all()
 

admin_tests/registration_providers/test_views.py

@@ -26,6 +26,7 @@
 
 from django.contrib.messages.storage.fallback import FallbackStorage
 from osf.migrations import update_provider_auth_groups
+from tests.utils import capture_notifications
 
 pytestmark = pytest.mark.django_db
 
@@ -318,7 +319,8 @@ def test_post_add(self, add_moderator_view, req, user, provider):
         messages = FallbackStorage(req)
         setattr(req, '_messages', messages)
 
-        res = add_moderator_view.post(req)
+        with capture_notifications():
+            res = add_moderator_view.post(req)
         assert res.status_code == 302
         assert user in provider.get_group('moderator').user_set.all()
 

notifications.yaml

@@ -583,28 +583,28 @@ notification_types:
     tests: ['api_tests/nodes/views/test_node_forks_list.py']
 
   - name: node_schema_response_initiated
-    subject: 'Schema Response Initiated'
+    subject: 'Updates for {resource_type} {title} are in progress'
     __docs__: ...
     object_content_type_model_name: abstractnode
     template: 'website/templates/updates_initiated.html.mako'
     tests: ['osf_tests/test_schema_responses.py']
 
   - name: node_schema_response_submitted
-    subject: 'Schema Response Submitted'
+    subject: 'Updates for {resource_type} {title} are pending Admin approval'
     __docs__: ...
     object_content_type_model_name: abstractnode
     template: 'website/templates/updates_pending_approval.html.mako'
     tests: ['osf_tests/test_schema_responses.py']
 
   - name: node_schema_response_approved
-    subject: 'Schema Response Approved'
+    subject: 'The updates for {resource_type} {title} have been approved'
     __docs__: ...
     object_content_type_model_name: abstractnode
     template: 'website/templates/updates_approved.html.mako'
     tests: ['osf_tests/test_schema_responses.py']
 
   - name: node_schema_response_rejected
-    subject: 'Schema Response Rejected'
+    subject: 'The updates for {resource_type} {title} were not accepted'
     __docs__: ...
     object_content_type_model_name: abstractnode
     template: 'website/templates/updates_rejected.html.mako'

notifications/listeners.py

@@ -93,6 +93,7 @@ def reviews_withdraw_requests_notification_moderators(self, timestamp, context,
 
     provider = resource.provider
     context['provider_id'] = provider.id
+    context['requester_fullname'] = user.fullname
     # Set message
     context['message'] = f'has requested withdrawal of "{resource.title}".'
     # Set submission url

osf/utils/machines.py

@@ -335,6 +335,7 @@ def notify_submit(self, ev):
         context = self.get_context()
         if not self.auto_approval_allowed():
             context['reviewable'] = self.machineable.target
+            context['requester_fullname'] = self.machineable.creator.fullname
             reviews_signals.email_withdrawal_requests.send(timestamp=timezone.now(), context=context)
             reviews_signals.reviews_email_withdrawal_requests.send(timestamp=timezone.now(), context=context)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OSF",
-  "version": "26.1.1",
+  "version": "26.1.2",
   "description": "Facilitating Open Science",
   "repository": "https://github.com/CenterForOpenScience/osf.io",
   "author": "Center for Open Science",

website/reviews/listeners.py

@@ -26,6 +26,7 @@ def reviews_notification(self, creator, template, context, action):
 @reviews_signals.reviews_withdraw_requests_notification_moderators.connect
 def reviews_withdraw_requests_notification_moderators(self, timestamp, context, user, resource):
     context['referrer_fullname'] = user.fullname
+    context['requester_fullname'] = user.fullname
     provider = resource.provider
     from osf.models import NotificationType
 

website/settings/defaults.py

@@ -180,16 +180,19 @@ def parent_dir(path):
 }
 NOTIFICATION_TYPES_YAML = 'notifications.yaml'
 
-# Triggered emails
+# Triggered emails - updated by Notification Refactor release
 OSF_HELP_LIST = 'Open Science Framework Help'
-WAIT_BETWEEN_MAILS = timedelta(days=7)
-NO_ADDON_WAIT_TIME = timedelta(weeks=8)
-NO_LOGIN_WAIT_TIME = timedelta(weeks=4)
-NO_LOGIN_OSF4M_WAIT_TIME = timedelta(weeks=6)
-
-# Configuration for NO_LOGIN_EMAIL (NotificationType.Type.USER_NO_LOGIN)
+WAIT_BETWEEN_MAILS = timedelta(days=7)  # Deprecated setting, used by deprecated `scripts.send_queued_mails`
+NO_ADDON_WAIT_TIME = timedelta(weeks=8)  # 2 months for "Link an add-on to your OSF project" email
+NO_LOGIN_WAIT_TIME = timedelta(weeks=52)   # 1 year for "We miss you at OSF" email
+NO_LOGIN_OSF4M_WAIT_TIME = timedelta(weeks=52)  # 1 year for "We miss you at OSF" email to users created from OSF4M
+
+# Configuration for "We miss you at OSF" email (`NotificationType.Type.USER_NO_LOGIN`)
+# Note: 1) we can gradually increase `MAX_DAILY_NO_LOGIN_EMAILS` to 10000, 100000, etc. or set it to `None` after we
+# have verified that users are not spammed by this email after NR release. 2) If we want to clean up database for those
+# already sent `USER_NO_LOGIN` emails, we need to adjust the cut-off time to the day we clean the DB.
 MAX_DAILY_NO_LOGIN_EMAILS = 1000
-NO_LOGIN_EMAIL_CUTOFF = datetime.datetime(2026, 1, 1)
+NO_LOGIN_EMAIL_CUTOFF = datetime.datetime(2026, 1, 5)
 
 # TODO: Override in local.py
 MAILGUN_API_KEY = None