Compare commits
87 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 875618d786 | |||
| 1503a5c946 | |||
| 8641f5f2a3 | |||
| 93b17af78b | |||
| 92876a0c61 | |||
| d62df4e02a | |||
| 8fa5041c37 | |||
| dc05965895 | |||
| 109e668ac7 | |||
| 6d58052504 | |||
| 491d51c95f | |||
| db49e41acf | |||
| e6b814199b | |||
| b0a10f02fd | |||
| 9c05c3c493 | |||
| 2a9d91c783 | |||
| cb59944d6b | |||
| c12476c1a9 | |||
| bc6ab44ff2 | |||
| 6282ac1f38 | |||
| 96c0ef4efd | |||
| b139ac4a2c | |||
| c818d5bbb8 | |||
| e366710529 | |||
| 5cff4d7117 | |||
| f31a784eaa | |||
| 7edfcc3cf7 | |||
| fe4b00b9f8 | |||
| 46b159ac58 | |||
| 86c58e11f6 | |||
| 9a1d9593b3 | |||
| 43546976d2 | |||
| 3ab9ca9e4d | |||
| 1af6df7cb9 | |||
| 50dff576b0 | |||
| 6af4d69c39 | |||
| 27015a5e34 | |||
| cdb57b3843 | |||
| 152ef578d2 | |||
| 72486b9bd1 | |||
| 81df0b2a16 | |||
| b296f21e98 | |||
| af15032145 | |||
| 6a6a88d06d | |||
| 8660f5e3c7 | |||
| da4ab4263c | |||
| 237672a62c | |||
| e9d4a130fd | |||
| d291d6a74d | |||
| e0f7e6f2a8 | |||
| ef3dbd3707 | |||
| 32f08053aa | |||
| 117c031f1c | |||
| b95c9023ee | |||
| 3538c4271b | |||
| ac44507af2 | |||
| 44c48d109f | |||
| 40727704c2 | |||
| 8a014c6abc | |||
| 60ad19c427 | |||
| f40c1e7f63 | |||
| a4d16cc5c1 | |||
| 7c857bdc72 | |||
| 0caadf82f2 | |||
| 0086e0b356 | |||
| 70b513b8db | |||
| cecc18420d | |||
| d53fd17e10 | |||
| 21d22d7f0b | |||
| d59990f1dd | |||
| 49085daefe | |||
| 5872710d22 | |||
| d2212dee12 | |||
| 8db637cb39 | |||
| 699deea72c | |||
| c41d189a7a | |||
| adfc38d237 | |||
| a8bb7a48d7 | |||
| f9dce3d10f | |||
| 567e8cfc89 | |||
| a8e73d6875 | |||
| fa7f2b18a0 | |||
| 43d302e768 | |||
| 4e181330d0 | |||
| 0369f03940 | |||
| 4597d9b289 | |||
| 7bfd22aab7 |
@@ -63,3 +63,5 @@ body:
|
||||
required: true
|
||||
- label: "I understand that feature requests are not guaranteed to be implemented."
|
||||
required: true
|
||||
- label: "I agree to follow the project's contribution guidelines."
|
||||
required: true
|
||||
|
||||
@@ -84,3 +84,5 @@ body:
|
||||
required: true
|
||||
- label: "I agree to provide follow-up updates and maintain discussion on this proposal."
|
||||
required: true
|
||||
- label: "I agree to follow the project's contribution guidelines."
|
||||
required: true
|
||||
|
||||
@@ -4,4 +4,4 @@ Have you followed these guidelines?
|
||||
- [ ] There are no breaking changes
|
||||
- [ ] I have thoroughly tested my changes and verified there are no regressions
|
||||
- [ ] My commit messages follow the [Conventional Commits specification](https://www.conventionalcommits.org/)
|
||||
- [ ] I have read this document: https://miniflux.app/faq.html#pull-request
|
||||
- [ ] I have read and understood the [contribution guidelines](https://github.com/miniflux/v2/blob/main/CONTRIBUTING.md)
|
||||
|
||||
+178
@@ -0,0 +1,178 @@
|
||||
# Contributing to Miniflux
|
||||
|
||||
This document outlines how to contribute effectively to Miniflux.
|
||||
|
||||
## Philosophy
|
||||
|
||||
Miniflux follows a **minimalist philosophy**. The feature set is intentionally kept limited to avoid bloatware. Before contributing, please understand that:
|
||||
|
||||
- **Improving existing features takes priority over adding new ones**
|
||||
- **Quality over quantity** - well-implemented, focused features are preferred
|
||||
- **Simplicity is key** - complex solutions are discouraged in favor of simple, maintainable code
|
||||
|
||||
## Before You Start
|
||||
|
||||
### Feature Requests
|
||||
|
||||
Before implementing a new feature:
|
||||
|
||||
- Check if it aligns with Miniflux's philosophy
|
||||
- Consider if the feature could be implemented differently to maintain simplicity
|
||||
- Remember that developing software takes significant time, and this is a volunteer-driven project
|
||||
- If you need a specific feature, the best approach is to contribute it yourself
|
||||
|
||||
### Bug Reports
|
||||
|
||||
When reporting bugs:
|
||||
|
||||
- Search existing issues first to avoid duplicates
|
||||
- Provide clear reproduction steps
|
||||
- Include relevant system information (OS, browser, Miniflux version)
|
||||
- Include error messages, screenshots, and logs when applicable
|
||||
|
||||
## Development Setup
|
||||
|
||||
### Requirements
|
||||
|
||||
- **Git**
|
||||
- **Go >= 1.24**
|
||||
- **PostgreSQL**
|
||||
|
||||
### Getting Started
|
||||
|
||||
1. **Fork the repository** on GitHub
|
||||
2. **Clone your fork locally:**
|
||||
```bash
|
||||
git clone https://github.com/YOUR_USERNAME/miniflux.git
|
||||
cd miniflux
|
||||
```
|
||||
|
||||
3. **Build the application binary:**
|
||||
```bash
|
||||
make miniflux
|
||||
```
|
||||
|
||||
4. **Run locally in debug mode:**
|
||||
```bash
|
||||
make run
|
||||
```
|
||||
|
||||
### Database Setup
|
||||
|
||||
For development and testing, you can run a local PostgreSQL database with Docker:
|
||||
|
||||
```bash
|
||||
# Start PostgreSQL container
|
||||
docker run --rm --name miniflux2-db -p 5432:5432 \
|
||||
-e POSTGRES_DB=miniflux2 \
|
||||
-e POSTGRES_USER=postgres \
|
||||
-e POSTGRES_PASSWORD=postgres \
|
||||
postgres
|
||||
```
|
||||
|
||||
You can also use an existing PostgreSQL instance. Make sure to set the `DATABASE_URL` environment variable accordingly.
|
||||
|
||||
## Development Workflow
|
||||
|
||||
### Code Quality
|
||||
|
||||
1. **Run the linter:**
|
||||
```bash
|
||||
make lint
|
||||
```
|
||||
Requires `staticcheck` and `golangci-lint` to be installed.
|
||||
|
||||
2. **Run unit tests:**
|
||||
```bash
|
||||
make test
|
||||
```
|
||||
|
||||
3. **Run integration tests:**
|
||||
```bash
|
||||
make integration-test
|
||||
make clean-integration-test
|
||||
```
|
||||
|
||||
### Building
|
||||
|
||||
- **Current platform:** `make miniflux`
|
||||
- **All platforms:** `make build`
|
||||
- **Specific platforms:** `make linux-amd64`, `make darwin-arm64`, etc.
|
||||
- **Docker image:** `make docker-image`
|
||||
|
||||
### Cross-Platform Support
|
||||
|
||||
Miniflux supports multiple architectures. When making changes, ensure compatibility across:
|
||||
- Linux (amd64, arm64, armv7, armv6, armv5)
|
||||
- macOS (amd64, arm64)
|
||||
- FreeBSD, OpenBSD, Windows (amd64)
|
||||
|
||||
## Pull Request Guidelines
|
||||
|
||||
### What Is Preferred
|
||||
|
||||
✅ **Good Pull Requests:**
|
||||
|
||||
- Focus on a single issue or feature
|
||||
- Include tests for new functionality
|
||||
- Maintain or improve performance
|
||||
- Follow existing code style and patterns
|
||||
- The commit messages follow the [conventional commit format](https://www.conventionalcommits.org/) (e.g., `feat: add new feature`, `fix: resolve bug`)
|
||||
- Update documentation when necessary
|
||||
|
||||
### What to Avoid
|
||||
|
||||
❌ **Pull Requests That Cannot Be Accepted:**
|
||||
|
||||
- **Too many changes** - makes review difficult
|
||||
- **Breaking changes** - disrupts existing functionality
|
||||
- **New bugs or regressions** - reduces software quality
|
||||
- **Unnecessary dependencies** - conflicts with minimalist approach
|
||||
- **Performance degradation** - slows down the software
|
||||
- **Poor-quality code** - hard to maintain
|
||||
- **Dependent PRs** - creates review complexity
|
||||
- **Radical UI changes** - disrupts user experience
|
||||
- **Conflicts with philosophy** - doesn't align with minimalist approach
|
||||
|
||||
### Pull Request Template
|
||||
|
||||
When creating a pull request, please include:
|
||||
|
||||
- **Description:** What does this PR do?
|
||||
- **Motivation:** Why is this change needed?
|
||||
- **Testing:** How was this tested?
|
||||
- **Breaking Changes:** Are there any breaking changes?
|
||||
- **Related Issues:** Link to any related issues
|
||||
|
||||
## Code Style
|
||||
|
||||
- Follow Go conventions and best practices
|
||||
- Use `gofmt` to format your Go code, and `jshint` for JavaScript
|
||||
- Write clear, descriptive variable and function names
|
||||
- Include comments for complex logic
|
||||
- Keep functions small and focused
|
||||
|
||||
## Testing
|
||||
|
||||
### Unit Tests
|
||||
- Write unit tests for new functions and methods
|
||||
- Ensure tests are fast and don't require external dependencies
|
||||
- Aim for good test coverage
|
||||
|
||||
### Integration Tests
|
||||
- Add integration tests for new API endpoints
|
||||
- Tests run against a real PostgreSQL database
|
||||
- Ensure tests clean up after themselves
|
||||
|
||||
## Communication
|
||||
|
||||
- **Discussions:** Use GitHub Discussions for general questions and community interaction
|
||||
- **Issues:** Use GitHub issues for bug reports and feature requests
|
||||
- **Pull Requests:** Use PR comments for code-specific discussions
|
||||
- **Philosophy Questions:** Refer to the FAQ for common questions about project direction
|
||||
|
||||
## Questions?
|
||||
|
||||
- Check the [FAQ](https://miniflux.app/faq.html) for common questions
|
||||
- Review the [development documentation](https://miniflux.app/docs/development.html) and [internationalization guide](https://miniflux.app/docs/i18n.html)
|
||||
- Look at existing issues and pull requests for examples
|
||||
@@ -1,3 +1,87 @@
|
||||
Version 2.2.10 (June 23, 2025)
|
||||
------------------------------
|
||||
|
||||
* test(sanitizer): add unit test for 0x0 pixel tracker
|
||||
* test(sanitizer): add test case to cover Vimeo iframe rewrite without query string
|
||||
* refactor(youtube): Remove a regex and make use of `fetchWatchTime`
|
||||
* refactor(youtube): initialize two maps to the proper length
|
||||
* refactor(tests): use `b.Loop()` instead of for range `b.N`
|
||||
* refactor(server): avoid double call to `Sprintf`
|
||||
* refactor(sanitizer): use global variables to avoid recreating slices on every call
|
||||
* refactor(sanitizer): use a map for iframe allow list
|
||||
* refactor(sanitizer): remove two useless `www.` prefixes
|
||||
* refactor(sanitizer): make `isValidAttribute()` check O(1)
|
||||
* refactor(rewrite): rename `Rewriter` function to `ApplyContentRewriteRules`
|
||||
* refactor(processor): simplify Bilibili processing
|
||||
* refactor(processor): remove a useless type declaration
|
||||
* refactor(processor): remove a duplicated function call
|
||||
* refactor(processor): refactor common code into a `fetchWatchTime` function
|
||||
* refactor(processor): move filters to a `filter` package
|
||||
* refactor(processor): move `FilterEntryMaxAgeDays` filter to filter package
|
||||
* refactor(processor): move `RewriteEntryURL` function to `rewrite` package
|
||||
* refactor(processor): minor simplification of a loop
|
||||
* refactor(internal): add an `urllib.DomainWithoutWWW` function
|
||||
* refactor(http): rename package from `httpd` to `server` for consistency
|
||||
* refactor(http): Don't hardcode TLS configuration
|
||||
* refactor(filter): avoid code duplication between `IsBlockedEntry` and `IsAllowedEntry` functions
|
||||
* refactor(database): drop 3 columns in a single transaction
|
||||
* refactor(crypto): use `rand.Text()` instead of a custom implementation
|
||||
* refactor(config): remove deprecated config options
|
||||
* refactor(appjs): no need to check if always present elements are always present
|
||||
* perf(xml): optimized `NewXMLDecoder`
|
||||
* perf(xml): optimize XML filtering
|
||||
* perf(validator): slightly optimize a regex
|
||||
* perf(timezone): cache `getLocation`'s results
|
||||
* perf(storage): pre-allocate a slice in `RefreshFeedEntries`
|
||||
* perf(storage): optimize away two `Sprintf` calls
|
||||
* perf(sanitizer): use a switch-case instead of a map
|
||||
* perf(sanitizer): minor simplifications of the sanitizer
|
||||
* perf(sanitizer): extract a call to `url.Parse` and make intensive use of it
|
||||
* perf(rss): optimize a bit `BuildFeed`
|
||||
* perf(rss): early return when looking for an item's author
|
||||
* perf(rewrite): make `getPredefinedRewriteRules` O(1)
|
||||
* perf(reader): use a non-cryptographic hash when possible
|
||||
* perf(reader): optimize `RemoveTrackingParameters`
|
||||
* perf(readability): minor regex improvement
|
||||
* perf(media): minor regex simplification
|
||||
* perf(fetcher): pre-allocate the cipherSuites
|
||||
* perf(database): use `TRUNCATE` instead of `DELETE FROM` in migrations
|
||||
* perf(database): marginally speeds migrations up
|
||||
* perf(api): use `math/rand/v2` instead of `math/rand` for better performance
|
||||
* fix(readability): do not remove elements within code blocks
|
||||
* fix(karakeep): correct method name and improve error handling in `SaveURL`
|
||||
* fix(filter): skip invalid rules instead of exiting the loop
|
||||
* feat(ui): display external link in single entry view because the URL was not visible on mobile (no mouse over)
|
||||
* feat(ui): avoid showing an excessive number of tags
|
||||
* feat(ui): add user setting to control `target="_blank"` on links
|
||||
* feat(sanitizer): validate MathML XML namespace
|
||||
* feat(sanitizer): consider images of size 0x0 as pixel trackers
|
||||
* feat(sanitizer): add validation for empty `width` and `height` attributes in img tags
|
||||
* feat(sanitizer): add support for `fetchpriority` and `decoding` attributes in img tags
|
||||
* feat(rewrite): add support for YouTube Shorts video URL pattern
|
||||
* feat(rewrite): add `parkablogs.com` to the referer override list
|
||||
* feat(oidc): use `preferred_username` first instead of `email` claim
|
||||
* feat(locale): update Polish translations
|
||||
* feat(locale): update locales using machine translation
|
||||
* feat(locale): update Indonesian translations
|
||||
* feat(locale): update German translations
|
||||
* feat(locale): update Chinese translations
|
||||
* feat(integration)!: remove Pocket integration (Pocket will no longer be available after July 8, 2025)
|
||||
* feat(filter): add `EntryDate=max-age:duration` filter
|
||||
* feat(css): add margin-bottom to input for consistent spacing
|
||||
* feat(config)!: remove `SERVER_TIMING_HEADER` config option
|
||||
* feat: Allow multiple listen addresses
|
||||
* feat: adding support for saving entries to Karakeep
|
||||
* feat: add entry filters at the feed level
|
||||
* docs(readme): document a couple of nifty features
|
||||
* docs: add `CONTRIBUTING.md` file
|
||||
* chore(template): remove `X-UA-Compatible` meta tag specific to Internet Explorer
|
||||
* build(go): bump to go 1.24
|
||||
* build(deps): bump `library/alpine` in `/packaging/docker/alpine`
|
||||
* build(deps): bump `golang.org/x/net` from `0.40.0` to `0.41.0`
|
||||
* build(deps): bump `golang.org/x/image` from `0.27.0` to `0.28.0`
|
||||
* build(deps): bump `golang.org/x/crypto` from `0.38.0` to `0.39.0`
|
||||
|
||||
Version 2.2.9 (May 26, 2025)
|
||||
----------------------------
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ Features
|
||||
- Provides full-text search (powered by Postgres).
|
||||
- Available in 20 languages: Portuguese (Brazilian), Chinese (Simplified and Traditional), Dutch, English (US), Finnish, French, German, Greek, Hindi, Indonesian, Italian, Japanese, Polish, Romanian, Russian, Taiwanese POJ, Ukrainian, Spanish, and Turkish.
|
||||
|
||||
### Privacy
|
||||
### Privacy and Security
|
||||
|
||||
- Removes pixel trackers.
|
||||
- Strips tracking parameters from URLs (e.g., `utm_source`, `utm_medium`, `utm_campaign`, `fbclid`, etc.).
|
||||
@@ -33,6 +33,8 @@ Features
|
||||
- Plays YouTube videos via the privacy-focused domain `youtube-nocookie.com`.
|
||||
- Supports alternative YouTube video players such as [Invidious](https://invidio.us).
|
||||
- Blocks external JavaScript to prevent tracking and enhance security.
|
||||
- Sanitizes external content before rendering it.
|
||||
- Enforces a [Content Security](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) and a [Trusted Types Policy](https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API) to only application JavaScript and blocks inline scripts and styles.
|
||||
|
||||
### Bot Protection Bypass Mechanisms
|
||||
|
||||
@@ -70,7 +72,7 @@ Features
|
||||
|
||||
### Integrations
|
||||
|
||||
- 25+ integrations with third-party services: [Apprise](https://github.com/caronc/apprise), [Betula](https://sr.ht/~bouncepaw/betula/), [Cubox](https://cubox.cc/), [Discord](https://discord.com/), [Espial](https://github.com/jonschoning/espial), [Instapaper](https://www.instapaper.com/), [LinkAce](https://www.linkace.org/), [Linkding](https://github.com/sissbruecker/linkding), [LinkWarden](https://linkwarden.app/), [Matrix](https://matrix.org), [Notion](https://www.notion.com/), [Ntfy](https://ntfy.sh/), [Nunux Keeper](https://keeper.nunux.org/), [Pinboard](https://pinboard.in/), [Pocket](https://getpocket.com/), [Pushover](https://pushover.net), [RainDrop](https://raindrop.io/), [Readeck](https://readeck.org/en/), [Readwise Reader](https://readwise.io/read), [RssBridge](https://rss-bridge.org/), [Shaarli](https://github.com/shaarli/Shaarli), [Shiori](https://github.com/go-shiori/shiori), [Slack](https://slack.com/), [Telegram](https://telegram.org), [Wallabag](https://www.wallabag.org/), etc.
|
||||
- 25+ integrations with third-party services: [Apprise](https://github.com/caronc/apprise), [Betula](https://sr.ht/~bouncepaw/betula/), [Cubox](https://cubox.cc/), [Discord](https://discord.com/), [Espial](https://github.com/jonschoning/espial), [Instapaper](https://www.instapaper.com/), [LinkAce](https://www.linkace.org/), [Linkding](https://github.com/sissbruecker/linkding), [LinkWarden](https://linkwarden.app/), [Matrix](https://matrix.org), [Notion](https://www.notion.com/), [Ntfy](https://ntfy.sh/), [Nunux Keeper](https://keeper.nunux.org/), [Pinboard](https://pinboard.in/), [Pushover](https://pushover.net), [RainDrop](https://raindrop.io/), [Readeck](https://readeck.org/en/), [Readwise Reader](https://readwise.io/read), [RssBridge](https://rss-bridge.org/), [Shaarli](https://github.com/shaarli/Shaarli), [Shiori](https://github.com/go-shiori/shiori), [Slack](https://slack.com/), [Telegram](https://telegram.org), [Wallabag](https://www.wallabag.org/), etc.
|
||||
- Bookmarklet for subscribing to websites directly from any web browser.
|
||||
- Webhooks for real-time notifications or custom integrations.
|
||||
- Compatibility with existing mobile applications using the Fever or Google Reader API.
|
||||
@@ -97,13 +99,15 @@ Features
|
||||
- Allows the use of custom <abbr title="Secure Sockets Layer">SSL</abbr> certificates.
|
||||
- Supports [HTTP/2](https://en.wikipedia.org/wiki/HTTP/2) when TLS is enabled.
|
||||
- Updates feeds in the background using an internal scheduler or a traditional cron job.
|
||||
- Sanitizes external content before rendering it.
|
||||
- Enforces a [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) that permits only application JavaScript and blocks inline scripts and styles.
|
||||
- Uses native lazy loading for images and iframes.
|
||||
- Compatible only with modern browsers.
|
||||
- Adheres to the [Twelve-Factor App](https://12factor.net/) methodology.
|
||||
- Provides official Debian/RPM packages and pre-built binaries.
|
||||
- Publishes a Docker image to Docker Hub, GitHub Registry, and Quay.io Registry, with ARM architecture support.
|
||||
- Uses a limited amount of third-party go dependencies
|
||||
- Has a comprehensive testsuite, with both unit tests and integration tests.
|
||||
- Only uses a couple of MB of memory and a negligible amount of CPU, even with several hundreds of feeds.
|
||||
- Respects/sends Last-Modified, If-Modified-Since, If-None-Match, Cache-Control, Expires and ETags headers, and has a default polling interval of 1h.
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
+69
-58
@@ -17,36 +17,37 @@ const (
|
||||
|
||||
// User represents a user in the system.
|
||||
type User struct {
|
||||
ID int64 `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Password string `json:"password,omitempty"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
Theme string `json:"theme"`
|
||||
Language string `json:"language"`
|
||||
Timezone string `json:"timezone"`
|
||||
EntryDirection string `json:"entry_sorting_direction"`
|
||||
EntryOrder string `json:"entry_sorting_order"`
|
||||
Stylesheet string `json:"stylesheet"`
|
||||
CustomJS string `json:"custom_js"`
|
||||
GoogleID string `json:"google_id"`
|
||||
OpenIDConnectID string `json:"openid_connect_id"`
|
||||
EntriesPerPage int `json:"entries_per_page"`
|
||||
KeyboardShortcuts bool `json:"keyboard_shortcuts"`
|
||||
ShowReadingTime bool `json:"show_reading_time"`
|
||||
EntrySwipe bool `json:"entry_swipe"`
|
||||
GestureNav string `json:"gesture_nav"`
|
||||
LastLoginAt *time.Time `json:"last_login_at"`
|
||||
DisplayMode string `json:"display_mode"`
|
||||
DefaultReadingSpeed int `json:"default_reading_speed"`
|
||||
CJKReadingSpeed int `json:"cjk_reading_speed"`
|
||||
DefaultHomePage string `json:"default_home_page"`
|
||||
CategoriesSortingOrder string `json:"categories_sorting_order"`
|
||||
MarkReadOnView bool `json:"mark_read_on_view"`
|
||||
MediaPlaybackRate float64 `json:"media_playback_rate"`
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
ExternalFontHosts string `json:"external_font_hosts"`
|
||||
AlwaysOpenExternalLinks bool `json:"always_open_external_links"`
|
||||
ID int64 `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Password string `json:"password,omitempty"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
Theme string `json:"theme"`
|
||||
Language string `json:"language"`
|
||||
Timezone string `json:"timezone"`
|
||||
EntryDirection string `json:"entry_sorting_direction"`
|
||||
EntryOrder string `json:"entry_sorting_order"`
|
||||
Stylesheet string `json:"stylesheet"`
|
||||
CustomJS string `json:"custom_js"`
|
||||
GoogleID string `json:"google_id"`
|
||||
OpenIDConnectID string `json:"openid_connect_id"`
|
||||
EntriesPerPage int `json:"entries_per_page"`
|
||||
KeyboardShortcuts bool `json:"keyboard_shortcuts"`
|
||||
ShowReadingTime bool `json:"show_reading_time"`
|
||||
EntrySwipe bool `json:"entry_swipe"`
|
||||
GestureNav string `json:"gesture_nav"`
|
||||
LastLoginAt *time.Time `json:"last_login_at"`
|
||||
DisplayMode string `json:"display_mode"`
|
||||
DefaultReadingSpeed int `json:"default_reading_speed"`
|
||||
CJKReadingSpeed int `json:"cjk_reading_speed"`
|
||||
DefaultHomePage string `json:"default_home_page"`
|
||||
CategoriesSortingOrder string `json:"categories_sorting_order"`
|
||||
MarkReadOnView bool `json:"mark_read_on_view"`
|
||||
MediaPlaybackRate float64 `json:"media_playback_rate"`
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
ExternalFontHosts string `json:"external_font_hosts"`
|
||||
AlwaysOpenExternalLinks bool `json:"always_open_external_links"`
|
||||
OpenExternalLinksInNewTab bool `json:"open_external_links_in_new_tab"`
|
||||
}
|
||||
|
||||
func (u User) String() string {
|
||||
@@ -64,34 +65,35 @@ type UserCreationRequest struct {
|
||||
|
||||
// UserModificationRequest represents the request to update a user.
|
||||
type UserModificationRequest struct {
|
||||
Username *string `json:"username"`
|
||||
Password *string `json:"password"`
|
||||
IsAdmin *bool `json:"is_admin"`
|
||||
Theme *string `json:"theme"`
|
||||
Language *string `json:"language"`
|
||||
Timezone *string `json:"timezone"`
|
||||
EntryDirection *string `json:"entry_sorting_direction"`
|
||||
EntryOrder *string `json:"entry_sorting_order"`
|
||||
Stylesheet *string `json:"stylesheet"`
|
||||
CustomJS *string `json:"custom_js"`
|
||||
GoogleID *string `json:"google_id"`
|
||||
OpenIDConnectID *string `json:"openid_connect_id"`
|
||||
EntriesPerPage *int `json:"entries_per_page"`
|
||||
KeyboardShortcuts *bool `json:"keyboard_shortcuts"`
|
||||
ShowReadingTime *bool `json:"show_reading_time"`
|
||||
EntrySwipe *bool `json:"entry_swipe"`
|
||||
GestureNav *string `json:"gesture_nav"`
|
||||
DisplayMode *string `json:"display_mode"`
|
||||
DefaultReadingSpeed *int `json:"default_reading_speed"`
|
||||
CJKReadingSpeed *int `json:"cjk_reading_speed"`
|
||||
DefaultHomePage *string `json:"default_home_page"`
|
||||
CategoriesSortingOrder *string `json:"categories_sorting_order"`
|
||||
MarkReadOnView *bool `json:"mark_read_on_view"`
|
||||
MediaPlaybackRate *float64 `json:"media_playback_rate"`
|
||||
BlockFilterEntryRules *string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules *string `json:"keep_filter_entry_rules"`
|
||||
ExternalFontHosts *string `json:"external_font_hosts"`
|
||||
AlwaysOpenExternalLinks *bool `json:"always_open_external_links"`
|
||||
Username *string `json:"username"`
|
||||
Password *string `json:"password"`
|
||||
IsAdmin *bool `json:"is_admin"`
|
||||
Theme *string `json:"theme"`
|
||||
Language *string `json:"language"`
|
||||
Timezone *string `json:"timezone"`
|
||||
EntryDirection *string `json:"entry_sorting_direction"`
|
||||
EntryOrder *string `json:"entry_sorting_order"`
|
||||
Stylesheet *string `json:"stylesheet"`
|
||||
CustomJS *string `json:"custom_js"`
|
||||
GoogleID *string `json:"google_id"`
|
||||
OpenIDConnectID *string `json:"openid_connect_id"`
|
||||
EntriesPerPage *int `json:"entries_per_page"`
|
||||
KeyboardShortcuts *bool `json:"keyboard_shortcuts"`
|
||||
ShowReadingTime *bool `json:"show_reading_time"`
|
||||
EntrySwipe *bool `json:"entry_swipe"`
|
||||
GestureNav *string `json:"gesture_nav"`
|
||||
DisplayMode *string `json:"display_mode"`
|
||||
DefaultReadingSpeed *int `json:"default_reading_speed"`
|
||||
CJKReadingSpeed *int `json:"cjk_reading_speed"`
|
||||
DefaultHomePage *string `json:"default_home_page"`
|
||||
CategoriesSortingOrder *string `json:"categories_sorting_order"`
|
||||
MarkReadOnView *bool `json:"mark_read_on_view"`
|
||||
MediaPlaybackRate *float64 `json:"media_playback_rate"`
|
||||
BlockFilterEntryRules *string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules *string `json:"keep_filter_entry_rules"`
|
||||
ExternalFontHosts *string `json:"external_font_hosts"`
|
||||
AlwaysOpenExternalLinks *bool `json:"always_open_external_links"`
|
||||
OpenExternalLinksInNewTab *bool `json:"open_external_links_in_new_tab"`
|
||||
}
|
||||
|
||||
// Users represents a list of users.
|
||||
@@ -158,8 +160,11 @@ type Feed struct {
|
||||
FetchViaProxy bool `json:"fetch_via_proxy"`
|
||||
ScraperRules string `json:"scraper_rules"`
|
||||
RewriteRules string `json:"rewrite_rules"`
|
||||
UrlRewriteRules string `json:"urlrewrite_rules"`
|
||||
BlocklistRules string `json:"blocklist_rules"`
|
||||
KeeplistRules string `json:"keeplist_rules"`
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
Crawler bool `json:"crawler"`
|
||||
UserAgent string `json:"user_agent"`
|
||||
Cookie string `json:"cookie"`
|
||||
@@ -186,8 +191,11 @@ type FeedCreationRequest struct {
|
||||
FetchViaProxy bool `json:"fetch_via_proxy"`
|
||||
ScraperRules string `json:"scraper_rules"`
|
||||
RewriteRules string `json:"rewrite_rules"`
|
||||
UrlRewriteRules string `json:"urlrewrite_rules"`
|
||||
BlocklistRules string `json:"blocklist_rules"`
|
||||
KeeplistRules string `json:"keeplist_rules"`
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
HideGlobally bool `json:"hide_globally"`
|
||||
DisableHTTP2 bool `json:"disable_http2"`
|
||||
ProxyURL string `json:"proxy_url"`
|
||||
@@ -200,8 +208,11 @@ type FeedModificationRequest struct {
|
||||
Title *string `json:"title"`
|
||||
ScraperRules *string `json:"scraper_rules"`
|
||||
RewriteRules *string `json:"rewrite_rules"`
|
||||
UrlRewriteRules *string `json:"urlrewrite_rules"`
|
||||
BlocklistRules *string `json:"blocklist_rules"`
|
||||
KeeplistRules *string `json:"keeplist_rules"`
|
||||
BlockFilterEntryRules *string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules *string `json:"keep_filter_entry_rules"`
|
||||
Crawler *bool `json:"crawler"`
|
||||
UserAgent *string `json:"user_agent"`
|
||||
Cookie *string `json:"cookie"`
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
module miniflux.app/v2
|
||||
|
||||
// +heroku goVersion go1.23
|
||||
// +heroku goVersion go1.24
|
||||
|
||||
require (
|
||||
github.com/PuerkitoBio/goquery v1.10.3
|
||||
@@ -12,9 +12,9 @@ require (
|
||||
github.com/mattn/go-sqlite3 v1.14.28
|
||||
github.com/prometheus/client_golang v1.22.0
|
||||
github.com/tdewolff/minify/v2 v2.23.8
|
||||
golang.org/x/crypto v0.38.0
|
||||
golang.org/x/image v0.27.0
|
||||
golang.org/x/net v0.40.0
|
||||
golang.org/x/crypto v0.39.0
|
||||
golang.org/x/image v0.28.0
|
||||
golang.org/x/net v0.41.0
|
||||
golang.org/x/oauth2 v0.30.0
|
||||
golang.org/x/term v0.32.0
|
||||
)
|
||||
@@ -40,10 +40,10 @@ require (
|
||||
github.com/tdewolff/parse/v2 v2.8.1 // indirect
|
||||
github.com/x448/float16 v0.8.4 // indirect
|
||||
golang.org/x/sys v0.33.0 // indirect
|
||||
golang.org/x/text v0.25.0 // indirect
|
||||
golang.org/x/text v0.26.0 // indirect
|
||||
google.golang.org/protobuf v1.36.5 // indirect
|
||||
)
|
||||
|
||||
go 1.23.0
|
||||
go 1.24.0
|
||||
|
||||
toolchain go1.24.1
|
||||
|
||||
@@ -72,10 +72,10 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
|
||||
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
||||
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
||||
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
||||
golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
|
||||
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
|
||||
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
|
||||
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
|
||||
golang.org/x/image v0.28.0 h1:gdem5JW1OLS4FbkWgLO+7ZeFzYtL3xClb97GaUzYMFE=
|
||||
golang.org/x/image v0.28.0/go.mod h1:GUJYXtnGKEUgggyzh+Vxt+AviiCcyiwpsl8iQ8MvwGY=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
@@ -90,8 +90,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
||||
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
|
||||
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
||||
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
||||
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
|
||||
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
|
||||
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
|
||||
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
@@ -134,8 +134,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
||||
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
||||
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
|
||||
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"math/rand"
|
||||
"math/rand/v2"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
+15
-5
@@ -13,7 +13,7 @@ import (
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
httpd "miniflux.app/v2/internal/http/server"
|
||||
"miniflux.app/v2/internal/http/server"
|
||||
"miniflux.app/v2/internal/metric"
|
||||
"miniflux.app/v2/internal/storage"
|
||||
"miniflux.app/v2/internal/systemd"
|
||||
@@ -33,9 +33,9 @@ func startDaemon(store *storage.Storage) {
|
||||
runScheduler(store, pool)
|
||||
}
|
||||
|
||||
var httpServer *http.Server
|
||||
var httpServers []*http.Server
|
||||
if config.Opts.HasHTTPService() {
|
||||
httpServer = httpd.StartWebServer(store, pool)
|
||||
httpServers = server.StartWebServer(store, pool)
|
||||
}
|
||||
|
||||
if config.Opts.HasMetricsCollector() {
|
||||
@@ -78,8 +78,18 @@ func startDaemon(store *storage.Storage) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if httpServer != nil {
|
||||
httpServer.Shutdown(ctx)
|
||||
if len(httpServers) > 0 {
|
||||
slog.Debug("Shutting down HTTP servers...")
|
||||
for _, server := range httpServers {
|
||||
if server != nil {
|
||||
if err := server.Shutdown(ctx); err != nil {
|
||||
slog.Error("HTTP server shutdown error", slog.Any("error", err), slog.String("addr", server.Addr))
|
||||
}
|
||||
}
|
||||
}
|
||||
slog.Debug("All HTTP servers shut down.")
|
||||
} else {
|
||||
slog.Debug("No HTTP servers to shut down.")
|
||||
}
|
||||
|
||||
slog.Debug("Process gracefully stopped")
|
||||
|
||||
@@ -14,7 +14,7 @@ import (
|
||||
|
||||
func doHealthCheck(healthCheckEndpoint string) {
|
||||
if healthCheckEndpoint == "auto" {
|
||||
healthCheckEndpoint = "http://" + config.Opts.ListenAddr() + config.Opts.BasePath() + "/healthcheck"
|
||||
healthCheckEndpoint = "http://" + config.Opts.ListenAddr()[0] + config.Opts.BasePath() + "/healthcheck"
|
||||
}
|
||||
|
||||
slog.Debug("Executing health check request", slog.String("endpoint", healthCheckEndpoint))
|
||||
|
||||
+42
-227
@@ -6,6 +6,7 @@ package config // import "miniflux.app/v2/internal/config"
|
||||
import (
|
||||
"bytes"
|
||||
"os"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -184,35 +185,6 @@ func TestLogFormatWithInvalidValue(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDebugModeOn(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("DEBUG", "1")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
if opts.LogLevel() != "debug" {
|
||||
t.Fatalf(`Unexpected debug mode value, got %q`, opts.LogLevel())
|
||||
}
|
||||
}
|
||||
|
||||
func TestDebugModeOff(t *testing.T) {
|
||||
os.Clearenv()
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
if opts.LogLevel() != "info" {
|
||||
t.Fatalf(`Unexpected debug mode value, got %q`, opts.LogLevel())
|
||||
}
|
||||
}
|
||||
|
||||
func TestCustomBaseURL(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("BASE_URL", "http://example.org")
|
||||
@@ -457,18 +429,18 @@ func TestListenAddr(t *testing.T) {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := "foobar"
|
||||
expected := []string{"foobar"}
|
||||
result := opts.ListenAddr()
|
||||
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected LISTEN_ADDR value, got %q instead of %q`, result, expected)
|
||||
if !reflect.DeepEqual(result, expected) {
|
||||
t.Fatalf(`Unexpected LISTEN_ADDR value, got %v instead of %v`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestListenAddrWithPortDefined(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PORT", "3000")
|
||||
os.Setenv("LISTEN_ADDR", "foobar")
|
||||
os.Setenv("LISTEN_ADDR", "foobar") // This should be overridden by PORT
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
@@ -476,11 +448,11 @@ func TestListenAddrWithPortDefined(t *testing.T) {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := ":3000"
|
||||
expected := []string{":3000"}
|
||||
result := opts.ListenAddr()
|
||||
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected LISTEN_ADDR value, got %q instead of %q`, result, expected)
|
||||
if !reflect.DeepEqual(result, expected) {
|
||||
t.Fatalf(`Unexpected LISTEN_ADDR value when PORT is set, got %v instead of %v`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -493,11 +465,11 @@ func TestDefaultListenAddrValue(t *testing.T) {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := defaultListenAddr
|
||||
expected := []string{defaultListenAddr}
|
||||
result := opts.ListenAddr()
|
||||
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected LISTEN_ADDR value, got %q instead of %q`, result, expected)
|
||||
if !reflect.DeepEqual(result, expected) {
|
||||
t.Fatalf(`Unexpected default LISTEN_ADDR value, got %v instead of %v`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1466,41 +1438,6 @@ func TestCreateAdmin(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPocketConsumerKeyFromEnvVariable(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("POCKET_CONSUMER_KEY", "something")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := "something"
|
||||
result := opts.PocketConsumerKey("default")
|
||||
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected POCKET_CONSUMER_KEY value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPocketConsumerKeyFromUserPrefs(t *testing.T) {
|
||||
os.Clearenv()
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := "default"
|
||||
result := opts.PocketConsumerKey("default")
|
||||
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected POCKET_CONSUMER_KEY value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMediaProxyMode(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
@@ -1687,147 +1624,6 @@ func TestMediaProxyPrivateKey(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyImagesOptionForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_IMAGES", "all")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := []string{"image"}
|
||||
if len(expected) != len(opts.MediaProxyResourceTypes()) {
|
||||
t.Fatalf(`Unexpected PROXY_IMAGES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
|
||||
}
|
||||
|
||||
resultMap := make(map[string]bool)
|
||||
for _, mediaType := range opts.MediaProxyResourceTypes() {
|
||||
resultMap[mediaType] = true
|
||||
}
|
||||
|
||||
for _, mediaType := range expected {
|
||||
if !resultMap[mediaType] {
|
||||
t.Fatalf(`Unexpected PROXY_IMAGES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
|
||||
}
|
||||
}
|
||||
|
||||
expectedProxyOption := "all"
|
||||
result := opts.MediaProxyMode()
|
||||
if result != expectedProxyOption {
|
||||
t.Fatalf(`Unexpected PROXY_OPTION value, got %q instead of %q`, result, expectedProxyOption)
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyImageURLForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_IMAGE_URL", "http://example.org/proxy")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := "http://example.org/proxy"
|
||||
result := opts.MediaCustomProxyURL()
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected PROXY_IMAGE_URL value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyURLOptionForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_URL", "http://example.org/proxy")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := "http://example.org/proxy"
|
||||
result := opts.MediaCustomProxyURL()
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected PROXY_URL value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyMediaTypesOptionForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image,audio")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
expected := []string{"audio", "image"}
|
||||
if len(expected) != len(opts.MediaProxyResourceTypes()) {
|
||||
t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
|
||||
}
|
||||
|
||||
resultMap := make(map[string]bool)
|
||||
for _, mediaType := range opts.MediaProxyResourceTypes() {
|
||||
resultMap[mediaType] = true
|
||||
}
|
||||
|
||||
for _, mediaType := range expected {
|
||||
if !resultMap[mediaType] {
|
||||
t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyOptionForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
expected := "all"
|
||||
result := opts.MediaProxyMode()
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected PROXY_OPTION value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyHTTPClientTimeoutOptionForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_HTTP_CLIENT_TIMEOUT", "24")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
expected := 24
|
||||
result := opts.MediaProxyHTTPClientTimeout()
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected PROXY_HTTP_CLIENT_TIMEOUT value, got %d instead of %d`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestProxyPrivateKeyOptionForBackwardCompatibility(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "foobar")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
expected := []byte("foobar")
|
||||
result := opts.MediaProxyPrivateKey()
|
||||
if !bytes.Equal(result, expected) {
|
||||
t.Fatalf(`Unexpected PROXY_PRIVATE_KEY value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHTTPSOff(t *testing.T) {
|
||||
os.Clearenv()
|
||||
|
||||
@@ -1966,9 +1762,7 @@ func TestParseConfigFile(t *testing.T) {
|
||||
content := []byte(`
|
||||
# This is a comment
|
||||
|
||||
DEBUG = yes
|
||||
|
||||
POCKET_CONSUMER_KEY= >#1234
|
||||
LOG_LEVEL = debug
|
||||
|
||||
Invalid text
|
||||
`)
|
||||
@@ -1991,13 +1785,7 @@ Invalid text
|
||||
}
|
||||
|
||||
if opts.LogLevel() != "debug" {
|
||||
t.Errorf(`Unexpected debug mode value, got %q`, opts.LogLevel())
|
||||
}
|
||||
|
||||
expected := ">#1234"
|
||||
result := opts.PocketConsumerKey("default")
|
||||
if result != expected {
|
||||
t.Errorf(`Unexpected POCKET_CONSUMER_KEY value, got %q instead of %q`, result, expected)
|
||||
t.Errorf(`Unexpected log level value, got %q`, opts.LogLevel())
|
||||
}
|
||||
|
||||
if err := tmpfile.Close(); err != nil {
|
||||
@@ -2169,12 +1957,33 @@ func TestYouTubeApiKey(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDefaultYouTubeEmbedUrl(t *testing.T) {
|
||||
os.Clearenv()
|
||||
|
||||
opts, err := NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
expected := "https://www.youtube-nocookie.com/embed/"
|
||||
result := opts.YouTubeEmbedUrlOverride()
|
||||
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected default value, got %v instead of %v`, result, expected)
|
||||
}
|
||||
|
||||
expected = "www.youtube-nocookie.com"
|
||||
result = opts.YouTubeEmbedDomain()
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected YouTube embed domain, got %v instead of %v`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYouTubeEmbedUrlOverride(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("YOUTUBE_EMBED_URL_OVERRIDE", "https://invidious.custom/embed/")
|
||||
|
||||
parser := NewParser()
|
||||
opts, err := parser.ParseEnvironmentVariables()
|
||||
opts, err := NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
@@ -2185,6 +1994,12 @@ func TestYouTubeEmbedUrlOverride(t *testing.T) {
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected YOUTUBE_EMBED_URL_OVERRIDE value, got %v instead of %v`, result, expected)
|
||||
}
|
||||
|
||||
expected = "invidious.custom"
|
||||
result = opts.YouTubeEmbedDomain()
|
||||
if result != expected {
|
||||
t.Fatalf(`Unexpected YouTube embed domain, got %v instead of %v`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseConfigDumpOutput(t *testing.T) {
|
||||
|
||||
+14
-25
@@ -75,7 +75,6 @@ const (
|
||||
defaultOauth2OidcProviderName = "OpenID Connect"
|
||||
defaultOAuth2Provider = ""
|
||||
defaultDisableLocalAuth = false
|
||||
defaultPocketConsumerKey = ""
|
||||
defaultHTTPClientTimeout = 20
|
||||
defaultHTTPClientMaxBodySize = 15
|
||||
defaultHTTPClientProxy = ""
|
||||
@@ -112,7 +111,6 @@ type Options struct {
|
||||
hsts bool
|
||||
httpService bool
|
||||
schedulerService bool
|
||||
serverTimingHeader bool
|
||||
baseURL string
|
||||
rootURL string
|
||||
basePath string
|
||||
@@ -121,7 +119,7 @@ type Options struct {
|
||||
databaseMinConns int
|
||||
databaseConnectionLifetime int
|
||||
runMigrations bool
|
||||
listenAddr string
|
||||
listenAddr []string
|
||||
certFile string
|
||||
certDomain string
|
||||
certKeyFile string
|
||||
@@ -155,6 +153,7 @@ type Options struct {
|
||||
filterEntryMaxAgeDays int
|
||||
youTubeApiKey string
|
||||
youTubeEmbedUrlOverride string
|
||||
youTubeEmbedDomain string
|
||||
oauth2UserCreationAllowed bool
|
||||
oauth2ClientID string
|
||||
oauth2ClientSecret string
|
||||
@@ -163,7 +162,6 @@ type Options struct {
|
||||
oidcProviderName string
|
||||
oauth2Provider string
|
||||
disableLocalAuth bool
|
||||
pocketConsumerKey string
|
||||
httpClientTimeout int
|
||||
httpClientMaxBodySize int64
|
||||
httpClientProxyURL *url.URL
|
||||
@@ -196,7 +194,6 @@ func NewOptions() *Options {
|
||||
hsts: defaultHSTS,
|
||||
httpService: defaultHTTPService,
|
||||
schedulerService: defaultSchedulerService,
|
||||
serverTimingHeader: defaultTiming,
|
||||
baseURL: defaultBaseURL,
|
||||
rootURL: defaultRootURL,
|
||||
basePath: defaultBasePath,
|
||||
@@ -205,7 +202,7 @@ func NewOptions() *Options {
|
||||
databaseMinConns: defaultDatabaseMinConns,
|
||||
databaseConnectionLifetime: defaultDatabaseConnectionLifetime,
|
||||
runMigrations: defaultRunMigrations,
|
||||
listenAddr: defaultListenAddr,
|
||||
listenAddr: []string{defaultListenAddr},
|
||||
certFile: defaultCertFile,
|
||||
certDomain: defaultCertDomain,
|
||||
certKeyFile: defaultKeyFile,
|
||||
@@ -245,7 +242,6 @@ func NewOptions() *Options {
|
||||
oidcProviderName: defaultOauth2OidcProviderName,
|
||||
oauth2Provider: defaultOAuth2Provider,
|
||||
disableLocalAuth: defaultDisableLocalAuth,
|
||||
pocketConsumerKey: defaultPocketConsumerKey,
|
||||
httpClientTimeout: defaultHTTPClientTimeout,
|
||||
httpClientMaxBodySize: defaultHTTPClientMaxBodySize * 1024 * 1024,
|
||||
httpClientProxyURL: nil,
|
||||
@@ -302,11 +298,6 @@ func (o *Options) MaintenanceMessage() string {
|
||||
return o.maintenanceMessage
|
||||
}
|
||||
|
||||
// HasServerTimingHeader returns true if server-timing headers enabled.
|
||||
func (o *Options) HasServerTimingHeader() bool {
|
||||
return o.serverTimingHeader
|
||||
}
|
||||
|
||||
// BaseURL returns the application base URL with path.
|
||||
func (o *Options) BaseURL() string {
|
||||
return o.baseURL
|
||||
@@ -348,7 +339,7 @@ func (o *Options) DatabaseConnectionLifetime() time.Duration {
|
||||
}
|
||||
|
||||
// ListenAddr returns the listen address for the HTTP server.
|
||||
func (o *Options) ListenAddr() string {
|
||||
func (o *Options) ListenAddr() []string {
|
||||
return o.listenAddr
|
||||
}
|
||||
|
||||
@@ -521,11 +512,19 @@ func (o *Options) YouTubeApiKey() string {
|
||||
return o.youTubeApiKey
|
||||
}
|
||||
|
||||
// YouTubeEmbedUrlOverride returns YouTube URL which will be used for embeds
|
||||
// YouTubeEmbedUrlOverride returns the YouTube embed URL override if defined.
|
||||
func (o *Options) YouTubeEmbedUrlOverride() string {
|
||||
return o.youTubeEmbedUrlOverride
|
||||
}
|
||||
|
||||
// YouTubeEmbedDomain returns the domain used for YouTube embeds.
|
||||
func (o *Options) YouTubeEmbedDomain() string {
|
||||
if o.youTubeEmbedDomain != "" {
|
||||
return o.youTubeEmbedDomain
|
||||
}
|
||||
return "www.youtube-nocookie.com"
|
||||
}
|
||||
|
||||
// FetchNebulaWatchTime returns true if the Nebula video duration
|
||||
// should be fetched and used as a reading time.
|
||||
func (o *Options) FetchNebulaWatchTime() bool {
|
||||
@@ -579,14 +578,6 @@ func (o *Options) HasSchedulerService() bool {
|
||||
return o.schedulerService
|
||||
}
|
||||
|
||||
// PocketConsumerKey returns the Pocket Consumer Key if configured.
|
||||
func (o *Options) PocketConsumerKey(defaultValue string) string {
|
||||
if o.pocketConsumerKey != "" {
|
||||
return o.pocketConsumerKey
|
||||
}
|
||||
return defaultValue
|
||||
}
|
||||
|
||||
// HTTPClientTimeout returns the time limit in seconds before the HTTP client cancel the request.
|
||||
func (o *Options) HTTPClientTimeout() int {
|
||||
return o.httpClientTimeout
|
||||
@@ -749,7 +740,7 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
|
||||
"HTTP_SERVICE": o.httpService,
|
||||
"INVIDIOUS_INSTANCE": o.invidiousInstance,
|
||||
"KEY_FILE": o.certKeyFile,
|
||||
"LISTEN_ADDR": o.listenAddr,
|
||||
"LISTEN_ADDR": strings.Join(o.listenAddr, ","),
|
||||
"LOG_FILE": o.logFile,
|
||||
"LOG_DATE_TIME": o.logDateTime,
|
||||
"LOG_FORMAT": o.logFormat,
|
||||
@@ -769,7 +760,6 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
|
||||
"OAUTH2_REDIRECT_URL": o.oauth2RedirectURL,
|
||||
"OAUTH2_USER_CREATION": o.oauth2UserCreationAllowed,
|
||||
"DISABLE_LOCAL_AUTH": o.disableLocalAuth,
|
||||
"POCKET_CONSUMER_KEY": redactSecretValue(o.pocketConsumerKey, redactSecret),
|
||||
"POLLING_FREQUENCY": o.pollingFrequency,
|
||||
"FORCE_REFRESH_INTERVAL": o.forceRefreshInterval,
|
||||
"POLLING_PARSING_ERROR_LIMIT": o.pollingParsingErrorLimit,
|
||||
@@ -787,7 +777,6 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
|
||||
"SCHEDULER_ROUND_ROBIN_MIN_INTERVAL": o.schedulerRoundRobinMinInterval,
|
||||
"SCHEDULER_ROUND_ROBIN_MAX_INTERVAL": o.schedulerRoundRobinMaxInterval,
|
||||
"SCHEDULER_SERVICE": o.schedulerService,
|
||||
"SERVER_TIMING_HEADER": o.serverTimingHeader,
|
||||
"WATCHDOG": o.watchdog,
|
||||
"WORKER_POOL_SIZE": o.workerPoolSize,
|
||||
"YOUTUBE_API_KEY": redactSecretValue(o.youTubeApiKey, redactSecret),
|
||||
|
||||
+13
-40
@@ -10,7 +10,6 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/url"
|
||||
"os"
|
||||
"strconv"
|
||||
@@ -87,14 +86,6 @@ func (p *Parser) parseLines(lines []string) (err error) {
|
||||
if parsedValue == "json" || parsedValue == "text" {
|
||||
p.opts.logFormat = parsedValue
|
||||
}
|
||||
case "DEBUG":
|
||||
slog.Warn("The DEBUG environment variable is deprecated, use LOG_LEVEL instead")
|
||||
parsedValue := parseBool(value, defaultDebug)
|
||||
if parsedValue {
|
||||
p.opts.logLevel = "debug"
|
||||
}
|
||||
case "SERVER_TIMING_HEADER":
|
||||
p.opts.serverTimingHeader = parseBool(value, defaultTiming)
|
||||
case "BASE_URL":
|
||||
p.opts.baseURL, p.opts.rootURL, p.opts.basePath, err = parseBaseURL(value)
|
||||
if err != nil {
|
||||
@@ -103,7 +94,7 @@ func (p *Parser) parseLines(lines []string) (err error) {
|
||||
case "PORT":
|
||||
port = value
|
||||
case "LISTEN_ADDR":
|
||||
p.opts.listenAddr = parseString(value, defaultListenAddr)
|
||||
p.opts.listenAddr = parseStringList(value, []string{defaultListenAddr})
|
||||
case "DATABASE_URL":
|
||||
p.opts.databaseURL = parseString(value, defaultDatabaseURL)
|
||||
case "DATABASE_URL_FILE":
|
||||
@@ -164,37 +155,12 @@ func (p *Parser) parseLines(lines []string) (err error) {
|
||||
p.opts.schedulerRoundRobinMaxInterval = parseInt(value, defaultSchedulerRoundRobinMaxInterval)
|
||||
case "POLLING_PARSING_ERROR_LIMIT":
|
||||
p.opts.pollingParsingErrorLimit = parseInt(value, defaultPollingParsingErrorLimit)
|
||||
case "PROXY_IMAGES":
|
||||
slog.Warn("The PROXY_IMAGES environment variable is deprecated, use MEDIA_PROXY_MODE instead")
|
||||
p.opts.mediaProxyMode = parseString(value, defaultMediaProxyMode)
|
||||
case "PROXY_HTTP_CLIENT_TIMEOUT":
|
||||
slog.Warn("The PROXY_HTTP_CLIENT_TIMEOUT environment variable is deprecated, use MEDIA_PROXY_HTTP_CLIENT_TIMEOUT instead")
|
||||
p.opts.mediaProxyHTTPClientTimeout = parseInt(value, defaultMediaProxyHTTPClientTimeout)
|
||||
case "MEDIA_PROXY_HTTP_CLIENT_TIMEOUT":
|
||||
p.opts.mediaProxyHTTPClientTimeout = parseInt(value, defaultMediaProxyHTTPClientTimeout)
|
||||
case "PROXY_OPTION":
|
||||
slog.Warn("The PROXY_OPTION environment variable is deprecated, use MEDIA_PROXY_MODE instead")
|
||||
p.opts.mediaProxyMode = parseString(value, defaultMediaProxyMode)
|
||||
case "MEDIA_PROXY_MODE":
|
||||
p.opts.mediaProxyMode = parseString(value, defaultMediaProxyMode)
|
||||
case "PROXY_MEDIA_TYPES":
|
||||
slog.Warn("The PROXY_MEDIA_TYPES environment variable is deprecated, use MEDIA_PROXY_RESOURCE_TYPES instead")
|
||||
p.opts.mediaProxyResourceTypes = parseStringList(value, []string{defaultMediaResourceTypes})
|
||||
case "MEDIA_PROXY_RESOURCE_TYPES":
|
||||
p.opts.mediaProxyResourceTypes = parseStringList(value, []string{defaultMediaResourceTypes})
|
||||
case "PROXY_IMAGE_URL":
|
||||
slog.Warn("The PROXY_IMAGE_URL environment variable is deprecated, use MEDIA_PROXY_CUSTOM_URL instead")
|
||||
p.opts.mediaProxyCustomURL = parseString(value, defaultMediaProxyURL)
|
||||
case "PROXY_URL":
|
||||
slog.Warn("The PROXY_URL environment variable is deprecated, use MEDIA_PROXY_CUSTOM_URL instead")
|
||||
p.opts.mediaProxyCustomURL = parseString(value, defaultMediaProxyURL)
|
||||
case "PROXY_PRIVATE_KEY":
|
||||
slog.Warn("The PROXY_PRIVATE_KEY environment variable is deprecated, use MEDIA_PROXY_PRIVATE_KEY instead")
|
||||
randomKey := make([]byte, 16)
|
||||
if _, err := rand.Read(randomKey); err != nil {
|
||||
return fmt.Errorf("config: unable to generate random key: %w", err)
|
||||
}
|
||||
p.opts.mediaProxyPrivateKey = parseBytes(value, randomKey)
|
||||
case "MEDIA_PROXY_PRIVATE_KEY":
|
||||
randomKey := make([]byte, 16)
|
||||
if _, err := rand.Read(randomKey); err != nil {
|
||||
@@ -213,10 +179,6 @@ func (p *Parser) parseLines(lines []string) (err error) {
|
||||
p.opts.adminPassword = parseString(value, defaultAdminPassword)
|
||||
case "ADMIN_PASSWORD_FILE":
|
||||
p.opts.adminPassword = readSecretFile(value, defaultAdminPassword)
|
||||
case "POCKET_CONSUMER_KEY":
|
||||
p.opts.pocketConsumerKey = parseString(value, defaultPocketConsumerKey)
|
||||
case "POCKET_CONSUMER_KEY_FILE":
|
||||
p.opts.pocketConsumerKey = readSecretFile(value, defaultPocketConsumerKey)
|
||||
case "OAUTH2_USER_CREATION":
|
||||
p.opts.oauth2UserCreationAllowed = parseBool(value, defaultOAuth2UserCreation)
|
||||
case "OAUTH2_CLIENT_ID":
|
||||
@@ -296,8 +258,15 @@ func (p *Parser) parseLines(lines []string) (err error) {
|
||||
}
|
||||
|
||||
if port != "" {
|
||||
p.opts.listenAddr = ":" + port
|
||||
p.opts.listenAddr = []string{":" + port}
|
||||
}
|
||||
|
||||
youtubeEmbedURL, err := url.Parse(p.opts.youTubeEmbedUrlOverride)
|
||||
if err != nil {
|
||||
return fmt.Errorf("config: invalid YOUTUBE_EMBED_URL_OVERRIDE value: %w", err)
|
||||
}
|
||||
p.opts.youTubeEmbedDomain = youtubeEmbedURL.Hostname()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -370,6 +339,10 @@ func parseStringList(value string, fallback []string) []string {
|
||||
for _, item := range items {
|
||||
itemValue := strings.TrimSpace(item)
|
||||
|
||||
if itemValue == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
if _, found := strMap[itemValue]; !found {
|
||||
strMap[itemValue] = true
|
||||
strList = append(strList, itemValue)
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
package config // import "miniflux.app/v2/internal/config"
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -58,3 +59,108 @@ func TestParseIntValue(t *testing.T) {
|
||||
t.Errorf(`Defined variables should returns the specified value`)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseListenAddr(t *testing.T) {
|
||||
defaultExpected := []string{defaultListenAddr}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
listenAddr string
|
||||
port string
|
||||
expected []string
|
||||
lines []string // Used for direct lines parsing instead of individual env vars
|
||||
isLineOriented bool // Flag to indicate if we use lines
|
||||
}{
|
||||
{
|
||||
name: "Single LISTEN_ADDR",
|
||||
listenAddr: "127.0.0.1:8080",
|
||||
expected: []string{"127.0.0.1:8080"},
|
||||
},
|
||||
{
|
||||
name: "Multiple LISTEN_ADDR comma-separated",
|
||||
listenAddr: "127.0.0.1:8080,:8081,/tmp/miniflux.sock",
|
||||
expected: []string{"127.0.0.1:8080", ":8081", "/tmp/miniflux.sock"},
|
||||
},
|
||||
{
|
||||
name: "Multiple LISTEN_ADDR with spaces around commas",
|
||||
listenAddr: "127.0.0.1:8080 , :8081",
|
||||
expected: []string{"127.0.0.1:8080", ":8081"},
|
||||
},
|
||||
{
|
||||
name: "Empty LISTEN_ADDR",
|
||||
listenAddr: "",
|
||||
expected: defaultExpected,
|
||||
},
|
||||
{
|
||||
name: "PORT overrides LISTEN_ADDR",
|
||||
listenAddr: "127.0.0.1:8000",
|
||||
port: "8082",
|
||||
expected: []string{":8082"},
|
||||
},
|
||||
{
|
||||
name: "PORT overrides empty LISTEN_ADDR",
|
||||
listenAddr: "",
|
||||
port: "8083",
|
||||
expected: []string{":8083"},
|
||||
},
|
||||
{
|
||||
name: "LISTEN_ADDR with empty segment (comma)",
|
||||
listenAddr: "127.0.0.1:8080,,:8081",
|
||||
expected: []string{"127.0.0.1:8080", ":8081"},
|
||||
},
|
||||
{
|
||||
name: "PORT override with lines parsing",
|
||||
isLineOriented: true,
|
||||
lines: []string{"LISTEN_ADDR=127.0.0.1:8000", "PORT=8082"},
|
||||
expected: []string{":8082"},
|
||||
},
|
||||
{
|
||||
name: "LISTEN_ADDR only with lines parsing (comma)",
|
||||
isLineOriented: true,
|
||||
lines: []string{"LISTEN_ADDR=10.0.0.1:9090,10.0.0.2:9091"},
|
||||
expected: []string{"10.0.0.1:9090", "10.0.0.2:9091"},
|
||||
},
|
||||
{
|
||||
name: "Empty LISTEN_ADDR with lines parsing (default)",
|
||||
isLineOriented: true,
|
||||
lines: []string{"LISTEN_ADDR="},
|
||||
expected: defaultExpected,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
parser := NewParser()
|
||||
var err error
|
||||
|
||||
if tt.isLineOriented {
|
||||
err = parser.parseLines(tt.lines)
|
||||
} else {
|
||||
// Simulate os.Environ() behaviour for individual var testing
|
||||
var envLines []string
|
||||
if tt.listenAddr != "" {
|
||||
envLines = append(envLines, "LISTEN_ADDR="+tt.listenAddr)
|
||||
}
|
||||
if tt.port != "" {
|
||||
envLines = append(envLines, "PORT="+tt.port)
|
||||
}
|
||||
// Add a dummy var if both are empty to avoid empty lines slice if not intended
|
||||
if tt.listenAddr == "" && tt.port == "" && tt.name == "Empty LISTEN_ADDR" {
|
||||
// This case specifically tests empty LISTEN_ADDR resulting in default
|
||||
// So, we pass LISTEN_ADDR=
|
||||
envLines = append(envLines, "LISTEN_ADDR=")
|
||||
}
|
||||
err = parser.parseLines(envLines)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("parseLines() error = %v", err)
|
||||
}
|
||||
|
||||
opts := parser.opts
|
||||
if !reflect.DeepEqual(opts.ListenAddr(), tt.expected) {
|
||||
t.Errorf("ListenAddr() got = %v, want %v", opts.ListenAddr(), tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
+10
-15
@@ -8,38 +8,33 @@ import (
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"crypto/subtle"
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"hash/fnv"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
// HashFromBytes returns a SHA-256 checksum of the input.
|
||||
// HashFromBytes returns a non-cryptographic checksum of the input.
|
||||
func HashFromBytes(value []byte) string {
|
||||
return fmt.Sprintf("%x", sha256.Sum256(value))
|
||||
h := fnv.New128a()
|
||||
h.Write(value)
|
||||
return hex.EncodeToString(h.Sum(nil))
|
||||
}
|
||||
|
||||
// Hash returns a SHA-256 checksum of a string.
|
||||
func Hash(value string) string {
|
||||
return HashFromBytes([]byte(value))
|
||||
// SHA256 returns a SHA-256 checksum of a string.
|
||||
func SHA256(value string) string {
|
||||
h := sha256.Sum256([]byte(value))
|
||||
return hex.EncodeToString(h[:])
|
||||
}
|
||||
|
||||
// GenerateRandomBytes returns random bytes.
|
||||
func GenerateRandomBytes(size int) []byte {
|
||||
b := make([]byte, size)
|
||||
if _, err := rand.Read(b); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
rand.Read(b)
|
||||
return b
|
||||
}
|
||||
|
||||
// GenerateRandomString returns a random string.
|
||||
func GenerateRandomString(size int) string {
|
||||
return base64.URLEncoding.EncodeToString(GenerateRandomBytes(size))
|
||||
}
|
||||
|
||||
// GenerateRandomStringHex returns a random hexadecimal string.
|
||||
func GenerateRandomStringHex(size int) string {
|
||||
return hex.EncodeToString(GenerateRandomBytes(size))
|
||||
|
||||
@@ -34,7 +34,7 @@ func Migrate(db *sql.DB) error {
|
||||
return fmt.Errorf("[Migration v%d] %v", newVersion, err)
|
||||
}
|
||||
|
||||
if _, err := tx.Exec(`DELETE FROM schema_version`); err != nil {
|
||||
if _, err := tx.Exec(`TRUNCATE schema_version`); err != nil {
|
||||
tx.Rollback()
|
||||
return fmt.Errorf("[Migration v%d] %v", newVersion, err)
|
||||
}
|
||||
|
||||
+171
-106
@@ -211,12 +211,13 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN wallabag_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN wallabag_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN wallabag_client_id text default '';
|
||||
ALTER TABLE integrations ADD COLUMN wallabag_client_secret text default '';
|
||||
ALTER TABLE integrations ADD COLUMN wallabag_username text default '';
|
||||
ALTER TABLE integrations ADD COLUMN wallabag_password text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN wallabag_enabled bool default 'f',
|
||||
ADD COLUMN wallabag_url text default '',
|
||||
ADD COLUMN wallabag_client_id text default '',
|
||||
ADD COLUMN wallabag_client_secret text default '',
|
||||
ADD COLUMN wallabag_username text default '',
|
||||
ADD COLUMN wallabag_password text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -236,9 +237,10 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN nunux_keeper_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN nunux_keeper_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN nunux_keeper_api_key text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN nunux_keeper_enabled bool default 'f',
|
||||
ADD COLUMN nunux_keeper_url text default '',
|
||||
ADD COLUMN nunux_keeper_api_key text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -255,9 +257,10 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN pocket_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN pocket_access_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN pocket_consumer_key text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN pocket_enabled bool default 'f',
|
||||
ADD COLUMN pocket_access_token text default '',
|
||||
ADD COLUMN pocket_consumer_key text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -271,8 +274,9 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE feeds ADD COLUMN username text default '';
|
||||
ALTER TABLE feeds ADD COLUMN password text default '';
|
||||
ALTER TABLE feeds
|
||||
ADD COLUMN username text default '',
|
||||
ADD COLUMN password text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -558,9 +562,10 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN telegram_bot_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN telegram_bot_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN telegram_bot_chat_id text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN telegram_bot_enabled bool default 'f',
|
||||
ADD COLUMN telegram_bot_token text default '',
|
||||
ADD COLUMN telegram_bot_chat_id text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -575,28 +580,31 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN googlereader_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN googlereader_username text default '';
|
||||
ALTER TABLE integrations ADD COLUMN googlereader_password text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN googlereader_enabled bool default 'f',
|
||||
ADD COLUMN googlereader_username text default '',
|
||||
ADD COLUMN googlereader_password text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN espial_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN espial_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN espial_api_key text default '';
|
||||
ALTER TABLE integrations ADD COLUMN espial_tags text default 'miniflux';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN espial_enabled bool default 'f',
|
||||
ADD COLUMN espial_url text default '',
|
||||
ADD COLUMN espial_api_key text default '',
|
||||
ADD COLUMN espial_tags text default 'miniflux';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN linkding_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN linkding_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN linkding_api_key text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN linkding_enabled bool default 'f',
|
||||
ADD COLUMN linkding_url text default '',
|
||||
ADD COLUMN linkding_api_key text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -609,8 +617,9 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
_, err = tx.Exec(`
|
||||
ALTER TABLE users ADD COLUMN default_reading_speed int default 265;
|
||||
ALTER TABLE users ADD COLUMN cjk_reading_speed int default 500;
|
||||
ALTER TABLE users
|
||||
ADD COLUMN default_reading_speed int default 265,
|
||||
ADD COLUMN cjk_reading_speed int default 500;
|
||||
`)
|
||||
return
|
||||
},
|
||||
@@ -634,11 +643,12 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN matrix_bot_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN matrix_bot_user text default '';
|
||||
ALTER TABLE integrations ADD COLUMN matrix_bot_password text default '';
|
||||
ALTER TABLE integrations ADD COLUMN matrix_bot_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN matrix_bot_chat_id text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN matrix_bot_enabled bool default 'f',
|
||||
ADD COLUMN matrix_bot_user text default '',
|
||||
ADD COLUMN matrix_bot_password text default '',
|
||||
ADD COLUMN matrix_bot_url text default '',
|
||||
ADD COLUMN matrix_bot_chat_id text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return
|
||||
@@ -657,8 +667,9 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE users RENAME double_tap TO gesture_nav;
|
||||
ALTER TABLE users ALTER COLUMN gesture_nav SET DATA TYPE text using case when gesture_nav = true then 'tap' when gesture_nav = false then 'none' end;
|
||||
ALTER TABLE users ALTER COLUMN gesture_nav SET default 'tap';
|
||||
ALTER TABLE users
|
||||
ALTER COLUMN gesture_nav SET DATA TYPE text using case when gesture_nav = true then 'tap' when gesture_nav = false then 'none' end,
|
||||
ALTER COLUMN gesture_nav SET default 'tap';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -720,45 +731,50 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN notion_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN notion_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN notion_page_id text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN notion_enabled bool default 'f',
|
||||
ADD COLUMN notion_token text default '',
|
||||
ADD COLUMN notion_page_id text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN readwise_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN readwise_api_key text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN readwise_enabled bool default 'f',
|
||||
ADD COLUMN readwise_api_key text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN apprise_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN apprise_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN apprise_services_url text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN apprise_enabled bool default 'f',
|
||||
ADD COLUMN apprise_url text default '',
|
||||
ADD COLUMN apprise_services_url text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN shiori_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN shiori_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN shiori_username text default '';
|
||||
ALTER TABLE integrations ADD COLUMN shiori_password text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN shiori_enabled bool default 'f',
|
||||
ADD COLUMN shiori_url text default '',
|
||||
ADD COLUMN shiori_username text default '',
|
||||
ADD COLUMN shiori_password text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN shaarli_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN shaarli_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN shaarli_api_secret text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN shaarli_enabled bool default 'f',
|
||||
ADD COLUMN shaarli_url text default '',
|
||||
ADD COLUMN shaarli_api_secret text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -771,18 +787,20 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN webhook_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN webhook_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN webhook_secret text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN webhook_enabled bool default 'f',
|
||||
ADD COLUMN webhook_url text default '',
|
||||
ADD COLUMN webhook_secret text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN telegram_bot_topic_id int;
|
||||
ALTER TABLE integrations ADD COLUMN telegram_bot_disable_web_page_preview bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN telegram_bot_disable_notification bool default 'f';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN telegram_bot_topic_id int,
|
||||
ADD COLUMN telegram_bot_disable_web_page_preview bool default 'f',
|
||||
ADD COLUMN telegram_bot_disable_notification bool default 'f';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -812,8 +830,9 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN rssbridge_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN rssbridge_url text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN rssbridge_enabled bool default 'f',
|
||||
ADD COLUMN rssbridge_url text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return
|
||||
@@ -838,41 +857,45 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN omnivore_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN omnivore_api_key text default '';
|
||||
ALTER TABLE integrations ADD COLUMN omnivore_url text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN omnivore_enabled bool default 'f',
|
||||
ADD COLUMN omnivore_api_key text default '',
|
||||
ADD COLUMN omnivore_url text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN linkace_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN linkace_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN linkace_api_key text default '';
|
||||
ALTER TABLE integrations ADD COLUMN linkace_tags text default '';
|
||||
ALTER TABLE integrations ADD COLUMN linkace_is_private bool default 't';
|
||||
ALTER TABLE integrations ADD COLUMN linkace_check_disabled bool default 't';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN linkace_enabled bool default 'f',
|
||||
ADD COLUMN linkace_url text default '',
|
||||
ADD COLUMN linkace_api_key text default '',
|
||||
ADD COLUMN linkace_tags text default '',
|
||||
ADD COLUMN linkace_is_private bool default 't',
|
||||
ADD COLUMN linkace_check_disabled bool default 't';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN linkwarden_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN linkwarden_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN linkwarden_api_key text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN linkwarden_enabled bool default 'f',
|
||||
ADD COLUMN linkwarden_url text default '',
|
||||
ADD COLUMN linkwarden_api_key text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN readeck_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN readeck_only_url bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN readeck_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN readeck_api_key text default '';
|
||||
ALTER TABLE integrations ADD COLUMN readeck_labels text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN readeck_enabled bool default 'f',
|
||||
ADD COLUMN readeck_only_url bool default 'f',
|
||||
ADD COLUMN readeck_url text default '',
|
||||
ADD COLUMN readeck_api_key text default '',
|
||||
ADD COLUMN readeck_labels text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -901,10 +924,11 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN raindrop_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN raindrop_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN raindrop_collection_id text default '';
|
||||
ALTER TABLE integrations ADD COLUMN raindrop_tags text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN raindrop_enabled bool default 'f',
|
||||
ADD COLUMN raindrop_token text default '',
|
||||
ADD COLUMN raindrop_collection_id text default '',
|
||||
ADD COLUMN raindrop_tags text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -925,25 +949,28 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN betula_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN betula_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN betula_enabled bool default 'f';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN betula_url text default '',
|
||||
ADD COLUMN betula_token text default '',
|
||||
ADD COLUMN betula_enabled bool default 'f';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_url text default '';
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_topic text default '';
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_api_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_username text default '';
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_password text default '';
|
||||
ALTER TABLE integrations ADD COLUMN ntfy_icon_url text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN ntfy_enabled bool default 'f',
|
||||
ADD COLUMN ntfy_url text default '',
|
||||
ADD COLUMN ntfy_topic text default '',
|
||||
ADD COLUMN ntfy_api_token text default '',
|
||||
ADD COLUMN ntfy_username text default '',
|
||||
ADD COLUMN ntfy_password text default '',
|
||||
ADD COLUMN ntfy_icon_url text default '';
|
||||
|
||||
ALTER TABLE feeds ADD COLUMN ntfy_enabled bool default 'f';
|
||||
ALTER TABLE feeds ADD COLUMN ntfy_priority int default '3';
|
||||
ALTER TABLE feeds
|
||||
ADD COLUMN ntfy_enabled bool default 'f',
|
||||
ADD COLUMN ntfy_priority int default '3';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -965,16 +992,18 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN cubox_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN cubox_api_link text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN cubox_enabled bool default 'f',
|
||||
ADD COLUMN cubox_api_link text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN discord_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN discord_webhook_link text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN discord_enabled bool default 'f',
|
||||
ADD COLUMN discord_webhook_link text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -986,8 +1015,9 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN slack_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN slack_webhook_link text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN slack_enabled bool default 'f',
|
||||
ADD COLUMN slack_webhook_link text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -998,14 +1028,16 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations ADD COLUMN pushover_enabled bool default 'f';
|
||||
ALTER TABLE integrations ADD COLUMN pushover_user text default '';
|
||||
ALTER TABLE integrations ADD COLUMN pushover_token text default '';
|
||||
ALTER TABLE integrations ADD COLUMN pushover_device text default '';
|
||||
ALTER TABLE integrations ADD COLUMN pushover_prefix text default '';
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN pushover_enabled bool default 'f',
|
||||
ADD COLUMN pushover_user text default '',
|
||||
ADD COLUMN pushover_token text default '',
|
||||
ADD COLUMN pushover_device text default '',
|
||||
ADD COLUMN pushover_prefix text default '';
|
||||
|
||||
ALTER TABLE feeds ADD COLUMN pushover_enabled bool default 'f';
|
||||
ALTER TABLE feeds ADD COLUMN pushover_priority int default '0';
|
||||
ALTER TABLE feeds
|
||||
ADD COLUMN pushover_enabled bool default 'f',
|
||||
ADD COLUMN pushover_priority int default '0';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
@@ -1071,10 +1103,43 @@ var migrations = []func(tx *sql.Tx, driver string) error{
|
||||
ALTER TABLE integrations ADD COLUMN rssbridge_token text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
_, err = tx.Exec(`ALTER TABLE users ADD COLUMN always_open_external_links bool default 'f'`)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations
|
||||
ADD COLUMN karakeep_enabled bool default 'f',
|
||||
ADD COLUMN karakeep_api_key text default '',
|
||||
ADD COLUMN karakeep_url text default '';
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
_, err = tx.Exec(`ALTER TABLE users ADD COLUMN open_external_links_in_new_tab bool default 't'`)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE integrations
|
||||
DROP COLUMN pocket_enabled,
|
||||
DROP COLUMN pocket_access_token,
|
||||
DROP COLUMN pocket_consumer_key;
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
func(tx *sql.Tx, _ string) (err error) {
|
||||
sql := `
|
||||
ALTER TABLE feeds
|
||||
ADD COLUMN block_filter_entry_rules text not null default '',
|
||||
ADD COLUMN keep_filter_entry_rules text not null default ''
|
||||
`
|
||||
_, err = tx.Exec(sql)
|
||||
return err
|
||||
},
|
||||
}
|
||||
|
||||
@@ -29,7 +29,6 @@ const (
|
||||
OAuth2CodeVerifierContextKey
|
||||
FlashMessageContextKey
|
||||
FlashErrorMessageContextKey
|
||||
PocketRequestTokenContextKey
|
||||
LastForceRefreshContextKey
|
||||
ClientIPContextKey
|
||||
GoogleReaderToken
|
||||
@@ -135,11 +134,6 @@ func FlashErrorMessage(r *http.Request) string {
|
||||
return getContextStringValue(r, FlashErrorMessageContextKey)
|
||||
}
|
||||
|
||||
// PocketRequestToken returns the Pocket Request Token if any.
|
||||
func PocketRequestToken(r *http.Request) string {
|
||||
return getContextStringValue(r, PocketRequestTokenContextKey)
|
||||
}
|
||||
|
||||
// LastForceRefresh returns the last force refresh timestamp.
|
||||
func LastForceRefresh(r *http.Request) int64 {
|
||||
jsonStringValue := getContextStringValue(r, LastForceRefreshContextKey)
|
||||
|
||||
@@ -390,28 +390,6 @@ func TestFlashErrorMessage(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPocketRequestToken(t *testing.T) {
|
||||
r, _ := http.NewRequest("GET", "http://example.org", nil)
|
||||
|
||||
result := PocketRequestToken(r)
|
||||
expected := ""
|
||||
|
||||
if result != expected {
|
||||
t.Errorf(`Unexpected context value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
|
||||
ctx := r.Context()
|
||||
ctx = context.WithValue(ctx, PocketRequestTokenContextKey, "request token")
|
||||
r = r.WithContext(ctx)
|
||||
|
||||
result = PocketRequestToken(r)
|
||||
expected = "request token"
|
||||
|
||||
if result != expected {
|
||||
t.Errorf(`Unexpected context value, got %q instead of %q`, result, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClientIP(t *testing.T) {
|
||||
r, _ := http.NewRequest("GET", "http://example.org", nil)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package httpd // import "miniflux.app/v2/internal/http/server"
|
||||
package server // import "miniflux.app/v2/internal/http/server"
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
@@ -30,36 +30,84 @@ import (
|
||||
"golang.org/x/crypto/acme/autocert"
|
||||
)
|
||||
|
||||
func StartWebServer(store *storage.Storage, pool *worker.Pool) *http.Server {
|
||||
func StartWebServer(store *storage.Storage, pool *worker.Pool) []*http.Server {
|
||||
listenAddresses := config.Opts.ListenAddr()
|
||||
var httpServers []*http.Server
|
||||
|
||||
certFile := config.Opts.CertFile()
|
||||
keyFile := config.Opts.CertKeyFile()
|
||||
certDomain := config.Opts.CertDomain()
|
||||
listenAddr := config.Opts.ListenAddr()
|
||||
server := &http.Server{
|
||||
ReadTimeout: time.Duration(config.Opts.HTTPServerTimeout()) * time.Second,
|
||||
WriteTimeout: time.Duration(config.Opts.HTTPServerTimeout()) * time.Second,
|
||||
IdleTimeout: time.Duration(config.Opts.HTTPServerTimeout()) * time.Second,
|
||||
Handler: setupHandler(store, pool),
|
||||
var sharedAutocertTLSConfig *tls.Config
|
||||
|
||||
if certDomain != "" {
|
||||
slog.Debug("Configuring autocert manager and shared TLS config", slog.String("domain", certDomain))
|
||||
certManager := autocert.Manager{
|
||||
Cache: storage.NewCertificateCache(store),
|
||||
Prompt: autocert.AcceptTOS,
|
||||
HostPolicy: autocert.HostWhitelist(certDomain),
|
||||
}
|
||||
|
||||
sharedAutocertTLSConfig = &tls.Config{}
|
||||
sharedAutocertTLSConfig.GetCertificate = certManager.GetCertificate
|
||||
sharedAutocertTLSConfig.NextProtos = []string{"h2", "http/1.1", acme.ALPNProto}
|
||||
|
||||
challengeServer := &http.Server{
|
||||
Handler: certManager.HTTPHandler(nil),
|
||||
Addr: ":http",
|
||||
}
|
||||
slog.Info("Starting ACME HTTP challenge server for autocert", slog.String("address", challengeServer.Addr))
|
||||
go func() {
|
||||
if err := challengeServer.ListenAndServe(); err != http.ErrServerClosed {
|
||||
slog.Error("ACME HTTP challenge server failed", slog.Any("error", err))
|
||||
}
|
||||
}()
|
||||
config.Opts.HTTPS = true
|
||||
httpServers = append(httpServers, challengeServer)
|
||||
}
|
||||
|
||||
switch {
|
||||
case os.Getenv("LISTEN_PID") == strconv.Itoa(os.Getpid()):
|
||||
startSystemdSocketServer(server)
|
||||
case strings.HasPrefix(listenAddr, "/"):
|
||||
startUnixSocketServer(server, listenAddr)
|
||||
case certDomain != "":
|
||||
config.Opts.HTTPS = true
|
||||
startAutoCertTLSServer(server, certDomain, store)
|
||||
case certFile != "" && keyFile != "":
|
||||
config.Opts.HTTPS = true
|
||||
server.Addr = listenAddr
|
||||
startTLSServer(server, certFile, keyFile)
|
||||
default:
|
||||
server.Addr = listenAddr
|
||||
startHTTPServer(server)
|
||||
for i, listenAddr := range listenAddresses {
|
||||
server := &http.Server{
|
||||
ReadTimeout: time.Duration(config.Opts.HTTPServerTimeout()) * time.Second,
|
||||
WriteTimeout: time.Duration(config.Opts.HTTPServerTimeout()) * time.Second,
|
||||
IdleTimeout: time.Duration(config.Opts.HTTPServerTimeout()) * time.Second,
|
||||
Handler: setupHandler(store, pool),
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(listenAddr, "/") && os.Getenv("LISTEN_PID") != strconv.Itoa(os.Getpid()) {
|
||||
server.Addr = listenAddr
|
||||
}
|
||||
|
||||
shouldAddServer := true
|
||||
|
||||
switch {
|
||||
case os.Getenv("LISTEN_PID") == strconv.Itoa(os.Getpid()):
|
||||
if i == 0 {
|
||||
slog.Info("Starting server using systemd socket for the first listen address", slog.String("address_info", listenAddr))
|
||||
startSystemdSocketServer(server)
|
||||
} else {
|
||||
slog.Warn("Systemd socket activation: Only the first listen address is used by systemd. Other addresses ignored.", slog.String("skipped_address", listenAddr))
|
||||
shouldAddServer = false
|
||||
}
|
||||
case strings.HasPrefix(listenAddr, "/"): // Unix socket
|
||||
startUnixSocketServer(server, listenAddr)
|
||||
case certDomain != "" && (listenAddr == ":https" || (i == 0 && strings.Contains(listenAddr, ":"))):
|
||||
server.Addr = listenAddr
|
||||
startAutoCertTLSServer(server, sharedAutocertTLSConfig)
|
||||
case certFile != "" && keyFile != "":
|
||||
server.Addr = listenAddr
|
||||
startTLSServer(server, certFile, keyFile)
|
||||
config.Opts.HTTPS = true
|
||||
default:
|
||||
server.Addr = listenAddr
|
||||
startHTTPServer(server)
|
||||
}
|
||||
|
||||
if shouldAddServer {
|
||||
httpServers = append(httpServers, server)
|
||||
}
|
||||
}
|
||||
|
||||
return server
|
||||
return httpServers
|
||||
}
|
||||
|
||||
func startSystemdSocketServer(server *http.Server) {
|
||||
@@ -72,83 +120,47 @@ func startSystemdSocketServer(server *http.Server) {
|
||||
|
||||
slog.Info(`Starting server using systemd socket`)
|
||||
if err := server.Serve(listener); err != http.ErrServerClosed {
|
||||
printErrorAndExit(`Server failed to start: %v`, err)
|
||||
printErrorAndExit(`Systemd socket server failed to start: %v`, err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func startUnixSocketServer(server *http.Server, socketFile string) {
|
||||
os.Remove(socketFile)
|
||||
if err := os.Remove(socketFile); err != nil && !os.IsNotExist(err) {
|
||||
printErrorAndExit("Unable to remove existing Unix socket %s: %v", socketFile, err)
|
||||
}
|
||||
listener, err := net.Listen("unix", socketFile)
|
||||
if err != nil {
|
||||
printErrorAndExit(`Server failed to listen on Unix socket %s: %v`, socketFile, err)
|
||||
}
|
||||
|
||||
go func(sock string) {
|
||||
listener, err := net.Listen("unix", sock)
|
||||
if err != nil {
|
||||
printErrorAndExit(`Server failed to start: %v`, err)
|
||||
}
|
||||
defer listener.Close()
|
||||
if err := os.Chmod(socketFile, 0666); err != nil {
|
||||
printErrorAndExit(`Unable to change socket permission for %s: %v`, socketFile, err)
|
||||
}
|
||||
|
||||
if err := os.Chmod(sock, 0666); err != nil {
|
||||
printErrorAndExit(`Unable to change socket permission: %v`, err)
|
||||
}
|
||||
|
||||
slog.Info("Starting server using a Unix socket", slog.String("socket", sock))
|
||||
go func() {
|
||||
slog.Info("Starting server using a Unix socket", slog.String("socket", socketFile))
|
||||
if err := server.Serve(listener); err != http.ErrServerClosed {
|
||||
printErrorAndExit(`Server failed to start: %v`, err)
|
||||
printErrorAndExit("Unix socket server failed to start on %s: %v", socketFile, err)
|
||||
}
|
||||
}(socketFile)
|
||||
}()
|
||||
}
|
||||
|
||||
func tlsConfig() *tls.Config {
|
||||
// See https://blog.cloudflare.com/exposing-go-on-the-internet/
|
||||
// And https://wiki.mozilla.org/Security/Server_Side_TLS
|
||||
return &tls.Config{
|
||||
MinVersion: tls.VersionTLS12,
|
||||
CurvePreferences: []tls.CurveID{
|
||||
tls.CurveP256,
|
||||
tls.X25519,
|
||||
},
|
||||
CipherSuites: []uint16{
|
||||
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
|
||||
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
|
||||
tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
|
||||
tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
|
||||
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
|
||||
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func startAutoCertTLSServer(server *http.Server, certDomain string, store *storage.Storage) {
|
||||
server.Addr = ":https"
|
||||
certManager := autocert.Manager{
|
||||
Cache: storage.NewCertificateCache(store),
|
||||
Prompt: autocert.AcceptTOS,
|
||||
HostPolicy: autocert.HostWhitelist(certDomain),
|
||||
}
|
||||
server.TLSConfig = tlsConfig()
|
||||
server.TLSConfig.GetCertificate = certManager.GetCertificate
|
||||
server.TLSConfig.NextProtos = []string{"h2", "http/1.1", acme.ALPNProto}
|
||||
|
||||
// Handle http-01 challenge.
|
||||
s := &http.Server{
|
||||
Handler: certManager.HTTPHandler(nil),
|
||||
Addr: ":http",
|
||||
}
|
||||
go s.ListenAndServe()
|
||||
func startAutoCertTLSServer(server *http.Server, autoTLSConfig *tls.Config) {
|
||||
server.TLSConfig.GetCertificate = autoTLSConfig.GetCertificate
|
||||
server.TLSConfig.NextProtos = autoTLSConfig.NextProtos
|
||||
|
||||
go func() {
|
||||
slog.Info("Starting TLS server using automatic certificate management",
|
||||
slog.String("listen_address", server.Addr),
|
||||
slog.String("domain", certDomain),
|
||||
)
|
||||
if err := server.ListenAndServeTLS("", ""); err != http.ErrServerClosed {
|
||||
printErrorAndExit(`Server failed to start: %v`, err)
|
||||
printErrorAndExit("Autocert server failed to start on %s: %v", server.Addr, err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func startTLSServer(server *http.Server, certFile, keyFile string) {
|
||||
server.TLSConfig = tlsConfig()
|
||||
go func() {
|
||||
slog.Info("Starting TLS server using a certificate",
|
||||
slog.String("listen_address", server.Addr),
|
||||
@@ -156,7 +168,7 @@ func startTLSServer(server *http.Server, certFile, keyFile string) {
|
||||
slog.String("key_file", keyFile),
|
||||
)
|
||||
if err := server.ListenAndServeTLS(certFile, keyFile); err != http.ErrServerClosed {
|
||||
printErrorAndExit(`Server failed to start: %v`, err)
|
||||
printErrorAndExit("TLS server failed to start on %s: %v", server.Addr, err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
@@ -167,7 +179,7 @@ func startHTTPServer(server *http.Server) {
|
||||
slog.String("listen_address", server.Addr),
|
||||
)
|
||||
if err := server.ListenAndServe(); err != http.ErrServerClosed {
|
||||
printErrorAndExit(`Server failed to start: %v`, err)
|
||||
printErrorAndExit("HTTP server failed to start on %s: %v", server.Addr, err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package httpd // import "miniflux.app/v2/internal/http/server"
|
||||
package server // import "miniflux.app/v2/internal/http/server"
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
@@ -6,13 +6,13 @@ package integration // import "miniflux.app/v2/internal/integration"
|
||||
import (
|
||||
"log/slog"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/integration/apprise"
|
||||
"miniflux.app/v2/internal/integration/betula"
|
||||
"miniflux.app/v2/internal/integration/cubox"
|
||||
"miniflux.app/v2/internal/integration/discord"
|
||||
"miniflux.app/v2/internal/integration/espial"
|
||||
"miniflux.app/v2/internal/integration/instapaper"
|
||||
"miniflux.app/v2/internal/integration/karakeep"
|
||||
"miniflux.app/v2/internal/integration/linkace"
|
||||
"miniflux.app/v2/internal/integration/linkding"
|
||||
"miniflux.app/v2/internal/integration/linkwarden"
|
||||
@@ -22,7 +22,6 @@ import (
|
||||
"miniflux.app/v2/internal/integration/nunuxkeeper"
|
||||
"miniflux.app/v2/internal/integration/omnivore"
|
||||
"miniflux.app/v2/internal/integration/pinboard"
|
||||
"miniflux.app/v2/internal/integration/pocket"
|
||||
"miniflux.app/v2/internal/integration/pushover"
|
||||
"miniflux.app/v2/internal/integration/raindrop"
|
||||
"miniflux.app/v2/internal/integration/readeck"
|
||||
@@ -196,24 +195,6 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
|
||||
}
|
||||
}
|
||||
|
||||
if userIntegrations.PocketEnabled {
|
||||
slog.Debug("Sending entry to Pocket",
|
||||
slog.Int64("user_id", userIntegrations.UserID),
|
||||
slog.Int64("entry_id", entry.ID),
|
||||
slog.String("entry_url", entry.URL),
|
||||
)
|
||||
|
||||
client := pocket.NewClient(config.Opts.PocketConsumerKey(userIntegrations.PocketConsumerKey), userIntegrations.PocketAccessToken)
|
||||
if err := client.AddURL(entry.URL, entry.Title); err != nil {
|
||||
slog.Error("Unable to send entry to Pocket",
|
||||
slog.Int64("user_id", userIntegrations.UserID),
|
||||
slog.Int64("entry_id", entry.ID),
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if userIntegrations.LinkAceEnabled {
|
||||
slog.Debug("Sending entry to LinkAce",
|
||||
slog.Int64("user_id", userIntegrations.UserID),
|
||||
@@ -428,6 +409,24 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
|
||||
}
|
||||
}
|
||||
|
||||
if userIntegrations.KarakeepEnabled {
|
||||
slog.Debug("Sending entry to Karakeep",
|
||||
slog.Int64("user_id", userIntegrations.UserID),
|
||||
slog.Int64("entry_id", entry.ID),
|
||||
slog.String("entry_url", entry.URL),
|
||||
)
|
||||
|
||||
client := karakeep.NewClient(userIntegrations.KarakeepAPIKey, userIntegrations.KarakeepURL)
|
||||
if err := client.SaveURL(entry.URL); err != nil {
|
||||
slog.Error("Unable to send entry to Karakeep",
|
||||
slog.Int64("user_id", userIntegrations.UserID),
|
||||
slog.Int64("entry_id", entry.ID),
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if userIntegrations.RaindropEnabled {
|
||||
slog.Debug("Sending entry to Raindrop",
|
||||
slog.Int64("user_id", userIntegrations.UserID),
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package karakeep // import "miniflux.app/v2/internal/integration/karakeep"
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/version"
|
||||
)
|
||||
|
||||
const defaultClientTimeout = 10 * time.Second
|
||||
|
||||
type errorResponse struct {
|
||||
Code string `json:"code"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
type saveURLPayload struct {
|
||||
Type string `json:"type"`
|
||||
URL string `json:"url"`
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
wrapped *http.Client
|
||||
apiEndpoint string
|
||||
apiToken string
|
||||
}
|
||||
|
||||
func NewClient(apiToken string, apiEndpoint string) *Client {
|
||||
return &Client{wrapped: &http.Client{Timeout: defaultClientTimeout}, apiEndpoint: apiEndpoint, apiToken: apiToken}
|
||||
}
|
||||
|
||||
func (c *Client) SaveURL(entryURL string) error {
|
||||
requestBody, err := json.Marshal(&saveURLPayload{
|
||||
Type: "link",
|
||||
URL: entryURL,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("karakeep: unable to encode request body: %v", err)
|
||||
}
|
||||
|
||||
req, err := http.NewRequest(http.MethodPost, c.apiEndpoint, bytes.NewReader(requestBody))
|
||||
if err != nil {
|
||||
return fmt.Errorf("karakeep: unable to create request: %v", err)
|
||||
}
|
||||
|
||||
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.apiToken))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("User-Agent", "Miniflux/"+version.Version)
|
||||
|
||||
resp, err := c.wrapped.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("karakeep: unable to send request: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
responseBody, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("karakeep: failed to parse response: %s", err)
|
||||
}
|
||||
|
||||
if resp.Header.Get("Content-Type") != "application/json" {
|
||||
return fmt.Errorf("karakeep: unexpected content type response: %s", resp.Header.Get("Content-Type"))
|
||||
}
|
||||
|
||||
if resp.StatusCode != http.StatusCreated {
|
||||
var errResponse errorResponse
|
||||
if err := json.Unmarshal(responseBody, &errResponse); err != nil {
|
||||
return fmt.Errorf("karakeep: unable to parse error response: status=%d body=%s", resp.StatusCode, string(responseBody))
|
||||
}
|
||||
return fmt.Errorf("karakeep: failed to save URL: status=%d errorcode=%s %s", resp.StatusCode, errResponse.Code, errResponse.Error)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -1,132 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package pocket // import "miniflux.app/v2/internal/integration/pocket"
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"miniflux.app/v2/internal/version"
|
||||
)
|
||||
|
||||
// Connector manages the authorization flow with Pocket to get a personal access token.
|
||||
type Connector struct {
|
||||
consumerKey string
|
||||
}
|
||||
|
||||
// NewConnector returns a new Pocket Connector.
|
||||
func NewConnector(consumerKey string) *Connector {
|
||||
return &Connector{consumerKey}
|
||||
}
|
||||
|
||||
// RequestToken fetches a new request token from Pocket API.
|
||||
func (c *Connector) RequestToken(redirectURL string) (string, error) {
|
||||
apiEndpoint := "https://getpocket.com/v3/oauth/request"
|
||||
requestBody, err := json.Marshal(&createTokenRequest{ConsumerKey: c.consumerKey, RedirectURI: redirectURL})
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to encode request body: %v", err)
|
||||
}
|
||||
|
||||
request, err := http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBody))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to create request: %v", err)
|
||||
}
|
||||
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.Header.Set("X-Accept", "application/json")
|
||||
request.Header.Set("User-Agent", "Miniflux/"+version.Version)
|
||||
|
||||
httpClient := &http.Client{Timeout: defaultClientTimeout}
|
||||
response, err := httpClient.Do(request)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to send request: %v", err)
|
||||
}
|
||||
defer response.Body.Close()
|
||||
|
||||
if response.StatusCode >= 400 {
|
||||
return "", fmt.Errorf("pocket: unable get request token: url=%s status=%d", apiEndpoint, response.StatusCode)
|
||||
}
|
||||
|
||||
var result createTokenResponse
|
||||
if err := json.NewDecoder(response.Body).Decode(&result); err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to decode response: %v", err)
|
||||
}
|
||||
|
||||
if result.Code == "" {
|
||||
return "", errors.New("pocket: request token is empty")
|
||||
}
|
||||
|
||||
return result.Code, nil
|
||||
}
|
||||
|
||||
// AccessToken fetches a new access token once the end-user authorized the application.
|
||||
func (c *Connector) AccessToken(requestToken string) (string, error) {
|
||||
apiEndpoint := "https://getpocket.com/v3/oauth/authorize"
|
||||
requestBody, err := json.Marshal(&authorizeRequest{ConsumerKey: c.consumerKey, Code: requestToken})
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to encode request body: %v", err)
|
||||
}
|
||||
|
||||
request, err := http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBody))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to create request: %v", err)
|
||||
}
|
||||
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.Header.Set("X-Accept", "application/json")
|
||||
request.Header.Set("User-Agent", "Miniflux/"+version.Version)
|
||||
|
||||
httpClient := &http.Client{Timeout: defaultClientTimeout}
|
||||
response, err := httpClient.Do(request)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to send request: %v", err)
|
||||
}
|
||||
defer response.Body.Close()
|
||||
|
||||
if response.StatusCode >= 400 {
|
||||
return "", fmt.Errorf("pocket: unable get access token: url=%s status=%d", apiEndpoint, response.StatusCode)
|
||||
}
|
||||
|
||||
var result authorizeReponse
|
||||
if err := json.NewDecoder(response.Body).Decode(&result); err != nil {
|
||||
return "", fmt.Errorf("pocket: unable to decode response: %v", err)
|
||||
}
|
||||
|
||||
if result.AccessToken == "" {
|
||||
return "", errors.New("pocket: access token is empty")
|
||||
}
|
||||
|
||||
return result.AccessToken, nil
|
||||
}
|
||||
|
||||
// AuthorizationURL returns the authorization URL for the end-user.
|
||||
func (c *Connector) AuthorizationURL(requestToken, redirectURL string) string {
|
||||
return fmt.Sprintf(
|
||||
"https://getpocket.com/auth/authorize?request_token=%s&redirect_uri=%s",
|
||||
requestToken,
|
||||
redirectURL,
|
||||
)
|
||||
}
|
||||
|
||||
type createTokenRequest struct {
|
||||
ConsumerKey string `json:"consumer_key"`
|
||||
RedirectURI string `json:"redirect_uri"`
|
||||
}
|
||||
|
||||
type createTokenResponse struct {
|
||||
Code string `json:"code"`
|
||||
}
|
||||
|
||||
type authorizeRequest struct {
|
||||
ConsumerKey string `json:"consumer_key"`
|
||||
Code string `json:"code"`
|
||||
}
|
||||
|
||||
type authorizeReponse struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
Username string `json:"username"`
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package pocket // import "miniflux.app/v2/internal/integration/pocket"
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/version"
|
||||
)
|
||||
|
||||
const defaultClientTimeout = 10 * time.Second
|
||||
|
||||
type Client struct {
|
||||
consumerKey string
|
||||
accessToken string
|
||||
}
|
||||
|
||||
func NewClient(consumerKey, accessToken string) *Client {
|
||||
return &Client{consumerKey, accessToken}
|
||||
}
|
||||
|
||||
func (c *Client) AddURL(entryURL, entryTitle string) error {
|
||||
if c.consumerKey == "" || c.accessToken == "" {
|
||||
return fmt.Errorf("pocket: missing consumer key or access token")
|
||||
}
|
||||
|
||||
apiEndpoint := "https://getpocket.com/v3/add"
|
||||
requestBody, err := json.Marshal(&createItemRequest{
|
||||
AccessToken: c.accessToken,
|
||||
ConsumerKey: c.consumerKey,
|
||||
Title: entryTitle,
|
||||
URL: entryURL,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("pocket: unable to encode request body: %v", err)
|
||||
}
|
||||
|
||||
request, err := http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBody))
|
||||
if err != nil {
|
||||
return fmt.Errorf("pocket: unable to create request: %v", err)
|
||||
}
|
||||
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.Header.Set("User-Agent", "Miniflux/"+version.Version)
|
||||
|
||||
httpClient := &http.Client{Timeout: defaultClientTimeout}
|
||||
response, err := httpClient.Do(request)
|
||||
if err != nil {
|
||||
return fmt.Errorf("pocket: unable to send request: %v", err)
|
||||
}
|
||||
defer response.Body.Close()
|
||||
|
||||
if response.StatusCode >= 400 {
|
||||
return fmt.Errorf("pocket: unable to create item: url=%s status=%d", apiEndpoint, response.StatusCode)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type createItemRequest struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
ConsumerKey string `json:"consumer_key"`
|
||||
Title string `json:"title,omitempty"`
|
||||
URL string `json:"url"`
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Es gibt keine Artikel, die diesem Tag entsprechen.",
|
||||
"alert.no_unread_entry": "Es existiert kein ungelesener Artikel.",
|
||||
"alert.no_user": "Sie sind der einzige Benutzer.",
|
||||
"alert.pocket_linked": "Ihr Pocket-Konto ist jetzt verknüpft!",
|
||||
"alert.prefs_saved": "Einstellungen gespeichert!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Sie haben zu viele Aktualisierungen ausgelöst. Bitte warten Sie %d Minute, bevor Sie es erneut versuchen.",
|
||||
@@ -77,6 +76,10 @@
|
||||
"entry.status.toast.read": "Als gelesen markiert",
|
||||
"entry.status.toast.unread": "Als ungelesen markiert",
|
||||
"entry.tags.label": "Stichworte:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Zeige %d weiteres Schlagwort",
|
||||
"Zeige %d weitere Schlagwörter"
|
||||
],
|
||||
"entry.unshare.label": "Nicht teilen",
|
||||
"error.api_key_already_exists": "Dieser API-Schlüssel ist bereits vorhanden.",
|
||||
"error.bad_credentials": "Benutzername oder Passwort ungültig.",
|
||||
@@ -129,8 +132,6 @@
|
||||
"error.network_operation": "Miniflux kann die Webseite aufgrund eines Netzwerk-Fehlers nicht erreichen: %v",
|
||||
"error.network_timeout": "Die Webseite ist zu langsam und die Anfrage ist abgelaufen: %v.",
|
||||
"error.password_min_length": "Wenigstens 6 Zeichen müssen genutzt werden.",
|
||||
"error.pocket_access_token": "Zugriffstoken konnte nicht von Pocket abgerufen werden!",
|
||||
"error.pocket_request_token": "Anfrage-Token konnte nicht von Pocket abgerufen werden!",
|
||||
"error.proxy_url_not_empty": "Die Proxy-URL darf nicht leer sein.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Ungültige Blockierregel: Regel #%d hat keinen gültigen Feldnamen (Optionen: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Ungültige Blockierregel: Das Muster für Regel #%d ist kein zulässiger regulärer Ausdruck",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Regeln",
|
||||
"form.feed.label.allow_self_signed_certificates": "Erlaube selbstsignierte oder ungültige Zertifikate",
|
||||
"form.feed.label.apprise_service_urls": "Kommaseparierte Liste der Apprise-Service-URLs",
|
||||
"form.feed.label.blocklist_rules": "Blockierregeln",
|
||||
"form.feed.label.block_filter_entry_rules": "Eintrags-Sperrregeln",
|
||||
"form.feed.label.blocklist_rules": "Regex-basierte Sperrfilter",
|
||||
"form.feed.label.category": "Kategorie",
|
||||
"form.feed.label.cookie": "Cookies setzen",
|
||||
"form.feed.label.crawler": "Originalinhalt herunterladen",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Den auf Anwendungsebene konfigurierten Proxy verwenden",
|
||||
"form.feed.label.hide_globally": "Einträge in der globalen Ungelesen-Liste ausblenden",
|
||||
"form.feed.label.ignore_http_cache": "Ignoriere HTTP-Cache",
|
||||
"form.feed.label.keeplist_rules": "Erlaubnisregeln",
|
||||
"form.feed.label.keep_filter_entry_rules": "Eintrags-Erlaubnisregeln",
|
||||
"form.feed.label.keeplist_rules": "Regex-basierte Behalte-Filter",
|
||||
"form.feed.label.no_media_player": "Kein Media-Player (Audio/Video)",
|
||||
"form.feed.label.ntfy_activate": "Einträge zu ntfy pushen",
|
||||
"form.feed.label.ntfy_default_priority": "Normale Ntfy-Priorität",
|
||||
@@ -199,7 +202,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Höchste Pushoverpriorität",
|
||||
"form.feed.label.pushover_min_priority": "Niedrigste Pushoverpriorität",
|
||||
"form.feed.label.pushover_priority": "Pushover-Nachrichtenpriorität",
|
||||
"form.feed.label.rewrite_rules": "Umschreiberegeln",
|
||||
"form.feed.label.rewrite_rules": "Inhalts-Umschreibregeln",
|
||||
"form.feed.label.scraper_rules": "Extraktionsregeln",
|
||||
"form.feed.label.site_url": "URL der Webseite",
|
||||
"form.feed.label.title": "Titel",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Einträge in Instapaper speichern",
|
||||
"form.integration.instapaper_password": "Instapaper-Passwort",
|
||||
"form.integration.instapaper_username": "Instapaper-Benutzername",
|
||||
"form.integration.karakeep_activate": "Einträge in Karakeep speichern",
|
||||
"form.integration.karakeep_api_key": "Karakeep-API-Schlüssel",
|
||||
"form.integration.karakeep_url": "Karakeep-API-Endpunkt",
|
||||
"form.integration.linkace_activate": "Einträge in LinkAce speichern",
|
||||
"form.integration.linkace_api_key": "LinkAce-API-Schlüssel",
|
||||
"form.integration.linkace_check_disabled": "Linkprüfung deaktivieren",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Lesezeichen als ungelesen markieren",
|
||||
"form.integration.pinboard_tags": "Pinboard-Tags",
|
||||
"form.integration.pinboard_token": "Pinboard-API-Token",
|
||||
"form.integration.pocket_access_token": "Pocket-Zugangstoken",
|
||||
"form.integration.pocket_activate": "Einträge in Pocket speichern",
|
||||
"form.integration.pocket_connect_link": "Verbinden Sie Ihr Pocket-Konto",
|
||||
"form.integration.pocket_consumer_key": "Pocket-Verbraucher-Schlüssel",
|
||||
"form.integration.pushover_activate": "Einträge an Pushover senden",
|
||||
"form.integration.pushover_device": "Pushovergerät (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover-URL-Präfix (optional)",
|
||||
@@ -295,7 +297,7 @@
|
||||
"form.integration.readwise_api_key": "Readwise-Reader-Zugangstoken",
|
||||
"form.integration.readwise_api_key_link": "Erhalten Sie Ihren Readwise-Zugangstoken",
|
||||
"form.integration.rssbridge_activate": "Beim Hinzufügen von Abonnements RSS-Bridge prüfen.",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge authentication token",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge-Authentifizierungs-Token",
|
||||
"form.integration.rssbridge_url": "RSS-Bridge-Server-URL",
|
||||
"form.integration.shaarli_activate": "Artikel in Shaarli speichern",
|
||||
"form.integration.shaarli_api_secret": "Shaarli-API-Geheimnis",
|
||||
@@ -328,6 +330,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Globale Feedeinstellungen",
|
||||
"form.prefs.fieldset.reader_settings": "Reader-Einstellungen",
|
||||
"form.prefs.help.external_font_hosts": "Per Leerzeichen getrennte Liste externer Schriftarten-Hosts, die erlaubt werden sollen. Beispiel: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Artikel immer mit Öffnen der Links lesen",
|
||||
"form.prefs.label.categories_sorting_order": "Kategorie-Sortierung",
|
||||
"form.prefs.label.cjk_reading_speed": "Lesegeschwindigkeit für Chinesisch, Koreanisch und Japanisch (Zeichen pro Minute)",
|
||||
"form.prefs.label.custom_css": "Benutzerdefiniertes CSS",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Einträge automatisch als gelesen markieren, wenn sie angezeigt werden",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Einträge automatisch als gelesen markieren, wenn sie angezeigt werden. Audio/Video bei 90%% Wiedergabe als gelesen markieren",
|
||||
"form.prefs.label.media_playback_rate": "Wiedergabegeschwindigkeit von Audio/Video",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Externe Links in einem neuen Tab öffnen (fügt target=\"_blank\" zu Links hinzu)",
|
||||
"form.prefs.label.show_reading_time": "Geschätzte Lesezeit für Artikel anzeigen",
|
||||
"form.prefs.label.theme": "Thema",
|
||||
"form.prefs.label.timezone": "Zeitzone",
|
||||
@@ -402,14 +405,14 @@
|
||||
"menu.show_only_starred_entries": "Nur markierte Artikel anzeigen",
|
||||
"menu.show_only_unread_entries": "Nur ungelesene Artikel anzeigen",
|
||||
"menu.starred": "Lesezeichen",
|
||||
"menu.title": "Menu",
|
||||
"menu.title": "Menü",
|
||||
"menu.unread": "Ungelesen",
|
||||
"menu.users": "Benutzer",
|
||||
"page.about.author": "Autor:",
|
||||
"page.about.build_date": "Datum der Kompilierung:",
|
||||
"page.about.credits": "Urheberrechte",
|
||||
"page.about.db_usage": "Datenbankgröße:",
|
||||
"page.about.git_commit": "Git Commit:",
|
||||
"page.about.git_commit": "Git-Commit:",
|
||||
"page.about.global_config_options": "Globale Konfigurationsoptionen",
|
||||
"page.about.go_version": "Go-Version:",
|
||||
"page.about.license": "Lizenz:",
|
||||
@@ -574,13 +577,13 @@
|
||||
"page.users.title": "Benutzer",
|
||||
"page.users.username": "Benutzername",
|
||||
"page.webauthn_rename.title": "Passkey umbenennen",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"pagination.first": "Erste",
|
||||
"pagination.last": "Letzte",
|
||||
"pagination.next": "Nächste",
|
||||
"pagination.previous": "Vorherige",
|
||||
"search.label": "Suche",
|
||||
"search.placeholder": "Suche...",
|
||||
"search.submit": "Search",
|
||||
"search.submit": "Suchen",
|
||||
"skip_to_content": "Zum Inhalt springen",
|
||||
"time_elapsed.days": [
|
||||
"vor %d Tag",
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "gestern",
|
||||
"tooltip.keyboard_shortcuts": "Tastenkürzel: %s",
|
||||
"tooltip.logged_user": "Angemeldet als %s"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "Ενημέρωση",
|
||||
"alert.account_linked": "Ο εξωτερικός σας λογαριασμός είναι πλέον συνδεδεμένος!",
|
||||
"alert.account_unlinked": "Ο εξωτερικός σας λογαριασμός είναι πλέον αποσυνδεδεμένος!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "Όλες οι ροές ανανεώνονται στο παρασκήνιο. Μπορείτε να συνεχίσετε να χρησιμοποιείτε το Miniflux όσο εκτελείται αυτή η διαδικασία.",
|
||||
"alert.feed_error": "Υπάρχει πρόβλημα με αυτήν τη ροή",
|
||||
"alert.no_bookmark": "Δεν υπάρχει σελιδοδείκτης αυτή τη στιγμή.",
|
||||
"alert.no_category": "Δεν υπάρχει κατηγορία.",
|
||||
@@ -27,26 +27,25 @@
|
||||
"alert.no_tag_entry": "Δεν υπάρχουν αντικείμενα που να ταιριάζουν με αυτή την ετικέτα.",
|
||||
"alert.no_unread_entry": "Δεν υπάρχουν μη αναγνωσμένα άρθρα.",
|
||||
"alert.no_user": "Είστε ο μόνος χρήστης.",
|
||||
"alert.pocket_linked": "Ο λογαριασμός Pocket είναι τώρα συνδεδεμένος!",
|
||||
"alert.prefs_saved": "Οι προτιμήσεις αποθηκεύτηκαν!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again."
|
||||
"Έχετε ενεργοποιήσει πάρα πολλές ανανεώσεις ροών. Παρακαλώ περιμένετε %d λεπτό πριν προσπαθήσετε ξανά.",
|
||||
"Έχετε ενεργοποιήσει πάρα πολλές ανανεώσεις ροών. Παρακαλώ περιμένετε %d λεπτά πριν προσπαθήσετε ξανά."
|
||||
],
|
||||
"confirm.loading": "Σε εξέλιξη...",
|
||||
"confirm.no": "όχι",
|
||||
"confirm.question": "Είστε σίγουροι;",
|
||||
"confirm.question.refresh": "Θέλετε να επιτελέσετε μια υποχρεωτική ανανέωση;",
|
||||
"confirm.yes": "ναι",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "Αναζήτηση:",
|
||||
"enclosure_media_controls.seek.title": "Αναζήτηση %s δευτερόλεπτα",
|
||||
"enclosure_media_controls.speed": "Ταχύτητα:",
|
||||
"enclosure_media_controls.speed.faster": "Γρηγορότερα",
|
||||
"enclosure_media_controls.speed.faster.title": "Γρηγορότερα κατά %sx",
|
||||
"enclosure_media_controls.speed.reset": "Επαναφορά",
|
||||
"enclosure_media_controls.speed.reset.title": "Επαναφορά ταχύτητας σε 1x",
|
||||
"enclosure_media_controls.speed.slower": "Πιο αργά",
|
||||
"enclosure_media_controls.speed.slower.title": "Πιο αργά κατά %sx",
|
||||
"entry.bookmark.toast.off": "Μη αγαπημένα",
|
||||
"entry.bookmark.toast.on": "Αγαπημένα",
|
||||
"entry.bookmark.toggle.off": "Αναίρεση αγαπημένου",
|
||||
@@ -77,82 +76,84 @@
|
||||
"entry.status.toast.read": "Επισήμανση ως αναγνωσμένο",
|
||||
"entry.status.toast.unread": "Επισήμανση ως μη αναγνωσμένο",
|
||||
"entry.tags.label": "Ετικέτες:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Εμφάνιση %d ακόμη ετικέτας",
|
||||
"Εμφάνιση %d ακόμη ετικετών"
|
||||
],
|
||||
"entry.unshare.label": "Aναίρεση Διαμοιρασμού",
|
||||
"error.api_key_already_exists": "Αυτό το κλειδί API υπάρχει ήδη.",
|
||||
"error.bad_credentials": "Μη έγκυρο όνομα χρήστη ή κωδικό πρόσβασης.",
|
||||
"error.category_already_exists": "Αυτή η κατηγορία υπάρχει ήδη.",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "Αυτή η κατηγορία δεν υπάρχει ή δεν ανήκει σε αυτόν τον χρήστη.",
|
||||
"error.database_error": "Σφάλμα βάσης δεδομένων: %v.",
|
||||
"error.different_passwords": "Οι κωδικοί πρόσβασης δεν είναι οι ίδιοι.",
|
||||
"error.duplicate_fever_username": "Υπάρχει ήδη κάποιος άλλος με το ίδιο όνομα χρήστη Fever!",
|
||||
"error.duplicate_googlereader_username": "Υπάρχει ήδη κάποιος άλλος με το ίδιο όνομα χρήστη Google Reader!",
|
||||
"error.duplicate_linked_account": "Υπάρχει ήδη κάποιος που σχετίζεται με αυτόν τον πάροχο!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicated_feed": "Αυτή η ροή υπάρχει ήδη.",
|
||||
"error.empty_file": "Αυτό το αρχείο είναι κενό.",
|
||||
"error.entries_per_page_invalid": "Ο αριθμός των καταχωρήσεων ανά σελίδα δεν είναι έγκυρος.",
|
||||
"error.feed_already_exists": "Αυτή η ροή υπάρχει ήδη.",
|
||||
"error.feed_category_not_found": "Αυτή η κατηγορία δεν υπάρχει ή δεν ανήκει σε αυτόν τον χρήστη.",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "Δεν είναι δυνατή η ανίχνευση της μορφής ροής: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "Ο κανόνας λίστας μπλοκ δεν είναι έγκυρος.",
|
||||
"error.feed_invalid_keeplist_rule": "Ο κανόνας keep list δεν είναι έγκυρος.",
|
||||
"error.feed_mandatory_fields": "Η διεύθυνση URL και η κατηγορία είναι υποχρεωτικά.",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "Αυτή η ροή δεν υπάρχει ή δεν ανήκει σε αυτόν τον χρήστη.",
|
||||
"error.feed_title_not_empty": "Ο τίτλος ροής δεν μπορεί να είναι κενός.",
|
||||
"error.feed_url_not_empty": "Η διεύθυνση URL ροής δεν μπορεί να είναι κενή.",
|
||||
"error.fields_mandatory": "Όλα τα πεδία είναι υποχρεωτικά.",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
"error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
|
||||
"error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
|
||||
"error.http_service_unavailable": "The website is not available at the moment due to an internal server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
|
||||
"error.http_unexpected_status_code": "The website is not available at the moment due to an unexpected HTTP status code: %d. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_bad_gateway": "Ο ιστότοπος δεν είναι διαθέσιμος αυτήν τη στιγμή λόγω σφάλματος κακής πύλης. Το πρόβλημα δεν είναι στην πλευρά του Miniflux. Παρακαλώ δοκιμάστε ξανά αργότερα.",
|
||||
"error.http_body_read": "Δεν είναι δυνατή η ανάγνωση του σώματος HTTP: %v.",
|
||||
"error.http_client_error": "Σφάλμα πελάτη HTTP: %v.",
|
||||
"error.http_empty_response": "Η απάντηση HTTP είναι κενή. Ίσως αυτός ο ιστότοπος χρησιμοποιεί μηχανισμό προστασίας από bot;",
|
||||
"error.http_empty_response_body": "Το σώμα απάντησης HTTP είναι κενό.",
|
||||
"error.http_forbidden": "Η πρόσβαση σε αυτόν τον ιστότοπο απαγορεύεται. Ίσως αυτός ο ιστότοπος διαθέτει μηχανισμό προστασίας από bot;",
|
||||
"error.http_gateway_timeout": "Ο ιστότοπος δεν είναι διαθέσιμος αυτήν τη στιγμή λόγω σφάλματος χρονικού ορίου πύλης. Το πρόβλημα δεν είναι στην πλευρά του Miniflux. Παρακαλώ δοκιμάστε ξανά αργότερα.",
|
||||
"error.http_internal_server_error": "Ο ιστότοπος δεν είναι διαθέσιμος αυτήν τη στιγμή λόγω σφάλματος διακομιστή. Το πρόβλημα δεν είναι στην πλευρά του Miniflux. Παρακαλώ δοκιμάστε ξανά αργότερα.",
|
||||
"error.http_not_authorized": "Η πρόσβαση σε αυτόν τον ιστότοπο δεν είναι εξουσιοδοτημένη. Μπορεί να είναι λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης.",
|
||||
"error.http_resource_not_found": "Ο ζητούμενος πόρος δεν βρέθηκε. Επαληθεύστε τη διεύθυνση URL.",
|
||||
"error.http_response_too_large": "Η απάντηση HTTP είναι πολύ μεγάλη. Μπορείτε να αυξήσετε το όριο μεγέθους απάντησης HTTP στις καθολικές ρυθμίσεις (απαιτεί επανεκκίνηση του διακομιστή).",
|
||||
"error.http_service_unavailable": "Ο ιστότοπος δεν είναι διαθέσιμος αυτήν τη στιγμή λόγω εσωτερικού σφάλματος διακομιστή. Το πρόβλημα δεν είναι στην πλευρά του Miniflux. Παρακαλώ δοκιμάστε ξανά αργότερα.",
|
||||
"error.http_too_many_requests": "Το Miniflux δημιούργησε πάρα πολλά αιτήματα σε αυτόν τον ιστότοπο. Παρακαλώ δοκιμάστε ξανά αργότερα ή αλλάξτε τη διαμόρφωση της εφαρμογής.",
|
||||
"error.http_unexpected_status_code": "Ο ιστότοπος δεν είναι διαθέσιμος αυτήν τη στιγμή λόγω μη αναμενόμενου κωδικού κατάστασης HTTP: %d. Το πρόβλημα δεν είναι στην πλευρά του Miniflux. Παρακαλώ δοκιμάστε ξανά αργότερα.",
|
||||
"error.invalid_categories_sorting_order": "Η κατηγορία δεν μπορεί να είναι κενή.",
|
||||
"error.invalid_default_home_page": "Μη έγκυρη προεπιλεγμένη αρχική σελίδα!",
|
||||
"error.invalid_display_mode": "Μη έγκυρη λειτουργία εμφάνισης εφαρμογών ιστού.",
|
||||
"error.invalid_entry_direction": "Μη έγκυρη κατεύθυνση ταξινόμησης άρθρων.",
|
||||
"error.invalid_entry_order": "Η σειρά των καταχωρήσεων είναι μη έγκυρη.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "Μη έγκυρη διεύθυνση URL διακομιστή μεσολάβησης.",
|
||||
"error.invalid_feed_url": "Μη έγκυρη διεύθυνση URL ροής.",
|
||||
"error.invalid_gesture_nav": "Μη έγκυρη πλοήγηση με χειρονομίες.",
|
||||
"error.invalid_language": "Μη έγκυρη γλώσσα.",
|
||||
"error.invalid_site_url": "Μη έγκυρη διεύθυνση URL ιστότοπου.",
|
||||
"error.invalid_theme": "Μη έγκυρο θέμα.",
|
||||
"error.invalid_timezone": "Μη έγκυρη ζώνη ώρας.",
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.network_operation": "Το Miniflux δεν μπορεί να φτάσει σε αυτόν τον ιστότοπο λόγω σφάλματος δικτύου: %v.",
|
||||
"error.network_timeout": "Αυτός ο ιστότοπος είναι πολύ αργός και το αίτημα έληξε: %v",
|
||||
"error.password_min_length": "Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον 6 χαρακτήρες.",
|
||||
"error.pocket_access_token": "Δεν είναι δυνατή η λήψη του access token από το Pocket!",
|
||||
"error.pocket_request_token": "Δεν είναι δυνατή η λήψη του request token από το Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
|
||||
"error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
|
||||
"error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.proxy_url_not_empty": "Η διεύθυνση URL του διακομιστή μεσολάβησης δεν μπορεί να είναι κενή.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Μη έγκυρος κανόνας αποκλεισμού: ο κανόνας #%d λείπει ένα έγκυρο όνομα πεδίου (Επιλογές: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Μη έγκυρος κανόνας αποκλεισμού: το μοτίβο του κανόνα #%d δεν είναι έγκυρη κανονική έκφραση",
|
||||
"error.settings_block_rule_regex_required": "Μη έγκυρος κανόνας αποκλεισμού: το μοτίβο του κανόνα #%d δεν παρέχεται",
|
||||
"error.settings_block_rule_separator_required": "Μη έγκυρος κανόνας αποκλεισμού: το μοτίβο του κανόνα #%d απαιτείται να διαχωρίζεται με ένα '='",
|
||||
"error.settings_invalid_domain_list": "Μη έγκυρη λίστα τομέων. Παρακαλώ δώστε μια λίστα τομέων διαχωρισμένων με κενό.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Μη έγκυρος κανόνας διατήρησης: ο κανόνας #%d λείπει ένα έγκυρο όνομα πεδίου (Επιλογές: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Μη έγκυρος κανόνας διατήρησης: το μοτίβο του κανόνα #%d δεν είναι έγκυρη κανονική έκφραση",
|
||||
"error.settings_keep_rule_regex_required": "Μη έγκυρος κανόνας διατήρησης: το μοτίβο του κανόνα #%d δεν παρέχεται",
|
||||
"error.settings_keep_rule_separator_required": "Μη έγκυρος κανόνας διατήρησης: το μοτίβο του κανόνα #%d απαιτείται να διαχωρίζεται με ένα '='",
|
||||
"error.settings_mandatory_fields": "Τα πεδία όνομα χρήστη, θέμα, Γλώσσα και ζώνη ώρας είναι υποχρεωτικά.",
|
||||
"error.settings_media_playback_rate_range": "Η ταχύτητα αναπαραγωγής είναι εκτός εύρους",
|
||||
"error.settings_reading_speed_is_positive": "Οι ταχύτητες ανάγνωσης πρέπει να είναι θετικοί ακέραιοι αριθμοί.",
|
||||
"error.site_url_not_empty": "Η διεύθυνση URL του ιστότοπου δεν μπορεί να είναι κενή.",
|
||||
"error.subscription_not_found": "Δεν είναι δυνατή η εύρεση συνδρομής.",
|
||||
"error.title_required": "Ο τίτλος είναι υποχρεωτικός.",
|
||||
"error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
|
||||
"error.tls_error": "Σφάλμα TLS: %q. Μπορείτε να απενεργοποιήσετε την επαλήθευση TLS στις ρυθμίσεις ροής εάν το επιθυμείτε.",
|
||||
"error.unable_to_create_api_key": "Δεν είναι δυνατή η δημιουργία αυτού του κλειδιού API.",
|
||||
"error.unable_to_create_category": "Δεν είναι δυνατή η δημιουργία αυτής της κατηγορίας.",
|
||||
"error.unable_to_create_user": "Δεν είναι δυνατή η δημιουργία αυτού του χρήστη.",
|
||||
"error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Unable to parse this feed: %v.",
|
||||
"error.unable_to_detect_rssbridge": "Δεν είναι δυνατή η ανίχνευση ροής με χρήση RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Δεν είναι δυνατή η ανάλυση αυτής της ροής: %v.",
|
||||
"error.unable_to_update_category": "Δεν είναι δυνατή η ενημέρωση αυτής της κατηγορίας.",
|
||||
"error.unable_to_update_feed": "Δεν είναι δυνατή η ενημέρωση αυτής της ροής.",
|
||||
"error.unable_to_update_user": "Δεν είναι δυνατή η ενημέρωση αυτού του χρήστη.",
|
||||
@@ -162,18 +163,19 @@
|
||||
"form.api_key.label.description": "Ετικέτα κλειδιού API",
|
||||
"form.category.hide_globally": "Απόκρυψη καταχωρήσεων σε γενική λίστα μη αναγνωσμένων",
|
||||
"form.category.label.title": "Τίτλος",
|
||||
"form.feed.fieldset.general": "General",
|
||||
"form.feed.fieldset.integration": "Third-Party Services",
|
||||
"form.feed.fieldset.network_settings": "Network Settings",
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.fieldset.general": "Γενικά",
|
||||
"form.feed.fieldset.integration": "Υπηρεσίες τρίτων",
|
||||
"form.feed.fieldset.network_settings": "Ρυθμίσεις δικτύου",
|
||||
"form.feed.fieldset.rules": "Κανόνες",
|
||||
"form.feed.label.allow_self_signed_certificates": "Να επιτρέπονται αυτο-υπογεγραμμένα ή μη έγκυρα πιστοποιητικά",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Κανόνες Αποκλεισμού",
|
||||
"form.feed.label.apprise_service_urls": "Λίστα διευθύνσεων URL υπηρεσιών Apprise διαχωρισμένων με κόμμα",
|
||||
"form.feed.label.block_filter_entry_rules": "Κανόνες Αποκλεισμού Καταχωρήσεων",
|
||||
"form.feed.label.blocklist_rules": "Φίλτρα Αποκλεισμού Βασισμένα σε Regex",
|
||||
"form.feed.label.category": "Κατηγορία",
|
||||
"form.feed.label.cookie": "Ορισμός Cookies",
|
||||
"form.feed.label.crawler": "Λήψη αρχικού περιεχομένου",
|
||||
"form.feed.label.description": "Περιγραφή",
|
||||
"form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
|
||||
"form.feed.label.disable_http2": "Απενεργοποίηση HTTP/2 για αποφυγή δακτυλικών αποτυπωμάτων",
|
||||
"form.feed.label.disabled": "Μη ανανέωση αυτής της ροής",
|
||||
"form.feed.label.feed_password": "Κωδικός Πρόσβασης ροής",
|
||||
"form.feed.label.feed_url": "Διεύθυνση URL ροής",
|
||||
@@ -181,43 +183,44 @@
|
||||
"form.feed.label.fetch_via_proxy": "Χρησιμοποιήστε τον διακομιστή μεσολάβησης που έχει ρυθμιστεί σε επίπεδο εφαρμογής",
|
||||
"form.feed.label.hide_globally": "Απόκρυψη καταχωρήσεων σε γενική λίστα μη αναγνωσμένων",
|
||||
"form.feed.label.ignore_http_cache": "Αγνοήστε την προσωρινή μνήμη HTTP",
|
||||
"form.feed.label.keeplist_rules": "Κρατήστε Κανόνες",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
"form.feed.label.ntfy_high_priority": "Ntfy high priority",
|
||||
"form.feed.label.ntfy_low_priority": "Ntfy low priority",
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy max priority",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy min priority",
|
||||
"form.feed.label.ntfy_priority": "Ntfy priority",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (optional)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Κανόνες Μετατροπής",
|
||||
"form.feed.label.keep_filter_entry_rules": "Κανόνες Επιτρεπόμενων Καταχωρήσεων",
|
||||
"form.feed.label.keeplist_rules": "Φίλτρα Διατήρησης Βασισμένα σε Regex",
|
||||
"form.feed.label.no_media_player": "Χωρίς πρόγραμμα αναπαραγωγής πολυμέσων (ήχος/βίντεο)",
|
||||
"form.feed.label.ntfy_activate": "Προώθηση καταχωρήσεων στο ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Προεπιλεγμένη προτεραιότητα Ntfy",
|
||||
"form.feed.label.ntfy_high_priority": "Υψηλή προτεραιότητα Ntfy",
|
||||
"form.feed.label.ntfy_low_priority": "Χαμηλή προτεραιότητα Ntfy",
|
||||
"form.feed.label.ntfy_max_priority": "Μέγιστη προτεραιότητα Ntfy",
|
||||
"form.feed.label.ntfy_min_priority": "Ελάχιστη προτεραιότητα Ntfy",
|
||||
"form.feed.label.ntfy_priority": "Προτεραιότητα Ntfy",
|
||||
"form.feed.label.ntfy_topic": "Θέμα Ntfy (προαιρετικό)",
|
||||
"form.feed.label.proxy_url": "Διεύθυνση URL διακομιστή μεσολάβησης",
|
||||
"form.feed.label.pushover_activate": "Προώθηση καταχωρήσεων στο pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Προεπιλεγμένη προτεραιότητα Pushover",
|
||||
"form.feed.label.pushover_high_priority": "Υψηλή προτεραιότητα Pushover",
|
||||
"form.feed.label.pushover_low_priority": "Χαμηλή προτεραιότητα Pushover",
|
||||
"form.feed.label.pushover_max_priority": "Μέγιστη προτεραιότητα Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Ελάχιστη προτεραιότητα Pushover",
|
||||
"form.feed.label.pushover_priority": "Προτεραιότητα μηνύματος Pushover",
|
||||
"form.feed.label.rewrite_rules": "Κανόνες Επανασύνταξης Περιεχομένου",
|
||||
"form.feed.label.scraper_rules": "Κανόνες Scraper",
|
||||
"form.feed.label.site_url": "Διεύθυνση URL ιστότοπου",
|
||||
"form.feed.label.title": "Τίτλος",
|
||||
"form.feed.label.urlrewrite_rules": "επανεγγραφή κανόνων για τη διεύθυνση URL.",
|
||||
"form.feed.label.urlrewrite_rules": "κανόνες επανεγγραφής για τη διεύθυνση URL.",
|
||||
"form.feed.label.user_agent": "Παράκαμψη Προεπιλεγμένου User Agent Χρήστη",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "Παράκαμψη διεύθυνσης URL webhook",
|
||||
"form.import.label.file": "Αρχείο OPML",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "Push entries to Apprise",
|
||||
"form.integration.apprise_services_url": "Comma separated list of Apprise service URLs",
|
||||
"form.integration.apprise_url": "Apprise API URL",
|
||||
"form.integration.betula_activate": "Save entries to Betula",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
"form.integration.betula_url": "Betula server URL",
|
||||
"form.integration.cubox_activate": "Save entries to Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API link",
|
||||
"form.integration.discord_activate": "Push entries to Discord",
|
||||
"form.integration.discord_webhook_link": "Discord Webhook link",
|
||||
"form.import.label.url": "Διεύθυνση URL",
|
||||
"form.integration.apprise_activate": "Προώθηση καταχωρήσεων στο Apprise",
|
||||
"form.integration.apprise_services_url": "Λίστα διευθύνσεων URL υπηρεσιών Apprise διαχωρισμένων με κόμμα",
|
||||
"form.integration.apprise_url": "Διεύθυνση URL API Apprise",
|
||||
"form.integration.betula_activate": "Αποθήκευση καταχωρήσεων στο Betula",
|
||||
"form.integration.betula_token": "Διακριτικό Betula",
|
||||
"form.integration.betula_url": "Διεύθυνση URL διακομιστή Betula",
|
||||
"form.integration.cubox_activate": "Αποθήκευση καταχωρήσεων στο Cubox",
|
||||
"form.integration.cubox_api_link": "Σύνδεσμος API Cubox",
|
||||
"form.integration.discord_activate": "Προώθηση καταχωρήσεων στο Discord",
|
||||
"form.integration.discord_webhook_link": "Σύνδεσμος Webhook Discord",
|
||||
"form.integration.espial_activate": "Αποθήκευση άρθρων στο Espial",
|
||||
"form.integration.espial_api_key": "Κλειδί API Espial",
|
||||
"form.integration.espial_endpoint": "Τελικό σημείο Espial API",
|
||||
@@ -233,17 +236,20 @@
|
||||
"form.integration.instapaper_activate": "Αποθήκευση άρθρων στο Instapaper",
|
||||
"form.integration.instapaper_password": "Κωδικός Πρόσβασης Instapaper",
|
||||
"form.integration.instapaper_username": "Όνομα Χρήστη Instapaper",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
"form.integration.linkace_endpoint": "LinkAce API Endpoint",
|
||||
"form.integration.linkace_is_private": "Mark link as private",
|
||||
"form.integration.linkace_tags": "LinkAce Tags",
|
||||
"form.integration.karakeep_activate": "Αποθήκευση άρθρων στο Karakeep",
|
||||
"form.integration.karakeep_api_key": "Κλειδί API Karakeep",
|
||||
"form.integration.karakeep_url": "Τελικό σημείο Karakeep API",
|
||||
"form.integration.linkace_activate": "Αποθήκευση καταχωρήσεων στο LinkAce",
|
||||
"form.integration.linkace_api_key": "Κλειδί API LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Απενεργοποίηση ελέγχου συνδέσμου",
|
||||
"form.integration.linkace_endpoint": "Τελικό σημείο API LinkAce",
|
||||
"form.integration.linkace_is_private": "Σήμανση συνδέσμου ως ιδιωτικού",
|
||||
"form.integration.linkace_tags": "Ετικέτες LinkAce",
|
||||
"form.integration.linkding_activate": "Αποθήκευση άρθρων στο Linkding",
|
||||
"form.integration.linkding_api_key": "Κλειδί API Linkding",
|
||||
"form.integration.linkding_bookmark": "Σημείωση του σελιδοδείκτη ως μη αναγνωσμένου",
|
||||
"form.integration.linkding_endpoint": "Τελικό σημείο Linkding API",
|
||||
"form.integration.linkding_tags": "Linkding Tags",
|
||||
"form.integration.linkding_tags": "Ετικέτες Linkding",
|
||||
"form.integration.linkwarden_activate": "Αποθήκευση άρθρων στο Linkwarden",
|
||||
"form.integration.linkwarden_api_key": "Κλειδί API Linkwarden",
|
||||
"form.integration.linkwarden_endpoint": "Τελικό σημείο Linkwarden API",
|
||||
@@ -252,17 +258,17 @@
|
||||
"form.integration.matrix_bot_password": "Κωδικός πρόσβασης για τον χρήστη Matrix",
|
||||
"form.integration.matrix_bot_url": "URL διακομιστή Matrix",
|
||||
"form.integration.matrix_bot_user": "Όνομα χρήστη για το Matrix",
|
||||
"form.integration.notion_activate": "Save entries to Notion",
|
||||
"form.integration.notion_page_id": "Notion Page ID",
|
||||
"form.integration.notion_token": "Notion Secret Token",
|
||||
"form.integration.ntfy_activate": "Push entries to ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (optional)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
|
||||
"form.integration.ntfy_internal_links": "Use internal links on click (optional)",
|
||||
"form.integration.ntfy_password": "Ntfy Password (optional)",
|
||||
"form.integration.ntfy_topic": "Ntfy topic (default used if not set in feed)",
|
||||
"form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
|
||||
"form.integration.ntfy_username": "Ntfy Username (optional)",
|
||||
"form.integration.notion_activate": "Αποθήκευση καταχωρήσεων στο Notion",
|
||||
"form.integration.notion_page_id": "Αναγνωριστικό σελίδας Notion",
|
||||
"form.integration.notion_token": "Μυστικό διακριτικό Notion",
|
||||
"form.integration.ntfy_activate": "Προώθηση καταχωρήσεων στο ntfy",
|
||||
"form.integration.ntfy_api_token": "Διακριτικό API Ntfy (προαιρετικό)",
|
||||
"form.integration.ntfy_icon_url": "Διεύθυνση URL εικονιδίου Ntfy (προαιρετικό)",
|
||||
"form.integration.ntfy_internal_links": "Χρήση εσωτερικών συνδέσμων με κλικ (προαιρετικό)",
|
||||
"form.integration.ntfy_password": "Κωδικός πρόσβασης Ntfy (προαιρετικό)",
|
||||
"form.integration.ntfy_topic": "Θέμα Ntfy (προεπιλογή χρησιμοποιείται εάν δεν οριστεί στη ροή)",
|
||||
"form.integration.ntfy_url": "Διεύθυνση URL Ntfy (προαιρετικό, προεπιλογή είναι ntfy.sh)",
|
||||
"form.integration.ntfy_username": "Όνομα χρήστη Ntfy (προαιρετικό)",
|
||||
"form.integration.nunux_keeper_activate": "Αποθήκευση άρθρων στο Nunux Keeper",
|
||||
"form.integration.nunux_keeper_api_key": "Κλειδί API Nunux Keeper",
|
||||
"form.integration.nunux_keeper_endpoint": "Τελικό σημείο Nunux Keeper API",
|
||||
@@ -272,47 +278,43 @@
|
||||
"form.integration.pinboard_activate": "Αποθήκευση άρθρων στο Pinboard",
|
||||
"form.integration.pinboard_bookmark": "Σημείωση του σελιδοδείκτη ως μη αναγνωσμένου",
|
||||
"form.integration.pinboard_tags": "Ετικέτες Pinboard",
|
||||
"form.integration.pinboard_token": "Pinboard API Token",
|
||||
"form.integration.pocket_access_token": "Pocket Access Token",
|
||||
"form.integration.pocket_activate": "Αποθήκευση άρθρων στο Pocket",
|
||||
"form.integration.pocket_connect_link": "Συνδέστε τον λογαριασμό Pocket σας",
|
||||
"form.integration.pocket_consumer_key": "Pocket Consumer Key",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
"form.integration.pushover_token": "Pushover application API token",
|
||||
"form.integration.pushover_user": "Pushover user key",
|
||||
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||
"form.integration.raindrop_collection_id": "Collection ID",
|
||||
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||
"form.integration.raindrop_token": "(Test) Token",
|
||||
"form.integration.pinboard_token": "Διακριτικό API Pinboard",
|
||||
"form.integration.pushover_activate": "Προώθηση καταχωρήσεων στο Pushover",
|
||||
"form.integration.pushover_device": "Συσκευή Pushover (προαιρετικό)",
|
||||
"form.integration.pushover_prefix": "Πρόθεμα διεύθυνσης URL Pushover (προαιρετικό)",
|
||||
"form.integration.pushover_token": "Διακριτικό API εφαρμογής Pushover",
|
||||
"form.integration.pushover_user": "Κλειδί χρήστη Pushover",
|
||||
"form.integration.raindrop_activate": "Αποθήκευση καταχωρήσεων στο Raindrop",
|
||||
"form.integration.raindrop_collection_id": "Αναγνωριστικό συλλογής",
|
||||
"form.integration.raindrop_tags": "Ετικέτες (διαχωρισμένες με κόμμα)",
|
||||
"form.integration.raindrop_token": "Διακριτικό (Δοκιμή)",
|
||||
"form.integration.readeck_activate": "Αποθήκευση άρθρων στο Readeck",
|
||||
"form.integration.readeck_api_key": "Κλειδί API Readeck",
|
||||
"form.integration.readeck_endpoint": "Τελικό σημείο Readeck API",
|
||||
"form.integration.readeck_labels": "Readeck Labels",
|
||||
"form.integration.readeck_labels": "Ετικέτες Readeck",
|
||||
"form.integration.readeck_only_url": "Αποστολή μόνο URL (αντί για πλήρες περιεχόμενο)",
|
||||
"form.integration.readwise_activate": "Save entries to Readwise Reader",
|
||||
"form.integration.readwise_api_key": "Readwise Reader Access Token",
|
||||
"form.integration.readwise_api_key_link": "Get your Readwise Access Token",
|
||||
"form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge authentication token",
|
||||
"form.integration.rssbridge_url": "RSS-Bridge server URL",
|
||||
"form.integration.shaarli_activate": "Save articles to Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Shaarli API Secret",
|
||||
"form.integration.shaarli_endpoint": "Shaarli URL",
|
||||
"form.integration.readwise_activate": "Αποθήκευση καταχωρήσεων στο Readwise Reader",
|
||||
"form.integration.readwise_api_key": "Διακριτικό πρόσβασης Readwise Reader",
|
||||
"form.integration.readwise_api_key_link": "Λήψη του διακριτικού πρόσβασης Readwise",
|
||||
"form.integration.rssbridge_activate": "Έλεγχος RSS-Bridge κατά την προσθήκη συνδρομών",
|
||||
"form.integration.rssbridge_token": "Διακριτικό ελέγχου ταυτότητας RSS-Bridge",
|
||||
"form.integration.rssbridge_url": "Διεύθυνση URL διακομιστή RSS-Bridge",
|
||||
"form.integration.shaarli_activate": "Αποθήκευση άρθρων στο Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Μυστικό API Shaarli",
|
||||
"form.integration.shaarli_endpoint": "Διεύθυνση URL Shaarli",
|
||||
"form.integration.shiori_activate": "Αποθήκευση άρθρων στο Shiori",
|
||||
"form.integration.shiori_endpoint": "Τελικό σημείο Shiori",
|
||||
"form.integration.shiori_password": "Κωδικός Πρόσβασης Shiori",
|
||||
"form.integration.shiori_username": "Όνομα Χρήστη Shiori",
|
||||
"form.integration.slack_activate": "Push entries to Slack",
|
||||
"form.integration.slack_webhook_link": "Slack Webhook link",
|
||||
"form.integration.slack_activate": "Προώθηση καταχωρήσεων στο Slack",
|
||||
"form.integration.slack_webhook_link": "Σύνδεσμος Webhook Slack",
|
||||
"form.integration.telegram_bot_activate": "Προωθήστε νέα άρθρα στη συνομιλία Telegram",
|
||||
"form.integration.telegram_bot_disable_buttons": "Disable buttons",
|
||||
"form.integration.telegram_bot_disable_notification": "Disable notification",
|
||||
"form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
|
||||
"form.integration.telegram_bot_disable_buttons": "Απενεργοποίηση κουμπιών",
|
||||
"form.integration.telegram_bot_disable_notification": "Απενεργοποίηση ειδοποίησης",
|
||||
"form.integration.telegram_bot_disable_web_page_preview": "Απενεργοποίηση προεπισκόπησης ιστοσελίδας",
|
||||
"form.integration.telegram_bot_token": "Διακριτικό bot",
|
||||
"form.integration.telegram_chat_id": "Αναγνωριστικό συνομιλίας",
|
||||
"form.integration.telegram_topic_id": "Topic ID",
|
||||
"form.integration.telegram_topic_id": "Αναγνωριστικό θέματος",
|
||||
"form.integration.wallabag_activate": "Αποθήκευση άρθρων στο Wallabag",
|
||||
"form.integration.wallabag_client_id": "Ταυτότητα πελάτη Wallabag",
|
||||
"form.integration.wallabag_client_secret": "Wallabag Μυστικό Πελάτη",
|
||||
@@ -320,14 +322,15 @@
|
||||
"form.integration.wallabag_only_url": "Αποστολή μόνο URL (αντί για πλήρες περιεχόμενο)",
|
||||
"form.integration.wallabag_password": "Wallabag Κωδικός Πρόσβασης",
|
||||
"form.integration.wallabag_username": "Όνομα Χρήστη Wallabag",
|
||||
"form.integration.webhook_activate": "Enable Webhooks",
|
||||
"form.integration.webhook_secret": "Webhooks Secret",
|
||||
"form.integration.webhook_url": "Default Webhook URL",
|
||||
"form.prefs.fieldset.application_settings": "Application Settings",
|
||||
"form.prefs.fieldset.authentication_settings": "Authentication Settings",
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.integration.webhook_activate": "Ενεργοποίηση Webhooks",
|
||||
"form.integration.webhook_secret": "Μυστικό Webhooks",
|
||||
"form.integration.webhook_url": "Προεπιλεγμένη διεύθυνση URL Webhook",
|
||||
"form.prefs.fieldset.application_settings": "Ρυθμίσεις εφαρμογής",
|
||||
"form.prefs.fieldset.authentication_settings": "Ρυθμίσεις ελέγχου ταυτότητας",
|
||||
"form.prefs.fieldset.global_feed_settings": "Καθολικές ρυθμίσεις ροής",
|
||||
"form.prefs.fieldset.reader_settings": "Ρυθμίσεις αναγνώστη",
|
||||
"form.prefs.help.external_font_hosts": "Λίστα εξωτερικών κεντρικών υπολογιστών γραμματοσειρών διαχωρισμένων με κενό για να επιτρέπονται. Για παράδειγμα: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Ανάγνωση άρθρων ανοίγοντας εξωτερικούς συνδέσμους",
|
||||
"form.prefs.label.categories_sorting_order": "Ταξινόμηση κατηγοριών",
|
||||
"form.prefs.label.cjk_reading_speed": "Ταχύτητα ανάγνωσης για κινέζικα, κορεάτικα και ιαπωνικά (χαρακτήρες ανά λεπτό)",
|
||||
"form.prefs.label.custom_css": "Προσαρμοσμένο CSS",
|
||||
@@ -339,16 +342,16 @@
|
||||
"form.prefs.label.entry_order": "Στήλη ταξινόμησης εισόδου",
|
||||
"form.prefs.label.entry_sorting": "Ταξινόμηση",
|
||||
"form.prefs.label.entry_swipe": "Ενεργοποιήστε το σάρωση καταχώρισης στις οθόνες αφής",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Εξωτερικοί κεντρικοί υπολογιστές γραμματοσειρών",
|
||||
"form.prefs.label.gesture_nav": "Χειρονομία για πλοήγηση μεταξύ των καταχωρήσεων",
|
||||
"form.prefs.label.keyboard_shortcuts": "Ενεργοποίηση συντομεύσεων πληκτρολογίου",
|
||||
"form.prefs.label.language": "Γλώσσα",
|
||||
"form.prefs.label.mark_read_manually": "Mark entries as read manually",
|
||||
"form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
|
||||
"form.prefs.label.mark_read_manually": "Σήμανση καταχωρήσεων ως αναγνωσμένων με μη αυτόματο τρόπο",
|
||||
"form.prefs.label.mark_read_on_media_completion": "Σήμανση ως αναγνωσμένου μόνο όταν η αναπαραγωγή ήχου/βίντεο φτάσει το 90%% ολοκλήρωσης",
|
||||
"form.prefs.label.mark_read_on_view": "Αυτόματη επισήμανση καταχωρήσεων ως αναγνωσμένων κατά την προβολή",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Σήμανση καταχωρήσεων ως αναγνωσμένων κατά την προβολή. Για ήχο/βίντεο, σήμανση ως αναγνωσμένου στο 90%% ολοκλήρωσης",
|
||||
"form.prefs.label.media_playback_rate": "Ταχύτητα αναπαραγωγής του ήχου/βίντεο",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Άνοιγμα εξωτερικών συνδέσμων σε νέα καρτέλα (προσθέτει target=\"_blank\" στους συνδέσμους)",
|
||||
"form.prefs.label.show_reading_time": "Εμφάνιση εκτιμώμενου χρόνου ανάγνωσης για άρθρα",
|
||||
"form.prefs.label.theme": "Θέμα",
|
||||
"form.prefs.label.timezone": "Ζώνη Ώρας",
|
||||
@@ -385,7 +388,7 @@
|
||||
"menu.feeds": "Ροές",
|
||||
"menu.flush_history": "Εκκαθάριση ιστορικού",
|
||||
"menu.history": "Ιστορικό",
|
||||
"menu.home_page": "Home page",
|
||||
"menu.home_page": "Αρχική σελίδα",
|
||||
"menu.import": "Εισαγωγή",
|
||||
"menu.integrations": "Ενσωμάτωσεις",
|
||||
"menu.logout": "Αποσύνδεση",
|
||||
@@ -402,14 +405,14 @@
|
||||
"menu.show_only_starred_entries": "Εμφάνιση μόνο αγαπημένων καταχωρήσεων",
|
||||
"menu.show_only_unread_entries": "Εμφάνιση μόνο μη αναγνωσμένων καταχωρήσεων",
|
||||
"menu.starred": "Αγαπημένα",
|
||||
"menu.title": "Menu",
|
||||
"menu.title": "Μενού",
|
||||
"menu.unread": "Μη αναγνωσμένα",
|
||||
"menu.users": "Χρήστες",
|
||||
"page.about.author": "Συγγραφέας:",
|
||||
"page.about.build_date": "Ημερομηνία Κατασκευής:",
|
||||
"page.about.credits": "Συνεισφέροντες",
|
||||
"page.about.db_usage": "Database size:",
|
||||
"page.about.git_commit": "Git Commit:",
|
||||
"page.about.db_usage": "Μέγεθος βάσης δεδομένων:",
|
||||
"page.about.git_commit": "Υποβολή Git:",
|
||||
"page.about.global_config_options": "Γενικές ρυθμίσεις",
|
||||
"page.about.go_version": "Έκδοση Go:",
|
||||
"page.about.license": "Άδεια:",
|
||||
@@ -438,10 +441,10 @@
|
||||
"page.categories.no_feed": "Καμία ροή.",
|
||||
"page.categories.title": "Κατηγορίες",
|
||||
"page.categories_count": [
|
||||
"%d category",
|
||||
"%d categories"
|
||||
"%d κατηγορία",
|
||||
"%d κατηγορίες"
|
||||
],
|
||||
"page.category_label": "Category: %s",
|
||||
"page.category_label": "Κατηγορία: %s",
|
||||
"page.edit_category.title": "Επεξεργασία κατηγορίας: % s",
|
||||
"page.edit_feed.etag_header": "Κεφαλίδα ETag:",
|
||||
"page.edit_feed.last_check": "Τελευταίος έλεγχος:",
|
||||
@@ -456,7 +459,7 @@
|
||||
"%d σφάλματα"
|
||||
],
|
||||
"page.feeds.last_check": "Τελευταίος έλεγχος:",
|
||||
"page.feeds.next_check": "Next check:",
|
||||
"page.feeds.next_check": "Επόμενος έλεγχος:",
|
||||
"page.feeds.read_counter": "Αριθμός αναγνωσμένων καταχωρήσεων",
|
||||
"page.feeds.title": "Ροές",
|
||||
"page.history.title": "Ιστορικό",
|
||||
@@ -504,7 +507,7 @@
|
||||
"page.keyboard_shortcuts.subtitle.sections": "Πλοήγηση Τμημάτων",
|
||||
"page.keyboard_shortcuts.title": "Συντομεύσεις Πληκτρολογίου",
|
||||
"page.keyboard_shortcuts.toggle_bookmark_status": "Εναλλαγή σελιδοδείκτη",
|
||||
"page.keyboard_shortcuts.toggle_entry_attachments": "Toggle open/close entry attachments",
|
||||
"page.keyboard_shortcuts.toggle_entry_attachments": "Εναλλαγή άνοιγμα/κλείσιμο συνημμένων καταχώρησης",
|
||||
"page.keyboard_shortcuts.toggle_read_status_next": "Εναλλαγή ανάγνωσης / μη αναγνωσμένης, εστίαση στη συνέχεια",
|
||||
"page.keyboard_shortcuts.toggle_read_status_prev": "Εναλλαγή ανάγνωσης / μη αναγνωσμένης, εστίαση στο προηγούμενο",
|
||||
"page.login.google_signin": "Συνδεθείτε με τo Google",
|
||||
@@ -512,7 +515,7 @@
|
||||
"page.login.title": "Είσοδος",
|
||||
"page.login.webauthn_login": "Είσοδος με κωδικό πρόσβασης",
|
||||
"page.login.webauthn_login.error": "Δεν είναι δυνατή η σύνδεση με κωδικό πρόσβασης",
|
||||
"page.login.webauthn_login.help": "Please enter your username if you're using a security key. This is not required if you are using a Passkey (discoverable credentials).",
|
||||
"page.login.webauthn_login.help": "Παρακαλώ εισαγάγετε το όνομα χρήστη σας εάν χρησιμοποιείτε κλειδί ασφαλείας. Αυτό δεν απαιτείται εάν χρησιμοποιείτε Passkey (ανακαλύψιμα διαπιστευτήρια).",
|
||||
"page.new_api_key.title": "Νέο κλειδί API",
|
||||
"page.new_category.title": "Νέα Κατηγορία",
|
||||
"page.new_user.title": "Νέος Χρήστης",
|
||||
@@ -520,8 +523,8 @@
|
||||
"page.offline.refresh_page": "Προσπαθήστε να ανανεώσετε τη σελίδα",
|
||||
"page.offline.title": "Λειτουργία Εκτός Σύνδεσης",
|
||||
"page.read_entry_count": [
|
||||
"%d read entry",
|
||||
"%d read entries"
|
||||
"%d αναγνωσμένη καταχώρηση",
|
||||
"%d αναγνωσμένες καταχωρήσεις"
|
||||
],
|
||||
"page.search.title": "Αποτελέσματα Αναζήτησης",
|
||||
"page.sessions.table.actions": "Eνέργειες",
|
||||
@@ -535,35 +538,35 @@
|
||||
"page.settings.title": "Ρυθμίσεις",
|
||||
"page.settings.unlink_google_account": "Αποσύνδεση του λογαριασμού μου Google",
|
||||
"page.settings.unlink_oidc_account": "Αποσύνδεση του λογαριασμού μου %s",
|
||||
"page.settings.webauthn.actions": "Actions",
|
||||
"page.settings.webauthn.added_on": "Added On",
|
||||
"page.settings.webauthn.actions": "Ενέργειες",
|
||||
"page.settings.webauthn.added_on": "Προστέθηκε στις",
|
||||
"page.settings.webauthn.delete": [
|
||||
"Αφαιρέστε %d κωδικό πρόσβασης",
|
||||
"Καταργήστε %d κωδικούς πρόσβασης"
|
||||
"Κατάργηση %d κωδικού πρόσβασης",
|
||||
"Κατάργηση %d κωδικών πρόσβασης"
|
||||
],
|
||||
"page.settings.webauthn.last_seen_on": "Last Used",
|
||||
"page.settings.webauthn.passkey_name": "Passkey Name",
|
||||
"page.settings.webauthn.passkeys": "Passkeys",
|
||||
"page.settings.webauthn.last_seen_on": "Τελευταία χρήση",
|
||||
"page.settings.webauthn.passkey_name": "Όνομα κωδικού πρόσβασης",
|
||||
"page.settings.webauthn.passkeys": "Κωδικοί πρόσβασης",
|
||||
"page.settings.webauthn.register": "Εγγραφή κωδικού πρόσβασης",
|
||||
"page.settings.webauthn.register.error": "Δεν είναι δυνατή η εγγραφή του κωδικού πρόσβασης",
|
||||
"page.shared_entries.title": "Κοινόχρηστες Καταχωρήσεις",
|
||||
"page.shared_entries_count": [
|
||||
"%d shared entry",
|
||||
"%d shared entries"
|
||||
"%d κοινόχρηστη καταχώρηση",
|
||||
"%d κοινόχρηστες καταχωρήσεις"
|
||||
],
|
||||
"page.starred.title": "Αγαπημένo",
|
||||
"page.starred_entry_count": [
|
||||
"%d starred entry",
|
||||
"%d starred entries"
|
||||
"%d καταχώρηση με αστέρι",
|
||||
"%d καταχωρήσεις με αστέρι"
|
||||
],
|
||||
"page.total_entry_count": [
|
||||
"%d entry in total",
|
||||
"%d entries in total"
|
||||
"%d καταχώρηση συνολικά",
|
||||
"%d καταχωρήσεις συνολικά"
|
||||
],
|
||||
"page.unread.title": "Μη αναγνωσμένα",
|
||||
"page.unread_entry_count": [
|
||||
"%d unread entry",
|
||||
"%d unread entries"
|
||||
"%d μη αναγνωσμένη καταχώρηση",
|
||||
"%d μη αναγνωσμένες καταχωρήσεις"
|
||||
],
|
||||
"page.users.actions": "Eνέργειες",
|
||||
"page.users.admin.no": "Όχι",
|
||||
@@ -573,15 +576,15 @@
|
||||
"page.users.never_logged": "Ποτέ",
|
||||
"page.users.title": "Χρήστες",
|
||||
"page.users.username": "Χρήστης",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"page.webauthn_rename.title": "Μετονομασία κωδικού πρόσβασης",
|
||||
"pagination.first": "Πρώτο",
|
||||
"pagination.last": "Τελευταίο",
|
||||
"pagination.next": "Επόμενη",
|
||||
"pagination.previous": "Προηγούμενη",
|
||||
"search.label": "Αναζήτηση",
|
||||
"search.placeholder": "Αναζήτηση...",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "Αναζήτηση",
|
||||
"skip_to_content": "Μετάβαση στο περιεχόμενο",
|
||||
"time_elapsed.days": [
|
||||
"πριν %d ημέρα",
|
||||
"πριν %d ημέρες"
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "χθες",
|
||||
"tooltip.keyboard_shortcuts": "Συντόμευση πληκτρολογίου: % s",
|
||||
"tooltip.logged_user": "Συνδεδεμένος/η ως %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "There are no entries matching this tag.",
|
||||
"alert.no_unread_entry": "There are no unread entries.",
|
||||
"alert.no_user": "You are the only user.",
|
||||
"alert.pocket_linked": "Your Pocket account is now linked!",
|
||||
"alert.prefs_saved": "Preferences saved!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
@@ -77,6 +76,10 @@
|
||||
"entry.status.toast.read": "Marked as read",
|
||||
"entry.status.toast.unread": "Marked as unread",
|
||||
"entry.tags.label": "Tags:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Show %d more tag",
|
||||
"Show %d more tags"
|
||||
],
|
||||
"entry.unshare.label": "Unshare",
|
||||
"error.api_key_already_exists": "This API Key already exists.",
|
||||
"error.bad_credentials": "Invalid username or password.",
|
||||
@@ -129,8 +132,6 @@
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.password_min_length": "The password must have at least 6 characters.",
|
||||
"error.pocket_access_token": "Unable to fetch access token from Pocket!",
|
||||
"error.pocket_request_token": "Unable to fetch request token from Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.label.allow_self_signed_certificates": "Allow self-signed or invalid certificates",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Block Rules",
|
||||
"form.feed.label.block_filter_entry_rules": "Entry Blocking Rules",
|
||||
"form.feed.label.blocklist_rules": "Regex-Based Blocking Filters",
|
||||
"form.feed.label.category": "Category",
|
||||
"form.feed.label.cookie": "Set Cookies",
|
||||
"form.feed.label.crawler": "Fetch original content",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Use the proxy configured at the application level",
|
||||
"form.feed.label.hide_globally": "Hide entries in global unread list",
|
||||
"form.feed.label.ignore_http_cache": "Ignore HTTP cache",
|
||||
"form.feed.label.keeplist_rules": "Keep Rules",
|
||||
"form.feed.label.keep_filter_entry_rules": "Entry Allow Rules",
|
||||
"form.feed.label.keeplist_rules": "Regex-Based Keep Filters",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
@@ -199,7 +202,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Max priority",
|
||||
"form.feed.label.pushover_min_priority": "Minimal priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Rewrite Rules",
|
||||
"form.feed.label.rewrite_rules": "Content Rewrite Rules",
|
||||
"form.feed.label.scraper_rules": "Scraper Rules",
|
||||
"form.feed.label.site_url": "Site URL",
|
||||
"form.feed.label.title": "Title",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Save entries to Instapaper",
|
||||
"form.integration.instapaper_password": "Instapaper Password",
|
||||
"form.integration.instapaper_username": "Instapaper Username",
|
||||
"form.integration.karakeep_activate": "Save entries to Karakeep",
|
||||
"form.integration.karakeep_api_key": "Karakeep API key",
|
||||
"form.integration.karakeep_url": "Karakeep API Endpoint",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Mark bookmark as unread",
|
||||
"form.integration.pinboard_tags": "Pinboard Tags",
|
||||
"form.integration.pinboard_token": "Pinboard API Token",
|
||||
"form.integration.pocket_access_token": "Pocket Access Token",
|
||||
"form.integration.pocket_activate": "Save entries to Pocket",
|
||||
"form.integration.pocket_connect_link": "Connect your Pocket account",
|
||||
"form.integration.pocket_consumer_key": "Pocket Consumer Key",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -328,6 +330,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.categories_sorting_order": "Categories sorting",
|
||||
"form.prefs.label.cjk_reading_speed": "Reading speed for Chinese, Korean and Japanese (characters per minute)",
|
||||
"form.prefs.label.custom_css": "Custom CSS",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Automatically mark entries as read when viewed",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "Playback speed of the audio/video",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Open external links in a new tab (adds target=\"_blank\" to links)",
|
||||
"form.prefs.label.show_reading_time": "Show estimated reading time for entries",
|
||||
"form.prefs.label.theme": "Theme",
|
||||
"form.prefs.label.timezone": "Timezone",
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "No hay artículos con esta etiqueta.",
|
||||
"alert.no_unread_entry": "No hay artículos sin leer.",
|
||||
"alert.no_user": "Eres el único usuario.",
|
||||
"alert.pocket_linked": "¡Tu cuenta de Pocket ya está vinculada!",
|
||||
"alert.prefs_saved": "¡Las preferencias se han guardado!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Has activado demasiadas actualizaciones del feed. Espere %d minuto antes de volver a intentarlo.",
|
||||
@@ -77,6 +76,10 @@
|
||||
"entry.status.toast.read": "Marcado como leído",
|
||||
"entry.status.toast.unread": "Marcado como no leído",
|
||||
"entry.tags.label": "Etiquetas:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Mostrar %d etiqueta más",
|
||||
"Mostrar %d etiquetas más"
|
||||
],
|
||||
"entry.unshare.label": "No compartir",
|
||||
"error.api_key_already_exists": "Esta clave API ya existe.",
|
||||
"error.bad_credentials": "Usuario o contraseña no válido.",
|
||||
@@ -119,7 +122,7 @@
|
||||
"error.invalid_display_mode": "Modo de visualización de la aplicación web no válido.",
|
||||
"error.invalid_entry_direction": "Dirección de artículo no válida.",
|
||||
"error.invalid_entry_order": "Orden de artículo no válido.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "URL de proxy inválida.",
|
||||
"error.invalid_feed_url": "URL de feed no válida.",
|
||||
"error.invalid_gesture_nav": "Navegación por gestos no válida.",
|
||||
"error.invalid_language": "Idioma no válido.",
|
||||
@@ -129,14 +132,12 @@
|
||||
"error.network_operation": "Miniflux no puede acceder a este sitio web debido a un error de red: %v.",
|
||||
"error.network_timeout": "Este sitio web es demasiado lento y se agotó el tiempo de espera de la solicitud: %v",
|
||||
"error.password_min_length": "La contraseña debería tener al menos 6 caracteres.",
|
||||
"error.pocket_access_token": "Incapaz de obtener un token de acceso de Pocket!",
|
||||
"error.pocket_request_token": "Incapaz de obtener un token de solicitud de Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "La URL del proxy no puede estar vacía.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Regla de bloqueo no válida: a la regla #%d le falta un nombre de campo válido (Opciones: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Regla de bloqueo no válida: el patrón de la regla #%d no es una expresión regular válida",
|
||||
"error.settings_block_rule_regex_required": "Regla de bloqueo no válida: no se ha proporcionado el patrón de la regla #%d",
|
||||
"error.settings_block_rule_separator_required": "Regla de bloqueo no válida: el patrón de la regla #%d debe estar separado por un '='",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_invalid_domain_list": "Lista de dominios inválida. Por favor proporcione una lista de dominios separados por espacios.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Regla de mantenimiento no válida: a la regla #%d le falta un nombre de campo válido (Opciones: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Regla de mantenimiento no válida: el patrón de la regla #%d no es una expresión regular válida",
|
||||
"error.settings_keep_rule_regex_required": "Regla de conservación no válida: no se ha proporcionado la regla #%d patrón",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Reglas",
|
||||
"form.feed.label.allow_self_signed_certificates": "Permitir certificados autofirmados o no válidos",
|
||||
"form.feed.label.apprise_service_urls": "Lista separada por comas de las URL del servicio Apprise",
|
||||
"form.feed.label.blocklist_rules": "Reglas de Filtrado (Bloquear)",
|
||||
"form.feed.label.block_filter_entry_rules": "Reglas de Bloqueo de Entradas",
|
||||
"form.feed.label.blocklist_rules": "Filtros de Bloqueo Basados en Regex",
|
||||
"form.feed.label.category": "Categoría",
|
||||
"form.feed.label.cookie": "Configurar las cookies",
|
||||
"form.feed.label.crawler": "Obtener rastreador original",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Usar el proxy configurado a nivel de la aplicación",
|
||||
"form.feed.label.hide_globally": "Ocultar artículos en la lista global de no leídos",
|
||||
"form.feed.label.ignore_http_cache": "Ignorar caché HTTP",
|
||||
"form.feed.label.keeplist_rules": "Reglas de Filtrado (Permitir)",
|
||||
"form.feed.label.keep_filter_entry_rules": "Reglas de Permitir Entradas",
|
||||
"form.feed.label.keeplist_rules": "Filtros de Mantener Basados en Regex",
|
||||
"form.feed.label.no_media_player": "Sin reproductor multimedia (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Enviar entradas a ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Prioridad predeterminada a Ntfy",
|
||||
@@ -191,21 +194,21 @@
|
||||
"form.feed.label.ntfy_min_priority": "Prioridad mínima a Ntfy",
|
||||
"form.feed.label.ntfy_priority": "Prioridad Ntfy",
|
||||
"form.feed.label.ntfy_topic": "Tema Ntfy (opcional)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Reglas de reescribir",
|
||||
"form.feed.label.proxy_url": "URL del Proxy",
|
||||
"form.feed.label.pushover_activate": "Enviar artículos a pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Prioridad predeterminada de Pushover",
|
||||
"form.feed.label.pushover_high_priority": "Prioridad alta de Pushover",
|
||||
"form.feed.label.pushover_low_priority": "Prioridad baja de Pushover",
|
||||
"form.feed.label.pushover_max_priority": "Prioridad máxima de Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Prioridad mínima de Pushover",
|
||||
"form.feed.label.pushover_priority": "Prioridad del mensaje de Pushover",
|
||||
"form.feed.label.rewrite_rules": "Reglas de Reescritura de Contenido",
|
||||
"form.feed.label.scraper_rules": "Reglas de extracción de información",
|
||||
"form.feed.label.site_url": "URL del sitio",
|
||||
"form.feed.label.title": "Título",
|
||||
"form.feed.label.urlrewrite_rules": "Reglas de Filtrado (Reescritura)",
|
||||
"form.feed.label.user_agent": "Invalidar el agente de usuario predeterminado",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "Invalidar la URL del webhook",
|
||||
"form.import.label.file": "Archivo OPML",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "Enviar artículos a Apprise",
|
||||
@@ -214,8 +217,8 @@
|
||||
"form.integration.betula_activate": "Guardar artículos en Betula",
|
||||
"form.integration.betula_token": "Token de Betula",
|
||||
"form.integration.betula_url": "URL del servidor Betula",
|
||||
"form.integration.cubox_activate": "Save entries to Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API link",
|
||||
"form.integration.cubox_activate": "Guardar artículos en Cubox",
|
||||
"form.integration.cubox_api_link": "Enlace de la API de Cubox",
|
||||
"form.integration.discord_activate": "Enviar artículos a Discord",
|
||||
"form.integration.discord_webhook_link": "URL de la Webhook de Discord",
|
||||
"form.integration.espial_activate": "Enviar artículos a Espial",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Enviar artículos a Instapaper",
|
||||
"form.integration.instapaper_password": "Contraseña de Instapaper",
|
||||
"form.integration.instapaper_username": "Nombre de usuario de Instapaper",
|
||||
"form.integration.karakeep_activate": "Enviar artículos a Karakeep",
|
||||
"form.integration.karakeep_api_key": "Clave de API de Karakeep",
|
||||
"form.integration.karakeep_url": "Acceso API de Karakeep",
|
||||
"form.integration.linkace_activate": "Guardar artículos en LinkAce",
|
||||
"form.integration.linkace_api_key": "Clave API de LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Deshabilitar la comprobación de enlace",
|
||||
@@ -273,15 +279,11 @@
|
||||
"form.integration.pinboard_bookmark": "Marcar marcador como no leído",
|
||||
"form.integration.pinboard_tags": "Etiquetas de Pinboard",
|
||||
"form.integration.pinboard_token": "Token de API de Pinboard",
|
||||
"form.integration.pocket_access_token": "Token de acceso de Pocket",
|
||||
"form.integration.pocket_activate": "Enviar artículos a Pocket",
|
||||
"form.integration.pocket_connect_link": "Conectar a la cuenta de Pocket",
|
||||
"form.integration.pocket_consumer_key": "Clave del consumidor de Pocket",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
"form.integration.pushover_token": "Pushover application API token",
|
||||
"form.integration.pushover_user": "Pushover user key",
|
||||
"form.integration.pushover_activate": "Enviar artículos a Pushover",
|
||||
"form.integration.pushover_device": "Dispositivo Pushover (opcional)",
|
||||
"form.integration.pushover_prefix": "Prefijo de URL de Pushover (opcional)",
|
||||
"form.integration.pushover_token": "Token de API de la aplicación Pushover",
|
||||
"form.integration.pushover_user": "Clave de usuario de Pushover",
|
||||
"form.integration.raindrop_activate": "Guardar artículos en Raindrop",
|
||||
"form.integration.raindrop_collection_id": "Colección ID",
|
||||
"form.integration.raindrop_tags": "Etiquetas (separadas por comas)",
|
||||
@@ -327,7 +329,8 @@
|
||||
"form.prefs.fieldset.authentication_settings": "Ajustes de la autentificación",
|
||||
"form.prefs.fieldset.global_feed_settings": "Ajustes globales del feed",
|
||||
"form.prefs.fieldset.reader_settings": "Ajustes del lector",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.help.external_font_hosts": "Lista separada por espacios de hosts de fuentes externas permitidos. Por ejemplo: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Leer artículos abriendo enlaces externos",
|
||||
"form.prefs.label.categories_sorting_order": "Clasificación por categorías",
|
||||
"form.prefs.label.cjk_reading_speed": "Velocidad de lectura en chino, coreano y japonés (caracteres por minuto)",
|
||||
"form.prefs.label.custom_css": "CSS personalizado",
|
||||
@@ -339,7 +342,7 @@
|
||||
"form.prefs.label.entry_order": "Columna de clasificación de artículos",
|
||||
"form.prefs.label.entry_sorting": "Clasificación de artículos",
|
||||
"form.prefs.label.entry_swipe": "Habilitar deslizamiento de entrada en pantallas táctiles",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Hosts de fuentes externas",
|
||||
"form.prefs.label.gesture_nav": "Gesto para navegar entre entradas",
|
||||
"form.prefs.label.keyboard_shortcuts": "Habilitar atajos de teclado",
|
||||
"form.prefs.label.language": "Idioma",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Marcar automáticamente las entradas como leídas cuando se vean",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Marcar las entradas como leídas cuando se vean. Para audio/video, marcar como leído al 90%% de finalización",
|
||||
"form.prefs.label.media_playback_rate": "Velocidad de reproducción del audio/vídeo",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Abrir enlaces externos en una nueva pestaña (agrega target=\"_blank\" a los enlaces)",
|
||||
"form.prefs.label.show_reading_time": "Mostrar el tiempo estimado de lectura de los artículos",
|
||||
"form.prefs.label.theme": "Tema",
|
||||
"form.prefs.label.timezone": "Zona horaria",
|
||||
@@ -408,7 +411,7 @@
|
||||
"page.about.author": "Autor:",
|
||||
"page.about.build_date": "Fecha de compilación:",
|
||||
"page.about.credits": "Créditos",
|
||||
"page.about.db_usage": "Database size:",
|
||||
"page.about.db_usage": "Tamaño de la base de datos:",
|
||||
"page.about.git_commit": "Git Commit:",
|
||||
"page.about.global_config_options": "Opciones de configuración global",
|
||||
"page.about.go_version": "Go versión:",
|
||||
@@ -472,7 +475,7 @@
|
||||
"page.integration.miniflux_api_username": "Nombre de usuario",
|
||||
"page.integrations.title": "Integraciones",
|
||||
"page.keyboard_shortcuts.close_modal": "Cerrar el cuadro de diálogo modal",
|
||||
"page.keyboard_shortcuts.download_content": "Descargar el contento original",
|
||||
"page.keyboard_shortcuts.download_content": "Descargar el contenido original",
|
||||
"page.keyboard_shortcuts.go_to_bottom_item": "Ir al elemento inferior",
|
||||
"page.keyboard_shortcuts.go_to_categories": "Ir a las categorías",
|
||||
"page.keyboard_shortcuts.go_to_feed": "Ir a la fuente",
|
||||
@@ -512,7 +515,7 @@
|
||||
"page.login.title": "Iniciar sesión",
|
||||
"page.login.webauthn_login": "Iniciar sesión con clave de acceso",
|
||||
"page.login.webauthn_login.error": "No se puede iniciar sesión con la clave de acceso",
|
||||
"page.login.webauthn_login.help": "Please enter your username if you're using a security key. This is not required if you are using a Passkey (discoverable credentials).",
|
||||
"page.login.webauthn_login.help": "Por favor, introduce tu nombre de usuario si usas una clave de seguridad. Esto no es necesario si usas una Passkey (credenciales detectables).",
|
||||
"page.new_api_key.title": "Nueva clave API",
|
||||
"page.new_category.title": "Nueva categoría",
|
||||
"page.new_user.title": "Nuevo usuario",
|
||||
@@ -535,7 +538,7 @@
|
||||
"page.settings.title": "Ajustes",
|
||||
"page.settings.unlink_google_account": "Desvincular mi cuenta de Google",
|
||||
"page.settings.unlink_oidc_account": "Desvincular mi cuenta de %s",
|
||||
"page.settings.webauthn.actions": "Accioness",
|
||||
"page.settings.webauthn.actions": "Acciones",
|
||||
"page.settings.webauthn.added_on": "Añadido",
|
||||
"page.settings.webauthn.delete": [
|
||||
"Eliminar %d clave de acceso",
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "ayer",
|
||||
"tooltip.keyboard_shortcuts": "Atajo de teclado: %s",
|
||||
"tooltip.logged_user": "Registrado como %s"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "Päivitä",
|
||||
"alert.account_linked": "Ulkoinen tilisi on nyt linkitetty!",
|
||||
"alert.account_unlinked": "Ulkoinen tilisi on nyt irrotettu!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "Kaikki syötteet päivitetään taustalla. Voit jatkaa Minifluxin käyttöä tämän prosessin aikana.",
|
||||
"alert.feed_error": "Tässä syötteessä on ongelma",
|
||||
"alert.no_bookmark": "Tällä hetkellä ei ole kirjanmerkkiä.",
|
||||
"alert.no_category": "Ei ole kategoriaa.",
|
||||
@@ -27,26 +27,25 @@
|
||||
"alert.no_tag_entry": "Tätä tunnistetta vastaavia merkintöjä ei ole.",
|
||||
"alert.no_unread_entry": "Ei ole lukemattomia artikkeleita.",
|
||||
"alert.no_user": "Olet ainoa käyttäjä.",
|
||||
"alert.pocket_linked": "Pocket-tilisi on nyt linkitetty!",
|
||||
"alert.prefs_saved": "Asetukset tallennettu!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again."
|
||||
"Olet käynnistänyt liian monta syötteen päivitystä. Odota %d minuutti ennen kuin yrität uudelleen.",
|
||||
"Olet käynnistänyt liian monta syötteen päivitystä. Odota %d minuuttia ennen kuin yrität uudelleen."
|
||||
],
|
||||
"confirm.loading": "Käynnissä...",
|
||||
"confirm.no": "ei",
|
||||
"confirm.question": "Oletko varma?",
|
||||
"confirm.question.refresh": "Haluatko pakottaa päivityksen?",
|
||||
"confirm.yes": "kyllä",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "Siirry:",
|
||||
"enclosure_media_controls.seek.title": "Siirry %s sekuntia",
|
||||
"enclosure_media_controls.speed": "Nopeus:",
|
||||
"enclosure_media_controls.speed.faster": "Nopeammin",
|
||||
"enclosure_media_controls.speed.faster.title": "Nopeampi %sx",
|
||||
"enclosure_media_controls.speed.reset": "Palauta",
|
||||
"enclosure_media_controls.speed.reset.title": "Palauta nopeus 1x",
|
||||
"enclosure_media_controls.speed.slower": "Hitaammin",
|
||||
"enclosure_media_controls.speed.slower.title": "Hitaampi %sx",
|
||||
"entry.bookmark.toast.off": "Tähdettömät",
|
||||
"entry.bookmark.toast.on": "Tähdellä merkityt",
|
||||
"entry.bookmark.toggle.off": "Poista suosikeista",
|
||||
@@ -76,31 +75,35 @@
|
||||
"entry.status.title": "Vaihda artikkelin tilaa",
|
||||
"entry.status.toast.read": "Merkitty luetuksi",
|
||||
"entry.status.toast.unread": "Merkitty lukemattomaksi",
|
||||
"entry.tags.label": "Tags:",
|
||||
"entry.tags.label": "Tunnisteet:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Näytä %d lisää tunnistetta",
|
||||
"Näytä %d lisää tunnisteita"
|
||||
],
|
||||
"entry.unshare.label": "Poista jako",
|
||||
"error.api_key_already_exists": "API-avain on jo olemassa.",
|
||||
"error.bad_credentials": "Virheellinen käyttäjänimi tai salasana.",
|
||||
"error.category_already_exists": "Kategoria on jo olemassa. ",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "Tämä kategoria ei ole olemassa tai se ei kuulu tälle käyttäjälle.",
|
||||
"error.database_error": "Tietokantavirhe: %v.",
|
||||
"error.different_passwords": "Salasanat eivät ole samat.",
|
||||
"error.duplicate_fever_username": "There is already someone else with the same Fever username!",
|
||||
"error.duplicate_fever_username": "Joku muu käyttää jo samaa Fever-käyttäjänimeä!",
|
||||
"error.duplicate_googlereader_username": "On jo joku muu, jolla on sama Google-syötteenlukijan käyttäjätunnus!",
|
||||
"error.duplicate_linked_account": "There is already someone associated with this provider!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicate_linked_account": "Joku on jo yhdistetty tähän palveluntarjoajaan!",
|
||||
"error.duplicated_feed": "Tämä syöte on jo olemassa.",
|
||||
"error.empty_file": "Tiedosto on tyhjä.",
|
||||
"error.entries_per_page_invalid": "Artikkelien määrä sivulla ei kelpaa.",
|
||||
"error.feed_already_exists": "Tämä syöte on jo olemassa.",
|
||||
"error.feed_category_not_found": "Tätä kategoriaa ei ole olemassa tai se ei kuulu tälle käyttäjälle.",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "The block list rule is invalid.",
|
||||
"error.feed_invalid_keeplist_rule": "The keep list rule is invalid.",
|
||||
"error.feed_format_not_detected": "Syötteen muotoa ei voitu tunnistaa: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "Estolistan sääntö on virheellinen.",
|
||||
"error.feed_invalid_keeplist_rule": "Säilytettävien listan sääntö on virheellinen.",
|
||||
"error.feed_mandatory_fields": "URL-osoite ja kategoria ovat pakollisia.",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "Tämä syöte ei ole olemassa tai se ei kuulu tälle käyttäjälle.",
|
||||
"error.feed_title_not_empty": "Syötteen otsikko ei voi olla tyhjä.",
|
||||
"error.feed_url_not_empty": "Syötteen URL-osoite ei voi olla tyhjä.",
|
||||
"error.fields_mandatory": "Kaikki kentät ovat pakollisia.",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_bad_gateway": "Verkkosivusto ei ole tällä hetkellä saatavilla huonon yhdyskäytävän virheen vuoksi. Ongelma ei ole Miniflux-puolella. Yritä uudelleen myöhemmin.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
@@ -129,8 +132,6 @@
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.password_min_length": "Salasanassa on oltava vähintään 6 merkkiä.",
|
||||
"error.pocket_access_token": "Unable to fetch access token from Pocket!",
|
||||
"error.pocket_request_token": "Unable to fetch request token from Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.label.allow_self_signed_certificates": "Salli itseallekirjoitetut tai virheelliset varmenteet",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Block-säännöt",
|
||||
"form.feed.label.block_filter_entry_rules": "Merkinnän estosäännöt",
|
||||
"form.feed.label.blocklist_rules": "Regex-pohjaiset estosuodattimet",
|
||||
"form.feed.label.category": "Kategoria",
|
||||
"form.feed.label.cookie": "Aseta evästeet",
|
||||
"form.feed.label.crawler": "Nouda alkuperäinen sisältö",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Käytä sovellustasolla määritettyä välityspalvelinta",
|
||||
"form.feed.label.hide_globally": "Piilota artikkelit lukemattomien listassa",
|
||||
"form.feed.label.ignore_http_cache": "Ohita HTTP-välimuisti",
|
||||
"form.feed.label.keeplist_rules": "Keep-säännöt",
|
||||
"form.feed.label.keep_filter_entry_rules": "Merkinnän sallimissäännöt",
|
||||
"form.feed.label.keeplist_rules": "Regex-pohjaiset säilytyssuodattimet",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
@@ -199,7 +202,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Rewrite-säännöt",
|
||||
"form.feed.label.rewrite_rules": "Sisällön uudelleenkirjoitussäännöt",
|
||||
"form.feed.label.scraper_rules": "Scraper-säännöt",
|
||||
"form.feed.label.site_url": "Sivuston URL-osoite",
|
||||
"form.feed.label.title": "Otsikko",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Tallenna artikkelit Instapaperiin",
|
||||
"form.integration.instapaper_password": "Instapaper-salasana",
|
||||
"form.integration.instapaper_username": "Instapaper-käyttäjätunnus",
|
||||
"form.integration.karakeep_activate": "Tallenna artikkelit Karakeepiin",
|
||||
"form.integration.karakeep_api_key": "Karakeep API-avain",
|
||||
"form.integration.karakeep_url": "Karakeep API-päätepiste",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Merkitse kirjanmerkki lukemattomaksi",
|
||||
"form.integration.pinboard_tags": "Pinboard-tagit",
|
||||
"form.integration.pinboard_token": "Pinboard API-tunnus",
|
||||
"form.integration.pocket_access_token": "Pocket-käyttöoikeustunnus",
|
||||
"form.integration.pocket_activate": "Tallenna artikkelit Pocketiin",
|
||||
"form.integration.pocket_connect_link": "Yhdistä Pocket-tilisi",
|
||||
"form.integration.pocket_consumer_key": "Pocket Consumer Key",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -328,6 +330,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.categories_sorting_order": "Kategorioiden lajittelu",
|
||||
"form.prefs.label.cjk_reading_speed": "Kiinan, Korean ja Japanin lukunopeus (merkkejä minuutissa)",
|
||||
"form.prefs.label.custom_css": "Mukautettu CSS",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Merkitse kohdat automaattisesti luetuiksi, kun niitä tarkastellaan",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "Äänen/videon toistonopeus",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Avaa ulkoiset linkit uuteen välilehteen (lisää target=\"_blank\" linkkeihin)",
|
||||
"form.prefs.label.show_reading_time": "Näytä artikkeleiden arvioitu lukuaika",
|
||||
"form.prefs.label.theme": "Teema",
|
||||
"form.prefs.label.timezone": "Aikavyöhyke",
|
||||
@@ -385,7 +388,7 @@
|
||||
"menu.feeds": "Syötteet",
|
||||
"menu.flush_history": "Tyhjennä historia",
|
||||
"menu.history": "Historia",
|
||||
"menu.home_page": "Home page",
|
||||
"menu.home_page": "Etusivu",
|
||||
"menu.import": "Tuo",
|
||||
"menu.integrations": "Integraatiot",
|
||||
"menu.logout": "Kirjaudu ulos",
|
||||
@@ -399,7 +402,7 @@
|
||||
"menu.settings": "Asetukset",
|
||||
"menu.shared_entries": "Jaetut artikkelit",
|
||||
"menu.show_all_entries": "Näytä kaikki artikkelit",
|
||||
"menu.show_only_starred_entries": "Show only starred entries",
|
||||
"menu.show_only_starred_entries": "Näytä vain suosikit",
|
||||
"menu.show_only_unread_entries": "Näytä vain lukemattomat artikkelit",
|
||||
"menu.starred": "Suosikit",
|
||||
"menu.title": "Menu",
|
||||
@@ -574,14 +577,14 @@
|
||||
"page.users.title": "Käyttäjät",
|
||||
"page.users.username": "Käyttäjätunnus",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"pagination.first": "Ensimmäinen",
|
||||
"pagination.last": "Viimeinen",
|
||||
"pagination.next": "Seuraava",
|
||||
"pagination.previous": "Edellinen",
|
||||
"search.label": "Haku",
|
||||
"search.placeholder": "Hae...",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "Hae",
|
||||
"skip_to_content": "Siirry sisältöön",
|
||||
"time_elapsed.days": [
|
||||
"%d päivä sitten",
|
||||
"%d päivää sitten"
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "eilen",
|
||||
"tooltip.keyboard_shortcuts": "Pikanäppäin: %s",
|
||||
"tooltip.logged_user": "Kirjautunut %s-käyttäjänä"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Il n'y a aucun article correspondant à ce tag.",
|
||||
"alert.no_unread_entry": "Il n'y a rien de nouveau à lire.",
|
||||
"alert.no_user": "Vous êtes le seul utilisateur.",
|
||||
"alert.pocket_linked": "Votre compte Pocket est maintenant connecté !",
|
||||
"alert.prefs_saved": "Préférences sauvegardées !",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Vous avez déclenché trop d'actualisations de flux. Veuillez attendre %d minute avant de réessayer.",
|
||||
@@ -77,6 +76,10 @@
|
||||
"entry.status.toast.read": "Marqué comme lu",
|
||||
"entry.status.toast.unread": "Marqué comme non lu",
|
||||
"entry.tags.label": "Libellés :",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Afficher %d libellé supplémentaire",
|
||||
"Afficher %d libellés supplémentaires"
|
||||
],
|
||||
"entry.unshare.label": "Enlever le partage",
|
||||
"error.api_key_already_exists": "Cette clé d'API existe déjà.",
|
||||
"error.bad_credentials": "Mauvais identifiant ou mot de passe.",
|
||||
@@ -129,8 +132,6 @@
|
||||
"error.network_operation": "Miniflux n'est pas en mesure de se connecter à ce site web à cause d'un problème réseau : %v.",
|
||||
"error.network_timeout": "Ce site web est trop lent à répondre : %v.",
|
||||
"error.password_min_length": "Vous devez utiliser au moins 6 caractères pour le mot de passe.",
|
||||
"error.pocket_access_token": "Impossible de récupérer le jeton d'accès depuis Pocket !",
|
||||
"error.pocket_request_token": "Impossible de récupérer le jeton d'accès depuis Pocket !",
|
||||
"error.proxy_url_not_empty": "L'URL du proxy ne peut pas être vide.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Règle de blocage invalide : la règle n°%d ne contient pas un nom de champ valide (Options : %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Règle de blocage invalide : le motif de la règle n°%d n'est pas une expression régulière valide",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Règles",
|
||||
"form.feed.label.allow_self_signed_certificates": "Autoriser les certificats auto-signés ou non valides",
|
||||
"form.feed.label.apprise_service_urls": "Liste séparée par des virgules des URL du service Apprise",
|
||||
"form.feed.label.blocklist_rules": "Règles de blocage",
|
||||
"form.feed.label.block_filter_entry_rules": "Règles de blocage des entrées",
|
||||
"form.feed.label.blocklist_rules": "Filtres de blocage basés sur des expressions régulières",
|
||||
"form.feed.label.category": "Catégorie",
|
||||
"form.feed.label.cookie": "Définir les cookies",
|
||||
"form.feed.label.crawler": "Récupérer le contenu original",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Utiliser le proxy configuré au niveau de l'application",
|
||||
"form.feed.label.hide_globally": "Masquer les entrées dans la liste globale non lue",
|
||||
"form.feed.label.ignore_http_cache": "Ignorer le cache HTTP",
|
||||
"form.feed.label.keeplist_rules": "Règles d'autorisation",
|
||||
"form.feed.label.keep_filter_entry_rules": "Règles d'autorisation des entrées",
|
||||
"form.feed.label.keeplist_rules": "Filtres de conservation basés sur des expressions régulières",
|
||||
"form.feed.label.no_media_player": "Pas de lecteur multimedia (audio/vidéo)",
|
||||
"form.feed.label.ntfy_activate": "Activer les notifications",
|
||||
"form.feed.label.ntfy_default_priority": "Priorité par défaut de notification",
|
||||
@@ -199,7 +202,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Priorité maximale",
|
||||
"form.feed.label.pushover_min_priority": "Priorité minimale",
|
||||
"form.feed.label.pushover_priority": "Priorité des notifications Pushover",
|
||||
"form.feed.label.rewrite_rules": "Règles de réécriture",
|
||||
"form.feed.label.rewrite_rules": "Règles de réécriture du contenu",
|
||||
"form.feed.label.scraper_rules": "Règles pour récupérer le contenu original",
|
||||
"form.feed.label.site_url": "URL du site web",
|
||||
"form.feed.label.title": "Titre",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Sauvegarder les articles vers Instapaper",
|
||||
"form.integration.instapaper_password": "Mot de passe Instapaper",
|
||||
"form.integration.instapaper_username": "Nom d'utilisateur Instapaper",
|
||||
"form.integration.karakeep_activate": "Sauvegarder les articles vers Karakeep",
|
||||
"form.integration.karakeep_api_key": "Clé d'API de Karakeep",
|
||||
"form.integration.karakeep_url": "URL de l'API de Karakeep",
|
||||
"form.integration.linkace_activate": "Enregistrer les entrées vers LinkAce",
|
||||
"form.integration.linkace_api_key": "Clé d'API LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Désactiver la vérification des liens",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Marquer le lien comme non lu",
|
||||
"form.integration.pinboard_tags": "Libellés de Pinboard",
|
||||
"form.integration.pinboard_token": "Jeton de sécurité de l'API de Pinboard",
|
||||
"form.integration.pocket_access_token": "Jeton d'accès de l'API de Pocket",
|
||||
"form.integration.pocket_activate": "Sauvegarder les articles vers Pocket",
|
||||
"form.integration.pocket_connect_link": "Connectez votre compte Pocket",
|
||||
"form.integration.pocket_consumer_key": "Clé de l'API de Pocket",
|
||||
"form.integration.pushover_activate": "Envoyer les articles vers Pushover",
|
||||
"form.integration.pushover_device": "Nom de l'appareil Pushover (facultatif)",
|
||||
"form.integration.pushover_prefix": "URL de préfixe Pushover (facultatif)",
|
||||
@@ -289,7 +291,7 @@
|
||||
"form.integration.readeck_activate": "Sauvegarder les articles vers Readeck",
|
||||
"form.integration.readeck_api_key": "Clé d'API de Readeck",
|
||||
"form.integration.readeck_endpoint": "URL de l'API de Readeck",
|
||||
"form.integration.readeck_labels": "Readeck Labels",
|
||||
"form.integration.readeck_labels": "Libellés Readeck",
|
||||
"form.integration.readeck_only_url": "Envoyer uniquement l'URL (au lieu du contenu complet)",
|
||||
"form.integration.readwise_activate": "Enregistrer les entrées vers Readwise Reader",
|
||||
"form.integration.readwise_api_key": "Jeton d'accès au lecteur Readwise",
|
||||
@@ -328,6 +330,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Paramètres globaux des abonnements",
|
||||
"form.prefs.fieldset.reader_settings": "Paramètres du lecteur",
|
||||
"form.prefs.help.external_font_hosts": "Liste de domaine externes autorisés, séparés par des espaces. Par exemple : « fonts.gstatic.com fonts.googleapis.com ».",
|
||||
"form.prefs.label.always_open_external_links": "Lire les articles en ouvrant les liens externes",
|
||||
"form.prefs.label.categories_sorting_order": "Colonne de tri des catégories",
|
||||
"form.prefs.label.cjk_reading_speed": "Vitesse de lecture pour le chinois, le coréen et le japonais (caractères par minute)",
|
||||
"form.prefs.label.custom_css": "Feuille de style personnalisée",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Marquer automatiquement les entrées comme lues lorsqu'elles sont consultées",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Marquer automatiquement les entrées comme lues lorsqu'elles sont consultées. Pour l'audio/vidéo, marquer comme lues après 90%%",
|
||||
"form.prefs.label.media_playback_rate": "Vitesse de lecture de l'audio/vidéo",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet (ajoute target=\"_blank\" aux liens)",
|
||||
"form.prefs.label.show_reading_time": "Afficher le temps de lecture estimé des articles",
|
||||
"form.prefs.label.theme": "Thème",
|
||||
"form.prefs.label.timezone": "Fuseau horaire",
|
||||
@@ -544,7 +547,7 @@
|
||||
"page.settings.webauthn.last_seen_on": "Dernière utilisation",
|
||||
"page.settings.webauthn.passkey_name": "Nom de la clé d’accès",
|
||||
"page.settings.webauthn.passkeys": "Clés d’accès",
|
||||
"page.settings.webauthn.register": "Enregister une nouvelle clé d’accès",
|
||||
"page.settings.webauthn.register": "Enregistrer une nouvelle clé d’accès",
|
||||
"page.settings.webauthn.register.error": "Impossible d'enregistrer la clé d’accès",
|
||||
"page.shared_entries.title": "Articles partagés",
|
||||
"page.shared_entries_count": [
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "hier",
|
||||
"tooltip.keyboard_shortcuts": "Raccourci clavier : %s",
|
||||
"tooltip.logged_user": "Connecté en tant que %s"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "नवीनीकरण करे",
|
||||
"alert.account_linked": "आपका बाहरी खाता अब लिंक हो गया है!",
|
||||
"alert.account_unlinked": "आपका बाहरी खाता अब अलग कर दिया गया है!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "सभी फ़ीड्स पृष्ठभूमि में ताज़ा की जा रही हैं। जब यह प्रक्रिया चल रही हो, तो आप मिनीफ्लक्स का उपयोग जारी रख सकते हैं।",
|
||||
"alert.feed_error": "इस फ़ीड में एक समस्या है",
|
||||
"alert.no_bookmark": "इस समय कोई बुकमार्क नहीं है",
|
||||
"alert.no_category": "कोई श्रेणी नहीं है।",
|
||||
@@ -27,26 +27,25 @@
|
||||
"alert.no_tag_entry": "इस टैग से मेल खाती कोई प्रविष्टियाँ नहीं हैं।",
|
||||
"alert.no_unread_entry": "कोई अपठित वस्तुत नहीं है।",
|
||||
"alert.no_user": "आप एकमात्र उपयोगकर्ता हैं।",
|
||||
"alert.pocket_linked": "आपका पॉकेट खाता अब लिंक हो गया है!",
|
||||
"alert.prefs_saved": "प्राथमिकताएं सहेजी गईं!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again."
|
||||
"आपने बहुत अधिक फ़ीड ताज़ा करने की प्रक्रिया शुरू कर दी है। कृपया पुनः प्रयास करने से पहले %d मिनट प्रतीक्षा करें।",
|
||||
"आपने बहुत अधिक फ़ीड ताज़ा करने की प्रक्रिया शुरू कर दी है। कृपया पुनः प्रयास करने से पहले %d मिनट प्रतीक्षा करें।"
|
||||
],
|
||||
"confirm.loading": " प्रगति में है ...",
|
||||
"confirm.no": " नहीं",
|
||||
"confirm.question": "मंजूर है?",
|
||||
"confirm.question.refresh": "क्या आप बल द्वारा ताज़ा करना चाहते हैं?",
|
||||
"confirm.yes": "हाँ",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "खोजें:",
|
||||
"enclosure_media_controls.seek.title": "%s सेकंड खोजें",
|
||||
"enclosure_media_controls.speed": "गति:",
|
||||
"enclosure_media_controls.speed.faster": "तेज",
|
||||
"enclosure_media_controls.speed.faster.title": "%sx गुना तेज",
|
||||
"enclosure_media_controls.speed.reset": "रीसेट करें",
|
||||
"enclosure_media_controls.speed.reset.title": "गति 1x पर रीसेट करें",
|
||||
"enclosure_media_controls.speed.slower": "धीमा",
|
||||
"enclosure_media_controls.speed.slower.title": "%sx गुना धीमा",
|
||||
"entry.bookmark.toast.off": "तारांकित न करे",
|
||||
"entry.bookmark.toast.on": "तारांकित",
|
||||
"entry.bookmark.toggle.off": "सितारा हटा दो",
|
||||
@@ -77,35 +76,39 @@
|
||||
"entry.status.toast.read": "पढ़ा हुआ चिह्नित करे",
|
||||
"entry.status.toast.unread": "अपठित के रूप में चिह्नित",
|
||||
"entry.tags.label": "टैग:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"%d और टैग दिखाएँ",
|
||||
"%d और टैग दिखाएँ"
|
||||
],
|
||||
"entry.unshare.label": "न साझा कारें",
|
||||
"error.api_key_already_exists": "यह एपीआई कुंजी पहले से मौजूद है।",
|
||||
"error.bad_credentials": "अमान्य उपयोगकर्ता नाम या पासवर्ड।",
|
||||
"error.category_already_exists": "यह श्रेणी पहले से मौजूद है।",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "यह श्रेणी मौजूद नहीं है या इस उपयोगकर्ता से संबंधित नहीं है।",
|
||||
"error.database_error": "डेटाबेस त्रुटि: %v।",
|
||||
"error.different_passwords": "पासवर्ड एक जैसे नहीं हैं।",
|
||||
"error.duplicate_fever_username": "पहले से ही समान फीवर उपयोगकर्ता नाम वाला कोई और है!",
|
||||
"error.duplicate_googlereader_username": "समान गूगल रीडर उपयोगकर्ता नाम वाला कोई और पहले से मौजूद है!",
|
||||
"error.duplicate_linked_account": "इस प्रदाता के साथ पहले से ही कोई व्यक्ति जुड़ा हुआ है!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicated_feed": "यह फ़ीड पहले से मौजूद है।",
|
||||
"error.empty_file": "यह फ़ाइल खाली है।",
|
||||
"error.entries_per_page_invalid": "प्रति पृष्ठ प्रविष्टियों की संख्या मान्य नहीं है।",
|
||||
"error.feed_already_exists": "यह फ़ीड पहले से मौजूद है.",
|
||||
"error.feed_category_not_found": "यह श्रेणी मौजूद नहीं है या इस उपयोगकर्ता से संबंधित नहीं है।",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "फ़ीड प्रारूप का पता नहीं लगा सकते: %v।",
|
||||
"error.feed_invalid_blocklist_rule": "ब्लॉक सूची नियम अमान्य है।",
|
||||
"error.feed_invalid_keeplist_rule": "सूची रखें नियम अमान्य है।",
|
||||
"error.feed_mandatory_fields": "URL और श्रेणी अनिवार्य हैं।",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "यह फ़ीड मौजूद नहीं है या इस उपयोगकर्ता से संबंधित नहीं है।",
|
||||
"error.feed_title_not_empty": "फ़ीड शीर्षक खाली नहीं हो सकता.",
|
||||
"error.feed_url_not_empty": "फ़ीड यूआरएल खाली नहीं हो सकता.",
|
||||
"error.fields_mandatory": "सभी फील्ड अनिवार्य।",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_bad_gateway": "खराब गेटवे त्रुटि के कारण वेबसाइट फिलहाल उपलब्ध नहीं है। समस्या Miniflux की तरफ नहीं है। कृपया बाद में फिर से कोशिश करें।",
|
||||
"error.http_body_read": "HTTP बॉडी पढ़ने में असमर्थ: %v।",
|
||||
"error.http_client_error": "HTTP क्लाइंट त्रुटि: %v।",
|
||||
"error.http_empty_response": "HTTP प्रतिक्रिया खाली है। शायद यह वेबसाइट बॉट सुरक्षा तंत्र का उपयोग कर रही है?",
|
||||
"error.http_empty_response_body": "HTTP प्रतिक्रिया बॉडी खाली है।",
|
||||
"error.http_forbidden": "इस वेबसाइट तक पहुंच वर्जित है। शायद इस वेबसाइट में बॉट सुरक्षा तंत्र है?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
@@ -119,7 +122,7 @@
|
||||
"error.invalid_display_mode": "अमान्य वेब ऐप्लिकेशन प्रदर्शन मोड.",
|
||||
"error.invalid_entry_direction": "अमान्य प्रवेश दिशा।",
|
||||
"error.invalid_entry_order": "अमान्य प्रविष्टि क्रम।",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "अमान्य प्रॉक्सी यूआरएल।",
|
||||
"error.invalid_feed_url": "दृष्टिकोण यूआरएल.",
|
||||
"error.invalid_gesture_nav": "अमान्य इशारा नेविगेशन।",
|
||||
"error.invalid_language": "अमान्य भाषा.",
|
||||
@@ -129,8 +132,6 @@
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.password_min_length": "पासवर्ड में कम से कम 6 अक्षर होने चाहिए।",
|
||||
"error.pocket_access_token": "पॉकेट से एक्सेस टोकन प्राप्त करने में असमर्थ!",
|
||||
"error.pocket_request_token": "पॉकेट से अनुरोध टोकन लाने में असमर्थ!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
@@ -151,8 +152,8 @@
|
||||
"error.unable_to_create_api_key": "यह एपीआई कुंजी बनाने में असमर्थ।",
|
||||
"error.unable_to_create_category": "यह श्रेणी बनाने में असमर्थ.",
|
||||
"error.unable_to_create_user": "इस उपयोगकर्ता को बनाने में असमर्थ।",
|
||||
"error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Unable to parse this feed: %v.",
|
||||
"error.unable_to_detect_rssbridge": "RSS-Bridge का उपयोग करके फ़ीड का पता लगाने में असमर्थ: %v.",
|
||||
"error.unable_to_parse_feed": "इस फ़ीड को पार्स करने में असमर्थ: %v.",
|
||||
"error.unable_to_update_category": "इस श्रेणी को अपडेट करने में असमर्थ।",
|
||||
"error.unable_to_update_feed": "इस फ़ीड को अपडेट करने में असमर्थ.",
|
||||
"error.unable_to_update_user": "इस उपयोगकर्ता को अपडेट करने में असमर्थ.",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.label.allow_self_signed_certificates": "स्व-हस्ताक्षरित या अमान्य प्रमाणपत्रों की अनुमति दें",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "ब्लॉक नियम",
|
||||
"form.feed.label.block_filter_entry_rules": "प्रविष्टि अवरोधन नियम",
|
||||
"form.feed.label.blocklist_rules": "रेगेक्स-आधारित अवरोधन फिल्टर",
|
||||
"form.feed.label.category": "श्रेणी",
|
||||
"form.feed.label.cookie": "कुकीज़ सेट करें",
|
||||
"form.feed.label.crawler": "मूल सामग्री प्राप्त करें",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "एप्लिकेशन स्तर पर कॉन्फ़िगर किए गए प्रॉक्सी का उपयोग करें",
|
||||
"form.feed.label.hide_globally": "वैश्विक अपठित सूची में प्रविष्टियां छिपाएं",
|
||||
"form.feed.label.ignore_http_cache": "एचटीटीपी कैश पर ध्यान न दें",
|
||||
"form.feed.label.keeplist_rules": "नियम बनाए रखें",
|
||||
"form.feed.label.keep_filter_entry_rules": "प्रविष्टि अनुमति नियम",
|
||||
"form.feed.label.keeplist_rules": "रेगेक्स-आधारित रखने वाले फिल्टर",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
@@ -199,7 +202,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "नियम फिर से लिखें",
|
||||
"form.feed.label.rewrite_rules": "सामग्री पुनर्लेखन नियम",
|
||||
"form.feed.label.scraper_rules": "खुरचनी नियम",
|
||||
"form.feed.label.site_url": "साइट यूआरएल",
|
||||
"form.feed.label.title": "शीर्षक",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "विषय-वस्तु को इंस्टापेपर में सहेजें",
|
||||
"form.integration.instapaper_password": "इंस्टापेपर पासवर्ड",
|
||||
"form.integration.instapaper_username": "इंस्टापेपर यूजरनेम",
|
||||
"form.integration.karakeep_activate": "Save entries to Karakeep",
|
||||
"form.integration.karakeep_api_key": "Karakeep API key",
|
||||
"form.integration.karakeep_url": "Karakeep API Endpoint",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "बुकमार्क को अपठित के रूप में चिह्नित करें",
|
||||
"form.integration.pinboard_tags": "पिनबोर्ड टैग",
|
||||
"form.integration.pinboard_token": "पिनबोर्ड एपीआई टोकन",
|
||||
"form.integration.pocket_access_token": "पॉकेट एक्सेस टोकन",
|
||||
"form.integration.pocket_activate": "विषय-कविता को पॉकेट में सहेजें",
|
||||
"form.integration.pocket_connect_link": "अपना पॉकेट खाता कनेक्ट करें",
|
||||
"form.integration.pocket_consumer_key": "पॉकेट उपभोक्ता कुंजी",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -328,6 +330,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.categories_sorting_order": "श्रेणियाँ छँटाई",
|
||||
"form.prefs.label.cjk_reading_speed": "चीनी, कोरियाई और जापानी के लिए पढ़ने की गति (प्रति मिनट वर्ण)",
|
||||
"form.prefs.label.custom_css": "कस्टम सीएसएस",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "देखे जाने पर स्वचालित रूप से प्रविष्टियों को पढ़ने के रूप में चिह्नित करें",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "ऑडियो/वीडियो की प्लेबैक गति",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "बाहरी लिंक को एक नए टैब में खोलें (लिंक में target=\"_blank\" जोड़ता है)",
|
||||
"form.prefs.label.show_reading_time": "विषय के लिए अनुमानित पढ़ने का समय दिखाएं",
|
||||
"form.prefs.label.theme": "थीम",
|
||||
"form.prefs.label.timezone": "समय क्षेत्र",
|
||||
@@ -574,14 +577,14 @@
|
||||
"page.users.title": "उपभोक्ता",
|
||||
"page.users.username": "यूसर्नेम",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"pagination.first": "पहला",
|
||||
"pagination.last": "अंतिम",
|
||||
"pagination.next": "अगला",
|
||||
"pagination.previous": "पिछला",
|
||||
"search.label": "खोजे",
|
||||
"search.placeholder": "खोजे...",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "खोजें",
|
||||
"skip_to_content": "सामग्री पर जाएं",
|
||||
"time_elapsed.days": [
|
||||
"%d दिन पहले",
|
||||
"%d दिन पहले"
|
||||
@@ -599,7 +602,7 @@
|
||||
"%d महिनो पहले"
|
||||
],
|
||||
"time_elapsed.not_yet": "अभी तक नहीं",
|
||||
"time_elapsed.now": "बिल्कुल अभी",
|
||||
"time_elapsed.now": "अभी",
|
||||
"time_elapsed.weeks": [
|
||||
"%d सप्ताह पहले",
|
||||
"%d हफ्तों पहले"
|
||||
@@ -609,6 +612,6 @@
|
||||
"%d वर्षों पहले"
|
||||
],
|
||||
"time_elapsed.yesterday": "कल",
|
||||
"tooltip.keyboard_shortcuts": "कुंजीपटल संक्षिप्त रीति: %s",
|
||||
"tooltip.keyboard_shortcuts": "कुंजीपटल शॉर्टकट: %s",
|
||||
"tooltip.logged_user": "%s के रूप में लॉग इन किया"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "Perbarui",
|
||||
"alert.account_linked": "Akun eksternal Anda sudah terhubung!",
|
||||
"alert.account_unlinked": "Akun eksternal Anda sudah terputus!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "Semua umpan sedang disegarkan di latar belakang. Anda bisa lanjut menggunakan Miniflux sembari proses ini berlanjut.",
|
||||
"alert.feed_error": "Ada masalah dengan umpan ini",
|
||||
"alert.no_bookmark": "Tidak ada markah.",
|
||||
"alert.no_category": "Tidak ada kategori.",
|
||||
@@ -27,25 +27,24 @@
|
||||
"alert.no_tag_entry": "Tidak ada entri yang cocok dengan tag ini.",
|
||||
"alert.no_unread_entry": "Belum ada artikel yang dibaca.",
|
||||
"alert.no_user": "Anda adalah satu-satunya pengguna.",
|
||||
"alert.pocket_linked": "Akun Pocket Anda sudah terhubung!",
|
||||
"alert.prefs_saved": "Preferensi disimpan!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again."
|
||||
"Anda terlalu banyak menyegarkan umpan. Mohon tunggu %d menit sebelum mencoba lagi."
|
||||
],
|
||||
"confirm.loading": "Sedang progres...",
|
||||
"confirm.no": "tidak",
|
||||
"confirm.question": "Apakah Anda yakin?",
|
||||
"confirm.question.refresh": "Apakah Anda ingin memaksa penyegaran?",
|
||||
"confirm.yes": "ya",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "Putar:",
|
||||
"enclosure_media_controls.seek.title": "Putar %s detik",
|
||||
"enclosure_media_controls.speed": "Kecepatan:",
|
||||
"enclosure_media_controls.speed.faster": "Lebih cepat",
|
||||
"enclosure_media_controls.speed.faster.title": "Lebih cepat %sx",
|
||||
"enclosure_media_controls.speed.reset": "Atur ulang",
|
||||
"enclosure_media_controls.speed.reset.title": "Atur ulang ke 1x",
|
||||
"enclosure_media_controls.speed.slower": "Lebih lambat",
|
||||
"enclosure_media_controls.speed.slower.title": "Lebih lambat %sx",
|
||||
"entry.bookmark.toast.off": "Batal Markahi",
|
||||
"entry.bookmark.toast.on": "Markahi",
|
||||
"entry.bookmark.toggle.off": "Batal Markahi",
|
||||
@@ -75,82 +74,83 @@
|
||||
"entry.status.toast.read": "Ditandai sebagai telah dibaca",
|
||||
"entry.status.toast.unread": "Ditandai sebagai belum dibaca",
|
||||
"entry.tags.label": "Tanda:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Tampilkan %d tag lainnya"
|
||||
],
|
||||
"entry.unshare.label": "Batal bagikan",
|
||||
"error.api_key_already_exists": "Kunci API ini sudah ada.",
|
||||
"error.bad_credentials": "Nama pengguna atau kata sandi tidak valid.",
|
||||
"error.category_already_exists": "Kategori ini telah ada.",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "Kategori ini tidak ada atau tidak dipunyai oleh pengguna ini.",
|
||||
"error.database_error": "Galat basis data: %v.",
|
||||
"error.different_passwords": "Kata sandi tidak sama.",
|
||||
"error.duplicate_fever_username": "Sudah ada orang lain dengan nama pengguna Fever yang sama!",
|
||||
"error.duplicate_googlereader_username": "Sudah ada orang lain dengan nama pengguna Google Reader yang sama!",
|
||||
"error.duplicate_linked_account": "Sudah ada orang lain yang terhubung dengan penyedia ini!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicate_fever_username": "Sudah ada pengguna lain dengan nama pengguna Fever yang sama!",
|
||||
"error.duplicate_googlereader_username": "Sudah ada pengguna lain dengan nama pengguna Google Reader yang sama!",
|
||||
"error.duplicate_linked_account": "Sudah ada pengguna lain yang terhubung dengan penyedia ini!",
|
||||
"error.duplicated_feed": "Umpan ini sudah ada.",
|
||||
"error.empty_file": "Berkas ini kosong.",
|
||||
"error.entries_per_page_invalid": "Jumlah entri per halaman tidak valid.",
|
||||
"error.feed_already_exists": "Umpan ini sudah ada.",
|
||||
"error.feed_category_not_found": "Kategori ini tidak ada atau tidak dipunyai oleh pengguna ini.",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "Tidak dapat mendeteksi format umpan: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "Aturan blokir tidak valid.",
|
||||
"error.feed_invalid_keeplist_rule": "Aturan simpan tidak valid.",
|
||||
"error.feed_mandatory_fields": "Harus ada URL dan kategorinya.",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "Umpan ini tidak ada atau tidak dipunyai oleh pengguna ini",
|
||||
"error.feed_title_not_empty": "Judul umpan tidak boleh kosong.",
|
||||
"error.feed_url_not_empty": "URL umpan tidak boleh kosong.",
|
||||
"error.fields_mandatory": "Semua bidang diharuskan.",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
"error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
|
||||
"error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
|
||||
"error.http_service_unavailable": "The website is not available at the moment due to an internal server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
|
||||
"error.http_unexpected_status_code": "The website is not available at the moment due to an unexpected HTTP status code: %d. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_bad_gateway": "Situs ini tidak tersedia saat ini karena kesalahan akses peladen situs. Masalah ini bukan pada sisi Miniflux. Coba lagi nanti.",
|
||||
"error.http_body_read": "Tidak dapat membaca badan HTTP: %v.",
|
||||
"error.http_client_error": "Galat klien HTTP: %v.",
|
||||
"error.http_empty_response": "Balasan HTTP kosong. Mungkin, situs ini menggunakan mekanisme perlindungan dari bot?",
|
||||
"error.http_empty_response_body": "Badan balasan HTTP kosong.",
|
||||
"error.http_forbidden": "Akses ke situs ini terlarang. Mungkin, situs ini menggunakan mekanisme perlindungan dari bot?",
|
||||
"error.http_gateway_timeout": "Situs ini tidak tersedia saat ini karena kesalahan akses jaringan peladen situs. Masalah ini bukan pada sisi Miniflux. Coba lagi nanti.",
|
||||
"error.http_internal_server_error": "Situs ini tidak tersedia saat ini karena galat peladen situs. Masalah ini bukan pada sisi Miniflux. Coba lagi nanti.",
|
||||
"error.http_not_authorized": "Akses ke situs ini tidak diizinkan. Mungkin nama pengguna atau kata sandinya salah.",
|
||||
"error.http_resource_not_found": "Sumber daya yang diminta tidak ditemukan. Periksa kembali URL-nya.",
|
||||
"error.http_response_too_large": "Balasan HTTP terlalu besar. Anda bisa menaikkan batas ukuran balasan HTTP di pengaturan global (membutuhkan pemulaian ulang peladen).",
|
||||
"error.http_service_unavailable": "Situs ini tidak tersedia saat ini dikarenakan galat internal peladen situs. Masalah ini bukan pada sisi Miniflux. Coba lagi nanti.",
|
||||
"error.http_too_many_requests": "Terlalu banyak koneksi dari Miniflux yang dibuat ke situs ini. Coba lagi nanti atau ubah konfigurasi aplikasi.",
|
||||
"error.http_unexpected_status_code": "Situs ini tidak dapat dijangkau saat ini dikarenakan kode status HTTP tak diduga: %d Masalah ini bukan pada sisi Miniflux. Coba lagi nanti.",
|
||||
"error.invalid_categories_sorting_order": "Urutan penyortiran kategori tidak valid.",
|
||||
"error.invalid_default_home_page": "Beranda baku tidak valid!",
|
||||
"error.invalid_display_mode": "Mode tampilan aplikasi web tidak valid.",
|
||||
"error.invalid_entry_direction": "Urutan entri tidak valid.",
|
||||
"error.invalid_entry_order": "Urutan entri tidak valid.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "URL proksi tidak valid.",
|
||||
"error.invalid_feed_url": "URL umpan tidak valid.",
|
||||
"error.invalid_gesture_nav": "Navigasi gestur tidak valid.",
|
||||
"error.invalid_language": "Bahasa tidak valid.",
|
||||
"error.invalid_site_url": "URL situs tidak valid.",
|
||||
"error.invalid_theme": "Tema tidak valid.",
|
||||
"error.invalid_timezone": "Zona waktu tidak valid.",
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.network_operation": "Miniflux tidak dapat menjangkau situs ini dikarenakan galat jaringan: %v.",
|
||||
"error.network_timeout": "Situs ini terlalu lambat dan permintaan ke situs terlalu lama: %v",
|
||||
"error.password_min_length": "Kata sandi harus memiliki setidaknya 6 karakter.",
|
||||
"error.pocket_access_token": "Tidak bisa mendapatkan token akses dari Pocket!",
|
||||
"error.pocket_request_token": "Tidak bisa mendapatkan token permintaan dari Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
|
||||
"error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
|
||||
"error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.proxy_url_not_empty": "URL proksi tidak boleh kosong.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Aturan blokir tidak valid: aturan #%d tidak mempunyai nama bidang yang valid (Opsi: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Aturan blokir tidak valid: aturan pola #%d bukan ekspresi regular (regex) yang valid",
|
||||
"error.settings_block_rule_regex_required": "Aturan blokir tidak valid: aturan pola #%d tidak disediakan",
|
||||
"error.settings_block_rule_separator_required": "Aturan blokir tidak valid: aturan pola #%d diharuskan dipisah menggunakan '='",
|
||||
"error.settings_invalid_domain_list": "Daftar domain tidak valid. Mohon sediakan daftar domain yang dipisah spasi.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Aturan simpan tidak valid: aturan #%d tidak mempunyai nama bidang yang valid (Opsi: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Aturan simpan tidak valid: aturan pola #%d bukan ekspresi regular (regex) yang valid",
|
||||
"error.settings_keep_rule_regex_required": "Aturan simpan tidak valid: aturan pola #%d tidak disediakan",
|
||||
"error.settings_keep_rule_separator_required": "Aturan simpan tidak valid: aturan pola #%d diharuskan dipisah menggunakan '='",
|
||||
"error.settings_mandatory_fields": "Harus ada nama pengguna, tema, bahasa, dan zona waktu.",
|
||||
"error.settings_media_playback_rate_range": "Kecepatan pemutaran di luar jangkauan",
|
||||
"error.settings_reading_speed_is_positive": "Kecepatan membaca harus integer positif.",
|
||||
"error.site_url_not_empty": "URL situs tidak boleh kosong.",
|
||||
"error.subscription_not_found": "Tidak bisa mencari langganan apa pun.",
|
||||
"error.title_required": "Judul diharuskan.",
|
||||
"error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
|
||||
"error.title_required": "Judul harus ada.",
|
||||
"error.tls_error": "Galat TLS: %q. Anda bisa mematikan verifikasi TLS di pengaturan umpan jika Anda mau.",
|
||||
"error.unable_to_create_api_key": "Tidak bisa membuat kunci API ini.",
|
||||
"error.unable_to_create_category": "Tidak bisa membuat kategori ini.",
|
||||
"error.unable_to_create_user": "Tidak bisa membuat pengguna tersebut.",
|
||||
"error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Unable to parse this feed: %v.",
|
||||
"error.unable_to_detect_rssbridge": "Tidak dapat mendeteksi umpan menggunakan RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Tidak dapat membaca umpan: %v.",
|
||||
"error.unable_to_update_category": "Tidak bisa memperbarui kategori ini.",
|
||||
"error.unable_to_update_feed": "Tidak bisa memperbarui umpan ini.",
|
||||
"error.unable_to_update_user": "Tidak bisa memperbarui pengguna tersebut.",
|
||||
@@ -160,62 +160,64 @@
|
||||
"form.api_key.label.description": "Label Kunci API",
|
||||
"form.category.hide_globally": "Sembunyikan entri di daftar belum dibaca global",
|
||||
"form.category.label.title": "Judul",
|
||||
"form.feed.fieldset.general": "General",
|
||||
"form.feed.fieldset.integration": "Third-Party Services",
|
||||
"form.feed.fieldset.network_settings": "Network Settings",
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.fieldset.general": "Umum",
|
||||
"form.feed.fieldset.integration": "Pengaturan Pihak Ketiga",
|
||||
"form.feed.fieldset.network_settings": "Pengaturan Jaringan",
|
||||
"form.feed.fieldset.rules": "Aturan",
|
||||
"form.feed.label.allow_self_signed_certificates": "Perbolehkan sertifikat web tidak valid atau sertifikasi sendiri",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Aturan Blokir",
|
||||
"form.feed.label.apprise_service_urls": "Daftar yang dipisahkan koma untuk URL layanan Apprise",
|
||||
"form.feed.label.block_filter_entry_rules": "Aturan Pemblokiran Entri",
|
||||
"form.feed.label.blocklist_rules": "Filter Pemblokiran Berbasis Regex",
|
||||
"form.feed.label.category": "Kategori",
|
||||
"form.feed.label.cookie": "Atur Kuki",
|
||||
"form.feed.label.crawler": "Ambil konten asli",
|
||||
"form.feed.label.description": "Deskripsi",
|
||||
"form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
|
||||
"form.feed.label.disable_http2": "Matikan HTTP/2 untuk menghindari pelacakan",
|
||||
"form.feed.label.disabled": "Jangan perbarui umpan ini",
|
||||
"form.feed.label.feed_password": "Kata Sandi Umpan",
|
||||
"form.feed.label.feed_url": "URL Umpan",
|
||||
"form.feed.label.feed_username": "Nama Pengguna Umpan",
|
||||
"form.feed.label.fetch_via_proxy": "Gunakan proxy yang dikonfigurasi di tingkat aplikasi",
|
||||
"form.feed.label.fetch_via_proxy": "Gunakan proksi yang dikonfigurasi di tingkat aplikasi",
|
||||
"form.feed.label.hide_globally": "Sembunyikan entri di daftar belum dibaca global",
|
||||
"form.feed.label.ignore_http_cache": "Abaikan Tembolok HTTP",
|
||||
"form.feed.label.keeplist_rules": "Aturan Simpan",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
"form.feed.label.ntfy_high_priority": "Ntfy high priority",
|
||||
"form.feed.label.ntfy_low_priority": "Ntfy low priority",
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy max priority",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy min priority",
|
||||
"form.feed.label.ntfy_priority": "Ntfy priority",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (optional)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Aturan Tulis Ulang",
|
||||
"form.feed.label.keep_filter_entry_rules": "Aturan Izin Entri",
|
||||
"form.feed.label.keeplist_rules": "Filter Simpan Berbasis Regex",
|
||||
"form.feed.label.no_media_player": "Tidak ada pemutar media (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Kirim artikel ke ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Prioritas baku Ntfy",
|
||||
"form.feed.label.ntfy_high_priority": "Priroritas tinggi Ntfy",
|
||||
"form.feed.label.ntfy_low_priority": "Prioritas rendah Ntfy",
|
||||
"form.feed.label.ntfy_max_priority": "Prioritas maksimal Ntfy",
|
||||
"form.feed.label.ntfy_min_priority": "Prioritas minimal Ntfy",
|
||||
"form.feed.label.ntfy_priority": "Prioritas Ntfy",
|
||||
"form.feed.label.ntfy_topic": "Topik Ntfy (opsional)",
|
||||
"form.feed.label.proxy_url": "URL Proksi",
|
||||
"form.feed.label.pushover_activate": "Kirim artikel ke pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Prioritas baku Pushover",
|
||||
"form.feed.label.pushover_high_priority": "Prioritas tinggi Pushover",
|
||||
"form.feed.label.pushover_low_priority": "Prioritas rendah Pushover",
|
||||
"form.feed.label.pushover_max_priority": "Prioritas maksimal Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Prioritas minimal Pushover",
|
||||
"form.feed.label.pushover_priority": "Prioritas pesan Pushover",
|
||||
"form.feed.label.rewrite_rules": "Aturan Penulisan Ulang Konten",
|
||||
"form.feed.label.scraper_rules": "Aturan Pengambil Data",
|
||||
"form.feed.label.site_url": "URL Situs",
|
||||
"form.feed.label.title": "Judul",
|
||||
"form.feed.label.urlrewrite_rules": "Aturan Tulis Ulang URL",
|
||||
"form.feed.label.user_agent": "Timpa User Agent Baku",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "Timpa URL Webhook",
|
||||
"form.import.label.file": "Berkas OPML",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "Push entries to Apprise",
|
||||
"form.integration.apprise_services_url": "Comma separated list of Apprise service URLs",
|
||||
"form.integration.apprise_url": "Apprise API URL",
|
||||
"form.integration.betula_activate": "Save entries to Betula",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
"form.integration.betula_url": "Betula server URL",
|
||||
"form.integration.cubox_activate": "Save entries to Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API link",
|
||||
"form.integration.discord_activate": "Push entries to Discord",
|
||||
"form.integration.discord_webhook_link": "Discord Webhook link",
|
||||
"form.integration.apprise_activate": "Kirim artikel ke Apprise",
|
||||
"form.integration.apprise_services_url": "Daftar yang dipisahkan koma untuk URL layanan Apprise",
|
||||
"form.integration.apprise_url": "URL API Apprise",
|
||||
"form.integration.betula_activate": "Simpan artikel ke Betula",
|
||||
"form.integration.betula_token": "Token Betula",
|
||||
"form.integration.betula_url": "URL Peladen Betula",
|
||||
"form.integration.cubox_activate": "Simpan artikel ke Cubox",
|
||||
"form.integration.cubox_api_link": "Tautan API Cubox",
|
||||
"form.integration.discord_activate": "Kirim artikel ke Discord",
|
||||
"form.integration.discord_webhook_link": "Tautan Webhook Discord",
|
||||
"form.integration.espial_activate": "Simpan artikel ke Espial",
|
||||
"form.integration.espial_api_key": "Kunci API Espial",
|
||||
"form.integration.espial_endpoint": "Titik URL API Espial",
|
||||
@@ -231,17 +233,20 @@
|
||||
"form.integration.instapaper_activate": "Simpan artikel ke Instapaper",
|
||||
"form.integration.instapaper_password": "Kata Sandi Instapaper",
|
||||
"form.integration.instapaper_username": "Nama Pengguna Instapaper",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
"form.integration.linkace_endpoint": "LinkAce API Endpoint",
|
||||
"form.integration.linkace_is_private": "Mark link as private",
|
||||
"form.integration.linkace_tags": "LinkAce Tags",
|
||||
"form.integration.karakeep_activate": "Simpan artikel ke Karakeep",
|
||||
"form.integration.karakeep_api_key": "Kunci API Karakeep",
|
||||
"form.integration.karakeep_url": "Titik URL API Karakeep",
|
||||
"form.integration.linkace_activate": "Simpan artikel ke LinkAce",
|
||||
"form.integration.linkace_api_key": "Kunci API LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Matikan pemeriksaan tautan",
|
||||
"form.integration.linkace_endpoint": "Titik URL API LinkAce",
|
||||
"form.integration.linkace_is_private": "Tandai tautan sebagai pribadi",
|
||||
"form.integration.linkace_tags": "Tanda LinkAce",
|
||||
"form.integration.linkding_activate": "Simpan artikel ke Linkding",
|
||||
"form.integration.linkding_api_key": "Kunci API Linkding",
|
||||
"form.integration.linkding_bookmark": "Tandai markah sebagai belum dibaca",
|
||||
"form.integration.linkding_endpoint": "Titik URL API Linkding",
|
||||
"form.integration.linkding_tags": "Linkding Tags",
|
||||
"form.integration.linkding_tags": "Tanda Linkding",
|
||||
"form.integration.linkwarden_activate": "Simpan artikel ke Linkwarden",
|
||||
"form.integration.linkwarden_api_key": "Kunci API Linkwarden",
|
||||
"form.integration.linkwarden_endpoint": "Titik URL API Linkwarden",
|
||||
@@ -250,17 +255,17 @@
|
||||
"form.integration.matrix_bot_password": "Kata Sandi Matrix",
|
||||
"form.integration.matrix_bot_url": "URL Peladen Matrix",
|
||||
"form.integration.matrix_bot_user": "Nama Pengguna Matrix",
|
||||
"form.integration.notion_activate": "Save entries to Notion",
|
||||
"form.integration.notion_page_id": "Notion Page ID",
|
||||
"form.integration.notion_token": "Notion Secret Token",
|
||||
"form.integration.ntfy_activate": "Push entries to ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (optional)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
|
||||
"form.integration.ntfy_internal_links": "Use internal links on click (optional)",
|
||||
"form.integration.ntfy_password": "Ntfy Password (optional)",
|
||||
"form.integration.ntfy_topic": "Ntfy topic (default used if not set in feed)",
|
||||
"form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
|
||||
"form.integration.ntfy_username": "Ntfy Username (optional)",
|
||||
"form.integration.notion_activate": "Simpan artikel ke Notion",
|
||||
"form.integration.notion_page_id": "ID Halaman Notion",
|
||||
"form.integration.notion_token": "Token Rahasia Notion",
|
||||
"form.integration.ntfy_activate": "Kirim artikel ke ntfy",
|
||||
"form.integration.ntfy_api_token": "Token API Ntfy (opsional)",
|
||||
"form.integration.ntfy_icon_url": "URL ikon Ntfy (opsional)",
|
||||
"form.integration.ntfy_internal_links": "Gunakan tautan internal ketika mengklik (opsional)",
|
||||
"form.integration.ntfy_password": "Kata sandi Ntfy (opsional)",
|
||||
"form.integration.ntfy_topic": "Topik Ntfy (yang akan digunakan jika tidak diatur di umpan)",
|
||||
"form.integration.ntfy_url": "URL Ntfy (opsional, bawaan ke ntfy.sh)",
|
||||
"form.integration.ntfy_username": "Nama pengguna Ntfy (opsional)",
|
||||
"form.integration.nunux_keeper_activate": "Simpan artikel ke Nunux Keeper",
|
||||
"form.integration.nunux_keeper_api_key": "Kunci API Nunux Keeper",
|
||||
"form.integration.nunux_keeper_endpoint": "Titik URL API Nunux Keeper",
|
||||
@@ -271,46 +276,42 @@
|
||||
"form.integration.pinboard_bookmark": "Tandai markah sebagai belum dibaca",
|
||||
"form.integration.pinboard_tags": "Tanda di Pinboard",
|
||||
"form.integration.pinboard_token": "Token API Pinboard",
|
||||
"form.integration.pocket_access_token": "Token Akses Pocket",
|
||||
"form.integration.pocket_activate": "Simpan artikel ke Pocket",
|
||||
"form.integration.pocket_connect_link": "Hubungkan akun Pocket Anda",
|
||||
"form.integration.pocket_consumer_key": "Kunci Pelanggan Pocket",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
"form.integration.pushover_token": "Pushover application API token",
|
||||
"form.integration.pushover_user": "Pushover user key",
|
||||
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||
"form.integration.raindrop_collection_id": "Collection ID",
|
||||
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||
"form.integration.raindrop_token": "(Test) Token",
|
||||
"form.integration.pushover_activate": "Kirim artikel ke Pushover",
|
||||
"form.integration.pushover_device": "Perangkat Pushover (opsional)",
|
||||
"form.integration.pushover_prefix": "Prefiks URL Pushover (opsional)",
|
||||
"form.integration.pushover_token": "Token API aplikasi Pushover",
|
||||
"form.integration.pushover_user": "Kunci pengguna Pushover",
|
||||
"form.integration.raindrop_activate": "Simpan artikel ke Raindrop",
|
||||
"form.integration.raindrop_collection_id": "ID Koleksi",
|
||||
"form.integration.raindrop_tags": "Tanda (dipisahkan koma)",
|
||||
"form.integration.raindrop_token": "Token (Tes)",
|
||||
"form.integration.readeck_activate": "Simpan artikel ke Readeck",
|
||||
"form.integration.readeck_api_key": "Kunci API Readeck",
|
||||
"form.integration.readeck_endpoint": "Titik URL API Readeck",
|
||||
"form.integration.readeck_labels": "Readeck Labels",
|
||||
"form.integration.readeck_labels": "Tagar Readeck",
|
||||
"form.integration.readeck_only_url": "Kirim hanya URL (alih-alih konten penuh)",
|
||||
"form.integration.readwise_activate": "Save entries to Readwise Reader",
|
||||
"form.integration.readwise_api_key": "Readwise Reader Access Token",
|
||||
"form.integration.readwise_api_key_link": "Get your Readwise Access Token",
|
||||
"form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge authentication token",
|
||||
"form.integration.rssbridge_url": "RSS-Bridge server URL",
|
||||
"form.integration.shaarli_activate": "Save articles to Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Shaarli API Secret",
|
||||
"form.integration.shaarli_endpoint": "Shaarli URL",
|
||||
"form.integration.shiori_activate": "Save articles to Shiori",
|
||||
"form.integration.shiori_endpoint": "Shiori API Endpoint",
|
||||
"form.integration.shiori_password": "Shiori Password",
|
||||
"form.integration.shiori_username": "Shiori Username",
|
||||
"form.integration.slack_activate": "Push entries to Slack",
|
||||
"form.integration.slack_webhook_link": "Slack Webhook link",
|
||||
"form.integration.readwise_activate": "Simpan artikel ke Readwise",
|
||||
"form.integration.readwise_api_key": "Token Akses Readwise",
|
||||
"form.integration.readwise_api_key_link": "Dapatkan Token Akses Readwise Anda",
|
||||
"form.integration.rssbridge_activate": "Periksa RSS-Bridge ketika menambahkan langganan",
|
||||
"form.integration.rssbridge_token": "Token autentikasi RSS-Bridge",
|
||||
"form.integration.rssbridge_url": "URL peladen RSS-Bridge",
|
||||
"form.integration.shaarli_activate": "Simpan artikel ke Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Rahasia API Shaarli",
|
||||
"form.integration.shaarli_endpoint": "URL Shaarli",
|
||||
"form.integration.shiori_activate": "Simpan artikel ke Shiori",
|
||||
"form.integration.shiori_endpoint": "Titik URL API Shiori",
|
||||
"form.integration.shiori_password": "Kata Sandi Shiori",
|
||||
"form.integration.shiori_username": "Nama Pengguna Shiori",
|
||||
"form.integration.slack_activate": "Kirim artikel ke Slack",
|
||||
"form.integration.slack_webhook_link": "Tautan Webhook Slack",
|
||||
"form.integration.telegram_bot_activate": "Kirim artikel baru ke percakapan Telegram",
|
||||
"form.integration.telegram_bot_disable_buttons": "Disable buttons",
|
||||
"form.integration.telegram_bot_disable_notification": "Disable notification",
|
||||
"form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
|
||||
"form.integration.telegram_bot_disable_buttons": "Matikan tombol",
|
||||
"form.integration.telegram_bot_disable_notification": "Matikan notifikasi",
|
||||
"form.integration.telegram_bot_disable_web_page_preview": "Matikan tinjauan halaman web",
|
||||
"form.integration.telegram_bot_token": "Token Bot",
|
||||
"form.integration.telegram_chat_id": "ID Obrolan",
|
||||
"form.integration.telegram_topic_id": "Topic ID",
|
||||
"form.integration.telegram_topic_id": "ID Topik",
|
||||
"form.integration.wallabag_activate": "Simpan artikel ke Wallabag",
|
||||
"form.integration.wallabag_client_id": "ID Klien Wallabag",
|
||||
"form.integration.wallabag_client_secret": "Rahasia Klien Wallabag",
|
||||
@@ -318,14 +319,15 @@
|
||||
"form.integration.wallabag_only_url": "Kirim hanya URL (alih-alih konten penuh)",
|
||||
"form.integration.wallabag_password": "Kata Sandi Wallabag",
|
||||
"form.integration.wallabag_username": "Nama Pengguna Wallabag",
|
||||
"form.integration.webhook_activate": "Enable Webhooks",
|
||||
"form.integration.webhook_secret": "Webhooks Secret",
|
||||
"form.integration.webhook_url": "Default Webhook URL",
|
||||
"form.prefs.fieldset.application_settings": "Application Settings",
|
||||
"form.prefs.fieldset.authentication_settings": "Authentication Settings",
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.integration.webhook_activate": "Aktifkan Webhook",
|
||||
"form.integration.webhook_secret": "Rahasia Webhook",
|
||||
"form.integration.webhook_url": "URL Webhook baku",
|
||||
"form.prefs.fieldset.application_settings": "Pengaturan Aplikasi",
|
||||
"form.prefs.fieldset.authentication_settings": "Pengaturan Autentikasi",
|
||||
"form.prefs.fieldset.global_feed_settings": "Pengaturan Umpan Global",
|
||||
"form.prefs.fieldset.reader_settings": "Pengaturan Pembaca",
|
||||
"form.prefs.help.external_font_hosts": "Daftar yang dipisah spasi untuk peladen penyedia fonta eksternal yang diperbolehkan. Seperti: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Baca artikel dengan membuka tautan eksternal",
|
||||
"form.prefs.label.categories_sorting_order": "Pengurutan Kategori",
|
||||
"form.prefs.label.cjk_reading_speed": "Kecepatan membaca untuk bahasa Tiongkok, Korea, dan Jepang (karakter per menit)",
|
||||
"form.prefs.label.custom_css": "Modifikasi CSS",
|
||||
@@ -337,16 +339,16 @@
|
||||
"form.prefs.label.entry_order": "Pengurutan Kolom Entri",
|
||||
"form.prefs.label.entry_sorting": "Pengurutan Entri",
|
||||
"form.prefs.label.entry_swipe": "Aktifkan tindakan geser pada entri di ponsel",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Peladen penyedia fonta eksternal",
|
||||
"form.prefs.label.gesture_nav": "Isyarat untuk menavigasi antar entri",
|
||||
"form.prefs.label.keyboard_shortcuts": "Aktifkan pintasan papan tik",
|
||||
"form.prefs.label.language": "Bahasa",
|
||||
"form.prefs.label.mark_read_manually": "Mark entries as read manually",
|
||||
"form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
|
||||
"form.prefs.label.mark_read_manually": "Tandai entri sebagai telah dibaca secara manual",
|
||||
"form.prefs.label.mark_read_on_media_completion": "Tandai entri sebagai telah dibaca ketika audio/video sudah 90% didengar/ditonton",
|
||||
"form.prefs.label.mark_read_on_view": "Secara otomatis menandai entri sebagai telah dibaca saat dilihat",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Tandai entri sebagai telah dibaca ketika dilihat. Untuk audio/video, tandai sebagai telah dibaca ketika sudah 90% didengar/ditonton.",
|
||||
"form.prefs.label.media_playback_rate": "Kecepatan pemutaran audio/video",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Buka tautan eksternal di tab baru (menambahkan target=\"_blank\" ke tautan)",
|
||||
"form.prefs.label.show_reading_time": "Tampilkan perkiraan waktu baca untuk artikel",
|
||||
"form.prefs.label.theme": "Tema",
|
||||
"form.prefs.label.timezone": "Zona Waktu",
|
||||
@@ -383,7 +385,7 @@
|
||||
"menu.feeds": "Umpan",
|
||||
"menu.flush_history": "Hapus riwayat",
|
||||
"menu.history": "Riwayat",
|
||||
"menu.home_page": "Home page",
|
||||
"menu.home_page": "Beranda",
|
||||
"menu.import": "Impor",
|
||||
"menu.integrations": "Integrasi",
|
||||
"menu.logout": "Keluar",
|
||||
@@ -397,7 +399,7 @@
|
||||
"menu.settings": "Pengaturan",
|
||||
"menu.shared_entries": "Entri yang Dibagikan",
|
||||
"menu.show_all_entries": "Tampilkan semua entri",
|
||||
"menu.show_only_starred_entries": "Show only starred entries",
|
||||
"menu.show_only_starred_entries": "Tampilkan hanya entri yang dimarkahkan",
|
||||
"menu.show_only_unread_entries": "Tampilkan hanya entri yang belum dibaca",
|
||||
"menu.starred": "Markah",
|
||||
"menu.title": "Menu",
|
||||
@@ -435,7 +437,7 @@
|
||||
"page.categories.no_feed": "Tidak ada umpan.",
|
||||
"page.categories.title": "Kategori",
|
||||
"page.categories_count": [
|
||||
"%d category"
|
||||
"%d kategori"
|
||||
],
|
||||
"page.category_label": "Category: %s",
|
||||
"page.edit_category.title": "Sunting Kategori: %s",
|
||||
@@ -451,7 +453,7 @@
|
||||
"%d galat"
|
||||
],
|
||||
"page.feeds.last_check": "Terakhir diperiksa:",
|
||||
"page.feeds.next_check": "Next check:",
|
||||
"page.feeds.next_check": "Akan diperiksa kembali:",
|
||||
"page.feeds.read_counter": "Jumlah entri yang telah dibaca",
|
||||
"page.feeds.title": "Umpan",
|
||||
"page.history.title": "Riwayat",
|
||||
@@ -502,12 +504,12 @@
|
||||
"page.keyboard_shortcuts.toggle_entry_attachments": "Buka/tutup lampiran entri",
|
||||
"page.keyboard_shortcuts.toggle_read_status_next": "Ubah status baca, fokus ke selanjutnya",
|
||||
"page.keyboard_shortcuts.toggle_read_status_prev": "Ubah status baca, fokus ke sebelumnya",
|
||||
"page.login.google_signin": "Masuk dengan Google",
|
||||
"page.login.oidc_signin": "Masuk dengan %s",
|
||||
"page.login.google_signin": "Masuk menggunakan Google",
|
||||
"page.login.oidc_signin": "Masuk menggunakan %s",
|
||||
"page.login.title": "Masuk",
|
||||
"page.login.webauthn_login": "Login with passkey",
|
||||
"page.login.webauthn_login.error": "Unable to login with passkey",
|
||||
"page.login.webauthn_login.help": "Please enter your username if you're using a security key. This is not required if you are using a Passkey (discoverable credentials).",
|
||||
"page.login.webauthn_login": "Masuk menggunakan passkey",
|
||||
"page.login.webauthn_login.error": "Tidak dapat masuk menggunakan passkey",
|
||||
"page.login.webauthn_login.help": "Mohon untuk memasukkan nama pengguna Anda jika Anda menggunakan kunci keamanan. Tidak diperlukan jika anda menggunakan Passkey (kredensial dapat ditemukan).",
|
||||
"page.new_api_key.title": "Kunci API Baru",
|
||||
"page.new_category.title": "Kategori Baru",
|
||||
"page.new_user.title": "Pengguna Baru",
|
||||
@@ -515,7 +517,7 @@
|
||||
"page.offline.refresh_page": "Coba untuk memuat ulang halaman ini",
|
||||
"page.offline.title": "Mode Luring",
|
||||
"page.read_entry_count": [
|
||||
"%d read entry"
|
||||
"%d entri dibaca"
|
||||
],
|
||||
"page.search.title": "Hasil Pencarian",
|
||||
"page.sessions.table.actions": "Tindakan",
|
||||
@@ -529,30 +531,30 @@
|
||||
"page.settings.title": "Pengaturan",
|
||||
"page.settings.unlink_google_account": "Putuskan akun Google saya",
|
||||
"page.settings.unlink_oidc_account": "Putuskan akun %s saya",
|
||||
"page.settings.webauthn.actions": "Actions",
|
||||
"page.settings.webauthn.added_on": "Added On",
|
||||
"page.settings.webauthn.actions": "Tindakan",
|
||||
"page.settings.webauthn.added_on": "Ditambahkan Pada",
|
||||
"page.settings.webauthn.delete": [
|
||||
"Remove %d passkey"
|
||||
"Hapus %d passkey"
|
||||
],
|
||||
"page.settings.webauthn.last_seen_on": "Last Used",
|
||||
"page.settings.webauthn.passkey_name": "Passkey Name",
|
||||
"page.settings.webauthn.passkeys": "Passkeys",
|
||||
"page.settings.webauthn.register": "Register passkey",
|
||||
"page.settings.webauthn.register.error": "Unable to register passkey",
|
||||
"page.settings.webauthn.last_seen_on": "Terakhir Digunakan",
|
||||
"page.settings.webauthn.passkey_name": "Nama Passkey",
|
||||
"page.settings.webauthn.passkeys": "Passkey",
|
||||
"page.settings.webauthn.register": "Daftar passkey",
|
||||
"page.settings.webauthn.register.error": "Tidak dapat mendaftarkan passkey",
|
||||
"page.shared_entries.title": "Entri yang Dibagikan",
|
||||
"page.shared_entries_count": [
|
||||
"%d shared entry"
|
||||
"%d entri yang dibagikan"
|
||||
],
|
||||
"page.starred.title": "Markah",
|
||||
"page.starred_entry_count": [
|
||||
"%d starred entry"
|
||||
"%d entri dimarkahi"
|
||||
],
|
||||
"page.total_entry_count": [
|
||||
"%d entry in total"
|
||||
"%d entri secara total"
|
||||
],
|
||||
"page.unread.title": "Belum Dibaca",
|
||||
"page.unread_entry_count": [
|
||||
"%d unread entry"
|
||||
"%d entri belum dibaca"
|
||||
],
|
||||
"page.users.actions": "Tindakan",
|
||||
"page.users.admin.no": "Tidak",
|
||||
@@ -562,15 +564,15 @@
|
||||
"page.users.never_logged": "Tidak Pernah",
|
||||
"page.users.title": "Pengguna",
|
||||
"page.users.username": "Nama Pengguna",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"page.webauthn_rename.title": "Ubah Nama Passkey",
|
||||
"pagination.first": "Pertama",
|
||||
"pagination.last": "Terakhir",
|
||||
"pagination.next": "Berikutnya",
|
||||
"pagination.previous": "Sebelumnya",
|
||||
"search.label": "Cari",
|
||||
"search.placeholder": "Cari...",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "Cari",
|
||||
"skip_to_content": "Langsung ke konten",
|
||||
"time_elapsed.days": [
|
||||
"%d hari yang lalu"
|
||||
],
|
||||
@@ -594,4 +596,4 @@
|
||||
"time_elapsed.yesterday": "kemarin",
|
||||
"tooltip.keyboard_shortcuts": "Pintasan Papan Tik: %s",
|
||||
"tooltip.logged_user": "Masuk sebagai %s"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "Aggiorna",
|
||||
"alert.account_linked": "Il tuo account esterno ora è collegato!",
|
||||
"alert.account_unlinked": "Il tuo account esterno ora è scollegato!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "Tutti i feed vengono aggiornati in background. Puoi continuare a usare Miniflux mentre questo processo è in esecuzione.",
|
||||
"alert.feed_error": "Sembra ci sia un problema con questo feed",
|
||||
"alert.no_bookmark": "Nessun preferito disponibile.",
|
||||
"alert.no_category": "Nessuna categoria disponibile.",
|
||||
@@ -27,28 +27,27 @@
|
||||
"alert.no_tag_entry": "Non ci sono voci corrispondenti a questo tag.",
|
||||
"alert.no_unread_entry": "Nessun articolo da leggere.",
|
||||
"alert.no_user": "Tu sei l'unico utente.",
|
||||
"alert.pocket_linked": "Il tuo account Pocket ora è collegato!",
|
||||
"alert.prefs_saved": "Preferenze salvate!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again."
|
||||
"Hai richiesto troppi aggiornamenti dei feed. Attendi %d minuto prima di riprovare.",
|
||||
"Hai richiesto troppi aggiornamenti dei feed. Attendi %d minuti prima di riprovare."
|
||||
],
|
||||
"confirm.loading": "In corso...",
|
||||
"confirm.no": "no",
|
||||
"confirm.question": "Sei sicuro?",
|
||||
"confirm.question.refresh": "Vuoi forzare l'aggiornamento?",
|
||||
"confirm.yes": "sì",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"entry.bookmark.toast.off": "Non speciali",
|
||||
"entry.bookmark.toast.on": "Ha recitato",
|
||||
"enclosure_media_controls.seek": "Sposta:",
|
||||
"enclosure_media_controls.seek.title": "Sposta di %s secondi",
|
||||
"enclosure_media_controls.speed": "Velocità:",
|
||||
"enclosure_media_controls.speed.faster": "Più veloce",
|
||||
"enclosure_media_controls.speed.faster.title": "Più veloce di %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reimposta",
|
||||
"enclosure_media_controls.speed.reset.title": "Reimposta velocità a 1x",
|
||||
"enclosure_media_controls.speed.slower": "Più lento",
|
||||
"enclosure_media_controls.speed.slower.title": "Più lento di %sx",
|
||||
"entry.bookmark.toast.off": "Non preferito",
|
||||
"entry.bookmark.toast.on": "Preferito",
|
||||
"entry.bookmark.toggle.off": "Rimuovi dai preferiti",
|
||||
"entry.bookmark.toggle.on": "Aggiungi ai preferiti",
|
||||
"entry.comments.label": "Commenti",
|
||||
@@ -77,35 +76,39 @@
|
||||
"entry.status.toast.read": "Contrassegnato come letto",
|
||||
"entry.status.toast.unread": "Contrassegnato come non letto",
|
||||
"entry.tags.label": "Tag:",
|
||||
"entry.unshare.label": "Unshare",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Mostra %d altro tag",
|
||||
"Mostra %d altri tag"
|
||||
],
|
||||
"entry.unshare.label": "Rimuovi condivisione",
|
||||
"error.api_key_already_exists": "Questa chiave API esiste già.",
|
||||
"error.bad_credentials": "Nome utente o password non validi.",
|
||||
"error.category_already_exists": "Questa categoria esiste già.",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "Questa categoria non esiste o non appartiene a questo utente.",
|
||||
"error.database_error": "Errore del database: %v.",
|
||||
"error.different_passwords": "Le password non coincidono.",
|
||||
"error.duplicate_fever_username": "Esiste già un account Fever con lo stesso nome utente!",
|
||||
"error.duplicate_googlereader_username": "Esiste già un account Google Reader con lo stesso nome utente!",
|
||||
"error.duplicate_linked_account": "Esiste già un account configurato per questo servizio!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicated_feed": "Questo feed esiste già.",
|
||||
"error.empty_file": "Questo file è vuoto.",
|
||||
"error.entries_per_page_invalid": "Il numero di articoli per pagina non è valido.",
|
||||
"error.feed_already_exists": "Questo feed esiste già.",
|
||||
"error.feed_category_not_found": "Questa categoria non esiste o non appartiene a questo utente.",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "Impossibile rilevare il formato del feed: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "La regola dell'elenco di blocco non è valida.",
|
||||
"error.feed_invalid_keeplist_rule": "La regola dell'elenco di conservazione non è valida.",
|
||||
"error.feed_mandatory_fields": "L'URL e la categoria sono obbligatori.",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "Questo feed non esiste o non appartiene a questo utente.",
|
||||
"error.feed_title_not_empty": "Il titolo del feed non può essere vuoto.",
|
||||
"error.feed_url_not_empty": "L'URL del feed non può essere vuoto.",
|
||||
"error.fields_mandatory": "Tutti i campi sono obbligatori.",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_bad_gateway": "Il sito web non è disponibile al momento a causa di un errore di gateway. Il problema non è dal lato di Miniflux. Per favore, riprova più tardi.",
|
||||
"error.http_body_read": "Impossibile leggere il corpo HTTP: %v.",
|
||||
"error.http_client_error": "Errore del client HTTP: %v.",
|
||||
"error.http_empty_response": "La risposta HTTP è vuota. Forse questo sito web utilizza un meccanismo di protezione dai bot?",
|
||||
"error.http_empty_response_body": "Il corpo della risposta HTTP è vuoto.",
|
||||
"error.http_forbidden": "L'accesso a questo sito web è vietato. Forse questo sito web ha un meccanismo di protezione dai bot?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
@@ -119,19 +122,17 @@
|
||||
"error.invalid_display_mode": "Modalità di visualizzazione web app non valida.",
|
||||
"error.invalid_entry_direction": "Ordinamento non valido.",
|
||||
"error.invalid_entry_order": "L'ordinamento delle voci non è valido.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "URL del proxy non valido.",
|
||||
"error.invalid_feed_url": "URL del feed non valido.",
|
||||
"error.invalid_gesture_nav": "Navigazione gestuale non valida.",
|
||||
"error.invalid_language": "Lingua non valida.",
|
||||
"error.invalid_site_url": "URL del sito non valido.",
|
||||
"error.invalid_theme": "Tema non valido.",
|
||||
"error.invalid_timezone": "Fuso orario non valido.",
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.network_operation": "Miniflux non riesce a raggiungere questo sito web a causa di un errore di rete: %v.",
|
||||
"error.network_timeout": "Questo sito web è troppo lento e la richiesta è scaduta: %v",
|
||||
"error.password_min_length": "La password deve contenere almeno 6 caratteri.",
|
||||
"error.pocket_access_token": "Non sono riuscito ad ottenere l'access token da Pocket!",
|
||||
"error.pocket_request_token": "Non sono riuscito ad ottenere il request token da Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "L'URL del proxy non può essere vuoto.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
|
||||
@@ -151,8 +152,8 @@
|
||||
"error.unable_to_create_api_key": "Impossibile creare questa chiave API.",
|
||||
"error.unable_to_create_category": "Non sono riuscito ad aggiungere questa categoria.",
|
||||
"error.unable_to_create_user": "Non sono riuscito ad aggiungere questo user.",
|
||||
"error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Unable to parse this feed: %v.",
|
||||
"error.unable_to_detect_rssbridge": "Impossibile rilevare il feed usando RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Impossibile analizzare questo feed: %v.",
|
||||
"error.unable_to_update_category": "Non sono riuscito ad aggiornare questa categoria.",
|
||||
"error.unable_to_update_feed": "Non sono riuscito ad aggiornare questo feed.",
|
||||
"error.unable_to_update_user": "Non sono riuscito ad aggiornare questo utente.",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.label.allow_self_signed_certificates": "Consenti certificati autofirmati o non validi",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Regole di blocco",
|
||||
"form.feed.label.block_filter_entry_rules": "Regole di Blocco delle Voci",
|
||||
"form.feed.label.blocklist_rules": "Filtri di Blocco Basati su Regex",
|
||||
"form.feed.label.category": "Categoria",
|
||||
"form.feed.label.cookie": "Installare i cookies",
|
||||
"form.feed.label.crawler": "Scarica il contenuto integrale",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Usa il proxy configurato a livello di applicazione",
|
||||
"form.feed.label.hide_globally": "Nascondere le voci nella lista globale dei non letti",
|
||||
"form.feed.label.ignore_http_cache": "Ignora cache HTTP",
|
||||
"form.feed.label.keeplist_rules": "Regole di autorizzazione",
|
||||
"form.feed.label.keep_filter_entry_rules": "Regole di Permesso delle Voci",
|
||||
"form.feed.label.keeplist_rules": "Filtri di Mantenimento Basati su Regex",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
@@ -199,7 +202,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Regole di impaginazione del contenuto",
|
||||
"form.feed.label.rewrite_rules": "Regole di Riscrittura del Contenuto",
|
||||
"form.feed.label.scraper_rules": "Regole di estrazione del contenuto",
|
||||
"form.feed.label.site_url": "URL del sito",
|
||||
"form.feed.label.title": "Titolo",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Salva gli articoli su Instapaper",
|
||||
"form.integration.instapaper_password": "Password dell'account Instapaper",
|
||||
"form.integration.instapaper_username": "Nome utente dell'account Instapaper",
|
||||
"form.integration.karakeep_activate": "Salva gli articoli su Karakeep",
|
||||
"form.integration.karakeep_api_key": "API key dell'account Karakeep",
|
||||
"form.integration.karakeep_url": "Endpoint dell'API di Karakeep",
|
||||
"form.integration.linkace_activate": "Salva gli articoli su LinkAce",
|
||||
"form.integration.linkace_api_key": "API key dell'account LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Disabilita i controlli",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Segna i preferiti come non letti",
|
||||
"form.integration.pinboard_tags": "Tag di Pinboard",
|
||||
"form.integration.pinboard_token": "Token dell'API di Pinboard",
|
||||
"form.integration.pocket_access_token": "Access token dell'account Pocket",
|
||||
"form.integration.pocket_activate": "Salva gli articoli su Pocket",
|
||||
"form.integration.pocket_connect_link": "Collega il tuo account Pocket",
|
||||
"form.integration.pocket_consumer_key": "Consumer key dell'account Pocket",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -328,6 +330,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.categories_sorting_order": "Ordinamento delle categorie",
|
||||
"form.prefs.label.cjk_reading_speed": "Velocità di lettura per cinese, coreano e giapponese (caratteri al minuto)",
|
||||
"form.prefs.label.custom_css": "CSS personalizzati",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Contrassegna automaticamente le voci come lette quando visualizzate",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "Velocità di riproduzione dell'audio/video",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Apri i link esterni in una nuova scheda (aggiunge target=\"_blank\" ai link)",
|
||||
"form.prefs.label.show_reading_time": "Mostra il tempo di lettura stimato per gli articoli",
|
||||
"form.prefs.label.theme": "Tema",
|
||||
"form.prefs.label.timezone": "Fuso orario",
|
||||
@@ -574,14 +577,14 @@
|
||||
"page.users.title": "Utenti",
|
||||
"page.users.username": "Nome utente",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"pagination.first": "Primo",
|
||||
"pagination.last": "Ultimo",
|
||||
"pagination.next": "Successivo",
|
||||
"pagination.previous": "Precedente",
|
||||
"search.label": "Cerca",
|
||||
"search.placeholder": "Cerca...",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "Cerca",
|
||||
"skip_to_content": "Salta al contenuto",
|
||||
"time_elapsed.days": [
|
||||
"%d giorno fa",
|
||||
"%d giorni fa"
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "ieri",
|
||||
"tooltip.keyboard_shortcuts": "Scorciatoia da tastiera: %s",
|
||||
"tooltip.logged_user": "Autenticato come %s"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "更新",
|
||||
"alert.account_linked": "外部アカウントとリンクされました!",
|
||||
"alert.account_unlinked": "外部アカウントとのリンクが解除されました!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "すべてのフィードがバックグラウンドで更新されています。この処理中も Miniflux を使い続けることができます。",
|
||||
"alert.feed_error": "このフィードには問題があります。",
|
||||
"alert.no_bookmark": "現在星付きはありません。",
|
||||
"alert.no_category": "カテゴリが存在しません。",
|
||||
@@ -27,25 +27,24 @@
|
||||
"alert.no_tag_entry": "このタグに一致するエントリーはありません。",
|
||||
"alert.no_unread_entry": "未読の記事はありません。",
|
||||
"alert.no_user": "あなたが唯一のユーザーです。",
|
||||
"alert.pocket_linked": "Pocket アカウントとリンクされました!",
|
||||
"alert.prefs_saved": "設定情報は保存されました!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again."
|
||||
"フィードの更新を要求しすぎました。%d 分後に再度お試しください。"
|
||||
],
|
||||
"confirm.loading": "実行中…",
|
||||
"confirm.no": "いいえ",
|
||||
"confirm.question": "よろしいですか?",
|
||||
"confirm.question.refresh": "強制的に更新しますか?",
|
||||
"confirm.yes": "はい",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "シーク:",
|
||||
"enclosure_media_controls.seek.title": "%s 秒シーク",
|
||||
"enclosure_media_controls.speed": "速度:",
|
||||
"enclosure_media_controls.speed.faster": "速く",
|
||||
"enclosure_media_controls.speed.faster.title": "%sx 速く",
|
||||
"enclosure_media_controls.speed.reset": "リセット",
|
||||
"enclosure_media_controls.speed.reset.title": "速度を1xにリセット",
|
||||
"enclosure_media_controls.speed.slower": "遅く",
|
||||
"enclosure_media_controls.speed.slower.title": "%sx 遅く",
|
||||
"entry.bookmark.toast.off": "星を外しました",
|
||||
"entry.bookmark.toast.on": "星を付けました",
|
||||
"entry.bookmark.toggle.off": "星を外す",
|
||||
@@ -75,35 +74,38 @@
|
||||
"entry.status.toast.read": "既読にしました",
|
||||
"entry.status.toast.unread": "未読にしました",
|
||||
"entry.tags.label": "タグ:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"%d 個のタグ"
|
||||
],
|
||||
"entry.unshare.label": "共有を解除",
|
||||
"error.api_key_already_exists": "この API キーは既に存在します。",
|
||||
"error.bad_credentials": "ユーザー名かパスワードが間違っています。",
|
||||
"error.category_already_exists": "このカテゴリは既に存在します。",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "このカテゴリは存在しないか、このユーザーに属していません。",
|
||||
"error.database_error": "データベースエラー: %v。",
|
||||
"error.different_passwords": "パスワードが一致しません。",
|
||||
"error.duplicate_fever_username": "既に同じ名前の Fever ユーザー名が使われています!",
|
||||
"error.duplicate_googlereader_username": "既に同じ名前の Google Reader ユーザー名が使われています!",
|
||||
"error.duplicate_linked_account": "別なユーザーが既にこのサービスの同じユーザーとリンクしています。",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicated_feed": "このフィードは既に存在します。",
|
||||
"error.empty_file": "このファイルは空です。",
|
||||
"error.entries_per_page_invalid": "ページあたりの記事数が無効です。",
|
||||
"error.feed_already_exists": "このフィードは既に存在します。",
|
||||
"error.feed_category_not_found": "このカテゴリは存在しないか、このユーザーに属していません。",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "フィードの形式を検出できません: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "ブロックリストルールが無効です。",
|
||||
"error.feed_invalid_keeplist_rule": "リストの保持ルールが無効です。",
|
||||
"error.feed_mandatory_fields": "URL と カテゴリが必要です。",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "このフィードは存在しないか、このユーザーに属していません。",
|
||||
"error.feed_title_not_empty": "フィードのタイトルを空にすることはできません。",
|
||||
"error.feed_url_not_empty": "フィード URL を空にすることはできません。",
|
||||
"error.fields_mandatory": "すべての項目が必要です。",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_bad_gateway": "ウェブサイトは、不正なゲートウェイエラーのため現在利用できません。問題はMiniflux側にはありません。後でもう一度お試しください。",
|
||||
"error.http_body_read": "HTTP本文を読み取れません: %v。",
|
||||
"error.http_client_error": "HTTPクライアントエラー: %v。",
|
||||
"error.http_empty_response": "HTTP応答が空です。おそらく、このウェブサイトはボット保護メカニズムを使用していますか?",
|
||||
"error.http_empty_response_body": "HTTP応答本文が空です。",
|
||||
"error.http_forbidden": "このウェブサイトへのアクセスは禁止されています。おそらく、このウェブサイトはボット保護メカニズムを持っていますか?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
@@ -117,19 +119,17 @@
|
||||
"error.invalid_display_mode": "Web アプリの表示モードが無効です。",
|
||||
"error.invalid_entry_direction": "記事の表示順が無効です。",
|
||||
"error.invalid_entry_order": "記事の表示順が無効です。",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "プロキシURLが無効です。",
|
||||
"error.invalid_feed_url": "フィード URL が無効です。",
|
||||
"error.invalid_gesture_nav": "ジェスチャー ナビゲーションが無効です。",
|
||||
"error.invalid_language": "言語が無効です。",
|
||||
"error.invalid_site_url": "サイト URL が無効です。",
|
||||
"error.invalid_theme": "テーマが無効です。",
|
||||
"error.invalid_timezone": "タイムゾーンが無効です。",
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.network_operation": "Miniflux はネットワークエラーのためこのウェブサイトに到達できません: %v.",
|
||||
"error.network_timeout": "このウェブサイトは応答が遅すぎるためタイムアウトしました: %v",
|
||||
"error.password_min_length": "パスワードは6文字以上である必要があります。",
|
||||
"error.pocket_access_token": "Pocket の access token が取得できません!",
|
||||
"error.pocket_request_token": "Pocket の request token が取得できません!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "プロキシURLを空にすることはできません。",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
|
||||
@@ -149,8 +149,8 @@
|
||||
"error.unable_to_create_api_key": "この API キーを作成できません。",
|
||||
"error.unable_to_create_category": "このカテゴリは作成できません。",
|
||||
"error.unable_to_create_user": "このユーザーは作成できません。",
|
||||
"error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
|
||||
"error.unable_to_parse_feed": "Unable to parse this feed: %v.",
|
||||
"error.unable_to_detect_rssbridge": "RSS-Bridge を使ってフィードを検出できません: %v.",
|
||||
"error.unable_to_parse_feed": "このフィードを解析できません: %v.",
|
||||
"error.unable_to_update_category": "このカテゴリは更新できません。",
|
||||
"error.unable_to_update_feed": "このフィードは更新できません。",
|
||||
"error.unable_to_update_user": "このユーザーは更新できません。",
|
||||
@@ -166,7 +166,8 @@
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.label.allow_self_signed_certificates": "自己署名証明書または無効な証明書を許可する",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Block ルール",
|
||||
"form.feed.label.block_filter_entry_rules": "エントリブロッキングルール",
|
||||
"form.feed.label.blocklist_rules": "正規表現ベースのブロッキングフィルター",
|
||||
"form.feed.label.category": "カテゴリ",
|
||||
"form.feed.label.cookie": "Cookie の設定",
|
||||
"form.feed.label.crawler": "オリジナルの内容を取得",
|
||||
@@ -179,7 +180,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "アプリケーションレベルで設定されたプロキシを使用する",
|
||||
"form.feed.label.hide_globally": "未読一覧に記事を表示しない",
|
||||
"form.feed.label.ignore_http_cache": "HTTPキャッシュを無視",
|
||||
"form.feed.label.keeplist_rules": "Keep ルール",
|
||||
"form.feed.label.keep_filter_entry_rules": "エントリ許可ルール",
|
||||
"form.feed.label.keeplist_rules": "正規表現ベースのキープフィルター",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
@@ -197,7 +199,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Rewrite ルール",
|
||||
"form.feed.label.rewrite_rules": "コンテンツ書き換えルール",
|
||||
"form.feed.label.scraper_rules": "Scraper ルール",
|
||||
"form.feed.label.site_url": "サイト URL",
|
||||
"form.feed.label.title": "タイトル",
|
||||
@@ -231,6 +233,9 @@
|
||||
"form.integration.instapaper_activate": "Instapaper に記事を保存する",
|
||||
"form.integration.instapaper_password": "Instapaper のパスワード",
|
||||
"form.integration.instapaper_username": "Instapaper のユーザー名",
|
||||
"form.integration.karakeep_activate": "Karakeep に記事を保存する",
|
||||
"form.integration.karakeep_api_key": "Karakeep の API key",
|
||||
"form.integration.karakeep_url": "Karakeep の API Endpoint",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
@@ -271,10 +276,6 @@
|
||||
"form.integration.pinboard_bookmark": "ブックマークを未読にする",
|
||||
"form.integration.pinboard_tags": "Pinboard の Tag",
|
||||
"form.integration.pinboard_token": "Pinboard の API Token",
|
||||
"form.integration.pocket_access_token": "Pocket の Access Token",
|
||||
"form.integration.pocket_activate": "Pocket に記事を保存する",
|
||||
"form.integration.pocket_connect_link": "Pocket account に接続",
|
||||
"form.integration.pocket_consumer_key": "Pocket の Consumer Key",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -326,6 +327,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.categories_sorting_order": "カテゴリの表示順",
|
||||
"form.prefs.label.cjk_reading_speed": "中国語、韓国語、日本語の読書速度(文字数/分)",
|
||||
"form.prefs.label.custom_css": "カスタム CSS",
|
||||
@@ -346,7 +348,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "表示時にエントリを自動的に既読としてマークします",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "オーディオ/ビデオの再生速度",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "外部リンクを新しいタブで開く(リンクに target=\"_blank\" を追加)",
|
||||
"form.prefs.label.show_reading_time": "記事の推定読書時間を表示する",
|
||||
"form.prefs.label.theme": "テーマ",
|
||||
"form.prefs.label.timezone": "タイムゾーン",
|
||||
@@ -435,7 +437,7 @@
|
||||
"page.categories.no_feed": "フィードはありません。",
|
||||
"page.categories.title": "カテゴリ",
|
||||
"page.categories_count": [
|
||||
"%d category"
|
||||
"%d 件のカテゴリ"
|
||||
],
|
||||
"page.category_label": "Category: %s",
|
||||
"page.edit_category.title": "カテゴリを編集: %s",
|
||||
@@ -515,7 +517,7 @@
|
||||
"page.offline.refresh_page": "ページを更新してみてください",
|
||||
"page.offline.title": "オフラインモード",
|
||||
"page.read_entry_count": [
|
||||
"%d read entry"
|
||||
"%d 件の既読エントリ"
|
||||
],
|
||||
"page.search.title": "検索結果",
|
||||
"page.sessions.table.actions": "アクション",
|
||||
@@ -541,18 +543,18 @@
|
||||
"page.settings.webauthn.register.error": "パスキーを登録できません",
|
||||
"page.shared_entries.title": "共有エントリ",
|
||||
"page.shared_entries_count": [
|
||||
"%d shared entry"
|
||||
"%d 件の共有エントリ"
|
||||
],
|
||||
"page.starred.title": "星付き",
|
||||
"page.starred_entry_count": [
|
||||
"%d starred entry"
|
||||
"%d 件の星付きエントリ"
|
||||
],
|
||||
"page.total_entry_count": [
|
||||
"%d entry in total"
|
||||
"合計 %d 件のエントリ"
|
||||
],
|
||||
"page.unread.title": "未読",
|
||||
"page.unread_entry_count": [
|
||||
"%d unread entry"
|
||||
"%d 件の未読エントリ"
|
||||
],
|
||||
"page.users.actions": "アクション",
|
||||
"page.users.admin.no": "非管理者",
|
||||
@@ -563,14 +565,14 @@
|
||||
"page.users.title": "ユーザー一覧",
|
||||
"page.users.username": "ユーザー名",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"pagination.first": "最初",
|
||||
"pagination.last": "最後",
|
||||
"pagination.next": "次",
|
||||
"pagination.previous": "前",
|
||||
"search.label": "検索",
|
||||
"search.placeholder": "…を検索",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "検索",
|
||||
"skip_to_content": "コンテンツへスキップ",
|
||||
"time_elapsed.days": [
|
||||
"%d 日前"
|
||||
],
|
||||
@@ -594,4 +596,4 @@
|
||||
"time_elapsed.yesterday": "昨日",
|
||||
"tooltip.keyboard_shortcuts": "キーボードショートカット: %s",
|
||||
"tooltip.logged_user": "%s としてログイン中"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Bô kah chit ê khan-á ū hû-ha̍p ê siau-sit",
|
||||
"alert.no_unread_entry": "Chit-má ah-bô tha̍k kè ê siau-sit",
|
||||
"alert.no_user": "Lí sī ûi-it ê sú-iōng-lâng",
|
||||
"alert.pocket_linked": "Í-keng kā lí ê Pocket kháu-chō kiat chòe-hé--ah!",
|
||||
"alert.prefs_saved": "Siat-tēng í-keng pó-chûn--ah!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Lí í-keng ín-khí siuⁿ chōe pái siau-sit lâi-goân ōaⁿ-sin, chhiáⁿ tán-hāu %d hun-cheng āu koh chhì-khòaⁿ-māi."
|
||||
@@ -37,8 +36,8 @@
|
||||
"confirm.question": "Kám ū khak-tēng?",
|
||||
"confirm.question.refresh": "Kám beh kiông-chè têng lia̍h?",
|
||||
"confirm.yes": "Sī",
|
||||
"enclosure_media_controls.seek": "sóa-ūi:",
|
||||
"enclosure_media_controls.seek.title": "sóa %s bió",
|
||||
"enclosure_media_controls.seek": "Sóa-ūi:",
|
||||
"enclosure_media_controls.seek.title": "Sóa %s bió",
|
||||
"enclosure_media_controls.speed": "Sok-tō͘",
|
||||
"enclosure_media_controls.speed.faster": "Cheng-ka sok-tō͘",
|
||||
"enclosure_media_controls.speed.faster.title": "Cheng-ka sok-tō͘ %sx",
|
||||
@@ -75,6 +74,9 @@
|
||||
"entry.status.toast.read": "Chù chòe tha̍k kè chòe soah",
|
||||
"entry.status.toast.unread": "Chù chòe ah-bōe tha̍k chòe soah",
|
||||
"entry.tags.label": "Khan-á:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Kah %d khan-á"
|
||||
],
|
||||
"entry.unshare.label": "Chhú-siau hun-hióng",
|
||||
"error.api_key_already_exists": "Chit ê API só-sî í-keng chûn-chāi",
|
||||
"error.bad_credentials": "M̄-tio̍h ê kháu-chō miâ ah-sī bi̍t-bé.",
|
||||
@@ -117,7 +119,7 @@
|
||||
"error.invalid_display_mode": "Ū būn-tôe ê su-li̍p bô͘-sek.",
|
||||
"error.invalid_entry_direction": "Ū būn-tôe ê su-li̍p hong-hiòng.",
|
||||
"error.invalid_entry_order": "Siau-sit ê chōe pái bô-hāu, chhiáⁿ tán-hāu %d hun-cheng āu koh chhì-khòaⁿ-māi.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "Proxy URL ū būn-tôe.",
|
||||
"error.invalid_feed_url": "Beh tēng ê siau-sit lâi-goân ê bāng-chí ū būn-tôe.",
|
||||
"error.invalid_gesture_nav": "Chhiú-sè tō-lám ū būn-tôe.",
|
||||
"error.invalid_language": "Ū būn-tôe ê gú-giân.",
|
||||
@@ -127,9 +129,7 @@
|
||||
"error.network_operation": "Miniflux bô-hoat-tō͘ liân kàu chit ê bāng-chām, ū khó-lêng sī bāng-lō͘ būn-tôe: %v.",
|
||||
"error.network_timeout": "Chit ê bāng-chām ê hôe-èng siuⁿ bān, chhéng-kiû chhiau-kè sî-kan: %v.",
|
||||
"error.password_min_length": "Chhiáⁿ chì-chió ài su-li̍p la̍k ê lī goân.",
|
||||
"error.pocket_access_token": "Bô-hoat-tō͘ ùi Pocket thê tio̍h access token",
|
||||
"error.pocket_request_token": "Bô-hoat-tō͘ ùi Pocket thê tio̍h request token",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "Proxy URL bōe-sái sī khang--ê.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Bô-hāu ê hong-só kui-chek: kui-chek #%d khiàm ū-hāu ê lân-ūi miâ (e-sai ê soán-hāng: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Bô-hāu ê hong-só kui-chek: kui-chek #%d ê bô͘-sek m̄ sī ha̍p-hoat ê chiàⁿ-kui piáu-ta̍t sek",
|
||||
"error.settings_block_rule_regex_required": "Bô-hāu ê hong-só kui-chek: kui-chek #%d bô thê-kiong chiàⁿ-kui piáu-ta̍t sek",
|
||||
@@ -166,7 +166,8 @@
|
||||
"form.feed.fieldset.rules": "Kui-chek",
|
||||
"form.feed.label.allow_self_signed_certificates": "ún-chún chū chhiam ah-sī bô-hāu ê pîn-chèng",
|
||||
"form.feed.label.apprise_service_urls": "Sú-iōng tō͘-tiám keh khui ê Apprise ho̍k-bū bāng-chí lia̍t-pió",
|
||||
"form.feed.label.blocklist_rules": "Hong-só kui-chek",
|
||||
"form.feed.label.block_filter_entry_rules": "Entry Blocking Rules",
|
||||
"form.feed.label.blocklist_rules": "Regex-Based Blocking Filters",
|
||||
"form.feed.label.category": "lūi-pia̍t",
|
||||
"form.feed.label.cookie": "Siat-tēng Cookies",
|
||||
"form.feed.label.crawler": "Lia̍h goân-tóe lōe-iông",
|
||||
@@ -179,7 +180,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Iōng tī su-hāu-khì siat-tēng ê proxy",
|
||||
"form.feed.label.hide_globally": "Tī choân-he̍k ah-bōe tha̍k--ê lia̍t-pió am-khàm siau-sit",
|
||||
"form.feed.label.ignore_http_cache": "Pàng-ba̍k HTTP cache",
|
||||
"form.feed.label.keeplist_rules": "Pó-liû kui-chek",
|
||||
"form.feed.label.keep_filter_entry_rules": "Entry Allow Rules",
|
||||
"form.feed.label.keeplist_rules": "Regex-Based Keep Filters",
|
||||
"form.feed.label.no_media_player": "Bô mûi-thé hòng-sàng khì (im-sìn, sī-sìn)",
|
||||
"form.feed.label.ntfy_activate": "Thui-sàng siau-sit khì ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy ū-siat iu-sian sūn-sū",
|
||||
@@ -190,14 +192,14 @@
|
||||
"form.feed.label.ntfy_priority": "Ntfy iu-sian sūn-sū",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (soán thiⁿ)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to Pushover",
|
||||
"form.feed.label.pushover_default_priority": "Default priority",
|
||||
"form.feed.label.pushover_high_priority": "High priority",
|
||||
"form.feed.label.pushover_low_priority": "Low priority",
|
||||
"form.feed.label.pushover_max_priority": "Max priority",
|
||||
"form.feed.label.pushover_min_priority": "Minimal priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Têng siá kui-chek",
|
||||
"form.feed.label.pushover_activate": "Pó-chûn siau-sit kàu pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover ū-siat iu-sian sūn-sū",
|
||||
"form.feed.label.pushover_high_priority": "Pushover koân iu-sian sūn-sū",
|
||||
"form.feed.label.pushover_low_priority": "Pushover kē iu-sian sūn-sū",
|
||||
"form.feed.label.pushover_max_priority": "Pushover siōng koân iu-sian sūn-sū",
|
||||
"form.feed.label.pushover_min_priority": "Pushover siōng kē iu-sian sūn-sū",
|
||||
"form.feed.label.pushover_priority": "Pushover siau-sit iu-sian sūn-sū",
|
||||
"form.feed.label.rewrite_rules": "Content Rewrite Rules",
|
||||
"form.feed.label.scraper_rules": "Lia̍h ê kui-chek",
|
||||
"form.feed.label.site_url": "Bāng-chām bāng-chí",
|
||||
"form.feed.label.title": "Piau-tôe",
|
||||
@@ -231,6 +233,9 @@
|
||||
"form.integration.instapaper_activate": "Pó-chûn siau-sit kàu Instapaper",
|
||||
"form.integration.instapaper_password": "Instapaper bi̍t-bé",
|
||||
"form.integration.instapaper_username": "Instapaper Kháu-chō miâ",
|
||||
"form.integration.karakeep_activate": "Pó-chûn siau-sit kàu Karakeep",
|
||||
"form.integration.karakeep_api_key": "Karakeep API só-sî",
|
||||
"form.integration.karakeep_url": "Karakeep API thâu",
|
||||
"form.integration.linkace_activate": "Pó-chûn siau-sit kàu LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API só-sî",
|
||||
"form.integration.linkace_check_disabled": "Thêng iōng liân-kiat kiám-cha",
|
||||
@@ -271,15 +276,11 @@
|
||||
"form.integration.pinboard_bookmark": "Chù chòe ah-bōe tha̍k",
|
||||
"form.integration.pinboard_tags": "Pinboard khan-á",
|
||||
"form.integration.pinboard_token": "Pinboard API Token",
|
||||
"form.integration.pocket_access_token": "Pocket token",
|
||||
"form.integration.pocket_activate": "Pó-chûn siau-sit kàu Pocket",
|
||||
"form.integration.pocket_connect_link": "Kah Pocket kháu-chō kiat chòe-hé",
|
||||
"form.integration.pocket_consumer_key": "Pocket sú-iōng-lâng só-sî",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
"form.integration.pushover_token": "Pushover application API token",
|
||||
"form.integration.pushover_user": "Pushover user key",
|
||||
"form.integration.pushover_activate": "Pó-chûn siau-sit kàu Pushover",
|
||||
"form.integration.pushover_device": "Pushover ki-hì (soán thiⁿ)",
|
||||
"form.integration.pushover_prefix": "Pushover URL tó͘-bí (soán thiⁿ)",
|
||||
"form.integration.pushover_token": "Pushover application API só-sî",
|
||||
"form.integration.pushover_user": "Pushover sú-iōng-lâng só-sî",
|
||||
"form.integration.raindrop_activate": "Pó-chûn siau-sit kàu Raindrop",
|
||||
"form.integration.raindrop_collection_id": "Collection ID",
|
||||
"form.integration.raindrop_tags": "khan-á (iōng tō͘-tiám keh khui)",
|
||||
@@ -326,6 +327,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Choân-he̍k siau-sit lâi-goân siat-tēng",
|
||||
"form.prefs.fieldset.reader_settings": "Ia̍t-tha̍k khì siat-tēng",
|
||||
"form.prefs.help.external_font_hosts": "Iōng khang-keh keh khui ún-chún ê gōa-pō͘ lī-hêng lâi-goân. Phì-lû \"fonts.gstatic.com fonts.googleapis.com\"",
|
||||
"form.prefs.label.always_open_external_links": "Chhiau-chhē bûn-chiong sī iōng gōa-pō͘ liân-kiat phah khui",
|
||||
"form.prefs.label.categories_sorting_order": "Lūi-pia̍t hián-sī sūn-sū",
|
||||
"form.prefs.label.cjk_reading_speed": "Tiong-bûn, Hân-bûn, Li̍t-bûn tha̍k ê sok-tō͘ (múi hun-cheng ē-sái tha̍k kúi ê lī-goân)",
|
||||
"form.prefs.label.custom_css": "Chū tēng ê CSS",
|
||||
@@ -346,15 +348,15 @@
|
||||
"form.prefs.label.mark_read_on_view": "Phah khui ê sî-chūn sūn-sòa kā siau-sit chù chòe tha̍k kè",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Phah khui ê sî-chūn sūn-sòa kā siau-sit chù chòe tha̍k kè, m̄-koh nā-sī im-sìn, sī-sìn tio̍h tī hòng-sàng kàu 90%% ê si-chun chiah lâi chù",
|
||||
"form.prefs.label.media_playback_rate": "Im-sìn, sī-sìn pàng ê sok-tō͘",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Chhiau-chhē gōa-pō͘ liân-kiat sī tī sin ê ia̍h phah khui (kā liân-kiat chhē target=\"_blank\")",
|
||||
"form.prefs.label.show_reading_time": "Hián-sī siau-sit àn-sǹg ài gōa-kú lâi tha̍k",
|
||||
"form.prefs.label.theme": "Chú-tôe",
|
||||
"form.prefs.label.timezone": "Sî-khu",
|
||||
"form.prefs.select.alphabetical": "Chiàu lī-bú pâi",
|
||||
"form.prefs.select.browser": "Tī iû-lám khì phah khui",
|
||||
"form.prefs.select.browser": "Iû-lâm-khì",
|
||||
"form.prefs.select.created_time": "Siau-sit kiàn-li̍p sî-kan",
|
||||
"form.prefs.select.fullscreen": "Choân êng-bō͘",
|
||||
"form.prefs.select.minimal_ui": "Siōng iông-chhun--ê",
|
||||
"form.prefs.select.minimal_ui": "Siōng sió UI",
|
||||
"form.prefs.select.none": "Bô",
|
||||
"form.prefs.select.older_first": "Ùi kū--ê khai-sí pâi",
|
||||
"form.prefs.select.publish_time": "Siau-sit hoat-pò͘ sî-kan",
|
||||
@@ -406,7 +408,7 @@
|
||||
"page.about.author": "Chok-chiá: ",
|
||||
"page.about.build_date": "Kiàn-tì li̍t-kî:",
|
||||
"page.about.credits": "Pán-koân",
|
||||
"page.about.db_usage": "Database size:",
|
||||
"page.about.db_usage": "Database chhài-chhiú:",
|
||||
"page.about.git_commit": "Git Commit:",
|
||||
"page.about.global_config_options": "Choân-he̍k siat-tēng soán-hāng",
|
||||
"page.about.go_version": "Go pán-pún:",
|
||||
@@ -570,7 +572,7 @@
|
||||
"search.label": "Chhiau-chhē",
|
||||
"search.placeholder": "Chhiau-chhē...",
|
||||
"search.submit": "Chhiau-chhē",
|
||||
"skip_to_content": "Sóa kah chú-iàu ê lōe-iông",
|
||||
"skip_to_content": "Thiaⁿ--khì chhòng-bûn",
|
||||
"time_elapsed.days": [
|
||||
"%d kang chêng"
|
||||
],
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"action.cancel": "annuleren",
|
||||
"action.download": "Download",
|
||||
"action.download": "Downloaden",
|
||||
"action.edit": "Bewerken",
|
||||
"action.home_screen": "Toevoegen aan startscherm",
|
||||
"action.import": "Importeren",
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Er zijn geen artikelen die overeenkomen met deze tag.",
|
||||
"alert.no_unread_entry": "Er zijn geen ongelezen artikelen.",
|
||||
"alert.no_user": "Je bent de enige gebruiker.",
|
||||
"alert.pocket_linked": "Jouw Pocket-account is nu gekoppeld!",
|
||||
"alert.prefs_saved": "Instellingen opgeslagen!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Je hebt te veel feed-vernieuwingen getriggered. Wacht aub %d minuut voor opnieuw proberen.",
|
||||
@@ -43,7 +42,7 @@
|
||||
"enclosure_media_controls.speed": "Snelheid:",
|
||||
"enclosure_media_controls.speed.faster": "Versnel",
|
||||
"enclosure_media_controls.speed.faster.title": "Versnel met %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset": "Resetten",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset snelheid naar 1x",
|
||||
"enclosure_media_controls.speed.slower": "Vertraag",
|
||||
"enclosure_media_controls.speed.slower.title": "Vertraag met %sx",
|
||||
@@ -77,6 +76,10 @@
|
||||
"entry.status.toast.read": "Gemarkeerd als gelezen",
|
||||
"entry.status.toast.unread": "Gemarkeerd als ongelezen",
|
||||
"entry.tags.label": "Tags:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Toon %d extra tag",
|
||||
"Toon %d extra tags"
|
||||
],
|
||||
"entry.unshare.label": "Delen ongedaan maken",
|
||||
"error.api_key_already_exists": "Deze API-sleutel bestaat al.",
|
||||
"error.bad_credentials": "Onjuiste gebruikersnaam of wachtwoord.",
|
||||
@@ -119,7 +122,7 @@
|
||||
"error.invalid_display_mode": "Ongeldige weergavemodus voor de webapp.",
|
||||
"error.invalid_entry_direction": "Ongeldige sorteervolgorde.",
|
||||
"error.invalid_entry_order": "Ongeldige volgorde van artikelen.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "Ongeldige proxy-URL.",
|
||||
"error.invalid_feed_url": "Ongeldige feed URL.",
|
||||
"error.invalid_gesture_nav": "Ongeldige gebarennavigatie.",
|
||||
"error.invalid_language": "Ongeldige taal.",
|
||||
@@ -129,14 +132,12 @@
|
||||
"error.network_operation": "Miniflux kan deze website niet bereiken vanwege een netwerkfout: %v.",
|
||||
"error.network_timeout": "Deze website is te traag en de aanvraag gaf timeout: %v",
|
||||
"error.password_min_length": "Minimaal 6 tekens gebruiken.",
|
||||
"error.pocket_access_token": "Kon geen toegangstoken ophalen van Pocket!",
|
||||
"error.pocket_request_token": "Kon geen aanvraagtoken ophalen van Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "De proxy-URL mag niet leeg zijn.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Ongeldige blokkeerregel: regel #%d mist een geldige veldnaam (Opties: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Ongeldige blokkeerregel: het patroon van regel #%d is geen geldige regex",
|
||||
"error.settings_block_rule_regex_required": "Ongeldige blokkeerregel: het patroon van regel #%d is niet opgegeven",
|
||||
"error.settings_block_rule_separator_required": "Ongeldige blokkeerregel: het patroon van regel #%d moet worden gescheiden door een '='",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_invalid_domain_list": "Ongeldige domeinlijst. Geef een spatiegescheiden lijst van domeinen op.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Ongeldige bewaarregel: regel #%d mist een geldige veldnaam (Options: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Ongeldige bewaarregel: het patroon van regel #%d is geen geldige regex",
|
||||
"error.settings_keep_rule_regex_required": "Ongeldige bewaarregel: het patroon van regel #%d is niet opgegeven",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Regels",
|
||||
"form.feed.label.allow_self_signed_certificates": "Zelfondertekende of ongeldige certificaten toestaan",
|
||||
"form.feed.label.apprise_service_urls": "Door komma's gescheiden lijst van Apprise service URL's",
|
||||
"form.feed.label.blocklist_rules": "Blokkeerregels",
|
||||
"form.feed.label.block_filter_entry_rules": "Blokkeerregels voor Items",
|
||||
"form.feed.label.blocklist_rules": "Regex-gebaseerde Blokkeerfilters",
|
||||
"form.feed.label.category": "Categorie",
|
||||
"form.feed.label.cookie": "Cookies instellen",
|
||||
"form.feed.label.crawler": "Download originele inhoud",
|
||||
@@ -181,7 +183,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Gebruik de proxy die op applicatieniveau is geconfigureerd",
|
||||
"form.feed.label.hide_globally": "Verberg artikelen in de globale ongelezen lijst",
|
||||
"form.feed.label.ignore_http_cache": "Negeer HTTP-cache",
|
||||
"form.feed.label.keeplist_rules": "Bewaarregels",
|
||||
"form.feed.label.keep_filter_entry_rules": "Toestaan Regels voor Items",
|
||||
"form.feed.label.keeplist_rules": "Regex-gebaseerde Bewaarfilters",
|
||||
"form.feed.label.no_media_player": "Geen mediaspeler (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Artikelen naar ntfy sturen",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy standaard prioriteit",
|
||||
@@ -190,16 +193,16 @@
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy maximale prioriteit",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy minimale prioriteit",
|
||||
"form.feed.label.ntfy_priority": "Ntfy prioriteit",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (optional)",
|
||||
"form.feed.label.ntfy_topic": "Ntfy onderwerp (optioneel)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Herschrijfregels",
|
||||
"form.feed.label.pushover_activate": "Stuur artikelen naar pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover standaard prioriteit",
|
||||
"form.feed.label.pushover_high_priority": "Pushover hoge prioriteit",
|
||||
"form.feed.label.pushover_low_priority": "Pushover lage prioriteit",
|
||||
"form.feed.label.pushover_max_priority": "Pushover maximale prioriteit",
|
||||
"form.feed.label.pushover_min_priority": "Pushover minimale prioriteit",
|
||||
"form.feed.label.pushover_priority": "Pushover berichtprioriteit",
|
||||
"form.feed.label.rewrite_rules": "Inhoud Herschrijfregels",
|
||||
"form.feed.label.scraper_rules": "Extractieregels",
|
||||
"form.feed.label.site_url": "Website URL",
|
||||
"form.feed.label.title": "Titel",
|
||||
@@ -214,8 +217,8 @@
|
||||
"form.integration.betula_activate": "Artikelen opslaan in Betula",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
"form.integration.betula_url": "Betula server URL",
|
||||
"form.integration.cubox_activate": "Save entries to Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API link",
|
||||
"form.integration.cubox_activate": "Artikelen opslaan in Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API-link",
|
||||
"form.integration.discord_activate": "Artikelen opslaan in Discord",
|
||||
"form.integration.discord_webhook_link": "Discord Webhook link",
|
||||
"form.integration.espial_activate": "Artikelen opslaan in Espial",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Artikelen opslaan in Instapaper",
|
||||
"form.integration.instapaper_password": "Instapaper wachtwoord",
|
||||
"form.integration.instapaper_username": "Instapaper gebruikersnaam",
|
||||
"form.integration.karakeep_activate": "Artikelen opslaan in Karakeep",
|
||||
"form.integration.karakeep_api_key": "Karakeep API-sleutel",
|
||||
"form.integration.karakeep_url": "Karakeep URL",
|
||||
"form.integration.linkace_activate": "Artikelen opslaan in LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API-sleutel",
|
||||
"form.integration.linkace_check_disabled": "Koppelingcontrole uitschakelen",
|
||||
@@ -258,7 +264,7 @@
|
||||
"form.integration.ntfy_activate": "Stuur artikelen naar ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (optioneel)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (optioneel)",
|
||||
"form.integration.ntfy_internal_links": "Use internal links on click (optional)",
|
||||
"form.integration.ntfy_internal_links": "Gebruik interne links bij klikken (optioneel)",
|
||||
"form.integration.ntfy_password": "Ntfy wachtwoord (optioneel)",
|
||||
"form.integration.ntfy_topic": "Ntfy topic (standaard gebruikt als deze niet is ingesteld in feed)",
|
||||
"form.integration.ntfy_url": "Ntfy URL (optioneel, standaard is ntfy.sh)",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Markeer favoriet als ongelezen",
|
||||
"form.integration.pinboard_tags": "Pinboard tags",
|
||||
"form.integration.pinboard_token": "Pinboard API token",
|
||||
"form.integration.pocket_access_token": "Pocket Access Token",
|
||||
"form.integration.pocket_activate": "Artikelen opslaan in Pocket",
|
||||
"form.integration.pocket_connect_link": "Verbind je Pocket-account",
|
||||
"form.integration.pocket_consumer_key": "Pocket Consumer Key",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -327,7 +329,8 @@
|
||||
"form.prefs.fieldset.authentication_settings": "Authenticatie Instellingen",
|
||||
"form.prefs.fieldset.global_feed_settings": "Globale Feed Instellingen",
|
||||
"form.prefs.fieldset.reader_settings": "Lees Instellingen",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.help.external_font_hosts": "Spatiegescheiden lijst van externe font-hosts die zijn toegestaan. Bijvoorbeeld: 'fonts.gstatic.com fonts.googleapis.com'.",
|
||||
"form.prefs.label.always_open_external_links": "Lees artikelen door externe links te openen",
|
||||
"form.prefs.label.categories_sorting_order": "Volgorde categorieën",
|
||||
"form.prefs.label.cjk_reading_speed": "Leessnelheid voor Chinees, Koreaans en Japans (tekens per minuut)",
|
||||
"form.prefs.label.custom_css": "Aangepaste CSS",
|
||||
@@ -339,7 +342,7 @@
|
||||
"form.prefs.label.entry_order": "Artikelen sorteren",
|
||||
"form.prefs.label.entry_sorting": "Volgorde van artikelen",
|
||||
"form.prefs.label.entry_swipe": "Vegen tussen artikelen inschakelen op aanraakschermen",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Externe font-hosts",
|
||||
"form.prefs.label.gesture_nav": "Gebaar om tussen artikelen te navigeren",
|
||||
"form.prefs.label.keyboard_shortcuts": "Sneltoetsen inschakelen",
|
||||
"form.prefs.label.language": "Taal",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Markeer artikelen automatisch als gelezen wanneer ze worden bekeken",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Markeer artikelen als gelezen wanneer ze worden bekeken. Voor audio/video, markeer als gelezen bij 90%% voltooiing",
|
||||
"form.prefs.label.media_playback_rate": "Afspeelsnelheid van de audio/video",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Open externe links in een nieuw tabblad (voegt target=\"_blank\" toe aan links)",
|
||||
"form.prefs.label.show_reading_time": "Toon geschatte leestijd van artikelen",
|
||||
"form.prefs.label.theme": "Thema",
|
||||
"form.prefs.label.timezone": "Tijdzone",
|
||||
@@ -408,7 +411,7 @@
|
||||
"page.about.author": "Auteur:",
|
||||
"page.about.build_date": "Compilatiedatum:",
|
||||
"page.about.credits": "Credits",
|
||||
"page.about.db_usage": "Database size:",
|
||||
"page.about.db_usage": "Databasegrootte:",
|
||||
"page.about.git_commit": "Git Commit:",
|
||||
"page.about.global_config_options": "Globale Configuratie Opties",
|
||||
"page.about.go_version": "Go versie:",
|
||||
@@ -512,7 +515,7 @@
|
||||
"page.login.title": "Inloggen",
|
||||
"page.login.webauthn_login": "Inloggen met passkey",
|
||||
"page.login.webauthn_login.error": "Kan niet inloggen met passkey",
|
||||
"page.login.webauthn_login.help": "Please enter your username if you're using a security key. This is not required if you are using a Passkey (discoverable credentials).",
|
||||
"page.login.webauthn_login.help": "Voer je gebruikersnaam in als je een beveiligingssleutel gebruikt. Dit is niet nodig als je een Passkey (ontdekkingsbare referenties) gebruikt.",
|
||||
"page.new_api_key.title": "Nieuwe API-sleutel",
|
||||
"page.new_category.title": "Nieuwe categorie",
|
||||
"page.new_user.title": "Nieuwe gebruiker",
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "gisteren",
|
||||
"tooltip.keyboard_shortcuts": "Sneltoets: %s",
|
||||
"tooltip.logged_user": "Ingelogd als %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Brak wpisów pasujących do tego znacznika.",
|
||||
"alert.no_unread_entry": "Nie ma żadnych nieprzeczytanych wpisów.",
|
||||
"alert.no_user": "Jesteś jedynym użytkownikiem.",
|
||||
"alert.pocket_linked": "Twoje konto Pocket jest teraz połączone!",
|
||||
"alert.prefs_saved": "Ustawienia zapisane!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Wykonano zbyt wiele odświeżeń kanału. Poczekaj %d minutę przed ponowną próbą.",
|
||||
@@ -79,6 +78,11 @@
|
||||
"entry.status.toast.read": "Oznaczono jako przeczytany",
|
||||
"entry.status.toast.unread": "Oznaczono jako nieprzeczytany",
|
||||
"entry.tags.label": "Znaczniki:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Dodaj znacznik",
|
||||
"Dodaj %d znaczniki",
|
||||
"Dodaj %d znaczników"
|
||||
],
|
||||
"entry.unshare.label": "Cofnij udostępnianie",
|
||||
"error.api_key_already_exists": "Ten klucz API już istnieje.",
|
||||
"error.bad_credentials": "Nieprawidłowa nazwa użytkownika lub hasło.",
|
||||
@@ -96,7 +100,7 @@
|
||||
"error.feed_category_not_found": "Ta kategoria nie istnieje lub nie należy do tego użytkownika.",
|
||||
"error.feed_format_not_detected": "Nie można wykryć formatu kanału: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "Reguła listy zablokowanych jest nieprawidłowa.",
|
||||
"error.feed_invalid_keeplist_rule": "Reguła listy zachowania jest nieprawidłowa.",
|
||||
"error.feed_invalid_keeplist_rule": "Reguła listy zachowywania jest nieprawidłowa.",
|
||||
"error.feed_mandatory_fields": "Adres URL i kategoria są obowiązkowe.",
|
||||
"error.feed_not_found": "Ten kanał nie istnieje lub nie należy do tego użytkownika.",
|
||||
"error.feed_title_not_empty": "Tytuł kanału nie może być pusty.",
|
||||
@@ -131,8 +135,6 @@
|
||||
"error.network_operation": "Miniflux nie może połączyć się z tą witryną z powodu błędu sieci: %v.",
|
||||
"error.network_timeout": "Ta witryna internetowa jest zbyt wolna i upłynął limit czasu żądania: %v",
|
||||
"error.password_min_length": "Musisz użyć co najmniej 6 znaków.",
|
||||
"error.pocket_access_token": "Nie można pobrać tokena dostępu z Pocket!",
|
||||
"error.pocket_request_token": "Nie można pobrać tokena żądania z Pocket!",
|
||||
"error.proxy_url_not_empty": "Adres URL serwera proxy nie może być pusty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Nieprawidłowa reguła blokowania: w regule #%d brakuje prawidłowej nazwy pola (opcje: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Nieprawidłowa reguła blokowania: wzór reguły #%d nie jest prawidłowym wyrażeniem regularnym",
|
||||
@@ -170,7 +172,8 @@
|
||||
"form.feed.fieldset.rules": "Reguły",
|
||||
"form.feed.label.allow_self_signed_certificates": "Zezwalaj na samopodpisane lub nieprawidłowe certyfikaty",
|
||||
"form.feed.label.apprise_service_urls": "Rozdzielana przecinkami lista adresów URL usług Appprise",
|
||||
"form.feed.label.blocklist_rules": "Reguły blokowania",
|
||||
"form.feed.label.block_filter_entry_rules": "Reguły blokowania wpisów",
|
||||
"form.feed.label.blocklist_rules": "Filtry blokowania oparte na wyrażeniach regularnych",
|
||||
"form.feed.label.category": "Kategoria",
|
||||
"form.feed.label.cookie": "Ustaw ciasteczka",
|
||||
"form.feed.label.crawler": "Pobierz oryginalną treść",
|
||||
@@ -183,7 +186,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Użyj serwera proxy skonfigurowanego na poziomie aplikacji",
|
||||
"form.feed.label.hide_globally": "Ukryj wpisy na globalnej liście nieprzeczytanych",
|
||||
"form.feed.label.ignore_http_cache": "Zignoruj pamięć podręczną HTTP",
|
||||
"form.feed.label.keeplist_rules": "Reguły utrzymywania",
|
||||
"form.feed.label.keep_filter_entry_rules": "Reguły zachowywania wpisów",
|
||||
"form.feed.label.keeplist_rules": "Filtry zachowywania oparte na wyrażeniach regularnych",
|
||||
"form.feed.label.no_media_player": "Brak odtwarzacza multimedialnego (audio i wideo)",
|
||||
"form.feed.label.ntfy_activate": "Prześlij wpisy do ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Domyślny priorytet ntfy",
|
||||
@@ -201,7 +205,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Maksymalny priorytet Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Minimalny priorytet Pushover",
|
||||
"form.feed.label.pushover_priority": "Priorytet wiadomości Pushover",
|
||||
"form.feed.label.rewrite_rules": "Reguły zapisu",
|
||||
"form.feed.label.rewrite_rules": "Reguły przepisywania treści",
|
||||
"form.feed.label.scraper_rules": "Reguły ekstrakcji",
|
||||
"form.feed.label.site_url": "Adres URL strony",
|
||||
"form.feed.label.title": "Tytuł",
|
||||
@@ -235,6 +239,9 @@
|
||||
"form.integration.instapaper_activate": "Zapisuj wpisy w Instapaper",
|
||||
"form.integration.instapaper_password": "Hasło do Instapaper",
|
||||
"form.integration.instapaper_username": "Login do Instapaper",
|
||||
"form.integration.karakeep_activate": "Zapisuj wpisy w Karakeep",
|
||||
"form.integration.karakeep_api_key": "Klucz API do Karakeep",
|
||||
"form.integration.karakeep_url": "Punkt końcowy API Karakeep",
|
||||
"form.integration.linkace_activate": "Zapisuj wpisy w LinkAce",
|
||||
"form.integration.linkace_api_key": "Klucz API do LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Wyłącz sprawdzanie łączy",
|
||||
@@ -275,10 +282,6 @@
|
||||
"form.integration.pinboard_bookmark": "Zaznacz zakładkę jako nieprzeczytaną",
|
||||
"form.integration.pinboard_tags": "Znaczniki Pinboard",
|
||||
"form.integration.pinboard_token": "Token API do Pinboard",
|
||||
"form.integration.pocket_access_token": "Token dostępu do Pocket",
|
||||
"form.integration.pocket_activate": "Zapisuj wpisy w Pocket",
|
||||
"form.integration.pocket_connect_link": "Połącz swoje konto Pocket",
|
||||
"form.integration.pocket_consumer_key": "Klucz klienta do Pocket",
|
||||
"form.integration.pushover_activate": "Prześlij wpisy do Pushover",
|
||||
"form.integration.pushover_device": "Urządzenie Pushover (opcjonalne)",
|
||||
"form.integration.pushover_prefix": "Prefiks adresu URL Pushover (opcjonalny)",
|
||||
@@ -307,7 +310,7 @@
|
||||
"form.integration.shiori_password": "Hasło do Shiori",
|
||||
"form.integration.shiori_username": "Login do Shiori",
|
||||
"form.integration.slack_activate": "Przesyłaj wpisy do Slack",
|
||||
"form.integration.slack_webhook_link": "Slack Webhook link",
|
||||
"form.integration.slack_webhook_link": "Łącze webhooka Slack",
|
||||
"form.integration.telegram_bot_activate": "Przesyłaj nowe wpisy do czatu Telegram",
|
||||
"form.integration.telegram_bot_disable_buttons": "Wyłącz przyciski",
|
||||
"form.integration.telegram_bot_disable_notification": "Wyłącz powiadomienie",
|
||||
@@ -330,6 +333,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Globalne ustawienia kanałów",
|
||||
"form.prefs.fieldset.reader_settings": "Ustawienia czytnika",
|
||||
"form.prefs.help.external_font_hosts": "Lista hostów zewnętrznych czcionek, na które należy zezwolić, rozdzielona spacjami. Na przykład: „fonts.gstatic.com fonts.googleapis.com”.",
|
||||
"form.prefs.label.always_open_external_links": "Czytaj artykuły, otwierając łącza zewnętrzne",
|
||||
"form.prefs.label.categories_sorting_order": "Sortowanie kategorii",
|
||||
"form.prefs.label.cjk_reading_speed": "Szybkość czytania w języku chińskim, koreańskim i japońskim (znaki na minutę)",
|
||||
"form.prefs.label.custom_css": "Niestandardowy CSS",
|
||||
@@ -350,7 +354,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Automatycznie oznacz wpisy jako przeczytane podczas przeglądania",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Oznacz wpisy jako przeczytane po wyświetleniu. W przypadku audio i wideo oznacz jako przeczytane po ukończeniu 90%%",
|
||||
"form.prefs.label.media_playback_rate": "Szybkość odtwarzania audio i wideo",
|
||||
"form.prefs.label.always_open_external_links": "Czytaj artykuły, otwierając łącza zewnętrzne",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Otwieraj łącza zewnętrzne w nowej karcie (dodaje target=\"_blank\" do łączy)",
|
||||
"form.prefs.label.show_reading_time": "Pokaż szacowany czas czytania wpisów",
|
||||
"form.prefs.label.theme": "Wygląd",
|
||||
"form.prefs.label.timezone": "Strefa czasowa",
|
||||
@@ -628,4 +632,4 @@
|
||||
"time_elapsed.yesterday": "wczoraj",
|
||||
"tooltip.keyboard_shortcuts": "Skróty klawiszowe: %s",
|
||||
"tooltip.logged_user": "Zalogowany jako %s"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "Atualizar",
|
||||
"alert.account_linked": "Sua conta externa está vinculada!",
|
||||
"alert.account_unlinked": "Sua conta externa está desvinculada!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "Todas as fontes estão sendo atualizadas em segundo plano. Você pode continuar usando o Miniflux enquanto este processo está em execução.",
|
||||
"alert.feed_error": "Ocorreu um problema com esta fonte.",
|
||||
"alert.no_bookmark": "Não há favorito neste momento.",
|
||||
"alert.no_category": "Não há categoria.",
|
||||
@@ -27,26 +27,25 @@
|
||||
"alert.no_tag_entry": "Não há itens que correspondam a esta etiqueta.",
|
||||
"alert.no_unread_entry": "Não há itens não lidos.",
|
||||
"alert.no_user": "Você é o único usuário.",
|
||||
"alert.pocket_linked": "Sua conta do Pocket está vinculada!",
|
||||
"alert.prefs_saved": "Suas preferências foram salvas!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again."
|
||||
"Você acionou muitas atualizações de fontes. Por favor, aguarde %d minuto antes de tentar novamente.",
|
||||
"Você acionou muitas atualizações de fontes. Por favor, aguarde %d minutos antes de tentar novamente."
|
||||
],
|
||||
"confirm.loading": "Carregando...",
|
||||
"confirm.no": "Não",
|
||||
"confirm.question": "Tem certeza?",
|
||||
"confirm.question.refresh": "Você deseja forçar a atualização?",
|
||||
"confirm.yes": "Sim",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "Procurar:",
|
||||
"enclosure_media_controls.seek.title": "Procurar %s segundos",
|
||||
"enclosure_media_controls.speed": "Velocidade:",
|
||||
"enclosure_media_controls.speed.faster": "Mais Rápido",
|
||||
"enclosure_media_controls.speed.faster.title": "Mais rápido em %sx",
|
||||
"enclosure_media_controls.speed.reset": "Resetar",
|
||||
"enclosure_media_controls.speed.reset.title": "Resetar velocidade para 1x",
|
||||
"enclosure_media_controls.speed.slower": "Mais Lento",
|
||||
"enclosure_media_controls.speed.slower.title": "Mais lento em %sx",
|
||||
"entry.bookmark.toast.off": "Desfavoritado",
|
||||
"entry.bookmark.toast.on": "Favoritado",
|
||||
"entry.bookmark.toggle.off": "Remover dos Favoritos",
|
||||
@@ -77,77 +76,79 @@
|
||||
"entry.status.toast.read": "Marcado como lido",
|
||||
"entry.status.toast.unread": "Marcado como não lido",
|
||||
"entry.tags.label": "Etiquetas:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Mostrar mais %d etiqueta",
|
||||
"Mostrar mais %d etiquetas"
|
||||
],
|
||||
"entry.unshare.label": "Descompartilhar",
|
||||
"error.api_key_already_exists": "Essa chave de API já existe.",
|
||||
"error.bad_credentials": "Usuário ou senha são inválidos.",
|
||||
"error.category_already_exists": "Esta categoria já existe.",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "Esta categoria não existe ou não pertence a este usuário.",
|
||||
"error.database_error": "Erro no banco de dados: %v.",
|
||||
"error.different_passwords": "As senhas não são iguais.",
|
||||
"error.duplicate_fever_username": "Alguém já está utilizando esse nome de usuário do Fever!",
|
||||
"error.duplicate_googlereader_username": "Alguém já está utilizando esse nome de usuário do Google Reader!",
|
||||
"error.duplicate_linked_account": "Alguém já está vinculado a esse serviço!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicated_feed": "Esta fonte já existe.",
|
||||
"error.empty_file": "Esse arquivo está vazio.",
|
||||
"error.entries_per_page_invalid": "O número de itens por página é inválido.",
|
||||
"error.feed_already_exists": "Este feed já existe.",
|
||||
"error.feed_category_not_found": "Esta categoria não existe ou não pertence a este usuário.",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "Não foi possível detectar o formato da fonte: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "A regra da lista de bloqueio é inválida.",
|
||||
"error.feed_invalid_keeplist_rule": "A regra de manutenção da lista é inválida.",
|
||||
"error.feed_mandatory_fields": "O campo de URL e categoria são obrigatórios.",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "Esta fonte não existe ou não pertence a este usuário.",
|
||||
"error.feed_title_not_empty": "O título do feed não pode estar vazio.",
|
||||
"error.feed_url_not_empty": "O URL do feed não pode estar vazio.",
|
||||
"error.fields_mandatory": "Todos os campos são obrigatórios.",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
"error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
|
||||
"error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
|
||||
"error.http_service_unavailable": "The website is not available at the moment due to an internal server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
|
||||
"error.http_unexpected_status_code": "The website is not available at the moment due to an unexpected HTTP status code: %d. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_bad_gateway": "O site não está disponível no momento devido a um erro de gateway. O problema não está no Miniflux. Por favor, tente novamente mais tarde.",
|
||||
"error.http_body_read": "Não foi possível ler o corpo HTTP: %v.",
|
||||
"error.http_client_error": "Erro do cliente HTTP: %v.",
|
||||
"error.http_empty_response": "A resposta HTTP está vazia. Talvez este site esteja usando um mecanismo de proteção contra bots?",
|
||||
"error.http_empty_response_body": "O corpo da resposta HTTP está vazio.",
|
||||
"error.http_forbidden": "O acesso a este site está proibido. Talvez este site tenha um mecanismo de proteção contra bots?",
|
||||
"error.http_gateway_timeout": "O site não está disponível no momento devido a um erro de tempo limite do gateway. O problema não está no Miniflux. Por favor, tente novamente mais tarde.",
|
||||
"error.http_internal_server_error": "O site não está disponível no momento devido a um erro interno do servidor. O problema não está no Miniflux. Por favor, tente novamente mais tarde.",
|
||||
"error.http_not_authorized": "O acesso a este site não está autorizado. Pode ser um nome de usuário ou senha incorretos.",
|
||||
"error.http_resource_not_found": "O recurso solicitado não foi encontrado. Por favor, verifique a URL.",
|
||||
"error.http_response_too_large": "A resposta HTTP é muito grande. Você pode aumentar o limite de tamanho da resposta HTTP nas configurações globais (requer reinício do servidor).",
|
||||
"error.http_service_unavailable": "O site não está disponível no momento devido a um erro interno do servidor. O problema não está no Miniflux. Por favor, tente novamente mais tarde.",
|
||||
"error.http_too_many_requests": "O Miniflux gerou muitas solicitações para este site. Por favor, tente novamente mais tarde ou altere a configuração do aplicativo.",
|
||||
"error.http_unexpected_status_code": "O site não está disponível no momento devido a um código de status HTTP inesperado: %d. O problema não está no Miniflux. Por favor, tente novamente mais tarde.",
|
||||
"error.invalid_categories_sorting_order": "A ordem de classificação das categorias não é válida.",
|
||||
"error.invalid_default_home_page": "Página inicial por defeito inválida!",
|
||||
"error.invalid_display_mode": "Modo de exibição de aplicativo inválido da web.",
|
||||
"error.invalid_entry_direction": "Direção de entrada inválida.",
|
||||
"error.invalid_entry_order": "A ordem de entrada é inválida.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "URL de proxy inválido.",
|
||||
"error.invalid_feed_url": "URL de feed inválido.",
|
||||
"error.invalid_gesture_nav": "Navegação por gestos inválida.",
|
||||
"error.invalid_language": "Idioma inválido.",
|
||||
"error.invalid_site_url": "URL de site inválido.",
|
||||
"error.invalid_theme": "Tema inválido.",
|
||||
"error.invalid_timezone": "Fuso horário inválido.",
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.network_operation": "O Miniflux não conseguiu acessar este site devido a um erro de rede: %v.",
|
||||
"error.network_timeout": "Este site está muito lento e a solicitação expirou: %v",
|
||||
"error.password_min_length": "A senha deve ter no mínimo 6 caracteres.",
|
||||
"error.pocket_access_token": "Não foi possível obter um token de acesso no Pocket!",
|
||||
"error.pocket_request_token": "Não foi possível obter um pedido de token no Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
|
||||
"error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
|
||||
"error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.proxy_url_not_empty": "A URL do proxy não pode estar vazia.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Regra de bloqueio inválida: a regra #%d está sem um nome de campo válido (Opções: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Regra de bloqueio inválida: o padrão da regra #%d não é uma expressão regular válida",
|
||||
"error.settings_block_rule_regex_required": "Regra de bloqueio inválida: o padrão da regra #%d não foi fornecido",
|
||||
"error.settings_block_rule_separator_required": "Regra de bloqueio inválida: o padrão da regra #%d deve ser separado por um '='",
|
||||
"error.settings_invalid_domain_list": "Lista de domínios inválida. Por favor, forneça uma lista de domínios separados por espaço.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Regra de permissão inválida: a regra #%d está sem um nome de campo válido (Opções: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Regra de permissão inválida: o padrão da regra #%d não é uma expressão regular válida",
|
||||
"error.settings_keep_rule_regex_required": "Regra de permissão inválida: o padrão da regra #%d não foi fornecido",
|
||||
"error.settings_keep_rule_separator_required": "Regra de permissão inválida: o padrão da regra #%d deve ser separado por um '='",
|
||||
"error.settings_mandatory_fields": "Os campos de nome de usuário, tema, idioma e fuso horário são obrigatórios.",
|
||||
"error.settings_media_playback_rate_range": "A velocidade de reprodução está fora do intervalo",
|
||||
"error.settings_reading_speed_is_positive": "As velocidades de leitura devem ser inteiros positivos.",
|
||||
"error.site_url_not_empty": "O URL do site não pode estar vazio.",
|
||||
"error.subscription_not_found": "Não foi possível encontrar uma inscrição.",
|
||||
"error.title_required": "O título é obrigatório.",
|
||||
"error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
|
||||
"error.tls_error": "Erro TLS: %q. Você pode desabilitar a verificação TLS nas configurações do feed se desejar.",
|
||||
"error.unable_to_create_api_key": "Não foi possível criar uma chave de API.",
|
||||
"error.unable_to_create_category": "Não foi possível criar essa categoria.",
|
||||
"error.unable_to_create_user": "Não foi possível criar esse usuário.",
|
||||
@@ -162,18 +163,19 @@
|
||||
"form.api_key.label.description": "Etiqueta da chave de API",
|
||||
"form.category.hide_globally": "Ocultar entradas na lista global não lida",
|
||||
"form.category.label.title": "Título",
|
||||
"form.feed.fieldset.general": "General",
|
||||
"form.feed.fieldset.integration": "Third-Party Services",
|
||||
"form.feed.fieldset.network_settings": "Network Settings",
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.fieldset.general": "Geral",
|
||||
"form.feed.fieldset.integration": "Serviços de Terceiros",
|
||||
"form.feed.fieldset.network_settings": "Configurações de Rede",
|
||||
"form.feed.fieldset.rules": "Regras",
|
||||
"form.feed.label.allow_self_signed_certificates": "Permitir certificados autoassinados ou inválidos",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Regras de bloqueio",
|
||||
"form.feed.label.apprise_service_urls": "Lista de URLs de serviços Apprise separadas por vírgula",
|
||||
"form.feed.label.block_filter_entry_rules": "Regras de Bloqueio de Entradas",
|
||||
"form.feed.label.blocklist_rules": "Filtros de Bloqueio Baseados em Regex",
|
||||
"form.feed.label.category": "Categoria",
|
||||
"form.feed.label.cookie": "Definir Cookies",
|
||||
"form.feed.label.crawler": "Obter conteúdo original",
|
||||
"form.feed.label.description": "Descrição",
|
||||
"form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
|
||||
"form.feed.label.disable_http2": "Desativar HTTP/2 para evitar fingerprinting",
|
||||
"form.feed.label.disabled": "Não atualizar esta fonte",
|
||||
"form.feed.label.feed_password": "Senha da fonte",
|
||||
"form.feed.label.feed_url": "URL da fonte",
|
||||
@@ -181,35 +183,36 @@
|
||||
"form.feed.label.fetch_via_proxy": "Usar o proxy configurado no nível da aplicação",
|
||||
"form.feed.label.hide_globally": "Ocultar entradas na lista global não lida",
|
||||
"form.feed.label.ignore_http_cache": "Ignorar cache HTTP",
|
||||
"form.feed.label.keeplist_rules": "Regras de permissão",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
"form.feed.label.ntfy_high_priority": "Ntfy high priority",
|
||||
"form.feed.label.ntfy_low_priority": "Ntfy low priority",
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy max priority",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy min priority",
|
||||
"form.feed.label.ntfy_priority": "Ntfy priority",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (optional)",
|
||||
"form.feed.label.keep_filter_entry_rules": "Regras de Permissão de Entradas",
|
||||
"form.feed.label.keeplist_rules": "Filtros de Manutenção Baseados em Regex",
|
||||
"form.feed.label.no_media_player": "Sem reprodutor de mídia (áudio/vídeo)",
|
||||
"form.feed.label.ntfy_activate": "Enviar itens para o ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Prioridade padrão do ntfy",
|
||||
"form.feed.label.ntfy_high_priority": "Alta prioridade do ntfy",
|
||||
"form.feed.label.ntfy_low_priority": "Baixa prioridade do ntfy",
|
||||
"form.feed.label.ntfy_max_priority": "Prioridade máxima do ntfy",
|
||||
"form.feed.label.ntfy_min_priority": "Prioridade mínima do ntfy",
|
||||
"form.feed.label.ntfy_priority": "Prioridade do ntfy",
|
||||
"form.feed.label.ntfy_topic": "Tópico do ntfy (opcional)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Regras para o Rewrite",
|
||||
"form.feed.label.pushover_activate": "Enviar itens para o pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Prioridade padrão do Pushover",
|
||||
"form.feed.label.pushover_high_priority": "Alta prioridade do Pushover",
|
||||
"form.feed.label.pushover_low_priority": "Baixa prioridade do Pushover",
|
||||
"form.feed.label.pushover_max_priority": "Prioridade máxima do Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Prioridade mínima do Pushover",
|
||||
"form.feed.label.pushover_priority": "Prioridade da mensagem do Pushover",
|
||||
"form.feed.label.rewrite_rules": "Regras de Reescrita de Conteúdo",
|
||||
"form.feed.label.scraper_rules": "Regras do scraper",
|
||||
"form.feed.label.site_url": "URL do site",
|
||||
"form.feed.label.title": "Título",
|
||||
"form.feed.label.urlrewrite_rules": "Regras de reescrita de URL",
|
||||
"form.feed.label.user_agent": "Sobrescrever o agente de usuário (user-agent) padrão",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "Sobrescrever URL do webhook",
|
||||
"form.import.label.file": "Arquivo OPML",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "Push entries to Apprise",
|
||||
"form.integration.apprise_services_url": "Comma separated list of Apprise service URLs",
|
||||
"form.integration.apprise_activate": "Enviar itens para o Apprise",
|
||||
"form.integration.apprise_services_url": "Lista de URLs de serviços Apprise separadas por vírgula",
|
||||
"form.integration.apprise_url": "Apprise API URL",
|
||||
"form.integration.betula_activate": "Save entries to Betula",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
@@ -233,12 +236,15 @@
|
||||
"form.integration.instapaper_activate": "Salvar itens no Instapaper",
|
||||
"form.integration.instapaper_password": "Senha do Instapaper",
|
||||
"form.integration.instapaper_username": "Nome do usuário do Instapaper",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
"form.integration.linkace_endpoint": "LinkAce API Endpoint",
|
||||
"form.integration.linkace_is_private": "Mark link as private",
|
||||
"form.integration.linkace_tags": "LinkAce Tags",
|
||||
"form.integration.karakeep_activate": "Salvar itens no Karakeep",
|
||||
"form.integration.karakeep_api_key": "Chave de API do Karakeep",
|
||||
"form.integration.karakeep_url": "Endpoint de API do Karakeep",
|
||||
"form.integration.linkace_activate": "Salvar itens no LinkAce",
|
||||
"form.integration.linkace_api_key": "Chave de API do LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Desativar verificação de link",
|
||||
"form.integration.linkace_endpoint": "Endpoint de API do LinkAce",
|
||||
"form.integration.linkace_is_private": "Marcar link como privado",
|
||||
"form.integration.linkace_tags": "Etiquetas do LinkAce",
|
||||
"form.integration.linkding_activate": "Salvar itens no Linkding",
|
||||
"form.integration.linkding_api_key": "Chave de API do Linkding",
|
||||
"form.integration.linkding_bookmark": "Salvar marcador como não lido",
|
||||
@@ -252,14 +258,14 @@
|
||||
"form.integration.matrix_bot_password": "Palavra-passe para utilizador da Matrix",
|
||||
"form.integration.matrix_bot_url": "URL do servidor Matrix",
|
||||
"form.integration.matrix_bot_user": "Nome de utilizador para Matrix",
|
||||
"form.integration.notion_activate": "Save entries to Notion",
|
||||
"form.integration.notion_page_id": "Notion Page ID",
|
||||
"form.integration.notion_token": "Notion Secret Token",
|
||||
"form.integration.ntfy_activate": "Push entries to ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (optional)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
|
||||
"form.integration.ntfy_internal_links": "Use internal links on click (optional)",
|
||||
"form.integration.ntfy_password": "Ntfy Password (optional)",
|
||||
"form.integration.notion_activate": "Salvar itens no Notion",
|
||||
"form.integration.notion_page_id": "ID da página do Notion",
|
||||
"form.integration.notion_token": "Token secreto do Notion",
|
||||
"form.integration.ntfy_activate": "Enviar itens para o ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (opcional)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (opcional)",
|
||||
"form.integration.ntfy_internal_links": "Usar links internos ao clicar (opcional)",
|
||||
"form.integration.ntfy_password": "Ntfy Password (opcional)",
|
||||
"form.integration.ntfy_topic": "Ntfy topic (default if not set in feed)",
|
||||
"form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
|
||||
"form.integration.ntfy_username": "Ntfy Username (optional)",
|
||||
@@ -273,33 +279,29 @@
|
||||
"form.integration.pinboard_bookmark": "Salvar marcador como não lido",
|
||||
"form.integration.pinboard_tags": "Etiquetas (tags) do Pinboard",
|
||||
"form.integration.pinboard_token": "Token de API do Pinboard",
|
||||
"form.integration.pocket_access_token": "Token de acesso do Pocket",
|
||||
"form.integration.pocket_activate": "Salvar itens no Pocket",
|
||||
"form.integration.pocket_connect_link": "Conectar a conta do Pocket",
|
||||
"form.integration.pocket_consumer_key": "Chave de consumo (Consumer Key) do Pocket",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
"form.integration.pushover_token": "Pushover application API token",
|
||||
"form.integration.pushover_user": "Pushover user key",
|
||||
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||
"form.integration.raindrop_collection_id": "Collection ID",
|
||||
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||
"form.integration.raindrop_token": "(Test) Token",
|
||||
"form.integration.pushover_activate": "Enviar itens para o Pushover",
|
||||
"form.integration.pushover_device": "Dispositivo Pushover (opcional)",
|
||||
"form.integration.pushover_prefix": "Prefixo da URL do Pushover (opcional)",
|
||||
"form.integration.pushover_token": "Token de API do aplicativo Pushover",
|
||||
"form.integration.pushover_user": "Chave do usuário Pushover",
|
||||
"form.integration.raindrop_activate": "Salvar itens no Raindrop",
|
||||
"form.integration.raindrop_collection_id": "ID da coleção",
|
||||
"form.integration.raindrop_tags": "Etiquetas (separadas por vírgula)",
|
||||
"form.integration.raindrop_token": "Token (teste)",
|
||||
"form.integration.readeck_activate": "Salvar itens no Readeck",
|
||||
"form.integration.readeck_api_key": "Chave de API do Readeck",
|
||||
"form.integration.readeck_endpoint": "Endpoint de API do Readeck",
|
||||
"form.integration.readeck_labels": "Readeck Labels",
|
||||
"form.integration.readeck_only_url": "Enviar apenas URL (em vez de conteúdo completo)",
|
||||
"form.integration.readwise_activate": "Save entries to Readwise Reader",
|
||||
"form.integration.readwise_api_key": "Readwise Reader Access Token",
|
||||
"form.integration.readwise_api_key_link": "Get your Readwise Access Token",
|
||||
"form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge authentication token",
|
||||
"form.integration.rssbridge_url": "RSS-Bridge server URL",
|
||||
"form.integration.shaarli_activate": "Save articles to Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Shaarli API Secret",
|
||||
"form.integration.shaarli_endpoint": "Shaarli URL",
|
||||
"form.integration.readwise_activate": "Salvar itens no Readwise Reader",
|
||||
"form.integration.readwise_api_key": "Token de acesso do Readwise Reader",
|
||||
"form.integration.readwise_api_key_link": "Obtenha seu token de acesso do Readwise",
|
||||
"form.integration.rssbridge_activate": "Verificar RSS-Bridge ao adicionar inscrições",
|
||||
"form.integration.rssbridge_token": "Token de autenticação do RSS-Bridge",
|
||||
"form.integration.rssbridge_url": "URL do servidor RSS-Bridge",
|
||||
"form.integration.shaarli_activate": "Salvar artigos no Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Segredo da API do Shaarli",
|
||||
"form.integration.shaarli_endpoint": "URL do Shaarli",
|
||||
"form.integration.shiori_activate": "Salvar itens no Shiori",
|
||||
"form.integration.shiori_endpoint": "Endpoint da API do Shiori",
|
||||
"form.integration.shiori_password": "Senha do Shiori",
|
||||
@@ -323,11 +325,12 @@
|
||||
"form.integration.webhook_activate": "Enable Webhooks",
|
||||
"form.integration.webhook_secret": "Webhooks Secret",
|
||||
"form.integration.webhook_url": "Default Webhook URL",
|
||||
"form.prefs.fieldset.application_settings": "Application Settings",
|
||||
"form.prefs.fieldset.authentication_settings": "Authentication Settings",
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.fieldset.application_settings": "Configurações do aplicativo",
|
||||
"form.prefs.fieldset.authentication_settings": "Configurações de autenticação",
|
||||
"form.prefs.fieldset.global_feed_settings": "Configurações globais de fontes",
|
||||
"form.prefs.fieldset.reader_settings": "Configurações do leitor",
|
||||
"form.prefs.help.external_font_hosts": "Lista separada por espaço de hosts de fontes externas permitidos. Por exemplo: 'fonts.gstatic.com fonts.googleapis.com'.",
|
||||
"form.prefs.label.always_open_external_links": "Ler artigos abrindo links externos",
|
||||
"form.prefs.label.categories_sorting_order": "Classificação das categorias",
|
||||
"form.prefs.label.cjk_reading_speed": "Velocidade de leitura para chinês, coreano e japonês (caracteres por minuto)",
|
||||
"form.prefs.label.custom_css": "CSS customizado",
|
||||
@@ -339,16 +342,16 @@
|
||||
"form.prefs.label.entry_order": "Coluna de Ordenação de Entrada",
|
||||
"form.prefs.label.entry_sorting": "Ordenação dos itens",
|
||||
"form.prefs.label.entry_swipe": "Ativar entrada de furto em telas sensíveis ao toque",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Hosts de fontes externas",
|
||||
"form.prefs.label.gesture_nav": "Gesto para navegar entre as entradas",
|
||||
"form.prefs.label.keyboard_shortcuts": "Habilitar atalhos do teclado",
|
||||
"form.prefs.label.language": "Idioma",
|
||||
"form.prefs.label.mark_read_manually": "Mark entries as read manually",
|
||||
"form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
|
||||
"form.prefs.label.mark_read_manually": "Marcar itens como lidos manualmente",
|
||||
"form.prefs.label.mark_read_on_media_completion": "Marcar como lido apenas quando a reprodução de áudio/vídeo atingir 90%% de conclusão",
|
||||
"form.prefs.label.mark_read_on_view": "Marcar automaticamente as entradas como lidas quando visualizadas",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Marcar itens como lidos quando visualizados. Para áudio/vídeo, marcar como lido em 90%% de conclusão",
|
||||
"form.prefs.label.media_playback_rate": "Velocidade de reprodução do áudio/vídeo",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Abrir links externos em uma nova aba (adiciona target=\"_blank\" aos links)",
|
||||
"form.prefs.label.show_reading_time": "Mostrar tempo estimado de leitura de artigos",
|
||||
"form.prefs.label.theme": "Tema",
|
||||
"form.prefs.label.timezone": "Fuso horário",
|
||||
@@ -438,10 +441,10 @@
|
||||
"page.categories.no_feed": "Sem fonte.",
|
||||
"page.categories.title": "Categorias",
|
||||
"page.categories_count": [
|
||||
"%d category",
|
||||
"%d categories"
|
||||
"%d categoria",
|
||||
"%d categorias"
|
||||
],
|
||||
"page.category_label": "Category: %s",
|
||||
"page.category_label": "Categoria: %s",
|
||||
"page.edit_category.title": "Editar categoria: %s",
|
||||
"page.edit_feed.etag_header": "Cabeçalho 'ETag':",
|
||||
"page.edit_feed.last_check": "Última verificação:",
|
||||
@@ -456,7 +459,7 @@
|
||||
"%d erros"
|
||||
],
|
||||
"page.feeds.last_check": "Última verificação:",
|
||||
"page.feeds.next_check": "Next check:",
|
||||
"page.feeds.next_check": "Próxima verificação:",
|
||||
"page.feeds.read_counter": "Número de itens lidos",
|
||||
"page.feeds.title": "Fontes",
|
||||
"page.history.title": "Histórico",
|
||||
@@ -504,7 +507,7 @@
|
||||
"page.keyboard_shortcuts.subtitle.sections": "Navegação de seções",
|
||||
"page.keyboard_shortcuts.title": "Atalhos de teclado",
|
||||
"page.keyboard_shortcuts.toggle_bookmark_status": "Marcar ou desmarcar como favorito",
|
||||
"page.keyboard_shortcuts.toggle_entry_attachments": "Toggle open/close entry attachments",
|
||||
"page.keyboard_shortcuts.toggle_entry_attachments": "Alternar abrir/fechar anexos do item",
|
||||
"page.keyboard_shortcuts.toggle_read_status_next": "Inverter estado de leitura do item, focar próximo item",
|
||||
"page.keyboard_shortcuts.toggle_read_status_prev": "Inverter estado de leitura do item, focar item anterior",
|
||||
"page.login.google_signin": "Iniciar Sessão com sua conta do Google",
|
||||
@@ -520,8 +523,8 @@
|
||||
"page.offline.refresh_page": "Tente atualizar a página",
|
||||
"page.offline.title": "Modo offline",
|
||||
"page.read_entry_count": [
|
||||
"%d read entry",
|
||||
"%d read entries"
|
||||
"%d item lido",
|
||||
"%d itens lidos"
|
||||
],
|
||||
"page.search.title": "Resultados da busca",
|
||||
"page.sessions.table.actions": "Ações",
|
||||
@@ -535,35 +538,35 @@
|
||||
"page.settings.title": "Ajustes",
|
||||
"page.settings.unlink_google_account": "Desvincular minha conta do Google",
|
||||
"page.settings.unlink_oidc_account": "Desvincular minha conta do %s",
|
||||
"page.settings.webauthn.actions": "Actions",
|
||||
"page.settings.webauthn.added_on": "Added On",
|
||||
"page.settings.webauthn.actions": "Ações",
|
||||
"page.settings.webauthn.added_on": "Adicionado em",
|
||||
"page.settings.webauthn.delete": [
|
||||
"Remover %d senha",
|
||||
"Remover %d senhas"
|
||||
],
|
||||
"page.settings.webauthn.last_seen_on": "Last Used",
|
||||
"page.settings.webauthn.passkey_name": "Passkey Name",
|
||||
"page.settings.webauthn.passkeys": "Passkeys",
|
||||
"page.settings.webauthn.last_seen_on": "Último uso",
|
||||
"page.settings.webauthn.passkey_name": "Nome da senha",
|
||||
"page.settings.webauthn.passkeys": "Senhas",
|
||||
"page.settings.webauthn.register": "Registrar senha",
|
||||
"page.settings.webauthn.register.error": "Não foi possível registrar a senha",
|
||||
"page.shared_entries.title": "Itens compartilhados",
|
||||
"page.shared_entries_count": [
|
||||
"%d shared entry",
|
||||
"%d shared entries"
|
||||
"%d item compartilhado",
|
||||
"%d itens compartilhados"
|
||||
],
|
||||
"page.starred.title": "Favoritos",
|
||||
"page.starred_entry_count": [
|
||||
"%d starred entry",
|
||||
"%d starred entries"
|
||||
"%d item favorito",
|
||||
"%d itens favoritos"
|
||||
],
|
||||
"page.total_entry_count": [
|
||||
"%d entry in total",
|
||||
"%d entries in total"
|
||||
"%d item no total",
|
||||
"%d itens no total"
|
||||
],
|
||||
"page.unread.title": "Não lidos",
|
||||
"page.unread_entry_count": [
|
||||
"%d unread entry",
|
||||
"%d unread entries"
|
||||
"%d item não lido",
|
||||
"%d itens não lidos"
|
||||
],
|
||||
"page.users.actions": "Ações",
|
||||
"page.users.admin.no": "Não",
|
||||
@@ -573,15 +576,15 @@
|
||||
"page.users.never_logged": "Nunca",
|
||||
"page.users.title": "Usuários",
|
||||
"page.users.username": "Nome de usuário",
|
||||
"page.webauthn_rename.title": "Rename Passkey",
|
||||
"pagination.first": "First",
|
||||
"pagination.last": "Last",
|
||||
"page.webauthn_rename.title": "Renomear senha",
|
||||
"pagination.first": "Primeira",
|
||||
"pagination.last": "Última",
|
||||
"pagination.next": "Próximo",
|
||||
"pagination.previous": "Anterior",
|
||||
"search.label": "Buscar",
|
||||
"search.placeholder": "Buscar por...",
|
||||
"search.submit": "Search",
|
||||
"skip_to_content": "Skip to content",
|
||||
"search.submit": "Buscar",
|
||||
"skip_to_content": "Pular para o conteúdo",
|
||||
"time_elapsed.days": [
|
||||
"há %d dia",
|
||||
"há %d dias"
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "ontem",
|
||||
"tooltip.keyboard_shortcuts": "Atalho do teclado: %s",
|
||||
"tooltip.logged_user": "Autenticado como %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Nu sunt înregistrări pentru această etichetă.",
|
||||
"alert.no_unread_entry": "Nu sunt intrări necitite.",
|
||||
"alert.no_user": "Sunteți singurul utilizator.",
|
||||
"alert.pocket_linked": "Contul dvs. Pocket este atașat!",
|
||||
"alert.prefs_saved": "Preferințe salvate!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Ați activat actualizarea a prea multe fluxuri de informații. Vă rog să așteptați %d minut înainte de a reîncerca.",
|
||||
@@ -79,6 +78,11 @@
|
||||
"entry.status.toast.read": "Marcat ca citit",
|
||||
"entry.status.toast.unread": "Marcat ca necitit",
|
||||
"entry.tags.label": "Etichete:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Afișează încă o etichetă",
|
||||
"Afișează încă %d etichete",
|
||||
"Afișează încă %d de etichete"
|
||||
],
|
||||
"entry.unshare.label": "Elimină partajarea",
|
||||
"error.api_key_already_exists": "Această cheie API există deja.",
|
||||
"error.bad_credentials": "Utilizator sau parolă invalide.",
|
||||
@@ -121,7 +125,7 @@
|
||||
"error.invalid_display_mode": "Mod invalid de afișare în aplicația web.",
|
||||
"error.invalid_entry_direction": "Direcție invalidă ăn intrare.",
|
||||
"error.invalid_entry_order": "Direcție de sortare invalidă.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "URL proxy invalid.",
|
||||
"error.invalid_feed_url": "Adresa URL a fluxului este invalidă.",
|
||||
"error.invalid_gesture_nav": "Gest de navigare invalid.",
|
||||
"error.invalid_language": "Limbă invalidă.",
|
||||
@@ -131,14 +135,12 @@
|
||||
"error.network_operation": "Miniflux nu poate ajunge la acest site din cauza unei erori de rețea: %v.",
|
||||
"error.network_timeout": "Acest site web este prea lent și conexiunea nu s-a realizat: %v",
|
||||
"error.password_min_length": "Parola trebuie să aibă cel puțin 6 caractere.",
|
||||
"error.pocket_access_token": "Nu poate obține token-ul de acces de la Pocket!",
|
||||
"error.pocket_request_token": "Nu poate obține token-ul solicitat de la Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "URL-ul proxy nu poate fi gol.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Regulă de bloc invalidă: regulii #%d îi lipsește un nume valid de câmp (Opțiuni: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Regulă de bloc invalidă: modelul regulii #%d's nu este regex valid",
|
||||
"error.settings_block_rule_regex_required": "Regulă de bloc invalidă: modelul regulii #%d's nu este furnizat",
|
||||
"error.settings_block_rule_separator_required": "Regulă de bloc invalidă: modelul regulii #%d's trebuie separat de '='",
|
||||
"error.settings_invalid_domain_list": "Lista domeniilor invalidă. Vă rugăm să ne furnizați o listă separată de virgulă a domeniilor.",
|
||||
"error.settings_invalid_domain_list": "Lista domeniilor este invalidă. Vă rugăm să furnizați o listă de domenii separate prin spațiu.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Regulă Keep invalidă: regulii #%d îi lipsește un nume valid (Opțiuni: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Regulă Keep invalidă: modelul regulii #%d's nu este regex valid",
|
||||
"error.settings_keep_rule_regex_required": "Regulă Keep invalidă: modelul regulii #%d nu este furnizat",
|
||||
@@ -170,7 +172,8 @@
|
||||
"form.feed.fieldset.rules": "Reguli",
|
||||
"form.feed.label.allow_self_signed_certificates": "Permite certificatele auto-semnate sau invalide",
|
||||
"form.feed.label.apprise_service_urls": "Lista de URL-uri ale serviciilor Apprise separate prin virgule",
|
||||
"form.feed.label.blocklist_rules": "Reguli de Blocare",
|
||||
"form.feed.label.block_filter_entry_rules": "Reguli de Blocare a Intrărilor",
|
||||
"form.feed.label.blocklist_rules": "Filtre de Blocare Bazate pe Regex",
|
||||
"form.feed.label.category": "Categorie",
|
||||
"form.feed.label.cookie": "Setare Cookie-uri",
|
||||
"form.feed.label.crawler": "Aduce conținutul original",
|
||||
@@ -183,7 +186,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Utilizați proxy-ul configurat la nivelul aplicației",
|
||||
"form.feed.label.hide_globally": "Ascunde intrările în lista globală de articole necitite",
|
||||
"form.feed.label.ignore_http_cache": "Ignoră cache HTTP",
|
||||
"form.feed.label.keeplist_rules": "Reguli de Păstrare",
|
||||
"form.feed.label.keep_filter_entry_rules": "Reguli de Permitere a Intrărilor",
|
||||
"form.feed.label.keeplist_rules": "Filtre de Păstrare Bazate pe Regex",
|
||||
"form.feed.label.no_media_player": "Nu există player media (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Împinge intrările la ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Prioritate predefinită Ntfy",
|
||||
@@ -193,7 +197,7 @@
|
||||
"form.feed.label.ntfy_min_priority": "Prioritate minimă Ntfy",
|
||||
"form.feed.label.ntfy_priority": "Prioritate Ntfy",
|
||||
"form.feed.label.ntfy_topic": "Subiect Ntfy (opțional)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.proxy_url": "URL Proxy",
|
||||
"form.feed.label.pushover_activate": "Activează Pushover",
|
||||
"form.feed.label.pushover_default_priority": "Prioritate implicită Pushover",
|
||||
"form.feed.label.pushover_high_priority": "Prioritate ridicată Pushover",
|
||||
@@ -201,7 +205,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Prioritate maximă Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Prioritate minimă Pushover",
|
||||
"form.feed.label.pushover_priority": "Prioritate Pushover",
|
||||
"form.feed.label.rewrite_rules": "Rescrie Regulile",
|
||||
"form.feed.label.rewrite_rules": "Reguli de Rescriere a Conținutului",
|
||||
"form.feed.label.scraper_rules": "Reguli de Eliminare",
|
||||
"form.feed.label.site_url": "Adresă URL",
|
||||
"form.feed.label.title": "Titlu",
|
||||
@@ -220,7 +224,7 @@
|
||||
"form.integration.cubox_api_link": "Link APi Cubox",
|
||||
"form.integration.discord_activate": "Împinge intrările pe Discord",
|
||||
"form.integration.discord_webhook_link": "Link Webhook Discord",
|
||||
"form.integration.espial_activate": "Save entries to Espial",
|
||||
"form.integration.espial_activate": "Salvează intrările în Espial",
|
||||
"form.integration.espial_api_key": "Cheie API Espial",
|
||||
"form.integration.espial_endpoint": "Punct acces API Espial",
|
||||
"form.integration.espial_tags": "Etichete Espial",
|
||||
@@ -235,6 +239,9 @@
|
||||
"form.integration.instapaper_activate": "Salvează înregistrările pe Instapaper",
|
||||
"form.integration.instapaper_password": "Parolă Instapaper",
|
||||
"form.integration.instapaper_username": "Utilizator Instapaper",
|
||||
"form.integration.karakeep_activate": "Salvare înregistrări în Karakeep",
|
||||
"form.integration.karakeep_api_key": "Cheie API Karakeep",
|
||||
"form.integration.karakeep_url": "Punct acces API Karakeep",
|
||||
"form.integration.linkace_activate": "Salvează intrările în LinkAce",
|
||||
"form.integration.linkace_api_key": "Cheie API LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Dezactivează verificarea link-urilor",
|
||||
@@ -275,10 +282,6 @@
|
||||
"form.integration.pinboard_bookmark": "Marchează bookmark ca necitit",
|
||||
"form.integration.pinboard_tags": "Etichete Pinboard",
|
||||
"form.integration.pinboard_token": "Token API Pinboard",
|
||||
"form.integration.pocket_access_token": "Token Acces Pocket",
|
||||
"form.integration.pocket_activate": "Salvează înregistrările în Pocket",
|
||||
"form.integration.pocket_connect_link": "Conectează contul Pocket personal",
|
||||
"form.integration.pocket_consumer_key": "Cheie Consumator Pocket",
|
||||
"form.integration.pushover_activate": "Activează Pushover",
|
||||
"form.integration.pushover_device": "Dispozitiv Pushover (opțional)",
|
||||
"form.integration.pushover_prefix": "Prefix Pushover (opțional)",
|
||||
@@ -330,6 +333,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Setări Globale pt. Flux",
|
||||
"form.prefs.fieldset.reader_settings": "Setări Citire",
|
||||
"form.prefs.help.external_font_hosts": "Lista fonturilor de pe gazdă separate de virgulă care poate fi utilizate. De exemplu: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Citește articolele deschizând linkurile externe",
|
||||
"form.prefs.label.categories_sorting_order": "Sortare categorii",
|
||||
"form.prefs.label.cjk_reading_speed": "Viteză de citire pentru Chineză, Coreană și Japoneză (caractere pe minut)",
|
||||
"form.prefs.label.custom_css": "CSS personalizat",
|
||||
@@ -350,7 +354,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Marchează intrările ca citite la vizualizare",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Marchează intrările ca citite la vizualizare. Pentru audio/video, marchează ca citit la redarea a 90%% de conținut",
|
||||
"form.prefs.label.media_playback_rate": "Viteza de rulare audio/video",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Deschide linkurile externe într-o filă nouă (adaugă target=\"_blank\" la linkuri)",
|
||||
"form.prefs.label.show_reading_time": "Afișare timp estimat de citire pentru înregistrări",
|
||||
"form.prefs.label.theme": "Temă",
|
||||
"form.prefs.label.timezone": "Fus orar",
|
||||
@@ -628,4 +632,4 @@
|
||||
"time_elapsed.yesterday": "ieri",
|
||||
"tooltip.keyboard_shortcuts": "Scurtături Tastatură: %s",
|
||||
"tooltip.logged_user": "Atentificat ca %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Нет записей, соответствующих этому тегу.",
|
||||
"alert.no_unread_entry": "Нет непрочитанных статей.",
|
||||
"alert.no_user": "Вы единственный пользователь.",
|
||||
"alert.pocket_linked": "Ваш Pocket аккаунт теперь привязан!",
|
||||
"alert.prefs_saved": "Предпочтения сохранены!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Вы запустили слишком много обновлений подписок. Подождите %d минуту для нового запуска",
|
||||
@@ -79,6 +78,11 @@
|
||||
"entry.status.toast.read": "Помечено как прочитанное",
|
||||
"entry.status.toast.unread": "Помечено как непрочитанное",
|
||||
"entry.tags.label": "Теги:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Ещё %d тег",
|
||||
"Ещё %d тега",
|
||||
"Ещё %d тегов"
|
||||
],
|
||||
"entry.unshare.label": "Удалить из общедоступных",
|
||||
"error.api_key_already_exists": "Этот API-ключ уже существует.",
|
||||
"error.bad_credentials": "Неверное имя пользователя или пароль.",
|
||||
@@ -131,8 +135,6 @@
|
||||
"error.network_operation": "Miniflux не может открыть сайт из-за ошибки сети: %v.",
|
||||
"error.network_timeout": "Этот сайт слишком медленный и время ожидания запроса истекло: %v",
|
||||
"error.password_min_length": "Вы должны использовать минимум 6 символов.",
|
||||
"error.pocket_access_token": "Не удалось получить ключ доступа от Pocket!",
|
||||
"error.pocket_request_token": "Не удалось получить request token от Pocket!",
|
||||
"error.proxy_url_not_empty": "URL прокси не может быть пустым.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Недопустимое правило блокировки: у правила #%d отсутствует корректное имя поля (Возможные варианты: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Недопустимое правило блокировки: шаблон правила #%d не является корректным регулярным выражением",
|
||||
@@ -170,7 +172,8 @@
|
||||
"form.feed.fieldset.rules": "Правила",
|
||||
"form.feed.label.allow_self_signed_certificates": "Разрешить самоподписанные или недействительные сертификаты",
|
||||
"form.feed.label.apprise_service_urls": "Список ссылок сервисов Apprise, разделенный запятой",
|
||||
"form.feed.label.blocklist_rules": "Правила черного списка",
|
||||
"form.feed.label.block_filter_entry_rules": "Правила блокировки записей",
|
||||
"form.feed.label.blocklist_rules": "Фильтры блокировки на основе регулярных выражений",
|
||||
"form.feed.label.category": "Категория",
|
||||
"form.feed.label.cookie": "Установить куки",
|
||||
"form.feed.label.crawler": "Извлечь оригинальное содержимое",
|
||||
@@ -183,7 +186,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "Использовать прокси, настроенный на уровне приложения",
|
||||
"form.feed.label.hide_globally": "Скрыть записи в глобальном списке непрочитанных",
|
||||
"form.feed.label.ignore_http_cache": "Игнорировать HTTP кеш",
|
||||
"form.feed.label.keeplist_rules": "Правила белого списка",
|
||||
"form.feed.label.keep_filter_entry_rules": "Правила разрешения записей",
|
||||
"form.feed.label.keeplist_rules": "Фильтры сохранения на основе регулярных выражений",
|
||||
"form.feed.label.no_media_player": "Отключить медиаплеер (аудио и видео)",
|
||||
"form.feed.label.ntfy_activate": "Отправлять статьи в ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "По умолчанию",
|
||||
@@ -201,7 +205,7 @@
|
||||
"form.feed.label.pushover_max_priority": "Высший",
|
||||
"form.feed.label.pushover_min_priority": "Минимальный",
|
||||
"form.feed.label.pushover_priority": "Приоритет сообщений Pushover",
|
||||
"form.feed.label.rewrite_rules": "Правила перезаписи",
|
||||
"form.feed.label.rewrite_rules": "Правила переписывания содержимого",
|
||||
"form.feed.label.scraper_rules": "Правила сборщика",
|
||||
"form.feed.label.site_url": "Адрес сайта",
|
||||
"form.feed.label.title": "Название",
|
||||
@@ -235,6 +239,9 @@
|
||||
"form.integration.instapaper_activate": "Сохранять статьи в Instapaper",
|
||||
"form.integration.instapaper_password": "Пароль Instapaper",
|
||||
"form.integration.instapaper_username": "Имя пользователя Instapaper",
|
||||
"form.integration.karakeep_activate": "Сохранять статьи в Karakeep",
|
||||
"form.integration.karakeep_api_key": "API-ключ Karakeep",
|
||||
"form.integration.karakeep_url": "Конечная точка Karakeep API",
|
||||
"form.integration.linkace_activate": "Сохранять статьи в LinkAce",
|
||||
"form.integration.linkace_api_key": "API-ключ LinkAce",
|
||||
"form.integration.linkace_check_disabled": "Отключить проверку ссылок",
|
||||
@@ -275,10 +282,6 @@
|
||||
"form.integration.pinboard_bookmark": "Помечать закладки как непрочитанное",
|
||||
"form.integration.pinboard_tags": "Теги Pinboard",
|
||||
"form.integration.pinboard_token": "Токен Pinboard API",
|
||||
"form.integration.pocket_access_token": "Ключ доступа к Pocket",
|
||||
"form.integration.pocket_activate": "Сохранять статьи в Pocket",
|
||||
"form.integration.pocket_connect_link": "Подключить аккаунт Pocket",
|
||||
"form.integration.pocket_consumer_key": "Ключ пользователя Pocket",
|
||||
"form.integration.pushover_activate": "Отправлять статьи Pushover",
|
||||
"form.integration.pushover_device": "Устройство Pushover (опционально)",
|
||||
"form.integration.pushover_prefix": "URL-префикс Pushover (опционально)",
|
||||
@@ -330,6 +333,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "Глобальные настройки подписок",
|
||||
"form.prefs.fieldset.reader_settings": "Настройки чтения",
|
||||
"form.prefs.help.external_font_hosts": "Список разрешённых внешних хостов для шрифтов, разделенных пробелами. Например: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.label.always_open_external_links": "Читать статьи, открывая внешние ссылки",
|
||||
"form.prefs.label.categories_sorting_order": "Сортировка категорий",
|
||||
"form.prefs.label.cjk_reading_speed": "Скорость чтения на китайском, корейском и японском языках (знаков в минуту)",
|
||||
"form.prefs.label.custom_css": "Пользовательский CSS",
|
||||
@@ -350,7 +354,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Автоматически отмечать записи как прочитанные при просмотре",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Отмечать статьи как прочитанные при просмотре. Для аудио/видео - при 90%% завершения воспроизведения",
|
||||
"form.prefs.label.media_playback_rate": "Скорость воспроизведения аудио/видео",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Открывать внешние ссылки в новой вкладке (добавляет target=\"_blank\" к ссылкам)",
|
||||
"form.prefs.label.show_reading_time": "Показать примерное время чтения статей",
|
||||
"form.prefs.label.theme": "Тема",
|
||||
"form.prefs.label.timezone": "Часовой пояс",
|
||||
@@ -470,7 +474,7 @@
|
||||
"page.integration.bookmarklet.help": "Эта специальная ссылка позволит вам подписаться на сайт, используя обыкновенную закладку в вашем браузере.",
|
||||
"page.integration.bookmarklet.instructions": "Перетащите эту ссылку в ваши закладки.",
|
||||
"page.integration.bookmarklet.name": "Добавить в Miniflux",
|
||||
"page.integration.miniflux_api": "Miniflux API",
|
||||
"page.integration.miniflux_api": "API Miniflux",
|
||||
"page.integration.miniflux_api_endpoint": "Конечная точка API",
|
||||
"page.integration.miniflux_api_password": "Пароль",
|
||||
"page.integration.miniflux_api_password_value": "Пароль вашего аккаунта",
|
||||
@@ -628,4 +632,4 @@
|
||||
"time_elapsed.yesterday": "вчера",
|
||||
"tooltip.keyboard_shortcuts": "Сочетания клавиш: %s",
|
||||
"tooltip.logged_user": "Авторизован как %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "Bu etiketle eşleşen hiçbir giriş yok.",
|
||||
"alert.no_unread_entry": "Okunmamış makele yok",
|
||||
"alert.no_user": "Tek kullanıcı sizsiniz",
|
||||
"alert.pocket_linked": "Pocket hesabınız artık bağlandı.",
|
||||
"alert.prefs_saved": "Tercihler kaydedildi!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"Çok fazla besleme yenilemesi başlattınız. Tekrar denemeden önce lütfen %d dakika bekleyin.",
|
||||
@@ -77,6 +76,10 @@
|
||||
"entry.status.toast.read": "Okundu olarak işaretlendi",
|
||||
"entry.status.toast.unread": "Okunmamış olarak işaretlendi",
|
||||
"entry.tags.label": "Etiketler:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"%d tane daha etiket göster",
|
||||
"%d tane daha etiket göster"
|
||||
],
|
||||
"entry.unshare.label": "Paylaşma",
|
||||
"error.api_key_already_exists": "Bu API anahtarı zaten mevcut.",
|
||||
"error.bad_credentials": "Geçersiz kullanıcı veya parola.",
|
||||
@@ -119,7 +122,7 @@
|
||||
"error.invalid_display_mode": "Geçersiz web uygulaması görüntüleme modu.",
|
||||
"error.invalid_entry_direction": "Geçersiz makele sıralaması.",
|
||||
"error.invalid_entry_order": "Geçersiz makele sıralaması.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "Geçersiz proxy URL'si.",
|
||||
"error.invalid_feed_url": "Geçersiz besleme URL'si.",
|
||||
"error.invalid_gesture_nav": "Hareketle gezinme geçersiz.",
|
||||
"error.invalid_language": "Geçersiz dil.",
|
||||
@@ -129,14 +132,12 @@
|
||||
"error.network_operation": "Miniflux bir ağ hatası nedeniyle bu websitesine erişemiyor: %v.",
|
||||
"error.network_timeout": "Bu websitesi çok yavaş ve istek zaman aşımına uğradı: %v",
|
||||
"error.password_min_length": "Parola en az 6 karakter içermeli.",
|
||||
"error.pocket_access_token": "Pocket'tan access tokeni alınamıyor!",
|
||||
"error.pocket_request_token": "Pocket'tan request tokeni alınamıyor!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "Proxy URL'si boş olamaz.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Geçersiz Engelleme kuralı: #%d kuralında geçerli bir alan adı eksik (Seçenekler: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Geçersiz Engelleme kuralı: #%d kuralı modeli geçerli bir düzenli ifade değil",
|
||||
"error.settings_block_rule_regex_required": "Geçersiz Engelleme kuralı: #%d kuralı modeli sağlanmadı",
|
||||
"error.settings_block_rule_separator_required": "Geçersiz Engelleme kuralı: #%d kuralı modelinin '=' ile ayrılması gerekiyor",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_invalid_domain_list": "Geçersiz alan adı listesi. Lütfen boşlukla ayrılmış bir alan adı listesi girin.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Geçersiz Koruma kuralı: #%d kuralında geçerli bir alan adı eksik (Seçenekler: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Geçersiz Koruma kuralı: #%d kuralı modeli geçerli bir düzenli ifade değil",
|
||||
"error.settings_keep_rule_regex_required": "Geçersiz Koruma kuralı: #%d kuralı modeli sağlanmadı",
|
||||
@@ -168,7 +169,8 @@
|
||||
"form.feed.fieldset.rules": "Kurallar",
|
||||
"form.feed.label.allow_self_signed_certificates": "Kendinden imzalı veya geçersiz sertifikalara izin ver",
|
||||
"form.feed.label.apprise_service_urls": "Apprise hizmet URL'lerinin virgülle ayrılmış listesi",
|
||||
"form.feed.label.blocklist_rules": "Engelleme Kuralları",
|
||||
"form.feed.label.block_filter_entry_rules": "Giriş Engelleme Kuralları",
|
||||
"form.feed.label.blocklist_rules": "Regex Tabanlı Engelleme Filtreleri",
|
||||
"form.feed.label.category": "Kategori",
|
||||
"form.feed.label.cookie": "Çerezleri Ayarla",
|
||||
"form.feed.label.crawler": "Orijinal içeriği çek",
|
||||
@@ -181,31 +183,32 @@
|
||||
"form.feed.label.fetch_via_proxy": "Uygulama düzeyinde yapılandırılmış proxy'yi kullan",
|
||||
"form.feed.label.hide_globally": "Genel okunmamış listesindeki girişleri gizle",
|
||||
"form.feed.label.ignore_http_cache": "HTTP önbelleğini yoksay",
|
||||
"form.feed.label.keeplist_rules": "Saklama Kuralları",
|
||||
"form.feed.label.keep_filter_entry_rules": "Giriş İzin Kuralları",
|
||||
"form.feed.label.keeplist_rules": "Regex Tabanlı Tutma Filtreleri",
|
||||
"form.feed.label.no_media_player": "Medya oynatıcı yok (ses/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
"form.feed.label.ntfy_high_priority": "Ntfy high priority",
|
||||
"form.feed.label.ntfy_low_priority": "Ntfy low priority",
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy max priority",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy min priority",
|
||||
"form.feed.label.ntfy_priority": "Ntfy priority",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (optional)",
|
||||
"form.feed.label.ntfy_activate": "Makaleleri ntfy'ye gönder",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy varsayılan öncelik",
|
||||
"form.feed.label.ntfy_high_priority": "Ntfy yüksek öncelik",
|
||||
"form.feed.label.ntfy_low_priority": "Ntfy düşük öncelik",
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy maksimum öncelik",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy minimum öncelik",
|
||||
"form.feed.label.ntfy_priority": "Ntfy öncelik",
|
||||
"form.feed.label.ntfy_topic": "Ntfy konusu (isteğe bağlı)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Yeniden Yazma Kuralları",
|
||||
"form.feed.label.pushover_activate": "Makaleleri pushover.net'e gönder",
|
||||
"form.feed.label.pushover_default_priority": "Pushover varsayılan öncelik",
|
||||
"form.feed.label.pushover_high_priority": "Pushover yüksek öncelik",
|
||||
"form.feed.label.pushover_low_priority": "Pushover düşük öncelik",
|
||||
"form.feed.label.pushover_max_priority": "Pushover maksimum öncelik",
|
||||
"form.feed.label.pushover_min_priority": "Pushover minimum öncelik",
|
||||
"form.feed.label.pushover_priority": "Pushover mesaj önceliği",
|
||||
"form.feed.label.rewrite_rules": "İçerik Yeniden Yazma Kuralları",
|
||||
"form.feed.label.scraper_rules": "Scrapper Kuralları",
|
||||
"form.feed.label.site_url": "Site URL'si",
|
||||
"form.feed.label.title": "Başlık",
|
||||
"form.feed.label.urlrewrite_rules": "URL Yeniden Yazma Kuralları",
|
||||
"form.feed.label.user_agent": "Varsayılan User Agent'i Geçersiz Kıl",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "Webhook URL'sini geçersiz kıl",
|
||||
"form.import.label.file": "OPML dosyası",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "Makaleleri Apprise'a gönder",
|
||||
@@ -214,8 +217,8 @@
|
||||
"form.integration.betula_activate": "Makaleleri Betula'ya kaydet",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
"form.integration.betula_url": "Betula sunucu URLsi",
|
||||
"form.integration.cubox_activate": "Save entries to Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API link",
|
||||
"form.integration.cubox_activate": "Makaleleri Cubox'a kaydet",
|
||||
"form.integration.cubox_api_link": "Cubox API bağlantısı",
|
||||
"form.integration.discord_activate": "Makaleleri Discord'a gönder",
|
||||
"form.integration.discord_webhook_link": "Discord hizmet Webhook'lerinin virgülle ayrılmış listesi",
|
||||
"form.integration.espial_activate": "Makaleleri Espial'e kaydet",
|
||||
@@ -233,6 +236,9 @@
|
||||
"form.integration.instapaper_activate": "Makaleleri Instapaper'a kaydet",
|
||||
"form.integration.instapaper_password": "Instapaper Parolası",
|
||||
"form.integration.instapaper_username": "Instapaper Kullanıcı Adı",
|
||||
"form.integration.karakeep_activate": "Makaleleri Karakeep'a kaydet",
|
||||
"form.integration.karakeep_api_key": "Karakeep API anahtarı",
|
||||
"form.integration.karakeep_url": "Karakeep API Uç Noktası",
|
||||
"form.integration.linkace_activate": "Makaleleri LinkAce'e kaydet",
|
||||
"form.integration.linkace_api_key": "LinkAce API anahtarı",
|
||||
"form.integration.linkace_check_disabled": "Link kontrolünü devre dışı bırak",
|
||||
@@ -258,7 +264,7 @@
|
||||
"form.integration.ntfy_activate": "Push entries to ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (optional)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
|
||||
"form.integration.ntfy_internal_links": "Use internal links on click (optional)",
|
||||
"form.integration.ntfy_internal_links": "Tıklamada dahili bağlantıları kullan (isteğe bağlı)",
|
||||
"form.integration.ntfy_password": "Ntfy Password (optional)",
|
||||
"form.integration.ntfy_topic": "Ntfy topic (default if not set in feed)",
|
||||
"form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
|
||||
@@ -273,10 +279,6 @@
|
||||
"form.integration.pinboard_bookmark": "Yer imini okunmadı olarak işaretle",
|
||||
"form.integration.pinboard_tags": "Pinboard Etiketleri",
|
||||
"form.integration.pinboard_token": "Pinboard API Token",
|
||||
"form.integration.pocket_access_token": "Pocket Access Token",
|
||||
"form.integration.pocket_activate": "Makaleleri Pocket'a kaydet",
|
||||
"form.integration.pocket_connect_link": "Pocket hesabını bağla",
|
||||
"form.integration.pocket_consumer_key": "Pocket Consumer Anahtarı",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -327,7 +329,8 @@
|
||||
"form.prefs.fieldset.authentication_settings": "Kimlik Doğrulama Ayarları",
|
||||
"form.prefs.fieldset.global_feed_settings": "Genel Besleme Ayarları",
|
||||
"form.prefs.fieldset.reader_settings": "Okuyucu Ayarları",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.help.external_font_hosts": "İzin verilecek harici font sunucularının boşlukla ayrılmış listesi. Örneğin: 'fonts.gstatic.com fonts.googleapis.com'.",
|
||||
"form.prefs.label.always_open_external_links": "Makaleleri harici bağlantıları açarak oku",
|
||||
"form.prefs.label.categories_sorting_order": "Kategori sıralaması",
|
||||
"form.prefs.label.cjk_reading_speed": "Çince, Korece ve Japonca için okuma hızı (dakika başına karakter)",
|
||||
"form.prefs.label.custom_css": "Özel CSS",
|
||||
@@ -339,7 +342,7 @@
|
||||
"form.prefs.label.entry_order": "Makale Sıralama Sütunu",
|
||||
"form.prefs.label.entry_sorting": "Makale Sıralaması",
|
||||
"form.prefs.label.entry_swipe": "Dokunmatik ekranlarda makale kaydırmayı etkinleştir",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Harici font sunucuları",
|
||||
"form.prefs.label.gesture_nav": "Makaleler arasında gezinmek için dokunma hareketi",
|
||||
"form.prefs.label.keyboard_shortcuts": "Klavye kısayollarını etkinleştir",
|
||||
"form.prefs.label.language": "Dil",
|
||||
@@ -348,7 +351,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Makaleler görüntülendiğinde otomatik olarak okundu olarak işaretle",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "Ses/video oynatma hızı",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Harici bağlantıları yeni bir sekmede aç (bağlantılara target=\"_blank\" ekler)",
|
||||
"form.prefs.label.show_reading_time": "Makaleler için tahmini okuma süresini göster",
|
||||
"form.prefs.label.theme": "Tema",
|
||||
"form.prefs.label.timezone": "Saat Dilimi",
|
||||
@@ -611,4 +614,4 @@
|
||||
"time_elapsed.yesterday": "dün",
|
||||
"tooltip.keyboard_shortcuts": "Klavye Kısayolu: %s",
|
||||
"tooltip.logged_user": "%s olarak giriş yapıldı"
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
"action.update": "Зберегти",
|
||||
"alert.account_linked": "Тепер ваш зовнішній обліковий запис від’єднано!",
|
||||
"alert.account_unlinked": "Тепер ваш зовнішній обліковий запис підключено!",
|
||||
"alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
|
||||
"alert.background_feed_refresh": "Всі стрічки оновлюються у фоновому режимі. Ви можете продовжувати користуватися Miniflux, поки триває цей процес.",
|
||||
"alert.feed_error": "З цією стрічкою трапилась помилка",
|
||||
"alert.no_bookmark": "Наразі закладки відсутні.",
|
||||
"alert.no_category": "Немає категорії.",
|
||||
@@ -27,27 +27,26 @@
|
||||
"alert.no_tag_entry": "Немає записів, що відповідають цьому тегу.",
|
||||
"alert.no_unread_entry": "Немає непрочитаних статей.",
|
||||
"alert.no_user": "Ви єдиний користувач.",
|
||||
"alert.pocket_linked": "Тепер ваш обліковий запис Pocket підключено!",
|
||||
"alert.prefs_saved": "Уподобання збережено!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"You have triggered too many feed refreshes. Please wait %d minute before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again.",
|
||||
"You have triggered too many feed refreshes. Please wait %d minutes before trying again."
|
||||
"Ви запустили надто багато оновлень стрічок. Будь ласка, зачекайте %d хвилину перед повторною спробою.",
|
||||
"Ви запустили надто багато оновлень стрічок. Будь ласка, зачекайте %d хвилини перед повторною спробою.",
|
||||
"Ви запустили надто багато оновлень стрічок. Будь ласка, зачекайте %d хвилин перед повторною спробою."
|
||||
],
|
||||
"confirm.loading": "В процесі...",
|
||||
"confirm.no": "ні",
|
||||
"confirm.question": "Ви впевнені?",
|
||||
"confirm.question.refresh": "Ви хочете змусити оновити?",
|
||||
"confirm.yes": "так",
|
||||
"enclosure_media_controls.seek": "Seek:",
|
||||
"enclosure_media_controls.seek.title": "Seek %s seconds",
|
||||
"enclosure_media_controls.speed": "Speed:",
|
||||
"enclosure_media_controls.speed.faster": "Faster",
|
||||
"enclosure_media_controls.speed.faster.title": "Faster by %sx",
|
||||
"enclosure_media_controls.speed.reset": "Reset",
|
||||
"enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
|
||||
"enclosure_media_controls.speed.slower": "Slower",
|
||||
"enclosure_media_controls.speed.slower.title": "Slower by %sx",
|
||||
"enclosure_media_controls.seek": "Пошук:",
|
||||
"enclosure_media_controls.seek.title": "Пошук %s секунд",
|
||||
"enclosure_media_controls.speed": "Швидкість:",
|
||||
"enclosure_media_controls.speed.faster": "Швидше",
|
||||
"enclosure_media_controls.speed.faster.title": "Швидше на %sx",
|
||||
"enclosure_media_controls.speed.reset": "Скинути",
|
||||
"enclosure_media_controls.speed.reset.title": "Скинути швидкість до 1x",
|
||||
"enclosure_media_controls.speed.slower": "Повільніше",
|
||||
"enclosure_media_controls.speed.slower.title": "Повільніше на %sx",
|
||||
"entry.bookmark.toast.off": "Без зірочки",
|
||||
"entry.bookmark.toast.on": "З зірочкою",
|
||||
"entry.bookmark.toggle.off": "Прибрати зірочку",
|
||||
@@ -79,77 +78,80 @@
|
||||
"entry.status.toast.read": "Відмічено прочитаним",
|
||||
"entry.status.toast.unread": "Відмічено непрочитаним",
|
||||
"entry.tags.label": "Теги:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"Ще %d тег",
|
||||
"Ще %d теги",
|
||||
"Ще %d тегів"
|
||||
],
|
||||
"entry.unshare.label": "Не ділитися",
|
||||
"error.api_key_already_exists": "Такий ключ API вже існує.",
|
||||
"error.bad_credentials": "Невірне ім’я користувача або пароль.",
|
||||
"error.category_already_exists": "Така категорія вже існує.",
|
||||
"error.category_not_found": "This category does not exist or does not belong to this user.",
|
||||
"error.database_error": "Database error: %v.",
|
||||
"error.category_not_found": "Ця категорія не існує або не належить цьому користувачу.",
|
||||
"error.database_error": "Помилка бази даних: %v.",
|
||||
"error.different_passwords": "Паролі не співпадають.",
|
||||
"error.duplicate_fever_username": "Вже є обліковий запис з таким самим користувачем Fever!",
|
||||
"error.duplicate_googlereader_username": "Вже є обліковий запис з таким самим користувачем Google Reader!",
|
||||
"error.duplicate_linked_account": "Вже є обліковий запис, під’єднаний до цього провайдера!",
|
||||
"error.duplicated_feed": "This feed already exists.",
|
||||
"error.duplicated_feed": "Ця стрічка вже існує.",
|
||||
"error.empty_file": "Цей файл порожній.",
|
||||
"error.entries_per_page_invalid": "Число записів на сторінку недійсне.",
|
||||
"error.feed_already_exists": "Така стрічка вже існує.",
|
||||
"error.feed_category_not_found": "Категорія не існує або належить до іншого користувача.",
|
||||
"error.feed_format_not_detected": "Unable to detect feed format: %v.",
|
||||
"error.feed_format_not_detected": "Не вдалося визначити формат стрічки: %v.",
|
||||
"error.feed_invalid_blocklist_rule": "Правило списку блокувань недійсне.",
|
||||
"error.feed_invalid_keeplist_rule": "Правило списку дозволень недійсне.",
|
||||
"error.feed_mandatory_fields": "URL та категорія є обов’язковими.",
|
||||
"error.feed_not_found": "This feed does not exist or does not belong to this user.",
|
||||
"error.feed_not_found": "Ця стрічка не існує або не належить цьому користувачу.",
|
||||
"error.feed_title_not_empty": "Назва стрічки не може бути порожньою.",
|
||||
"error.feed_url_not_empty": "URL-адреса стрічки не може бути порожньою.",
|
||||
"error.fields_mandatory": "Всі поля є обов’язковими.",
|
||||
"error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_body_read": "Unable to read the HTTP body: %v.",
|
||||
"error.http_client_error": "HTTP client error: %v.",
|
||||
"error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
|
||||
"error.http_empty_response_body": "The HTTP response body is empty.",
|
||||
"error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
|
||||
"error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
|
||||
"error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
|
||||
"error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
|
||||
"error.http_service_unavailable": "The website is not available at the moment due to an internal server error. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
|
||||
"error.http_unexpected_status_code": "The website is not available at the moment due to an unexpected HTTP status code: %d. The problem is not on Miniflux side. Please, try again later.",
|
||||
"error.http_bad_gateway": "Сайт наразі недоступний через помилку шлюзу. Проблема не на стороні Miniflux. Будь ласка, спробуйте пізніше.",
|
||||
"error.http_body_read": "Не вдалося прочитати HTTP-вміст: %v.",
|
||||
"error.http_client_error": "Помилка HTTP-клієнта: %v.",
|
||||
"error.http_empty_response": "Відповідь HTTP порожня. Можливо, цей сайт використовує захист від ботів?",
|
||||
"error.http_empty_response_body": "Тіло відповіді HTTP порожнє.",
|
||||
"error.http_forbidden": "Доступ до цього сайту заборонено. Можливо, сайт має захист від ботів?",
|
||||
"error.http_gateway_timeout": "Сайт наразі недоступний через помилку тайм-ауту шлюзу. Проблема не на стороні Miniflux. Будь ласка, спробуйте пізніше.",
|
||||
"error.http_internal_server_error": "Сайт наразі недоступний через внутрішню помилку сервера. Проблема не на стороні Miniflux. Будь ласка, спробуйте пізніше.",
|
||||
"error.http_not_authorized": "Доступ до цього сайту не дозволено. Можливо, неправильне ім’я користувача або пароль.",
|
||||
"error.http_resource_not_found": "Запитаний ресурс не знайдено. Будь ласка, перевірте URL.",
|
||||
"error.http_response_too_large": "Відповідь HTTP занадто велика. Ви можете збільшити ліміт розміру HTTP-відповіді у глобальних налаштуваннях (потрібен перезапуск сервера).",
|
||||
"error.http_service_unavailable": "Сайт наразі недоступний через внутрішню помилку сервера. Проблема не на стороні Miniflux. Будь ласка, спробуйте пізніше.",
|
||||
"error.http_too_many_requests": "Miniflux згенерував надто багато запитів до цього сайту. Будь ласка, спробуйте пізніше або змініть налаштування програми.",
|
||||
"error.http_unexpected_status_code": "Сайт наразі недоступний через неочікуваний HTTP-код: %d. Проблема не на стороні Miniflux. Будь ласка, спробуйте пізніше.",
|
||||
"error.invalid_categories_sorting_order": "Недійсний порядок сортування категорій.",
|
||||
"error.invalid_default_home_page": "Недійсна домашня сторінка за замовчуванням!",
|
||||
"error.invalid_display_mode": "Недійсний режим відображення.",
|
||||
"error.invalid_entry_direction": "Недійсний напрямок запису.",
|
||||
"error.invalid_entry_order": "Недійсний порядок запису.",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "Недійсний proxy URL.",
|
||||
"error.invalid_feed_url": "Недійсна URL-адреса стрічки.",
|
||||
"error.invalid_gesture_nav": "Недійсна навігація жестами.",
|
||||
"error.invalid_language": "Недійсна мова.",
|
||||
"error.invalid_site_url": "Недійсна URL-адреса сайту.",
|
||||
"error.invalid_theme": "Недійсна тема.",
|
||||
"error.invalid_timezone": "Недійсний часовий пояс.",
|
||||
"error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
|
||||
"error.network_timeout": "This website is too slow and the request timed out: %v",
|
||||
"error.network_operation": "Miniflux не може отримати доступ до цього сайту через помилку мережі: %v.",
|
||||
"error.network_timeout": "Цей сайт занадто повільний і запит перевищив час очікування: %v",
|
||||
"error.password_min_length": "Пароль має складати щонайменше 6 символів.",
|
||||
"error.pocket_access_token": "Не вдалося отримати токен доступу з Pocket!",
|
||||
"error.pocket_request_token": "Не вдалося отримати токен доступу з Pocket!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
|
||||
"error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
|
||||
"error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
|
||||
"error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
|
||||
"error.proxy_url_not_empty": "Proxy URL не може бути порожнім.",
|
||||
"error.settings_block_rule_fieldname_invalid": "Недійсне правило блокування: у правилі #%d відсутнє коректне ім’я поля (Опції: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "Недійсне правило блокування: шаблон правила #%d не є коректним регулярним виразом",
|
||||
"error.settings_block_rule_regex_required": "Недійсне правило блокування: не вказано шаблон для правила #%d",
|
||||
"error.settings_block_rule_separator_required": "Недійсне правило блокування: шаблон правила #%d має бути розділений знаком '='",
|
||||
"error.settings_invalid_domain_list": "Недійсний список доменів. Будь ласка, вкажіть список доменів, розділених пробілами.",
|
||||
"error.settings_keep_rule_fieldname_invalid": "Недійсне правило дозволення: у правилі #%d відсутнє коректне ім’я поля (Опції: %s)",
|
||||
"error.settings_keep_rule_invalid_regex": "Недійсне правило дозволення: шаблон правила #%d не є коректним регулярним виразом",
|
||||
"error.settings_keep_rule_regex_required": "Недійсне правило дозволення: не вказано шаблон для правила #%d",
|
||||
"error.settings_keep_rule_separator_required": "Недійсне правило дозволення: шаблон правила #%d має бути розділений знаком '='",
|
||||
"error.settings_mandatory_fields": "Поля імені, теми, мови та часового поясу є обов’язковими.",
|
||||
"error.settings_media_playback_rate_range": "Швидкість відтворення виходить за межі діапазону",
|
||||
"error.settings_reading_speed_is_positive": "Швидкість читання має бути додатнім цілим числом.",
|
||||
"error.site_url_not_empty": "URL-адреса сайту не може бути порожньою.",
|
||||
"error.subscription_not_found": "Не знайшлося жодної підписки.",
|
||||
"error.title_required": "Назва є обов’язковою.",
|
||||
"error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
|
||||
"error.tls_error": "Помилка TLS: %q. Ви можете відключити перевірку TLS в налаштуваннях фіду, якщо хочете.",
|
||||
"error.unable_to_create_api_key": "Не вдається створити такий ключ API",
|
||||
"error.unable_to_create_category": "Не вдається сворити категорію.",
|
||||
"error.unable_to_create_user": "Не вдається створити користувача.",
|
||||
@@ -164,18 +166,19 @@
|
||||
"form.api_key.label.description": "Назва ключа API",
|
||||
"form.category.hide_globally": "Приховати записи в глобальному списку непрочитаного",
|
||||
"form.category.label.title": "Назва",
|
||||
"form.feed.fieldset.general": "General",
|
||||
"form.feed.fieldset.integration": "Third-Party Services",
|
||||
"form.feed.fieldset.network_settings": "Network Settings",
|
||||
"form.feed.fieldset.rules": "Rules",
|
||||
"form.feed.fieldset.general": "Загальні",
|
||||
"form.feed.fieldset.integration": "Сторонні сервіси",
|
||||
"form.feed.fieldset.network_settings": "Налаштування мережі",
|
||||
"form.feed.fieldset.rules": "Правила",
|
||||
"form.feed.label.allow_self_signed_certificates": "Дозволити сертифікати з власним підписом або недійсні",
|
||||
"form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
|
||||
"form.feed.label.blocklist_rules": "Правила блокування",
|
||||
"form.feed.label.apprise_service_urls": "Список URL сервісів Apprise, розділених комами",
|
||||
"form.feed.label.block_filter_entry_rules": "Правила блокування записів",
|
||||
"form.feed.label.blocklist_rules": "Фільтри блокування на основі регулярних виразів",
|
||||
"form.feed.label.category": "Категорія",
|
||||
"form.feed.label.cookie": "Встановити кукі",
|
||||
"form.feed.label.crawler": "Завантажувати оригінальний вміст",
|
||||
"form.feed.label.description": "Опис",
|
||||
"form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
|
||||
"form.feed.label.disable_http2": "Вимкнути HTTP/2 для уникнення відбитків",
|
||||
"form.feed.label.disabled": "Не оновлювати цю стрічку",
|
||||
"form.feed.label.feed_password": "Пароль для завантаження",
|
||||
"form.feed.label.feed_url": "URL-адреса стрічки",
|
||||
@@ -183,41 +186,42 @@
|
||||
"form.feed.label.fetch_via_proxy": "Використовувати проксі, налаштований на рівні програми",
|
||||
"form.feed.label.hide_globally": "Приховати записи в глобальному списку непрочитаного",
|
||||
"form.feed.label.ignore_http_cache": "Ігнорувати кеш HTTP",
|
||||
"form.feed.label.keeplist_rules": "Правила дозволення",
|
||||
"form.feed.label.no_media_player": "No media player (audio/video)",
|
||||
"form.feed.label.ntfy_activate": "Push entries to ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy default priority",
|
||||
"form.feed.label.ntfy_high_priority": "Ntfy high priority",
|
||||
"form.feed.label.ntfy_low_priority": "Ntfy low priority",
|
||||
"form.feed.label.ntfy_max_priority": "Ntfy max priority",
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy min priority",
|
||||
"form.feed.label.ntfy_priority": "Ntfy priority",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (optional)",
|
||||
"form.feed.label.keep_filter_entry_rules": "Правила дозволу записів",
|
||||
"form.feed.label.keeplist_rules": "Фільтри збереження на основі регулярних виразів",
|
||||
"form.feed.label.no_media_player": "Немає медіаплеєра (аудіо/відео)",
|
||||
"form.feed.label.ntfy_activate": "Надсилати записи у ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Стандартний пріоритет ntfy",
|
||||
"form.feed.label.ntfy_high_priority": "Високий пріоритет ntfy",
|
||||
"form.feed.label.ntfy_low_priority": "Низький пріоритет ntfy",
|
||||
"form.feed.label.ntfy_max_priority": "Максимальний пріоритет ntfy",
|
||||
"form.feed.label.ntfy_min_priority": "Мінімальний пріоритет ntfy",
|
||||
"form.feed.label.ntfy_priority": "Пріоритет ntfy",
|
||||
"form.feed.label.ntfy_topic": "Тема ntfy (необов’язково)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "Правила Rewrite",
|
||||
"form.feed.label.pushover_activate": "Надсилати записи у pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Стандартний пріоритет Pushover",
|
||||
"form.feed.label.pushover_high_priority": "Високий пріоритет Pushover",
|
||||
"form.feed.label.pushover_low_priority": "Низький пріоритет Pushover",
|
||||
"form.feed.label.pushover_max_priority": "Максимальний пріоритет Pushover",
|
||||
"form.feed.label.pushover_min_priority": "Мінімальний пріоритет Pushover",
|
||||
"form.feed.label.pushover_priority": "Пріоритет повідомлення Pushover",
|
||||
"form.feed.label.rewrite_rules": "Правила перезапису вмісту",
|
||||
"form.feed.label.scraper_rules": "Правила Scraper",
|
||||
"form.feed.label.site_url": "URL-адреса сайту",
|
||||
"form.feed.label.title": "Назва",
|
||||
"form.feed.label.urlrewrite_rules": "Правила перезапису URL-адрес",
|
||||
"form.feed.label.user_agent": "Назначити User Agent",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "Перевизначити URL вебхука",
|
||||
"form.import.label.file": "Файл OPML",
|
||||
"form.import.label.url": "URL-адреса",
|
||||
"form.integration.apprise_activate": "Push entries to Apprise",
|
||||
"form.integration.apprise_services_url": "Comma separated list of Apprise service URLs",
|
||||
"form.integration.apprise_activate": "Надсилати записи у Apprise",
|
||||
"form.integration.apprise_services_url": "Список URL сервісів Apprise, розділених комами",
|
||||
"form.integration.apprise_url": "Apprise API URL",
|
||||
"form.integration.betula_activate": "Save entries to Betula",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
"form.integration.betula_url": "Betula server URL",
|
||||
"form.integration.cubox_activate": "Save entries to Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API link",
|
||||
"form.integration.cubox_activate": "Зберігати статті до Cubox",
|
||||
"form.integration.cubox_api_link": "Посилання на Cubox API",
|
||||
"form.integration.discord_activate": "Push entries to Discord",
|
||||
"form.integration.discord_webhook_link": "Discord Webhook link",
|
||||
"form.integration.espial_activate": "Зберігати статті до Espial",
|
||||
@@ -235,6 +239,9 @@
|
||||
"form.integration.instapaper_activate": "Зберігати статті до Instapaper",
|
||||
"form.integration.instapaper_password": "Пароль Instapaper",
|
||||
"form.integration.instapaper_username": "Ім’я користувача Instapaper",
|
||||
"form.integration.karakeep_activate": "Зберігати статті до Karakeep",
|
||||
"form.integration.karakeep_api_key": "Ключ API Karakeep",
|
||||
"form.integration.karakeep_url": "Karakeep API Endpoint",
|
||||
"form.integration.linkace_activate": "Save entries to LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API key",
|
||||
"form.integration.linkace_check_disabled": "Disable link check",
|
||||
@@ -257,10 +264,10 @@
|
||||
"form.integration.notion_activate": "Save entries to Notion",
|
||||
"form.integration.notion_page_id": "Notion Page ID",
|
||||
"form.integration.notion_token": "Notion Secret Token",
|
||||
"form.integration.ntfy_activate": "Push entries to ntfy",
|
||||
"form.integration.ntfy_activate": "Надсилати записи у ntfy",
|
||||
"form.integration.ntfy_api_token": "Ntfy API Token (optional)",
|
||||
"form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
|
||||
"form.integration.ntfy_internal_links": "Use internal links on click (optional)",
|
||||
"form.integration.ntfy_internal_links": "Використовувати внутрішні посилання при натисканні (необов’язково)",
|
||||
"form.integration.ntfy_password": "Ntfy Password (optional)",
|
||||
"form.integration.ntfy_topic": "Ntfy topic (default if not set in feed)",
|
||||
"form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
|
||||
@@ -275,10 +282,6 @@
|
||||
"form.integration.pinboard_bookmark": "Відмічати закладку як непрочитану",
|
||||
"form.integration.pinboard_tags": "Теги для Pinboard",
|
||||
"form.integration.pinboard_token": "API ключ від Pinboard",
|
||||
"form.integration.pocket_access_token": "Pocket Access Token",
|
||||
"form.integration.pocket_activate": "Зберігати статті до Pocket",
|
||||
"form.integration.pocket_connect_link": "Підключити ваш обліковий запис Pocket",
|
||||
"form.integration.pocket_consumer_key": "Pocket Consumer Key",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -329,7 +332,8 @@
|
||||
"form.prefs.fieldset.authentication_settings": "Authentication Settings",
|
||||
"form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
|
||||
"form.prefs.fieldset.reader_settings": "Reader Settings",
|
||||
"form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
|
||||
"form.prefs.help.external_font_hosts": "Список дозволених зовнішніх хостів шрифтів, розділених пробілами. Наприклад: 'fonts.gstatic.com fonts.googleapis.com'.",
|
||||
"form.prefs.label.always_open_external_links": "Читати статті, відкриваючи зовнішні посилання",
|
||||
"form.prefs.label.categories_sorting_order": "Сортування за категоріями",
|
||||
"form.prefs.label.cjk_reading_speed": "Швидкість читання для китайської, корейської та японської мови (символів на хвилину)",
|
||||
"form.prefs.label.custom_css": "Спеціальний CSS",
|
||||
@@ -341,7 +345,7 @@
|
||||
"form.prefs.label.entry_order": "Стовпець сортування записів",
|
||||
"form.prefs.label.entry_sorting": "Сортування записів",
|
||||
"form.prefs.label.entry_swipe": "Увімкніть введення пальцем на сенсорних екранах",
|
||||
"form.prefs.label.external_font_hosts": "External font hosts",
|
||||
"form.prefs.label.external_font_hosts": "Зовнішні хости шрифтів",
|
||||
"form.prefs.label.gesture_nav": "Жест для переходу між записами",
|
||||
"form.prefs.label.keyboard_shortcuts": "Увімкнути комбінації клавиш",
|
||||
"form.prefs.label.language": "Мова",
|
||||
@@ -350,7 +354,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "Автоматично позначати записи як прочитані під час перегляду",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
|
||||
"form.prefs.label.media_playback_rate": "Швидкість відтворення аудіо/відео",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "Відкривати зовнішні посилання у новій вкладці (додає target=\"_blank\" до посилань)",
|
||||
"form.prefs.label.show_reading_time": "Показувати приблизний час читання для записів",
|
||||
"form.prefs.label.theme": "Тема",
|
||||
"form.prefs.label.timezone": "Часовий пояс",
|
||||
@@ -628,4 +632,4 @@
|
||||
"time_elapsed.yesterday": "вчора",
|
||||
"tooltip.keyboard_shortcuts": "Комбінація клавіш: %s",
|
||||
"tooltip.logged_user": "Здійснено вхід як %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "没有与此标签匹配的条目。",
|
||||
"alert.no_unread_entry": "目前没有未读文章",
|
||||
"alert.no_user": "您是目前仅有的用户",
|
||||
"alert.pocket_linked": "您的 Pocket 帐户现已关联",
|
||||
"alert.prefs_saved": "设置已存储!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"多次触发订阅源更新,请等待 %d 分钟后重试。"
|
||||
@@ -75,6 +74,9 @@
|
||||
"entry.status.toast.read": "已标为已读",
|
||||
"entry.status.toast.unread": "已标为未读",
|
||||
"entry.tags.label": "标签:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"更多标签 (%d)"
|
||||
],
|
||||
"entry.unshare.label": "取消分享",
|
||||
"error.api_key_already_exists": "此 API 密钥已存在。",
|
||||
"error.bad_credentials": "用户名或密码无效",
|
||||
@@ -96,7 +98,7 @@
|
||||
"error.feed_mandatory_fields": "必须填写网址和分类",
|
||||
"error.feed_not_found": "该订阅源不存在或不属于该用户。",
|
||||
"error.feed_title_not_empty": "订阅源的标题不能为空。",
|
||||
"error.feed_url_not_empty": "订阅源的网址不能为空。",
|
||||
"error.feed_url_not_empty": "订阅源的 URL 不能为空。",
|
||||
"error.fields_mandatory": "必须填写全部信息",
|
||||
"error.http_bad_gateway": "当前由于错误的网关导致该网站无法访问,问题不在 Miniflux,请稍后重试。",
|
||||
"error.http_body_read": "无法读取HTTP主体: %v。",
|
||||
@@ -113,23 +115,21 @@
|
||||
"error.http_too_many_requests": "Miniflux 对该网站请求过多次数,请稍后重试或修改应用配置项。",
|
||||
"error.http_unexpected_status_code": "当前由于意外的 HTTP 状态码:%d 导致该网站无法访问,问题不在 Miniflux,请稍后重试。",
|
||||
"error.invalid_categories_sorting_order": "无效的分类排序",
|
||||
"error.invalid_default_home_page": "无效的默认主页!",
|
||||
"error.invalid_default_home_page": "无效的默认主页!",
|
||||
"error.invalid_display_mode": "无效的网页应用显示模式。",
|
||||
"error.invalid_entry_direction": "无效的输入方向。",
|
||||
"error.invalid_entry_order": "无效的条目排序",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_url": "订阅源的网址无效。",
|
||||
"error.invalid_entry_order": "无效的条目排序。",
|
||||
"error.invalid_feed_proxy_url": "无效的代理 URL。",
|
||||
"error.invalid_feed_url": "订阅源的 URL 无效。",
|
||||
"error.invalid_gesture_nav": "手势导航无效。",
|
||||
"error.invalid_language": "无效的语言。",
|
||||
"error.invalid_site_url": "源网站的网址无效。",
|
||||
"error.invalid_site_url": "源网站的 URL 无效。",
|
||||
"error.invalid_theme": "无效的主题。",
|
||||
"error.invalid_timezone": "无效的时区。",
|
||||
"error.network_operation": "Miniflux 无法访问该网站由于网络错误: %v。",
|
||||
"error.network_timeout": "该网站响应过慢,请求超时: %v",
|
||||
"error.password_min_length": "请至少输入 6 个字符",
|
||||
"error.pocket_access_token": "无法从 Pocket 获取访问令牌!",
|
||||
"error.pocket_request_token": "无法从 Pocket 获取请求令牌!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "代理 URL 不能为空。",
|
||||
"error.settings_block_rule_fieldname_invalid": "无效的阻止规则: 规则 #%d 缺少合法的字段名 (可选: %s)",
|
||||
"error.settings_block_rule_invalid_regex": "无效的阻止规则: 规则 #%d 的模式字符不是合法的正则表达式。",
|
||||
"error.settings_block_rule_regex_required": "无效的阻止规则: 规则 #%d 的模式字符没有提供。",
|
||||
@@ -142,7 +142,7 @@
|
||||
"error.settings_mandatory_fields": "必须填写用户名、主题、语言以及时区",
|
||||
"error.settings_media_playback_rate_range": "播放速度超出范围",
|
||||
"error.settings_reading_speed_is_positive": "阅读速度必须是正整数。",
|
||||
"error.site_url_not_empty": "源网站的网址不能为空。",
|
||||
"error.site_url_not_empty": "源网站的 URL 不能为空。",
|
||||
"error.subscription_not_found": "找不到任何源",
|
||||
"error.title_required": "必须填写标题",
|
||||
"error.tls_error": "TLS 错误: %q。如果您愿意的话可以在订阅源设置里关闭 TLS 验证。",
|
||||
@@ -166,7 +166,8 @@
|
||||
"form.feed.fieldset.rules": "规则",
|
||||
"form.feed.label.allow_self_signed_certificates": "允许自签名证书或无效证书",
|
||||
"form.feed.label.apprise_service_urls": "使用逗号分隔的 Apprise 服务 URL 列表",
|
||||
"form.feed.label.blocklist_rules": "阻止规则",
|
||||
"form.feed.label.block_filter_entry_rules": "条目屏蔽规则",
|
||||
"form.feed.label.blocklist_rules": "基于正则表达式的屏蔽过滤器",
|
||||
"form.feed.label.category": "类别",
|
||||
"form.feed.label.cookie": "设置 Cookies",
|
||||
"form.feed.label.crawler": "抓取全文内容",
|
||||
@@ -179,7 +180,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "使用在应用程序级别配置的代理",
|
||||
"form.feed.label.hide_globally": "隐藏全局未读列表中的文章",
|
||||
"form.feed.label.ignore_http_cache": "忽略 HTTP 缓存",
|
||||
"form.feed.label.keeplist_rules": "保留规则",
|
||||
"form.feed.label.keep_filter_entry_rules": "条目允许规则",
|
||||
"form.feed.label.keeplist_rules": "基于正则表达式的保留过滤器",
|
||||
"form.feed.label.no_media_player": "没有媒体播放器(音频/视频)",
|
||||
"form.feed.label.ntfy_activate": "推送条目到ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy 默认优先级",
|
||||
@@ -189,7 +191,7 @@
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy 最低优先级",
|
||||
"form.feed.label.ntfy_priority": "Ntfy 优先级",
|
||||
"form.feed.label.ntfy_topic": "Ntfy 主题(可选)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.proxy_url": "代理 URL",
|
||||
"form.feed.label.pushover_activate": "将条目推送至 pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover 默认优先级",
|
||||
"form.feed.label.pushover_high_priority": "Pushover 高优先级",
|
||||
@@ -197,13 +199,13 @@
|
||||
"form.feed.label.pushover_max_priority": "Pushover 最高优先级",
|
||||
"form.feed.label.pushover_min_priority": "Pushover 最低优先级",
|
||||
"form.feed.label.pushover_priority": "Pushover 消息优先级",
|
||||
"form.feed.label.rewrite_rules": "重写规则",
|
||||
"form.feed.label.rewrite_rules": "内容重写规则",
|
||||
"form.feed.label.scraper_rules": "抓取规则",
|
||||
"form.feed.label.site_url": "源网站 URL",
|
||||
"form.feed.label.title": "标题",
|
||||
"form.feed.label.urlrewrite_rules": "URL 重写规则",
|
||||
"form.feed.label.user_agent": "覆盖默认的用户代理",
|
||||
"form.feed.label.webhook_url": "覆盖 webhook url",
|
||||
"form.feed.label.webhook_url": "覆盖 Webhook URL",
|
||||
"form.import.label.file": "OPML 文件",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "将新文章推送到 Apprise",
|
||||
@@ -211,11 +213,11 @@
|
||||
"form.integration.apprise_url": "Apprise API URL",
|
||||
"form.integration.betula_activate": "保存文章到 Betula",
|
||||
"form.integration.betula_token": "Betula 令牌",
|
||||
"form.integration.betula_url": "Betula 服务地址",
|
||||
"form.integration.betula_url": "Betula 服务端 URL",
|
||||
"form.integration.cubox_activate": "保存文章到 Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API 链接",
|
||||
"form.integration.discord_activate": "将新文章推送到 Discord",
|
||||
"form.integration.discord_webhook_link": "Discord Webhook link",
|
||||
"form.integration.discord_webhook_link": "Discord Webhook 链接",
|
||||
"form.integration.espial_activate": "保存文章到 Espial",
|
||||
"form.integration.espial_api_key": "Espial API 密钥",
|
||||
"form.integration.espial_endpoint": "Espial API 端点",
|
||||
@@ -231,6 +233,9 @@
|
||||
"form.integration.instapaper_activate": "保存文章到 Instapaper",
|
||||
"form.integration.instapaper_password": "Instapaper 密码",
|
||||
"form.integration.instapaper_username": "Instapaper 用户名",
|
||||
"form.integration.karakeep_activate": "保存文章到 Karakeep",
|
||||
"form.integration.karakeep_api_key": "Karakeep API 密钥",
|
||||
"form.integration.karakeep_url": "Karakeep API 端点",
|
||||
"form.integration.linkace_activate": "保存文章到 LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API 密钥",
|
||||
"form.integration.linkace_check_disabled": "关闭链接检查",
|
||||
@@ -271,10 +276,6 @@
|
||||
"form.integration.pinboard_bookmark": "标记为未读",
|
||||
"form.integration.pinboard_tags": "Pinboard 标签",
|
||||
"form.integration.pinboard_token": "Pinboard API 令牌",
|
||||
"form.integration.pocket_access_token": "Pocket 访问令牌",
|
||||
"form.integration.pocket_activate": "将文章保存到 Pocket",
|
||||
"form.integration.pocket_connect_link": "连接您的 Pocket 帐户",
|
||||
"form.integration.pocket_consumer_key": "Pocket 用户密钥",
|
||||
"form.integration.pushover_activate": "将条目推送至 Pushover",
|
||||
"form.integration.pushover_device": "Pushover 装置(可选)",
|
||||
"form.integration.pushover_prefix": "Pushover URL 前缀(可选)",
|
||||
@@ -293,7 +294,7 @@
|
||||
"form.integration.readwise_api_key": "Readwise Reader 访问令牌",
|
||||
"form.integration.readwise_api_key_link": "获取你的 Readwise 访问令牌",
|
||||
"form.integration.rssbridge_activate": "添加订阅时检查 RSS-Bridge",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge authentication token",
|
||||
"form.integration.rssbridge_token": "RSS-Bridge 认证令牌",
|
||||
"form.integration.rssbridge_url": "RSS-Bridge 服务器 URL",
|
||||
"form.integration.shaarli_activate": "保存文章到 Shaarli",
|
||||
"form.integration.shaarli_api_secret": "Shaarli API 密钥",
|
||||
@@ -303,14 +304,14 @@
|
||||
"form.integration.shiori_password": "Shiori 密码",
|
||||
"form.integration.shiori_username": "Shiori 用户名",
|
||||
"form.integration.slack_activate": "将新文章推送到 Slack",
|
||||
"form.integration.slack_webhook_link": "Slack Webhook link",
|
||||
"form.integration.slack_webhook_link": "Slack Webhook 链接",
|
||||
"form.integration.telegram_bot_activate": "将新文章推送到 Telegram",
|
||||
"form.integration.telegram_bot_disable_buttons": "不展示按钮",
|
||||
"form.integration.telegram_bot_disable_notification": "禁用通知",
|
||||
"form.integration.telegram_bot_disable_web_page_preview": "禁用网页预览",
|
||||
"form.integration.telegram_bot_token": "机器人令牌",
|
||||
"form.integration.telegram_chat_id": "聊天 ID",
|
||||
"form.integration.telegram_topic_id": "Topic ID",
|
||||
"form.integration.telegram_topic_id": "主题ID",
|
||||
"form.integration.wallabag_activate": "保存文章到 Wallabag",
|
||||
"form.integration.wallabag_client_id": "Wallabag 客户端 ID",
|
||||
"form.integration.wallabag_client_secret": "Wallabag 客户端 密钥",
|
||||
@@ -320,12 +321,13 @@
|
||||
"form.integration.wallabag_username": "Wallabag 用户名",
|
||||
"form.integration.webhook_activate": "启用 Webhooks",
|
||||
"form.integration.webhook_secret": "Webhooks 密钥",
|
||||
"form.integration.webhook_url": "Default Webhook URL",
|
||||
"form.integration.webhook_url": "默认的 Webhook URL",
|
||||
"form.prefs.fieldset.application_settings": "应用设置",
|
||||
"form.prefs.fieldset.authentication_settings": "用户认证设置",
|
||||
"form.prefs.fieldset.global_feed_settings": "全局订阅源设置",
|
||||
"form.prefs.fieldset.reader_settings": "阅读器设置",
|
||||
"form.prefs.help.external_font_hosts": "允许外部字体托管的空格分隔列表。例如:\"fonts.gstatic.com fonts.googleapis.com\"。",
|
||||
"form.prefs.label.always_open_external_links": "打开外部链接阅读文章",
|
||||
"form.prefs.label.categories_sorting_order": "分类排序",
|
||||
"form.prefs.label.cjk_reading_speed": "中文、韩文和日文的阅读速度(每分钟字符数)",
|
||||
"form.prefs.label.custom_css": "自定义 CSS",
|
||||
@@ -346,7 +348,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "查看时自动将条目标记为已读",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "当浏览时标记条目为已读。对于音频/视频,当播放完成90%%时标记为已读",
|
||||
"form.prefs.label.media_playback_rate": "音频/视频的播放速度",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "在新标签页中打开外部链接(为链接添加 target=\"_blank\")",
|
||||
"form.prefs.label.show_reading_time": "显示文章的预计阅读时间",
|
||||
"form.prefs.label.theme": "主题",
|
||||
"form.prefs.label.timezone": "时区",
|
||||
@@ -407,7 +409,7 @@
|
||||
"page.about.build_date": "构建日期:",
|
||||
"page.about.credits": "版权",
|
||||
"page.about.db_usage": "数据库容量",
|
||||
"page.about.git_commit": "Git Commit:",
|
||||
"page.about.git_commit": "Git提交:",
|
||||
"page.about.global_config_options": "全局配置选项",
|
||||
"page.about.go_version": "Go 版本号:",
|
||||
"page.about.license": "协议:",
|
||||
@@ -415,7 +417,7 @@
|
||||
"page.about.title": "关于",
|
||||
"page.about.version": "版本号:",
|
||||
"page.add_feed.choose_feed": "选择一个源",
|
||||
"page.add_feed.label.url": "网址",
|
||||
"page.add_feed.label.url": "URL",
|
||||
"page.add_feed.legend.advanced_options": "高级选项",
|
||||
"page.add_feed.no_category": "没有类别,至少需要有一个类别",
|
||||
"page.add_feed.submit": "查找源",
|
||||
@@ -505,9 +507,9 @@
|
||||
"page.login.google_signin": "使用 Google 登录",
|
||||
"page.login.oidc_signin": "使用 %s 登录",
|
||||
"page.login.title": "登录",
|
||||
"page.login.webauthn_login": "使用密码登录",
|
||||
"page.login.webauthn_login.error": "无法使用密码登录",
|
||||
"page.login.webauthn_login.help": "如果您正在使用安全密钥,请输入您的用户名。如果您正在使用通行密钥(可发现凭证),则无需输入用户名。",
|
||||
"page.login.webauthn_login": "使用通行密钥登录",
|
||||
"page.login.webauthn_login.error": "无法使用通行密钥登录",
|
||||
"page.login.webauthn_login.help": "如果您正在使用安全密钥,请输入您的用户名;如果您正在使用通行密钥(可发现凭证),则无需输入。",
|
||||
"page.new_api_key.title": "新的 API 密钥",
|
||||
"page.new_category.title": "新分类",
|
||||
"page.new_user.title": "新用户",
|
||||
@@ -532,13 +534,13 @@
|
||||
"page.settings.webauthn.actions": "操作",
|
||||
"page.settings.webauthn.added_on": "添加时间",
|
||||
"page.settings.webauthn.delete": [
|
||||
"删除 %d 个 Passkey"
|
||||
"删除 %d 个通行密钥"
|
||||
],
|
||||
"page.settings.webauthn.last_seen_on": "最后使用时间",
|
||||
"page.settings.webauthn.passkey_name": "Passkey 名称",
|
||||
"page.settings.webauthn.passkeys": "Passkeys",
|
||||
"page.settings.webauthn.register": "注册 Passkey",
|
||||
"page.settings.webauthn.register.error": "无法注册 Passkey",
|
||||
"page.settings.webauthn.passkey_name": "通行密钥名称",
|
||||
"page.settings.webauthn.passkeys": "通行密钥列表",
|
||||
"page.settings.webauthn.register": "注册通行密钥",
|
||||
"page.settings.webauthn.register.error": "无法注册通行密钥",
|
||||
"page.shared_entries.title": "已分享的文章",
|
||||
"page.shared_entries_count": [
|
||||
"%d 已分享的文章"
|
||||
@@ -562,7 +564,7 @@
|
||||
"page.users.never_logged": "从未登录",
|
||||
"page.users.title": "用户",
|
||||
"page.users.username": "用户名",
|
||||
"page.webauthn_rename.title": "重命名 Passkey",
|
||||
"page.webauthn_rename.title": "重命名通行密钥",
|
||||
"pagination.first": "第一页",
|
||||
"pagination.last": "最后一页",
|
||||
"pagination.next": "下一页",
|
||||
@@ -594,4 +596,4 @@
|
||||
"time_elapsed.yesterday": "昨天",
|
||||
"tooltip.keyboard_shortcuts": "快捷键: %s",
|
||||
"tooltip.logged_user": "当前登录 %s"
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@
|
||||
"alert.no_tag_entry": "沒有與此標籤相符的文章。",
|
||||
"alert.no_unread_entry": "目前沒有未讀文章",
|
||||
"alert.no_user": "您是唯一的使用者",
|
||||
"alert.pocket_linked": "您的 Pocket 帳戶已關聯",
|
||||
"alert.prefs_saved": "設定已儲存!",
|
||||
"alert.too_many_feeds_refresh": [
|
||||
"您已觸發過太多次 Feed 更新,請等待 %d 分鐘後再嘗試。"
|
||||
@@ -75,6 +74,9 @@
|
||||
"entry.status.toast.read": "已標記為已讀",
|
||||
"entry.status.toast.unread": "已標記為未讀",
|
||||
"entry.tags.label": "標籤:",
|
||||
"entry.tags.more_tags_label": [
|
||||
"還有 %d 個標籤"
|
||||
],
|
||||
"entry.unshare.label": "取消分享",
|
||||
"error.api_key_already_exists": "此 API 金鑰已存在。",
|
||||
"error.bad_credentials": "使用者名稱或密碼無效",
|
||||
@@ -117,7 +119,7 @@
|
||||
"error.invalid_display_mode": "無效的顯示模式。",
|
||||
"error.invalid_entry_direction": "無效的輸入方向。",
|
||||
"error.invalid_entry_order": "無效的文章排序依據。",
|
||||
"error.invalid_feed_proxy_url": "Invalid proxy URL.",
|
||||
"error.invalid_feed_proxy_url": "代理伺服器網址無效。",
|
||||
"error.invalid_feed_url": "訂閱網址無效。",
|
||||
"error.invalid_gesture_nav": "手勢導覽無效。",
|
||||
"error.invalid_language": "無效的語言。",
|
||||
@@ -127,9 +129,7 @@
|
||||
"error.network_operation": "Miniflux 無法連線到該網站,可能是網路問題:%v。",
|
||||
"error.network_timeout": "該網站回應過慢,請求逾時:%v。",
|
||||
"error.password_min_length": "請至少輸入 6 個字元",
|
||||
"error.pocket_access_token": "無法從 Pocket 取得存取金鑰!",
|
||||
"error.pocket_request_token": "無法從 Pocket 取得請求金鑰!",
|
||||
"error.proxy_url_not_empty": "The proxy URL cannot be empty.",
|
||||
"error.proxy_url_not_empty": "代理伺服器網址不能為空。",
|
||||
"error.settings_block_rule_fieldname_invalid": "無效的封鎖規則:規則 #%d 缺少有效的欄位名稱 (可用選項:%s)",
|
||||
"error.settings_block_rule_invalid_regex": "無效的封鎖規則:規則 #%d 的模式不是合法的正規表示式",
|
||||
"error.settings_block_rule_regex_required": "無效的封鎖規則:規則 #%d 沒有提供正規表示式",
|
||||
@@ -166,7 +166,8 @@
|
||||
"form.feed.fieldset.rules": "規則",
|
||||
"form.feed.label.allow_self_signed_certificates": "允許自簽或無效的憑證",
|
||||
"form.feed.label.apprise_service_urls": "使用逗號分隔的 Apprise 服務網址列表",
|
||||
"form.feed.label.blocklist_rules": "過濾規則",
|
||||
"form.feed.label.block_filter_entry_rules": "條目封鎖規則",
|
||||
"form.feed.label.blocklist_rules": "基於正則表達式的封鎖過濾器",
|
||||
"form.feed.label.category": "類別",
|
||||
"form.feed.label.cookie": "設定 Cookies",
|
||||
"form.feed.label.crawler": "下載原文內容",
|
||||
@@ -179,7 +180,8 @@
|
||||
"form.feed.label.fetch_via_proxy": "使用應用程式層級設定的代理",
|
||||
"form.feed.label.hide_globally": "在全域未讀列表中隱藏文章",
|
||||
"form.feed.label.ignore_http_cache": "忽略 HTTP 快取",
|
||||
"form.feed.label.keeplist_rules": "保留規則",
|
||||
"form.feed.label.keep_filter_entry_rules": "條目允許規則",
|
||||
"form.feed.label.keeplist_rules": "基於正則表達式的保留過濾器",
|
||||
"form.feed.label.no_media_player": "無媒體播放器 (音訊/視訊)",
|
||||
"form.feed.label.ntfy_activate": "推送文章到 ntfy",
|
||||
"form.feed.label.ntfy_default_priority": "Ntfy 預設優先順序",
|
||||
@@ -189,28 +191,28 @@
|
||||
"form.feed.label.ntfy_min_priority": "Ntfy 最低優先順序",
|
||||
"form.feed.label.ntfy_priority": "Ntfy 優先順序",
|
||||
"form.feed.label.ntfy_topic": "Ntfy topic (選填)",
|
||||
"form.feed.label.proxy_url": "Proxy URL",
|
||||
"form.feed.label.proxy_url": "代理URL",
|
||||
"form.feed.label.pushover_activate": "Push entries to pushover.net",
|
||||
"form.feed.label.pushover_default_priority": "Pushover default priority",
|
||||
"form.feed.label.pushover_high_priority": "Pushover high priority",
|
||||
"form.feed.label.pushover_low_priority": "Pushover low priority",
|
||||
"form.feed.label.pushover_max_priority": "Pushover max priority",
|
||||
"form.feed.label.pushover_min_priority": "Pushover min priority",
|
||||
"form.feed.label.pushover_priority": "Pushover message priority",
|
||||
"form.feed.label.rewrite_rules": "重寫規則",
|
||||
"form.feed.label.pushover_priority": "Pushover消息優先級",
|
||||
"form.feed.label.rewrite_rules": "內容重寫規則",
|
||||
"form.feed.label.scraper_rules": "抓取規則",
|
||||
"form.feed.label.site_url": "網站網址",
|
||||
"form.feed.label.title": "標題",
|
||||
"form.feed.label.urlrewrite_rules": "網址重寫規則",
|
||||
"form.feed.label.user_agent": "覆蓋預設的使用者代理",
|
||||
"form.feed.label.webhook_url": "Override webhook url",
|
||||
"form.feed.label.webhook_url": "覆蓋webhook URL",
|
||||
"form.import.label.file": "OPML 檔案",
|
||||
"form.import.label.url": "URL",
|
||||
"form.integration.apprise_activate": "推送文章到 Apprise",
|
||||
"form.integration.apprise_services_url": "使用逗號分隔的 Apprise 服務網址列表",
|
||||
"form.integration.apprise_url": "Apprise API 網址",
|
||||
"form.integration.betula_activate": "儲存文章到 Betula",
|
||||
"form.integration.betula_token": "Betula Token",
|
||||
"form.integration.betula_token": "Betula令牌",
|
||||
"form.integration.betula_url": "Betula 伺服器網址",
|
||||
"form.integration.cubox_activate": "儲存文章到 Cubox",
|
||||
"form.integration.cubox_api_link": "Cubox API 連結",
|
||||
@@ -231,6 +233,9 @@
|
||||
"form.integration.instapaper_activate": "儲存文章到 Instapaper",
|
||||
"form.integration.instapaper_password": "Instapaper 密碼",
|
||||
"form.integration.instapaper_username": "Instapaper 使用者名稱",
|
||||
"form.integration.karakeep_activate": "儲存文章到 Karakeep",
|
||||
"form.integration.karakeep_api_key": "Karakeep API 金鑰",
|
||||
"form.integration.karakeep_url": "Karakeep API 端點",
|
||||
"form.integration.linkace_activate": "儲存文章到 LinkAce",
|
||||
"form.integration.linkace_api_key": "LinkAce API 金鑰",
|
||||
"form.integration.linkace_check_disabled": "停用連結檢查",
|
||||
@@ -271,10 +276,6 @@
|
||||
"form.integration.pinboard_bookmark": "標記為未讀",
|
||||
"form.integration.pinboard_tags": "Pinboard 標籤",
|
||||
"form.integration.pinboard_token": "Pinboard API Token",
|
||||
"form.integration.pocket_access_token": "Pocket 存取金鑰",
|
||||
"form.integration.pocket_activate": "儲存文章到 Pocket",
|
||||
"form.integration.pocket_connect_link": "連線您的 Pocket 帳戶",
|
||||
"form.integration.pocket_consumer_key": "Pocket 使用者金鑰",
|
||||
"form.integration.pushover_activate": "Push entries to Pushover",
|
||||
"form.integration.pushover_device": "Pushover device (optional)",
|
||||
"form.integration.pushover_prefix": "Pushover URL prefix (optional)",
|
||||
@@ -326,6 +327,7 @@
|
||||
"form.prefs.fieldset.global_feed_settings": "全域 Feed 設定",
|
||||
"form.prefs.fieldset.reader_settings": "閱讀器設定",
|
||||
"form.prefs.help.external_font_hosts": "以空白分隔允許的外部字型來源。例如:「fonts.gstatic.com fonts.googleapis.com」。",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.categories_sorting_order": "分類排序",
|
||||
"form.prefs.label.cjk_reading_speed": "中文、韓文和日文的閱讀速度(每分鐘字元數)",
|
||||
"form.prefs.label.custom_css": "自訂 CSS",
|
||||
@@ -346,7 +348,7 @@
|
||||
"form.prefs.label.mark_read_on_view": "檢視時自動將文章標記為已讀",
|
||||
"form.prefs.label.mark_read_on_view_or_media_completion": "檢視文章即標記為已讀;若是音訊/視訊則在 90% 播放完成時標記",
|
||||
"form.prefs.label.media_playback_rate": "音訊/視訊播放速度",
|
||||
"form.prefs.label.always_open_external_links": "Read articles by opening external links",
|
||||
"form.prefs.label.open_external_links_in_new_tab": "在新分頁中開啟外部連結(為連結加上 target=\"_blank\")",
|
||||
"form.prefs.label.show_reading_time": "顯示文章的預計閱讀時間",
|
||||
"form.prefs.label.theme": "主題",
|
||||
"form.prefs.label.timezone": "時區",
|
||||
@@ -594,4 +596,4 @@
|
||||
"time_elapsed.yesterday": "昨天",
|
||||
"tooltip.keyboard_shortcuts": "快捷鍵:%s",
|
||||
"tooltip.logged_user": "目前登入 %s"
|
||||
}
|
||||
}
|
||||
@@ -14,9 +14,9 @@ import (
|
||||
|
||||
func TestProxyFilterWithHttpDefault(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "http-only")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "http-only")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -39,8 +39,8 @@ func TestProxyFilterWithHttpDefault(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpsDefault(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "http-only")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "http-only")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -63,7 +63,7 @@ func TestProxyFilterWithHttpsDefault(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpNever(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "none")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "none")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -86,7 +86,7 @@ func TestProxyFilterWithHttpNever(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpsNever(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "none")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "none")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -109,9 +109,9 @@ func TestProxyFilterWithHttpsNever(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpAlways(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -134,9 +134,9 @@ func TestProxyFilterWithHttpAlways(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpsAlways(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -159,9 +159,9 @@ func TestProxyFilterWithHttpsAlways(t *testing.T) {
|
||||
|
||||
func TestAbsoluteProxyFilterWithHttpsAlways(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -221,9 +221,9 @@ func TestAbsoluteProxyFilterWithCustomPortAndSubfolderInBaseURL(t *testing.T) {
|
||||
|
||||
func TestAbsoluteProxyFilterWithHttpsAlwaysAndAudioTag(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "audio")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "audio")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -246,9 +246,9 @@ func TestAbsoluteProxyFilterWithHttpsAlwaysAndAudioTag(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_URL", "https://proxy-example/proxy")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_CUSTOM_URL", "https://proxy-example/proxy")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -271,9 +271,9 @@ func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpsAlwaysAndIncorrectCustomProxyServer(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_URL", "http://:8080example.com")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_CUSTOM_URL", "http://:8080example.com")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -321,8 +321,8 @@ func TestAbsoluteProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpInvalid(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "invalid")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "invalid")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -345,8 +345,8 @@ func TestProxyFilterWithHttpInvalid(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithHttpsInvalid(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "invalid")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "invalid")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -369,9 +369,9 @@ func TestProxyFilterWithHttpsInvalid(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithSrcset(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -394,9 +394,9 @@ func TestProxyFilterWithSrcset(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithEmptySrcset(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -419,9 +419,9 @@ func TestProxyFilterWithEmptySrcset(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithPictureSource(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -444,9 +444,9 @@ func TestProxyFilterWithPictureSource(t *testing.T) {
|
||||
|
||||
func TestProxyFilterOnlyNonHTTPWithPictureSource(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "https")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "https")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -469,8 +469,8 @@ func TestProxyFilterOnlyNonHTTPWithPictureSource(t *testing.T) {
|
||||
|
||||
func TestProxyWithImageDataURL(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -493,8 +493,8 @@ func TestProxyWithImageDataURL(t *testing.T) {
|
||||
|
||||
func TestProxyWithImageSourceDataURL(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -517,9 +517,9 @@ func TestProxyWithImageSourceDataURL(t *testing.T) {
|
||||
|
||||
func TestProxyFilterWithVideo(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "video")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "video")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -542,9 +542,9 @@ func TestProxyFilterWithVideo(t *testing.T) {
|
||||
|
||||
func TestProxyFilterVideoPoster(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
@@ -567,9 +567,9 @@ func TestProxyFilterVideoPoster(t *testing.T) {
|
||||
|
||||
func TestProxyFilterVideoPosterOnce(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("PROXY_OPTION", "all")
|
||||
os.Setenv("PROXY_MEDIA_TYPES", "image,video")
|
||||
os.Setenv("PROXY_PRIVATE_KEY", "test")
|
||||
os.Setenv("MEDIA_PROXY_MODE", "all")
|
||||
os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image,video")
|
||||
os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
|
||||
@@ -19,13 +19,12 @@ type SessionData struct {
|
||||
FlashErrorMessage string `json:"flash_error_message"`
|
||||
Language string `json:"language"`
|
||||
Theme string `json:"theme"`
|
||||
PocketRequestToken string `json:"pocket_request_token"`
|
||||
LastForceRefresh string `json:"last_force_refresh"`
|
||||
WebAuthnSessionData WebAuthnSession `json:"webauthn_session_data"`
|
||||
}
|
||||
|
||||
func (s *SessionData) String() string {
|
||||
return fmt.Sprintf(`CSRF=%q, OAuth2State=%q, OAuth2CodeVerifier=%q, FlashMsg=%q, FlashErrMsg=%q, Lang=%q, Theme=%q, PocketTkn=%q, LastForceRefresh=%s, WebAuthnSession=%q`,
|
||||
return fmt.Sprintf(`CSRF=%q, OAuth2State=%q, OAuth2CodeVerifier=%q, FlashMsg=%q, FlashErrMsg=%q, Lang=%q, Theme=%q, LastForceRefresh=%s, WebAuthnSession=%q`,
|
||||
s.CSRF,
|
||||
s.OAuth2State,
|
||||
s.OAuth2CodeVerifier,
|
||||
@@ -33,7 +32,6 @@ func (s *SessionData) String() string {
|
||||
s.FlashErrorMessage,
|
||||
s.Language,
|
||||
s.Theme,
|
||||
s.PocketRequestToken,
|
||||
s.LastForceRefresh,
|
||||
s.WebAuthnSessionData,
|
||||
)
|
||||
|
||||
+19
-5
@@ -40,6 +40,8 @@ type Feed struct {
|
||||
Crawler bool `json:"crawler"`
|
||||
BlocklistRules string `json:"blocklist_rules"`
|
||||
KeeplistRules string `json:"keeplist_rules"`
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
UrlRewriteRules string `json:"urlrewrite_rules"`
|
||||
UserAgent string `json:"user_agent"`
|
||||
Cookie string `json:"cookie"`
|
||||
@@ -166,6 +168,8 @@ type FeedCreationRequest struct {
|
||||
RewriteRules string `json:"rewrite_rules"`
|
||||
BlocklistRules string `json:"blocklist_rules"`
|
||||
KeeplistRules string `json:"keeplist_rules"`
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
HideGlobally bool `json:"hide_globally"`
|
||||
UrlRewriteRules string `json:"urlrewrite_rules"`
|
||||
DisableHTTP2 bool `json:"disable_http2"`
|
||||
@@ -189,8 +193,10 @@ type FeedModificationRequest struct {
|
||||
ScraperRules *string `json:"scraper_rules"`
|
||||
RewriteRules *string `json:"rewrite_rules"`
|
||||
BlocklistRules *string `json:"blocklist_rules"`
|
||||
KeeplistRules *string `json:"keeplist_rules"`
|
||||
UrlRewriteRules *string `json:"urlrewrite_rules"`
|
||||
KeeplistRules *string `json:"keeplist_rules"`
|
||||
BlockFilterEntryRules *string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules *string `json:"keep_filter_entry_rules"`
|
||||
Crawler *bool `json:"crawler"`
|
||||
UserAgent *string `json:"user_agent"`
|
||||
Cookie *string `json:"cookie"`
|
||||
@@ -233,18 +239,26 @@ func (f *FeedModificationRequest) Patch(feed *Feed) {
|
||||
feed.RewriteRules = *f.RewriteRules
|
||||
}
|
||||
|
||||
if f.KeeplistRules != nil {
|
||||
feed.KeeplistRules = *f.KeeplistRules
|
||||
}
|
||||
|
||||
if f.UrlRewriteRules != nil {
|
||||
feed.UrlRewriteRules = *f.UrlRewriteRules
|
||||
}
|
||||
|
||||
if f.KeeplistRules != nil {
|
||||
feed.KeeplistRules = *f.KeeplistRules
|
||||
}
|
||||
|
||||
if f.BlocklistRules != nil {
|
||||
feed.BlocklistRules = *f.BlocklistRules
|
||||
}
|
||||
|
||||
if f.BlockFilterEntryRules != nil {
|
||||
feed.BlockFilterEntryRules = *f.BlockFilterEntryRules
|
||||
}
|
||||
|
||||
if f.KeepFilterEntryRules != nil {
|
||||
feed.KeepFilterEntryRules = *f.KeepFilterEntryRules
|
||||
}
|
||||
|
||||
if f.Crawler != nil {
|
||||
feed.Crawler = *f.Crawler
|
||||
}
|
||||
|
||||
@@ -41,9 +41,6 @@ type Integration struct {
|
||||
EspialTags string
|
||||
ReadwiseEnabled bool
|
||||
ReadwiseAPIKey string
|
||||
PocketEnabled bool
|
||||
PocketAccessToken string
|
||||
PocketConsumerKey string
|
||||
TelegramBotEnabled bool
|
||||
TelegramBotToken string
|
||||
TelegramBotChatID string
|
||||
@@ -94,6 +91,9 @@ type Integration struct {
|
||||
OmnivoreEnabled bool
|
||||
OmnivoreAPIKey string
|
||||
OmnivoreURL string
|
||||
KarakeepEnabled bool
|
||||
KarakeepAPIKey string
|
||||
KarakeepURL string
|
||||
RaindropEnabled bool
|
||||
RaindropToken string
|
||||
RaindropCollectionID string
|
||||
|
||||
@@ -42,6 +42,7 @@ type User struct {
|
||||
BlockFilterEntryRules string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules string `json:"keep_filter_entry_rules"`
|
||||
AlwaysOpenExternalLinks bool `json:"always_open_external_links"`
|
||||
OpenExternalLinksInNewTab bool `json:"open_external_links_in_new_tab"`
|
||||
}
|
||||
|
||||
// UserCreationRequest represents the request to create a user.
|
||||
@@ -84,6 +85,7 @@ type UserModificationRequest struct {
|
||||
BlockFilterEntryRules *string `json:"block_filter_entry_rules"`
|
||||
KeepFilterEntryRules *string `json:"keep_filter_entry_rules"`
|
||||
AlwaysOpenExternalLinks *bool `json:"always_open_external_links"`
|
||||
OpenExternalLinksInNewTab *bool `json:"open_external_links_in_new_tab"`
|
||||
}
|
||||
|
||||
// Patch updates the User object with the modification request.
|
||||
@@ -203,6 +205,10 @@ func (u *UserModificationRequest) Patch(user *User) {
|
||||
if u.AlwaysOpenExternalLinks != nil {
|
||||
user.AlwaysOpenExternalLinks = *u.AlwaysOpenExternalLinks
|
||||
}
|
||||
|
||||
if u.OpenExternalLinksInNewTab != nil {
|
||||
user.OpenExternalLinksInNewTab = *u.OpenExternalLinksInNewTab
|
||||
}
|
||||
}
|
||||
|
||||
// UseTimezone converts last login date to the given timezone.
|
||||
|
||||
@@ -75,7 +75,9 @@ func (o *oidcProvider) GetProfile(ctx context.Context, code, codeVerifier string
|
||||
return nil, fmt.Errorf(`oidc: failed to parse user claims: %w`, err)
|
||||
}
|
||||
|
||||
for _, value := range []string{userClaims.Email, userClaims.PreferredUsername, userClaims.Name, userClaims.Profile} {
|
||||
// Use the first non-empty value from the claims to set the username.
|
||||
// The order of preference is: preferred_username, email, name, profile.
|
||||
for _, value := range []string{userClaims.PreferredUsername, userClaims.Email, userClaims.Name, userClaims.Profile} {
|
||||
if value != "" {
|
||||
profile.Username = value
|
||||
break
|
||||
|
||||
@@ -103,7 +103,7 @@ func (a *Atom03Adapter) BuildFeed(baseURL string) *model.Feed {
|
||||
// Generate the entry hash.
|
||||
for _, value := range []string{atomEntry.ID, atomEntry.Links.OriginalLink()} {
|
||||
if value != "" {
|
||||
entry.Hash = crypto.Hash(value)
|
||||
entry.Hash = crypto.SHA256(value)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ func (a *Atom10Adapter) populateEntries(siteURL string) model.Entries {
|
||||
// Generate the entry hash.
|
||||
for _, value := range []string{atomEntry.ID, atomEntry.Links.OriginalLink()} {
|
||||
if value != "" {
|
||||
entry.Hash = crypto.Hash(value)
|
||||
entry.Hash = crypto.SHA256(value)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,7 +130,7 @@ func (r *RequestBuilder) ExecuteRequest(requestURL string) (*http.Response, erro
|
||||
// and the insecure ones if we are ignoring TLS errors. This allows to connect to badly configured servers anyway
|
||||
ciphers = append(ciphers, tls.InsecureCipherSuites()...)
|
||||
}
|
||||
cipherSuites := []uint16{}
|
||||
cipherSuites := make([]uint16, 0, len(ciphers))
|
||||
for _, cipher := range ciphers {
|
||||
cipherSuites = append(cipherSuites, cipher.ID)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,250 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package filter // import "miniflux.app/v2/internal/reader/filter"
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"regexp"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
type filterActionType string
|
||||
|
||||
const (
|
||||
filterActionBlock filterActionType = "block"
|
||||
filterActionAllow filterActionType = "allow"
|
||||
)
|
||||
|
||||
func isBlockedGlobally(entry *model.Entry) bool {
|
||||
if config.Opts == nil {
|
||||
return false
|
||||
}
|
||||
|
||||
if config.Opts.FilterEntryMaxAgeDays() > 0 {
|
||||
maxAge := time.Duration(config.Opts.FilterEntryMaxAgeDays()) * 24 * time.Hour
|
||||
if entry.Date.Before(time.Now().Add(-maxAge)) {
|
||||
slog.Debug("Entry is blocked globally due to max age",
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Time("entry_date", entry.Date),
|
||||
slog.Duration("max_age", maxAge),
|
||||
)
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func IsBlockedEntry(feed *model.Feed, entry *model.Entry, user *model.User) bool {
|
||||
if isBlockedGlobally(entry) {
|
||||
return true
|
||||
}
|
||||
|
||||
combinedRules := combineFilterRules(user.BlockFilterEntryRules, feed.BlockFilterEntryRules)
|
||||
if combinedRules != "" {
|
||||
if matchesEntryFilterRules(combinedRules, entry, feed, filterActionBlock) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
if feed.BlocklistRules == "" {
|
||||
return false
|
||||
}
|
||||
|
||||
return matchesEntryRegexRules(feed.BlocklistRules, entry, feed, filterActionBlock)
|
||||
}
|
||||
|
||||
func IsAllowedEntry(feed *model.Feed, entry *model.Entry, user *model.User) bool {
|
||||
combinedRules := combineFilterRules(user.KeepFilterEntryRules, feed.KeepFilterEntryRules)
|
||||
if combinedRules != "" {
|
||||
return matchesEntryFilterRules(combinedRules, entry, feed, filterActionAllow)
|
||||
}
|
||||
|
||||
if feed.KeeplistRules == "" {
|
||||
return true
|
||||
}
|
||||
|
||||
return matchesEntryRegexRules(feed.KeeplistRules, entry, feed, filterActionAllow)
|
||||
}
|
||||
|
||||
func combineFilterRules(userRules, feedRules string) string {
|
||||
var combinedRules strings.Builder
|
||||
|
||||
userRules = strings.TrimSpace(userRules)
|
||||
feedRules = strings.TrimSpace(feedRules)
|
||||
|
||||
if userRules != "" {
|
||||
combinedRules.WriteString(userRules)
|
||||
}
|
||||
if feedRules != "" {
|
||||
if combinedRules.Len() > 0 {
|
||||
combinedRules.WriteString("\n")
|
||||
}
|
||||
combinedRules.WriteString(feedRules)
|
||||
}
|
||||
return combinedRules.String()
|
||||
}
|
||||
|
||||
func matchesEntryFilterRules(rules string, entry *model.Entry, feed *model.Feed, filterAction filterActionType) bool {
|
||||
for rule := range strings.SplitSeq(rules, "\n") {
|
||||
if matchesRule(rule, entry) {
|
||||
logFilterAction(entry, feed, rule, filterAction)
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func matchesEntryRegexRules(rules string, entry *model.Entry, feed *model.Feed, filterAction filterActionType) bool {
|
||||
compiledRegex, err := regexp.Compile(rules)
|
||||
if err != nil {
|
||||
slog.Warn("Failed on regexp compilation",
|
||||
slog.String("pattern", rules),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
return false
|
||||
}
|
||||
|
||||
containsMatchingTag := slices.ContainsFunc(entry.Tags, func(tag string) bool {
|
||||
return compiledRegex.MatchString(tag)
|
||||
})
|
||||
|
||||
if compiledRegex.MatchString(entry.URL) ||
|
||||
compiledRegex.MatchString(entry.Title) ||
|
||||
compiledRegex.MatchString(entry.Author) ||
|
||||
containsMatchingTag {
|
||||
logFilterAction(entry, feed, rules, filterAction)
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func matchesRule(rule string, entry *model.Entry) bool {
|
||||
parts := strings.SplitN(rule, "=", 2)
|
||||
if len(parts) != 2 {
|
||||
return false
|
||||
}
|
||||
|
||||
ruleType, ruleValue := parts[0], parts[1]
|
||||
|
||||
switch ruleType {
|
||||
case "EntryDate":
|
||||
return isDateMatchingPattern(ruleValue, entry.Date)
|
||||
case "EntryTitle":
|
||||
match, _ := regexp.MatchString(ruleValue, entry.Title)
|
||||
return match
|
||||
case "EntryURL":
|
||||
match, _ := regexp.MatchString(ruleValue, entry.URL)
|
||||
return match
|
||||
case "EntryCommentsURL":
|
||||
match, _ := regexp.MatchString(ruleValue, entry.CommentsURL)
|
||||
return match
|
||||
case "EntryContent":
|
||||
match, _ := regexp.MatchString(ruleValue, entry.Content)
|
||||
return match
|
||||
case "EntryAuthor":
|
||||
match, _ := regexp.MatchString(ruleValue, entry.Author)
|
||||
return match
|
||||
case "EntryTag":
|
||||
return containsRegexPattern(ruleValue, entry.Tags)
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func logFilterAction(entry *model.Entry, feed *model.Feed, filterRule string, filterAction filterActionType) {
|
||||
slog.Debug("Filtering entry based on rule",
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.String("filter_rule", filterRule),
|
||||
slog.Any("filter_action", filterAction),
|
||||
)
|
||||
}
|
||||
|
||||
func isDateMatchingPattern(pattern string, entryDate time.Time) bool {
|
||||
if pattern == "future" {
|
||||
return entryDate.After(time.Now())
|
||||
}
|
||||
|
||||
parts := strings.SplitN(pattern, ":", 2)
|
||||
if len(parts) != 2 {
|
||||
return false
|
||||
}
|
||||
|
||||
ruleType, inputDate := parts[0], parts[1]
|
||||
|
||||
switch ruleType {
|
||||
case "before":
|
||||
targetDate, err := time.Parse("2006-01-02", inputDate)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return entryDate.Before(targetDate)
|
||||
case "after":
|
||||
targetDate, err := time.Parse("2006-01-02", inputDate)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return entryDate.After(targetDate)
|
||||
case "between":
|
||||
dates := strings.Split(inputDate, ",")
|
||||
if len(dates) != 2 {
|
||||
return false
|
||||
}
|
||||
startDate, err := time.Parse("2006-01-02", dates[0])
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
endDate, err := time.Parse("2006-01-02", dates[1])
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return entryDate.After(startDate) && entryDate.Before(endDate)
|
||||
case "max-age":
|
||||
duration, err := parseDuration(inputDate)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
cutoffDate := time.Now().Add(-duration)
|
||||
return entryDate.Before(cutoffDate)
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func containsRegexPattern(pattern string, entries []string) bool {
|
||||
for _, entry := range entries {
|
||||
if matched, _ := regexp.MatchString(pattern, entry); matched {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func parseDuration(duration string) (time.Duration, error) {
|
||||
// Handle common duration formats like "30d", "7d", "1h", "1m", etc.
|
||||
// Go's time.ParseDuration doesn't support days, so we handle them manually
|
||||
if strings.HasSuffix(duration, "d") {
|
||||
daysStr := strings.TrimSuffix(duration, "d")
|
||||
days := 0
|
||||
if daysStr != "" {
|
||||
var err error
|
||||
days, err = strconv.Atoi(daysStr)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
}
|
||||
return time.Duration(days) * 24 * time.Hour, nil
|
||||
}
|
||||
|
||||
// For other durations (hours, minutes, seconds), use Go's built-in parser
|
||||
return time.ParseDuration(duration)
|
||||
}
|
||||
@@ -0,0 +1,238 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package filter // import "miniflux.app/v2/internal/reader/filter"
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
func TestBlockingEntries(t *testing.T) {
|
||||
var scenarios = []struct {
|
||||
feed *model.Feed
|
||||
entry *model.Entry
|
||||
user *model.User
|
||||
expected bool
|
||||
}{
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{URL: "https://example.com"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "[a-z"}, &model.Entry{URL: "https://example.com"}, &model.User{}, false}, // invalid regex
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{URL: "https://different.com"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Some Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"something different", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Tags: []string{"something different", "something else"}}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Title: "No rule defined"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{URL: "https://example.com", Title: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{URL: "https://different.com", Title: "Some Test"}, &model.User{BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{URL: "https://different.com", Title: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{CommentsURL: "https://example.com", Content: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Test"}, &model.User{BlockFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Example", Tags: []string{"example", "something else"}}, &model.User{BlockFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{BlockFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)example"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{BlockFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Different", Tags: []string{"example", "test"}}, &model.User{BlockFilterEntryRules: "EntryAuthor\nEntryTag=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 14, 0, 0, 0, 0, time.UTC)}, &model.User{BlockFilterEntryRules: "EntryDate=before:2024-03-15"}, true},
|
||||
// Test max-age filter
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)}, &model.User{BlockFilterEntryRules: "EntryDate=max-age:30d"}, true}, // Entry from Jan 1, 2024 is definitely older than 30 days
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)}, &model.User{BlockFilterEntryRules: "EntryDate=max-age:invalid"}, false}, // Invalid duration format
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 14, 0, 0, 0, 0, time.UTC)}, &model.User{BlockFilterEntryRules: "UnknownRuleType=test"}, false},
|
||||
{&model.Feed{ID: 1, BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, &model.Entry{URL: "https://example.com", Title: "Some Example"}, &model.User{}, true},
|
||||
// Test cases for merged user and feed BlockFilterEntryRules
|
||||
{&model.Feed{ID: 1, BlockFilterEntryRules: "EntryURL=(?i)website"}, &model.Entry{URL: "https://example.com", Title: "Some Title"}, &model.User{BlockFilterEntryRules: " EntryTitle=(?i)title "}, true}, // User rule matches
|
||||
{&model.Feed{ID: 1, BlockFilterEntryRules: "EntryURL=(?i)example"}, &model.Entry{URL: "https://example.com", Title: "Some Other"}, &model.User{BlockFilterEntryRules: "EntryTitle=(?i)title"}, true}, // Feed rule matches
|
||||
{&model.Feed{ID: 1, BlockFilterEntryRules: "EntryURL=(?i)example"}, &model.Entry{URL: "https://different.com", Title: "Some Other"}, &model.User{BlockFilterEntryRules: "EntryTitle=(?i)title"}, false}, // Neither rule matches
|
||||
{&model.Feed{ID: 1, BlockFilterEntryRules: "EntryURL=(?i)example"}, &model.Entry{URL: "https://example.com", Title: "Some Title"}, &model.User{BlockFilterEntryRules: "EntryTitle=(?i)title"}, true}, // Both rules would match
|
||||
}
|
||||
|
||||
for _, tc := range scenarios {
|
||||
result := IsBlockedEntry(tc.feed, tc.entry, tc.user)
|
||||
if tc.expected != result {
|
||||
t.Errorf(`Unexpected result, got %v for entry %q`, result, tc.entry.Title)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestAllowEntries(t *testing.T) {
|
||||
var scenarios = []struct {
|
||||
feed *model.Feed
|
||||
entry *model.Entry
|
||||
user *model.User
|
||||
expected bool
|
||||
}{
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "https://example.com"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "[a-z"}, &model.Entry{Title: "https://example.com"}, &model.User{}, false}, // invalid regex
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "https://different.com"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Some Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Title: "No rule defined"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"something different", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something more", Tags: []string{"something different", "something else"}}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{URL: "https://example.com", Title: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{URL: "https://different.com", Title: "Some Test"}, &model.User{KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{URL: "https://different.com", Title: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{CommentsURL: "https://example.com", Content: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Test"}, &model.User{KeepFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Example", Tags: []string{"example", "something else"}}, &model.User{KeepFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{KeepFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)example"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{KeepFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Author: "Different", Tags: []string{"example", "some test"}}, &model.User{KeepFilterEntryRules: "EntryAuthor\nEntryTag=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Now().Add(24 * time.Hour)}, &model.User{KeepFilterEntryRules: "EntryDate=future"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Now().Add(-24 * time.Hour)}, &model.User{KeepFilterEntryRules: "EntryDate=future"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 14, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=before:2024-03-15"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 14, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=before:invalid-date"}, false}, // invalid date format
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 16, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=after:2024-03-15"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 16, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=after:invalid-date"}, false}, // invalid date format
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 3, 10, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:2024-03-01,2024-03-15"}, true},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:2024-03-01,2024-03-15"}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:invalid-date,2024-03-15"}, false}, // invalid date format
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:2024-03-15,invalid-date"}, false}, // invalid date format
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:2024-03-15"}, false}, // missing second date in range
|
||||
// Test max-age filter
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=max-age:30d"}, true}, // Entry from Jan 1, 2024 is definitely older than 30 days
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=max-age:invalid"}, false}, // Invalid duration format
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=abcd"}, false}, // no colon in rule value
|
||||
{&model.Feed{ID: 1}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=unknown:2024-03-15"}, false}, // unknown rule type
|
||||
{&model.Feed{ID: 1, KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, &model.Entry{URL: "https://example.com", Title: "Some Example"}, &model.User{}, true},
|
||||
// Test cases for merged user and feed KeepFilterEntryRules
|
||||
{&model.Feed{ID: 1, KeepFilterEntryRules: "EntryURL=(?i)website"}, &model.Entry{URL: "https://example.com", Title: "Some Title"}, &model.User{KeepFilterEntryRules: "EntryTitle=(?i)title"}, true}, // User rule matches
|
||||
{&model.Feed{ID: 1, KeepFilterEntryRules: "EntryURL=(?i)example"}, &model.Entry{URL: "https://example.com", Title: "Some Other"}, &model.User{KeepFilterEntryRules: "EntryTitle=(?i)title"}, true}, // Feed rule matches
|
||||
{&model.Feed{ID: 1, KeepFilterEntryRules: "EntryURL=(?i)example"}, &model.Entry{URL: "https://different.com", Title: "Some Other"}, &model.User{KeepFilterEntryRules: "EntryTitle=(?i)title"}, false}, // Neither rule matches
|
||||
{&model.Feed{ID: 1, KeepFilterEntryRules: "EntryURL=(?i)example"}, &model.Entry{URL: "https://example.com", Title: "Some Title"}, &model.User{KeepFilterEntryRules: "EntryTitle=(?i)title"}, true}, // Both rules would match
|
||||
}
|
||||
|
||||
for _, tc := range scenarios {
|
||||
result := IsAllowedEntry(tc.feed, tc.entry, tc.user)
|
||||
if tc.expected != result {
|
||||
t.Errorf(`Unexpected result, got %v for entry %q`, result, tc.entry.Title)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseDuration(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
expected time.Duration
|
||||
err bool
|
||||
}{
|
||||
{"30d", 30 * 24 * time.Hour, false},
|
||||
{"1h", time.Hour, false},
|
||||
{"2m", 2 * time.Minute, false},
|
||||
{"invalid", 0, true},
|
||||
{"5x", 0, true}, // Invalid unit
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
result, err := parseDuration(test.input)
|
||||
if (err != nil) != test.err {
|
||||
t.Errorf("parseDuration(%q) error = %v, expected error: %v", test.input, err, test.err)
|
||||
continue
|
||||
}
|
||||
if result != test.expected {
|
||||
t.Errorf("parseDuration(%q) = %v, expected %v", test.input, result, test.expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMaxAgeFilter(t *testing.T) {
|
||||
now := time.Now()
|
||||
oldEntry := &model.Entry{
|
||||
Title: "Old Entry",
|
||||
Date: now.Add(-48 * time.Hour), // 48 hours ago
|
||||
}
|
||||
newEntry := &model.Entry{
|
||||
Title: "New Entry",
|
||||
Date: now.Add(-30 * time.Minute), // 30 minutes ago
|
||||
}
|
||||
|
||||
// Test blocking old entries
|
||||
feed := &model.Feed{ID: 1}
|
||||
user := &model.User{BlockFilterEntryRules: "EntryDate=max-age:1d"}
|
||||
|
||||
// Old entry should be blocked (48 hours > 1 day is true)
|
||||
if !IsBlockedEntry(feed, oldEntry, user) {
|
||||
t.Error("Expected old entry to be blocked with max-age:1d")
|
||||
}
|
||||
|
||||
// New entry should not be blocked
|
||||
if IsBlockedEntry(feed, newEntry, user) {
|
||||
t.Error("Expected new entry to not be blocked with max-age:1d")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsBlockedGlobally(t *testing.T) {
|
||||
var err error
|
||||
config.Opts, err = config.NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
if isBlockedGlobally(&model.Entry{Title: "Test Entry", Date: time.Date(2020, 5, 1, 05, 05, 05, 05, time.UTC)}) {
|
||||
t.Error("Expected no entries to be blocked globally when max-age is not set")
|
||||
}
|
||||
|
||||
os.Setenv("FILTER_ENTRY_MAX_AGE_DAYS", "30")
|
||||
defer os.Clearenv()
|
||||
|
||||
config.Opts, err = config.NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
if !isBlockedGlobally(&model.Entry{Title: "Test Entry", Date: time.Date(2020, 5, 1, 05, 05, 05, 05, time.UTC)}) {
|
||||
t.Error("Expected entries to be blocked globally when max-age is set")
|
||||
}
|
||||
|
||||
if isBlockedGlobally(&model.Entry{Title: "Test Entry", Date: time.Now().Add(-2 * time.Hour)}) {
|
||||
t.Error("Expected entries not to be blocked globally when they are within the max-age limit")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsBlockedEntryWithGlobalMaxAge(t *testing.T) {
|
||||
os.Setenv("FILTER_ENTRY_MAX_AGE_DAYS", "30")
|
||||
defer os.Clearenv()
|
||||
|
||||
var err error
|
||||
config.Opts, err = config.NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
entry := &model.Entry{Title: "Test Entry", Date: time.Now().Add(-31 * 24 * time.Hour)} // 31 days old
|
||||
feed := &model.Feed{ID: 1}
|
||||
user := &model.User{}
|
||||
|
||||
if !IsBlockedEntry(feed, entry, user) {
|
||||
t.Error("Expected entry to be blocked due to global max-age rule")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsBlockedEntryWithDefaultGlobalMaxAge(t *testing.T) {
|
||||
var err error
|
||||
config.Opts, err = config.NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
entry := &model.Entry{Title: "Test Entry", Date: time.Now().Add(-31 * 24 * time.Hour)} // 31 days old
|
||||
feed := &model.Feed{ID: 1}
|
||||
user := &model.User{}
|
||||
|
||||
if IsBlockedEntry(feed, entry, user) {
|
||||
t.Error("Expected entry not to be blocked due to default global max-age rule")
|
||||
}
|
||||
}
|
||||
@@ -61,6 +61,8 @@ func CreateFeedFromSubscriptionDiscovery(store *storage.Storage, userID int64, f
|
||||
subscription.BlocklistRules = feedCreationRequest.BlocklistRules
|
||||
subscription.KeeplistRules = feedCreationRequest.KeeplistRules
|
||||
subscription.UrlRewriteRules = feedCreationRequest.UrlRewriteRules
|
||||
subscription.BlockFilterEntryRules = feedCreationRequest.BlockFilterEntryRules
|
||||
subscription.KeepFilterEntryRules = feedCreationRequest.KeepFilterEntryRules
|
||||
subscription.EtagHeader = feedCreationRequest.ETag
|
||||
subscription.LastModifiedHeader = feedCreationRequest.LastModified
|
||||
subscription.FeedURL = feedCreationRequest.FeedURL
|
||||
@@ -158,9 +160,11 @@ func CreateFeed(store *storage.Storage, userID int64, feedCreationRequest *model
|
||||
subscription.FetchViaProxy = feedCreationRequest.FetchViaProxy
|
||||
subscription.ScraperRules = feedCreationRequest.ScraperRules
|
||||
subscription.RewriteRules = feedCreationRequest.RewriteRules
|
||||
subscription.UrlRewriteRules = feedCreationRequest.UrlRewriteRules
|
||||
subscription.BlocklistRules = feedCreationRequest.BlocklistRules
|
||||
subscription.KeeplistRules = feedCreationRequest.KeeplistRules
|
||||
subscription.UrlRewriteRules = feedCreationRequest.UrlRewriteRules
|
||||
subscription.BlockFilterEntryRules = feedCreationRequest.BlockFilterEntryRules
|
||||
subscription.KeepFilterEntryRules = feedCreationRequest.KeepFilterEntryRules
|
||||
subscription.HideGlobally = feedCreationRequest.HideGlobally
|
||||
subscription.EtagHeader = responseHandler.ETag()
|
||||
subscription.LastModifiedHeader = responseHandler.LastModified()
|
||||
|
||||
@@ -161,7 +161,7 @@ func (j *JSONAdapter) BuildFeed(baseURL string) *model.Feed {
|
||||
for _, value := range []string{item.ID, item.URL, item.ContentText + item.ContentHTML + item.Summary} {
|
||||
value = strings.TrimSpace(value)
|
||||
if value != "" {
|
||||
entry.Hash = crypto.Hash(value)
|
||||
entry.Hash = crypto.SHA256(value)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
var textLinkRegex = regexp.MustCompile(`(?mi)(\bhttps?:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])`)
|
||||
var textLinkRegex = regexp.MustCompile(`(?mi)(\bhttps?://[^\s]+)[.]?(?:\s|$)`)
|
||||
|
||||
// Specs: https://www.rssboard.org/media-rss
|
||||
type MediaItemElement struct {
|
||||
|
||||
@@ -22,7 +22,7 @@ func BenchmarkParse(b *testing.B) {
|
||||
}
|
||||
testCases[filename][1] = string(data)
|
||||
}
|
||||
for range b.N {
|
||||
for b.Loop() {
|
||||
for _, v := range testCases {
|
||||
ParseFeed(v[0], strings.NewReader(v[1]))
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
@@ -16,7 +17,6 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
bilibiliURLRegex = regexp.MustCompile(`bilibili\.com/video/(.*)$`)
|
||||
bilibiliVideoIdRegex = regexp.MustCompile(`/video/(?:av(\d+)|BV([a-zA-Z0-9]+))`)
|
||||
)
|
||||
|
||||
@@ -24,9 +24,7 @@ func shouldFetchBilibiliWatchTime(entry *model.Entry) bool {
|
||||
if !config.Opts.FetchBilibiliWatchTime() {
|
||||
return false
|
||||
}
|
||||
matches := bilibiliURLRegex.FindStringSubmatch(entry.URL)
|
||||
urlMatchesBilibiliPattern := len(matches) == 2
|
||||
return urlMatchesBilibiliPattern
|
||||
return strings.Contains(entry.URL, "bilibili.com/video/")
|
||||
}
|
||||
|
||||
func extractBilibiliVideoID(websiteURL string) (string, string, error) {
|
||||
@@ -52,7 +50,7 @@ func fetchBilibiliWatchTime(websiteURL string) (int, error) {
|
||||
if extractErr != nil {
|
||||
return 0, extractErr
|
||||
}
|
||||
bilibiliApiURL := fmt.Sprintf("https://api.bilibili.com/x/web-interface/view?%s=%s", idType, videoID)
|
||||
bilibiliApiURL := "https://api.bilibili.com/x/web-interface/view?" + idType + "=" + videoID
|
||||
|
||||
responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(bilibiliApiURL))
|
||||
defer responseHandler.Close()
|
||||
@@ -65,7 +63,7 @@ func fetchBilibiliWatchTime(websiteURL string) (int, error) {
|
||||
return 0, localizedError.Error()
|
||||
}
|
||||
|
||||
var result map[string]interface{}
|
||||
var result map[string]any
|
||||
doc := json.NewDecoder(responseHandler.Body(config.Opts.HTTPClientMaxBodySize()))
|
||||
if docErr := doc.Decode(&result); docErr != nil {
|
||||
return 0, fmt.Errorf("failed to decode API response: %v", docErr)
|
||||
@@ -75,7 +73,7 @@ func fetchBilibiliWatchTime(websiteURL string) (int, error) {
|
||||
return 0, fmt.Errorf("API returned error code: %v", result["code"])
|
||||
}
|
||||
|
||||
data, ok := result["data"].(map[string]interface{})
|
||||
data, ok := result["data"].(map[string]any)
|
||||
if !ok {
|
||||
return 0, fmt.Errorf("data field not found or not an object")
|
||||
}
|
||||
|
||||
@@ -1,200 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"regexp"
|
||||
"slices"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
func isBlockedEntry(feed *model.Feed, entry *model.Entry, user *model.User) bool {
|
||||
if user.BlockFilterEntryRules != "" {
|
||||
rules := strings.Split(user.BlockFilterEntryRules, "\n")
|
||||
for _, rule := range rules {
|
||||
parts := strings.SplitN(rule, "=", 2)
|
||||
|
||||
var match bool
|
||||
switch parts[0] {
|
||||
case "EntryDate":
|
||||
datePattern := parts[1]
|
||||
match = isDateMatchingPattern(entry.Date, datePattern)
|
||||
case "EntryTitle":
|
||||
match, _ = regexp.MatchString(parts[1], entry.Title)
|
||||
case "EntryURL":
|
||||
match, _ = regexp.MatchString(parts[1], entry.URL)
|
||||
case "EntryCommentsURL":
|
||||
match, _ = regexp.MatchString(parts[1], entry.CommentsURL)
|
||||
case "EntryContent":
|
||||
match, _ = regexp.MatchString(parts[1], entry.Content)
|
||||
case "EntryAuthor":
|
||||
match, _ = regexp.MatchString(parts[1], entry.Author)
|
||||
case "EntryTag":
|
||||
containsTag := slices.ContainsFunc(entry.Tags, func(tag string) bool {
|
||||
match, _ = regexp.MatchString(parts[1], tag)
|
||||
return match
|
||||
})
|
||||
if containsTag {
|
||||
match = true
|
||||
}
|
||||
}
|
||||
|
||||
if match {
|
||||
slog.Debug("Blocking entry based on rule",
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("rule", rule),
|
||||
)
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if feed.BlocklistRules == "" {
|
||||
return false
|
||||
}
|
||||
|
||||
compiledBlocklist, err := regexp.Compile(feed.BlocklistRules)
|
||||
if err != nil {
|
||||
slog.Debug("Failed on regexp compilation",
|
||||
slog.String("pattern", feed.BlocklistRules),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
return false
|
||||
}
|
||||
|
||||
containsBlockedTag := slices.ContainsFunc(entry.Tags, func(tag string) bool {
|
||||
return compiledBlocklist.MatchString(tag)
|
||||
})
|
||||
|
||||
if compiledBlocklist.MatchString(entry.URL) || compiledBlocklist.MatchString(entry.Title) || compiledBlocklist.MatchString(entry.Author) || containsBlockedTag {
|
||||
slog.Debug("Blocking entry based on rule",
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("rule", feed.BlocklistRules),
|
||||
)
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func isAllowedEntry(feed *model.Feed, entry *model.Entry, user *model.User) bool {
|
||||
if user.KeepFilterEntryRules != "" {
|
||||
rules := strings.Split(user.KeepFilterEntryRules, "\n")
|
||||
for _, rule := range rules {
|
||||
parts := strings.SplitN(rule, "=", 2)
|
||||
|
||||
var match bool
|
||||
switch parts[0] {
|
||||
case "EntryDate":
|
||||
datePattern := parts[1]
|
||||
match = isDateMatchingPattern(entry.Date, datePattern)
|
||||
case "EntryTitle":
|
||||
match, _ = regexp.MatchString(parts[1], entry.Title)
|
||||
case "EntryURL":
|
||||
match, _ = regexp.MatchString(parts[1], entry.URL)
|
||||
case "EntryCommentsURL":
|
||||
match, _ = regexp.MatchString(parts[1], entry.CommentsURL)
|
||||
case "EntryContent":
|
||||
match, _ = regexp.MatchString(parts[1], entry.Content)
|
||||
case "EntryAuthor":
|
||||
match, _ = regexp.MatchString(parts[1], entry.Author)
|
||||
case "EntryTag":
|
||||
containsTag := slices.ContainsFunc(entry.Tags, func(tag string) bool {
|
||||
match, _ = regexp.MatchString(parts[1], tag)
|
||||
return match
|
||||
})
|
||||
if containsTag {
|
||||
match = true
|
||||
}
|
||||
}
|
||||
|
||||
if match {
|
||||
slog.Debug("Allowing entry based on rule",
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("rule", rule),
|
||||
)
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
if feed.KeeplistRules == "" {
|
||||
return true
|
||||
}
|
||||
|
||||
compiledKeeplist, err := regexp.Compile(feed.KeeplistRules)
|
||||
if err != nil {
|
||||
slog.Debug("Failed on regexp compilation",
|
||||
slog.String("pattern", feed.KeeplistRules),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
return false
|
||||
}
|
||||
containsAllowedTag := slices.ContainsFunc(entry.Tags, func(tag string) bool {
|
||||
return compiledKeeplist.MatchString(tag)
|
||||
})
|
||||
|
||||
if compiledKeeplist.MatchString(entry.URL) || compiledKeeplist.MatchString(entry.Title) || compiledKeeplist.MatchString(entry.Author) || containsAllowedTag {
|
||||
slog.Debug("Allow entry based on rule",
|
||||
slog.String("entry_url", entry.URL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("rule", feed.KeeplistRules),
|
||||
)
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func isDateMatchingPattern(entryDate time.Time, pattern string) bool {
|
||||
if pattern == "future" {
|
||||
return entryDate.After(time.Now())
|
||||
}
|
||||
|
||||
parts := strings.SplitN(pattern, ":", 2)
|
||||
if len(parts) != 2 {
|
||||
return false
|
||||
}
|
||||
|
||||
operator := parts[0]
|
||||
dateStr := parts[1]
|
||||
|
||||
switch operator {
|
||||
case "before":
|
||||
targetDate, err := time.Parse("2006-01-02", dateStr)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return entryDate.Before(targetDate)
|
||||
case "after":
|
||||
targetDate, err := time.Parse("2006-01-02", dateStr)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return entryDate.After(targetDate)
|
||||
case "between":
|
||||
dates := strings.Split(dateStr, ",")
|
||||
if len(dates) != 2 {
|
||||
return false
|
||||
}
|
||||
startDate, err1 := time.Parse("2006-01-02", dates[0])
|
||||
endDate, err2 := time.Parse("2006-01-02", dates[1])
|
||||
if err1 != nil || err2 != nil {
|
||||
return false
|
||||
}
|
||||
return entryDate.After(startDate) && entryDate.Before(endDate)
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -4,18 +4,9 @@
|
||||
package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/url"
|
||||
"strconv"
|
||||
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
"miniflux.app/v2/internal/proxyrotator"
|
||||
"miniflux.app/v2/internal/reader/fetcher"
|
||||
"miniflux.app/v2/internal/urllib"
|
||||
)
|
||||
|
||||
func shouldFetchNebulaWatchTime(entry *model.Entry) bool {
|
||||
@@ -23,42 +14,9 @@ func shouldFetchNebulaWatchTime(entry *model.Entry) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
u, err := url.Parse(entry.URL)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return u.Hostname() == "nebula.tv"
|
||||
return urllib.DomainWithoutWWW(entry.URL) == "nebula.tv"
|
||||
}
|
||||
|
||||
func fetchNebulaWatchTime(websiteURL string) (int, error) {
|
||||
requestBuilder := fetcher.NewRequestBuilder()
|
||||
requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
|
||||
requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
|
||||
|
||||
responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
|
||||
defer responseHandler.Close()
|
||||
|
||||
if localizedError := responseHandler.LocalizedError(); localizedError != nil {
|
||||
slog.Warn("Unable to fetch Nebula watch time", slog.String("website_url", websiteURL), slog.Any("error", localizedError.Error()))
|
||||
return 0, localizedError.Error()
|
||||
}
|
||||
|
||||
doc, docErr := goquery.NewDocumentFromReader(responseHandler.Body(config.Opts.HTTPClientMaxBodySize()))
|
||||
if docErr != nil {
|
||||
return 0, docErr
|
||||
}
|
||||
|
||||
durs, exists := doc.FindMatcher(goquery.Single(`meta[property="video:duration"]`)).Attr("content")
|
||||
// durs contains video watch time in seconds
|
||||
if !exists {
|
||||
return 0, errors.New("duration has not found")
|
||||
}
|
||||
|
||||
dur, err := strconv.ParseInt(durs, 10, 64)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("unable to parse duration %s: %v", durs, err)
|
||||
}
|
||||
|
||||
return int(dur / 60), nil
|
||||
return fetchWatchTime(websiteURL, `meta[property="video:duration"]`, false)
|
||||
}
|
||||
|
||||
@@ -4,18 +4,9 @@
|
||||
package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/url"
|
||||
"strconv"
|
||||
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
"miniflux.app/v2/internal/proxyrotator"
|
||||
"miniflux.app/v2/internal/reader/fetcher"
|
||||
"miniflux.app/v2/internal/urllib"
|
||||
)
|
||||
|
||||
func shouldFetchOdyseeWatchTime(entry *model.Entry) bool {
|
||||
@@ -23,42 +14,9 @@ func shouldFetchOdyseeWatchTime(entry *model.Entry) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
u, err := url.Parse(entry.URL)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return u.Hostname() == "odysee.com"
|
||||
return urllib.DomainWithoutWWW(entry.URL) == "odysee.com"
|
||||
}
|
||||
|
||||
func fetchOdyseeWatchTime(websiteURL string) (int, error) {
|
||||
requestBuilder := fetcher.NewRequestBuilder()
|
||||
requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
|
||||
requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
|
||||
|
||||
responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
|
||||
defer responseHandler.Close()
|
||||
|
||||
if localizedError := responseHandler.LocalizedError(); localizedError != nil {
|
||||
slog.Warn("Unable to fetch Odysee watch time", slog.String("website_url", websiteURL), slog.Any("error", localizedError.Error()))
|
||||
return 0, localizedError.Error()
|
||||
}
|
||||
|
||||
doc, docErr := goquery.NewDocumentFromReader(responseHandler.Body(config.Opts.HTTPClientMaxBodySize()))
|
||||
if docErr != nil {
|
||||
return 0, docErr
|
||||
}
|
||||
|
||||
durs, exists := doc.FindMatcher(goquery.Single(`meta[property="og:video:duration"]`)).Attr("content")
|
||||
// durs contains video watch time in seconds
|
||||
if !exists {
|
||||
return 0, errors.New("duration has not found")
|
||||
}
|
||||
|
||||
dur, err := strconv.ParseInt(durs, 10, 64)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("unable to parse duration %s: %v", durs, err)
|
||||
}
|
||||
|
||||
return int(dur / 60), nil
|
||||
return fetchWatchTime(websiteURL, `meta[property="og:video:duration"]`, false)
|
||||
}
|
||||
|
||||
@@ -5,17 +5,16 @@ package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"regexp"
|
||||
"net/url"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/tdewolff/minify/v2"
|
||||
"github.com/tdewolff/minify/v2/html"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/metric"
|
||||
"miniflux.app/v2/internal/model"
|
||||
"miniflux.app/v2/internal/proxyrotator"
|
||||
"miniflux.app/v2/internal/reader/fetcher"
|
||||
"miniflux.app/v2/internal/reader/filter"
|
||||
"miniflux.app/v2/internal/reader/readingtime"
|
||||
"miniflux.app/v2/internal/reader/rewrite"
|
||||
"miniflux.app/v2/internal/reader/sanitizer"
|
||||
@@ -24,8 +23,6 @@ import (
|
||||
"miniflux.app/v2/internal/storage"
|
||||
)
|
||||
|
||||
var customReplaceRuleRegex = regexp.MustCompile(`rewrite\("([^"]+)"\|"([^"]+)"\)`)
|
||||
|
||||
// ProcessFeedEntries downloads original web page for entries and apply filters.
|
||||
func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64, forceRefresh bool) {
|
||||
var filteredEntries model.Entries
|
||||
@@ -36,10 +33,12 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
|
||||
return
|
||||
}
|
||||
|
||||
// Process older entries first
|
||||
for i := len(feed.Entries) - 1; i >= 0; i-- {
|
||||
entry := feed.Entries[i]
|
||||
// The errors are handled in RemoveTrackingParameters.
|
||||
parsedFeedURL, _ := url.Parse(feed.FeedURL)
|
||||
parsedSiteURL, _ := url.Parse(feed.SiteURL)
|
||||
|
||||
// Process older entries first
|
||||
for _, entry := range slices.Backward(feed.Entries) {
|
||||
slog.Debug("Processing entry",
|
||||
slog.Int64("user_id", user.ID),
|
||||
slog.String("entry_url", entry.URL),
|
||||
@@ -48,17 +47,18 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
)
|
||||
if isBlockedEntry(feed, entry, user) || !isAllowedEntry(feed, entry, user) || !isRecentEntry(entry) {
|
||||
|
||||
if filter.IsBlockedEntry(feed, entry, user) || !filter.IsAllowedEntry(feed, entry, user) {
|
||||
continue
|
||||
}
|
||||
|
||||
if cleanedURL, err := urlcleaner.RemoveTrackingParameters(feed.FeedURL, feed.SiteURL, entry.URL); err == nil {
|
||||
parsedInputUrl, _ := url.Parse(entry.URL)
|
||||
if cleanedURL, err := urlcleaner.RemoveTrackingParameters(parsedFeedURL, parsedSiteURL, parsedInputUrl); err == nil {
|
||||
entry.URL = cleanedURL
|
||||
}
|
||||
|
||||
pageBaseURL := ""
|
||||
rewrittenURL := rewriteEntryURL(feed, entry)
|
||||
entry.URL = rewrittenURL
|
||||
webpageBaseURL := ""
|
||||
entry.URL = rewrite.RewriteEntryURL(feed, entry)
|
||||
entryIsNew := store.IsNewEntry(feed.ID, entry.Hash)
|
||||
if feed.Crawler && (entryIsNew || forceRefresh) {
|
||||
slog.Debug("Scraping entry",
|
||||
@@ -70,7 +70,6 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.Bool("entry_is_new", entryIsNew),
|
||||
slog.Bool("force_refresh", forceRefresh),
|
||||
slog.String("rewritten_url", rewrittenURL),
|
||||
)
|
||||
|
||||
startTime := time.Now()
|
||||
@@ -88,12 +87,12 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
|
||||
|
||||
scrapedPageBaseURL, extractedContent, scraperErr := scraper.ScrapeWebsite(
|
||||
requestBuilder,
|
||||
rewrittenURL,
|
||||
entry.URL,
|
||||
feed.ScraperRules,
|
||||
)
|
||||
|
||||
if scrapedPageBaseURL != "" {
|
||||
pageBaseURL = scrapedPageBaseURL
|
||||
webpageBaseURL = scrapedPageBaseURL
|
||||
}
|
||||
|
||||
if config.Opts.HasMetricsCollector() {
|
||||
@@ -114,18 +113,18 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
|
||||
)
|
||||
} else if extractedContent != "" {
|
||||
// We replace the entry content only if the scraper doesn't return any error.
|
||||
entry.Content = minifyEntryContent(extractedContent)
|
||||
entry.Content = minifyContent(extractedContent)
|
||||
}
|
||||
}
|
||||
|
||||
rewrite.Rewriter(rewrittenURL, entry, feed.RewriteRules)
|
||||
rewrite.ApplyContentRewriteRules(entry, feed.RewriteRules)
|
||||
|
||||
if pageBaseURL == "" {
|
||||
pageBaseURL = rewrittenURL
|
||||
if webpageBaseURL == "" {
|
||||
webpageBaseURL = entry.URL
|
||||
}
|
||||
|
||||
// The sanitizer should always run at the end of the process to make sure unsafe HTML is filtered out.
|
||||
entry.Content = sanitizer.Sanitize(pageBaseURL, entry.Content)
|
||||
entry.Content = sanitizer.SanitizeHTML(webpageBaseURL, entry.Content, &sanitizer.SanitizerOptions{OpenLinksInNewTab: user.OpenExternalLinksInNewTab})
|
||||
|
||||
updateEntryReadingTime(store, feed, entry, entryIsNew, user)
|
||||
|
||||
@@ -142,7 +141,7 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
|
||||
// ProcessEntryWebPage downloads the entry web page and apply rewrite rules.
|
||||
func ProcessEntryWebPage(feed *model.Feed, entry *model.Entry, user *model.User) error {
|
||||
startTime := time.Now()
|
||||
rewrittenEntryURL := rewriteEntryURL(feed, entry)
|
||||
entry.URL = rewrite.RewriteEntryURL(feed, entry)
|
||||
|
||||
requestBuilder := fetcher.NewRequestBuilder()
|
||||
requestBuilder.WithUserAgent(feed.UserAgent, config.Opts.HTTPClientUserAgent())
|
||||
@@ -155,9 +154,9 @@ func ProcessEntryWebPage(feed *model.Feed, entry *model.Entry, user *model.User)
|
||||
requestBuilder.IgnoreTLSErrors(feed.AllowSelfSignedCertificates)
|
||||
requestBuilder.DisableHTTP2(feed.DisableHTTP2)
|
||||
|
||||
pageBaseURL, extractedContent, scraperErr := scraper.ScrapeWebsite(
|
||||
webpageBaseURL, extractedContent, scraperErr := scraper.ScrapeWebsite(
|
||||
requestBuilder,
|
||||
rewrittenEntryURL,
|
||||
entry.URL,
|
||||
feed.ScraperRules,
|
||||
)
|
||||
|
||||
@@ -174,72 +173,14 @@ func ProcessEntryWebPage(feed *model.Feed, entry *model.Entry, user *model.User)
|
||||
}
|
||||
|
||||
if extractedContent != "" {
|
||||
entry.Content = minifyEntryContent(extractedContent)
|
||||
entry.Content = minifyContent(extractedContent)
|
||||
if user.ShowReadingTime {
|
||||
entry.ReadingTime = readingtime.EstimateReadingTime(entry.Content, user.DefaultReadingSpeed, user.CJKReadingSpeed)
|
||||
}
|
||||
}
|
||||
|
||||
rewrite.Rewriter(rewrittenEntryURL, entry, entry.Feed.RewriteRules)
|
||||
entry.Content = sanitizer.Sanitize(pageBaseURL, entry.Content)
|
||||
rewrite.ApplyContentRewriteRules(entry, entry.Feed.RewriteRules)
|
||||
entry.Content = sanitizer.SanitizeHTML(webpageBaseURL, entry.Content, &sanitizer.SanitizerOptions{OpenLinksInNewTab: user.OpenExternalLinksInNewTab})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func rewriteEntryURL(feed *model.Feed, entry *model.Entry) string {
|
||||
var rewrittenURL = entry.URL
|
||||
if feed.UrlRewriteRules != "" {
|
||||
parts := customReplaceRuleRegex.FindStringSubmatch(feed.UrlRewriteRules)
|
||||
|
||||
if len(parts) >= 3 {
|
||||
re, err := regexp.Compile(parts[1])
|
||||
if err != nil {
|
||||
slog.Error("Failed on regexp compilation",
|
||||
slog.String("url_rewrite_rules", feed.UrlRewriteRules),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
return rewrittenURL
|
||||
}
|
||||
rewrittenURL = re.ReplaceAllString(entry.URL, parts[2])
|
||||
slog.Debug("Rewriting entry URL",
|
||||
slog.String("original_entry_url", entry.URL),
|
||||
slog.String("rewritten_entry_url", rewrittenURL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
)
|
||||
} else {
|
||||
slog.Debug("Cannot find search and replace terms for replace rule",
|
||||
slog.String("original_entry_url", entry.URL),
|
||||
slog.String("rewritten_entry_url", rewrittenURL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("url_rewrite_rules", feed.UrlRewriteRules),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return rewrittenURL
|
||||
}
|
||||
|
||||
func isRecentEntry(entry *model.Entry) bool {
|
||||
if config.Opts.FilterEntryMaxAgeDays() == 0 || entry.Date.After(time.Now().AddDate(0, 0, -config.Opts.FilterEntryMaxAgeDays())) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func minifyEntryContent(entryContent string) string {
|
||||
m := minify.New()
|
||||
|
||||
// Options required to avoid breaking the HTML content.
|
||||
m.Add("text/html", &html.Minifier{
|
||||
KeepEndTags: true,
|
||||
KeepQuotes: true,
|
||||
})
|
||||
|
||||
if minifiedHTML, err := m.String("text/html", entryContent); err == nil {
|
||||
entryContent = minifiedHTML
|
||||
}
|
||||
|
||||
return entryContent
|
||||
}
|
||||
|
||||
@@ -5,120 +5,12 @@ package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
func TestBlockingEntries(t *testing.T) {
|
||||
var scenarios = []struct {
|
||||
feed *model.Feed
|
||||
entry *model.Entry
|
||||
user *model.User
|
||||
expected bool
|
||||
}{
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{URL: "https://example.com"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{URL: "https://different.com"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Some Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"something different", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Tags: []string{"something different", "something else"}}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Title: "No rule defined"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{URL: "https://example.com", Title: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{URL: "https://different.com", Title: "Some Test"}, &model.User{BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{URL: "https://different.com", Title: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{CommentsURL: "https://example.com", Content: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Test"}, &model.User{BlockFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Example"}, &model.User{BlockFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Author: "Example", Tags: []string{"example", "something else"}}, &model.User{BlockFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{BlockFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)example"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{BlockFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, false},
|
||||
}
|
||||
|
||||
for _, tc := range scenarios {
|
||||
result := isBlockedEntry(tc.feed, tc.entry, tc.user)
|
||||
if tc.expected != result {
|
||||
t.Errorf(`Unexpected result, got %v for entry %q`, result, tc.entry.Title)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestAllowEntries(t *testing.T) {
|
||||
var scenarios = []struct {
|
||||
feed *model.Feed
|
||||
entry *model.Entry
|
||||
user *model.User
|
||||
expected bool
|
||||
}{
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "https://example.com"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "https://different.com"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Some Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1}, &model.Entry{Title: "No rule defined"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"example", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Example", Tags: []string{"something different", "something else"}}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something more", Tags: []string{"something different", "something else"}}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Example"}, &model.User{}, true},
|
||||
{&model.Feed{ID: 1, KeeplistRules: "(?i)example"}, &model.Entry{Title: "Something different", Author: "Something different"}, &model.User{}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{URL: "https://example.com", Title: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{URL: "https://different.com", Title: "Some Test"}, &model.User{KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{URL: "https://different.com", Title: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryURL=(?i)example\nEntryTitle=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{CommentsURL: "https://example.com", Content: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Test"}, &model.User{KeepFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{CommentsURL: "https://different.com", Content: "Some Example"}, &model.User{KeepFilterEntryRules: "EntryCommentsURL=(?i)example\nEntryContent=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Author: "Example", Tags: []string{"example", "something else"}}, &model.User{KeepFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{KeepFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)example"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Author: "Different", Tags: []string{"example", "something else"}}, &model.User{KeepFilterEntryRules: "EntryAuthor=(?i)example\nEntryTag=(?i)Test"}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Date: time.Now().Add(24 * time.Hour)}, &model.User{KeepFilterEntryRules: "EntryDate=future"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Date: time.Now().Add(-24 * time.Hour)}, &model.User{KeepFilterEntryRules: "EntryDate=future"}, false},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Date: time.Date(2024, 3, 14, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=before:2024-03-15"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Date: time.Date(2024, 3, 16, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=after:2024-03-15"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Date: time.Date(2024, 3, 10, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:2024-03-01,2024-03-15"}, true},
|
||||
{&model.Feed{ID: 1, BlocklistRules: ""}, &model.Entry{Date: time.Date(2024, 2, 28, 0, 0, 0, 0, time.UTC)}, &model.User{KeepFilterEntryRules: "EntryDate=between:2024-03-01,2024-03-15"}, false},
|
||||
}
|
||||
|
||||
for _, tc := range scenarios {
|
||||
result := isAllowedEntry(tc.feed, tc.entry, tc.user)
|
||||
if tc.expected != result {
|
||||
t.Errorf(`Unexpected result, got %v for entry %q`, result, tc.entry.Title)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsRecentEntry(t *testing.T) {
|
||||
parser := config.NewParser()
|
||||
var err error
|
||||
config.Opts, err = parser.ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
var scenarios = []struct {
|
||||
entry *model.Entry
|
||||
expected bool
|
||||
}{
|
||||
{&model.Entry{Title: "Example1", Date: time.Date(2005, 5, 1, 05, 05, 05, 05, time.UTC)}, true},
|
||||
{&model.Entry{Title: "Example2", Date: time.Date(2010, 5, 1, 05, 05, 05, 05, time.UTC)}, true},
|
||||
{&model.Entry{Title: "Example3", Date: time.Date(2020, 5, 1, 05, 05, 05, 05, time.UTC)}, true},
|
||||
{&model.Entry{Title: "Example4", Date: time.Date(2024, 3, 15, 05, 05, 05, 05, time.UTC)}, true},
|
||||
}
|
||||
for _, tc := range scenarios {
|
||||
result := isRecentEntry(tc.entry)
|
||||
if tc.expected != result {
|
||||
t.Errorf(`Unexpected result, got %v for entry %q`, result, tc.entry.Title)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMinifyEntryContent(t *testing.T) {
|
||||
input := `<p> Some text with a <a href="http://example.org/"> link </a> </p>`
|
||||
expected := `<p>Some text with a <a href="http://example.org/">link</a></p>`
|
||||
result := minifyEntryContent(input)
|
||||
result := minifyContent(input)
|
||||
if expected != result {
|
||||
t.Errorf(`Unexpected result, got %q`, result)
|
||||
}
|
||||
|
||||
@@ -4,26 +4,70 @@
|
||||
package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strconv"
|
||||
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
"miniflux.app/v2/internal/proxyrotator"
|
||||
"miniflux.app/v2/internal/reader/fetcher"
|
||||
"miniflux.app/v2/internal/reader/readingtime"
|
||||
"miniflux.app/v2/internal/storage"
|
||||
)
|
||||
|
||||
func fetchWatchTime(websiteURL, query string, isoDate bool) (int, error) {
|
||||
requestBuilder := fetcher.NewRequestBuilder()
|
||||
requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
|
||||
requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
|
||||
|
||||
responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
|
||||
defer responseHandler.Close()
|
||||
|
||||
if localizedError := responseHandler.LocalizedError(); localizedError != nil {
|
||||
slog.Warn("Unable to fetch watch time", slog.String("website_url", websiteURL), slog.Any("error", localizedError.Error()))
|
||||
return 0, localizedError.Error()
|
||||
}
|
||||
|
||||
doc, docErr := goquery.NewDocumentFromReader(responseHandler.Body(config.Opts.HTTPClientMaxBodySize()))
|
||||
if docErr != nil {
|
||||
return 0, docErr
|
||||
}
|
||||
|
||||
duration, exists := doc.FindMatcher(goquery.Single(query)).Attr("content")
|
||||
if !exists {
|
||||
return 0, errors.New("duration not found")
|
||||
}
|
||||
|
||||
ret := 0
|
||||
if isoDate {
|
||||
parsedDuration, err := parseISO8601(duration)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("unable to parse iso duration %s: %v", duration, err)
|
||||
}
|
||||
ret = int(parsedDuration.Minutes())
|
||||
} else {
|
||||
parsedDuration, err := strconv.ParseInt(duration, 10, 64)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("unable to parse duration %s: %v", duration, err)
|
||||
}
|
||||
ret = int(parsedDuration / 60)
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func updateEntryReadingTime(store *storage.Storage, feed *model.Feed, entry *model.Entry, entryIsNew bool, user *model.User) {
|
||||
if !user.ShowReadingTime {
|
||||
slog.Debug("Skip reading time estimation for this user", slog.Int64("user_id", user.ID))
|
||||
return
|
||||
}
|
||||
|
||||
// Define a type for watch time fetching functions
|
||||
type watchTimeFetcher func(string) (int, error)
|
||||
|
||||
// Define watch time fetching scenarios
|
||||
watchTimeScenarios := []struct {
|
||||
shouldFetch func(*model.Entry) bool
|
||||
fetchFunc watchTimeFetcher
|
||||
fetchFunc func(string) (int, error)
|
||||
platform string
|
||||
}{
|
||||
{shouldFetchYouTubeWatchTimeForSingleEntry, fetchYouTubeWatchTimeForSingleEntry, "YouTube"},
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/tdewolff/minify/v2"
|
||||
"github.com/tdewolff/minify/v2/html"
|
||||
)
|
||||
|
||||
// TODO: use something less horrible than a regex to parse ISO 8601 durations.
|
||||
|
||||
var (
|
||||
iso8601Regex = regexp.MustCompile(`^P((?P<year>\d+)Y)?((?P<month>\d+)M)?((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$`)
|
||||
)
|
||||
|
||||
func parseISO8601(from string) (time.Duration, error) {
|
||||
var match []string
|
||||
var d time.Duration
|
||||
|
||||
if iso8601Regex.MatchString(from) {
|
||||
match = iso8601Regex.FindStringSubmatch(from)
|
||||
} else {
|
||||
return 0, errors.New("processor: could not parse duration string")
|
||||
}
|
||||
|
||||
for i, name := range iso8601Regex.SubexpNames() {
|
||||
part := match[i]
|
||||
if i == 0 || name == "" || part == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
val, err := strconv.ParseInt(part, 10, 64)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
switch name {
|
||||
case "hour":
|
||||
d += time.Duration(val) * time.Hour
|
||||
case "minute":
|
||||
d += time.Duration(val) * time.Minute
|
||||
case "second":
|
||||
d += time.Duration(val) * time.Second
|
||||
default:
|
||||
return 0, fmt.Errorf("processor: unknown field %s", name)
|
||||
}
|
||||
}
|
||||
|
||||
return d, nil
|
||||
}
|
||||
|
||||
func minifyContent(content string) string {
|
||||
m := minify.New()
|
||||
|
||||
// Options required to avoid breaking the HTML content.
|
||||
m.Add("text/html", &html.Minifier{
|
||||
KeepEndTags: true,
|
||||
KeepQuotes: true,
|
||||
})
|
||||
|
||||
if minifiedHTML, err := m.String("text/html", content); err == nil {
|
||||
content = minifiedHTML
|
||||
}
|
||||
|
||||
return content
|
||||
}
|
||||
@@ -5,30 +5,20 @@ package processor // import "miniflux.app/v2/internal/reader/processor"
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
|
||||
"miniflux.app/v2/internal/config"
|
||||
"miniflux.app/v2/internal/model"
|
||||
"miniflux.app/v2/internal/proxyrotator"
|
||||
"miniflux.app/v2/internal/reader/fetcher"
|
||||
)
|
||||
|
||||
var (
|
||||
youtubeRegex = regexp.MustCompile(`youtube\.com/watch\?v=(.*)$`)
|
||||
iso8601Regex = regexp.MustCompile(`^P((?P<year>\d+)Y)?((?P<month>\d+)M)?((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$`)
|
||||
)
|
||||
|
||||
func isYouTubeVideoURL(websiteURL string) bool {
|
||||
return len(youtubeRegex.FindStringSubmatch(websiteURL)) == 2
|
||||
return strings.Contains(websiteURL, "youtube.com/watch?v=")
|
||||
}
|
||||
|
||||
func getVideoIDFromYouTubeURL(websiteURL string) string {
|
||||
@@ -49,40 +39,11 @@ func shouldFetchYouTubeWatchTimeInBulk() bool {
|
||||
}
|
||||
|
||||
func fetchYouTubeWatchTimeForSingleEntry(websiteURL string) (int, error) {
|
||||
slog.Debug("Fetching YouTube watch time for a single entry", slog.String("website_url", websiteURL))
|
||||
|
||||
requestBuilder := fetcher.NewRequestBuilder()
|
||||
requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
|
||||
requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
|
||||
|
||||
responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
|
||||
defer responseHandler.Close()
|
||||
|
||||
if localizedError := responseHandler.LocalizedError(); localizedError != nil {
|
||||
slog.Warn("Unable to fetch YouTube page", slog.String("website_url", websiteURL), slog.Any("error", localizedError.Error()))
|
||||
return 0, localizedError.Error()
|
||||
}
|
||||
|
||||
doc, docErr := goquery.NewDocumentFromReader(responseHandler.Body(config.Opts.HTTPClientMaxBodySize()))
|
||||
if docErr != nil {
|
||||
return 0, docErr
|
||||
}
|
||||
|
||||
htmlDuration, exists := doc.FindMatcher(goquery.Single(`meta[itemprop="duration"]`)).Attr("content")
|
||||
if !exists {
|
||||
return 0, errors.New("youtube: duration has not found")
|
||||
}
|
||||
|
||||
parsedDuration, err := parseISO8601(htmlDuration)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("youtube: unable to parse duration %s: %v", htmlDuration, err)
|
||||
}
|
||||
|
||||
return int(parsedDuration.Minutes()), nil
|
||||
return fetchWatchTime(websiteURL, `meta[itemprop="duration"]`, true)
|
||||
}
|
||||
|
||||
func fetchYouTubeWatchTimeInBulk(entries []*model.Entry) {
|
||||
var videosEntriesMapping = make(map[string]*model.Entry)
|
||||
var videosEntriesMapping = make(map[string]*model.Entry, len(entries))
|
||||
var videoIDs []string
|
||||
|
||||
for _, entry := range entries {
|
||||
@@ -95,7 +56,7 @@ func fetchYouTubeWatchTimeInBulk(entries []*model.Entry) {
|
||||
continue
|
||||
}
|
||||
|
||||
videosEntriesMapping[getVideoIDFromYouTubeURL(entry.URL)] = entry
|
||||
videosEntriesMapping[youtubeVideoID] = entry
|
||||
videoIDs = append(videoIDs, youtubeVideoID)
|
||||
}
|
||||
|
||||
@@ -143,12 +104,19 @@ func fetchYouTubeWatchTimeFromApiInBulk(videoIDs []string) (map[string]time.Dura
|
||||
return nil, localizedError.Error()
|
||||
}
|
||||
|
||||
var videos youtubeVideoListResponse
|
||||
videos := struct {
|
||||
Items []struct {
|
||||
ID string `json:"id"`
|
||||
ContentDetails struct {
|
||||
Duration string `json:"duration"`
|
||||
} `json:"contentDetails"`
|
||||
} `json:"items"`
|
||||
}{}
|
||||
if err := json.NewDecoder(responseHandler.Body(config.Opts.HTTPClientMaxBodySize())).Decode(&videos); err != nil {
|
||||
return nil, fmt.Errorf("youtube: unable to decode JSON: %v", err)
|
||||
}
|
||||
|
||||
watchTimeMap := make(map[string]time.Duration)
|
||||
watchTimeMap := make(map[string]time.Duration, len(videos.Items))
|
||||
for _, video := range videos.Items {
|
||||
duration, err := parseISO8601(video.ContentDetails.Duration)
|
||||
if err != nil {
|
||||
@@ -159,48 +127,3 @@ func fetchYouTubeWatchTimeFromApiInBulk(videoIDs []string) (map[string]time.Dura
|
||||
}
|
||||
return watchTimeMap, nil
|
||||
}
|
||||
|
||||
func parseISO8601(from string) (time.Duration, error) {
|
||||
var match []string
|
||||
var d time.Duration
|
||||
|
||||
if iso8601Regex.MatchString(from) {
|
||||
match = iso8601Regex.FindStringSubmatch(from)
|
||||
} else {
|
||||
return 0, errors.New("youtube: could not parse duration string")
|
||||
}
|
||||
|
||||
for i, name := range iso8601Regex.SubexpNames() {
|
||||
part := match[i]
|
||||
if i == 0 || name == "" || part == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
val, err := strconv.ParseInt(part, 10, 64)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
switch name {
|
||||
case "hour":
|
||||
d += time.Duration(val) * time.Hour
|
||||
case "minute":
|
||||
d += time.Duration(val) * time.Minute
|
||||
case "second":
|
||||
d += time.Duration(val) * time.Second
|
||||
default:
|
||||
return 0, fmt.Errorf("youtube: unknown field %s", name)
|
||||
}
|
||||
}
|
||||
|
||||
return d, nil
|
||||
}
|
||||
|
||||
type youtubeVideoListResponse struct {
|
||||
Items []struct {
|
||||
ID string `json:"id"`
|
||||
ContentDetails struct {
|
||||
Duration string `json:"duration"`
|
||||
} `json:"contentDetails"`
|
||||
} `json:"items"`
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ func (r *RDFAdapter) BuildFeed(baseURL string) *model.Feed {
|
||||
hashValue = item.Title + item.Description // Fallback to the title and description if the link is empty.
|
||||
}
|
||||
|
||||
entry.Hash = crypto.Hash(hashValue)
|
||||
entry.Hash = crypto.SHA256(hashValue)
|
||||
|
||||
// Populate the entry date.
|
||||
entry.Date = time.Now()
|
||||
|
||||
@@ -21,7 +21,7 @@ const (
|
||||
)
|
||||
|
||||
var (
|
||||
divToPElementsRegexp = regexp.MustCompile(`(?i)<(a|blockquote|dl|div|img|ol|p|pre|table|ul)`)
|
||||
divToPElementsRegexp = regexp.MustCompile(`(?i)<(?:a|blockquote|dl|div|img|ol|p|pre|table|ul)[ />]`)
|
||||
|
||||
okMaybeItsACandidateRegexp = regexp.MustCompile(`and|article|body|column|main|shadow`)
|
||||
unlikelyCandidatesRegexp = regexp.MustCompile(`banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|foot|header|legends|menu|modal|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote`)
|
||||
@@ -162,6 +162,11 @@ func removeUnlikelyCandidates(document *goquery.Document) {
|
||||
return
|
||||
}
|
||||
|
||||
// Don't remove elements within code blocks (pre or code tags)
|
||||
if s.Closest("pre, code").Length() > 0 {
|
||||
return
|
||||
}
|
||||
|
||||
if class, ok := s.Attr("class"); ok {
|
||||
if shouldRemove(class) {
|
||||
s.Remove()
|
||||
|
||||
@@ -164,6 +164,28 @@ func TestRemoveBlacklist(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestNestedSpanInCodeBlock(t *testing.T) {
|
||||
html := `
|
||||
<html>
|
||||
<head>
|
||||
<title>Test</title>
|
||||
</head>
|
||||
<body>
|
||||
<article><p>Some content</p><pre><code class="hljs-built_in">Code block with <span class="hljs-built_in">nested span</span> <span class="hljs-comment"># exit 1</span></code></pre></article>
|
||||
</body>
|
||||
</html>`
|
||||
want := `<div><div><p>Some content</p><pre><code class="hljs-built_in">Code block with <span class="hljs-built_in">nested span</span> <span class="hljs-comment"># exit 1</span></code></pre></div></div>`
|
||||
|
||||
_, result, err := ExtractContent(strings.NewReader(html))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if result != want {
|
||||
t.Errorf(`Invalid content, got %s instead of %s`, result, want)
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkExtractContent(b *testing.B) {
|
||||
var testCases = map[string][]byte{
|
||||
"miniflux_github.html": {},
|
||||
|
||||
@@ -80,7 +80,7 @@ func TestEstimateReadingTime(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkEstimateReadingTime(b *testing.B) {
|
||||
for range b.N {
|
||||
for b.Loop() {
|
||||
for _, sample := range samples {
|
||||
EstimateReadingTime(sample, 200, 500)
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ func (rule rule) applyRule(entryURL string, entry *model.Entry) {
|
||||
case "add_dynamic_iframe":
|
||||
entry.Content = addDynamicIframe(entry.Content)
|
||||
case "add_youtube_video":
|
||||
entry.Content = addYoutubeVideo(entryURL, entry.Content)
|
||||
entry.Content = addYoutubeVideoRewriteRule(entryURL, entry.Content)
|
||||
case "add_invidious_video":
|
||||
entry.Content = addInvidiousVideo(entryURL, entry.Content)
|
||||
case "add_youtube_video_using_invidious_player":
|
||||
@@ -97,9 +97,8 @@ func (rule rule) applyRule(entryURL string, entry *model.Entry) {
|
||||
}
|
||||
}
|
||||
|
||||
// Rewriter modify item contents with a set of rewriting rules.
|
||||
func Rewriter(entryURL string, entry *model.Entry, customRewriteRules string) {
|
||||
rulesList := getPredefinedRewriteRules(entryURL)
|
||||
func ApplyContentRewriteRules(entry *model.Entry, customRewriteRules string) {
|
||||
rulesList := getPredefinedRewriteRules(entry.URL)
|
||||
if customRewriteRules != "" {
|
||||
rulesList = customRewriteRules
|
||||
}
|
||||
@@ -109,11 +108,11 @@ func Rewriter(entryURL string, entry *model.Entry, customRewriteRules string) {
|
||||
|
||||
slog.Debug("Rewrite rules applied",
|
||||
slog.Any("rules", rules),
|
||||
slog.String("entry_url", entryURL),
|
||||
slog.String("entry_url", entry.URL),
|
||||
)
|
||||
|
||||
for _, rule := range rules {
|
||||
rule.applyRule(entryURL, entry)
|
||||
rule.applyRule(entry.URL, entry)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,11 +136,9 @@ func parseRules(rulesText string) (rules []rule) {
|
||||
}
|
||||
|
||||
func getPredefinedRewriteRules(entryURL string) string {
|
||||
urlDomain := urllib.Domain(entryURL)
|
||||
for domain, rules := range predefinedRules {
|
||||
if strings.Contains(urlDomain, domain) {
|
||||
return rules
|
||||
}
|
||||
urlDomain := urllib.DomainWithoutWWW(entryURL)
|
||||
if rules, ok := predefinedRules[urlDomain]; ok {
|
||||
return rules
|
||||
}
|
||||
|
||||
return ""
|
||||
+26
-13
@@ -21,10 +21,11 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
youtubeRegex = regexp.MustCompile(`youtube\.com/watch\?v=(.*)$`)
|
||||
youtubeIdRegex = regexp.MustCompile(`youtube_id"?\s*[:=]\s*"([a-zA-Z0-9_-]{11})"`)
|
||||
invidioRegex = regexp.MustCompile(`https?://(.*)/watch\?v=(.*)`)
|
||||
textLinkRegex = regexp.MustCompile(`(?mi)(\bhttps?:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])`)
|
||||
youtubeVideoRegex = regexp.MustCompile(`youtube\.com/watch\?v=(.*)$`)
|
||||
youtubeShortRegex = regexp.MustCompile(`youtube\.com/shorts/([a-zA-Z0-9_-]{11})$`)
|
||||
youtubeIdRegex = regexp.MustCompile(`youtube_id"?\s*[:=]\s*"([a-zA-Z0-9_-]{11})"`)
|
||||
invidioRegex = regexp.MustCompile(`https?://(.*)/watch\?v=(.*)`)
|
||||
textLinkRegex = regexp.MustCompile(`(?mi)(\bhttps?:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])`)
|
||||
)
|
||||
|
||||
// titlelize returns a copy of the string s with all Unicode letters that begin words
|
||||
@@ -259,22 +260,34 @@ func useNoScriptImages(entryContent string) string {
|
||||
return output
|
||||
}
|
||||
|
||||
func addYoutubeVideo(entryURL, entryContent string) string {
|
||||
matches := youtubeRegex.FindStringSubmatch(entryURL)
|
||||
func getYoutubVideoIDFromURL(entryURL string) string {
|
||||
matches := youtubeVideoRegex.FindStringSubmatch(entryURL)
|
||||
|
||||
if len(matches) != 2 {
|
||||
matches = youtubeShortRegex.FindStringSubmatch(entryURL)
|
||||
}
|
||||
|
||||
if len(matches) == 2 {
|
||||
video := `<iframe width="650" height="350" frameborder="0" src="` + config.Opts.YouTubeEmbedUrlOverride() + matches[1] + `" allowfullscreen></iframe>`
|
||||
return video + `<br>` + entryContent
|
||||
return matches[1]
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func addVideoPlayerIframe(absoluteVideoURL, entryContent string) string {
|
||||
video := `<iframe width="650" height="350" frameborder="0" src="` + absoluteVideoURL + `" allowfullscreen></iframe>`
|
||||
return video + `<br>` + entryContent
|
||||
}
|
||||
|
||||
func addYoutubeVideoRewriteRule(entryURL, entryContent string) string {
|
||||
if videoURL := getYoutubVideoIDFromURL(entryURL); videoURL != "" {
|
||||
return addVideoPlayerIframe(config.Opts.YouTubeEmbedUrlOverride()+videoURL, entryContent)
|
||||
}
|
||||
return entryContent
|
||||
}
|
||||
|
||||
func addYoutubeVideoUsingInvidiousPlayer(entryURL, entryContent string) string {
|
||||
matches := youtubeRegex.FindStringSubmatch(entryURL)
|
||||
|
||||
if len(matches) == 2 {
|
||||
video := `<iframe width="650" height="350" frameborder="0" src="https://` + config.Opts.InvidiousInstance() + `/embed/` + matches[1] + `" allowfullscreen></iframe>`
|
||||
return video + `<br>` + entryContent
|
||||
if videoURL := getYoutubVideoIDFromURL(entryURL); videoURL != "" {
|
||||
return addVideoPlayerIframe(`https://`+config.Opts.InvidiousInstance()+`/embed/`+videoURL, entryContent)
|
||||
}
|
||||
return entryContent
|
||||
}
|
||||
+1
-43
@@ -3,13 +3,7 @@
|
||||
|
||||
package rewrite // import "miniflux.app/v2/internal/reader/rewrite"
|
||||
|
||||
import (
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// List of predefined rewrite rules (alphabetically sorted)
|
||||
// Available rules: "add_image_title", "add_youtube_video"
|
||||
// domain => rule name
|
||||
var predefinedRules = map[string]string{
|
||||
"abstrusegoose.com": "add_image_title",
|
||||
@@ -32,47 +26,11 @@ var predefinedRules = map[string]string{
|
||||
"optipess.com": "add_image_title",
|
||||
"peebleslab.com": "add_image_title",
|
||||
"quantamagazine.org": `add_youtube_video_from_id, remove("h6:not(.byline,.post__title__kicker), #comments, .next-post__content, .footer__section, figure .outer--content, script")`,
|
||||
"qwantz.com": "add_image_title,add_mailto_subject",
|
||||
"sentfromthemoon.com": "add_image_title",
|
||||
"thedoghousediaries.com": "add_image_title",
|
||||
"theverge.com": `add_dynamic_image, remove("div.duet--recirculation--related-list, .hidden")`,
|
||||
"treelobsters.com": "add_image_title",
|
||||
"www.qwantz.com": "add_image_title,add_mailto_subject",
|
||||
"xkcd.com": "add_image_title",
|
||||
"youtube.com": "add_youtube_video",
|
||||
}
|
||||
|
||||
// GetRefererForURL returns the referer for the given URL if it exists, otherwise an empty string.
|
||||
func GetRefererForURL(u string) string {
|
||||
parsedUrl, err := url.Parse(u)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
switch parsedUrl.Hostname() {
|
||||
case "appinn.com":
|
||||
return "https://appinn.com"
|
||||
case "bjp.org.cn":
|
||||
return "https://bjp.org.cn"
|
||||
case "cdnfile.sspai.com":
|
||||
return "https://sspai.com"
|
||||
case "f.video.weibocdn.com":
|
||||
return "https://weibo.com"
|
||||
case "i.pximg.net":
|
||||
return "https://www.pixiv.net"
|
||||
case "img.hellogithub.com":
|
||||
return "https://hellogithub.com"
|
||||
case "moyu.im":
|
||||
return "https://i.jandan.net"
|
||||
}
|
||||
|
||||
switch {
|
||||
case strings.HasSuffix(parsedUrl.Hostname(), ".cdninstagram.com"):
|
||||
return "https://www.instagram.com"
|
||||
case strings.HasSuffix(parsedUrl.Hostname(), ".moyu.im"):
|
||||
return "https://i.jandan.net"
|
||||
case strings.HasSuffix(parsedUrl.Hostname(), ".sinaimg.cn"):
|
||||
return "https://weibo.com"
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
+214
-46
@@ -50,39 +50,83 @@ func TestReplaceTextLinks(t *testing.T) {
|
||||
|
||||
func TestRewriteWithNoMatchingRule(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `Some text.`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `Some text.`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteWithYoutubeLink(t *testing.T) {
|
||||
func TestRewriteYoutubeVideoLink(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `<iframe width="650" height="350" frameborder="0" src="https://www.youtube-nocookie.com/embed/1234" allowfullscreen></iframe><br>Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
Rewriter("https://www.youtube.com/watch?v=1234", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteWithYoutubeLinkAndCustomEmbedURL(t *testing.T) {
|
||||
func TestRewriteYoutubeShortLink(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/shorts/1LUWKWZkPjo",
|
||||
Title: `A title`,
|
||||
Content: `<iframe width="650" height="350" frameborder="0" src="https://www.youtube-nocookie.com/embed/1LUWKWZkPjo" allowfullscreen></iframe><br>Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/shorts/1LUWKWZkPjo",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteIncorrectYoutubeLink(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/some-page",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/some-page",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteYoutubeLinkAndCustomEmbedURL(t *testing.T) {
|
||||
os.Clearenv()
|
||||
os.Setenv("YOUTUBE_EMBED_URL_OVERRIDE", "https://invidious.custom/embed/")
|
||||
|
||||
@@ -95,14 +139,56 @@ func TestRewriteWithYoutubeLinkAndCustomEmbedURL(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `<iframe width="650" height="350" frameborder="0" src="https://invidious.custom/embed/1234" allowfullscreen></iframe><br>Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
Rewriter("https://www.youtube.com/watch?v=1234", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteYoutubeVideoLinkUsingInvidious(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `<iframe width="650" height="350" frameborder="0" src="https://yewtu.be/embed/1234" allowfullscreen></iframe><br>Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
|
||||
ApplyContentRewriteRules(testEntry, `add_youtube_video_using_invidious_player`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteYoutubeShortLinkUsingInvidious(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/shorts/1LUWKWZkPjo",
|
||||
Title: `A title`,
|
||||
Content: `<iframe width="650" height="350" frameborder="0" src="https://yewtu.be/embed/1LUWKWZkPjo" allowfullscreen></iframe><br>Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/shorts/1LUWKWZkPjo",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
|
||||
ApplyContentRewriteRules(testEntry, `add_youtube_video_using_invidious_player`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -111,14 +197,16 @@ func TestRewriteWithYoutubeLinkAndCustomEmbedURL(t *testing.T) {
|
||||
|
||||
func TestRewriteWithInexistingCustomRule(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.youtube.com/watch?v=1234",
|
||||
Title: `A title`,
|
||||
Content: `Video Description`,
|
||||
}
|
||||
Rewriter("https://www.youtube.com/watch?v=1234", testEntry, `some rule`)
|
||||
ApplyContentRewriteRules(testEntry, `some rule`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -127,14 +215,16 @@ func TestRewriteWithInexistingCustomRule(t *testing.T) {
|
||||
|
||||
func TestRewriteWithXkcdLink(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="https://imgs.xkcd.com/comics/thermostat.png" alt="Your problem is so terrible, I worry that, if I help you, I risk drawing the attention of whatever god of technology inflicted it on you."/><figcaption><p>Your problem is so terrible, I worry that, if I help you, I risk drawing the attention of whatever god of technology inflicted it on you.</p></figcaption></figure>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://imgs.xkcd.com/comics/thermostat.png" title="Your problem is so terrible, I worry that, if I help you, I risk drawing the attention of whatever god of technology inflicted it on you." alt="Your problem is so terrible, I worry that, if I help you, I risk drawing the attention of whatever god of technology inflicted it on you." />`,
|
||||
}
|
||||
Rewriter("https://xkcd.com/1912/", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -143,14 +233,16 @@ func TestRewriteWithXkcdLink(t *testing.T) {
|
||||
|
||||
func TestRewriteWithXkcdLinkHtmlInjection(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="https://imgs.xkcd.com/comics/thermostat.png" alt="<foo>"/><figcaption><p><foo></p></figcaption></figure>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://imgs.xkcd.com/comics/thermostat.png" title="<foo>" alt="<foo>" />`,
|
||||
}
|
||||
Rewriter("https://xkcd.com/1912/", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -159,14 +251,16 @@ func TestRewriteWithXkcdLinkHtmlInjection(t *testing.T) {
|
||||
|
||||
func TestRewriteWithXkcdLinkAndImageNoTitle(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://imgs.xkcd.com/comics/thermostat.png" alt="Your problem is so terrible, I worry that, if I help you, I risk drawing the attention of whatever god of technology inflicted it on you." />`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://imgs.xkcd.com/comics/thermostat.png" alt="Your problem is so terrible, I worry that, if I help you, I risk drawing the attention of whatever god of technology inflicted it on you." />`,
|
||||
}
|
||||
Rewriter("https://xkcd.com/1912/", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -175,14 +269,16 @@ func TestRewriteWithXkcdLinkAndImageNoTitle(t *testing.T) {
|
||||
|
||||
func TestRewriteWithXkcdLinkAndNoImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `test`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `test`,
|
||||
}
|
||||
Rewriter("https://xkcd.com/1912/", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -191,14 +287,16 @@ func TestRewriteWithXkcdLinkAndNoImage(t *testing.T) {
|
||||
|
||||
func TestRewriteWithXkcdAndNoImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `test`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://xkcd.com/1912/",
|
||||
Title: `A title`,
|
||||
Content: `test`,
|
||||
}
|
||||
Rewriter("https://xkcd.com/1912/", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -207,14 +305,16 @@ func TestRewriteWithXkcdAndNoImage(t *testing.T) {
|
||||
|
||||
func TestRewriteMailtoLink(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://www.qwantz.com/",
|
||||
Title: `A title`,
|
||||
Content: `<a href="mailto:ryan@qwantz.com?subject=blah%20blah">contact [blah blah]</a>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://www.qwantz.com/",
|
||||
Title: `A title`,
|
||||
Content: `<a href="mailto:ryan@qwantz.com?subject=blah%20blah">contact</a>`,
|
||||
}
|
||||
Rewriter("https://www.qwantz.com/", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -223,14 +323,16 @@ func TestRewriteMailtoLink(t *testing.T) {
|
||||
|
||||
func TestRewriteWithPDFLink(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/document.pdf",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/document.pdf">PDF</a><br>test`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/document.pdf",
|
||||
Title: `A title`,
|
||||
Content: `test`,
|
||||
}
|
||||
Rewriter("https://example.org/document.pdf", testEntry, ``)
|
||||
ApplyContentRewriteRules(testEntry, ``)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -239,14 +341,16 @@ func TestRewriteWithPDFLink(t *testing.T) {
|
||||
|
||||
func TestRewriteWithNoLazyImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://example.org/image.jpg" alt="Image"><noscript><p>Some text</p></noscript>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://example.org/image.jpg" alt="Image"><noscript><p>Some text</p></noscript>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_image")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_image")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -255,14 +359,16 @@ func TestRewriteWithNoLazyImage(t *testing.T) {
|
||||
|
||||
func TestRewriteWithLazyImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://example.org/image.jpg" data-url="https://example.org/image.jpg" alt="Image"/><noscript><img src="https://example.org/fallback.jpg" alt="Fallback"/></noscript>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="" data-url="https://example.org/image.jpg" alt="Image"><noscript><img src="https://example.org/fallback.jpg" alt="Fallback"></noscript>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_image")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_image")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -271,14 +377,16 @@ func TestRewriteWithLazyImage(t *testing.T) {
|
||||
|
||||
func TestRewriteWithLazyDivImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="https://example.org/image.jpg" alt="Image"/><noscript><img src="https://example.org/fallback.jpg" alt="Fallback"/></noscript>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div data-url="https://example.org/image.jpg" alt="Image"></div><noscript><img src="https://example.org/fallback.jpg" alt="Fallback"></noscript>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_image")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_image")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -287,14 +395,16 @@ func TestRewriteWithLazyDivImage(t *testing.T) {
|
||||
|
||||
func TestRewriteWithUnknownLazyNoScriptImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="" data-non-candidate="https://example.org/image.jpg" alt="Image"/><img src="https://example.org/fallback.jpg" alt="Fallback"/>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="" data-non-candidate="https://example.org/image.jpg" alt="Image"><noscript><img src="https://example.org/fallback.jpg" alt="Fallback"></noscript>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_image")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_image")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -303,14 +413,16 @@ func TestRewriteWithUnknownLazyNoScriptImage(t *testing.T) {
|
||||
|
||||
func TestRewriteWithLazySrcset(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img srcset="https://example.org/image.jpg" data-srcset="https://example.org/image.jpg" alt="Image"/>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img srcset="" data-srcset="https://example.org/image.jpg" alt="Image">`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_image")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_image")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -319,14 +431,16 @@ func TestRewriteWithLazySrcset(t *testing.T) {
|
||||
|
||||
func TestRewriteWithImageAndLazySrcset(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="meow" srcset="https://example.org/image.jpg" data-srcset="https://example.org/image.jpg" alt="Image"/>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="meow" srcset="" data-srcset="https://example.org/image.jpg" alt="Image">`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_image")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_image")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -335,14 +449,16 @@ func TestRewriteWithImageAndLazySrcset(t *testing.T) {
|
||||
|
||||
func TestRewriteWithNoLazyIframe(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<iframe src="https://example.org/embed" allowfullscreen></iframe>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<iframe src="https://example.org/embed" allowfullscreen></iframe>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_iframe")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_iframe")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -351,14 +467,16 @@ func TestRewriteWithNoLazyIframe(t *testing.T) {
|
||||
|
||||
func TestRewriteWithLazyIframe(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<iframe data-src="https://example.org/embed" allowfullscreen="" src="https://example.org/embed"></iframe>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<iframe data-src="https://example.org/embed" allowfullscreen></iframe>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_iframe")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_iframe")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -367,14 +485,16 @@ func TestRewriteWithLazyIframe(t *testing.T) {
|
||||
|
||||
func TestRewriteWithLazyIframeAndSrc(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<iframe src="https://example.org/embed" data-src="https://example.org/embed" allowfullscreen=""></iframe>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<iframe src="about:blank" data-src="https://example.org/embed" allowfullscreen></iframe>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "add_dynamic_iframe")
|
||||
ApplyContentRewriteRules(testEntry, "add_dynamic_iframe")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -383,14 +503,16 @@ func TestRewriteWithLazyIframeAndSrc(t *testing.T) {
|
||||
|
||||
func TestNewLineRewriteRule(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `A<br>B<br>C`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: "A\nB\nC",
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "nl2br")
|
||||
ApplyContentRewriteRules(testEntry, "nl2br")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -399,14 +521,16 @@ func TestNewLineRewriteRule(t *testing.T) {
|
||||
|
||||
func TestConvertTextLinkRewriteRule(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `Test: <a href="http://example.org/a/b">http://example.org/a/b</a>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `Test: http://example.org/a/b`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "convert_text_link")
|
||||
ApplyContentRewriteRules(testEntry, "convert_text_link")
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -415,10 +539,12 @@ func TestConvertTextLinkRewriteRule(t *testing.T) {
|
||||
|
||||
func TestMediumImage(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img alt="Image for post" class="t u v if aj" src="https://miro.medium.com/max/2560/1*ephLSqSzQYLvb7faDwzRbw.jpeg" width="1280" height="720" srcset="https://miro.medium.com/max/552/1*ephLSqSzQYLvb7faDwzRbw.jpeg 276w, https://miro.medium.com/max/1104/1*ephLSqSzQYLvb7faDwzRbw.jpeg 552w, https://miro.medium.com/max/1280/1*ephLSqSzQYLvb7faDwzRbw.jpeg 640w, https://miro.medium.com/max/1400/1*ephLSqSzQYLvb7faDwzRbw.jpeg 700w" sizes="700px"/>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `
|
||||
<figure class="ht hu hv hw hx hy cy cz paragraph-image">
|
||||
@@ -440,7 +566,7 @@ func TestMediumImage(t *testing.T) {
|
||||
</figure>
|
||||
`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "fix_medium_images")
|
||||
ApplyContentRewriteRules(testEntry, "fix_medium_images")
|
||||
testEntry.Content = strings.TrimSpace(testEntry.Content)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
@@ -450,14 +576,16 @@ func TestMediumImage(t *testing.T) {
|
||||
|
||||
func TestRewriteNoScriptImageWithoutNoScriptTag(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="https://developer.mozilla.org/static/img/favicon144.png" alt="The beautiful MDN logo."/><figcaption>MDN Logo</figcaption></figure>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="https://developer.mozilla.org/static/img/favicon144.png" alt="The beautiful MDN logo."><figcaption>MDN Logo</figcaption></figure>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "use_noscript_figure_images")
|
||||
ApplyContentRewriteRules(testEntry, "use_noscript_figure_images")
|
||||
testEntry.Content = strings.TrimSpace(testEntry.Content)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
@@ -467,14 +595,16 @@ func TestRewriteNoScriptImageWithoutNoScriptTag(t *testing.T) {
|
||||
|
||||
func TestRewriteNoScriptImageWithNoScriptTag(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="http://example.org/logo.svg"/><figcaption>MDN Logo</figcaption></figure>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="https://developer.mozilla.org/static/img/favicon144.png" alt="The beautiful MDN logo."><noscript><img src="http://example.org/logo.svg"></noscript><figcaption>MDN Logo</figcaption></figure>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, "use_noscript_figure_images")
|
||||
ApplyContentRewriteRules(testEntry, "use_noscript_figure_images")
|
||||
testEntry.Content = strings.TrimSpace(testEntry.Content)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
@@ -484,14 +614,16 @@ func TestRewriteNoScriptImageWithNoScriptTag(t *testing.T) {
|
||||
|
||||
func TestRewriteReplaceCustom(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="http://example.org/logo.svg"><img src="https://example.org/article/picture.png">`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<img src="http://example.org/logo.svg"><img src="https://example.org/article/picture.svg">`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `replace("article/(.*).svg"|"article/$1.png")`)
|
||||
ApplyContentRewriteRules(testEntry, `replace("article/(.*).svg"|"article/$1.png")`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -500,14 +632,16 @@ func TestRewriteReplaceCustom(t *testing.T) {
|
||||
|
||||
func TestRewriteReplaceTitleCustom(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `Ouch, a thistle`,
|
||||
Content: `The replace_title rewrite rule should not modify the content.`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `The replace_title rewrite rule should not modify the content.`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `replace_title("(?i)^a\\s*ti"|"Ouch, a this")`)
|
||||
ApplyContentRewriteRules(testEntry, `replace_title("(?i)^a\\s*ti"|"Ouch, a this")`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -516,14 +650,16 @@ func TestRewriteReplaceTitleCustom(t *testing.T) {
|
||||
|
||||
func TestRewriteRemoveCustom(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div>Lorem Ipsum <span class="ads keep">Super important info</span></div>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div>Lorem Ipsum <span class="spam">I dont want to see this</span><span class="ads keep">Super important info</span></div>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `remove(".spam, .ads:not(.keep)")`)
|
||||
ApplyContentRewriteRules(testEntry, `remove(".spam, .ads:not(.keep)")`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -532,14 +668,16 @@ func TestRewriteRemoveCustom(t *testing.T) {
|
||||
|
||||
func TestRewriteAddCastopodEpisode(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://podcast.demo/@demo/episodes/test",
|
||||
Title: `A title`,
|
||||
Content: `<iframe width="650" frameborder="0" src="https://podcast.demo/@demo/episodes/test/embed/light"></iframe><br>Episode Description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://podcast.demo/@demo/episodes/test",
|
||||
Title: `A title`,
|
||||
Content: `Episode Description`,
|
||||
}
|
||||
Rewriter("https://podcast.demo/@demo/episodes/test", testEntry, `add_castopod_episode`)
|
||||
ApplyContentRewriteRules(testEntry, `add_castopod_episode`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -548,14 +686,16 @@ func TestRewriteAddCastopodEpisode(t *testing.T) {
|
||||
|
||||
func TestRewriteBase64Decode(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `This is some base64 encoded content`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `VGhpcyBpcyBzb21lIGJhc2U2NCBlbmNvZGVkIGNvbnRlbnQ=`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `base64_decode`)
|
||||
ApplyContentRewriteRules(testEntry, `base64_decode`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -564,14 +704,16 @@ func TestRewriteBase64Decode(t *testing.T) {
|
||||
|
||||
func TestRewriteBase64DecodeInHTML(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div>Lorem Ipsum not valid base64<span class="base64">This is some base64 encoded content</span></div>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div>Lorem Ipsum not valid base64<span class="base64">VGhpcyBpcyBzb21lIGJhc2U2NCBlbmNvZGVkIGNvbnRlbnQ=</span></div>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `base64_decode`)
|
||||
ApplyContentRewriteRules(testEntry, `base64_decode`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -580,14 +722,16 @@ func TestRewriteBase64DecodeInHTML(t *testing.T) {
|
||||
|
||||
func TestRewriteBase64DecodeArgs(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div>Lorem Ipsum<span class="base64">This is some base64 encoded content</span></div>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<div>Lorem Ipsum<span class="base64">VGhpcyBpcyBzb21lIGJhc2U2NCBlbmNvZGVkIGNvbnRlbnQ=</span></div>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `base64_decode(".base64")`)
|
||||
ApplyContentRewriteRules(testEntry, `base64_decode(".base64")`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -596,14 +740,16 @@ func TestRewriteBase64DecodeArgs(t *testing.T) {
|
||||
|
||||
func TestRewriteRemoveTables(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<p>Test</p><p>Hello World!</p><p>Test</p>`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<table class="container"><tbody><tr><td><p>Test</p><table class="row"><tbody><tr><td><p>Hello World!</p></td><td><p>Test</p></td></tr></tbody></table></td></tr></tbody></table>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `remove_tables`)
|
||||
ApplyContentRewriteRules(testEntry, `remove_tables`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -612,14 +758,16 @@ func TestRewriteRemoveTables(t *testing.T) {
|
||||
|
||||
func TestRemoveClickbait(t *testing.T) {
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `This Is Amazing`,
|
||||
Content: `Some description`,
|
||||
}
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `THIS IS AMAZING`,
|
||||
Content: `Some description`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `remove_clickbait`)
|
||||
ApplyContentRewriteRules(testEntry, `remove_clickbait`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -628,6 +776,7 @@ func TestRemoveClickbait(t *testing.T) {
|
||||
|
||||
func TestAddHackerNewsLinksUsingHack(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<p>Article URL: <a href="https://example.org/url">https://example.org/article</a></p>
|
||||
<p>Comments URL: <a href="https://news.ycombinator.com/item?id=37620043">https://news.ycombinator.com/item?id=37620043</a></p>
|
||||
@@ -636,13 +785,14 @@ func TestAddHackerNewsLinksUsingHack(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<p>Article URL: <a href="https://example.org/url">https://example.org/article</a></p>
|
||||
<p>Comments URL: <a href="https://news.ycombinator.com/item?id=37620043">https://news.ycombinator.com/item?id=37620043</a> <a href="hack://item?id=37620043">Open with HACK</a></p>
|
||||
<p>Points: 23</p>
|
||||
<p># Comments: 38</p>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `add_hn_links_using_hack`)
|
||||
ApplyContentRewriteRules(testEntry, `add_hn_links_using_hack`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -651,6 +801,7 @@ func TestAddHackerNewsLinksUsingHack(t *testing.T) {
|
||||
|
||||
func TestAddHackerNewsLinksUsingOpener(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<p>Article URL: <a href="https://example.org/url">https://example.org/article</a></p>
|
||||
<p>Comments URL: <a href="https://news.ycombinator.com/item?id=37620043">https://news.ycombinator.com/item?id=37620043</a></p>
|
||||
@@ -659,13 +810,14 @@ func TestAddHackerNewsLinksUsingOpener(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<p>Article URL: <a href="https://example.org/url">https://example.org/article</a></p>
|
||||
<p>Comments URL: <a href="https://news.ycombinator.com/item?id=37620043">https://news.ycombinator.com/item?id=37620043</a> <a href="opener://x-callback-url/show-options?url=https%3A%2F%2Fnews.ycombinator.com%2Fitem%3Fid%3D37620043">Open with Opener</a></p>
|
||||
<p>Points: 23</p>
|
||||
<p># Comments: 38</p>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `add_hn_links_using_opener`)
|
||||
ApplyContentRewriteRules(testEntry, `add_hn_links_using_opener`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -674,6 +826,7 @@ func TestAddHackerNewsLinksUsingOpener(t *testing.T) {
|
||||
|
||||
func TestAddImageTitle(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `
|
||||
<img src="pif" title="pouf">
|
||||
@@ -687,6 +840,7 @@ func TestAddImageTitle(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure><img src="pif" alt=""/><figcaption><p>pouf</p></figcaption></figure>
|
||||
<figure><img src="pif" alt="" onerror="alert(1)" a=""/><figcaption><p>pouf</p></figcaption></figure>
|
||||
@@ -697,7 +851,7 @@ func TestAddImageTitle(t *testing.T) {
|
||||
<figure><img src="pif" alt="pouf"/><figcaption><p>;&quot;onerror=alert(1) a=;&quot;</p></figcaption></figure>
|
||||
`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `add_image_title`)
|
||||
ApplyContentRewriteRules(testEntry, `add_image_title`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -706,6 +860,7 @@ func TestAddImageTitle(t *testing.T) {
|
||||
|
||||
func TestFixGhostCard(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a class="kg-bookmark-container" href="https://example.org/article">
|
||||
@@ -726,10 +881,11 @@ func TestFixGhostCard(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/article">Example Article - Example</a>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -738,15 +894,17 @@ func TestFixGhostCard(t *testing.T) {
|
||||
|
||||
func TestFixGhostCardNoCard(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/article">Example Article - Example</a>`,
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/article">Example Article - Example</a>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -755,6 +913,7 @@ func TestFixGhostCardNoCard(t *testing.T) {
|
||||
|
||||
func TestFixGhostCardInvalidCard(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a href="https://example.org/article">This card does not have the required fields</a>
|
||||
@@ -762,12 +921,13 @@ func TestFixGhostCardInvalidCard(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a href="https://example.org/article">This card does not have the required fields</a>
|
||||
</figure>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -776,6 +936,7 @@ func TestFixGhostCardInvalidCard(t *testing.T) {
|
||||
|
||||
func TestFixGhostCardMissingAuthor(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a class="kg-bookmark-container" href="https://example.org/article">
|
||||
@@ -791,10 +952,11 @@ func TestFixGhostCardMissingAuthor(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/article">Example Article</a>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -803,6 +965,7 @@ func TestFixGhostCardMissingAuthor(t *testing.T) {
|
||||
|
||||
func TestFixGhostCardDuplicatedAuthor(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a class="kg-bookmark-container" href="https://example.org/article">
|
||||
@@ -823,10 +986,11 @@ func TestFixGhostCardDuplicatedAuthor(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/article">Example Article - Example</a>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -835,6 +999,7 @@ func TestFixGhostCardDuplicatedAuthor(t *testing.T) {
|
||||
|
||||
func TestFixGhostCardMultiple(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a class="kg-bookmark-container" href="https://example.org/article1">
|
||||
@@ -871,10 +1036,11 @@ func TestFixGhostCardMultiple(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<ul><li><a href="https://example.org/article1">Example Article 1 - Example</a></li><li><a href="https://example.org/article2">Example Article 2 - Example</a></li></ul>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -883,6 +1049,7 @@ func TestFixGhostCardMultiple(t *testing.T) {
|
||||
|
||||
func TestFixGhostCardMultipleSplit(t *testing.T) {
|
||||
testEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<figure class="kg-card kg-bookmark-card">
|
||||
<a class="kg-bookmark-container" href="https://example.org/article1">
|
||||
@@ -920,12 +1087,13 @@ func TestFixGhostCardMultipleSplit(t *testing.T) {
|
||||
}
|
||||
|
||||
controlEntry := &model.Entry{
|
||||
URL: "https://example.org/article",
|
||||
Title: `A title`,
|
||||
Content: `<a href="https://example.org/article1">Example Article 1 - Example</a>
|
||||
<p>This separates the two cards</p>
|
||||
<a href="https://example.org/article2">Example Article 2 - Example</a>`,
|
||||
}
|
||||
Rewriter("https://example.org/article", testEntry, `fix_ghost_cards`)
|
||||
ApplyContentRewriteRules(testEntry, `fix_ghost_cards`)
|
||||
|
||||
if !reflect.DeepEqual(testEntry, controlEntry) {
|
||||
t.Errorf(`Not expected output: got "%+v" instead of "%+v"`, testEntry, controlEntry)
|
||||
@@ -0,0 +1,47 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package rewrite // import "miniflux.app/v2/internal/reader/rewrite"
|
||||
|
||||
import (
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// GetRefererForURL returns the referer for the given URL if it exists, otherwise an empty string.
|
||||
func GetRefererForURL(u string) string {
|
||||
parsedUrl, err := url.Parse(u)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
switch parsedUrl.Hostname() {
|
||||
case "appinn.com":
|
||||
return "https://appinn.com"
|
||||
case "bjp.org.cn":
|
||||
return "https://bjp.org.cn"
|
||||
case "cdnfile.sspai.com":
|
||||
return "https://sspai.com"
|
||||
case "f.video.weibocdn.com":
|
||||
return "https://weibo.com"
|
||||
case "i.pximg.net":
|
||||
return "https://www.pixiv.net"
|
||||
case "img.hellogithub.com":
|
||||
return "https://hellogithub.com"
|
||||
case "moyu.im":
|
||||
return "https://i.jandan.net"
|
||||
case "www.parkablogs.com":
|
||||
return "https://www.parkablogs.com"
|
||||
}
|
||||
|
||||
switch {
|
||||
case strings.HasSuffix(parsedUrl.Hostname(), ".cdninstagram.com"):
|
||||
return "https://www.instagram.com"
|
||||
case strings.HasSuffix(parsedUrl.Hostname(), ".moyu.im"):
|
||||
return "https://i.jandan.net"
|
||||
case strings.HasSuffix(parsedUrl.Hostname(), ".sinaimg.cn"):
|
||||
return "https://weibo.com"
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
@@ -43,6 +43,11 @@ func TestGetRefererForURL(t *testing.T) {
|
||||
url: "https://img.hellogithub.com/example.png",
|
||||
expected: "https://hellogithub.com",
|
||||
},
|
||||
{
|
||||
name: "Park Blogs",
|
||||
url: "https://www.parkablogs.com/sites/default/files/2025/image.jpg",
|
||||
expected: "https://www.parkablogs.com",
|
||||
},
|
||||
{
|
||||
name: "Non-matching URL",
|
||||
url: "https://example.com/image.jpg",
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package rewrite // import "miniflux.app/v2/internal/reader/rewrite"
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"regexp"
|
||||
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
var customReplaceRuleRegex = regexp.MustCompile(`rewrite\("([^"]+)"\|"([^"]+)"\)`)
|
||||
|
||||
func RewriteEntryURL(feed *model.Feed, entry *model.Entry) string {
|
||||
var rewrittenURL = entry.URL
|
||||
if feed.UrlRewriteRules != "" {
|
||||
parts := customReplaceRuleRegex.FindStringSubmatch(feed.UrlRewriteRules)
|
||||
|
||||
if len(parts) >= 3 {
|
||||
re, err := regexp.Compile(parts[1])
|
||||
if err != nil {
|
||||
slog.Error("Failed on regexp compilation",
|
||||
slog.String("url_rewrite_rules", feed.UrlRewriteRules),
|
||||
slog.Any("error", err),
|
||||
)
|
||||
return rewrittenURL
|
||||
}
|
||||
rewrittenURL = re.ReplaceAllString(entry.URL, parts[2])
|
||||
slog.Debug("Rewriting entry URL",
|
||||
slog.String("original_entry_url", entry.URL),
|
||||
slog.String("rewritten_entry_url", rewrittenURL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
)
|
||||
} else {
|
||||
slog.Debug("Cannot find search and replace terms for replace rule",
|
||||
slog.String("original_entry_url", entry.URL),
|
||||
slog.String("rewritten_entry_url", rewrittenURL),
|
||||
slog.Int64("feed_id", feed.ID),
|
||||
slog.String("feed_url", feed.FeedURL),
|
||||
slog.String("url_rewrite_rules", feed.UrlRewriteRules),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return rewrittenURL
|
||||
}
|
||||
@@ -0,0 +1,297 @@
|
||||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package rewrite // import "miniflux.app/v2/internal/reader/rewrite"
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
func TestRewriteEntryURL(t *testing.T) {
|
||||
scenarios := []struct {
|
||||
name string
|
||||
feed *model.Feed
|
||||
entry *model.Entry
|
||||
expectedURL string
|
||||
description string
|
||||
}{
|
||||
{
|
||||
name: "NoRewriteRules",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: "",
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when no rewrite rules are specified",
|
||||
},
|
||||
{
|
||||
name: "EmptyRewriteRules",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: " ",
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when rewrite rules are empty/whitespace",
|
||||
},
|
||||
{
|
||||
name: "ValidRewriteRule",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/article/(.+)"|"https://example.com/full-article/$1")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/full-article/123",
|
||||
description: "Should rewrite URL according to the regex pattern",
|
||||
},
|
||||
{
|
||||
name: "ComplexRegexRewrite",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://news.ycombinator.com/rss",
|
||||
UrlRewriteRules: `rewrite("^https://news\.ycombinator\.com/item\?id=(.+)"|"https://hn.algolia.com/api/v1/items/$1")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://news.ycombinator.com/item?id=12345",
|
||||
},
|
||||
expectedURL: "https://hn.algolia.com/api/v1/items/12345",
|
||||
description: "Should handle complex regex patterns with escaped characters",
|
||||
},
|
||||
{
|
||||
name: "NoMatchingPattern",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://different.com/(.+)"|"https://rewritten.com/$1")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when regex pattern doesn't match",
|
||||
},
|
||||
{
|
||||
name: "InvalidRegexPattern",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/[invalid"|"https://rewritten.com/$1")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when regex pattern is invalid",
|
||||
},
|
||||
{
|
||||
name: "MalformedRewriteRule",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("invalid format")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when rewrite rule format is malformed",
|
||||
},
|
||||
{
|
||||
name: "MultipleGroups",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/([^/]+)/article/(.+)"|"https://example.com/full/$1/story/$2")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/tech/article/ai-news",
|
||||
},
|
||||
expectedURL: "https://example.com/full/tech/story/ai-news",
|
||||
description: "Should handle multiple capture groups in regex",
|
||||
},
|
||||
{
|
||||
name: "URLWithSpecialCharacters",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/(.+)"|"https://proxy.example.com/$1")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/test?param=value&other=123#section",
|
||||
},
|
||||
expectedURL: "https://proxy.example.com/article/test?param=value&other=123#section",
|
||||
description: "Should handle URLs with query parameters and fragments",
|
||||
},
|
||||
{
|
||||
name: "ReplaceWithStaticURL",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/(.+)"|"https://static.example.com/reader")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://static.example.com/reader",
|
||||
description: "Should replace with static URL when no capture groups are used in replacement",
|
||||
},
|
||||
{
|
||||
name: "EmptyReplacementString",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/(.+)"|"x")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "x",
|
||||
description: "Should replace with specified string",
|
||||
},
|
||||
{
|
||||
name: "EmptyReplacementNotSupported",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/(.+)"|"")`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when replacement is empty string (not supported by regex pattern)",
|
||||
},
|
||||
{
|
||||
name: "InvalidRewriteRuleFormat",
|
||||
feed: &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `not-a-rewrite-rule`,
|
||||
},
|
||||
entry: &model.Entry{
|
||||
URL: "https://example.com/article/123",
|
||||
},
|
||||
expectedURL: "https://example.com/article/123",
|
||||
description: "Should return original URL when rewrite rule doesn't match expected format",
|
||||
},
|
||||
}
|
||||
|
||||
for _, scenario := range scenarios {
|
||||
t.Run(scenario.name, func(t *testing.T) {
|
||||
result := RewriteEntryURL(scenario.feed, scenario.entry)
|
||||
if result != scenario.expectedURL {
|
||||
t.Errorf("Expected URL %q, got %q. Description: %s", scenario.expectedURL, result, scenario.description)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRewriteEntryURLWithNilValues(t *testing.T) {
|
||||
t.Run("NilFeed", func(t *testing.T) {
|
||||
entry := &model.Entry{URL: "https://example.com/article/123"}
|
||||
|
||||
// This should panic or handle gracefully - let's see what happens
|
||||
defer func() {
|
||||
if r := recover(); r == nil {
|
||||
t.Error("Expected panic when feed is nil, but function completed normally")
|
||||
}
|
||||
}()
|
||||
|
||||
RewriteEntryURL(nil, entry)
|
||||
})
|
||||
|
||||
t.Run("NilEntry", func(t *testing.T) {
|
||||
feed := &model.Feed{
|
||||
ID: 1,
|
||||
FeedURL: "https://example.com/feed.xml",
|
||||
UrlRewriteRules: `rewrite("^https://example.com/(.+)"|"https://rewritten.com/$1")`,
|
||||
}
|
||||
|
||||
// This should panic or handle gracefully - let's see what happens
|
||||
defer func() {
|
||||
if r := recover(); r == nil {
|
||||
t.Error("Expected panic when entry is nil, but function completed normally")
|
||||
}
|
||||
}()
|
||||
|
||||
RewriteEntryURL(feed, nil)
|
||||
})
|
||||
}
|
||||
|
||||
func TestCustomReplaceRuleRegex(t *testing.T) {
|
||||
scenarios := []struct {
|
||||
name string
|
||||
input string
|
||||
expected []string
|
||||
matches bool
|
||||
}{
|
||||
{
|
||||
name: "ValidRule",
|
||||
input: `rewrite("^https://example.com/(.+)"|"https://rewritten.com/$1")`,
|
||||
expected: []string{`rewrite("^https://example.com/(.+)"|"https://rewritten.com/$1")`, `^https://example.com/(.+)`, `https://rewritten.com/$1`},
|
||||
matches: true,
|
||||
},
|
||||
{
|
||||
name: "ValidRuleWithEscapedCharacters",
|
||||
input: `rewrite("^https://news\\.ycombinator\\.com/item\\?id=(.+)"|"https://hn.algolia.com/api/v1/items/$1")`,
|
||||
expected: []string{`rewrite("^https://news\\.ycombinator\\.com/item\\?id=(.+)"|"https://hn.algolia.com/api/v1/items/$1")`, `^https://news\\.ycombinator\\.com/item\\?id=(.+)`, `https://hn.algolia.com/api/v1/items/$1`},
|
||||
matches: true,
|
||||
},
|
||||
{
|
||||
name: "InvalidFormat",
|
||||
input: `rewrite("invalid")`,
|
||||
expected: nil,
|
||||
matches: false,
|
||||
},
|
||||
{
|
||||
name: "EmptyString",
|
||||
input: ``,
|
||||
expected: nil,
|
||||
matches: false,
|
||||
},
|
||||
{
|
||||
name: "RandomText",
|
||||
input: `some random text`,
|
||||
expected: nil,
|
||||
matches: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, scenario := range scenarios {
|
||||
t.Run(scenario.name, func(t *testing.T) {
|
||||
parts := customReplaceRuleRegex.FindStringSubmatch(scenario.input)
|
||||
|
||||
if scenario.matches {
|
||||
if len(parts) < 3 {
|
||||
t.Errorf("Expected regex to match and return at least 3 parts, got %d parts: %v", len(parts), parts)
|
||||
return
|
||||
}
|
||||
|
||||
// Check the full match and captured groups
|
||||
if parts[0] != scenario.expected[0] {
|
||||
t.Errorf("Expected full match %q, got %q", scenario.expected[0], parts[0])
|
||||
}
|
||||
if parts[1] != scenario.expected[1] {
|
||||
t.Errorf("Expected first capture group %q, got %q", scenario.expected[1], parts[1])
|
||||
}
|
||||
if parts[2] != scenario.expected[2] {
|
||||
t.Errorf("Expected second capture group %q, got %q", scenario.expected[2], parts[2])
|
||||
}
|
||||
} else if len(parts) >= 3 {
|
||||
t.Errorf("Expected regex not to match, but got %d parts: %v", len(parts), parts)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -35,8 +35,8 @@ func (r *RSSAdapter) BuildFeed(baseURL string) *model.Feed {
|
||||
}
|
||||
|
||||
// Ensure the Site URL is absolute.
|
||||
if siteURL, err := urllib.AbsoluteURL(baseURL, feed.SiteURL); err == nil {
|
||||
feed.SiteURL = siteURL
|
||||
if absoluteSiteURL, err := urllib.AbsoluteURL(baseURL, feed.SiteURL); err == nil {
|
||||
feed.SiteURL = absoluteSiteURL
|
||||
}
|
||||
|
||||
// Try to find the feed URL from the Atom links.
|
||||
@@ -104,11 +104,11 @@ func (r *RSSAdapter) BuildFeed(baseURL string) *model.Feed {
|
||||
// Generate the entry hash.
|
||||
switch {
|
||||
case item.GUID.Data != "":
|
||||
entry.Hash = crypto.Hash(item.GUID.Data)
|
||||
entry.Hash = crypto.SHA256(item.GUID.Data)
|
||||
case entryURL != "":
|
||||
entry.Hash = crypto.Hash(entryURL)
|
||||
entry.Hash = crypto.SHA256(entryURL)
|
||||
default:
|
||||
entry.Hash = crypto.Hash(entry.Title + entry.Content)
|
||||
entry.Hash = crypto.SHA256(entry.Title + entry.Content)
|
||||
}
|
||||
|
||||
// Find CommentsURL if defined.
|
||||
@@ -169,8 +169,11 @@ func findFeedAuthor(rssChannel *RSSChannel) string {
|
||||
author = rssChannel.ManagingEditor
|
||||
case rssChannel.Webmaster != "":
|
||||
author = rssChannel.Webmaster
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
return sanitizer.StripTags(strings.TrimSpace(author))
|
||||
|
||||
return strings.TrimSpace(sanitizer.StripTags(author))
|
||||
}
|
||||
|
||||
func findEntryTitle(rssItem *RSSItem) string {
|
||||
@@ -258,8 +261,10 @@ func findEntryAuthor(rssItem *RSSItem) string {
|
||||
author = rssItem.PersonName()
|
||||
case strings.Contains(rssItem.Author.Inner, "<![CDATA["):
|
||||
author = rssItem.Author.Data
|
||||
default:
|
||||
case rssItem.Author.Inner != "":
|
||||
author = rssItem.Author.Inner
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
|
||||
return strings.TrimSpace(sanitizer.StripTags(author))
|
||||
|
||||
@@ -18,71 +18,71 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
tagAllowList = map[string][]string{
|
||||
"a": {"href", "title", "id"},
|
||||
"abbr": {"title"},
|
||||
"acronym": {"title"},
|
||||
allowedHTMLTagsAndAttributes = map[string]map[string]struct{}{
|
||||
"a": {"href": {}, "title": {}, "id": {}},
|
||||
"abbr": {"title": {}},
|
||||
"acronym": {"title": {}},
|
||||
"aside": {},
|
||||
"audio": {"src"},
|
||||
"audio": {"src": {}},
|
||||
"blockquote": {},
|
||||
"b": {},
|
||||
"br": {},
|
||||
"caption": {},
|
||||
"cite": {},
|
||||
"code": {},
|
||||
"dd": {"id"},
|
||||
"dd": {"id": {}},
|
||||
"del": {},
|
||||
"dfn": {},
|
||||
"dl": {"id"},
|
||||
"dt": {"id"},
|
||||
"dl": {"id": {}},
|
||||
"dt": {"id": {}},
|
||||
"em": {},
|
||||
"figcaption": {},
|
||||
"figure": {},
|
||||
"h1": {"id"},
|
||||
"h2": {"id"},
|
||||
"h3": {"id"},
|
||||
"h4": {"id"},
|
||||
"h5": {"id"},
|
||||
"h6": {"id"},
|
||||
"h1": {"id": {}},
|
||||
"h2": {"id": {}},
|
||||
"h3": {"id": {}},
|
||||
"h4": {"id": {}},
|
||||
"h5": {"id": {}},
|
||||
"h6": {"id": {}},
|
||||
"hr": {},
|
||||
"iframe": {"width", "height", "frameborder", "src", "allowfullscreen"},
|
||||
"img": {"alt", "title", "src", "srcset", "sizes", "width", "height"},
|
||||
"iframe": {"width": {}, "height": {}, "frameborder": {}, "src": {}, "allowfullscreen": {}},
|
||||
"img": {"alt": {}, "title": {}, "src": {}, "srcset": {}, "sizes": {}, "width": {}, "height": {}, "fetchpriority": {}, "decoding": {}},
|
||||
"ins": {},
|
||||
"kbd": {},
|
||||
"li": {"id"},
|
||||
"ol": {"id"},
|
||||
"li": {"id": {}},
|
||||
"ol": {"id": {}},
|
||||
"p": {},
|
||||
"picture": {},
|
||||
"pre": {},
|
||||
"q": {"cite"},
|
||||
"q": {"cite": {}},
|
||||
"rp": {},
|
||||
"rt": {},
|
||||
"rtc": {},
|
||||
"ruby": {},
|
||||
"s": {},
|
||||
"samp": {},
|
||||
"source": {"src", "type", "srcset", "sizes", "media"},
|
||||
"source": {"src": {}, "type": {}, "srcset": {}, "sizes": {}, "media": {}},
|
||||
"strong": {},
|
||||
"sub": {},
|
||||
"sup": {"id"},
|
||||
"sup": {"id": {}},
|
||||
"table": {},
|
||||
"td": {"rowspan", "colspan"},
|
||||
"td": {"rowspan": {}, "colspan": {}},
|
||||
"tfoot": {},
|
||||
"th": {"rowspan", "colspan"},
|
||||
"th": {"rowspan": {}, "colspan": {}},
|
||||
"thead": {},
|
||||
"time": {"datetime"},
|
||||
"time": {"datetime": {}},
|
||||
"tr": {},
|
||||
"u": {},
|
||||
"ul": {"id"},
|
||||
"ul": {"id": {}},
|
||||
"var": {},
|
||||
"video": {"poster", "height", "width", "src"},
|
||||
"video": {"poster": {}, "height": {}, "width": {}, "src": {}},
|
||||
"wbr": {},
|
||||
|
||||
// MathML: https://w3c.github.io/mathml-core/ and https://developer.mozilla.org/en-US/docs/Web/MathML/Reference/Element
|
||||
"annotation": {},
|
||||
"annotation-xml": {},
|
||||
"maction": {},
|
||||
"math": {"xmlns"},
|
||||
"math": {"xmlns": {}},
|
||||
"merror": {},
|
||||
"mfrac": {},
|
||||
"mi": {},
|
||||
@@ -110,16 +110,109 @@ var (
|
||||
"munderover": {},
|
||||
"semantics": {},
|
||||
}
|
||||
|
||||
iframeAllowList = map[string]struct{}{
|
||||
"bandcamp.com": {},
|
||||
"cdn.embedly.com": {},
|
||||
"dailymotion.com": {},
|
||||
"open.spotify.com": {},
|
||||
"player.bilibili.com": {},
|
||||
"player.twitch.tv": {},
|
||||
"player.vimeo.com": {},
|
||||
"soundcloud.com": {},
|
||||
"vk.com": {},
|
||||
"w.soundcloud.com": {},
|
||||
"youtube-nocookie.com": {},
|
||||
"youtube.com": {},
|
||||
}
|
||||
|
||||
blockedResourceURLSubstrings = []string{
|
||||
"api.flattr.com",
|
||||
"feeds.feedburner.com",
|
||||
"feedsportal.com",
|
||||
"pinterest.com/pin/create/button/",
|
||||
"stats.wordpress.com",
|
||||
"twitter.com/intent/tweet",
|
||||
"twitter.com/share",
|
||||
"facebook.com/sharer.php",
|
||||
"linkedin.com/shareArticle",
|
||||
}
|
||||
|
||||
validURISchemes = map[string]struct{}{
|
||||
"apt": {},
|
||||
"bitcoin": {},
|
||||
"callto": {},
|
||||
"dav": {},
|
||||
"davs": {},
|
||||
"ed2k": {},
|
||||
"facetime": {},
|
||||
"feed": {},
|
||||
"ftp": {},
|
||||
"geo": {},
|
||||
"git": {},
|
||||
"gopher": {},
|
||||
"http": {},
|
||||
"https": {},
|
||||
"irc": {},
|
||||
"irc6": {},
|
||||
"ircs": {},
|
||||
"itms-apps": {},
|
||||
"itms": {},
|
||||
"magnet": {},
|
||||
"mailto": {},
|
||||
"news": {},
|
||||
"nntp": {},
|
||||
"rtmp": {},
|
||||
"sftp": {},
|
||||
"sip": {},
|
||||
"sips": {},
|
||||
"skype": {},
|
||||
"spotify": {},
|
||||
"ssh": {},
|
||||
"steam": {},
|
||||
"svn": {},
|
||||
"svn+ssh": {},
|
||||
"tel": {},
|
||||
"webcal": {},
|
||||
"xmpp": {},
|
||||
// iOS Apps
|
||||
"opener": {}, // https://www.opener.link
|
||||
"hack": {}, // https://apps.apple.com/it/app/hack-for-hacker-news-reader/id1464477788?l=en-GB
|
||||
}
|
||||
|
||||
dataAttributeAllowedPrefixes = []string{
|
||||
"data:image/avif",
|
||||
"data:image/apng",
|
||||
"data:image/png",
|
||||
"data:image/svg",
|
||||
"data:image/svg+xml",
|
||||
"data:image/jpg",
|
||||
"data:image/jpeg",
|
||||
"data:image/gif",
|
||||
"data:image/webp",
|
||||
}
|
||||
)
|
||||
|
||||
// Sanitize returns safe HTML.
|
||||
func Sanitize(baseURL, input string) string {
|
||||
type SanitizerOptions struct {
|
||||
OpenLinksInNewTab bool
|
||||
}
|
||||
|
||||
func SanitizeHTMLWithDefaultOptions(baseURL, rawHTML string) string {
|
||||
return SanitizeHTML(baseURL, rawHTML, &SanitizerOptions{
|
||||
OpenLinksInNewTab: true,
|
||||
})
|
||||
}
|
||||
|
||||
func SanitizeHTML(baseURL, rawHTML string, sanitizerOptions *SanitizerOptions) string {
|
||||
var buffer strings.Builder
|
||||
var tagStack []string
|
||||
var parentTag string
|
||||
var blockedStack []string
|
||||
|
||||
tokenizer := html.NewTokenizer(strings.NewReader(input))
|
||||
// Errors are a non-issue, so they're handled later in the function.
|
||||
parsedBaseUrl, _ := url.Parse(baseURL)
|
||||
|
||||
tokenizer := html.NewTokenizer(strings.NewReader(rawHTML))
|
||||
for {
|
||||
if tokenizer.Next() == html.ErrorToken {
|
||||
err := tokenizer.Err()
|
||||
@@ -166,7 +259,7 @@ func Sanitize(baseURL, input string) string {
|
||||
}
|
||||
|
||||
if len(blockedStack) == 0 && isValidTag(tagName) {
|
||||
attrNames, htmlAttributes := sanitizeAttributes(baseURL, tagName, token.Attr)
|
||||
attrNames, htmlAttributes := sanitizeAttributes(parsedBaseUrl, baseURL, tagName, token.Attr, sanitizerOptions)
|
||||
if hasRequiredAttributes(tagName, attrNames) {
|
||||
if len(attrNames) > 0 {
|
||||
// Rewrite the start tag with allowed attributes.
|
||||
@@ -194,7 +287,7 @@ func Sanitize(baseURL, input string) string {
|
||||
continue
|
||||
}
|
||||
if len(blockedStack) == 0 && isValidTag(tagName) {
|
||||
attrNames, htmlAttributes := sanitizeAttributes(baseURL, tagName, token.Attr)
|
||||
attrNames, htmlAttributes := sanitizeAttributes(parsedBaseUrl, baseURL, tagName, token.Attr, sanitizerOptions)
|
||||
if hasRequiredAttributes(tagName, attrNames) {
|
||||
if len(attrNames) > 0 {
|
||||
buffer.WriteString("<" + tagName + " " + htmlAttributes + "/>")
|
||||
@@ -207,7 +300,7 @@ func Sanitize(baseURL, input string) string {
|
||||
}
|
||||
}
|
||||
|
||||
func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([]string, string) {
|
||||
func sanitizeAttributes(parsedBaseUrl *url.URL, baseURL, tagName string, attributes []html.Attribute, sanitizerOptions *SanitizerOptions) ([]string, string) {
|
||||
var htmlAttrs, attrNames []string
|
||||
var err error
|
||||
var isImageLargerThanLayout bool
|
||||
@@ -225,20 +318,35 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
|
||||
continue
|
||||
}
|
||||
|
||||
if (tagName == "img" || tagName == "source") && attribute.Key == "srcset" {
|
||||
value = sanitizeSrcsetAttr(baseURL, value)
|
||||
if tagName == "math" && attribute.Key == "xmlns" && value != "http://www.w3.org/1998/Math/MathML" {
|
||||
value = "http://www.w3.org/1998/Math/MathML"
|
||||
}
|
||||
|
||||
if tagName == "img" && (attribute.Key == "width" || attribute.Key == "height") {
|
||||
if isImageLargerThanLayout || !isPositiveInteger(value) {
|
||||
continue
|
||||
if tagName == "img" {
|
||||
switch attribute.Key {
|
||||
case "fetchpriority":
|
||||
if !isValidFetchPriorityValue(value) {
|
||||
continue
|
||||
}
|
||||
case "decoding":
|
||||
if !isValidDecodingValue(value) {
|
||||
continue
|
||||
}
|
||||
case "width", "height":
|
||||
if isImageLargerThanLayout || !isPositiveInteger(value) {
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (tagName == "img" || tagName == "source") && attribute.Key == "srcset" {
|
||||
value = sanitizeSrcsetAttr(baseURL, value)
|
||||
}
|
||||
|
||||
if isExternalResourceAttribute(attribute.Key) {
|
||||
switch {
|
||||
case tagName == "iframe":
|
||||
if !isValidIframeSource(baseURL, attribute.Val) {
|
||||
if !isValidIframeSource(attribute.Val) {
|
||||
continue
|
||||
}
|
||||
value = rewriteIframeURL(attribute.Val)
|
||||
@@ -258,7 +366,8 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
|
||||
}
|
||||
|
||||
// TODO use feedURL instead of baseURL twice.
|
||||
if cleanedURL, err := urlcleaner.RemoveTrackingParameters(baseURL, baseURL, value); err == nil {
|
||||
parsedValueUrl, _ := url.Parse(value)
|
||||
if cleanedURL, err := urlcleaner.RemoveTrackingParameters(parsedBaseUrl, parsedBaseUrl, parsedValueUrl); err == nil {
|
||||
value = cleanedURL
|
||||
}
|
||||
}
|
||||
@@ -269,7 +378,7 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
|
||||
}
|
||||
|
||||
if !isAnchorLink {
|
||||
extraAttrNames, extraHTMLAttributes := getExtraAttributes(tagName)
|
||||
extraAttrNames, extraHTMLAttributes := getExtraAttributes(tagName, sanitizerOptions)
|
||||
if len(extraAttrNames) > 0 {
|
||||
attrNames = append(attrNames, extraAttrNames...)
|
||||
htmlAttrs = append(htmlAttrs, extraHTMLAttributes...)
|
||||
@@ -279,10 +388,16 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
|
||||
return attrNames, strings.Join(htmlAttrs, " ")
|
||||
}
|
||||
|
||||
func getExtraAttributes(tagName string) ([]string, []string) {
|
||||
func getExtraAttributes(tagName string, sanitizerOptions *SanitizerOptions) ([]string, []string) {
|
||||
switch tagName {
|
||||
case "a":
|
||||
return []string{"rel", "target", "referrerpolicy"}, []string{`rel="noopener noreferrer"`, `target="_blank"`, `referrerpolicy="no-referrer"`}
|
||||
attributeNames := []string{"rel", "referrerpolicy"}
|
||||
htmlAttributes := []string{`rel="noopener noreferrer"`, `referrerpolicy="no-referrer"`}
|
||||
if sanitizerOptions.OpenLinksInNewTab {
|
||||
attributeNames = append(attributeNames, "target")
|
||||
htmlAttributes = append(htmlAttributes, `target="_blank"`)
|
||||
}
|
||||
return attributeNames, htmlAttributes
|
||||
case "video", "audio":
|
||||
return []string{"controls"}, []string{"controls"}
|
||||
case "iframe":
|
||||
@@ -295,13 +410,14 @@ func getExtraAttributes(tagName string) ([]string, []string) {
|
||||
}
|
||||
|
||||
func isValidTag(tagName string) bool {
|
||||
_, ok := tagAllowList[tagName]
|
||||
_, ok := allowedHTMLTagsAndAttributes[tagName]
|
||||
return ok
|
||||
}
|
||||
|
||||
func isValidAttribute(tagName, attributeName string) bool {
|
||||
if attributes, ok := tagAllowList[tagName]; ok {
|
||||
return slices.Contains(attributes, attributeName)
|
||||
if attributes, ok := allowedHTMLTagsAndAttributes[tagName]; ok {
|
||||
_, allowed := attributes[attributeName]
|
||||
return allowed
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -323,7 +439,7 @@ func isPixelTracker(tagName string, attributes []html.Attribute) bool {
|
||||
hasWidth := false
|
||||
|
||||
for _, attribute := range attributes {
|
||||
if attribute.Val == "1" {
|
||||
if attribute.Val == "1" || attribute.Val == "0" {
|
||||
switch attribute.Key {
|
||||
case "height":
|
||||
hasHeight = true
|
||||
@@ -350,97 +466,40 @@ func hasRequiredAttributes(tagName string, attributes []string) bool {
|
||||
}
|
||||
|
||||
// See https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
|
||||
func hasValidURIScheme(src string) bool {
|
||||
whitelist := []string{
|
||||
"apt:",
|
||||
"bitcoin:",
|
||||
"callto:",
|
||||
"dav:",
|
||||
"davs:",
|
||||
"ed2k://",
|
||||
"facetime://",
|
||||
"feed:",
|
||||
"ftp://",
|
||||
"geo:",
|
||||
"gopher://",
|
||||
"git://",
|
||||
"http://",
|
||||
"https://",
|
||||
"irc://",
|
||||
"irc6://",
|
||||
"ircs://",
|
||||
"itms://",
|
||||
"itms-apps://",
|
||||
"magnet:",
|
||||
"mailto:",
|
||||
"news:",
|
||||
"nntp:",
|
||||
"rtmp://",
|
||||
"sip:",
|
||||
"sips:",
|
||||
"skype:",
|
||||
"spotify:",
|
||||
"ssh://",
|
||||
"sftp://",
|
||||
"steam://",
|
||||
"svn://",
|
||||
"svn+ssh://",
|
||||
"tel:",
|
||||
"webcal://",
|
||||
"xmpp:",
|
||||
|
||||
// iOS Apps
|
||||
"opener://", // https://www.opener.link
|
||||
"hack://", // https://apps.apple.com/it/app/hack-for-hacker-news-reader/id1464477788?l=en-GB
|
||||
func hasValidURIScheme(absoluteURL string) bool {
|
||||
colonIndex := strings.IndexByte(absoluteURL, ':')
|
||||
// Scheme must exist (colonIndex > 0). An empty scheme (e.g. ":foo") is not allowed.
|
||||
if colonIndex <= 0 {
|
||||
return false
|
||||
}
|
||||
|
||||
return slices.ContainsFunc(whitelist, func(prefix string) bool {
|
||||
return strings.HasPrefix(src, prefix)
|
||||
scheme := absoluteURL[:colonIndex]
|
||||
_, ok := validURISchemes[strings.ToLower(scheme)]
|
||||
return ok
|
||||
}
|
||||
|
||||
func isBlockedResource(absoluteURL string) bool {
|
||||
return slices.ContainsFunc(blockedResourceURLSubstrings, func(element string) bool {
|
||||
return strings.Contains(absoluteURL, element)
|
||||
})
|
||||
}
|
||||
|
||||
func isBlockedResource(src string) bool {
|
||||
blacklist := []string{
|
||||
"feedsportal.com",
|
||||
"api.flattr.com",
|
||||
"stats.wordpress.com",
|
||||
"twitter.com/share",
|
||||
"feeds.feedburner.com",
|
||||
}
|
||||
func isValidIframeSource(iframeSourceURL string) bool {
|
||||
iframeSourceDomain := urllib.DomainWithoutWWW(iframeSourceURL)
|
||||
|
||||
return slices.ContainsFunc(blacklist, func(element string) bool {
|
||||
return strings.Contains(src, element)
|
||||
})
|
||||
}
|
||||
|
||||
func isValidIframeSource(baseURL, src string) bool {
|
||||
whitelist := []string{
|
||||
"bandcamp.com",
|
||||
"cdn.embedly.com",
|
||||
"player.bilibili.com",
|
||||
"player.twitch.tv",
|
||||
"player.vimeo.com",
|
||||
"soundcloud.com",
|
||||
"vk.com",
|
||||
"w.soundcloud.com",
|
||||
"dailymotion.com",
|
||||
"youtube-nocookie.com",
|
||||
"youtube.com",
|
||||
"open.spotify.com",
|
||||
}
|
||||
domain := urllib.Domain(src)
|
||||
|
||||
// allow iframe from same origin
|
||||
if urllib.Domain(baseURL) == domain {
|
||||
if _, ok := iframeAllowList[iframeSourceDomain]; ok {
|
||||
return true
|
||||
}
|
||||
|
||||
// allow iframe from custom invidious instance
|
||||
if config.Opts.InvidiousInstance() == domain {
|
||||
if ytDomain := config.Opts.YouTubeEmbedDomain(); ytDomain != "" && iframeSourceDomain == strings.TrimPrefix(ytDomain, "www.") {
|
||||
return true
|
||||
}
|
||||
|
||||
return slices.Contains(whitelist, strings.TrimPrefix(domain, "www."))
|
||||
if invidiousInstance := config.Opts.InvidiousInstance(); invidiousInstance != "" && iframeSourceDomain == strings.TrimPrefix(invidiousInstance, "www.") {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func rewriteIframeURL(link string) string {
|
||||
@@ -451,11 +510,11 @@ func rewriteIframeURL(link string) string {
|
||||
|
||||
switch strings.TrimPrefix(u.Hostname(), "www.") {
|
||||
case "youtube.com":
|
||||
if strings.HasPrefix(u.Path, "/embed/") {
|
||||
if pathWithoutEmbed, ok := strings.CutPrefix(u.Path, "/embed/"); ok {
|
||||
if len(u.RawQuery) > 0 {
|
||||
return config.Opts.YouTubeEmbedUrlOverride() + strings.TrimPrefix(u.Path, "/embed/") + "?" + u.RawQuery
|
||||
return config.Opts.YouTubeEmbedUrlOverride() + pathWithoutEmbed + "?" + u.RawQuery
|
||||
}
|
||||
return config.Opts.YouTubeEmbedUrlOverride() + strings.TrimPrefix(u.Path, "/embed/")
|
||||
return config.Opts.YouTubeEmbedUrlOverride() + pathWithoutEmbed
|
||||
}
|
||||
case "player.vimeo.com":
|
||||
// See https://help.vimeo.com/hc/en-us/articles/12426260232977-About-Player-parameters
|
||||
@@ -471,13 +530,11 @@ func rewriteIframeURL(link string) string {
|
||||
}
|
||||
|
||||
func isBlockedTag(tagName string) bool {
|
||||
blacklist := []string{
|
||||
"noscript",
|
||||
"script",
|
||||
"style",
|
||||
switch tagName {
|
||||
case "noscript", "script", "style":
|
||||
return true
|
||||
}
|
||||
|
||||
return slices.Contains(blacklist, tagName)
|
||||
return false
|
||||
}
|
||||
|
||||
func sanitizeSrcsetAttr(baseURL, value string) string {
|
||||
@@ -493,23 +550,18 @@ func sanitizeSrcsetAttr(baseURL, value string) string {
|
||||
}
|
||||
|
||||
func isValidDataAttribute(value string) bool {
|
||||
var dataAttributeAllowList = []string{
|
||||
"data:image/avif",
|
||||
"data:image/apng",
|
||||
"data:image/png",
|
||||
"data:image/svg",
|
||||
"data:image/svg+xml",
|
||||
"data:image/jpg",
|
||||
"data:image/jpeg",
|
||||
"data:image/gif",
|
||||
"data:image/webp",
|
||||
for _, prefix := range dataAttributeAllowedPrefixes {
|
||||
if strings.HasPrefix(value, prefix) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return slices.ContainsFunc(dataAttributeAllowList, func(prefix string) bool {
|
||||
return strings.HasPrefix(value, prefix)
|
||||
})
|
||||
return false
|
||||
}
|
||||
|
||||
func isPositiveInteger(value string) bool {
|
||||
if value == "" {
|
||||
return false
|
||||
}
|
||||
if number, err := strconv.Atoi(value); err == nil {
|
||||
return number > 0
|
||||
}
|
||||
@@ -525,3 +577,19 @@ func getIntegerAttributeValue(name string, attributes []html.Attribute) int {
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func isValidFetchPriorityValue(value string) bool {
|
||||
switch value {
|
||||
case "high", "low", "auto":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func isValidDecodingValue(value string) bool {
|
||||
switch value {
|
||||
case "sync", "async", "auto":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -13,12 +13,6 @@ import (
|
||||
"miniflux.app/v2/internal/config"
|
||||
)
|
||||
|
||||
func TestMain(m *testing.M) {
|
||||
config.Opts = config.NewOptions()
|
||||
exitCode := m.Run()
|
||||
os.Exit(exitCode)
|
||||
}
|
||||
|
||||
func BenchmarkSanitize(b *testing.B) {
|
||||
var testCases = map[string][]string{
|
||||
"miniflux_github.html": {"https://github.com/miniflux/v2", ""},
|
||||
@@ -31,9 +25,9 @@ func BenchmarkSanitize(b *testing.B) {
|
||||
}
|
||||
testCases[filename][1] = string(data)
|
||||
}
|
||||
for range b.N {
|
||||
for b.Loop() {
|
||||
for _, v := range testCases {
|
||||
Sanitize(v[0], v[1])
|
||||
SanitizeHTMLWithDefaultOptions(v[0], v[1])
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,7 +40,7 @@ func FuzzSanitizer(f *testing.F) {
|
||||
i++
|
||||
}
|
||||
|
||||
out := Sanitize("", orig)
|
||||
out := SanitizeHTMLWithDefaultOptions("", orig)
|
||||
|
||||
tok = html.NewTokenizer(strings.NewReader(out))
|
||||
j := 0
|
||||
@@ -62,7 +56,7 @@ func FuzzSanitizer(f *testing.F) {
|
||||
|
||||
func TestValidInput(t *testing.T) {
|
||||
input := `<p>This is a <strong>text</strong> with an image: <img src="http://example.org/" alt="Test" loading="lazy">.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if input != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, input, output)
|
||||
@@ -72,7 +66,7 @@ func TestValidInput(t *testing.T) {
|
||||
func TestImgWithWidthAndHeightAttribute(t *testing.T) {
|
||||
input := `<img src="https://example.org/image.png" width="10" height="20">`
|
||||
expected := `<img src="https://example.org/image.png" width="10" height="20" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -82,7 +76,7 @@ func TestImgWithWidthAndHeightAttribute(t *testing.T) {
|
||||
func TestImgWithWidthAndHeightAttributeLargerThanMinifluxLayout(t *testing.T) {
|
||||
input := `<img src="https://example.org/image.png" width="1200" height="675">`
|
||||
expected := `<img src="https://example.org/image.png" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -92,7 +86,17 @@ func TestImgWithWidthAndHeightAttributeLargerThanMinifluxLayout(t *testing.T) {
|
||||
func TestImgWithIncorrectWidthAndHeightAttribute(t *testing.T) {
|
||||
input := `<img src="https://example.org/image.png" width="10px" height="20px">`
|
||||
expected := `<img src="https://example.org/image.png" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestImgWithEmptywidthAndHeightAttribute(t *testing.T) {
|
||||
input := `<img src="https://example.org/image.png" width="" height="">`
|
||||
expected := `<img src="https://example.org/image.png" loading="lazy">`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -102,7 +106,7 @@ func TestImgWithIncorrectWidthAndHeightAttribute(t *testing.T) {
|
||||
func TestImgWithTextDataURL(t *testing.T) {
|
||||
input := `<img src="data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==" alt="Example">`
|
||||
expected := ``
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -112,7 +116,7 @@ func TestImgWithTextDataURL(t *testing.T) {
|
||||
func TestImgWithDataURL(t *testing.T) {
|
||||
input := `<img src="data:image/gif;base64,test" alt="Example">`
|
||||
expected := `<img src="data:image/gif;base64,test" alt="Example" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -122,7 +126,7 @@ func TestImgWithDataURL(t *testing.T) {
|
||||
func TestImgWithSrcsetAttribute(t *testing.T) {
|
||||
input := `<img srcset="example-320w.jpg, example-480w.jpg 1.5x, example-640w.jpg 2x, example-640w.jpg 640w" src="example-640w.jpg" alt="Example">`
|
||||
expected := `<img srcset="http://example.org/example-320w.jpg, http://example.org/example-480w.jpg 1.5x, http://example.org/example-640w.jpg 2x, http://example.org/example-640w.jpg 640w" src="http://example.org/example-640w.jpg" alt="Example" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -132,17 +136,111 @@ func TestImgWithSrcsetAttribute(t *testing.T) {
|
||||
func TestImgWithSrcsetAndNoSrcAttribute(t *testing.T) {
|
||||
input := `<img srcset="example-320w.jpg, example-480w.jpg 1.5x, example-640w.jpg 2x, example-640w.jpg 640w" alt="Example">`
|
||||
expected := `<img srcset="http://example.org/example-320w.jpg, http://example.org/example-480w.jpg 1.5x, http://example.org/example-640w.jpg 2x, http://example.org/example-640w.jpg 640w" alt="Example" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestImgWithFetchPriorityAttribute(t *testing.T) {
|
||||
cases := []struct {
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
`<img src="https://example.org/image.png" fetchpriority="high">`,
|
||||
`<img src="https://example.org/image.png" fetchpriority="high" loading="lazy">`,
|
||||
},
|
||||
{
|
||||
`<img src="https://example.org/image.png" fetchpriority="low">`,
|
||||
`<img src="https://example.org/image.png" fetchpriority="low" loading="lazy">`,
|
||||
},
|
||||
{
|
||||
`<img src="https://example.org/image.png" fetchpriority="auto">`,
|
||||
`<img src="https://example.org/image.png" fetchpriority="auto" loading="lazy">`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range cases {
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", tc.input)
|
||||
if output != tc.expected {
|
||||
t.Errorf(`Wrong output for input %q: expected %q, got %q`, tc.input, tc.expected, output)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestImgWithInvalidFetchPriorityAttribute(t *testing.T) {
|
||||
input := `<img src="https://example.org/image.png" fetchpriority="invalid">`
|
||||
expected := `<img src="https://example.org/image.png" loading="lazy">`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: expected %q, got %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNonImgWithFetchPriorityAttribute(t *testing.T) {
|
||||
input := `<p fetchpriority="high">Text</p>`
|
||||
expected := `<p>Text</p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: expected %q, got %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestImgWithDecodingAttribute(t *testing.T) {
|
||||
cases := []struct {
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
`<img src="https://example.org/image.png" decoding="sync">`,
|
||||
`<img src="https://example.org/image.png" decoding="sync" loading="lazy">`,
|
||||
},
|
||||
{
|
||||
`<img src="https://example.org/image.png" decoding="async">`,
|
||||
`<img src="https://example.org/image.png" decoding="async" loading="lazy">`,
|
||||
},
|
||||
{
|
||||
`<img src="https://example.org/image.png" decoding="auto">`,
|
||||
`<img src="https://example.org/image.png" decoding="auto" loading="lazy">`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range cases {
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", tc.input)
|
||||
if output != tc.expected {
|
||||
t.Errorf(`Wrong output for input %q: expected %q, got %q`, tc.input, tc.expected, output)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestImgWithInvalidDecodingAttribute(t *testing.T) {
|
||||
input := `<img src="https://example.org/image.png" decoding="invalid">`
|
||||
expected := `<img src="https://example.org/image.png" loading="lazy">`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: expected %q, got %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNonImgWithDecodingAttribute(t *testing.T) {
|
||||
input := `<p decoding="async">Text</p>`
|
||||
expected := `<p>Text</p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: expected %q, got %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSourceWithSrcsetAndMedia(t *testing.T) {
|
||||
input := `<picture><source media="(min-width: 800px)" srcset="elva-800w.jpg"></picture>`
|
||||
expected := `<picture><source media="(min-width: 800px)" srcset="http://example.org/elva-800w.jpg"></picture>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -152,7 +250,7 @@ func TestSourceWithSrcsetAndMedia(t *testing.T) {
|
||||
func TestMediumImgWithSrcset(t *testing.T) {
|
||||
input := `<img alt="Image for post" class="t u v ef aj" src="https://miro.medium.com/max/5460/1*aJ9JibWDqO81qMfNtqgqrw.jpeg" srcset="https://miro.medium.com/max/552/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 276w, https://miro.medium.com/max/1000/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 500w" sizes="500px" width="2730" height="3407">`
|
||||
expected := `<img alt="Image for post" src="https://miro.medium.com/max/5460/1*aJ9JibWDqO81qMfNtqgqrw.jpeg" srcset="https://miro.medium.com/max/552/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 276w, https://miro.medium.com/max/1000/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 500w" sizes="500px" loading="lazy">`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if output != expected {
|
||||
t.Errorf(`Wrong output: %s`, output)
|
||||
@@ -161,7 +259,7 @@ func TestMediumImgWithSrcset(t *testing.T) {
|
||||
|
||||
func TestSelfClosingTags(t *testing.T) {
|
||||
input := `<p>This <br> is a <strong>text</strong> <br/>with an image: <img src="http://example.org/" alt="Test" loading="lazy"/>.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if input != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, input, output)
|
||||
@@ -170,7 +268,7 @@ func TestSelfClosingTags(t *testing.T) {
|
||||
|
||||
func TestTable(t *testing.T) {
|
||||
input := `<table><tr><th>A</th><th colspan="2">B</th></tr><tr><td>C</td><td>D</td><td>E</td></tr></table>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if input != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, input, output)
|
||||
@@ -179,8 +277,8 @@ func TestTable(t *testing.T) {
|
||||
|
||||
func TestRelativeURL(t *testing.T) {
|
||||
input := `This <a href="/test.html">link is relative</a> and this image: <img src="../folder/image.png"/>`
|
||||
expected := `This <a href="http://example.org/test.html" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">link is relative</a> and this image: <img src="http://example.org/folder/image.png" loading="lazy"/>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `This <a href="http://example.org/test.html" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">link is relative</a> and this image: <img src="http://example.org/folder/image.png" loading="lazy"/>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -189,8 +287,8 @@ func TestRelativeURL(t *testing.T) {
|
||||
|
||||
func TestProtocolRelativeURL(t *testing.T) {
|
||||
input := `This <a href="//static.example.org/index.html">link is relative</a>.`
|
||||
expected := `This <a href="https://static.example.org/index.html" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">link is relative</a>.`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `This <a href="https://static.example.org/index.html" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">link is relative</a>.`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -200,7 +298,7 @@ func TestProtocolRelativeURL(t *testing.T) {
|
||||
func TestInvalidTag(t *testing.T) {
|
||||
input := `<p>My invalid <z>tag</z>.</p>`
|
||||
expected := `<p>My invalid tag.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -210,7 +308,7 @@ func TestInvalidTag(t *testing.T) {
|
||||
func TestVideoTag(t *testing.T) {
|
||||
input := `<p>My valid <video src="videofile.webm" autoplay poster="posterimage.jpg">fallback</video>.</p>`
|
||||
expected := `<p>My valid <video src="http://example.org/videofile.webm" poster="http://example.org/posterimage.jpg" controls>fallback</video>.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -220,7 +318,7 @@ func TestVideoTag(t *testing.T) {
|
||||
func TestAudioAndSourceTag(t *testing.T) {
|
||||
input := `<p>My music <audio controls="controls"><source src="foo.wav" type="audio/wav"></audio>.</p>`
|
||||
expected := `<p>My music <audio controls><source src="http://example.org/foo.wav" type="audio/wav"></audio>.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -230,7 +328,7 @@ func TestAudioAndSourceTag(t *testing.T) {
|
||||
func TestUnknownTag(t *testing.T) {
|
||||
input := `<p>My invalid <unknown>tag</unknown>.</p>`
|
||||
expected := `<p>My invalid tag.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -240,7 +338,7 @@ func TestUnknownTag(t *testing.T) {
|
||||
func TestInvalidNestedTag(t *testing.T) {
|
||||
input := `<p>My invalid <z>tag with some <em>valid</em> tag</z>.</p>`
|
||||
expected := `<p>My invalid tag with some <em>valid</em> tag.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -248,19 +346,85 @@ func TestInvalidNestedTag(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestInvalidIFrame(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
input := `<iframe src="http://example.org/"></iframe>`
|
||||
expected := ``
|
||||
output := Sanitize("http://example.com/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.com/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSameDomainIFrame(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
input := `<iframe src="http://example.com/test"></iframe>`
|
||||
expected := ``
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.com/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: %q != %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInvidiousIFrame(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
input := `<iframe src="https://yewtu.be/watch?v=video_id"></iframe>`
|
||||
expected := `<iframe src="https://yewtu.be/watch?v=video_id" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.com/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: %q != %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCustomYoutubeEmbedURL(t *testing.T) {
|
||||
os.Setenv("YOUTUBE_EMBED_URL_OVERRIDE", "https://www.invidious.custom/embed/")
|
||||
|
||||
defer os.Clearenv()
|
||||
var err error
|
||||
if config.Opts, err = config.NewParser().ParseEnvironmentVariables(); err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
input := `<iframe src="https://www.invidious.custom/embed/1234"></iframe>`
|
||||
expected := `<iframe src="https://www.invidious.custom/embed/1234" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.com/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: %q != %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIFrameWithChildElements(t *testing.T) {
|
||||
config.Opts = config.NewOptions()
|
||||
|
||||
input := `<iframe src="https://www.youtube.com/"><p>test</p></iframe>`
|
||||
expected := `<iframe src="https://www.youtube.com/" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.com/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.com/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLinkWithTarget(t *testing.T) {
|
||||
input := `<p>This link is <a href="http://example.org/index.html">an anchor</a></p>`
|
||||
expected := `<p>This link is <a href="http://example.org/index.html" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">an anchor</a></p>`
|
||||
output := SanitizeHTML("http://example.org/", input, &SanitizerOptions{OpenLinksInNewTab: true})
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLinkWithNoTarget(t *testing.T) {
|
||||
input := `<p>This link is <a href="http://example.org/index.html">an anchor</a></p>`
|
||||
expected := `<p>This link is <a href="http://example.org/index.html" rel="noopener noreferrer" referrerpolicy="no-referrer">an anchor</a></p>`
|
||||
output := SanitizeHTML("http://example.org/", input, &SanitizerOptions{OpenLinksInNewTab: false})
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -270,7 +434,7 @@ func TestIFrameWithChildElements(t *testing.T) {
|
||||
func TestAnchorLink(t *testing.T) {
|
||||
input := `<p>This link is <a href="#some-anchor">an anchor</a></p>`
|
||||
expected := `<p>This link is <a href="#some-anchor">an anchor</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -280,7 +444,7 @@ func TestAnchorLink(t *testing.T) {
|
||||
func TestInvalidURLScheme(t *testing.T) {
|
||||
input := `<p>This link is <a src="file:///etc/passwd">not valid</a></p>`
|
||||
expected := `<p>This link is not valid</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -289,8 +453,8 @@ func TestInvalidURLScheme(t *testing.T) {
|
||||
|
||||
func TestAPTURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="apt:some-package?channel=test">valid</a></p>`
|
||||
expected := `<p>This link is <a href="apt:some-package?channel=test" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="apt:some-package?channel=test" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -299,8 +463,8 @@ func TestAPTURIScheme(t *testing.T) {
|
||||
|
||||
func TestBitcoinURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W">valid</a></p>`
|
||||
expected := `<p>This link is <a href="bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -309,8 +473,8 @@ func TestBitcoinURIScheme(t *testing.T) {
|
||||
|
||||
func TestCallToURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="callto:12345679">valid</a></p>`
|
||||
expected := `<p>This link is <a href="callto:12345679" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="callto:12345679" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -319,16 +483,16 @@ func TestCallToURIScheme(t *testing.T) {
|
||||
|
||||
func TestFeedURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="feed://example.com/rss.xml">valid</a></p>`
|
||||
expected := `<p>This link is <a href="feed://example.com/rss.xml" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="feed://example.com/rss.xml" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>This link is <a href="feed:https://example.com/rss.xml">valid</a></p>`
|
||||
expected = `<p>This link is <a href="feed:https://example.com/rss.xml" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output = Sanitize("http://example.org/", input)
|
||||
expected = `<p>This link is <a href="feed:https://example.com/rss.xml" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -337,8 +501,8 @@ func TestFeedURIScheme(t *testing.T) {
|
||||
|
||||
func TestGeoURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="geo:13.4125,103.8667">valid</a></p>`
|
||||
expected := `<p>This link is <a href="geo:13.4125,103.8667" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="geo:13.4125,103.8667" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -347,16 +511,16 @@ func TestGeoURIScheme(t *testing.T) {
|
||||
|
||||
func TestItunesURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="itms://itunes.com/apps/my-app-name">valid</a></p>`
|
||||
expected := `<p>This link is <a href="itms://itunes.com/apps/my-app-name" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="itms://itunes.com/apps/my-app-name" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>This link is <a href="itms-apps://itunes.com/apps/my-app-name">valid</a></p>`
|
||||
expected = `<p>This link is <a href="itms-apps://itunes.com/apps/my-app-name" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output = Sanitize("http://example.org/", input)
|
||||
expected = `<p>This link is <a href="itms-apps://itunes.com/apps/my-app-name" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -365,8 +529,8 @@ func TestItunesURIScheme(t *testing.T) {
|
||||
|
||||
func TestMagnetURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="magnet:?xt.1=urn:sha1:YNCKHTQCWBTRNJIV4WNAE52SJUQCZO5C&xt.2=urn:sha1:TXGCZQTH26NL6OUQAJJPFALHG2LTGBC7">valid</a></p>`
|
||||
expected := `<p>This link is <a href="magnet:?xt.1=urn:sha1:YNCKHTQCWBTRNJIV4WNAE52SJUQCZO5C&xt.2=urn:sha1:TXGCZQTH26NL6OUQAJJPFALHG2LTGBC7" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="magnet:?xt.1=urn:sha1:YNCKHTQCWBTRNJIV4WNAE52SJUQCZO5C&xt.2=urn:sha1:TXGCZQTH26NL6OUQAJJPFALHG2LTGBC7" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -375,8 +539,8 @@ func TestMagnetURIScheme(t *testing.T) {
|
||||
|
||||
func TestMailtoURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="mailto:jsmith@example.com?subject=A%20Test&body=My%20idea%20is%3A%20%0A">valid</a></p>`
|
||||
expected := `<p>This link is <a href="mailto:jsmith@example.com?subject=A%20Test&body=My%20idea%20is%3A%20%0A" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="mailto:jsmith@example.com?subject=A%20Test&body=My%20idea%20is%3A%20%0A" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -385,24 +549,24 @@ func TestMailtoURIScheme(t *testing.T) {
|
||||
|
||||
func TestNewsURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="news://news.server.example/*">valid</a></p>`
|
||||
expected := `<p>This link is <a href="news://news.server.example/*" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="news://news.server.example/*" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>This link is <a href="news:example.group.this">valid</a></p>`
|
||||
expected = `<p>This link is <a href="news:example.group.this" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output = Sanitize("http://example.org/", input)
|
||||
expected = `<p>This link is <a href="news:example.group.this" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>This link is <a href="nntp://news.server.example/example.group.this">valid</a></p>`
|
||||
expected = `<p>This link is <a href="nntp://news.server.example/example.group.this" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output = Sanitize("http://example.org/", input)
|
||||
expected = `<p>This link is <a href="nntp://news.server.example/example.group.this" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -411,8 +575,8 @@ func TestNewsURIScheme(t *testing.T) {
|
||||
|
||||
func TestRTMPURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="rtmp://mycompany.com/vod/mp4:mycoolvideo.mov">valid</a></p>`
|
||||
expected := `<p>This link is <a href="rtmp://mycompany.com/vod/mp4:mycoolvideo.mov" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="rtmp://mycompany.com/vod/mp4:mycoolvideo.mov" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -421,16 +585,16 @@ func TestRTMPURIScheme(t *testing.T) {
|
||||
|
||||
func TestSIPURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="sip:+1-212-555-1212:1234@gateway.com;user=phone">valid</a></p>`
|
||||
expected := `<p>This link is <a href="sip:+1-212-555-1212:1234@gateway.com;user=phone" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="sip:+1-212-555-1212:1234@gateway.com;user=phone" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>This link is <a href="sips:alice@atlanta.com?subject=project%20x&priority=urgent">valid</a></p>`
|
||||
expected = `<p>This link is <a href="sips:alice@atlanta.com?subject=project%20x&priority=urgent" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output = Sanitize("http://example.org/", input)
|
||||
expected = `<p>This link is <a href="sips:alice@atlanta.com?subject=project%20x&priority=urgent" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -439,8 +603,8 @@ func TestSIPURIScheme(t *testing.T) {
|
||||
|
||||
func TestSkypeURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="skype:echo123?call">valid</a></p>`
|
||||
expected := `<p>This link is <a href="skype:echo123?call" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="skype:echo123?call" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -449,8 +613,8 @@ func TestSkypeURIScheme(t *testing.T) {
|
||||
|
||||
func TestSpotifyURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="spotify:track:2jCnn1QPQ3E8ExtLe6INsx">valid</a></p>`
|
||||
expected := `<p>This link is <a href="spotify:track:2jCnn1QPQ3E8ExtLe6INsx" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="spotify:track:2jCnn1QPQ3E8ExtLe6INsx" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -459,8 +623,8 @@ func TestSpotifyURIScheme(t *testing.T) {
|
||||
|
||||
func TestSteamURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="steam://settings/account">valid</a></p>`
|
||||
expected := `<p>This link is <a href="steam://settings/account" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="steam://settings/account" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -469,16 +633,16 @@ func TestSteamURIScheme(t *testing.T) {
|
||||
|
||||
func TestSubversionURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="svn://example.org">valid</a></p>`
|
||||
expected := `<p>This link is <a href="svn://example.org" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="svn://example.org" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>This link is <a href="svn+ssh://example.org">valid</a></p>`
|
||||
expected = `<p>This link is <a href="svn+ssh://example.org" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output = Sanitize("http://example.org/", input)
|
||||
expected = `<p>This link is <a href="svn+ssh://example.org" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -487,8 +651,8 @@ func TestSubversionURIScheme(t *testing.T) {
|
||||
|
||||
func TestTelURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="tel:+1-201-555-0123">valid</a></p>`
|
||||
expected := `<p>This link is <a href="tel:+1-201-555-0123" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="tel:+1-201-555-0123" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -497,8 +661,8 @@ func TestTelURIScheme(t *testing.T) {
|
||||
|
||||
func TestWebcalURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="webcal://example.com/calendar.ics">valid</a></p>`
|
||||
expected := `<p>This link is <a href="webcal://example.com/calendar.ics" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="webcal://example.com/calendar.ics" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -507,8 +671,8 @@ func TestWebcalURIScheme(t *testing.T) {
|
||||
|
||||
func TestXMPPURIScheme(t *testing.T) {
|
||||
input := `<p>This link is <a href="xmpp:user@host?subscribe&type=subscribed">valid</a></p>`
|
||||
expected := `<p>This link is <a href="xmpp:user@host?subscribe&type=subscribed" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">valid</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link is <a href="xmpp:user@host?subscribe&type=subscribed" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">valid</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -518,7 +682,7 @@ func TestXMPPURIScheme(t *testing.T) {
|
||||
func TestBlacklistedLink(t *testing.T) {
|
||||
input := `<p>This image is not valid <img src="https://stats.wordpress.com/some-tracker"></p>`
|
||||
expected := `<p>This image is not valid </p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -527,8 +691,8 @@ func TestBlacklistedLink(t *testing.T) {
|
||||
|
||||
func TestLinkWithTrackers(t *testing.T) {
|
||||
input := `<p>This link has trackers <a href="https://example.com/page?utm_source=newsletter">Test</a></p>`
|
||||
expected := `<p>This link has trackers <a href="https://example.com/page" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">Test</a></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
expected := `<p>This link has trackers <a href="https://example.com/page" rel="noopener noreferrer" referrerpolicy="no-referrer" target="_blank">Test</a></p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -538,17 +702,27 @@ func TestLinkWithTrackers(t *testing.T) {
|
||||
func TestImageSrcWithTrackers(t *testing.T) {
|
||||
input := `<p>This image has trackers <img src="https://example.org/?id=123&utm_source=newsletter&utm_medium=email&fbclid=abc123"></p>`
|
||||
expected := `<p>This image has trackers <img src="https://example.org/?id=123" loading="lazy"></p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPixelTracker(t *testing.T) {
|
||||
func Test1x1PixelTracker(t *testing.T) {
|
||||
input := `<p><img src="https://tracker1.example.org/" height="1" width="1"> and <img src="https://tracker2.example.org/" height="1" width="1"/></p>`
|
||||
expected := `<p> and </p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func Test0x0PixelTracker(t *testing.T) {
|
||||
input := `<p><img src="https://tracker1.example.org/" height="0" width="0"> and <img src="https://tracker2.example.org/" height="0" width="0"/></p>`
|
||||
expected := `<p> and </p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -558,7 +732,7 @@ func TestPixelTracker(t *testing.T) {
|
||||
func TestXmlEntities(t *testing.T) {
|
||||
input := `<pre>echo "test" > /etc/hosts</pre>`
|
||||
expected := `<pre>echo "test" > /etc/hosts</pre>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -568,7 +742,7 @@ func TestXmlEntities(t *testing.T) {
|
||||
func TestEspaceAttributes(t *testing.T) {
|
||||
input := `<td rowspan="<b>test</b>">test</td>`
|
||||
expected := `<td rowspan="<b>test</b>">test</td>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -578,7 +752,7 @@ func TestEspaceAttributes(t *testing.T) {
|
||||
func TestReplaceYoutubeURL(t *testing.T) {
|
||||
input := `<iframe src="http://www.youtube.com/embed/test123?version=3&rel=1&fs=1&autohide=2&showsearch=0&showinfo=1&iv_load_policy=1&wmode=transparent"></iframe>`
|
||||
expected := `<iframe src="https://www.youtube-nocookie.com/embed/test123?version=3&rel=1&fs=1&autohide=2&showsearch=0&showinfo=1&iv_load_policy=1&wmode=transparent" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -588,7 +762,7 @@ func TestReplaceYoutubeURL(t *testing.T) {
|
||||
func TestReplaceSecureYoutubeURL(t *testing.T) {
|
||||
input := `<iframe src="https://www.youtube.com/embed/test123"></iframe>`
|
||||
expected := `<iframe src="https://www.youtube-nocookie.com/embed/test123" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -598,7 +772,7 @@ func TestReplaceSecureYoutubeURL(t *testing.T) {
|
||||
func TestReplaceSecureYoutubeURLWithParameters(t *testing.T) {
|
||||
input := `<iframe src="https://www.youtube.com/embed/test123?rel=0&controls=0"></iframe>`
|
||||
expected := `<iframe src="https://www.youtube-nocookie.com/embed/test123?rel=0&controls=0" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -608,7 +782,7 @@ func TestReplaceSecureYoutubeURLWithParameters(t *testing.T) {
|
||||
func TestReplaceYoutubeURLAlreadyReplaced(t *testing.T) {
|
||||
input := `<iframe src="https://www.youtube-nocookie.com/embed/test123?rel=0&controls=0" sandbox="allow-scripts allow-same-origin"></iframe>`
|
||||
expected := `<iframe src="https://www.youtube-nocookie.com/embed/test123?rel=0&controls=0" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -618,7 +792,7 @@ func TestReplaceYoutubeURLAlreadyReplaced(t *testing.T) {
|
||||
func TestReplaceProtocolRelativeYoutubeURL(t *testing.T) {
|
||||
input := `<iframe src="//www.youtube.com/embed/Bf2W84jrGqs" width="560" height="314" allowfullscreen="allowfullscreen"></iframe>`
|
||||
expected := `<iframe src="https://www.youtube-nocookie.com/embed/Bf2W84jrGqs" width="560" height="314" allowfullscreen="allowfullscreen" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -626,40 +800,48 @@ func TestReplaceProtocolRelativeYoutubeURL(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestReplaceYoutubeURLWithCustomURL(t *testing.T) {
|
||||
os.Clearenv()
|
||||
defer os.Clearenv()
|
||||
os.Setenv("YOUTUBE_EMBED_URL_OVERRIDE", "https://invidious.custom/embed/")
|
||||
|
||||
var err error
|
||||
parser := config.NewParser()
|
||||
config.Opts, err = parser.ParseEnvironmentVariables()
|
||||
|
||||
config.Opts, err = config.NewParser().ParseEnvironmentVariables()
|
||||
if err != nil {
|
||||
t.Fatalf(`Parsing failure: %v`, err)
|
||||
}
|
||||
|
||||
input := `<iframe src="https://www.youtube.com/embed/test123?version=3&rel=1&fs=1&autohide=2&showsearch=0&showinfo=1&iv_load_policy=1&wmode=transparent"></iframe>`
|
||||
expected := `<iframe src="https://invidious.custom/embed/test123?version=3&rel=1&fs=1&autohide=2&showsearch=0&showinfo=1&iv_load_policy=1&wmode=transparent" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplaceIframeVimedoDNTURL(t *testing.T) {
|
||||
func TestVimeoIframeRewriteWithQueryString(t *testing.T) {
|
||||
input := `<iframe src="https://player.vimeo.com/video/123456?title=0&byline=0"></iframe>`
|
||||
expected := `<iframe src="https://player.vimeo.com/video/123456?title=0&byline=0&dnt=1" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
t.Errorf(`Wrong output: %q != %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestVimeoIframeRewriteWithoutQueryString(t *testing.T) {
|
||||
input := `<iframe src="https://player.vimeo.com/video/123456"></iframe>`
|
||||
expected := `<iframe src="https://player.vimeo.com/video/123456?dnt=1" sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox" loading="lazy"></iframe>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: %q != %q`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplaceNoScript(t *testing.T) {
|
||||
input := `<p>Before paragraph.</p><noscript>Inside <code>noscript</code> tag with an image: <img src="http://example.org/" alt="Test" loading="lazy"></noscript><p>After paragraph.</p>`
|
||||
expected := `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -669,7 +851,7 @@ func TestReplaceNoScript(t *testing.T) {
|
||||
func TestReplaceScript(t *testing.T) {
|
||||
input := `<p>Before paragraph.</p><script type="text/javascript">alert("1");</script><p>After paragraph.</p>`
|
||||
expected := `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -679,7 +861,7 @@ func TestReplaceScript(t *testing.T) {
|
||||
func TestReplaceStyle(t *testing.T) {
|
||||
input := `<p>Before paragraph.</p><style>body { background-color: #ff0000; }</style><p>After paragraph.</p>`
|
||||
expected := `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -689,7 +871,7 @@ func TestReplaceStyle(t *testing.T) {
|
||||
func TestHiddenParagraph(t *testing.T) {
|
||||
input := `<p>Before paragraph.</p><p hidden>This should <em>not</em> appear in the <strong>output</strong></p><p>After paragraph.</p>`
|
||||
expected := `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
@@ -700,7 +882,7 @@ func TestAttributesAreStripped(t *testing.T) {
|
||||
input := `<p style="color: red;">Some text.<hr style="color: blue"/>Test.</p>`
|
||||
expected := `<p>Some text.<hr/>Test.</p>`
|
||||
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
@@ -709,7 +891,43 @@ func TestAttributesAreStripped(t *testing.T) {
|
||||
func TestMathML(t *testing.T) {
|
||||
input := `<math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mi>x</mi><mn>2</mn></msup></math>`
|
||||
expected := `<math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mi>x</mi><mn>2</mn></msup></math>`
|
||||
output := Sanitize("http://example.org/", input)
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInvalidMathMLXMLNamespace(t *testing.T) {
|
||||
input := `<math xmlns="http://example.org"><msup><mi>x</mi><mn>2</mn></msup></math>`
|
||||
expected := `<math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mi>x</mi><mn>2</mn></msup></math>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBlockedResourcesSubstrings(t *testing.T) {
|
||||
input := `<p>Before paragraph.</p><img src="http://stats.wordpress.com/something.php" alt="Blocked Resource"><p>After paragraph.</p>`
|
||||
expected := `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output := SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>Before paragraph.</p><img src="http://twitter.com/share?text=This+is+google+a+search+engine&url=https%3A%2F%2Fwww.google.com" alt="Blocked Resource"><p>After paragraph.</p>`
|
||||
expected = `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
}
|
||||
|
||||
input = `<p>Before paragraph.</p><img src="http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.google.com%[title]=This+Is%2C+Google+a+search+engine" alt="Blocked Resource"><p>After paragraph.</p>`
|
||||
expected = `<p>Before paragraph.</p><p>After paragraph.</p>`
|
||||
output = SanitizeHTMLWithDefaultOptions("http://example.org/", input)
|
||||
|
||||
if expected != output {
|
||||
t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
|
||||
|
||||
@@ -93,8 +93,7 @@ func findContentUsingCustomRules(page io.Reader, rules string) (baseURL string,
|
||||
}
|
||||
|
||||
func getPredefinedScraperRules(websiteURL string) string {
|
||||
urlDomain := urllib.Domain(websiteURL)
|
||||
urlDomain = strings.TrimPrefix(urlDomain, "www.")
|
||||
urlDomain := urllib.DomainWithoutWWW(websiteURL)
|
||||
|
||||
if rules, ok := predefinedRules[urlDomain]; ok {
|
||||
return rules
|
||||
|
||||
@@ -95,26 +95,12 @@ var trackingParamsOutbound = map[string]bool{
|
||||
"ref": true,
|
||||
}
|
||||
|
||||
func RemoveTrackingParameters(baseUrl, feedUrl, inputURL string) (string, error) {
|
||||
parsedURL, err := url.Parse(inputURL)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("urlcleaner: error parsing URL: %v", err)
|
||||
func RemoveTrackingParameters(parsedFeedURL, parsedSiteURL, parsedInputUrl *url.URL) (string, error) {
|
||||
if parsedFeedURL == nil || parsedSiteURL == nil || parsedInputUrl == nil {
|
||||
return "", fmt.Errorf("urlcleaner: one of the URLs is nil")
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(parsedURL.Scheme, "http") {
|
||||
return inputURL, nil
|
||||
}
|
||||
|
||||
parsedBaseUrl, err := url.Parse(baseUrl)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("urlcleaner: error parsing base URL: %v", err)
|
||||
}
|
||||
parsedFeedUrl, err := url.Parse(feedUrl)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("urlcleaner: error parsing feed URL: %v", err)
|
||||
}
|
||||
|
||||
queryParams := parsedURL.Query()
|
||||
queryParams := parsedInputUrl.Query()
|
||||
hasTrackers := false
|
||||
|
||||
// Remove tracking parameters
|
||||
@@ -127,7 +113,7 @@ func RemoveTrackingParameters(baseUrl, feedUrl, inputURL string) (string, error)
|
||||
if trackingParamsOutbound[lowerParam] {
|
||||
// handle duplicate parameters like ?a=b&a=c&a=d…
|
||||
for _, value := range queryParams[param] {
|
||||
if value == parsedBaseUrl.Hostname() || value == parsedFeedUrl.Hostname() {
|
||||
if value == parsedFeedURL.Hostname() || value == parsedSiteURL.Hostname() {
|
||||
queryParams.Del(param)
|
||||
hasTrackers = true
|
||||
break
|
||||
@@ -138,14 +124,11 @@ func RemoveTrackingParameters(baseUrl, feedUrl, inputURL string) (string, error)
|
||||
|
||||
// Do not modify the URL if there are no tracking parameters
|
||||
if !hasTrackers {
|
||||
return inputURL, nil
|
||||
return parsedInputUrl.String(), nil
|
||||
}
|
||||
|
||||
parsedURL.RawQuery = queryParams.Encode()
|
||||
|
||||
// Remove trailing "?" if query string is empty
|
||||
cleanedURL := parsedURL.String()
|
||||
cleanedURL = strings.TrimSuffix(cleanedURL, "?")
|
||||
parsedInputUrl.RawQuery = queryParams.Encode()
|
||||
cleanedURL := strings.TrimSuffix(parsedInputUrl.String(), "?")
|
||||
|
||||
return cleanedURL, nil
|
||||
}
|
||||
|
||||
@@ -121,7 +121,10 @@ func TestRemoveTrackingParams(t *testing.T) {
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result, err := RemoveTrackingParameters(tt.baseUrl, tt.feedUrl, tt.input)
|
||||
parsedBaseUrl, _ := url.Parse(tt.baseUrl)
|
||||
parsedFeedUrl, _ := url.Parse(tt.feedUrl)
|
||||
parsedInputUrl, _ := url.Parse(tt.input)
|
||||
result, err := RemoveTrackingParameters(parsedBaseUrl, parsedFeedUrl, parsedInputUrl)
|
||||
if tt.expected == "" {
|
||||
if err == nil {
|
||||
t.Errorf("Expected an error for invalid URL, but got none")
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
|
||||
"miniflux.app/v2/internal/reader/encoding"
|
||||
)
|
||||
@@ -16,11 +17,15 @@ import (
|
||||
// NewXMLDecoder returns a XML decoder that filters illegal characters.
|
||||
func NewXMLDecoder(data io.ReadSeeker) *xml.Decoder {
|
||||
var decoder *xml.Decoder
|
||||
buffer, _ := io.ReadAll(data)
|
||||
enc := getEncoding(buffer)
|
||||
|
||||
// This is way fasted than io.ReadAll(data) as the buffer can be allocated in one go instead of dynamically grown.
|
||||
buffer := &bytes.Buffer{}
|
||||
io.Copy(buffer, data)
|
||||
|
||||
enc := getEncoding(buffer.Bytes())
|
||||
if enc == "" || strings.EqualFold(enc, "utf-8") {
|
||||
// filter invalid chars now, since decoder.CharsetReader not called for utf-8 content
|
||||
filteredBytes := bytes.Map(filterValidXMLChar, buffer)
|
||||
filteredBytes := filterValidXMLChars(buffer.Bytes())
|
||||
decoder = xml.NewDecoder(bytes.NewReader(filteredBytes))
|
||||
} else {
|
||||
// filter invalid chars later within decoder.CharsetReader
|
||||
@@ -39,13 +44,34 @@ func NewXMLDecoder(data io.ReadSeeker) *xml.Decoder {
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("encoding: unable to read data: %w", err)
|
||||
}
|
||||
filteredBytes := bytes.Map(filterValidXMLChar, rawData)
|
||||
filteredBytes := filterValidXMLChars(rawData)
|
||||
return bytes.NewReader(filteredBytes), nil
|
||||
}
|
||||
|
||||
return decoder
|
||||
}
|
||||
|
||||
// filterValidXMLChars filters inplace invalid XML characters.
|
||||
// This function is inspired from bytes.Map
|
||||
func filterValidXMLChars(s []byte) []byte {
|
||||
j := 0
|
||||
for i := 0; i < len(s); {
|
||||
wid := 1
|
||||
r := rune(s[i])
|
||||
if r >= utf8.RuneSelf {
|
||||
r, wid = utf8.DecodeRune(s[i:])
|
||||
}
|
||||
if r != utf8.RuneError {
|
||||
if r = filterValidXMLChar(r); r >= 0 {
|
||||
utf8.EncodeRune(s[j:], r)
|
||||
j += wid
|
||||
}
|
||||
}
|
||||
i += wid
|
||||
}
|
||||
return s[:j]
|
||||
}
|
||||
|
||||
// This function is copied from encoding/xml package,
|
||||
// and is used to check if all the characters are legal.
|
||||
func filterValidXMLChar(r rune) rune {
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
func TestXMLDocumentWithIllegalUnicodeCharacters(t *testing.T) {
|
||||
@@ -81,3 +82,25 @@ func TestXMLDocumentWithIncorrectEncodingField(t *testing.T) {
|
||||
t.Errorf("Incorrect entry title, expected: %s, got: %s", expected, x.Title)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFilterValidXMLCharsWithInvalidUTF8Sequence(t *testing.T) {
|
||||
// Create input with invalid UTF-8 sequence
|
||||
input := []byte{0x41, 0xC0, 0xAF, 0x42} // 'A', invalid UTF-8, 'B'
|
||||
|
||||
filtered := filterValidXMLChars(input)
|
||||
|
||||
// The function would replace invalid UTF-8 with replacement char
|
||||
// rather than properly filtering
|
||||
if utf8.Valid(filtered) {
|
||||
r, _ := utf8.DecodeRune(filtered[1:])
|
||||
if r == utf8.RuneError {
|
||||
t.Error("Invalid UTF-8 was not properly filtered")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func FuzzFilterValidXMLChars(f *testing.F) {
|
||||
f.Fuzz(func(t *testing.T, s []byte) {
|
||||
filterValidXMLChars(s)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ func (s *Storage) cleanupEntries(feedID int64, entryHashes []string) error {
|
||||
|
||||
// RefreshFeedEntries updates feed entries while refreshing a feed.
|
||||
func (s *Storage) RefreshFeedEntries(userID, feedID int64, entries model.Entries, updateExistingEntries bool) (newEntries model.Entries, err error) {
|
||||
var entryHashes []string
|
||||
entryHashes := make([]string, 0, len(entries))
|
||||
|
||||
for _, entry := range entries {
|
||||
entry.UserID = userID
|
||||
|
||||
+33
-25
@@ -239,6 +239,8 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
|
||||
rewrite_rules,
|
||||
blocklist_rules,
|
||||
keeplist_rules,
|
||||
block_filter_entry_rules,
|
||||
keep_filter_entry_rules,
|
||||
ignore_http_cache,
|
||||
allow_self_signed_certificates,
|
||||
fetch_via_proxy,
|
||||
@@ -252,7 +254,7 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
|
||||
proxy_url
|
||||
)
|
||||
VALUES
|
||||
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)
|
||||
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30)
|
||||
RETURNING
|
||||
id
|
||||
`
|
||||
@@ -275,6 +277,8 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
|
||||
feed.RewriteRules,
|
||||
feed.BlocklistRules,
|
||||
feed.KeeplistRules,
|
||||
feed.BlockFilterEntryRules,
|
||||
feed.KeepFilterEntryRules,
|
||||
feed.IgnoreHTTPCache,
|
||||
feed.AllowSelfSignedCertificates,
|
||||
feed.FetchViaProxy,
|
||||
@@ -344,31 +348,33 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
|
||||
rewrite_rules=$11,
|
||||
blocklist_rules=$12,
|
||||
keeplist_rules=$13,
|
||||
crawler=$14,
|
||||
user_agent=$15,
|
||||
cookie=$16,
|
||||
username=$17,
|
||||
password=$18,
|
||||
disabled=$19,
|
||||
next_check_at=$20,
|
||||
ignore_http_cache=$21,
|
||||
allow_self_signed_certificates=$22,
|
||||
fetch_via_proxy=$23,
|
||||
hide_globally=$24,
|
||||
url_rewrite_rules=$25,
|
||||
no_media_player=$26,
|
||||
apprise_service_urls=$27,
|
||||
webhook_url=$28,
|
||||
disable_http2=$29,
|
||||
description=$30,
|
||||
ntfy_enabled=$31,
|
||||
ntfy_priority=$32,
|
||||
ntfy_topic=$33,
|
||||
pushover_enabled=$34,
|
||||
pushover_priority=$35,
|
||||
proxy_url=$36
|
||||
block_filter_entry_rules=$14,
|
||||
keep_filter_entry_rules=$15,
|
||||
crawler=$16,
|
||||
user_agent=$17,
|
||||
cookie=$18,
|
||||
username=$19,
|
||||
password=$20,
|
||||
disabled=$21,
|
||||
next_check_at=$22,
|
||||
ignore_http_cache=$23,
|
||||
allow_self_signed_certificates=$24,
|
||||
fetch_via_proxy=$25,
|
||||
hide_globally=$26,
|
||||
url_rewrite_rules=$27,
|
||||
no_media_player=$28,
|
||||
apprise_service_urls=$29,
|
||||
webhook_url=$30,
|
||||
disable_http2=$31,
|
||||
description=$32,
|
||||
ntfy_enabled=$33,
|
||||
ntfy_priority=$34,
|
||||
ntfy_topic=$35,
|
||||
pushover_enabled=$36,
|
||||
pushover_priority=$37,
|
||||
proxy_url=$38
|
||||
WHERE
|
||||
id=$37 AND user_id=$38
|
||||
id=$39 AND user_id=$40
|
||||
`
|
||||
_, err = s.db.Exec(query,
|
||||
feed.FeedURL,
|
||||
@@ -384,6 +390,8 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
|
||||
feed.RewriteRules,
|
||||
feed.BlocklistRules,
|
||||
feed.KeeplistRules,
|
||||
feed.BlockFilterEntryRules,
|
||||
feed.KeepFilterEntryRules,
|
||||
feed.Crawler,
|
||||
feed.UserAgent,
|
||||
feed.Cookie,
|
||||
|
||||
@@ -6,6 +6,7 @@ package storage // import "miniflux.app/v2/internal/storage"
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"miniflux.app/v2/internal/model"
|
||||
@@ -40,9 +41,9 @@ func NewFeedQueryBuilder(store *Storage, userID int64) *FeedQueryBuilder {
|
||||
// WithCategoryID filter by category ID.
|
||||
func (f *FeedQueryBuilder) WithCategoryID(categoryID int64) *FeedQueryBuilder {
|
||||
if categoryID > 0 {
|
||||
f.conditions = append(f.conditions, fmt.Sprintf("f.category_id = $%d", len(f.args)+1))
|
||||
f.conditions = append(f.conditions, "f.category_id = $"+strconv.Itoa(len(f.args)+1))
|
||||
f.args = append(f.args, categoryID)
|
||||
f.counterConditions = append(f.counterConditions, fmt.Sprintf("f.category_id = $%d", len(f.counterArgs)+1))
|
||||
f.counterConditions = append(f.counterConditions, "f.category_id = $"+strconv.Itoa(len(f.counterArgs)+1))
|
||||
f.counterArgs = append(f.counterArgs, categoryID)
|
||||
f.counterJoinFeeds = true
|
||||
}
|
||||
@@ -52,7 +53,7 @@ func (f *FeedQueryBuilder) WithCategoryID(categoryID int64) *FeedQueryBuilder {
|
||||
// WithFeedID filter by feed ID.
|
||||
func (f *FeedQueryBuilder) WithFeedID(feedID int64) *FeedQueryBuilder {
|
||||
if feedID > 0 {
|
||||
f.conditions = append(f.conditions, fmt.Sprintf("f.id = $%d", len(f.args)+1))
|
||||
f.conditions = append(f.conditions, "f.id = $"+strconv.Itoa(len(f.args)+1))
|
||||
f.args = append(f.args, feedID)
|
||||
}
|
||||
return f
|
||||
@@ -145,9 +146,11 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
|
||||
f.parsing_error_msg,
|
||||
f.scraper_rules,
|
||||
f.rewrite_rules,
|
||||
f.url_rewrite_rules,
|
||||
f.blocklist_rules,
|
||||
f.keeplist_rules,
|
||||
f.url_rewrite_rules,
|
||||
f.block_filter_entry_rules,
|
||||
f.keep_filter_entry_rules,
|
||||
f.crawler,
|
||||
f.user_agent,
|
||||
f.cookie,
|
||||
@@ -224,9 +227,11 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
|
||||
&feed.ParsingErrorMsg,
|
||||
&feed.ScraperRules,
|
||||
&feed.RewriteRules,
|
||||
&feed.UrlRewriteRules,
|
||||
&feed.BlocklistRules,
|
||||
&feed.KeeplistRules,
|
||||
&feed.UrlRewriteRules,
|
||||
&feed.BlockFilterEntryRules,
|
||||
&feed.KeepFilterEntryRules,
|
||||
&feed.Crawler,
|
||||
&feed.UserAgent,
|
||||
&feed.Cookie,
|
||||
|
||||
+102
-102
@@ -142,9 +142,6 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
|
||||
espial_tags,
|
||||
readwise_enabled,
|
||||
readwise_api_key,
|
||||
pocket_enabled,
|
||||
pocket_access_token,
|
||||
pocket_consumer_key,
|
||||
telegram_bot_enabled,
|
||||
telegram_bot_token,
|
||||
telegram_bot_chat_id,
|
||||
@@ -220,7 +217,10 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
|
||||
pushover_token,
|
||||
pushover_device,
|
||||
pushover_prefix,
|
||||
rssbridge_token
|
||||
rssbridge_token,
|
||||
karakeep_enabled,
|
||||
karakeep_api_key,
|
||||
karakeep_url
|
||||
FROM
|
||||
integrations
|
||||
WHERE
|
||||
@@ -261,9 +261,6 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
|
||||
&integration.EspialTags,
|
||||
&integration.ReadwiseEnabled,
|
||||
&integration.ReadwiseAPIKey,
|
||||
&integration.PocketEnabled,
|
||||
&integration.PocketAccessToken,
|
||||
&integration.PocketConsumerKey,
|
||||
&integration.TelegramBotEnabled,
|
||||
&integration.TelegramBotToken,
|
||||
&integration.TelegramBotChatID,
|
||||
@@ -340,6 +337,9 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
|
||||
&integration.PushoverDevice,
|
||||
&integration.PushoverPrefix,
|
||||
&integration.RSSBridgeToken,
|
||||
&integration.KarakeepEnabled,
|
||||
&integration.KarakeepAPIKey,
|
||||
&integration.KarakeepURL,
|
||||
)
|
||||
switch {
|
||||
case err == sql.ErrNoRows:
|
||||
@@ -377,97 +377,97 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
|
||||
nunux_keeper_enabled=$18,
|
||||
nunux_keeper_url=$19,
|
||||
nunux_keeper_api_key=$20,
|
||||
pocket_enabled=$21,
|
||||
pocket_access_token=$22,
|
||||
pocket_consumer_key=$23,
|
||||
googlereader_enabled=$24,
|
||||
googlereader_username=$25,
|
||||
googlereader_password=$26,
|
||||
telegram_bot_enabled=$27,
|
||||
telegram_bot_token=$28,
|
||||
telegram_bot_chat_id=$29,
|
||||
telegram_bot_topic_id=$30,
|
||||
telegram_bot_disable_web_page_preview=$31,
|
||||
telegram_bot_disable_notification=$32,
|
||||
telegram_bot_disable_buttons=$33,
|
||||
espial_enabled=$34,
|
||||
espial_url=$35,
|
||||
espial_api_key=$36,
|
||||
espial_tags=$37,
|
||||
linkace_enabled=$38,
|
||||
linkace_url=$39,
|
||||
linkace_api_key=$40,
|
||||
linkace_tags=$41,
|
||||
linkace_is_private=$42,
|
||||
linkace_check_disabled=$43,
|
||||
linkding_enabled=$44,
|
||||
linkding_url=$45,
|
||||
linkding_api_key=$46,
|
||||
linkding_tags=$47,
|
||||
linkding_mark_as_unread=$48,
|
||||
matrix_bot_enabled=$49,
|
||||
matrix_bot_user=$50,
|
||||
matrix_bot_password=$51,
|
||||
matrix_bot_url=$52,
|
||||
matrix_bot_chat_id=$53,
|
||||
notion_enabled=$54,
|
||||
notion_token=$55,
|
||||
notion_page_id=$56,
|
||||
readwise_enabled=$57,
|
||||
readwise_api_key=$58,
|
||||
apprise_enabled=$59,
|
||||
apprise_url=$60,
|
||||
apprise_services_url=$61,
|
||||
readeck_enabled=$62,
|
||||
readeck_url=$63,
|
||||
readeck_api_key=$64,
|
||||
readeck_labels=$65,
|
||||
readeck_only_url=$66,
|
||||
shiori_enabled=$67,
|
||||
shiori_url=$68,
|
||||
shiori_username=$69,
|
||||
shiori_password=$70,
|
||||
shaarli_enabled=$71,
|
||||
shaarli_url=$72,
|
||||
shaarli_api_secret=$73,
|
||||
webhook_enabled=$74,
|
||||
webhook_url=$75,
|
||||
webhook_secret=$76,
|
||||
rssbridge_enabled=$77,
|
||||
rssbridge_url=$78,
|
||||
omnivore_enabled=$79,
|
||||
omnivore_api_key=$80,
|
||||
omnivore_url=$81,
|
||||
linkwarden_enabled=$82,
|
||||
linkwarden_url=$83,
|
||||
linkwarden_api_key=$84,
|
||||
raindrop_enabled=$85,
|
||||
raindrop_token=$86,
|
||||
raindrop_collection_id=$87,
|
||||
raindrop_tags=$88,
|
||||
betula_enabled=$89,
|
||||
betula_url=$90,
|
||||
betula_token=$91,
|
||||
ntfy_enabled=$92,
|
||||
ntfy_topic=$93,
|
||||
ntfy_url=$94,
|
||||
ntfy_api_token=$95,
|
||||
ntfy_username=$96,
|
||||
ntfy_password=$97,
|
||||
ntfy_icon_url=$98,
|
||||
ntfy_internal_links=$99,
|
||||
cubox_enabled=$100,
|
||||
cubox_api_link=$101,
|
||||
discord_enabled=$102,
|
||||
discord_webhook_link=$103,
|
||||
slack_enabled=$104,
|
||||
slack_webhook_link=$105,
|
||||
pushover_enabled=$106,
|
||||
pushover_user=$107,
|
||||
pushover_token=$108,
|
||||
pushover_device=$109,
|
||||
pushover_prefix=$110,
|
||||
rssbridge_token=$111
|
||||
googlereader_enabled=$21,
|
||||
googlereader_username=$22,
|
||||
googlereader_password=$23,
|
||||
telegram_bot_enabled=$24,
|
||||
telegram_bot_token=$25,
|
||||
telegram_bot_chat_id=$26,
|
||||
telegram_bot_topic_id=$27,
|
||||
telegram_bot_disable_web_page_preview=$28,
|
||||
telegram_bot_disable_notification=$29,
|
||||
telegram_bot_disable_buttons=$30,
|
||||
espial_enabled=$31,
|
||||
espial_url=$32,
|
||||
espial_api_key=$33,
|
||||
espial_tags=$34,
|
||||
linkace_enabled=$35,
|
||||
linkace_url=$36,
|
||||
linkace_api_key=$37,
|
||||
linkace_tags=$38,
|
||||
linkace_is_private=$39,
|
||||
linkace_check_disabled=$40,
|
||||
linkding_enabled=$41,
|
||||
linkding_url=$42,
|
||||
linkding_api_key=$43,
|
||||
linkding_tags=$44,
|
||||
linkding_mark_as_unread=$45,
|
||||
matrix_bot_enabled=$46,
|
||||
matrix_bot_user=$47,
|
||||
matrix_bot_password=$48,
|
||||
matrix_bot_url=$49,
|
||||
matrix_bot_chat_id=$50,
|
||||
notion_enabled=$51,
|
||||
notion_token=$52,
|
||||
notion_page_id=$53,
|
||||
readwise_enabled=$54,
|
||||
readwise_api_key=$55,
|
||||
apprise_enabled=$56,
|
||||
apprise_url=$57,
|
||||
apprise_services_url=$58,
|
||||
readeck_enabled=$59,
|
||||
readeck_url=$60,
|
||||
readeck_api_key=$61,
|
||||
readeck_labels=$62,
|
||||
readeck_only_url=$63,
|
||||
shiori_enabled=$64,
|
||||
shiori_url=$65,
|
||||
shiori_username=$66,
|
||||
shiori_password=$67,
|
||||
shaarli_enabled=$68,
|
||||
shaarli_url=$69,
|
||||
shaarli_api_secret=$70,
|
||||
webhook_enabled=$71,
|
||||
webhook_url=$72,
|
||||
webhook_secret=$73,
|
||||
rssbridge_enabled=$74,
|
||||
rssbridge_url=$75,
|
||||
omnivore_enabled=$76,
|
||||
omnivore_api_key=$77,
|
||||
omnivore_url=$78,
|
||||
linkwarden_enabled=$79,
|
||||
linkwarden_url=$80,
|
||||
linkwarden_api_key=$81,
|
||||
raindrop_enabled=$82,
|
||||
raindrop_token=$83,
|
||||
raindrop_collection_id=$84,
|
||||
raindrop_tags=$85,
|
||||
betula_enabled=$86,
|
||||
betula_url=$87,
|
||||
betula_token=$88,
|
||||
ntfy_enabled=$89,
|
||||
ntfy_topic=$90,
|
||||
ntfy_url=$91,
|
||||
ntfy_api_token=$92,
|
||||
ntfy_username=$93,
|
||||
ntfy_password=$94,
|
||||
ntfy_icon_url=$95,
|
||||
ntfy_internal_links=$96,
|
||||
cubox_enabled=$97,
|
||||
cubox_api_link=$98,
|
||||
discord_enabled=$99,
|
||||
discord_webhook_link=$100,
|
||||
slack_enabled=$101,
|
||||
slack_webhook_link=$102,
|
||||
pushover_enabled=$103,
|
||||
pushover_user=$104,
|
||||
pushover_token=$105,
|
||||
pushover_device=$106,
|
||||
pushover_prefix=$107,
|
||||
rssbridge_token=$108,
|
||||
karakeep_enabled=$109,
|
||||
karakeep_api_key=$110,
|
||||
karakeep_url=$111
|
||||
WHERE
|
||||
user_id=$112
|
||||
`
|
||||
@@ -493,9 +493,6 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
|
||||
integration.NunuxKeeperEnabled,
|
||||
integration.NunuxKeeperURL,
|
||||
integration.NunuxKeeperAPIKey,
|
||||
integration.PocketEnabled,
|
||||
integration.PocketAccessToken,
|
||||
integration.PocketConsumerKey,
|
||||
integration.GoogleReaderEnabled,
|
||||
integration.GoogleReaderUsername,
|
||||
integration.GoogleReaderPassword,
|
||||
@@ -584,6 +581,9 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
|
||||
integration.PushoverDevice,
|
||||
integration.PushoverPrefix,
|
||||
integration.RSSBridgeToken,
|
||||
integration.KarakeepEnabled,
|
||||
integration.KarakeepAPIKey,
|
||||
integration.KarakeepURL,
|
||||
integration.UserID,
|
||||
)
|
||||
|
||||
@@ -612,7 +612,6 @@ func (s *Storage) HasSaveEntry(userID int64) (result bool) {
|
||||
nunux_keeper_enabled='t' OR
|
||||
espial_enabled='t' OR
|
||||
readwise_enabled='t' OR
|
||||
pocket_enabled='t' OR
|
||||
linkace_enabled='t' OR
|
||||
linkding_enabled='t' OR
|
||||
linkwarden_enabled='t' OR
|
||||
@@ -622,6 +621,7 @@ func (s *Storage) HasSaveEntry(userID int64) (result bool) {
|
||||
shaarli_enabled='t' OR
|
||||
webhook_enabled='t' OR
|
||||
omnivore_enabled='t' OR
|
||||
karakeep_enabled='t' OR
|
||||
raindrop_enabled='t' OR
|
||||
betula_enabled='t' OR
|
||||
cubox_enabled='t' OR
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
package storage // import "miniflux.app/v2/internal/storage"
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"miniflux.app/v2/internal/crypto"
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
@@ -19,9 +19,9 @@ func (s *Storage) CreateAppSessionWithUserPrefs(userID int64) (*model.Session, e
|
||||
}
|
||||
|
||||
session := model.Session{
|
||||
ID: crypto.GenerateRandomString(32),
|
||||
ID: rand.Text(),
|
||||
Data: &model.SessionData{
|
||||
CSRF: crypto.GenerateRandomString(64),
|
||||
CSRF: rand.Text(),
|
||||
Theme: user.Theme,
|
||||
Language: user.Language,
|
||||
},
|
||||
@@ -33,9 +33,9 @@ func (s *Storage) CreateAppSessionWithUserPrefs(userID int64) (*model.Session, e
|
||||
// CreateAppSession creates a new application session.
|
||||
func (s *Storage) CreateAppSession() (*model.Session, error) {
|
||||
session := model.Session{
|
||||
ID: crypto.GenerateRandomString(32),
|
||||
ID: rand.Text(),
|
||||
Data: &model.SessionData{
|
||||
CSRF: crypto.GenerateRandomString(64),
|
||||
CSRF: rand.Text(),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
+23
-10
@@ -97,7 +97,8 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
|
||||
media_playback_rate,
|
||||
block_filter_entry_rules,
|
||||
keep_filter_entry_rules,
|
||||
always_open_external_links
|
||||
always_open_external_links,
|
||||
open_external_links_in_new_tab
|
||||
`
|
||||
|
||||
tx, err := s.db.Begin()
|
||||
@@ -142,6 +143,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
|
||||
&user.BlockFilterEntryRules,
|
||||
&user.KeepFilterEntryRules,
|
||||
&user.AlwaysOpenExternalLinks,
|
||||
&user.OpenExternalLinksInNewTab,
|
||||
)
|
||||
if err != nil {
|
||||
tx.Rollback()
|
||||
@@ -207,9 +209,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
||||
media_playback_rate=$26,
|
||||
block_filter_entry_rules=$27,
|
||||
keep_filter_entry_rules=$28,
|
||||
always_open_external_links=$29
|
||||
always_open_external_links=$29,
|
||||
open_external_links_in_new_tab=$30
|
||||
WHERE
|
||||
id=$30
|
||||
id=$31
|
||||
`
|
||||
|
||||
_, err = s.db.Exec(
|
||||
@@ -243,6 +246,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
||||
user.BlockFilterEntryRules,
|
||||
user.KeepFilterEntryRules,
|
||||
user.AlwaysOpenExternalLinks,
|
||||
user.OpenExternalLinksInNewTab,
|
||||
user.ID,
|
||||
)
|
||||
if err != nil {
|
||||
@@ -278,9 +282,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
||||
media_playback_rate=$25,
|
||||
block_filter_entry_rules=$26,
|
||||
keep_filter_entry_rules=$27,
|
||||
always_open_external_links=$28
|
||||
always_open_external_links=$28,
|
||||
open_external_links_in_new_tab=$29
|
||||
WHERE
|
||||
id=$29
|
||||
id=$30
|
||||
`
|
||||
|
||||
_, err := s.db.Exec(
|
||||
@@ -313,6 +318,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
||||
user.BlockFilterEntryRules,
|
||||
user.KeepFilterEntryRules,
|
||||
user.AlwaysOpenExternalLinks,
|
||||
user.OpenExternalLinksInNewTab,
|
||||
user.ID,
|
||||
)
|
||||
|
||||
@@ -367,7 +373,8 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
|
||||
media_playback_rate,
|
||||
block_filter_entry_rules,
|
||||
keep_filter_entry_rules,
|
||||
always_open_external_links
|
||||
always_open_external_links,
|
||||
open_external_links_in_new_tab
|
||||
FROM
|
||||
users
|
||||
WHERE
|
||||
@@ -409,7 +416,8 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
|
||||
media_playback_rate,
|
||||
block_filter_entry_rules,
|
||||
keep_filter_entry_rules,
|
||||
always_open_external_links
|
||||
always_open_external_links,
|
||||
open_external_links_in_new_tab
|
||||
FROM
|
||||
users
|
||||
WHERE
|
||||
@@ -451,7 +459,8 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
|
||||
media_playback_rate,
|
||||
block_filter_entry_rules,
|
||||
keep_filter_entry_rules,
|
||||
always_open_external_links
|
||||
always_open_external_links,
|
||||
open_external_links_in_new_tab
|
||||
FROM
|
||||
users
|
||||
WHERE
|
||||
@@ -500,7 +509,8 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) {
|
||||
media_playback_rate,
|
||||
u.block_filter_entry_rules,
|
||||
u.keep_filter_entry_rules,
|
||||
u.always_open_external_links
|
||||
u.always_open_external_links,
|
||||
u.open_external_links_in_new_tab
|
||||
FROM
|
||||
users u
|
||||
LEFT JOIN
|
||||
@@ -544,6 +554,7 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
|
||||
&user.BlockFilterEntryRules,
|
||||
&user.KeepFilterEntryRules,
|
||||
&user.AlwaysOpenExternalLinks,
|
||||
&user.OpenExternalLinksInNewTab,
|
||||
)
|
||||
|
||||
if err == sql.ErrNoRows {
|
||||
@@ -658,7 +669,8 @@ func (s *Storage) Users() (model.Users, error) {
|
||||
media_playback_rate,
|
||||
block_filter_entry_rules,
|
||||
keep_filter_entry_rules,
|
||||
always_open_external_links
|
||||
always_open_external_links,
|
||||
open_external_links_in_new_tab
|
||||
FROM
|
||||
users
|
||||
ORDER BY username ASC
|
||||
@@ -703,6 +715,7 @@ func (s *Storage) Users() (model.Users, error) {
|
||||
&user.BlockFilterEntryRules,
|
||||
&user.KeepFilterEntryRules,
|
||||
&user.AlwaysOpenExternalLinks,
|
||||
&user.OpenExternalLinksInNewTab,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
package storage // import "miniflux.app/v2/internal/storage"
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"miniflux.app/v2/internal/crypto"
|
||||
"miniflux.app/v2/internal/model"
|
||||
)
|
||||
|
||||
@@ -56,7 +56,7 @@ func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
|
||||
|
||||
// CreateUserSessionFromUsername creates a new user session.
|
||||
func (s *Storage) CreateUserSessionFromUsername(username, userAgent, ip string) (sessionID string, userID int64, err error) {
|
||||
token := crypto.GenerateRandomString(64)
|
||||
token := rand.Text()
|
||||
|
||||
tx, err := s.db.Begin()
|
||||
if err != nil {
|
||||
|
||||
@@ -100,8 +100,11 @@ func (f *funcMap) Map() template.FuncMap {
|
||||
"deRef": func(i *int) int { return *i },
|
||||
"duration": duration,
|
||||
"urlEncode": url.PathEscape,
|
||||
"subtract": func(a, b int) int {
|
||||
return a - b
|
||||
},
|
||||
|
||||
// These functions are overrode at runtime after the parsing.
|
||||
// These functions are overridden at runtime after parsing.
|
||||
"elapsed": func(timezone string, t time.Time) string {
|
||||
return ""
|
||||
},
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<div class="item-meta">
|
||||
<ul class="item-meta-info">
|
||||
<li class="item-meta-info-site-url" dir="auto">
|
||||
<a href="{{ .SiteURL | safeURL }}" title="{{ .SiteURL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="{{ $.user.MarkReadOnView }}">{{ domain .SiteURL }}</a>
|
||||
<a href="{{ .SiteURL | safeURL }}" title="{{ .SiteURL }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }} rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="{{ $.user.MarkReadOnView }}">{{ domain .SiteURL }}</a>
|
||||
</li>
|
||||
<li class="item-meta-info-checked-at">
|
||||
{{ t "page.feeds.last_check" }} <time datetime="{{ isodate .CheckedAt }}" title="{{ isodate .CheckedAt }}">{{ elapsed $.user.Timezone .CheckedAt }}</time>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user