Compare commits

...

21 Commits
7.5.0 ... 7.5.3

Author SHA1 Message Date
Athou
7da039503a release 7.5.3 2026-11-19 21:29:25 +01:00
Athou
abf9e2cd85 use ntfy JSON API so notification titles support non-ASCII characters (#2398) 2026-11-19 21:27:51 +01:00
Jérémie Panzer
fe5ff7f721 Merge pull request #2397 from Athou/renovate/patch-testing-library-monorepo
Update dependency @testing-library/user-event to v14.6.12
2026-11-19 14:33:30 +01:00
renovate[bot]
bedbeeccc2 Update dependency @testing-library/user-event to v14.6.12 2026-11-19 07:29:30 +00:00
renovate[bot]
2c819e3049 Update dependency @biomejs/biome to v2.6.8 2026-11-18 16:40:58 +00:00
renovate[bot]
1768571d72 Update mantine monorepo to v9.8.1 2026-11-18 12:02:02 +00:00
renovate[bot]
f8b1b7f8f4 Update graalvm/setup-graalvm action to v1.6.10 2026-11-18 04:54:52 +00:00
renovate[bot]
0a1840d4c8 Update dependency io.github.hakky54:ayza-for-apache5 to v10.1.2 2026-11-17 21:07:39 +00:00
Jérémie Panzer
3d85eca5f6 Merge pull request #2395 from Athou/renovate/org.apache.maven.plugins-maven-help-plugin-3.x
Update dependency org.apache.maven.plugins:maven-help-plugin to v3.6.0
2026-11-17 22:07:02 +01:00
renovate[bot]
894ad757b1 Update dependency org.apache.maven.plugins:maven-help-plugin to v3.6.0 2026-11-17 20:39:54 +00:00
Athou
728868784e release 7.5.2 2026-11-17 21:37:58 +01:00
Athou
e59948c68c fix youtube embeds (#2394) 2026-11-17 14:50:43 +01:00
renovate[bot]
d3ba47d200 Lock file maintenance 2026-11-16 17:22:20 +00:00
Athou
aa8d3a390c release 7.5.1 2026-11-16 18:20:18 +01:00
Athou
ec0e19fa4c only allow one entry context menu to be open at a time (#2393) 2026-11-16 18:19:09 +01:00
renovate[bot]
60ee632b78 Update dependency jsdom to v31.0.1 2026-11-16 12:02:06 +00:00
renovate[bot]
04860af353 Lock file maintenance 2026-11-16 04:05:03 +00:00
Jérémie Panzer
03d369659b Merge pull request #2392 from Athou/renovate/org.mock-server-mockserver-junit-jupiter-no-dependencies-9.x
Update dependency org.mock-server:mockserver-junit-jupiter-no-dependencies to v9.3.0
2026-11-16 05:03:45 +01:00
renovate[bot]
2c05b49c63 Update dependency org.mock-server:mockserver-junit-jupiter-no-dependencies to v9.3.0 2026-11-16 00:52:23 +00:00
renovate[bot]
0cde864b85 Update dependency maven to v3.10.1 2026-11-15 17:13:59 +00:00
renovate[bot]
8a2280ce2c Update dependency @testing-library/user-event to v14.6.10 2026-11-15 05:26:59 +00:00
18 changed files with 622 additions and 414 deletions

View File

@@ -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"

View File

@@ -1,3 +1,3 @@
wrapperVersion=3.3.4 wrapperVersion=3.3.4
distributionType=only-script distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.1/apache-maven-3.10.1-bin.zip

View File

@@ -1,5 +1,17 @@
# 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]
- Fix multiple entry context menus being open at the same time (#2393)
## [7.5.0] ## [7.5.0]
- Empty categories are now restored when importing OPML files (#2364) - Empty categories are now restored when importing OPML files (#2364)

View File

@@ -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,

File diff suppressed because it is too large Load Diff

View File

@@ -19,13 +19,13 @@
"@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.26.0",
"@reduxjs/toolkit": "2.14.0", "@reduxjs/toolkit": "2.14.0",
@@ -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.9", "@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",
@@ -67,7 +67,7 @@
"@types/tinycon": "0.6.7", "@types/tinycon": "0.6.7",
"@vitejs/plugin-react": "6.3.0", "@vitejs/plugin-react": "6.3.0",
"babel-plugin-react-compiler": "^1.0.0", "babel-plugin-react-compiler": "^1.0.0",
"jsdom": "31.0.0", "jsdom": "31.0.1",
"typescript": "7.0.2", "typescript": "7.0.2",
"vite": "8.3.8", "vite": "8.3.8",
"vite-plugin-checker": "1.0.0", "vite-plugin-checker": "1.0.0",

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>7.5.0</version> <version>7.5.3</version>
</parent> </parent>
<artifactId>commafeed-client</artifactId> <artifactId>commafeed-client</artifactId>
<name>CommaFeed Client</name> <name>CommaFeed Client</name>

View File

@@ -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>
) )

View File

@@ -1,7 +1,7 @@
import { Trans } from "@lingui/react/macro" import { Trans } from "@lingui/react/macro"
import { Box } from "@mantine/core" import { Box } from "@mantine/core"
import { openModal } from "@mantine/modals" import { openModal } from "@mantine/modals"
import { useEffect } from "react" import { useEffect, useState } from "react"
import InfiniteScroll from "react-infinite-scroller" import InfiniteScroll from "react-infinite-scroller"
import { throttle } from "throttle-debounce" import { throttle } from "throttle-debounce"
import { Constants } from "@/app/constants" import { Constants } from "@/app/constants"
@@ -78,6 +78,23 @@ export function FeedEntries() {
const swipedLeft = async (entry: ExpendableEntry) => await dispatch(markEntry({ entry, read: !entry.read })) const swipedLeft = async (entry: ExpendableEntry) => await dispatch(markEntry({ entry, read: !entry.read }))
// only one context menu can be opened at a time
const [contextMenuEntryId, setContextMenuEntryId] = useState<string>()
const contextMenuChanged = (entry: ExpendableEntry, opened: boolean) =>
setContextMenuEntryId(current => {
if (opened) return entry.id
return current === entry.id ? undefined : current
})
// close context menu on scroll
useEffect(() => {
if (!contextMenuEntryId) return
const listener = throttle(100, () => setContextMenuEntryId(undefined))
window.addEventListener("scroll", listener)
return () => window.removeEventListener("scroll", listener)
}, [contextMenuEntryId])
useEffect(() => { useEffect(() => {
const listener = throttle(100, () => { const listener = throttle(100, () => {
if (viewMode !== "expanded") return if (viewMode !== "expanded") return
@@ -287,6 +304,8 @@ export function FeedEntries() {
onHeaderClick={event => headerClicked(entry, event)} onHeaderClick={event => headerClicked(entry, event)}
onBodyClick={() => bodyClicked(entry)} onBodyClick={() => bodyClicked(entry)}
onSwipedLeft={async () => await swipedLeft(entry)} onSwipedLeft={async () => await swipedLeft(entry)}
contextMenuOpened={entry.id === contextMenuEntryId}
onContextMenuChange={opened => contextMenuChanged(entry, opened)}
/> />
))} ))}
</InfiniteScroll> </InfiniteScroll>

View File

@@ -21,6 +21,8 @@ interface FeedEntryProps {
onHeaderClick: (e: React.MouseEvent) => void onHeaderClick: (e: React.MouseEvent) => void
onBodyClick: (e: React.MouseEvent) => void onBodyClick: (e: React.MouseEvent) => void
onSwipedLeft: () => void onSwipedLeft: () => void
contextMenuOpened: boolean
onContextMenuChange: (opened: boolean) => void
} }
const useStyles = tss const useStyles = tss
@@ -170,7 +172,11 @@ export function FeedEntry(props: Readonly<FeedEntryProps>) {
"show-selection-indicator": props.showSelectionIndicator, "show-selection-indicator": props.showSelectionIndicator,
})} })}
> >
<FeedEntryContextMenu entry={props.entry}> <FeedEntryContextMenu
entry={props.entry}
opened={props.contextMenuOpened}
onChange={props.onContextMenuChange}
>
<a <a
className={classes.headerLink} className={classes.headerLink}
href={props.entry.url} href={props.entry.url}

View File

@@ -1,8 +1,7 @@
import { Trans } from "@lingui/react/macro" import { Trans } from "@lingui/react/macro"
import { Menu } from "@mantine/core" import { Menu } from "@mantine/core"
import { type ReactElement, useEffect, useState } from "react" import type { ReactElement } from "react"
import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb" import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb"
import { throttle } from "throttle-debounce"
import { markEntriesUpToEntry, markEntry, starEntry } from "@/app/entries/thunks" import { markEntriesUpToEntry, markEntry, starEntry } from "@/app/entries/thunks"
import { redirectToFeed } from "@/app/redirect/thunks" import { redirectToFeed } from "@/app/redirect/thunks"
import { useAppDispatch, useAppSelector } from "@/app/store" import { useAppDispatch, useAppSelector } from "@/app/store"
@@ -12,6 +11,8 @@ import { useBrowserExtension } from "@/hooks/useBrowserExtension"
interface FeedEntryContextMenuProps { interface FeedEntryContextMenuProps {
entry: Entry entry: Entry
opened: boolean
onChange: (opened: boolean) => void
// element that opens the menu when right-clicked // element that opens the menu when right-clicked
children: ReactElement children: ReactElement
} }
@@ -19,23 +20,13 @@ interface FeedEntryContextMenuProps {
const iconSize = 16 const iconSize = 16
export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>) { export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>) {
const [opened, setOpened] = useState(false)
const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu) const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
const sourceType = useAppSelector(state => state.entries.source.type) const sourceType = useAppSelector(state => state.entries.source.type)
const dispatch = useAppDispatch() const dispatch = useAppDispatch()
const { openLinkInBackgroundTab } = useBrowserExtension() const { openLinkInBackgroundTab } = useBrowserExtension()
// close context menu on scroll
useEffect(() => {
if (!opened) return
const listener = throttle(100, () => setOpened(false))
window.addEventListener("scroll", listener)
return () => window.removeEventListener("scroll", listener)
}, [opened])
return ( return (
<Menu position="bottom-start" opened={opened} onChange={setOpened}> <Menu position="bottom-start" opened={props.opened} onChange={props.onChange}>
<Menu.ContextMenu disabled={!customContextMenu}>{props.children}</Menu.ContextMenu> <Menu.ContextMenu disabled={!customContextMenu}>{props.children}</Menu.ContextMenu>
<Menu.Dropdown> <Menu.Dropdown>
<Menu.Item <Menu.Item

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>7.5.0</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.0</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>
@@ -483,7 +483,7 @@
<dependency> <dependency>
<groupId>org.mock-server</groupId> <groupId>org.mock-server</groupId>
<artifactId>mockserver-junit-jupiter-no-dependencies</artifactId> <artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
<version>9.2.0</version> <version>9.3.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -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;
} }

View File

@@ -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());
} }

View File

@@ -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>
""" """

View File

@@ -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));

View File

@@ -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

View File

@@ -5,7 +5,7 @@
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>7.5.0</version> <version>7.5.3</version>
<name>CommaFeed</name> <name>CommaFeed</name>
<packaging>pom</packaging> <packaging>pom</packaging>