Merged v5.42.3 into main

ghost/admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost-admin",
-  "version": "5.42.2",
+  "version": "5.42.3",
   "description": "Ember.js admin client for Ghost",
   "author": "Ghost Foundation",
   "homepage": "http://ghost.org",
@@ -184,4 +184,4 @@
     "path-browserify": "1.0.1",
     "webpack": "5.77.0"
   }
-}
+}

ghost/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.42.2",
+  "version": "5.42.3",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",

ghost/email-service/lib/email-event-storage.js

@@ -129,7 +129,11 @@ class EmailEventStorage {
     }
 
     async unsubscribeFromNewsletters(event) {
-        await this.#membersRepository.update({newsletters: []}, {id: event.memberId});
+        try {
+            await this.#membersRepository.update({newsletters: []}, {id: event.memberId});
+        } catch (err) {
+            logging.error(err);
+        }
     }
 }
 

ghost/email-service/test/email-event-storage.test.js

@@ -466,6 +466,27 @@ describe('Email Event Storage', function () {
         assert(update.firstCall.args[0].newsletters.length === 0);
     });
 
+    it('Handles unsubscribe with a non-existent member', async function () {
+        const event = EmailUnsubscribedEvent.create({
+            email: 'example@example.com',
+            memberId: '123',
+            emailId: '456',
+            timestamp: new Date(0)
+        });
+
+        const error = new Error('Member not found');
+        const update = sinon.stub().throws(error);
+
+        const eventHandler = new EmailEventStorage({
+            membersRepository: {
+                update
+            }
+        });
+        await eventHandler.handleUnsubscribed(event);
+        assert(update.calledOnce);
+        assert(update.firstCall.args[0].newsletters.length === 0);
+    });
+
     it('Handles complaints', async function () {
         const event = SpamComplaintEvent.create({
             email: 'example@example.com',