aboutsummaryrefslogtreecommitdiff
path: root/vnext
diff options
context:
space:
mode:
Diffstat (limited to 'vnext')
-rw-r--r--vnext/server/Dockerfile2
-rw-r--r--vnext/server/middleware/android.spec.js4
-rw-r--r--vnext/server/middleware/mastodon.spec.js4
-rw-r--r--vnext/server/middleware/webfinger.spec.js4
-rw-r--r--vnext/server/sender.js4
-rw-r--r--vnext/src/index.html38
-rw-r--r--vnext/src/ui/__tests__/__snapshots__/Avatar.test.js.snap2
-rw-r--r--vnext/src/ui/__tests__/__snapshots__/UserLink.test.js.snap2
-rw-r--r--vnext/webpack.config.js3
9 files changed, 39 insertions, 24 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) {
diff --git a/vnext/src/index.html b/vnext/src/index.html
index 851c844dd..007127b18 100644
--- a/vnext/src/index.html
+++ b/vnext/src/index.html
@@ -2,26 +2,26 @@
<html prefix="og: http://ogp.me/ns#">
<head>
- <meta charset="utf-8" />
- <meta property="og:type" content="website" />
- <meta property="fb:app_id" content="130568668304" />
- <meta name="viewport" content="width=device-width,initial-scale=1" />
- <meta name="theme-color" content="#ffffff" />
- <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta charset="utf-8">
+ <meta property="og:type" content="website">
+ <meta property="fb:app_id" content="130568668304">
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <meta name="theme-color" content="#ffffff">
+ <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
- <link rel="apple-touch-icon" sizes="57x57" href="https://i.juick.com/apple-icon-57x57.png" />
- <link rel="apple-touch-icon" sizes="60x60" href="https://i.juick.com/apple-icon-60x60.png" />
- <link rel="apple-touch-icon" sizes="72x72" href="https://i.juick.com/apple-icon-72x72.png" />
- <link rel="apple-touch-icon" sizes="76x76" href="https://i.juick.com/apple-icon-76x76.png" />
- <link rel="apple-touch-icon" sizes="114x114" href="https://i.juick.com/apple-icon-114x114.png" />
- <link rel="apple-touch-icon" sizes="120x120" href="https://i.juick.com/apple-icon-120x120.png" />
- <link rel="apple-touch-icon" sizes="144x144" href="https://i.juick.com/apple-icon-144x144.png" />
- <link rel="apple-touch-icon" sizes="152x152" href="https://i.juick.com/apple-icon-152x152.png" />
- <link rel="apple-touch-icon" sizes="180x180" href="https://i.juick.com/apple-icon-180x180.png" />
- <link rel="icon" type="image/png" sizes="32x32" href="https://i.juick.com/favicon-32x32.png" />
- <link rel="icon" type="image/png" sizes="96x96" href="https://i.juick.com/favicon-96x96.png" />
- <link rel="icon" type="image/png" sizes="16x16" href="https://i.juick.com/favicon-16x16.png" />
- <link rel="manifest" href="https://i.juick.com/manifest.json" />
+ <link rel="apple-touch-icon" sizes="57x57" href="https://i.juick.com/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="https://i.juick.com/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="https://i.juick.com/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="https://i.juick.com/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="https://i.juick.com/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="https://i.juick.com/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="https://i.juick.com/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="https://i.juick.com/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="https://i.juick.com/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="https://i.juick.com/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="https://i.juick.com/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="https://i.juick.com/favicon-16x16.png">
+ <link rel="manifest" href="https://i.juick.com/manifest.json">
</head>
<body>
diff --git a/vnext/src/ui/__tests__/__snapshots__/Avatar.test.js.snap b/vnext/src/ui/__tests__/__snapshots__/Avatar.test.js.snap
index a28b40362..3e8741019 100644
--- a/vnext/src/ui/__tests__/__snapshots__/Avatar.test.js.snap
+++ b/vnext/src/ui/__tests__/__snapshots__/Avatar.test.js.snap
@@ -8,6 +8,7 @@ exports[`Avatar renders correctly 1`] = `
className="msg-avatar"
>
<a
+ data-discover="true"
href="/ugnich/"
onClick={[Function]}
>
@@ -28,6 +29,7 @@ exports[`Avatar renders correctly 1`] = `
>
<span>
<a
+ data-discover="true"
href="/ugnich/"
onClick={[Function]}
>
diff --git a/vnext/src/ui/__tests__/__snapshots__/UserLink.test.js.snap b/vnext/src/ui/__tests__/__snapshots__/UserLink.test.js.snap
index ab6cd46b1..fda95d986 100644
--- a/vnext/src/ui/__tests__/__snapshots__/UserLink.test.js.snap
+++ b/vnext/src/ui/__tests__/__snapshots__/UserLink.test.js.snap
@@ -4,6 +4,7 @@ exports[`UserLink renders correctly 1`] = `
[
<a
className="info-avatar"
+ data-discover="true"
href="/ugnich/"
onClick={[Function]}
>
@@ -14,6 +15,7 @@ exports[`UserLink renders correctly 1`] = `
</a>,
<a
className="info-avatar"
+ data-discover="true"
href="/ugnich/"
onClick={[Function]}
>
diff --git a/vnext/webpack.config.js b/vnext/webpack.config.js
index 12c6e75c3..99755c70e 100644
--- a/vnext/webpack.config.js
+++ b/vnext/webpack.config.js
@@ -91,10 +91,9 @@ module.exports = (env, argv) => {
},
proxy: [{
context: ['/api'],
- target: 'http://localhost:8080',
+ target: 'http://localhost:8081',
router: () => 'https://juick.com',
secure: false,
- withCredentials: true,
changeOrigin: true
}]
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:14:39 +0000