Skip to content

Fix http/https feeds mismatch #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ai merged 3 commits into from
Jan 25, 2026
+57 −3
Merged

Fix http/https feeds mismatch #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7f7613
Fix http/https feeds mismatch
ilyatitovich Jan 24, 2026
6833499
Remove unnecessary url mutation
ilyatitovich Jan 24, 2026
a8142ba
Rename getFeedFilter to getFeedsFilter for consistency
ilyatitovich Jan 24, 2026
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
24 changes: 23 additions & 1 deletion core/popups/feed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { FilterStore } from '@logux/client'
import { atom } from 'nanostores'

import { getCategories } from '../category.ts'
Expand Down Expand Up @@ -31,9 +32,30 @@ async function loadFeedFromURL(
}
}

function swapHttpProtocol(url: string): string {
let u = new URL(url)
u.protocol = u.protocol === 'https:' ? 'http:' : 'https:'
return u.toString()
}

async function getFeedsFilter(url: string): Promise<FilterStore<FeedValue>> {
let exactFilter = getFeeds({ url })
let feeds = await waitSyncLoading(exactFilter)

if (feeds.get().list.length === 0) {
let fallbackFilter = getFeeds({ url: swapHttpProtocol(url) })
feeds = await waitSyncLoading(fallbackFilter)
if (feeds.get().list.length > 0) {
return fallbackFilter
}
}

return exactFilter
}

export const feed = definePopup('feed', async url => {
let task = createDownloadTask({ cache: 'read' })
let feedsFilter = getFeeds({ url })
let feedsFilter = await getFeedsFilter(url)
let error: string | undefined
let [responseOrError, categoriesFilter, feeds] = await Promise.all([
loadFeedFromURL(task, url),
Expand Down
5 changes: 3 additions & 2 deletions core/test/pages/add.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,6 @@ test('deduplicates feed links differing only by protocol', async () => {
route: 'add'
})

keepMount(page.candidates)

expectRequest('http://example.com').andRespond(
200,
`<html>
Expand All @@ -642,6 +640,9 @@ test('deduplicates feed links differing only by protocol', async () => {
page.params.url.set('http://example.com')
await waitLoading(page.searching)

let popup = getPopup('feed')
await waitLoading(popup.loading)

equal(page.candidates.get().length, 1)
equalWithText(page.candidates.get(), [
{
Expand Down
31 changes: 31 additions & 0 deletions core/test/popups/feed.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,34 @@ test('has helpers to generate popup ID', () => {
getPopupId('feed', 'http://example.com/')
)
})

test('ignores url protocol while checking for existing feeds', async () => {
keepMount(openedPopups)
expectRequest('http://a.com/atom').andRespond(
200,
'<feed><title>Atom</title>' +
'<entry><id>2</id><updated>2023-07-01T00:00:00Z</updated></entry>' +
'<entry><id>1</id><updated>2023-06-01T00:00:00Z</updated></entry>' +
'</feed>',
'text/xml'
)
let popup = openTestPopup('feed', 'http://a.com/atom')
await waitLoading(popup.loading)

let addedId = await checkLoadedPopup(popup).add()
let feedId = checkLoadedPopup(popup).feed.get()!.id
equal(addedId, feedId)
equal((await loadValue(getFeed(feedId)))!.url, 'http://a.com/atom')

expectRequest('https://a.com/atom').andRespond(
200,
'<feed><title>Atom</title>' +
'<entry><id>2</id><updated>2023-07-01T00:00:00Z</updated></entry>' +
'<entry><id>1</id><updated>2023-06-01T00:00:00Z</updated></entry>' +
'</feed>',
'text/xml'
)
let popup2 = openTestPopup('feed', 'https://a.com/atom')
await waitLoading(popup2.loading)
equal(checkLoadedPopup(popup2).feed.get()!.url, 'http://a.com/atom')
})