Skip to content
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.

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

fix: don't abort opml import when a single feed exists or can't be added #2996

Merged
merged 5 commits into from
Dec 21, 2024

Conversation

wofferl
Copy link
Collaborator

@wofferl wofferl commented Dec 20, 2024

Summary

Skip existing or faulty feeds during opml import.

Checklist

lib/Service/OpmlService.php Outdated Show resolved Hide resolved
lib/Service/OpmlService.php Outdated Show resolved Hide resolved
tests/Unit/Service/OPMLServiceTest.php Outdated Show resolved Hide resolved
@wofferl wofferl force-pushed the fix_opml_import branch 2 times, most recently from d6a1e9d to 952874d Compare December 21, 2024 11:28
Copy link
Contributor

@SMillerDev SMillerDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a bit clearer for users. Otherwise it's good to go.

lib/Service/OpmlService.php Outdated Show resolved Hide resolved
lib/Service/OpmlService.php Outdated Show resolved Hide resolved
lib/Service/OpmlService.php Outdated Show resolved Hide resolved
lib/Service/OpmlService.php Outdated Show resolved Hide resolved
wofferl and others added 4 commits December 21, 2024 13:38
Co-authored-by: Sean Molenaar <[email protected]>
Signed-off-by: Wolfgang <[email protected]>
Co-authored-by: Sean Molenaar <[email protected]>
Signed-off-by: Wolfgang <[email protected]>
Co-authored-by: Sean Molenaar <[email protected]>
Signed-off-by: Wolfgang <[email protected]>
Co-authored-by: Sean Molenaar <[email protected]>
Signed-off-by: Wolfgang <[email protected]>
@SMillerDev SMillerDev merged commit 1eb2ea3 into nextcloud:master Dec 21, 2024
23 of 24 checks passed
Grotax added a commit that referenced this pull request Dec 22, 2024
Changed
- show error message in add feed dialog and keep it open if the feed could not be added (#2988)
- keep margins the same even if an article does not use max width (#2995)

Fixed
- adding feed via web-ui always use auto-discover (#2988)
- show 403 forbidden errors when fetching feeds (#2988)
- prevent move feed dialog from being closed unexpectedly (#2995)
- don't abort `opml` import when a single feed exists or can't be added (#2996)

Signed-off-by: Benjamin Brahmer <[email protected]>
@Grotax Grotax mentioned this pull request Dec 22, 2024
Grotax added a commit that referenced this pull request Dec 22, 2024
Changed
- show error message in add feed dialog and keep it open if the feed could not be added (#2988)
- keep margins the same even if an article does not use max width (#2995)

Fixed
- adding feed via web-ui always use auto-discover (#2988)
- show 403 forbidden errors when fetching feeds (#2988)
- prevent move feed dialog from being closed unexpectedly (#2995)
- don't abort `opml` import when a single feed exists or can't be added (#2996)

Signed-off-by: Benjamin Brahmer <[email protected]>
@wofferl wofferl deleted the fix_opml_import branch January 3, 2025 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't import opml Files
2 participants