5 files changed, 15 insertions, 3 deletions
diff --git a/vnext/server/Dockerfile b/vnext/server/Dockerfile
index bbbb37adf..50835206a 100644
--- a/vnext/server/Dockerfile
+++ b/vnext/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:23.0.0-bookworm-slim
+FROM node:23.4.0-bookworm-slim
 
 # Install app dependencies
 COPY package.json .
diff --git a/vnext/server/middleware/android.spec.js b/vnext/server/middleware/android.spec.js
index 19d380d7d..f5b9792a2 100644
--- a/vnext/server/middleware/android.spec.js
+++ b/vnext/server/middleware/android.spec.js
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment node
+ */
+
 import request from 'supertest'
 
 import { app } from '../app'
diff --git a/vnext/server/middleware/mastodon.spec.js b/vnext/server/middleware/mastodon.spec.js
index 561303bc3..7f30d027b 100644
--- a/vnext/server/middleware/mastodon.spec.js
+++ b/vnext/server/middleware/mastodon.spec.js
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment node
+ */
+
 import request from 'supertest'
 import { app } from '../app'
 
diff --git a/vnext/server/middleware/webfinger.spec.js b/vnext/server/middleware/webfinger.spec.js
index d1b198e6b..c36c4571b 100644
--- a/vnext/server/middleware/webfinger.spec.js
+++ b/vnext/server/middleware/webfinger.spec.js
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment node
+ */
+
 import request from 'supertest'
 
 import { app } from '../app'
diff --git a/vnext/server/sender.js b/vnext/server/sender.js
index d5272bfbf..acfd3b752 100644
--- a/vnext/server/sender.js
+++ b/vnext/server/sender.js
@@ -70,11 +70,11 @@ export function sendNotification(productionIds, sandboxIds, data) {
                                 log(`${badTokens.length} APNS tokens deleted`)
                             }
                         })
-                    results.filter(r => r.method === 'gcm')
+                    results.filter(r => r.method === 'fcm')
                         .forEach(async r => {
                             let badTokens = r.message.filter(m =>
                                 m.errorMsg === 'NotRegistered' || m.errorMsg === 'MismatchSenderId'
-                                || m.errorMsg === 'InvalidRegistration').map(m => {
+                                || m.errorMsg === 'InvalidRegistration' || m.errorMsg === 'Requested entity was not found.').map(m => {
                                     return { 'type': 'fcm', 'token': m.regId }
                                 })
                             if (badTokens.length > 0) {