Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/bridges/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ const settingsBridge = {
ipcRenderer.invoke("set-fetch-interval", interval)
},

getFeedDelay: (): number => {
return ipcRenderer.sendSync("get-feed-delay")
},
setFeedDelay: (delay: number) => {
ipcRenderer.invoke("set-feed-delay", delay)
},

getSearchEngine: (): SearchEngines => {
return ipcRenderer.sendSync("get-search-engine")
},
Expand Down
26 changes: 26 additions & 0 deletions src/components/settings/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import DangerButton from "../utils/danger-button"
type AppTabProps = {
setLanguage: (option: string) => void
setFetchInterval: (interval: number) => void
setFeedDelay: (delay: number) => void
deleteArticles: (days: number) => Promise<void>
importAll: () => Promise<void>
}
Expand Down Expand Up @@ -93,6 +94,19 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
this.props.setFetchInterval(item.key as number)
}

feedDelayOptions = (): IDropdownOption[] => [
{ key: 0, text: intl.get("app.nodelay") },
{ key: 1, text: intl.get("time.day", { d: 1 }) },
{ key: 2, text: intl.get("time.day", { d: 2 }) },
{ key: 3, text: intl.get("time.day", { d: 3 }) },
{ key: 7, text: intl.get("time.week", { w: 1 }) },
{ key: 14, text: intl.get("time.week", { w: 2 }) },
{ key: 21, text: intl.get("time.week", { w: 3 }) },
]
onFeedDelayChanged = (item: IDropdownOption) => {
this.props.setFeedDelay(item.key as number)
}

searchEngineOptions = (): IDropdownOption[] =>
[
SearchEngines.Google,
Expand Down Expand Up @@ -196,6 +210,18 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
selectedKey={this.state.themeSettings}
/>

<Label>{intl.get("app.feedDelay")}</Label>
<Stack horizontal>
<Stack.Item>
<Dropdown
defaultSelectedKey={window.settings.getFeedDelay()}
options={this.feedDelayOptions()}
onChanged={this.onFeedDelayChanged}
style={{ width: 200 }}
/>
</Stack.Item>
</Stack>

<Label>{intl.get("app.fetchInterval")}</Label>
<Stack horizontal>
<Stack.Item>
Expand Down
4 changes: 3 additions & 1 deletion src/containers/feed-container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ const makeMapStateToProps = () => {
],
(sources, items, feed, viewType, filter, viewConfigs, currentItem) => ({
feed: feed,
items: feed.iids.map(iid => items[iid]),
items: feed.iids
.map(iid => items[iid])
.filter(item => ((new Date()).getTime() - item.date.getTime()) > window.settings.getFeedDelay() * 86400000),
sourceMap: sources,
filter: filter,
viewType: viewType,
Expand Down
3 changes: 3 additions & 0 deletions src/containers/settings/app-container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
window.settings.setFetchInterval(interval)
dispatch(setupAutoFetch())
},
setFeedDelay: (delay: number) => {
window.settings.setFeedDelay(delay)
},
deleteArticles: async (days: number) => {
dispatch(saveSettings())
let date = new Date()
Expand Down
8 changes: 8 additions & 0 deletions src/main/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ ipcMain.handle("set-fetch-interval", (_, interval: number) => {
store.set(FETCH_INTEVAL_STORE_KEY, interval)
})

const FEED_DELAY_STORE_KEY = "feedDelay"
ipcMain.on("get-feed-delay", event => {
event.returnValue = store.get(FEED_DELAY_STORE_KEY, 0)
})
ipcMain.handle("set-feed-delay", (_, interval: number) => {
store.set(FEED_DELAY_STORE_KEY, interval)
})

const SEARCH_ENGINE_STORE_KEY = "searchEngine"
ipcMain.on("get-search-engine", event => {
event.returnValue = store.get(SEARCH_ENGINE_STORE_KEY, SearchEngines.Google)
Expand Down
1 change: 1 addition & 0 deletions src/schema-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export type SchemaTypes = {
fontFamily: string
menuOn: boolean
fetchInterval: number
feedDelay: number
searchEngine: SearchEngines
serviceConfigs: ServiceConfigs
filterType: number
Expand Down
7 changes: 5 additions & 2 deletions src/scripts/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"d": "d",
"minute": "{m, plural, =1 {# minute} other {# minutes}}",
"hour": "{h, plural, =1 {# hour} other {# hours}}",
"day": "{d, plural, =1 {# day} other {# days}}"
"day": "{d, plural, =1 {# day} other {# days}}",
"week": "{w, plural, =1 {# week} other {# weeks}}"
},
"log": {
"empty": "No notifications",
Expand Down Expand Up @@ -237,6 +238,8 @@
"setPac": "Set PAC",
"pacHint": "For Socks proxies, it is recommended for PAC to return \"SOCKS5\" for proxy-side DNS. Turning off proxy requires restart.",
"fetchInterval": "Automatic fetch interval",
"never": "Never"
"feedDelay": "Feed delay",
"never": "Never",
"nodelay": "No delay"
}
}