mirror of
https://github.com/Athou/commafeed.git
synced 2026-11-20 10:43:37 +00:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
728868784e | ||
|
|
e59948c68c | ||
|
|
d3ba47d200 | ||
|
|
aa8d3a390c | ||
|
|
ec0e19fa4c | ||
|
|
60ee632b78 | ||
|
|
04860af353 | ||
|
|
03d369659b | ||
|
|
2c05b49c63 | ||
|
|
0cde864b85 | ||
|
|
8a2280ce2c |
2
.mvn/wrapper/maven-wrapper.properties
vendored
2
.mvn/wrapper/maven-wrapper.properties
vendored
@@ -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
|
||||||
|
|||||||
24
CHANGELOG.md
24
CHANGELOG.md
@@ -1,5 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [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)
|
||||||
@@ -286,12 +294,12 @@ compiled to a native binary, resulting in blazing fast startup times (around 0.3
|
|||||||
50M).
|
50M).
|
||||||
|
|
||||||
- CommaFeed now has a different package for each supported database.
|
- CommaFeed now has a different package for each supported database.
|
||||||
- If you are deploying CommaFeed with a precompiled package, please
|
- If you are deploying CommaFeed with a precompiled package, please
|
||||||
read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#download-a-precompiled-package).
|
read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#download-a-precompiled-package).
|
||||||
- If you are building CommaFeed from sources, please
|
- If you are building CommaFeed from sources, please
|
||||||
read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#build-from-sources).
|
read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#build-from-sources).
|
||||||
- If you are using the Docker image, please read the instructions on
|
- If you are using the Docker image, please read the instructions on
|
||||||
the [Docker Hub page](https://hub.docker.com/r/athou/commafeed).
|
the [Docker Hub page](https://hub.docker.com/r/athou/commafeed).
|
||||||
- Due to the switch to Quarkus, the way CommaFeed is configured is very different (the `config.yml` file is gone).
|
- Due to the switch to Quarkus, the way CommaFeed is configured is very different (the `config.yml` file is gone).
|
||||||
Please
|
Please
|
||||||
read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#configuration).
|
read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#configuration).
|
||||||
@@ -359,8 +367,8 @@ compiled to a native binary, resulting in blazing fast startup times (around 0.3
|
|||||||
## [4.3.0]
|
## [4.3.0]
|
||||||
|
|
||||||
- h2 (the embedded database) has been upgraded to 2.2.224
|
- h2 (the embedded database) has been upgraded to 2.2.224
|
||||||
- this version uses a different file format than 2.1.x, the first time you start CommaFeed with this version, the
|
- this version uses a different file format than 2.1.x, the first time you start CommaFeed with this version, the
|
||||||
database will be automatically converted to the new format
|
database will be automatically converted to the new format
|
||||||
- add a setting to completely disable scrolling to selected entry (#1157)
|
- add a setting to completely disable scrolling to selected entry (#1157)
|
||||||
- add a css class reflecting the current view mode to ease custom css rules (#1232)
|
- add a css class reflecting the current view mode to ease custom css rules (#1232)
|
||||||
- fix an issue that prevents new feeds from being added when mysql/mariadb is used as the database (#1239)
|
- fix an issue that prevents new feeds from being added when mysql/mariadb is used as the database (#1239)
|
||||||
|
|||||||
706
commafeed-client/package-lock.json
generated
706
commafeed-client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -58,7 +58,7 @@
|
|||||||
"@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.10",
|
||||||
"@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",
|
||||||
|
|||||||
@@ -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.2</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>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>commafeed-server</artifactId>
|
<artifactId>commafeed-server</artifactId>
|
||||||
<name>CommaFeed Server</name>
|
<name>CommaFeed Server</name>
|
||||||
@@ -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.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- compile-time processors -->
|
<!-- compile-time processors -->
|
||||||
@@ -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>
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
||||||
"""
|
"""
|
||||||
|
|||||||
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.0</version>
|
<version>7.5.2</version>
|
||||||
<name>CommaFeed</name>
|
<name>CommaFeed</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user