mirror of
https://github.com/Athou/commafeed.git
synced 2026-11-20 10:43:37 +00:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d21c5256e7 | ||
|
|
01b9b10811 | ||
|
|
7da039503a | ||
|
|
abf9e2cd85 | ||
|
|
fe5ff7f721 | ||
|
|
bedbeeccc2 | ||
|
|
2c819e3049 | ||
|
|
1768571d72 | ||
|
|
f8b1b7f8f4 | ||
|
|
0a1840d4c8 | ||
|
|
3d85eca5f6 | ||
|
|
894ad757b1 | ||
|
|
728868784e | ||
|
|
e59948c68c | ||
|
|
d3ba47d200 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -29,7 +29,7 @@ jobs:
|
|||||||
|
|
||||||
# Setup
|
# Setup
|
||||||
- name: Set up GraalVM
|
- name: Set up GraalVM
|
||||||
uses: graalvm/setup-graalvm@d6eca2595046623d69d636041513c80abf745406 # v1.6.9
|
uses: graalvm/setup-graalvm@60e76998d25690099182b796e99b8804da582d90 # v1.6.10
|
||||||
with:
|
with:
|
||||||
java-version: ${{ env.JAVA_VERSION }}
|
java-version: ${{ env.JAVA_VERSION }}
|
||||||
distribution: "mandrel"
|
distribution: "mandrel"
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [7.5.3]
|
||||||
|
|
||||||
|
- Use ntfy JSON API so notification titles support non-ASCII characters (#2398)
|
||||||
|
|
||||||
|
## [7.5.2]
|
||||||
|
|
||||||
|
- Fix Youtube embeds not loading and stealing focus (#2394)
|
||||||
|
|
||||||
## [7.5.1]
|
## [7.5.1]
|
||||||
|
|
||||||
- Fix multiple entry context menus being open at the same time (#2393)
|
- Fix multiple entry context menus being open at the same time (#2393)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://biomejs.dev/schemas/2.6.7/schema.json",
|
"$schema": "https://biomejs.dev/schemas/2.6.8/schema.json",
|
||||||
"formatter": {
|
"formatter": {
|
||||||
"indentStyle": "space",
|
"indentStyle": "space",
|
||||||
"indentWidth": 4,
|
"indentWidth": 4,
|
||||||
|
|||||||
224
commafeed-client/package-lock.json
generated
224
commafeed-client/package-lock.json
generated
@@ -12,15 +12,15 @@
|
|||||||
"@fontsource/open-sans": "5.3.0",
|
"@fontsource/open-sans": "5.3.0",
|
||||||
"@lingui/core": "6.12.0",
|
"@lingui/core": "6.12.0",
|
||||||
"@lingui/react": "6.12.0",
|
"@lingui/react": "6.12.0",
|
||||||
"@mantine/core": "9.8.0",
|
"@mantine/core": "9.8.1",
|
||||||
"@mantine/dates": "9.8.0",
|
"@mantine/dates": "9.8.1",
|
||||||
"@mantine/form": "9.8.0",
|
"@mantine/form": "9.8.1",
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"@mantine/modals": "9.8.0",
|
"@mantine/modals": "9.8.1",
|
||||||
"@mantine/notifications": "9.8.0",
|
"@mantine/notifications": "9.8.1",
|
||||||
"@mantine/spotlight": "9.8.0",
|
"@mantine/spotlight": "9.8.1",
|
||||||
"@monaco-editor/react": "4.7.0",
|
"@monaco-editor/react": "4.7.0",
|
||||||
"@react-querybuilder/mantine": "8.26.0",
|
"@react-querybuilder/mantine": "8.27.0",
|
||||||
"@reduxjs/toolkit": "2.14.0",
|
"@reduxjs/toolkit": "2.14.0",
|
||||||
"@rolldown/plugin-babel": "0.3.1",
|
"@rolldown/plugin-babel": "0.3.1",
|
||||||
"axios": "1.21.1",
|
"axios": "1.21.1",
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
"react-draggable": "4.7.2",
|
"react-draggable": "4.7.2",
|
||||||
"react-icons": "5.7.0",
|
"react-icons": "5.7.0",
|
||||||
"react-infinite-scroller": "1.2.6",
|
"react-infinite-scroller": "1.2.6",
|
||||||
"react-querybuilder": "8.26.0",
|
"react-querybuilder": "8.27.0",
|
||||||
"react-redux": "9.3.1",
|
"react-redux": "9.3.1",
|
||||||
"react-router-dom": "7.18.5",
|
"react-router-dom": "7.18.5",
|
||||||
"react-swipeable": "7.0.2",
|
"react-swipeable": "7.0.2",
|
||||||
@@ -46,12 +46,12 @@
|
|||||||
"websocket-heartbeat-js": "1.1.3"
|
"websocket-heartbeat-js": "1.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.6.7",
|
"@biomejs/biome": "2.6.8",
|
||||||
"@lingui/cli": "6.12.0",
|
"@lingui/cli": "6.12.0",
|
||||||
"@lingui/vite-plugin": "6.12.0",
|
"@lingui/vite-plugin": "6.12.0",
|
||||||
"@testing-library/jest-dom": "7.0.1",
|
"@testing-library/jest-dom": "7.0.1",
|
||||||
"@testing-library/react": "16.3.3",
|
"@testing-library/react": "16.3.3",
|
||||||
"@testing-library/user-event": "14.6.10",
|
"@testing-library/user-event": "14.6.12",
|
||||||
"@types/mousetrap": "1.6.15",
|
"@types/mousetrap": "1.6.15",
|
||||||
"@types/react": "19.3.0",
|
"@types/react": "19.3.0",
|
||||||
"@types/react-dom": "19.3.0",
|
"@types/react-dom": "19.3.0",
|
||||||
@@ -424,9 +424,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/biome": {
|
"node_modules/@biomejs/biome": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.6.8.tgz",
|
||||||
"integrity": "sha512-2bT1FE6FvZZgPLFw4BjcDyRwG8Ry9zYla4X+Lw8oj2SxvqiXHiYkkEpjcrsWQrik6iYHygAa/D67YxLbVz9P1Q==",
|
"integrity": "sha512-kqZUFvX6/aYQOmzfRN5ANcfNS9wLH4aHLWWP/dQKyhRZVoA6rdWszA7DGugFcxPbMiznUyVYyukVl+ExZN4PQA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -440,22 +440,22 @@
|
|||||||
"url": "https://opencollective.com/biome"
|
"url": "https://opencollective.com/biome"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@biomejs/cli-android-arm64": "2.6.7",
|
"@biomejs/cli-android-arm64": "2.6.8",
|
||||||
"@biomejs/cli-android-x64": "2.6.7",
|
"@biomejs/cli-android-x64": "2.6.8",
|
||||||
"@biomejs/cli-darwin-arm64": "2.6.7",
|
"@biomejs/cli-darwin-arm64": "2.6.8",
|
||||||
"@biomejs/cli-darwin-x64": "2.6.7",
|
"@biomejs/cli-darwin-x64": "2.6.8",
|
||||||
"@biomejs/cli-linux-arm64": "2.6.7",
|
"@biomejs/cli-linux-arm64": "2.6.8",
|
||||||
"@biomejs/cli-linux-arm64-musl": "2.6.7",
|
"@biomejs/cli-linux-arm64-musl": "2.6.8",
|
||||||
"@biomejs/cli-linux-x64": "2.6.7",
|
"@biomejs/cli-linux-x64": "2.6.8",
|
||||||
"@biomejs/cli-linux-x64-musl": "2.6.7",
|
"@biomejs/cli-linux-x64-musl": "2.6.8",
|
||||||
"@biomejs/cli-win32-arm64": "2.6.7",
|
"@biomejs/cli-win32-arm64": "2.6.8",
|
||||||
"@biomejs/cli-win32-x64": "2.6.7"
|
"@biomejs/cli-win32-x64": "2.6.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-android-arm64": {
|
"node_modules/@biomejs/cli-android-arm64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-android-arm64/-/cli-android-arm64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-android-arm64/-/cli-android-arm64-2.6.8.tgz",
|
||||||
"integrity": "sha512-f4fyRTl+rW6QZp+iHdZrKAKptG/xmIDijTnxWhpC1Hnzr8yvjaBm/aJ98JiMv5mMx7jL1MOu4+zwmQUzfcoKBg==",
|
"integrity": "sha512-X4JKPLK85kfUTwuuaORFplnBfGjKkp62PsFhhcL7F/Tpltc7pyUofjlkkMnlZZLWsifFl7LNB8ngVrwJg1uo1Q==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -470,9 +470,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-android-x64": {
|
"node_modules/@biomejs/cli-android-x64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-android-x64/-/cli-android-x64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-android-x64/-/cli-android-x64-2.6.8.tgz",
|
||||||
"integrity": "sha512-eUdeN+mh2bwen+By1feKzpFkFGAfLG3Pxi6tbwpzMvePBwFGMd4mnE6gaxDRMiWJ1eMuc+Xhtg3ErbLLbtL5wQ==",
|
"integrity": "sha512-C3Hk485vl+deEj53K08+SYYelPIPkdSZL3qHuD31Xi+qydVa4q2ze+aCYo1k3iJGWtvWtjHaGkDh7S2sX6wk8w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -487,9 +487,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-darwin-arm64": {
|
"node_modules/@biomejs/cli-darwin-arm64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.6.8.tgz",
|
||||||
"integrity": "sha512-GewLcsnCsVblgnWYw5QRz5ydy9xphCtlFP37TpLKarezqwZMrH2qxrYblhY6DPOir4gnKyaqDnS/xZWIGVjaKw==",
|
"integrity": "sha512-DHyj+JnRHcn4YdvpiqgTFZMYKSPELMCfFpNNlEuu1L8DKTGXhzW7raIwdsbo2Ie9nCljQLAQkVWQk/mwM0ueiA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -504,9 +504,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-darwin-x64": {
|
"node_modules/@biomejs/cli-darwin-x64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.6.8.tgz",
|
||||||
"integrity": "sha512-AMPl+Q+bHjRcNUBn8gwBl+dJAnKRUWGZ7ZiJo2U8tQtdpqJ32OqvIg4cwTH+xv0jrcNVkUSE69nj57zsHZ1WBA==",
|
"integrity": "sha512-QWWUPjlA0RnkkgYnFLUHZu+RrDc0FdK0A+wEPA+dENQJwsuSHMH89lspnAw2QUWWc9VHyfluGx1Xmp6Y2GZi8Q==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -521,9 +521,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-arm64": {
|
"node_modules/@biomejs/cli-linux-arm64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.6.8.tgz",
|
||||||
"integrity": "sha512-Qa2edxQClKn17y1ASWkOOuT96K2si1nTLiPbXMOMilNJ79eNsa1as1kaSbgxOXy1kRUENw76sp4pAddneq3l8Q==",
|
"integrity": "sha512-0Bjim8lKwnrvXUHoI4k3Tb51BjoiLEwDnovCI8nSzkk6wj3dShiuAjrx6+X0Hjf4ejR1sRZgTQiSDHlpy9vB7w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -541,9 +541,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-arm64-musl": {
|
"node_modules/@biomejs/cli-linux-arm64-musl": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.6.8.tgz",
|
||||||
"integrity": "sha512-BIA7qVO1O15D2wVKxLTcvEWszgOqJVZRUhlksg1KQ9N0VtYCbvknV1vyjFiSrzuBT57+z59gbzhYQCinw9lRSQ==",
|
"integrity": "sha512-WB9PhOitX+bRc0G3+GNJGlvbKoWn3JoB9z4E04JQizIC9aPCQyIvwvWG7QZHxw6k20Fi+dHLmZ2fSEmBa9HqiA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -561,9 +561,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-x64": {
|
"node_modules/@biomejs/cli-linux-x64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.6.8.tgz",
|
||||||
"integrity": "sha512-VpHQ33CPNYrlIn0vyDdRS1KUlS3AiM17FiyEE2gwU000NwzyY4MgjzVHEv2KrmMb5D9Ksm3gFkwg+IOx/ULJNQ==",
|
"integrity": "sha512-XIk3pLQT56I6Tti+u0DF8FtSNXjCMTPbxVTzfJ9cS2t1ImVKvrqV5b52GuEaJg6/wuiXvz0sjfb5saB4TPRjzA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -581,9 +581,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-x64-musl": {
|
"node_modules/@biomejs/cli-linux-x64-musl": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.6.8.tgz",
|
||||||
"integrity": "sha512-+AOQyCsPR4nH5L4Hjzp8T0iaHm4UxY3unjL/KUJKc/8ziLnbkbmL3adtWmQW5ERB1zi6LRA1fsjaSuf/xGnLaQ==",
|
"integrity": "sha512-64Yzo+J4fEk7Kf9SMnVdVxC+Y2A2e/L86QTP9JjGQ57lsddyELLpbBcNMxSJggre2T1AvISwwSrOApkBAHDqNA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -601,9 +601,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-win32-arm64": {
|
"node_modules/@biomejs/cli-win32-arm64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.6.8.tgz",
|
||||||
"integrity": "sha512-2nLivZfgcGMIXP/bI8w1FZP5JE2MetP+XZInyMQ7SvJBKlDoGrm/nRjN7uUi9dOaaSlpbRWkHSfb7PqcQR3nXg==",
|
"integrity": "sha512-ezjCEZzHIWE2pdh83a7zLVcAAcDaERcTcvfA7uWlxqz/1CuDxgtfO19pDg9B6YY4wKYIDvYBw2QCMnqIshSwmw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -618,9 +618,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-win32-x64": {
|
"node_modules/@biomejs/cli-win32-x64": {
|
||||||
"version": "2.6.7",
|
"version": "2.6.8",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.6.8.tgz",
|
||||||
"integrity": "sha512-uYfH+n+IAtVz3lh7m6JxdjxfJ3WCvAJDE3spHIUbU955V42oKymlhiQiu92fAhXZb7KOjvRcrfImySQbc1MFFg==",
|
"integrity": "sha512-cD6HvGczZUiAYsY8s2TxxXj2AHFzEdMomvVJfEjzOjBM45nGqIDfBpbtvwGQzDCN8X2yKKk9u1jnDZisT2nxIg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1372,9 +1372,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/core": {
|
"node_modules/@mantine/core": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/core/-/core-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/core/-/core-9.8.1.tgz",
|
||||||
"integrity": "sha512-+2Y+GBM6WvBJgBBb7hrfEvHbyljuRsOqC1GjxNpmX6NcD2SwmDXf9ZVFfquyXvi8fFerMrTpAwYdfb6k2PGAlQ==",
|
"integrity": "sha512-+ayBTxun7MslJL6x4qaylVy6TyHu3o68+PH22gt70eJSHgy0CHYR/c2q+BYxS8WvORuc4f5mr0xFbi0vzlgHug==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@floating-ui/react": "^0.27.20",
|
"@floating-ui/react": "^0.27.20",
|
||||||
@@ -1384,31 +1384,31 @@
|
|||||||
"type-fest": "^5.10.0"
|
"type-fest": "^5.10.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0"
|
"react-dom": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/dates": {
|
"node_modules/@mantine/dates": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/dates/-/dates-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/dates/-/dates-9.8.1.tgz",
|
||||||
"integrity": "sha512-mHmr0uNJI888M0gU7Ga0ec6CtUurQDPst4WauEEqjgkb7uGxAHknL2XdmFshjqQ4UyTLKrsjVeK5DIhzofz/gg==",
|
"integrity": "sha512-BDYvM3hSvTkFNAqnRmL/nhf8NnoqwXOUe+jxq7xZZ1ME9NaVT5u3QuLY2zEilqF3Wm0iUtf3LP6deL9c4gunSQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"clsx": "^2.1.1"
|
"clsx": "^2.1.1"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/core": "9.8.0",
|
"@mantine/core": "9.8.1",
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"dayjs": ">=1.0.0",
|
"dayjs": ">=1.0.0",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0"
|
"react-dom": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/form": {
|
"node_modules/@mantine/form": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/form/-/form-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/form/-/form-9.8.1.tgz",
|
||||||
"integrity": "sha512-ECed/ZR/uzCrhm8R5oT723l/Ft0AcM6RDfgwq3bXcK+3bJ9h4dSrr2GyIpwR9fjJ0dwM2JCl//IFFXP4QHlKrw==",
|
"integrity": "sha512-BLD6BlsccoM31ZfKMiFWb53A1QW9vR0mKlR2GaDcjJGaQhxfGm5rLZCdBHBnsBXlNdz1Pyf52rQUfNhi6fXePQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@standard-schema/spec": "^1.1.0",
|
"@standard-schema/spec": "^1.1.0",
|
||||||
@@ -1420,61 +1420,61 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/hooks": {
|
"node_modules/@mantine/hooks": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-9.8.1.tgz",
|
||||||
"integrity": "sha512-fUA3PS8Ys2kih6VEuozgdEO0UyiGhryTJqx+Bf2lxee1XpXQ0XFXsQY7lNB4f+eBDzYCczYykQjIIuUzyJft7A==",
|
"integrity": "sha512-aAbY3zcqrS/n+wbMnKBXMiF5TJ7HZ06sH455Cf4ZkWRXko9Td2FYSe9aONCzXFaW62XqaWHBICyeIsAmUds3uA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "^19.2.0"
|
"react": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/modals": {
|
"node_modules/@mantine/modals": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-9.8.1.tgz",
|
||||||
"integrity": "sha512-YRq4jy+kioDT3uIyskLwaQMw7DybVTCkE9n1NFxq9sb0gL2D/UIpkVBU0sWBItLuXBxqd73SNS5Br9SZlZD0eA==",
|
"integrity": "sha512-QwlPGmwyWXIq5YM3xzbeVQ6dJXTm98YBcrI7YQ6lraHxEXHZAr6M2HDIF4Pqd158mP/Oc+HL+UPd0cvSeZfHLQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/core": "9.8.0",
|
"@mantine/core": "9.8.1",
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0"
|
"react-dom": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/notifications": {
|
"node_modules/@mantine/notifications": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-9.8.1.tgz",
|
||||||
"integrity": "sha512-5+f1hQUa41UqC7z05kSYOU1uOrL6hpm/s7WzPmeHsfxbcb8xFefFi0I/9RZZ5KNgkCdt0LpfO4N4KNfiTmi0OQ==",
|
"integrity": "sha512-lqi9+HfXMbMKzEsAIUkWRFw2rURzgVMv8//oCyq0rhy27X6NjSMMlzvwsjbSazT/+WugDIYLJ8khZ+JMW1gkMQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mantine/store": "9.8.0",
|
"@mantine/store": "9.8.1",
|
||||||
"react-transition-group": "4.4.5"
|
"react-transition-group": "4.4.5"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/core": "9.8.0",
|
"@mantine/core": "9.8.1",
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0"
|
"react-dom": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/spotlight": {
|
"node_modules/@mantine/spotlight": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/spotlight/-/spotlight-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/spotlight/-/spotlight-9.8.1.tgz",
|
||||||
"integrity": "sha512-MsJKv6h0ARTJGgATOZYDh/0liA9ffJQZ7L2TMs1D/0brGFb5l1a4kiUrp1p1GRtZpAEZoiQK1n9Rg8Zo6qqtRA==",
|
"integrity": "sha512-x5BL6D1Khp6GxhWWxhPgtoyPb40zFgwKx8XfjyoDMRANGhQ+vijyjyDHol7nYQq8DMiM2G4Hnue2vMyTDEkS1g==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mantine/store": "9.8.0"
|
"@mantine/store": "9.8.1"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/core": "9.8.0",
|
"@mantine/core": "9.8.1",
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0"
|
"react-dom": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mantine/store": {
|
"node_modules/@mantine/store": {
|
||||||
"version": "9.8.0",
|
"version": "9.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/@mantine/store/-/store-9.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@mantine/store/-/store-9.8.1.tgz",
|
||||||
"integrity": "sha512-1lXf+ULBFLnMTN+cN4rCNxaBIRAUEPGm2uplLtNk0WHpvL+UwSuXZc26S5tdjYUW5HYsLLeY6C3u/N5qLv1r1Q==",
|
"integrity": "sha512-Wb5+6i6m3GdNgOjX1IbDPYrP76v9y4zThRoKDWH9Es+qY2c6gT2NpH7n10/zYgNPL8ipB6H6gGUPhLurs1o4kg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "^19.2.0"
|
"react": "^19.2.0"
|
||||||
@@ -1562,16 +1562,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@react-querybuilder/core": {
|
"node_modules/@react-querybuilder/core": {
|
||||||
"version": "8.26.0",
|
"version": "8.27.0",
|
||||||
"resolved": "https://registry.npmjs.org/@react-querybuilder/core/-/core-8.26.0.tgz",
|
"resolved": "https://registry.npmjs.org/@react-querybuilder/core/-/core-8.27.0.tgz",
|
||||||
"integrity": "sha512-gdCzYLT7tUVYLQICf5g1Qg92MnPRPlGvltbwubTrLPdwgVVNVPf/XXvPc9iACHzhVRQyUK+0/KGfaPFtVmpQTg==",
|
"integrity": "sha512-5lGI/+Ed54FgxlBVOisa4XpCud0pdZYAffGrfPESx8dAHQtOBy2HConPG8xaIqRGRdDu+EDVkdIEjaEzbeTAvQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ts-jison/lexer": "0.4.1-alpha.4",
|
"@ts-jison/lexer": "0.4.1-alpha.4",
|
||||||
"@ts-jison/parser": "0.4.1-alpha.4",
|
"@ts-jison/parser": "0.4.1-alpha.4",
|
||||||
"@types/json-logic-js": ">=2",
|
"@types/json-logic-js": ">=2",
|
||||||
"immer": "^11.2.9",
|
"immer": "^11.2.10",
|
||||||
"numeric-quantity": "^3.3.3"
|
"numeric-quantity": "^3.3.5"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@tanstack/db": ">=0.6.9",
|
"@tanstack/db": ">=0.6.9",
|
||||||
@@ -1611,9 +1611,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@react-querybuilder/mantine": {
|
"node_modules/@react-querybuilder/mantine": {
|
||||||
"version": "8.26.0",
|
"version": "8.27.0",
|
||||||
"resolved": "https://registry.npmjs.org/@react-querybuilder/mantine/-/mantine-8.26.0.tgz",
|
"resolved": "https://registry.npmjs.org/@react-querybuilder/mantine/-/mantine-8.27.0.tgz",
|
||||||
"integrity": "sha512-QyhCAz/drZNfhgyg60iFm2+n9vvGeyGOA94IJUikyA9Q6TCrRLlEwi0xEJg/nAD3F5ABpe4jHq3nLZE/mS+slA==",
|
"integrity": "sha512-ZAwiNbuZJ3vWmmI43R2hYkTKImsEyAkWsIotRSWSuEHlMnn5f1C/mtO/v1AUjqgCScLvDmkT34iodlHxesw0eQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/core": ">=7",
|
"@mantine/core": ">=7",
|
||||||
@@ -1621,7 +1621,7 @@
|
|||||||
"@mantine/hooks": ">=7",
|
"@mantine/hooks": ">=7",
|
||||||
"dayjs": ">=1",
|
"dayjs": ">=1",
|
||||||
"react": ">=18",
|
"react": ">=18",
|
||||||
"react-querybuilder": "8.26.0"
|
"react-querybuilder": "8.27.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@reduxjs/toolkit": {
|
"node_modules/@reduxjs/toolkit": {
|
||||||
@@ -2139,9 +2139,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@testing-library/user-event": {
|
"node_modules/@testing-library/user-event": {
|
||||||
"version": "14.6.10",
|
"version": "14.6.12",
|
||||||
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.10.tgz",
|
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.12.tgz",
|
||||||
"integrity": "sha512-tA4stGNp3mLGOGO+lh87UA56Tz4c8NVGBSkyIF58O+W/bs2Re9BCI9xihnL70+DsThncFznE0skS88SM1D2hyg==",
|
"integrity": "sha512-8yQV8v+eToBhsUO4oYrZY7fzhpTEMZx4IDx0/iuER/x0Xuy0NdqQOhsaaUNlvXE03N7vQ+4RCXUieKC0NJty9w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -2178,9 +2178,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tybys/wasm-util": {
|
"node_modules/@tybys/wasm-util": {
|
||||||
"version": "0.10.4",
|
"version": "0.10.5",
|
||||||
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz",
|
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.5.tgz",
|
||||||
"integrity": "sha512-W3c4gRigFS0T/Ma4qIYF3GDAc5AQdHb1yL5znJT1Zv1YaD9Kitx656wBjvr19qbiosmZT8lWDM5BEMynUqX65A==",
|
"integrity": "sha512-dOGOPxlaNV+G046mZzN+9C0dAcQZeSKcXiVaM0TYy/LM4ttTmgSBDxYfovcYI8Em3+eAbiAYpvWLOv8+ZVRJKA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -4558,9 +4558,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/numeric-quantity": {
|
"node_modules/numeric-quantity": {
|
||||||
"version": "3.3.4",
|
"version": "3.3.5",
|
||||||
"resolved": "https://registry.npmjs.org/numeric-quantity/-/numeric-quantity-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/numeric-quantity/-/numeric-quantity-3.3.5.tgz",
|
||||||
"integrity": "sha512-mYzGsK+5jEK3DM3iAxC8ACKp6k1qH2lxvbTQxfIb6FL+meXx4yrwUTiAQtXik7ZnCj8R5pMIY63Ra0wPP3SW/A==",
|
"integrity": "sha512-6+8OIGgAmHb+PVCkmfqF1LqpZQ2IVI8DrCR722U5sRZ8h8Ha6cjGl3HeRqb5sz5LMb6S+tkxbMkSwWSUOi54dg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16"
|
"node": ">=16"
|
||||||
@@ -5024,13 +5024,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/react-querybuilder": {
|
"node_modules/react-querybuilder": {
|
||||||
"version": "8.26.0",
|
"version": "8.27.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-querybuilder/-/react-querybuilder-8.26.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-querybuilder/-/react-querybuilder-8.27.0.tgz",
|
||||||
"integrity": "sha512-Y199ec9SSPAwmIeMA3PuWD1OUpcKBPa8F8r0WlPMhoIn+Pq6ny79kb69tcUcvBWpLguSKrIHKa0ywK4Si9Ch7g==",
|
"integrity": "sha512-ukG5uRi/maytxhUeINalbAmS3uDMCZyJzIMYjMQ+b1Wuu4AbUBAhQWkJ0Okd1xKQTGb9eXk6oXWIZqeemDlaUA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@react-querybuilder/core": "^8.26.0",
|
"@react-querybuilder/core": "^8.27.0",
|
||||||
"@reduxjs/toolkit": "^2.13.0",
|
"@reduxjs/toolkit": "^2.14.0",
|
||||||
"react-redux": "^9.3.0"
|
"react-redux": "^9.3.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
|
|||||||
@@ -19,15 +19,15 @@
|
|||||||
"@fontsource/open-sans": "5.3.0",
|
"@fontsource/open-sans": "5.3.0",
|
||||||
"@lingui/core": "6.12.0",
|
"@lingui/core": "6.12.0",
|
||||||
"@lingui/react": "6.12.0",
|
"@lingui/react": "6.12.0",
|
||||||
"@mantine/core": "9.8.0",
|
"@mantine/core": "9.8.1",
|
||||||
"@mantine/dates": "9.8.0",
|
"@mantine/dates": "9.8.1",
|
||||||
"@mantine/form": "9.8.0",
|
"@mantine/form": "9.8.1",
|
||||||
"@mantine/hooks": "9.8.0",
|
"@mantine/hooks": "9.8.1",
|
||||||
"@mantine/modals": "9.8.0",
|
"@mantine/modals": "9.8.1",
|
||||||
"@mantine/notifications": "9.8.0",
|
"@mantine/notifications": "9.8.1",
|
||||||
"@mantine/spotlight": "9.8.0",
|
"@mantine/spotlight": "9.8.1",
|
||||||
"@monaco-editor/react": "4.7.0",
|
"@monaco-editor/react": "4.7.0",
|
||||||
"@react-querybuilder/mantine": "8.26.0",
|
"@react-querybuilder/mantine": "8.27.0",
|
||||||
"@reduxjs/toolkit": "2.14.0",
|
"@reduxjs/toolkit": "2.14.0",
|
||||||
"@rolldown/plugin-babel": "0.3.1",
|
"@rolldown/plugin-babel": "0.3.1",
|
||||||
"axios": "1.21.1",
|
"axios": "1.21.1",
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
"react-draggable": "4.7.2",
|
"react-draggable": "4.7.2",
|
||||||
"react-icons": "5.7.0",
|
"react-icons": "5.7.0",
|
||||||
"react-infinite-scroller": "1.2.6",
|
"react-infinite-scroller": "1.2.6",
|
||||||
"react-querybuilder": "8.26.0",
|
"react-querybuilder": "8.27.0",
|
||||||
"react-redux": "9.3.1",
|
"react-redux": "9.3.1",
|
||||||
"react-router-dom": "7.18.5",
|
"react-router-dom": "7.18.5",
|
||||||
"react-swipeable": "7.0.2",
|
"react-swipeable": "7.0.2",
|
||||||
@@ -53,12 +53,12 @@
|
|||||||
"websocket-heartbeat-js": "1.1.3"
|
"websocket-heartbeat-js": "1.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.6.7",
|
"@biomejs/biome": "2.6.8",
|
||||||
"@lingui/cli": "6.12.0",
|
"@lingui/cli": "6.12.0",
|
||||||
"@lingui/vite-plugin": "6.12.0",
|
"@lingui/vite-plugin": "6.12.0",
|
||||||
"@testing-library/jest-dom": "7.0.1",
|
"@testing-library/jest-dom": "7.0.1",
|
||||||
"@testing-library/react": "16.3.3",
|
"@testing-library/react": "16.3.3",
|
||||||
"@testing-library/user-event": "14.6.10",
|
"@testing-library/user-event": "14.6.12",
|
||||||
"@types/mousetrap": "1.6.15",
|
"@types/mousetrap": "1.6.15",
|
||||||
"@types/react": "19.3.0",
|
"@types/react": "19.3.0",
|
||||||
"@types/react-dom": "19.3.0",
|
"@types/react-dom": "19.3.0",
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed</artifactId>
|
<artifactId>commafeed</artifactId>
|
||||||
<version>7.5.1</version>
|
<version>7.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>commafeed-client</artifactId>
|
<artifactId>commafeed-client</artifactId>
|
||||||
<name>CommaFeed Client</name>
|
<name>CommaFeed Client</name>
|
||||||
|
|||||||
@@ -106,7 +106,14 @@ const Content = React.memo((props: ContentProps) => {
|
|||||||
return (
|
return (
|
||||||
<BasicHtmlStyles>
|
<BasicHtmlStyles>
|
||||||
<Box className={classes.content}>
|
<Box className={classes.content}>
|
||||||
<Interweave content={props.content} transform={transform} matchers={matchers} allowList={allowList} />
|
<Interweave
|
||||||
|
content={props.content}
|
||||||
|
transform={transform}
|
||||||
|
matchers={matchers}
|
||||||
|
allowList={allowList}
|
||||||
|
// attributes are already sanitized server-side
|
||||||
|
allowAttributes
|
||||||
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</BasicHtmlStyles>
|
</BasicHtmlStyles>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed</artifactId>
|
<artifactId>commafeed</artifactId>
|
||||||
<version>7.5.1</version>
|
<version>7.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>commafeed-server</artifactId>
|
<artifactId>commafeed-server</artifactId>
|
||||||
<name>CommaFeed Server</name>
|
<name>CommaFeed Server</name>
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-help-plugin</artifactId>
|
<artifactId>maven-help-plugin</artifactId>
|
||||||
<version>3.5.2</version>
|
<version>3.6.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>initialize</phase>
|
<phase>initialize</phase>
|
||||||
@@ -303,7 +303,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed-client</artifactId>
|
<artifactId>commafeed-client</artifactId>
|
||||||
<version>7.5.1</version>
|
<version>7.5.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- compile-time processors -->
|
<!-- compile-time processors -->
|
||||||
@@ -460,7 +460,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.github.hakky54</groupId>
|
<groupId>io.github.hakky54</groupId>
|
||||||
<artifactId>ayza-for-apache5</artifactId>
|
<artifactId>ayza-for-apache5</artifactId>
|
||||||
<version>10.1.1</version>
|
<version>10.1.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.seancfoley</groupId>
|
<groupId>com.github.seancfoley</groupId>
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ public class FeedEntryContentCleaningService {
|
|||||||
|
|
||||||
whitelist.addEnforcedAttribute("a", "target", "_blank");
|
whitelist.addEnforcedAttribute("a", "target", "_blank");
|
||||||
whitelist.addEnforcedAttribute("a", "rel", "noreferrer");
|
whitelist.addEnforcedAttribute("a", "rel", "noreferrer");
|
||||||
|
whitelist.addEnforcedAttribute("iframe", "referrerpolicy", "strict-origin-when-cross-origin");
|
||||||
return whitelist;
|
return whitelist;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -95,14 +95,17 @@ public class PushNotificationService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleRequestBuilder request = SimpleRequestBuilder.post(serverUrl + "/" + topic);
|
JsonObject json = new JsonObject();
|
||||||
request.addHeader("Title", feedTitle);
|
json.put("topic", topic);
|
||||||
request.setBody(entryTitle, ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8));
|
json.put("title", feedTitle);
|
||||||
|
json.put("message", entryTitle);
|
||||||
if (StringUtils.isNotBlank(entryUrl)) {
|
if (StringUtils.isNotBlank(entryUrl)) {
|
||||||
request.addHeader("Click", entryUrl);
|
json.put("click", entryUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SimpleRequestBuilder request = SimpleRequestBuilder.post(serverUrl);
|
||||||
|
request.setBody(json.toString(), ContentType.APPLICATION_JSON);
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(settings.getUserSecret())) {
|
if (StringUtils.isNotBlank(settings.getUserSecret())) {
|
||||||
request.addHeader("Authorization", "Bearer " + settings.getUserSecret());
|
request.addHeader("Authorization", "Bearer " + settings.getUserSecret());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class FeedEntryContentCleaningServiceTest {
|
|||||||
<p>
|
<p>
|
||||||
Some text
|
Some text
|
||||||
<img width="965" height="320" src="https://localhost/an-image.png" alt="alt-desc" style="width:100%;">
|
<img width="965" height="320" src="https://localhost/an-image.png" alt="alt-desc" style="width:100%;">
|
||||||
<iframe src="https://localhost/an-iframe" style="width:100%;"></iframe>
|
<iframe src="https://localhost/an-iframe" style="width:100%;" referrerpolicy="strict-origin-when-cross-origin"></iframe>
|
||||||
aaa
|
aaa
|
||||||
</p>
|
</p>
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -64,16 +64,25 @@ class PushNotificationServiceTest {
|
|||||||
userSettings.setServerUrl("http://localhost:" + mockServerClient.getPort());
|
userSettings.setServerUrl("http://localhost:" + mockServerClient.getPort());
|
||||||
userSettings.setTopic("test-topic");
|
userSettings.setTopic("test-topic");
|
||||||
userSettings.setUserSecret("test-secret");
|
userSettings.setUserSecret("test-secret");
|
||||||
|
subscription.setTitle("ąćęłńóśźż 📰 Test Feed");
|
||||||
|
|
||||||
mockServerClient
|
mockServerClient
|
||||||
.when(
|
.when(
|
||||||
HttpRequest.request()
|
HttpRequest.request()
|
||||||
.withMethod("POST")
|
.withMethod("POST")
|
||||||
.withPath("/test-topic")
|
.withPath("/")
|
||||||
.withHeader("Title", "Test Feed")
|
|
||||||
.withHeader("Click", "http://example.com/entry")
|
|
||||||
.withHeader("Authorization", "Bearer test-secret")
|
.withHeader("Authorization", "Bearer test-secret")
|
||||||
.withBody("Test Entry"))
|
.withContentType(MediaType.APPLICATION_JSON_UTF_8)
|
||||||
|
.withBody(
|
||||||
|
JsonBody.json(
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"topic": "test-topic",
|
||||||
|
"title": "ąćęłńóśźż 📰 Test Feed",
|
||||||
|
"message": "Test Entry",
|
||||||
|
"click": "http://example.com/entry"
|
||||||
|
}
|
||||||
|
""")))
|
||||||
.respond(HttpResponse.response().withStatusCode(200));
|
.respond(HttpResponse.response().withStatusCode(200));
|
||||||
|
|
||||||
Assertions.assertDoesNotThrow(() -> pushNotificationService.notify(userSettings, subscription, entry));
|
Assertions.assertDoesNotThrow(() -> pushNotificationService.notify(userSettings, subscription, entry));
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class PushNotificationIT extends BaseIT {
|
|||||||
@Test
|
@Test
|
||||||
void receivedPushNotifications() throws IOException {
|
void receivedPushNotifications() throws IOException {
|
||||||
// mock ntfy server
|
// mock ntfy server
|
||||||
HttpRequest ntfyPost = HttpRequest.request().withMethod("POST").withPath("/ntfy/integration-test");
|
HttpRequest ntfyPost = HttpRequest.request().withMethod("POST").withPath("/ntfy");
|
||||||
getMockServerClient().when(ntfyPost).respond(HttpResponse.response().withStatusCode(200));
|
getMockServerClient().when(ntfyPost).respond(HttpResponse.response().withStatusCode(200));
|
||||||
|
|
||||||
// enable push notifications
|
// enable push notifications
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed</artifactId>
|
<artifactId>commafeed</artifactId>
|
||||||
<version>7.5.1</version>
|
<version>7.5.3</version>
|
||||||
<name>CommaFeed</name>
|
<name>CommaFeed</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user