From 168a870c025bfef6efdeb46e166e79a16093c157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Thu, 10 Aug 2023 19:46:45 -0700 Subject: [PATCH] Move internal packages to an internal folder For reference: https://go.dev/doc/go1.4#internalpackages --- Makefile | 4 +-- client/README.md | 4 +-- {api => internal/api}/api.go | 6 ++-- {api => internal/api}/category.go | 10 +++--- {api => internal/api}/entry.go | 22 ++++++------ {api => internal/api}/feed.go | 12 +++---- {api => internal/api}/icon.go | 6 ++-- {api => internal/api}/middleware.go | 10 +++--- {api => internal/api}/opml.go | 10 +++--- {api => internal/api}/payload.go | 4 +-- {api => internal/api}/subscription.go | 10 +++--- {api => internal/api}/user.go | 10 +++--- {cli => internal/cli}/ask_credentials.go | 2 +- {cli => internal/cli}/cleanup_tasks.go | 12 +++---- {cli => internal/cli}/cli.go | 16 ++++----- {cli => internal/cli}/create_admin.go | 12 +++---- {cli => internal/cli}/daemon.go | 16 ++++----- {cli => internal/cli}/flush_sessions.go | 4 +-- {cli => internal/cli}/health_check.go | 6 ++-- {cli => internal/cli}/info.go | 4 +-- {cli => internal/cli}/refresh_feeds.go | 12 +++---- {cli => internal/cli}/reset_password.go | 8 ++--- {cli => internal/cli}/scheduler.go | 10 +++--- {config => internal/config}/config.go | 2 +- {config => internal/config}/config_test.go | 2 +- {config => internal/config}/options.go | 4 +-- {config => internal/config}/parser.go | 2 +- {config => internal/config}/parser_test.go | 2 +- {crypto => internal/crypto}/crypto.go | 2 +- {database => internal/database}/database.go | 2 +- {database => internal/database}/migrations.go | 2 +- {errors => internal/errors}/errors.go | 4 +-- {fever => internal/fever}/handler.go | 16 ++++----- {fever => internal/fever}/middleware.go | 10 +++--- {fever => internal/fever}/response.go | 2 +- .../googlereader}/handler.go | 28 +++++++-------- .../googlereader}/middleware.go | 14 ++++---- .../googlereader}/response.go | 6 ++-- {http => internal/http}/client/client.go | 10 +++--- {http => internal/http}/client/client_test.go | 2 +- {http => internal/http}/client/response.go | 2 +- .../http}/client/response_test.go | 2 +- .../http}/client/testdata/HTTP-charset.html | 0 .../client/testdata/HTTP-vs-UTF-8-BOM.html | 0 .../client/testdata/HTTP-vs-meta-charset.html | 0 .../client/testdata/HTTP-vs-meta-content.html | 0 .../testdata/No-encoding-declaration.html | 0 .../http}/client/testdata/README | 0 .../http}/client/testdata/UTF-16BE-BOM.html | Bin .../http}/client/testdata/UTF-16LE-BOM.html | Bin .../testdata/UTF-8-BOM-vs-meta-charset.html | 0 .../testdata/UTF-8-BOM-vs-meta-content.html | 0 .../charset-content-type-xml-iso88591.xml | 0 .../testdata/content-type-only-win-8859-1.xml | 0 .../http}/client/testdata/gb2312.html | 0 .../testdata/meta-charset-attribute.html | 0 .../testdata/meta-content-attribute.html | 0 .../http}/client/testdata/rdf_utf8.xml | 0 .../testdata/single_quote_xml_encoding.xml | 0 .../http}/client/testdata/smallfile.xml | 0 .../http}/client/testdata/urdu.xml | 0 .../http}/client/testdata/windows_1251.html | 0 .../http}/client/testdata/windows_1251.xml | 0 {http => internal/http}/cookie/cookie.go | 2 +- {http => internal/http}/request/client_ip.go | 2 +- .../http}/request/client_ip_test.go | 2 +- {http => internal/http}/request/context.go | 2 +- .../http}/request/context_test.go | 2 +- {http => internal/http}/request/cookie.go | 2 +- .../http}/request/cookie_test.go | 2 +- {http => internal/http}/request/params.go | 2 +- .../http}/request/params_test.go | 2 +- {http => internal/http}/response/builder.go | 4 +-- .../http}/response/builder_test.go | 2 +- {http => internal/http}/response/html/html.go | 6 ++-- .../http}/response/html/html_test.go | 2 +- {http => internal/http}/response/json/json.go | 6 ++-- .../http}/response/json/json_test.go | 2 +- {http => internal/http}/response/xml/xml.go | 4 +-- .../http}/response/xml/xml_test.go | 2 +- {http => internal/http}/route/route.go | 4 +-- {http => internal/http}/server/httpd.go | 22 ++++++------ {http => internal/http}/server/middleware.go | 8 ++--- .../integration}/apprise/apprise.go | 4 +-- .../integration}/apprise/wrapper.go | 0 .../integration}/espial/espial.go | 4 +-- .../integration}/instapaper/instapaper.go | 4 +-- .../integration}/integration.go | 32 +++++++++--------- .../integration}/linkding/linkding.go | 4 +-- .../integration}/matrixbot/matrixbot.go | 6 ++-- .../integration}/notion/notion.go | 2 +- .../integration}/notion/wrapper.go | 0 .../integration}/nunuxkeeper/nunuxkeeper.go | 4 +-- .../integration}/pinboard/pinboard.go | 4 +-- .../integration}/pocket/connector.go | 4 +-- .../integration}/pocket/pocket.go | 4 +-- .../integration}/readwise/readwise.go | 4 +-- .../integration}/telegrambot/telegrambot.go | 4 +-- .../integration}/wallabag/wallabag.go | 4 +-- {locale => internal/locale}/catalog.go | 2 +- {locale => internal/locale}/catalog_test.go | 2 +- {locale => internal/locale}/locale.go | 2 +- {locale => internal/locale}/locale_test.go | 2 +- {locale => internal/locale}/plural.go | 2 +- {locale => internal/locale}/plural_test.go | 2 +- {locale => internal/locale}/printer.go | 2 +- {locale => internal/locale}/printer_test.go | 2 +- .../locale}/translations/de_DE.json | 0 .../locale}/translations/el_EL.json | 0 .../locale}/translations/en_US.json | 0 .../locale}/translations/es_ES.json | 0 .../locale}/translations/fi_FI.json | 0 .../locale}/translations/fr_FR.json | 0 .../locale}/translations/hi_IN.json | 0 .../locale}/translations/id_ID.json | 0 .../locale}/translations/it_IT.json | 0 .../locale}/translations/ja_JP.json | 0 .../locale}/translations/nl_NL.json | 0 .../locale}/translations/pl_PL.json | 0 .../locale}/translations/pt_BR.json | 0 .../locale}/translations/ru_RU.json | 0 .../locale}/translations/tr_TR.json | 0 .../locale}/translations/uk_UA.json | 0 .../locale}/translations/zh_CN.json | 0 .../locale}/translations/zh_TW.json | 0 {logger => internal/logger}/logger.go | 2 +- {metric => internal/metric}/metric.go | 6 ++-- {model => internal/model}/api_key.go | 4 +-- {model => internal/model}/app_session.go | 2 +- .../model}/categories_sort_options.go | 2 +- {model => internal/model}/category.go | 2 +- {model => internal/model}/enclosure.go | 2 +- {model => internal/model}/enclosure_test.go | 0 {model => internal/model}/entry.go | 2 +- {model => internal/model}/feed.go | 6 ++-- {model => internal/model}/feed_test.go | 6 ++-- {model => internal/model}/home_page.go | 2 +- {model => internal/model}/icon.go | 2 +- {model => internal/model}/integration.go | 2 +- {model => internal/model}/job.go | 2 +- {model => internal/model}/model.go | 2 +- {model => internal/model}/subscription.go | 2 +- {model => internal/model}/theme.go | 2 +- {model => internal/model}/user.go | 4 +-- {model => internal/model}/user_session.go | 4 +-- {oauth2 => internal/oauth2}/google.go | 4 +-- {oauth2 => internal/oauth2}/manager.go | 4 +-- {oauth2 => internal/oauth2}/oidc.go | 4 +-- {oauth2 => internal/oauth2}/profile.go | 2 +- {oauth2 => internal/oauth2}/provider.go | 4 +-- {proxy => internal/proxy}/media_proxy.go | 8 ++--- {proxy => internal/proxy}/media_proxy_test.go | 4 +-- {proxy => internal/proxy}/proxy.go | 6 ++-- {reader => internal/reader}/atom/atom_03.go | 14 ++++---- .../reader}/atom/atom_03_test.go | 2 +- {reader => internal/reader}/atom/atom_10.go | 16 ++++----- .../reader}/atom/atom_10_test.go | 2 +- .../reader}/atom/atom_common.go | 2 +- {reader => internal/reader}/atom/parser.go | 8 ++--- .../reader}/atom/parser_test.go | 2 +- .../reader}/browser/browser.go | 6 ++-- {reader => internal/reader}/date/parser.go | 2 +- .../reader}/date/parser_test.go | 2 +- .../reader}/encoding/encoding.go | 2 +- .../reader}/handler/handler.go | 26 +++++++------- {reader => internal/reader}/icon/finder.go | 14 ++++---- .../reader}/icon/finder_test.go | 2 +- {reader => internal/reader}/json/json.go | 14 ++++---- {reader => internal/reader}/json/parser.go | 6 ++-- .../reader}/json/parser_test.go | 2 +- {reader => internal/reader}/media/media.go | 2 +- .../reader}/media/media_test.go | 2 +- {reader => internal/reader}/opml/handler.go | 8 ++--- {reader => internal/reader}/opml/opml.go | 2 +- {reader => internal/reader}/opml/parser.go | 6 ++-- .../reader}/opml/parser_test.go | 2 +- .../reader}/opml/serializer.go | 4 +-- .../reader}/opml/serializer_test.go | 2 +- .../reader}/opml/subscription.go | 2 +- {reader => internal/reader}/parser/format.go | 4 +-- .../reader}/parser/format_test.go | 2 +- {reader => internal/reader}/parser/parser.go | 14 ++++---- .../reader}/parser/parser_test.go | 4 +-- .../parser/testdata/encoding_ISO-8859-1.xml | 0 .../parser/testdata/encoding_WINDOWS-1251.xml | 0 .../testdata/no_encoding_ISO-8859-1.xml | 0 .../reader}/parser/testdata/rdf_UTF8.xml | 0 .../reader}/parser/testdata/urdu_UTF8.xml | 0 .../reader}/processor/processor.go | 22 ++++++------ .../reader}/processor/processor_test.go | 4 +-- {reader => internal/reader}/rdf/dublincore.go | 2 +- {reader => internal/reader}/rdf/parser.go | 8 ++--- .../reader}/rdf/parser_test.go | 2 +- {reader => internal/reader}/rdf/rdf.go | 14 ++++---- .../reader}/readability/readability.go | 4 +-- .../reader}/rewrite/rewrite_functions.go | 4 +-- .../reader}/rewrite/rewriter.go | 8 ++--- .../reader}/rewrite/rewriter_test.go | 6 ++-- {reader => internal/reader}/rewrite/rules.go | 2 +- {reader => internal/reader}/rss/dublincore.go | 2 +- {reader => internal/reader}/rss/feedburner.go | 2 +- {reader => internal/reader}/rss/parser.go | 8 ++--- .../reader}/rss/parser_test.go | 2 +- {reader => internal/reader}/rss/podcast.go | 2 +- {reader => internal/reader}/rss/rss.go | 16 ++++----- .../reader}/sanitizer/sanitizer.go | 6 ++-- .../reader}/sanitizer/sanitizer_test.go | 4 +-- .../reader}/sanitizer/srcset.go | 0 .../reader}/sanitizer/srcset_test.go | 0 .../reader}/sanitizer/strip_tags.go | 2 +- .../reader}/sanitizer/strip_tags_test.go | 2 +- .../reader}/sanitizer/truncate.go | 0 .../reader}/sanitizer/truncate_test.go | 0 {reader => internal/reader}/scraper/rules.go | 2 +- .../reader}/scraper/scraper.go | 12 +++---- .../reader}/scraper/scraper_test.go | 2 +- .../reader}/scraper/testdata/iframe.html | 0 .../scraper/testdata/iframe.html-result | 0 .../reader}/scraper/testdata/img.html | 0 .../reader}/scraper/testdata/img.html-result | 0 .../reader}/scraper/testdata/p.html | 0 .../reader}/scraper/testdata/p.html-result | 0 .../reader}/subscription/finder.go | 14 ++++---- .../reader}/subscription/finder_test.go | 0 .../reader}/subscription/subscription.go | 2 +- {reader => internal/reader}/xml/decoder.go | 4 +-- .../reader}/xml/decoder_test.go | 2 +- {storage => internal/storage}/api_key.go | 4 +-- {storage => internal/storage}/category.go | 4 +-- .../storage}/certificate_cache.go | 2 +- {storage => internal/storage}/enclosure.go | 4 +-- {storage => internal/storage}/entry.go | 8 ++--- .../storage}/entry_pagination_builder.go | 6 ++-- .../storage}/entry_query_builder.go | 6 ++-- {storage => internal/storage}/feed.go | 8 ++--- .../storage}/feed_query_builder.go | 6 ++-- {storage => internal/storage}/icon.go | 4 +-- {storage => internal/storage}/integration.go | 4 +-- {storage => internal/storage}/job.go | 6 ++-- {storage => internal/storage}/session.go | 6 ++-- {storage => internal/storage}/storage.go | 2 +- {storage => internal/storage}/timezone.go | 2 +- {storage => internal/storage}/user.go | 8 ++--- {storage => internal/storage}/user_session.go | 6 ++-- {systemd => internal/systemd}/systemd.go | 2 +- {template => internal/template}/engine.go | 8 ++--- {template => internal/template}/functions.go | 18 +++++----- .../template}/functions_test.go | 4 +-- .../templates/common/entry_pagination.html | 0 .../template}/templates/common/feed_list.html | 0 .../template}/templates/common/feed_menu.html | 0 .../template}/templates/common/item_meta.html | 0 .../template}/templates/common/layout.html | 0 .../templates/common/pagination.html | 0 .../templates/common/settings_menu.html | 0 .../templates/standalone/offline.html | 0 .../template}/templates/views/about.html | 0 .../templates/views/add_subscription.html | 0 .../template}/templates/views/api_keys.html | 0 .../templates/views/bookmark_entries.html | 0 .../template}/templates/views/categories.html | 0 .../templates/views/category_entries.html | 0 .../templates/views/category_feeds.html | 0 .../templates/views/choose_subscription.html | 0 .../templates/views/create_api_key.html | 0 .../templates/views/create_category.html | 0 .../templates/views/create_user.html | 0 .../templates/views/edit_category.html | 0 .../template}/templates/views/edit_feed.html | 0 .../template}/templates/views/edit_user.html | 0 .../template}/templates/views/entry.html | 0 .../templates/views/feed_entries.html | 0 .../template}/templates/views/feeds.html | 0 .../templates/views/history_entries.html | 0 .../template}/templates/views/import.html | 0 .../templates/views/integrations.html | 0 .../template}/templates/views/login.html | 0 .../templates/views/search_entries.html | 0 .../template}/templates/views/sessions.html | 0 .../template}/templates/views/settings.html | 0 .../templates/views/shared_entries.html | 0 .../templates/views/unread_entries.html | 0 .../template}/templates/views/users.html | 0 {tests => internal/tests}/category_test.go | 0 {tests => internal/tests}/endpoint_test.go | 0 {tests => internal/tests}/entry_test.go | 0 {tests => internal/tests}/feed_test.go | 0 .../tests}/import_export_test.go | 0 .../tests}/subscription_test.go | 0 {tests => internal/tests}/tests.go | 2 -- {tests => internal/tests}/user_test.go | 0 {timer => internal/timer}/timer.go | 4 +-- {timezone => internal/timezone}/timezone.go | 2 +- .../timezone}/timezone_test.go | 2 +- {ui => internal/ui}/about.go | 14 ++++---- {ui => internal/ui}/api_key_create.go | 12 +++---- {ui => internal/ui}/api_key_list.go | 10 +++--- {ui => internal/ui}/api_key_remove.go | 10 +++--- {ui => internal/ui}/api_key_save.go | 18 +++++----- {ui => internal/ui}/bookmark_entries.go | 14 ++++---- {ui => internal/ui}/category_create.go | 10 +++--- {ui => internal/ui}/category_edit.go | 12 +++---- {ui => internal/ui}/category_entries.go | 14 ++++---- {ui => internal/ui}/category_entries_all.go | 14 ++++---- {ui => internal/ui}/category_feeds.go | 10 +++--- {ui => internal/ui}/category_list.go | 10 +++--- {ui => internal/ui}/category_mark_as_read.go | 8 ++--- {ui => internal/ui}/category_refresh.go | 8 ++--- {ui => internal/ui}/category_remove.go | 8 ++--- {ui => internal/ui}/category_save.go | 20 +++++------ {ui => internal/ui}/category_update.go | 20 +++++------ {ui => internal/ui}/entry_bookmark.go | 16 ++++----- {ui => internal/ui}/entry_category.go | 16 ++++----- .../ui}/entry_enclosure_save_position.go | 6 ++-- {ui => internal/ui}/entry_feed.go | 16 ++++----- {ui => internal/ui}/entry_read.go | 16 ++++----- {ui => internal/ui}/entry_save.go | 10 +++--- {ui => internal/ui}/entry_scraper.go | 16 ++++----- {ui => internal/ui}/entry_search.go | 16 ++++----- {ui => internal/ui}/entry_toggle_bookmark.go | 6 ++-- {ui => internal/ui}/entry_unread.go | 16 ++++----- {ui => internal/ui}/entry_update_status.go | 10 +++--- {ui => internal/ui}/feed_edit.go | 14 ++++---- {ui => internal/ui}/feed_entries.go | 14 ++++---- {ui => internal/ui}/feed_entries_all.go | 14 ++++---- {ui => internal/ui}/feed_icon.go | 8 ++--- {ui => internal/ui}/feed_list.go | 10 +++--- {ui => internal/ui}/feed_mark_as_read.go | 8 ++--- {ui => internal/ui}/feed_refresh.go | 12 +++---- {ui => internal/ui}/feed_remove.go | 8 ++--- {ui => internal/ui}/feed_update.go | 22 ++++++------ {ui => internal/ui}/form/api_key.go | 4 +-- {ui => internal/ui}/form/auth.go | 4 +-- {ui => internal/ui}/form/category.go | 2 +- {ui => internal/ui}/form/feed.go | 4 +-- {ui => internal/ui}/form/integration.go | 4 +-- {ui => internal/ui}/form/settings.go | 6 ++-- {ui => internal/ui}/form/settings_test.go | 2 +- {ui => internal/ui}/form/subscription.go | 6 ++-- {ui => internal/ui}/form/user.go | 6 ++-- {ui => internal/ui}/handler.go | 8 ++--- {ui => internal/ui}/history_entries.go | 14 ++++---- {ui => internal/ui}/history_flush.go | 6 ++-- {ui => internal/ui}/integration_pocket.go | 18 +++++----- {ui => internal/ui}/integration_show.go | 14 ++++---- {ui => internal/ui}/integration_update.go | 16 ++++----- {ui => internal/ui}/login_check.go | 20 +++++------ {ui => internal/ui}/login_show.go | 12 +++---- {ui => internal/ui}/logout.go | 16 ++++----- {ui => internal/ui}/middleware.go | 20 +++++------ {ui => internal/ui}/oauth2.go | 6 ++-- {ui => internal/ui}/oauth2_callback.go | 20 +++++------ {ui => internal/ui}/oauth2_redirect.go | 12 +++---- {ui => internal/ui}/oauth2_unlink.go | 14 ++++---- {ui => internal/ui}/offline.go | 10 +++--- {ui => internal/ui}/opml_export.go | 10 +++--- {ui => internal/ui}/opml_import.go | 10 +++--- {ui => internal/ui}/opml_upload.go | 20 +++++------ {ui => internal/ui}/pagination.go | 2 +- {ui => internal/ui}/proxy.go | 14 ++++---- {ui => internal/ui}/search_entries.go | 14 ++++---- {ui => internal/ui}/session/session.go | 6 ++-- {ui => internal/ui}/session_list.go | 10 +++--- {ui => internal/ui}/session_remove.go | 10 +++--- {ui => internal/ui}/settings_show.go | 16 ++++----- {ui => internal/ui}/settings_update.go | 22 ++++++------ {ui => internal/ui}/share.go | 16 ++++----- {ui => internal/ui}/shared_entries.go | 10 +++--- {ui => internal/ui}/static/bin/favicon-16.png | Bin {ui => internal/ui}/static/bin/favicon-32.png | Bin {ui => internal/ui}/static/bin/favicon.ico | Bin {ui => internal/ui}/static/bin/icon-120.png | Bin {ui => internal/ui}/static/bin/icon-128.png | Bin {ui => internal/ui}/static/bin/icon-152.png | Bin {ui => internal/ui}/static/bin/icon-167.png | Bin {ui => internal/ui}/static/bin/icon-180.png | Bin {ui => internal/ui}/static/bin/icon-192.png | Bin {ui => internal/ui}/static/bin/icon-512.png | Bin .../ui}/static/bin/maskable-icon-120.png | Bin .../ui}/static/bin/maskable-icon-192.png | Bin .../ui}/static/bin/maskable-icon-512.png | Bin {ui => internal/ui}/static/bin/sprite.svg | 0 {ui => internal/ui}/static/css/common.css | 0 {ui => internal/ui}/static/css/dark.css | 0 {ui => internal/ui}/static/css/light.css | 0 {ui => internal/ui}/static/css/sans_serif.css | 0 {ui => internal/ui}/static/css/serif.css | 0 {ui => internal/ui}/static/css/system.css | 0 {ui => internal/ui}/static/js/.jshintrc | 0 {ui => internal/ui}/static/js/app.js | 0 {ui => internal/ui}/static/js/bootstrap.js | 0 {ui => internal/ui}/static/js/dom_helper.js | 0 .../ui}/static/js/keyboard_handler.js | 0 .../ui}/static/js/modal_handler.js | 0 .../ui}/static/js/request_builder.js | 0 .../ui}/static/js/service_worker.js | 0 .../ui}/static/js/touch_handler.js | 0 {ui => internal/ui}/static/static.go | 2 +- {ui => internal/ui}/static_app_icon.go | 10 +++--- {ui => internal/ui}/static_favicon.go | 8 ++--- {ui => internal/ui}/static_javascript.go | 12 +++---- {ui => internal/ui}/static_manifest.go | 10 +++--- {ui => internal/ui}/static_stylesheet.go | 10 +++--- {ui => internal/ui}/subscription_add.go | 14 ++++---- .../ui}/subscription_bookmarklet.go | 14 ++++---- {ui => internal/ui}/subscription_choose.go | 20 +++++------ {ui => internal/ui}/subscription_submit.go | 24 ++++++------- {ui => internal/ui}/ui.go | 10 +++--- {ui => internal/ui}/unread_entries.go | 16 ++++----- {ui => internal/ui}/unread_mark_all_read.go | 6 ++-- {ui => internal/ui}/user_create.go | 12 +++---- {ui => internal/ui}/user_edit.go | 12 +++---- {ui => internal/ui}/user_list.go | 10 +++--- {ui => internal/ui}/user_remove.go | 8 ++--- {ui => internal/ui}/user_save.go | 20 +++++------ {ui => internal/ui}/user_update.go | 16 ++++----- {ui => internal/ui}/view/view.go | 10 +++--- {url => internal/url}/url.go | 2 +- {url => internal/url}/url_test.go | 2 +- {validator => internal/validator}/category.go | 6 ++-- {validator => internal/validator}/entry.go | 4 +-- .../validator}/entry_test.go | 4 +-- {validator => internal/validator}/feed.go | 6 ++-- .../validator}/subscription.go | 4 +-- {validator => internal/validator}/user.go | 8 ++--- .../validator}/validator.go | 4 +-- .../validator}/validator_test.go | 2 +- {version => internal/version}/version.go | 2 +- {worker => internal/worker}/pool.go | 6 ++-- {worker => internal/worker}/worker.go | 14 ++++---- main.go | 2 +- packaging/docker/alpine/Dockerfile | 2 +- packaging/docker/distroless/Dockerfile | 2 +- 433 files changed, 1121 insertions(+), 1123 deletions(-) rename {api => internal/api}/api.go (96%) rename {api => internal/api}/category.go (94%) rename {api => internal/api}/entry.go (94%) rename {api => internal/api}/feed.go (94%) rename {api => internal/api}/icon.go (81%) rename {api => internal/api}/middleware.go (94%) rename {api => internal/api}/opml.go (76%) rename {api => internal/api}/payload.go (83%) rename {api => internal/api}/subscription.go (84%) rename {api => internal/api}/user.go (95%) rename {cli => internal/cli}/ask_credentials.go (93%) rename {cli => internal/cli}/cleanup_tasks.go (86%) rename {cli => internal/cli}/cli.go (94%) rename {cli => internal/cli}/create_admin.go (80%) rename {cli => internal/cli}/daemon.go (85%) rename {cli => internal/cli}/flush_sessions.go (79%) rename {cli => internal/cli}/health_check.go (85%) rename {cli => internal/cli}/info.go (83%) rename {cli => internal/cli}/refresh_feeds.go (83%) rename {cli => internal/cli}/reset_password.go (84%) rename {cli => internal/cli}/scheduler.go (83%) rename {config => internal/config}/config.go (75%) rename {config => internal/config}/config_test.go (99%) rename {config => internal/config}/options.go (99%) rename {config => internal/config}/parser.go (99%) rename {config => internal/config}/parser_test.go (96%) rename {crypto => internal/crypto}/crypto.go (95%) rename {database => internal/database}/database.go (97%) rename {database => internal/database}/migrations.go (99%) rename {errors => internal/errors}/errors.go (89%) rename {fever => internal/fever}/handler.go (97%) rename {fever => internal/fever}/middleware.go (87%) rename {fever => internal/fever}/response.go (97%) rename {googlereader => internal/googlereader}/handler.go (98%) rename {googlereader => internal/googlereader}/middleware.go (95%) rename {googlereader => internal/googlereader}/response.go (96%) rename {http => internal/http}/client/client.go (97%) rename {http => internal/http}/client/client_test.go (95%) rename {http => internal/http}/client/response.go (97%) rename {http => internal/http}/client/response_test.go (98%) rename {http => internal/http}/client/testdata/HTTP-charset.html (100%) rename {http => internal/http}/client/testdata/HTTP-vs-UTF-8-BOM.html (100%) rename {http => internal/http}/client/testdata/HTTP-vs-meta-charset.html (100%) rename {http => internal/http}/client/testdata/HTTP-vs-meta-content.html (100%) rename {http => internal/http}/client/testdata/No-encoding-declaration.html (100%) rename {http => internal/http}/client/testdata/README (100%) rename {http => internal/http}/client/testdata/UTF-16BE-BOM.html (100%) rename {http => internal/http}/client/testdata/UTF-16LE-BOM.html (100%) rename {http => internal/http}/client/testdata/UTF-8-BOM-vs-meta-charset.html (100%) rename {http => internal/http}/client/testdata/UTF-8-BOM-vs-meta-content.html (100%) rename {http => internal/http}/client/testdata/charset-content-type-xml-iso88591.xml (100%) rename {http => internal/http}/client/testdata/content-type-only-win-8859-1.xml (100%) rename {http => internal/http}/client/testdata/gb2312.html (100%) rename {http => internal/http}/client/testdata/meta-charset-attribute.html (100%) rename {http => internal/http}/client/testdata/meta-content-attribute.html (100%) rename {http => internal/http}/client/testdata/rdf_utf8.xml (100%) rename {http => internal/http}/client/testdata/single_quote_xml_encoding.xml (100%) rename {http => internal/http}/client/testdata/smallfile.xml (100%) rename {http => internal/http}/client/testdata/urdu.xml (100%) rename {http => internal/http}/client/testdata/windows_1251.html (100%) rename {http => internal/http}/client/testdata/windows_1251.xml (100%) rename {http => internal/http}/cookie/cookie.go (94%) rename {http => internal/http}/request/client_ip.go (94%) rename {http => internal/http}/request/client_ip_test.go (98%) rename {http => internal/http}/request/context.go (98%) rename {http => internal/http}/request/context_test.go (99%) rename {http => internal/http}/request/cookie.go (83%) rename {http => internal/http}/request/cookie_test.go (92%) rename {http => internal/http}/request/params.go (97%) rename {http => internal/http}/request/params_test.go (98%) rename {http => internal/http}/response/builder.go (97%) rename {http => internal/http}/response/builder_test.go (99%) rename {http => internal/http}/response/html/html.go (95%) rename {http => internal/http}/response/html/html_test.go (98%) rename {http => internal/http}/response/json/json.go (95%) rename {http => internal/http}/response/json/json_test.go (99%) rename {http => internal/http}/response/xml/xml.go (87%) rename {http => internal/http}/response/xml/xml_test.go (96%) rename {http => internal/http}/route/route.go (88%) rename {http => internal/http}/server/httpd.go (94%) rename {http => internal/http}/server/middleware.go (82%) rename {integration => internal/integration}/apprise/apprise.go (94%) rename {integration => internal/integration}/apprise/wrapper.go (100%) rename {integration => internal/integration}/espial/espial.go (93%) rename {integration => internal/integration}/instapaper/instapaper.go (89%) rename {integration => internal/integration}/integration.go (87%) rename {integration => internal/integration}/linkding/linkding.go (94%) rename {integration => internal/integration}/matrixbot/matrixbot.go (89%) rename {integration => internal/integration}/notion/notion.go (96%) rename {integration => internal/integration}/notion/wrapper.go (100%) rename {integration => internal/integration}/nunuxkeeper/nunuxkeeper.go (93%) rename {integration => internal/integration}/pinboard/pinboard.go (90%) rename {integration => internal/integration}/pocket/connector.go (96%) rename {integration => internal/integration}/pocket/pocket.go (91%) rename {integration => internal/integration}/readwise/readwise.go (92%) rename {integration => internal/integration}/telegrambot/telegrambot.go (92%) rename {integration => internal/integration}/wallabag/wallabag.go (96%) rename {locale => internal/locale}/catalog.go (95%) rename {locale => internal/locale}/catalog_test.go (97%) rename {locale => internal/locale}/locale.go (92%) rename {locale => internal/locale}/locale_test.go (89%) rename {locale => internal/locale}/plural.go (96%) rename {locale => internal/locale}/plural_test.go (93%) rename {locale => internal/locale}/printer.go (95%) rename {locale => internal/locale}/printer_test.go (98%) rename {locale => internal/locale}/translations/de_DE.json (100%) rename {locale => internal/locale}/translations/el_EL.json (100%) rename {locale => internal/locale}/translations/en_US.json (100%) rename {locale => internal/locale}/translations/es_ES.json (100%) rename {locale => internal/locale}/translations/fi_FI.json (100%) rename {locale => internal/locale}/translations/fr_FR.json (100%) rename {locale => internal/locale}/translations/hi_IN.json (100%) rename {locale => internal/locale}/translations/id_ID.json (100%) rename {locale => internal/locale}/translations/it_IT.json (100%) rename {locale => internal/locale}/translations/ja_JP.json (100%) rename {locale => internal/locale}/translations/nl_NL.json (100%) rename {locale => internal/locale}/translations/pl_PL.json (100%) rename {locale => internal/locale}/translations/pt_BR.json (100%) rename {locale => internal/locale}/translations/ru_RU.json (100%) rename {locale => internal/locale}/translations/tr_TR.json (100%) rename {locale => internal/locale}/translations/uk_UA.json (100%) rename {locale => internal/locale}/translations/zh_CN.json (100%) rename {locale => internal/locale}/translations/zh_TW.json (100%) rename {logger => internal/logger}/logger.go (97%) rename {metric => internal/metric}/metric.go (97%) rename {model => internal/model}/api_key.go (87%) rename {model => internal/model}/app_session.go (96%) rename {model => internal/model}/categories_sort_options.go (84%) rename {model => internal/model}/category.go (94%) rename {model => internal/model}/enclosure.go (95%) rename {model => internal/model}/enclosure_test.go (100%) rename {model => internal/model}/entry.go (96%) rename {model => internal/model}/feed.go (98%) rename {model => internal/model}/feed_test.go (96%) rename {model => internal/model}/home_page.go (87%) rename {model => internal/model}/icon.go (92%) rename {model => internal/model}/integration.go (96%) rename {model => internal/model}/job.go (83%) rename {model => internal/model}/model.go (90%) rename {model => internal/model}/subscription.go (91%) rename {model => internal/model}/theme.go (94%) rename {model => internal/model}/user.go (98%) rename {model => internal/model}/user_session.go (90%) rename {oauth2 => internal/oauth2}/google.go (95%) rename {oauth2 => internal/oauth2}/manager.go (92%) rename {oauth2 => internal/oauth2}/oidc.go (95%) rename {oauth2 => internal/oauth2}/profile.go (86%) rename {oauth2 => internal/oauth2}/provider.go (85%) rename {proxy => internal/proxy}/media_proxy.go (95%) rename {proxy => internal/proxy}/media_proxy_test.go (99%) rename {proxy => internal/proxy}/proxy.go (93%) rename {reader => internal/reader}/atom/atom_03.go (92%) rename {reader => internal/reader}/atom/atom_03_test.go (99%) rename {reader => internal/reader}/atom/atom_10.go (95%) rename {reader => internal/reader}/atom/atom_10_test.go (99%) rename {reader => internal/reader}/atom/atom_common.go (96%) rename {reader => internal/reader}/atom/parser.go (86%) rename {reader => internal/reader}/atom/parser_test.go (96%) rename {reader => internal/reader}/browser/browser.go (91%) rename {reader => internal/reader}/date/parser.go (99%) rename {reader => internal/reader}/date/parser_test.go (99%) rename {reader => internal/reader}/encoding/encoding.go (94%) rename {reader => internal/reader}/handler/handler.go (93%) rename {reader => internal/reader}/icon/finder.go (94%) rename {reader => internal/reader}/icon/finder_test.go (98%) rename {reader => internal/reader}/json/json.go (93%) rename {reader => internal/reader}/json/parser.go (80%) rename {reader => internal/reader}/json/parser_test.go (99%) rename {reader => internal/reader}/media/media.go (98%) rename {reader => internal/reader}/media/media_test.go (97%) rename {reader => internal/reader}/opml/handler.go (92%) rename {reader => internal/reader}/opml/opml.go (96%) rename {reader => internal/reader}/opml/parser.go (89%) rename {reader => internal/reader}/opml/parser_test.go (99%) rename {reader => internal/reader}/opml/serializer.go (94%) rename {reader => internal/reader}/opml/serializer_test.go (97%) rename {reader => internal/reader}/opml/subscription.go (91%) rename {reader => internal/reader}/parser/format.go (88%) rename {reader => internal/reader}/parser/format_test.go (97%) rename {reader => internal/reader}/parser/parser.go (70%) rename {reader => internal/reader}/parser/parser_test.go (98%) rename {reader => internal/reader}/parser/testdata/encoding_ISO-8859-1.xml (100%) rename {reader => internal/reader}/parser/testdata/encoding_WINDOWS-1251.xml (100%) rename {reader => internal/reader}/parser/testdata/no_encoding_ISO-8859-1.xml (100%) rename {reader => internal/reader}/parser/testdata/rdf_UTF8.xml (100%) rename {reader => internal/reader}/parser/testdata/urdu_UTF8.xml (100%) rename {reader => internal/reader}/processor/processor.go (95%) rename {reader => internal/reader}/processor/processor_test.go (95%) rename {reader => internal/reader}/rdf/dublincore.go (91%) rename {reader => internal/reader}/rdf/parser.go (74%) rename {reader => internal/reader}/rdf/parser_test.go (99%) rename {reader => internal/reader}/rdf/rdf.go (89%) rename {reader => internal/reader}/readability/readability.go (98%) rename {reader => internal/reader}/rewrite/rewrite_functions.go (98%) rename {reader => internal/reader}/rewrite/rewriter.go (95%) rename {reader => internal/reader}/rewrite/rewriter_test.go (99%) rename {reader => internal/reader}/rewrite/rules.go (96%) rename {reader => internal/reader}/rss/dublincore.go (88%) rename {reader => internal/reader}/rss/feedburner.go (87%) rename {reader => internal/reader}/rss/parser.go (74%) rename {reader => internal/reader}/rss/parser_test.go (99%) rename {reader => internal/reader}/rss/podcast.go (97%) rename {reader => internal/reader}/rss/rss.go (96%) rename {reader => internal/reader}/sanitizer/sanitizer.go (98%) rename {reader => internal/reader}/sanitizer/sanitizer_test.go (99%) rename {reader => internal/reader}/sanitizer/srcset.go (100%) rename {reader => internal/reader}/sanitizer/srcset_test.go (100%) rename {reader => internal/reader}/sanitizer/strip_tags.go (89%) rename {reader => internal/reader}/sanitizer/strip_tags_test.go (86%) rename {reader => internal/reader}/sanitizer/truncate.go (100%) rename {reader => internal/reader}/sanitizer/truncate_test.go (100%) rename {reader => internal/reader}/scraper/rules.go (97%) rename {reader => internal/reader}/scraper/scraper.go (90%) rename {reader => internal/reader}/scraper/scraper_test.go (97%) rename {reader => internal/reader}/scraper/testdata/iframe.html (100%) rename {reader => internal/reader}/scraper/testdata/iframe.html-result (100%) rename {reader => internal/reader}/scraper/testdata/img.html (100%) rename {reader => internal/reader}/scraper/testdata/img.html-result (100%) rename {reader => internal/reader}/scraper/testdata/p.html (100%) rename {reader => internal/reader}/scraper/testdata/p.html-result (100%) rename {reader => internal/reader}/subscription/finder.go (94%) rename {reader => internal/reader}/subscription/finder_test.go (100%) rename {reader => internal/reader}/subscription/subscription.go (86%) rename {reader => internal/reader}/xml/decoder.go (95%) rename {reader => internal/reader}/xml/decoder_test.go (97%) rename {storage => internal/storage}/api_key.go (96%) rename {storage => internal/storage}/category.go (98%) rename {storage => internal/storage}/certificate_cache.go (96%) rename {storage => internal/storage}/enclosure.go (97%) rename {storage => internal/storage}/entry.go (98%) rename {storage => internal/storage}/entry_pagination_builder.go (97%) rename {storage => internal/storage}/entry_query_builder.go (98%) rename {storage => internal/storage}/feed.go (98%) rename {storage => internal/storage}/feed_query_builder.go (98%) rename {storage => internal/storage}/icon.go (97%) rename {storage => internal/storage}/integration.go (99%) rename {storage => internal/storage}/job.go (94%) rename {storage => internal/storage}/session.go (95%) rename {storage => internal/storage}/storage.go (94%) rename {storage => internal/storage}/timezone.go (93%) rename {storage => internal/storage}/user.go (98%) rename {storage => internal/storage}/user_session.go (96%) rename {systemd => internal/systemd}/systemd.go (96%) rename {template => internal/template}/engine.go (95%) rename {template => internal/template}/functions.go (93%) rename {template => internal/template}/functions_test.go (97%) rename {template => internal/template}/templates/common/entry_pagination.html (100%) rename {template => internal/template}/templates/common/feed_list.html (100%) rename {template => internal/template}/templates/common/feed_menu.html (100%) rename {template => internal/template}/templates/common/item_meta.html (100%) rename {template => internal/template}/templates/common/layout.html (100%) rename {template => internal/template}/templates/common/pagination.html (100%) rename {template => internal/template}/templates/common/settings_menu.html (100%) rename {template => internal/template}/templates/standalone/offline.html (100%) rename {template => internal/template}/templates/views/about.html (100%) rename {template => internal/template}/templates/views/add_subscription.html (100%) rename {template => internal/template}/templates/views/api_keys.html (100%) rename {template => internal/template}/templates/views/bookmark_entries.html (100%) rename {template => internal/template}/templates/views/categories.html (100%) rename {template => internal/template}/templates/views/category_entries.html (100%) rename {template => internal/template}/templates/views/category_feeds.html (100%) rename {template => internal/template}/templates/views/choose_subscription.html (100%) rename {template => internal/template}/templates/views/create_api_key.html (100%) rename {template => internal/template}/templates/views/create_category.html (100%) rename {template => internal/template}/templates/views/create_user.html (100%) rename {template => internal/template}/templates/views/edit_category.html (100%) rename {template => internal/template}/templates/views/edit_feed.html (100%) rename {template => internal/template}/templates/views/edit_user.html (100%) rename {template => internal/template}/templates/views/entry.html (100%) rename {template => internal/template}/templates/views/feed_entries.html (100%) rename {template => internal/template}/templates/views/feeds.html (100%) rename {template => internal/template}/templates/views/history_entries.html (100%) rename {template => internal/template}/templates/views/import.html (100%) rename {template => internal/template}/templates/views/integrations.html (100%) rename {template => internal/template}/templates/views/login.html (100%) rename {template => internal/template}/templates/views/search_entries.html (100%) rename {template => internal/template}/templates/views/sessions.html (100%) rename {template => internal/template}/templates/views/settings.html (100%) rename {template => internal/template}/templates/views/shared_entries.html (100%) rename {template => internal/template}/templates/views/unread_entries.html (100%) rename {template => internal/template}/templates/views/users.html (100%) rename {tests => internal/tests}/category_test.go (100%) rename {tests => internal/tests}/endpoint_test.go (100%) rename {tests => internal/tests}/entry_test.go (100%) rename {tests => internal/tests}/feed_test.go (100%) rename {tests => internal/tests}/import_export_test.go (100%) rename {tests => internal/tests}/subscription_test.go (100%) rename {tests => internal/tests}/tests.go (97%) rename {tests => internal/tests}/user_test.go (100%) rename {timer => internal/timer}/timer.go (78%) rename {timezone => internal/timezone}/timezone.go (94%) rename {timezone => internal/timezone}/timezone_test.go (97%) rename {ui => internal/ui}/about.go (76%) rename {ui => internal/ui}/api_key_create.go (73%) rename {ui => internal/ui}/api_key_list.go (78%) rename {ui => internal/ui}/api_key_remove.go (67%) rename {ui => internal/ui}/api_key_save.go (78%) rename {ui => internal/ui}/bookmark_entries.go (82%) rename {ui => internal/ui}/category_create.go (75%) rename {ui => internal/ui}/category_edit.go (81%) rename {ui => internal/ui}/category_entries.go (85%) rename {ui => internal/ui}/category_entries_all.go (85%) rename {ui => internal/ui}/category_feeds.go (83%) rename {ui => internal/ui}/category_list.go (79%) rename {ui => internal/ui}/category_mark_as_read.go (79%) rename {ui => internal/ui}/category_refresh.go (84%) rename {ui => internal/ui}/category_remove.go (80%) rename {ui => internal/ui}/category_save.go (76%) rename {ui => internal/ui}/category_update.go (81%) rename {ui => internal/ui}/entry_bookmark.go (86%) rename {ui => internal/ui}/entry_category.go (87%) rename {ui => internal/ui}/entry_enclosure_save_position.go (88%) rename {ui => internal/ui}/entry_feed.go (86%) rename {ui => internal/ui}/entry_read.go (84%) rename {ui => internal/ui}/entry_save.go (78%) rename {ui => internal/ui}/entry_scraper.go (81%) rename {ui => internal/ui}/entry_search.go (87%) rename {ui => internal/ui}/entry_toggle_bookmark.go (74%) rename {ui => internal/ui}/entry_unread.go (88%) rename {ui => internal/ui}/entry_update_status.go (79%) rename {ui => internal/ui}/feed_edit.go (88%) rename {ui => internal/ui}/feed_entries.go (85%) rename {ui => internal/ui}/feed_entries_all.go (85%) rename {ui => internal/ui}/feed_icon.go (79%) rename {ui => internal/ui}/feed_list.go (79%) rename {ui => internal/ui}/feed_mark_as_read.go (78%) rename {ui => internal/ui}/feed_refresh.go (76%) rename {ui => internal/ui}/feed_remove.go (74%) rename {ui => internal/ui}/feed_update.go (83%) rename {ui => internal/ui}/form/api_key.go (86%) rename {ui => internal/ui}/form/auth.go (87%) rename {ui => internal/ui}/form/category.go (89%) rename {ui => internal/ui}/form/feed.go (97%) rename {ui => internal/ui}/form/integration.go (98%) rename {ui => internal/ui}/form/settings.go (97%) rename {ui => internal/ui}/form/settings_test.go (97%) rename {ui => internal/ui}/form/subscription.go (95%) rename {ui => internal/ui}/form/user.go (92%) rename {ui => internal/ui}/handler.go (63%) rename {ui => internal/ui}/history_entries.go (82%) rename {ui => internal/ui}/history_flush.go (71%) rename {ui => internal/ui}/integration_pocket.go (85%) rename {ui => internal/ui}/integration_show.go (92%) rename {ui => internal/ui}/integration_update.go (86%) rename {ui => internal/ui}/login_check.go (78%) rename {ui => internal/ui}/login_show.go (69%) rename {ui => internal/ui}/logout.go (69%) rename {ui => internal/ui}/middleware.go (93%) rename {ui => internal/ui}/oauth2.go (76%) rename {ui => internal/ui}/oauth2_callback.go (89%) rename {ui => internal/ui}/oauth2_redirect.go (74%) rename {ui => internal/ui}/oauth2_unlink.go (82%) rename {ui => internal/ui}/offline.go (61%) rename {ui => internal/ui}/opml_export.go (63%) rename {ui => internal/ui}/opml_import.go (75%) rename {ui => internal/ui}/opml_upload.go (85%) rename {ui => internal/ui}/pagination.go (94%) rename {ui => internal/ui}/proxy.go (92%) rename {ui => internal/ui}/search_entries.go (83%) rename {ui => internal/ui}/session/session.go (93%) rename {ui => internal/ui}/session_list.go (80%) rename {ui => internal/ui}/session_remove.go (68%) rename {ui => internal/ui}/settings_show.go (85%) rename {ui => internal/ui}/settings_update.go (86%) rename {ui => internal/ui}/share.go (82%) rename {ui => internal/ui}/shared_entries.go (83%) rename {ui => internal/ui}/static/bin/favicon-16.png (100%) rename {ui => internal/ui}/static/bin/favicon-32.png (100%) rename {ui => internal/ui}/static/bin/favicon.ico (100%) rename {ui => internal/ui}/static/bin/icon-120.png (100%) rename {ui => internal/ui}/static/bin/icon-128.png (100%) rename {ui => internal/ui}/static/bin/icon-152.png (100%) rename {ui => internal/ui}/static/bin/icon-167.png (100%) rename {ui => internal/ui}/static/bin/icon-180.png (100%) rename {ui => internal/ui}/static/bin/icon-192.png (100%) rename {ui => internal/ui}/static/bin/icon-512.png (100%) rename {ui => internal/ui}/static/bin/maskable-icon-120.png (100%) rename {ui => internal/ui}/static/bin/maskable-icon-192.png (100%) rename {ui => internal/ui}/static/bin/maskable-icon-512.png (100%) rename {ui => internal/ui}/static/bin/sprite.svg (100%) rename {ui => internal/ui}/static/css/common.css (100%) rename {ui => internal/ui}/static/css/dark.css (100%) rename {ui => internal/ui}/static/css/light.css (100%) rename {ui => internal/ui}/static/css/sans_serif.css (100%) rename {ui => internal/ui}/static/css/serif.css (100%) rename {ui => internal/ui}/static/css/system.css (100%) rename {ui => internal/ui}/static/js/.jshintrc (100%) rename {ui => internal/ui}/static/js/app.js (100%) rename {ui => internal/ui}/static/js/bootstrap.js (100%) rename {ui => internal/ui}/static/js/dom_helper.js (100%) rename {ui => internal/ui}/static/js/keyboard_handler.js (100%) rename {ui => internal/ui}/static/js/modal_handler.js (100%) rename {ui => internal/ui}/static/js/request_builder.js (100%) rename {ui => internal/ui}/static/js/service_worker.js (100%) rename {ui => internal/ui}/static/js/touch_handler.js (100%) rename {ui => internal/ui}/static/static.go (98%) rename {ui => internal/ui}/static_app_icon.go (78%) rename {ui => internal/ui}/static_favicon.go (78%) rename {ui => internal/ui}/static_javascript.go (75%) rename {ui => internal/ui}/static_manifest.go (93%) rename {ui => internal/ui}/static_stylesheet.go (72%) rename {ui => internal/ui}/subscription_add.go (77%) rename {ui => internal/ui}/subscription_bookmarklet.go (83%) rename {ui => internal/ui}/subscription_choose.go (84%) rename {ui => internal/ui}/subscription_submit.go (87%) rename {ui => internal/ui}/ui.go (98%) rename {ui => internal/ui}/unread_entries.go (87%) rename {ui => internal/ui}/unread_mark_all_read.go (72%) rename {ui => internal/ui}/user_create.go (74%) rename {ui => internal/ui}/user_edit.go (81%) rename {ui => internal/ui}/user_list.go (79%) rename {ui => internal/ui}/user_remove.go (83%) rename {ui => internal/ui}/user_save.go (80%) rename {ui => internal/ui}/user_update.go (83%) rename {ui => internal/ui}/view/view.go (85%) rename {url => internal/url}/url.go (96%) rename {url => internal/url}/url_test.go (98%) rename {validator => internal/validator}/category.go (87%) rename {validator => internal/validator}/entry.go (92%) rename {validator => internal/validator}/entry_test.go (94%) rename {validator => internal/validator}/feed.go (94%) rename {validator => internal/validator}/subscription.go (79%) rename {validator => internal/validator}/user.go (96%) rename {validator => internal/validator}/validator.go (93%) rename {validator => internal/validator}/validator_test.go (95%) rename {version => internal/version}/version.go (79%) rename {worker => internal/worker}/pool.go (83%) rename {worker => internal/worker}/worker.go (76%) diff --git a/Makefile b/Makefile index 55d239c2..1a4f4536 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ DOCKER_IMAGE := miniflux/miniflux VERSION := $(shell git describe --tags --abbrev=0) COMMIT := $(shell git rev-parse --short HEAD) BUILD_DATE := `date +%FT%T%z` -LD_FLAGS := "-s -w -X 'miniflux.app/v2/version.Version=$(VERSION)' -X 'miniflux.app/v2/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/version.BuildDate=$(BUILD_DATE)'" +LD_FLAGS := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)' -X 'miniflux.app/v2/internal/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/internal/version.BuildDate=$(BUILD_DATE)'" PKG_LIST := $(shell go list ./... | grep -v /vendor/) DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable DEB_IMG_ARCH := amd64 @@ -122,7 +122,7 @@ integration-test: ./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid" while ! nc -z localhost 8080; do sleep 1; done - go test -v -tags=integration -count=1 miniflux.app/v2/tests + go test -v -tags=integration -count=1 miniflux.app/v2/internal/tests clean-integration-test: @ kill -9 `cat /tmp/miniflux.pid` diff --git a/client/README.md b/client/README.md index 80764407..a10dbffd 100644 --- a/client/README.md +++ b/client/README.md @@ -1,7 +1,7 @@ Miniflux API Client =================== -[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/client)](https://pkg.go.dev/miniflux.app/client) +[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/v2/client)](https://pkg.go.dev/miniflux.app/v2/client) Client library for Miniflux REST API. @@ -9,7 +9,7 @@ Installation ------------ ```bash -go get -u miniflux.app/client +go get -u miniflux.app/v2/client ``` Example diff --git a/api/api.go b/internal/api/api.go similarity index 96% rename from api/api.go rename to internal/api/api.go index ed1f17c6..1a53336c 100644 --- a/api/api.go +++ b/internal/api/api.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( "net/http" - "miniflux.app/v2/storage" - "miniflux.app/v2/worker" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/worker" "github.com/gorilla/mux" ) diff --git a/api/category.go b/internal/api/category.go similarity index 94% rename from api/category.go rename to internal/api/category.go index 381aef1e..a378b32f 100644 --- a/api/category.go +++ b/internal/api/category.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( json_parser "encoding/json" "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/model" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/validator" ) func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) { diff --git a/api/entry.go b/internal/api/entry.go similarity index 94% rename from api/entry.go rename to internal/api/entry.go index f6c37242..e06482a4 100644 --- a/api/entry.go +++ b/internal/api/entry.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( json_parser "encoding/json" @@ -11,16 +11,16 @@ import ( "strings" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/integration" - "miniflux.app/v2/model" - "miniflux.app/v2/proxy" - "miniflux.app/v2/reader/processor" - "miniflux.app/v2/storage" - "miniflux.app/v2/url" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/integration" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/proxy" + "miniflux.app/v2/internal/reader/processor" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/validator" ) func (h *handler) getEntryFromBuilder(w http.ResponseWriter, r *http.Request, b *storage.EntryQueryBuilder) { diff --git a/api/feed.go b/internal/api/feed.go similarity index 94% rename from api/feed.go rename to internal/api/feed.go index d89b3ecd..a6ddb77a 100644 --- a/api/feed.go +++ b/internal/api/feed.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( json_parser "encoding/json" "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/model" - feedHandler "miniflux.app/v2/reader/handler" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/model" + feedHandler "miniflux.app/v2/internal/reader/handler" + "miniflux.app/v2/internal/validator" ) func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) { diff --git a/api/icon.go b/internal/api/icon.go similarity index 81% rename from api/icon.go rename to internal/api/icon.go index 866386c9..11cbbfa6 100644 --- a/api/icon.go +++ b/internal/api/icon.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" ) func (h *handler) feedIcon(w http.ResponseWriter, r *http.Request) { diff --git a/api/middleware.go b/internal/api/middleware.go similarity index 94% rename from api/middleware.go rename to internal/api/middleware.go index 44bf12ae..73c96f5e 100644 --- a/api/middleware.go +++ b/internal/api/middleware.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( "context" "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" ) type middleware struct { diff --git a/api/opml.go b/internal/api/opml.go similarity index 76% rename from api/opml.go rename to internal/api/opml.go index db00e7fa..be1833d7 100644 --- a/api/opml.go +++ b/internal/api/opml.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/http/response/xml" - "miniflux.app/v2/reader/opml" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/http/response/xml" + "miniflux.app/v2/internal/reader/opml" ) func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) { diff --git a/api/payload.go b/internal/api/payload.go similarity index 83% rename from api/payload.go rename to internal/api/payload.go index 2df91bf4..499d6a9e 100644 --- a/api/payload.go +++ b/internal/api/payload.go @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) type feedIconResponse struct { diff --git a/api/subscription.go b/internal/api/subscription.go similarity index 84% rename from api/subscription.go rename to internal/api/subscription.go index a6148e95..315db6f2 100644 --- a/api/subscription.go +++ b/internal/api/subscription.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( json_parser "encoding/json" "net/http" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/subscription" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/subscription" + "miniflux.app/v2/internal/validator" ) func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) { diff --git a/api/user.go b/internal/api/user.go similarity index 95% rename from api/user.go rename to internal/api/user.go index 4d6b31fb..36d4b8e0 100644 --- a/api/user.go +++ b/internal/api/user.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package api // import "miniflux.app/v2/api" +package api // import "miniflux.app/v2/internal/api" import ( json_parser "encoding/json" "errors" "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/model" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/validator" ) func (h *handler) currentUser(w http.ResponseWriter, r *http.Request) { diff --git a/cli/ask_credentials.go b/internal/cli/ask_credentials.go similarity index 93% rename from cli/ask_credentials.go rename to internal/cli/ask_credentials.go index 3751cb9c..b8329274 100644 --- a/cli/ask_credentials.go +++ b/internal/cli/ask_credentials.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "bufio" diff --git a/cli/cleanup_tasks.go b/internal/cli/cleanup_tasks.go similarity index 86% rename from cli/cleanup_tasks.go rename to internal/cli/cleanup_tasks.go index d078030b..f7e791e7 100644 --- a/cli/cleanup_tasks.go +++ b/internal/cli/cleanup_tasks.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "time" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" - "miniflux.app/v2/metric" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/metric" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) func runCleanupTasks(store *storage.Storage) { diff --git a/cli/cli.go b/internal/cli/cli.go similarity index 94% rename from cli/cli.go rename to internal/cli/cli.go index 5d666d69..61fe226f 100644 --- a/cli/cli.go +++ b/internal/cli/cli.go @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "flag" "fmt" - "miniflux.app/v2/config" - "miniflux.app/v2/database" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/static" - "miniflux.app/v2/version" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/database" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/static" + "miniflux.app/v2/internal/version" ) const ( diff --git a/cli/create_admin.go b/internal/cli/create_admin.go similarity index 80% rename from cli/create_admin.go rename to internal/cli/create_admin.go index fd93da2d..dd79bb80 100644 --- a/cli/create_admin.go +++ b/internal/cli/create_admin.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "fmt" "os" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/validator" ) func createAdmin(store *storage.Storage) { diff --git a/cli/daemon.go b/internal/cli/daemon.go similarity index 85% rename from cli/daemon.go rename to internal/cli/daemon.go index 0e3c2a0d..378c4219 100644 --- a/cli/daemon.go +++ b/internal/cli/daemon.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "context" @@ -11,13 +11,13 @@ import ( "syscall" "time" - "miniflux.app/v2/config" - httpd "miniflux.app/v2/http/server" - "miniflux.app/v2/logger" - "miniflux.app/v2/metric" - "miniflux.app/v2/storage" - "miniflux.app/v2/systemd" - "miniflux.app/v2/worker" + "miniflux.app/v2/internal/config" + httpd "miniflux.app/v2/internal/http/server" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/metric" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/systemd" + "miniflux.app/v2/internal/worker" ) func startDaemon(store *storage.Storage) { diff --git a/cli/flush_sessions.go b/internal/cli/flush_sessions.go similarity index 79% rename from cli/flush_sessions.go rename to internal/cli/flush_sessions.go index 7472094b..bbf5c21c 100644 --- a/cli/flush_sessions.go +++ b/internal/cli/flush_sessions.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "fmt" "os" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/storage" ) func flushSessions(store *storage.Storage) { diff --git a/cli/health_check.go b/internal/cli/health_check.go similarity index 85% rename from cli/health_check.go rename to internal/cli/health_check.go index 0a727a0a..14b2c569 100644 --- a/cli/health_check.go +++ b/internal/cli/health_check.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "net/http" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" ) func doHealthCheck(healthCheckEndpoint string) { diff --git a/cli/info.go b/internal/cli/info.go similarity index 83% rename from cli/info.go rename to internal/cli/info.go index 3cb26599..414485b1 100644 --- a/cli/info.go +++ b/internal/cli/info.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "fmt" "runtime" - "miniflux.app/v2/version" + "miniflux.app/v2/internal/version" ) func info() { diff --git a/cli/refresh_feeds.go b/internal/cli/refresh_feeds.go similarity index 83% rename from cli/refresh_feeds.go rename to internal/cli/refresh_feeds.go index beaca17c..0e90a6cf 100644 --- a/cli/refresh_feeds.go +++ b/internal/cli/refresh_feeds.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "sync" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - feedHandler "miniflux.app/v2/reader/handler" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + feedHandler "miniflux.app/v2/internal/reader/handler" + "miniflux.app/v2/internal/storage" ) func refreshFeeds(store *storage.Storage) { diff --git a/cli/reset_password.go b/internal/cli/reset_password.go similarity index 84% rename from cli/reset_password.go rename to internal/cli/reset_password.go index dc266e36..a4241ebb 100644 --- a/cli/reset_password.go +++ b/internal/cli/reset_password.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "fmt" "os" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/validator" ) func resetPassword(store *storage.Storage) { diff --git a/cli/scheduler.go b/internal/cli/scheduler.go similarity index 83% rename from cli/scheduler.go rename to internal/cli/scheduler.go index 5046ab2f..ae9dbb11 100644 --- a/cli/scheduler.go +++ b/internal/cli/scheduler.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cli // import "miniflux.app/v2/cli" +package cli // import "miniflux.app/v2/internal/cli" import ( "time" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" - "miniflux.app/v2/worker" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/worker" ) func runScheduler(store *storage.Storage, pool *worker.Pool) { diff --git a/config/config.go b/internal/config/config.go similarity index 75% rename from config/config.go rename to internal/config/config.go index 17ef8fe3..6a29ef38 100644 --- a/config/config.go +++ b/internal/config/config.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package config // import "miniflux.app/v2/config" +package config // import "miniflux.app/v2/internal/config" // Opts holds parsed configuration options. var Opts *Options diff --git a/config/config_test.go b/internal/config/config_test.go similarity index 99% rename from config/config_test.go rename to internal/config/config_test.go index 5ab1cb22..596d640b 100644 --- a/config/config_test.go +++ b/internal/config/config_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package config // import "miniflux.app/v2/config" +package config // import "miniflux.app/v2/internal/config" import ( "os" diff --git a/config/options.go b/internal/config/options.go similarity index 99% rename from config/options.go rename to internal/config/options.go index d95e85bc..5ca6306c 100644 --- a/config/options.go +++ b/internal/config/options.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package config // import "miniflux.app/v2/config" +package config // import "miniflux.app/v2/internal/config" import ( "crypto/rand" @@ -10,7 +10,7 @@ import ( "strings" "time" - "miniflux.app/v2/version" + "miniflux.app/v2/internal/version" ) const ( diff --git a/config/parser.go b/internal/config/parser.go similarity index 99% rename from config/parser.go rename to internal/config/parser.go index 89165b6c..c754de5c 100644 --- a/config/parser.go +++ b/internal/config/parser.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package config // import "miniflux.app/v2/config" +package config // import "miniflux.app/v2/internal/config" import ( "bufio" diff --git a/config/parser_test.go b/internal/config/parser_test.go similarity index 96% rename from config/parser_test.go rename to internal/config/parser_test.go index c9be769f..7d48b4a2 100644 --- a/config/parser_test.go +++ b/internal/config/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package config // import "miniflux.app/v2/config" +package config // import "miniflux.app/v2/internal/config" import ( "testing" diff --git a/crypto/crypto.go b/internal/crypto/crypto.go similarity index 95% rename from crypto/crypto.go rename to internal/crypto/crypto.go index a73a1c1e..44854910 100644 --- a/crypto/crypto.go +++ b/internal/crypto/crypto.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package crypto // import "miniflux.app/v2/crypto" +package crypto // import "miniflux.app/v2/internal/crypto" import ( "crypto/rand" diff --git a/database/database.go b/internal/database/database.go similarity index 97% rename from database/database.go rename to internal/database/database.go index d32bd609..59eddc4c 100644 --- a/database/database.go +++ b/internal/database/database.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package database // import "miniflux.app/v2/database" +package database // import "miniflux.app/v2/internal/database" import ( "database/sql" diff --git a/database/migrations.go b/internal/database/migrations.go similarity index 99% rename from database/migrations.go rename to internal/database/migrations.go index 19595737..10975de0 100644 --- a/database/migrations.go +++ b/internal/database/migrations.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package database // import "miniflux.app/v2/database" +package database // import "miniflux.app/v2/internal/database" import ( "database/sql" diff --git a/errors/errors.go b/internal/errors/errors.go similarity index 89% rename from errors/errors.go rename to internal/errors/errors.go index bb0e04df..e98ca6f7 100644 --- a/errors/errors.go +++ b/internal/errors/errors.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package errors // import "miniflux.app/v2/errors" +package errors // import "miniflux.app/v2/internal/errors" import ( "fmt" - "miniflux.app/v2/locale" + "miniflux.app/v2/internal/locale" ) // LocalizedError represents an error than could be translated to another language. diff --git a/fever/handler.go b/internal/fever/handler.go similarity index 97% rename from fever/handler.go rename to internal/fever/handler.go index 5f954489..5060beac 100644 --- a/fever/handler.go +++ b/internal/fever/handler.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package fever // import "miniflux.app/v2/fever" +package fever // import "miniflux.app/v2/internal/fever" import ( "net/http" @@ -9,13 +9,13 @@ import ( "strings" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/integration" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/proxy" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/integration" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/proxy" + "miniflux.app/v2/internal/storage" "github.com/gorilla/mux" ) diff --git a/fever/middleware.go b/internal/fever/middleware.go similarity index 87% rename from fever/middleware.go rename to internal/fever/middleware.go index 8283a9bc..96d06f3e 100644 --- a/fever/middleware.go +++ b/internal/fever/middleware.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package fever // import "miniflux.app/v2/fever" +package fever // import "miniflux.app/v2/internal/fever" import ( "context" "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" ) type middleware struct { diff --git a/fever/response.go b/internal/fever/response.go similarity index 97% rename from fever/response.go rename to internal/fever/response.go index f5d47eff..5167ea31 100644 --- a/fever/response.go +++ b/internal/fever/response.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package fever // import "miniflux.app/v2/fever" +package fever // import "miniflux.app/v2/internal/fever" import ( "time" diff --git a/googlereader/handler.go b/internal/googlereader/handler.go similarity index 98% rename from googlereader/handler.go rename to internal/googlereader/handler.go index 6648c664..9ed7f820 100644 --- a/googlereader/handler.go +++ b/internal/googlereader/handler.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package googlereader // import "miniflux.app/v2/googlereader" +package googlereader // import "miniflux.app/v2/internal/googlereader" import ( "errors" @@ -13,19 +13,19 @@ import ( "time" "github.com/gorilla/mux" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/http/route" - "miniflux.app/v2/integration" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/proxy" - mff "miniflux.app/v2/reader/handler" - mfs "miniflux.app/v2/reader/subscription" - "miniflux.app/v2/storage" - "miniflux.app/v2/url" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/integration" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/proxy" + mff "miniflux.app/v2/internal/reader/handler" + mfs "miniflux.app/v2/internal/reader/subscription" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/validator" ) type handler struct { diff --git a/googlereader/middleware.go b/internal/googlereader/middleware.go similarity index 95% rename from googlereader/middleware.go rename to internal/googlereader/middleware.go index 770e1cc1..1bfc1a6e 100644 --- a/googlereader/middleware.go +++ b/internal/googlereader/middleware.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package googlereader // import "miniflux.app/v2/googlereader" +package googlereader // import "miniflux.app/v2/internal/googlereader" import ( "context" @@ -11,12 +11,12 @@ import ( "net/http" "strings" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) type middleware struct { diff --git a/googlereader/response.go b/internal/googlereader/response.go similarity index 96% rename from googlereader/response.go rename to internal/googlereader/response.go index f8cfc7a7..6d97bf38 100644 --- a/googlereader/response.go +++ b/internal/googlereader/response.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package googlereader // import "miniflux.app/v2/googlereader" +package googlereader // import "miniflux.app/v2/internal/googlereader" import ( "fmt" "net/http" - "miniflux.app/v2/http/response" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/logger" ) type login struct { diff --git a/http/client/client.go b/internal/http/client/client.go similarity index 97% rename from http/client/client.go rename to internal/http/client/client.go index 955c8388..de7c9d48 100644 --- a/http/client/client.go +++ b/internal/http/client/client.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package client // import "miniflux.app/v2/http/client" +package client // import "miniflux.app/v2/internal/http/client" import ( "bytes" @@ -16,10 +16,10 @@ import ( "strings" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/errors" - "miniflux.app/v2/logger" - "miniflux.app/v2/timer" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/timer" ) const ( diff --git a/http/client/client_test.go b/internal/http/client/client_test.go similarity index 95% rename from http/client/client_test.go rename to internal/http/client/client_test.go index 9ea72361..c68e48a4 100644 --- a/http/client/client_test.go +++ b/internal/http/client/client_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package client // import "miniflux.app/v2/http/client" +package client // import "miniflux.app/v2/internal/http/client" import ( "fmt" diff --git a/http/client/response.go b/internal/http/client/response.go similarity index 97% rename from http/client/response.go rename to internal/http/client/response.go index c7a09bf5..7b2faca7 100644 --- a/http/client/response.go +++ b/internal/http/client/response.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package client // import "miniflux.app/v2/http/client" +package client // import "miniflux.app/v2/internal/http/client" import ( "bytes" diff --git a/http/client/response_test.go b/internal/http/client/response_test.go similarity index 98% rename from http/client/response_test.go rename to internal/http/client/response_test.go index 133c8c05..184bc77b 100644 --- a/http/client/response_test.go +++ b/internal/http/client/response_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package client // import "miniflux.app/v2/http/client" +package client // import "miniflux.app/v2/internal/http/client" import ( "bytes" diff --git a/http/client/testdata/HTTP-charset.html b/internal/http/client/testdata/HTTP-charset.html similarity index 100% rename from http/client/testdata/HTTP-charset.html rename to internal/http/client/testdata/HTTP-charset.html diff --git a/http/client/testdata/HTTP-vs-UTF-8-BOM.html b/internal/http/client/testdata/HTTP-vs-UTF-8-BOM.html similarity index 100% rename from http/client/testdata/HTTP-vs-UTF-8-BOM.html rename to internal/http/client/testdata/HTTP-vs-UTF-8-BOM.html diff --git a/http/client/testdata/HTTP-vs-meta-charset.html b/internal/http/client/testdata/HTTP-vs-meta-charset.html similarity index 100% rename from http/client/testdata/HTTP-vs-meta-charset.html rename to internal/http/client/testdata/HTTP-vs-meta-charset.html diff --git a/http/client/testdata/HTTP-vs-meta-content.html b/internal/http/client/testdata/HTTP-vs-meta-content.html similarity index 100% rename from http/client/testdata/HTTP-vs-meta-content.html rename to internal/http/client/testdata/HTTP-vs-meta-content.html diff --git a/http/client/testdata/No-encoding-declaration.html b/internal/http/client/testdata/No-encoding-declaration.html similarity index 100% rename from http/client/testdata/No-encoding-declaration.html rename to internal/http/client/testdata/No-encoding-declaration.html diff --git a/http/client/testdata/README b/internal/http/client/testdata/README similarity index 100% rename from http/client/testdata/README rename to internal/http/client/testdata/README diff --git a/http/client/testdata/UTF-16BE-BOM.html b/internal/http/client/testdata/UTF-16BE-BOM.html similarity index 100% rename from http/client/testdata/UTF-16BE-BOM.html rename to internal/http/client/testdata/UTF-16BE-BOM.html diff --git a/http/client/testdata/UTF-16LE-BOM.html b/internal/http/client/testdata/UTF-16LE-BOM.html similarity index 100% rename from http/client/testdata/UTF-16LE-BOM.html rename to internal/http/client/testdata/UTF-16LE-BOM.html diff --git a/http/client/testdata/UTF-8-BOM-vs-meta-charset.html b/internal/http/client/testdata/UTF-8-BOM-vs-meta-charset.html similarity index 100% rename from http/client/testdata/UTF-8-BOM-vs-meta-charset.html rename to internal/http/client/testdata/UTF-8-BOM-vs-meta-charset.html diff --git a/http/client/testdata/UTF-8-BOM-vs-meta-content.html b/internal/http/client/testdata/UTF-8-BOM-vs-meta-content.html similarity index 100% rename from http/client/testdata/UTF-8-BOM-vs-meta-content.html rename to internal/http/client/testdata/UTF-8-BOM-vs-meta-content.html diff --git a/http/client/testdata/charset-content-type-xml-iso88591.xml b/internal/http/client/testdata/charset-content-type-xml-iso88591.xml similarity index 100% rename from http/client/testdata/charset-content-type-xml-iso88591.xml rename to internal/http/client/testdata/charset-content-type-xml-iso88591.xml diff --git a/http/client/testdata/content-type-only-win-8859-1.xml b/internal/http/client/testdata/content-type-only-win-8859-1.xml similarity index 100% rename from http/client/testdata/content-type-only-win-8859-1.xml rename to internal/http/client/testdata/content-type-only-win-8859-1.xml diff --git a/http/client/testdata/gb2312.html b/internal/http/client/testdata/gb2312.html similarity index 100% rename from http/client/testdata/gb2312.html rename to internal/http/client/testdata/gb2312.html diff --git a/http/client/testdata/meta-charset-attribute.html b/internal/http/client/testdata/meta-charset-attribute.html similarity index 100% rename from http/client/testdata/meta-charset-attribute.html rename to internal/http/client/testdata/meta-charset-attribute.html diff --git a/http/client/testdata/meta-content-attribute.html b/internal/http/client/testdata/meta-content-attribute.html similarity index 100% rename from http/client/testdata/meta-content-attribute.html rename to internal/http/client/testdata/meta-content-attribute.html diff --git a/http/client/testdata/rdf_utf8.xml b/internal/http/client/testdata/rdf_utf8.xml similarity index 100% rename from http/client/testdata/rdf_utf8.xml rename to internal/http/client/testdata/rdf_utf8.xml diff --git a/http/client/testdata/single_quote_xml_encoding.xml b/internal/http/client/testdata/single_quote_xml_encoding.xml similarity index 100% rename from http/client/testdata/single_quote_xml_encoding.xml rename to internal/http/client/testdata/single_quote_xml_encoding.xml diff --git a/http/client/testdata/smallfile.xml b/internal/http/client/testdata/smallfile.xml similarity index 100% rename from http/client/testdata/smallfile.xml rename to internal/http/client/testdata/smallfile.xml diff --git a/http/client/testdata/urdu.xml b/internal/http/client/testdata/urdu.xml similarity index 100% rename from http/client/testdata/urdu.xml rename to internal/http/client/testdata/urdu.xml diff --git a/http/client/testdata/windows_1251.html b/internal/http/client/testdata/windows_1251.html similarity index 100% rename from http/client/testdata/windows_1251.html rename to internal/http/client/testdata/windows_1251.html diff --git a/http/client/testdata/windows_1251.xml b/internal/http/client/testdata/windows_1251.xml similarity index 100% rename from http/client/testdata/windows_1251.xml rename to internal/http/client/testdata/windows_1251.xml diff --git a/http/cookie/cookie.go b/internal/http/cookie/cookie.go similarity index 94% rename from http/cookie/cookie.go rename to internal/http/cookie/cookie.go index 0bf46731..1d6a0fb0 100644 --- a/http/cookie/cookie.go +++ b/internal/http/cookie/cookie.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package cookie // import "miniflux.app/v2/http/cookie" +package cookie // import "miniflux.app/v2/internal/http/cookie" import ( "net/http" diff --git a/http/request/client_ip.go b/internal/http/request/client_ip.go similarity index 94% rename from http/request/client_ip.go rename to internal/http/request/client_ip.go index a76b0e2e..f145c36a 100644 --- a/http/request/client_ip.go +++ b/internal/http/request/client_ip.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import ( "net" diff --git a/http/request/client_ip_test.go b/internal/http/request/client_ip_test.go similarity index 98% rename from http/request/client_ip_test.go rename to internal/http/request/client_ip_test.go index d9fb4e75..7f958d64 100644 --- a/http/request/client_ip_test.go +++ b/internal/http/request/client_ip_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import ( "net/http" diff --git a/http/request/context.go b/internal/http/request/context.go similarity index 98% rename from http/request/context.go rename to internal/http/request/context.go index 31639b3e..caa6f543 100644 --- a/http/request/context.go +++ b/internal/http/request/context.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import "net/http" diff --git a/http/request/context_test.go b/internal/http/request/context_test.go similarity index 99% rename from http/request/context_test.go rename to internal/http/request/context_test.go index d6026d54..6d5cc989 100644 --- a/http/request/context_test.go +++ b/internal/http/request/context_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import ( "context" diff --git a/http/request/cookie.go b/internal/http/request/cookie.go similarity index 83% rename from http/request/cookie.go rename to internal/http/request/cookie.go index fdc65c3a..b5b234e0 100644 --- a/http/request/cookie.go +++ b/internal/http/request/cookie.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import "net/http" diff --git a/http/request/cookie_test.go b/internal/http/request/cookie_test.go similarity index 92% rename from http/request/cookie_test.go rename to internal/http/request/cookie_test.go index f00a4b37..5bd129b4 100644 --- a/http/request/cookie_test.go +++ b/internal/http/request/cookie_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import ( "net/http" diff --git a/http/request/params.go b/internal/http/request/params.go similarity index 97% rename from http/request/params.go rename to internal/http/request/params.go index d6c8bf3d..d24ec0bd 100644 --- a/http/request/params.go +++ b/internal/http/request/params.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import ( "net/http" diff --git a/http/request/params_test.go b/internal/http/request/params_test.go similarity index 98% rename from http/request/params_test.go rename to internal/http/request/params_test.go index 7804f055..d1c4971a 100644 --- a/http/request/params_test.go +++ b/internal/http/request/params_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package request // import "miniflux.app/v2/http/request" +package request // import "miniflux.app/v2/internal/http/request" import ( "net/http" diff --git a/http/response/builder.go b/internal/http/response/builder.go similarity index 97% rename from http/response/builder.go rename to internal/http/response/builder.go index b8fcbd46..017da1b6 100644 --- a/http/response/builder.go +++ b/internal/http/response/builder.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package response // import "miniflux.app/v2/http/response" +package response // import "miniflux.app/v2/internal/http/response" import ( "compress/flate" @@ -12,7 +12,7 @@ import ( "strings" "time" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/logger" ) const compressionThreshold = 1024 diff --git a/http/response/builder_test.go b/internal/http/response/builder_test.go similarity index 99% rename from http/response/builder_test.go rename to internal/http/response/builder_test.go index 864fbb9f..7b4d73ef 100644 --- a/http/response/builder_test.go +++ b/internal/http/response/builder_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package response // import "miniflux.app/v2/http/response" +package response // import "miniflux.app/v2/internal/http/response" import ( "errors" diff --git a/http/response/html/html.go b/internal/http/response/html/html.go similarity index 95% rename from http/response/html/html.go rename to internal/http/response/html/html.go index 7a2391d3..184bc9b6 100644 --- a/http/response/html/html.go +++ b/internal/http/response/html/html.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package html // import "miniflux.app/v2/http/response/html" +package html // import "miniflux.app/v2/internal/http/response/html" import ( "net/http" - "miniflux.app/v2/http/response" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/logger" ) // OK creates a new HTML response with a 200 status code. diff --git a/http/response/html/html_test.go b/internal/http/response/html/html_test.go similarity index 98% rename from http/response/html/html_test.go rename to internal/http/response/html/html_test.go index 3d990617..3acbd8ce 100644 --- a/http/response/html/html_test.go +++ b/internal/http/response/html/html_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package html // import "miniflux.app/v2/http/response/html" +package html // import "miniflux.app/v2/internal/http/response/html" import ( "errors" diff --git a/http/response/json/json.go b/internal/http/response/json/json.go similarity index 95% rename from http/response/json/json.go rename to internal/http/response/json/json.go index f0f88033..5e6024ea 100644 --- a/http/response/json/json.go +++ b/internal/http/response/json/json.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package json // import "miniflux.app/v2/http/response/json" +package json // import "miniflux.app/v2/internal/http/response/json" import ( "encoding/json" "errors" "net/http" - "miniflux.app/v2/http/response" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/logger" ) const contentTypeHeader = `application/json` diff --git a/http/response/json/json_test.go b/internal/http/response/json/json_test.go similarity index 99% rename from http/response/json/json_test.go rename to internal/http/response/json/json_test.go index 93a477c8..9a1e1a03 100644 --- a/http/response/json/json_test.go +++ b/internal/http/response/json/json_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package json // import "miniflux.app/v2/http/response/json" +package json // import "miniflux.app/v2/internal/http/response/json" import ( "errors" diff --git a/http/response/xml/xml.go b/internal/http/response/xml/xml.go similarity index 87% rename from http/response/xml/xml.go rename to internal/http/response/xml/xml.go index 3bfd5723..4329197b 100644 --- a/http/response/xml/xml.go +++ b/internal/http/response/xml/xml.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package xml // import "miniflux.app/v2/http/response/xml" +package xml // import "miniflux.app/v2/internal/http/response/xml" import ( "net/http" - "miniflux.app/v2/http/response" + "miniflux.app/v2/internal/http/response" ) // OK writes a standard XML response with a status 200 OK. diff --git a/http/response/xml/xml_test.go b/internal/http/response/xml/xml_test.go similarity index 96% rename from http/response/xml/xml_test.go rename to internal/http/response/xml/xml_test.go index e490f19e..05bf82e8 100644 --- a/http/response/xml/xml_test.go +++ b/internal/http/response/xml/xml_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package xml // import "miniflux.app/v2/http/response/xml" +package xml // import "miniflux.app/v2/internal/http/response/xml" import ( "net/http" diff --git a/http/route/route.go b/internal/http/route/route.go similarity index 88% rename from http/route/route.go rename to internal/http/route/route.go index 4e3b615d..601fbd67 100644 --- a/http/route/route.go +++ b/internal/http/route/route.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package route // import "miniflux.app/v2/http/route" +package route // import "miniflux.app/v2/internal/http/route" import ( "strconv" "github.com/gorilla/mux" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/logger" ) // Path returns the defined route based on given arguments. diff --git a/http/server/httpd.go b/internal/http/server/httpd.go similarity index 94% rename from http/server/httpd.go rename to internal/http/server/httpd.go index 156fb0be..c99761e6 100644 --- a/http/server/httpd.go +++ b/internal/http/server/httpd.go @@ -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/http/server" +package httpd // import "miniflux.app/v2/internal/http/server" import ( "crypto/tls" @@ -12,16 +12,16 @@ import ( "strings" "time" - "miniflux.app/v2/api" - "miniflux.app/v2/config" - "miniflux.app/v2/fever" - "miniflux.app/v2/googlereader" - "miniflux.app/v2/http/request" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui" - "miniflux.app/v2/version" - "miniflux.app/v2/worker" + "miniflux.app/v2/internal/api" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/fever" + "miniflux.app/v2/internal/googlereader" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui" + "miniflux.app/v2/internal/version" + "miniflux.app/v2/internal/worker" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/http/server/middleware.go b/internal/http/server/middleware.go similarity index 82% rename from http/server/middleware.go rename to internal/http/server/middleware.go index 470712c4..e23cdcc4 100644 --- a/http/server/middleware.go +++ b/internal/http/server/middleware.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package httpd // import "miniflux.app/v2/http/server" +package httpd // import "miniflux.app/v2/internal/http/server" import ( "context" "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/logger" ) func middleware(next http.Handler) http.Handler { diff --git a/integration/apprise/apprise.go b/internal/integration/apprise/apprise.go similarity index 94% rename from integration/apprise/apprise.go rename to internal/integration/apprise/apprise.go index 348b0d33..b073788b 100644 --- a/integration/apprise/apprise.go +++ b/internal/integration/apprise/apprise.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "miniflux.app/v2/http/client" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/model" ) // Client represents a Apprise client. diff --git a/integration/apprise/wrapper.go b/internal/integration/apprise/wrapper.go similarity index 100% rename from integration/apprise/wrapper.go rename to internal/integration/apprise/wrapper.go diff --git a/integration/espial/espial.go b/internal/integration/espial/espial.go similarity index 93% rename from integration/espial/espial.go rename to internal/integration/espial/espial.go index 7532a64b..293adca9 100644 --- a/integration/espial/espial.go +++ b/internal/integration/espial/espial.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package espial // import "miniflux.app/v2/integration/espial" +package espial // import "miniflux.app/v2/internal/integration/espial" import ( "fmt" "net/url" "path" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Document structure of an Espial document diff --git a/integration/instapaper/instapaper.go b/internal/integration/instapaper/instapaper.go similarity index 89% rename from integration/instapaper/instapaper.go rename to internal/integration/instapaper/instapaper.go index 8d073383..e593e24e 100644 --- a/integration/instapaper/instapaper.go +++ b/internal/integration/instapaper/instapaper.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package instapaper // import "miniflux.app/v2/integration/instapaper" +package instapaper // import "miniflux.app/v2/internal/integration/instapaper" import ( "fmt" "net/url" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Client represents an Instapaper client. diff --git a/integration/integration.go b/internal/integration/integration.go similarity index 87% rename from integration/integration.go rename to internal/integration/integration.go index c03b63a9..faa263d2 100644 --- a/integration/integration.go +++ b/internal/integration/integration.go @@ -1,24 +1,24 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package integration // import "miniflux.app/v2/integration" +package integration // import "miniflux.app/v2/internal/integration" import ( - "miniflux.app/v2/config" - "miniflux.app/v2/integration/apprise" - "miniflux.app/v2/integration/espial" - "miniflux.app/v2/integration/instapaper" - "miniflux.app/v2/integration/linkding" - "miniflux.app/v2/integration/matrixbot" - "miniflux.app/v2/integration/notion" - "miniflux.app/v2/integration/nunuxkeeper" - "miniflux.app/v2/integration/pinboard" - "miniflux.app/v2/integration/pocket" - "miniflux.app/v2/integration/readwise" - "miniflux.app/v2/integration/telegrambot" - "miniflux.app/v2/integration/wallabag" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/integration/apprise" + "miniflux.app/v2/internal/integration/espial" + "miniflux.app/v2/internal/integration/instapaper" + "miniflux.app/v2/internal/integration/linkding" + "miniflux.app/v2/internal/integration/matrixbot" + "miniflux.app/v2/internal/integration/notion" + "miniflux.app/v2/internal/integration/nunuxkeeper" + "miniflux.app/v2/internal/integration/pinboard" + "miniflux.app/v2/internal/integration/pocket" + "miniflux.app/v2/internal/integration/readwise" + "miniflux.app/v2/internal/integration/telegrambot" + "miniflux.app/v2/internal/integration/wallabag" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" ) // SendEntry sends the entry to third-party providers when the user click on "Save". diff --git a/integration/linkding/linkding.go b/internal/integration/linkding/linkding.go similarity index 94% rename from integration/linkding/linkding.go rename to internal/integration/linkding/linkding.go index 0b921995..8ed960d0 100644 --- a/integration/linkding/linkding.go +++ b/internal/integration/linkding/linkding.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package linkding // import "miniflux.app/v2/integration/linkding" +package linkding // import "miniflux.app/v2/internal/integration/linkding" import ( "fmt" "net/url" "strings" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Document structure of a Linkding document diff --git a/integration/matrixbot/matrixbot.go b/internal/integration/matrixbot/matrixbot.go similarity index 89% rename from integration/matrixbot/matrixbot.go rename to internal/integration/matrixbot/matrixbot.go index b68588c1..7b3198ed 100644 --- a/integration/matrixbot/matrixbot.go +++ b/internal/integration/matrixbot/matrixbot.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package matrixbot // import "miniflux.app/v2/integration/matrixbot" +package matrixbot // import "miniflux.app/v2/internal/integration/matrixbot" import ( "fmt" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" "github.com/matrix-org/gomatrix" ) diff --git a/integration/notion/notion.go b/internal/integration/notion/notion.go similarity index 96% rename from integration/notion/notion.go rename to internal/integration/notion/notion.go index b3df63ee..fe579928 100644 --- a/integration/notion/notion.go +++ b/internal/integration/notion/notion.go @@ -6,7 +6,7 @@ package notion import ( "fmt" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Client represents a Notion client. diff --git a/integration/notion/wrapper.go b/internal/integration/notion/wrapper.go similarity index 100% rename from integration/notion/wrapper.go rename to internal/integration/notion/wrapper.go diff --git a/integration/nunuxkeeper/nunuxkeeper.go b/internal/integration/nunuxkeeper/nunuxkeeper.go similarity index 93% rename from integration/nunuxkeeper/nunuxkeeper.go rename to internal/integration/nunuxkeeper/nunuxkeeper.go index 32cad605..6ad37f23 100644 --- a/integration/nunuxkeeper/nunuxkeeper.go +++ b/internal/integration/nunuxkeeper/nunuxkeeper.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package nunuxkeeper // import "miniflux.app/v2/integration/nunuxkeeper" +package nunuxkeeper // import "miniflux.app/v2/internal/integration/nunuxkeeper" import ( "fmt" "net/url" "path" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Document structure of a Nununx Keeper document diff --git a/integration/pinboard/pinboard.go b/internal/integration/pinboard/pinboard.go similarity index 90% rename from integration/pinboard/pinboard.go rename to internal/integration/pinboard/pinboard.go index ca5727d6..40d14c74 100644 --- a/integration/pinboard/pinboard.go +++ b/internal/integration/pinboard/pinboard.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package pinboard // import "miniflux.app/v2/integration/pinboard" +package pinboard // import "miniflux.app/v2/internal/integration/pinboard" import ( "fmt" "net/url" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Client represents a Pinboard client. diff --git a/integration/pocket/connector.go b/internal/integration/pocket/connector.go similarity index 96% rename from integration/pocket/connector.go rename to internal/integration/pocket/connector.go index 2a51d1e5..5878e646 100644 --- a/integration/pocket/connector.go +++ b/internal/integration/pocket/connector.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package pocket // import "miniflux.app/v2/integration/pocket" +package pocket // import "miniflux.app/v2/internal/integration/pocket" import ( "errors" @@ -9,7 +9,7 @@ import ( "io" "net/url" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Connector manages the authorization flow with Pocket to get a personal access token. diff --git a/integration/pocket/pocket.go b/internal/integration/pocket/pocket.go similarity index 91% rename from integration/pocket/pocket.go rename to internal/integration/pocket/pocket.go index aca3ca55..e940ce55 100644 --- a/integration/pocket/pocket.go +++ b/internal/integration/pocket/pocket.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package pocket // import "miniflux.app/v2/integration/pocket" +package pocket // import "miniflux.app/v2/internal/integration/pocket" import ( "fmt" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Client represents a Pocket client. diff --git a/integration/readwise/readwise.go b/internal/integration/readwise/readwise.go similarity index 92% rename from integration/readwise/readwise.go rename to internal/integration/readwise/readwise.go index 0025cba4..8a8d869b 100644 --- a/integration/readwise/readwise.go +++ b/internal/integration/readwise/readwise.go @@ -3,13 +3,13 @@ // Readwise Reader API documentation: https://readwise.io/reader_api -package readwise // import "miniflux.app/v2/integration/readwise" +package readwise // import "miniflux.app/v2/internal/integration/readwise" import ( "fmt" "net/url" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Document structure of a Readwise Reader document diff --git a/integration/telegrambot/telegrambot.go b/internal/integration/telegrambot/telegrambot.go similarity index 92% rename from integration/telegrambot/telegrambot.go rename to internal/integration/telegrambot/telegrambot.go index e7e74bde..a89092b5 100644 --- a/integration/telegrambot/telegrambot.go +++ b/internal/integration/telegrambot/telegrambot.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package telegrambot // import "miniflux.app/v2/integration/telegrambot" +package telegrambot // import "miniflux.app/v2/internal/integration/telegrambot" import ( "bytes" @@ -10,7 +10,7 @@ import ( "strconv" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // PushEntry pushes entry to telegram chat using integration settings provided diff --git a/integration/wallabag/wallabag.go b/internal/integration/wallabag/wallabag.go similarity index 96% rename from integration/wallabag/wallabag.go rename to internal/integration/wallabag/wallabag.go index 27f92742..b158bea8 100644 --- a/integration/wallabag/wallabag.go +++ b/internal/integration/wallabag/wallabag.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package wallabag // import "miniflux.app/v2/integration/wallabag" +package wallabag // import "miniflux.app/v2/internal/integration/wallabag" import ( "encoding/json" @@ -9,7 +9,7 @@ import ( "io" "net/url" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) // Client represents a Wallabag client. diff --git a/locale/catalog.go b/internal/locale/catalog.go similarity index 95% rename from locale/catalog.go rename to internal/locale/catalog.go index 0aa82359..8785cafb 100644 --- a/locale/catalog.go +++ b/internal/locale/catalog.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" import ( "embed" diff --git a/locale/catalog_test.go b/internal/locale/catalog_test.go similarity index 97% rename from locale/catalog_test.go rename to internal/locale/catalog_test.go index 6a242683..8fb29ddf 100644 --- a/locale/catalog_test.go +++ b/internal/locale/catalog_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" import "testing" diff --git a/locale/locale.go b/internal/locale/locale.go similarity index 92% rename from locale/locale.go rename to internal/locale/locale.go index 3882b321..a5a1010b 100644 --- a/locale/locale.go +++ b/internal/locale/locale.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" // AvailableLanguages returns the list of available languages. func AvailableLanguages() map[string]string { diff --git a/locale/locale_test.go b/internal/locale/locale_test.go similarity index 89% rename from locale/locale_test.go rename to internal/locale/locale_test.go index f79bd8ea..86b52820 100644 --- a/locale/locale_test.go +++ b/internal/locale/locale_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" import "testing" diff --git a/locale/plural.go b/internal/locale/plural.go similarity index 96% rename from locale/plural.go rename to internal/locale/plural.go index b29384c1..41cc9638 100644 --- a/locale/plural.go +++ b/internal/locale/plural.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" type pluralFormFunc func(n int) int diff --git a/locale/plural_test.go b/internal/locale/plural_test.go similarity index 93% rename from locale/plural_test.go rename to internal/locale/plural_test.go index 6f8f3799..084dd202 100644 --- a/locale/plural_test.go +++ b/internal/locale/plural_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" import "testing" diff --git a/locale/printer.go b/internal/locale/printer.go similarity index 95% rename from locale/printer.go rename to internal/locale/printer.go index 8d58b261..b0f5de6c 100644 --- a/locale/printer.go +++ b/internal/locale/printer.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" import "fmt" diff --git a/locale/printer_test.go b/internal/locale/printer_test.go similarity index 98% rename from locale/printer_test.go rename to internal/locale/printer_test.go index 7595c64c..780da7cb 100644 --- a/locale/printer_test.go +++ b/internal/locale/printer_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package locale // import "miniflux.app/v2/locale" +package locale // import "miniflux.app/v2/internal/locale" import "testing" diff --git a/locale/translations/de_DE.json b/internal/locale/translations/de_DE.json similarity index 100% rename from locale/translations/de_DE.json rename to internal/locale/translations/de_DE.json diff --git a/locale/translations/el_EL.json b/internal/locale/translations/el_EL.json similarity index 100% rename from locale/translations/el_EL.json rename to internal/locale/translations/el_EL.json diff --git a/locale/translations/en_US.json b/internal/locale/translations/en_US.json similarity index 100% rename from locale/translations/en_US.json rename to internal/locale/translations/en_US.json diff --git a/locale/translations/es_ES.json b/internal/locale/translations/es_ES.json similarity index 100% rename from locale/translations/es_ES.json rename to internal/locale/translations/es_ES.json diff --git a/locale/translations/fi_FI.json b/internal/locale/translations/fi_FI.json similarity index 100% rename from locale/translations/fi_FI.json rename to internal/locale/translations/fi_FI.json diff --git a/locale/translations/fr_FR.json b/internal/locale/translations/fr_FR.json similarity index 100% rename from locale/translations/fr_FR.json rename to internal/locale/translations/fr_FR.json diff --git a/locale/translations/hi_IN.json b/internal/locale/translations/hi_IN.json similarity index 100% rename from locale/translations/hi_IN.json rename to internal/locale/translations/hi_IN.json diff --git a/locale/translations/id_ID.json b/internal/locale/translations/id_ID.json similarity index 100% rename from locale/translations/id_ID.json rename to internal/locale/translations/id_ID.json diff --git a/locale/translations/it_IT.json b/internal/locale/translations/it_IT.json similarity index 100% rename from locale/translations/it_IT.json rename to internal/locale/translations/it_IT.json diff --git a/locale/translations/ja_JP.json b/internal/locale/translations/ja_JP.json similarity index 100% rename from locale/translations/ja_JP.json rename to internal/locale/translations/ja_JP.json diff --git a/locale/translations/nl_NL.json b/internal/locale/translations/nl_NL.json similarity index 100% rename from locale/translations/nl_NL.json rename to internal/locale/translations/nl_NL.json diff --git a/locale/translations/pl_PL.json b/internal/locale/translations/pl_PL.json similarity index 100% rename from locale/translations/pl_PL.json rename to internal/locale/translations/pl_PL.json diff --git a/locale/translations/pt_BR.json b/internal/locale/translations/pt_BR.json similarity index 100% rename from locale/translations/pt_BR.json rename to internal/locale/translations/pt_BR.json diff --git a/locale/translations/ru_RU.json b/internal/locale/translations/ru_RU.json similarity index 100% rename from locale/translations/ru_RU.json rename to internal/locale/translations/ru_RU.json diff --git a/locale/translations/tr_TR.json b/internal/locale/translations/tr_TR.json similarity index 100% rename from locale/translations/tr_TR.json rename to internal/locale/translations/tr_TR.json diff --git a/locale/translations/uk_UA.json b/internal/locale/translations/uk_UA.json similarity index 100% rename from locale/translations/uk_UA.json rename to internal/locale/translations/uk_UA.json diff --git a/locale/translations/zh_CN.json b/internal/locale/translations/zh_CN.json similarity index 100% rename from locale/translations/zh_CN.json rename to internal/locale/translations/zh_CN.json diff --git a/locale/translations/zh_TW.json b/internal/locale/translations/zh_TW.json similarity index 100% rename from locale/translations/zh_TW.json rename to internal/locale/translations/zh_TW.json diff --git a/logger/logger.go b/internal/logger/logger.go similarity index 97% rename from logger/logger.go rename to internal/logger/logger.go index 5a5ec0a3..70b93a75 100644 --- a/logger/logger.go +++ b/internal/logger/logger.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package logger // import "miniflux.app/v2/logger" +package logger // import "miniflux.app/v2/internal/logger" import ( "fmt" diff --git a/metric/metric.go b/internal/metric/metric.go similarity index 97% rename from metric/metric.go rename to internal/metric/metric.go index 050c21e7..7653c447 100644 --- a/metric/metric.go +++ b/internal/metric/metric.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package metric // import "miniflux.app/v2/metric" +package metric // import "miniflux.app/v2/internal/metric" import ( "time" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" "github.com/prometheus/client_golang/prometheus" ) diff --git a/model/api_key.go b/internal/model/api_key.go similarity index 87% rename from model/api_key.go rename to internal/model/api_key.go index e47e9838..c623c9b8 100644 --- a/model/api_key.go +++ b/internal/model/api_key.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "time" - "miniflux.app/v2/crypto" + "miniflux.app/v2/internal/crypto" ) // APIKey represents an application API key. diff --git a/model/app_session.go b/internal/model/app_session.go similarity index 96% rename from model/app_session.go rename to internal/model/app_session.go index c3349faf..dee4d09d 100644 --- a/model/app_session.go +++ b/internal/model/app_session.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "database/sql/driver" diff --git a/model/categories_sort_options.go b/internal/model/categories_sort_options.go similarity index 84% rename from model/categories_sort_options.go rename to internal/model/categories_sort_options.go index fbd17d67..6e267cb9 100644 --- a/model/categories_sort_options.go +++ b/internal/model/categories_sort_options.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" func CategoriesSortingOptions() map[string]string { return map[string]string{ diff --git a/model/category.go b/internal/model/category.go similarity index 94% rename from model/category.go rename to internal/model/category.go index b16a3def..b48ffda2 100644 --- a/model/category.go +++ b/internal/model/category.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import "fmt" diff --git a/model/enclosure.go b/internal/model/enclosure.go similarity index 95% rename from model/enclosure.go rename to internal/model/enclosure.go index 5ed0e5cd..20cb5bfe 100644 --- a/model/enclosure.go +++ b/internal/model/enclosure.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import "strings" // Enclosure represents an attachment. diff --git a/model/enclosure_test.go b/internal/model/enclosure_test.go similarity index 100% rename from model/enclosure_test.go rename to internal/model/enclosure_test.go diff --git a/model/entry.go b/internal/model/entry.go similarity index 96% rename from model/entry.go rename to internal/model/entry.go index 5630875c..d09bd3ee 100644 --- a/model/entry.go +++ b/internal/model/entry.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "time" diff --git a/model/feed.go b/internal/model/feed.go similarity index 98% rename from model/feed.go rename to internal/model/feed.go index 46d757c6..4add53b6 100644 --- a/model/feed.go +++ b/internal/model/feed.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "fmt" "math" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/client" ) // List of supported schedulers. diff --git a/model/feed_test.go b/internal/model/feed_test.go similarity index 96% rename from model/feed_test.go rename to internal/model/feed_test.go index 28474aab..91850f50 100644 --- a/model/feed_test.go +++ b/internal/model/feed_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "fmt" @@ -9,8 +9,8 @@ import ( "testing" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/client" ) func TestFeedWithResponse(t *testing.T) { diff --git a/model/home_page.go b/internal/model/home_page.go similarity index 87% rename from model/home_page.go rename to internal/model/home_page.go index 3ffffaa6..6732aafc 100644 --- a/model/home_page.go +++ b/internal/model/home_page.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" // HomePages returns the list of available home pages. func HomePages() map[string]string { diff --git a/model/icon.go b/internal/model/icon.go similarity index 92% rename from model/icon.go rename to internal/model/icon.go index e05bfbf3..c02e5767 100644 --- a/model/icon.go +++ b/internal/model/icon.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "encoding/base64" diff --git a/model/integration.go b/internal/model/integration.go similarity index 96% rename from model/integration.go rename to internal/model/integration.go index 8c46152b..edfad601 100644 --- a/model/integration.go +++ b/internal/model/integration.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" // Integration represents user integration settings. type Integration struct { diff --git a/model/job.go b/internal/model/job.go similarity index 83% rename from model/job.go rename to internal/model/job.go index 2e5df360..39bcc222 100644 --- a/model/job.go +++ b/internal/model/job.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" // Job represents a payload sent to the processing queue. type Job struct { diff --git a/model/model.go b/internal/model/model.go similarity index 90% rename from model/model.go rename to internal/model/model.go index 4470fe17..82d69b8a 100644 --- a/model/model.go +++ b/internal/model/model.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" // OptionalString populates an optional string field. func OptionalString(value string) *string { diff --git a/model/subscription.go b/internal/model/subscription.go similarity index 91% rename from model/subscription.go rename to internal/model/subscription.go index b24d36bb..448957ed 100644 --- a/model/subscription.go +++ b/internal/model/subscription.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" // SubscriptionDiscoveryRequest represents a request to discover subscriptions. type SubscriptionDiscoveryRequest struct { diff --git a/model/theme.go b/internal/model/theme.go similarity index 94% rename from model/theme.go rename to internal/model/theme.go index 9381e450..852cecba 100644 --- a/model/theme.go +++ b/internal/model/theme.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" // Themes returns the list of available themes. func Themes() map[string]string { diff --git a/model/user.go b/internal/model/user.go similarity index 98% rename from model/user.go rename to internal/model/user.go index 4af4a20a..61ff1065 100644 --- a/model/user.go +++ b/internal/model/user.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "time" - "miniflux.app/v2/timezone" + "miniflux.app/v2/internal/timezone" ) // User represents a user in the system. diff --git a/model/user_session.go b/internal/model/user_session.go similarity index 90% rename from model/user_session.go rename to internal/model/user_session.go index 9dca57e0..9f889242 100644 --- a/model/user_session.go +++ b/internal/model/user_session.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package model // import "miniflux.app/v2/model" +package model // import "miniflux.app/v2/internal/model" import ( "fmt" "time" - "miniflux.app/v2/timezone" + "miniflux.app/v2/internal/timezone" ) // UserSession represents a user session in the system. diff --git a/oauth2/google.go b/internal/oauth2/google.go similarity index 95% rename from oauth2/google.go rename to internal/oauth2/google.go index 48e48d68..790d31a1 100644 --- a/oauth2/google.go +++ b/internal/oauth2/google.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package oauth2 // import "miniflux.app/v2/oauth2" +package oauth2 // import "miniflux.app/v2/internal/oauth2" import ( "context" "encoding/json" "fmt" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" "golang.org/x/oauth2" ) diff --git a/oauth2/manager.go b/internal/oauth2/manager.go similarity index 92% rename from oauth2/manager.go rename to internal/oauth2/manager.go index a808b97e..6ffbb952 100644 --- a/oauth2/manager.go +++ b/internal/oauth2/manager.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package oauth2 // import "miniflux.app/v2/oauth2" +package oauth2 // import "miniflux.app/v2/internal/oauth2" import ( "context" "errors" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/logger" ) // Manager handles OAuth2 providers. diff --git a/oauth2/oidc.go b/internal/oauth2/oidc.go similarity index 95% rename from oauth2/oidc.go rename to internal/oauth2/oidc.go index f4a358ac..6ea7063d 100644 --- a/oauth2/oidc.go +++ b/internal/oauth2/oidc.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package oauth2 // import "miniflux.app/v2/oauth2" +package oauth2 // import "miniflux.app/v2/internal/oauth2" import ( "context" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" "github.com/coreos/go-oidc/v3/oidc" "golang.org/x/oauth2" diff --git a/oauth2/profile.go b/internal/oauth2/profile.go similarity index 86% rename from oauth2/profile.go rename to internal/oauth2/profile.go index 92c8382f..048bce3d 100644 --- a/oauth2/profile.go +++ b/internal/oauth2/profile.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package oauth2 // import "miniflux.app/v2/oauth2" +package oauth2 // import "miniflux.app/v2/internal/oauth2" import ( "fmt" diff --git a/oauth2/provider.go b/internal/oauth2/provider.go similarity index 85% rename from oauth2/provider.go rename to internal/oauth2/provider.go index f96b4a19..8243dc80 100644 --- a/oauth2/provider.go +++ b/internal/oauth2/provider.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package oauth2 // import "miniflux.app/v2/oauth2" +package oauth2 // import "miniflux.app/v2/internal/oauth2" import ( "context" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // Provider is an interface for OAuth2 providers. diff --git a/proxy/media_proxy.go b/internal/proxy/media_proxy.go similarity index 95% rename from proxy/media_proxy.go rename to internal/proxy/media_proxy.go index 8499f331..6fc7a92e 100644 --- a/proxy/media_proxy.go +++ b/internal/proxy/media_proxy.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package proxy // import "miniflux.app/v2/proxy" +package proxy // import "miniflux.app/v2/internal/proxy" import ( "strings" - "miniflux.app/v2/config" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/url" "github.com/PuerkitoBio/goquery" "github.com/gorilla/mux" diff --git a/proxy/media_proxy_test.go b/internal/proxy/media_proxy_test.go similarity index 99% rename from proxy/media_proxy_test.go rename to internal/proxy/media_proxy_test.go index 6a5bc38d..76499231 100644 --- a/proxy/media_proxy_test.go +++ b/internal/proxy/media_proxy_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package proxy // import "miniflux.app/v2/proxy" +package proxy // import "miniflux.app/v2/internal/proxy" import ( "net/http" @@ -9,7 +9,7 @@ import ( "testing" "github.com/gorilla/mux" - "miniflux.app/v2/config" + "miniflux.app/v2/internal/config" ) func TestProxyFilterWithHttpDefault(t *testing.T) { diff --git a/proxy/proxy.go b/internal/proxy/proxy.go similarity index 93% rename from proxy/proxy.go rename to internal/proxy/proxy.go index 7a95e02f..8b177348 100644 --- a/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package proxy // import "miniflux.app/v2/proxy" +package proxy // import "miniflux.app/v2/internal/proxy" import ( "crypto/hmac" @@ -10,11 +10,11 @@ import ( "net/url" "path" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/route" "github.com/gorilla/mux" - "miniflux.app/v2/config" + "miniflux.app/v2/internal/config" ) // ProxifyURL generates a relative URL for a proxified resource. diff --git a/reader/atom/atom_03.go b/internal/reader/atom/atom_03.go similarity index 92% rename from reader/atom/atom_03.go rename to internal/reader/atom/atom_03.go index 6e7db395..abf07a29 100644 --- a/reader/atom/atom_03.go +++ b/internal/reader/atom/atom_03.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import ( "encoding/base64" @@ -9,12 +9,12 @@ import ( "strings" "time" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/date" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/date" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/url" ) // Specs: http://web.archive.org/web/20060811235523/http://www.mnot.net/drafts/draft-nottingham-atom-format-02.html diff --git a/reader/atom/atom_03_test.go b/internal/reader/atom/atom_03_test.go similarity index 99% rename from reader/atom/atom_03_test.go rename to internal/reader/atom/atom_03_test.go index 88d957e6..d9715274 100644 --- a/reader/atom/atom_03_test.go +++ b/internal/reader/atom/atom_03_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import ( "bytes" diff --git a/reader/atom/atom_10.go b/internal/reader/atom/atom_10.go similarity index 95% rename from reader/atom/atom_10.go rename to internal/reader/atom/atom_10.go index 76052a26..4b0d0dfe 100644 --- a/reader/atom/atom_10.go +++ b/internal/reader/atom/atom_10.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import ( "encoding/xml" @@ -10,13 +10,13 @@ import ( "strings" "time" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/date" - "miniflux.app/v2/reader/media" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/date" + "miniflux.app/v2/internal/reader/media" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/url" ) // Specs: diff --git a/reader/atom/atom_10_test.go b/internal/reader/atom/atom_10_test.go similarity index 99% rename from reader/atom/atom_10_test.go rename to internal/reader/atom/atom_10_test.go index 194f16f0..cf23032c 100644 --- a/reader/atom/atom_10_test.go +++ b/internal/reader/atom/atom_10_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import ( "bytes" diff --git a/reader/atom/atom_common.go b/internal/reader/atom/atom_common.go similarity index 96% rename from reader/atom/atom_common.go rename to internal/reader/atom/atom_common.go index 99a1a605..6909747a 100644 --- a/reader/atom/atom_common.go +++ b/internal/reader/atom/atom_common.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import "strings" diff --git a/reader/atom/parser.go b/internal/reader/atom/parser.go similarity index 86% rename from reader/atom/parser.go rename to internal/reader/atom/parser.go index 846c96b6..b685a7a8 100644 --- a/reader/atom/parser.go +++ b/internal/reader/atom/parser.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import ( "bytes" "encoding/xml" "io" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" - xml_decoder "miniflux.app/v2/reader/xml" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" + xml_decoder "miniflux.app/v2/internal/reader/xml" ) type atomFeed interface { diff --git a/reader/atom/parser_test.go b/internal/reader/atom/parser_test.go similarity index 96% rename from reader/atom/parser_test.go rename to internal/reader/atom/parser_test.go index 2e5a7a57..eb8ee586 100644 --- a/reader/atom/parser_test.go +++ b/internal/reader/atom/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package atom // import "miniflux.app/v2/reader/atom" +package atom // import "miniflux.app/v2/internal/reader/atom" import ( "bytes" diff --git a/reader/browser/browser.go b/internal/reader/browser/browser.go similarity index 91% rename from reader/browser/browser.go rename to internal/reader/browser/browser.go index 52d3ab00..fe5374d1 100644 --- a/reader/browser/browser.go +++ b/internal/reader/browser/browser.go @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package browser // import "miniflux.app/v2/reader/browser" +package browser // import "miniflux.app/v2/internal/reader/browser" import ( - "miniflux.app/v2/errors" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/http/client" ) var ( diff --git a/reader/date/parser.go b/internal/reader/date/parser.go similarity index 99% rename from reader/date/parser.go rename to internal/reader/date/parser.go index 746fd1f5..850bc20d 100644 --- a/reader/date/parser.go +++ b/internal/reader/date/parser.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package date // import "miniflux.app/v2/reader/date" +package date // import "miniflux.app/v2/internal/reader/date" import ( "errors" diff --git a/reader/date/parser_test.go b/internal/reader/date/parser_test.go similarity index 99% rename from reader/date/parser_test.go rename to internal/reader/date/parser_test.go index bdd00274..3eaab431 100644 --- a/reader/date/parser_test.go +++ b/internal/reader/date/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package date // import "miniflux.app/v2/reader/date" +package date // import "miniflux.app/v2/internal/reader/date" import ( "testing" diff --git a/reader/encoding/encoding.go b/internal/reader/encoding/encoding.go similarity index 94% rename from reader/encoding/encoding.go rename to internal/reader/encoding/encoding.go index deb57897..a580a050 100644 --- a/reader/encoding/encoding.go +++ b/internal/reader/encoding/encoding.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package encoding // import "miniflux.app/v2/reader/encoding" +package encoding // import "miniflux.app/v2/internal/reader/encoding" import ( "bytes" diff --git a/reader/handler/handler.go b/internal/reader/handler/handler.go similarity index 93% rename from reader/handler/handler.go rename to internal/reader/handler/handler.go index 13118863..06bd78fc 100644 --- a/reader/handler/handler.go +++ b/internal/reader/handler/handler.go @@ -1,24 +1,24 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package handler // import "miniflux.app/v2/reader/handler" +package handler // import "miniflux.app/v2/internal/reader/handler" import ( "fmt" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/errors" - "miniflux.app/v2/http/client" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/browser" - "miniflux.app/v2/reader/icon" - "miniflux.app/v2/reader/parser" - "miniflux.app/v2/reader/processor" - "miniflux.app/v2/storage" - "miniflux.app/v2/timer" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/browser" + "miniflux.app/v2/internal/reader/icon" + "miniflux.app/v2/internal/reader/parser" + "miniflux.app/v2/internal/reader/processor" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/timer" ) var ( diff --git a/reader/icon/finder.go b/internal/reader/icon/finder.go similarity index 94% rename from reader/icon/finder.go rename to internal/reader/icon/finder.go index debc60b4..7f017979 100644 --- a/reader/icon/finder.go +++ b/internal/reader/icon/finder.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package icon // import "miniflux.app/v2/reader/icon" +package icon // import "miniflux.app/v2/internal/reader/icon" import ( "encoding/base64" @@ -11,12 +11,12 @@ import ( stdlib_url "net/url" - "miniflux.app/v2/config" - "miniflux.app/v2/crypto" - "miniflux.app/v2/http/client" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/icon/finder_test.go b/internal/reader/icon/finder_test.go similarity index 98% rename from reader/icon/finder_test.go rename to internal/reader/icon/finder_test.go index 90deaedc..93769194 100644 --- a/reader/icon/finder_test.go +++ b/internal/reader/icon/finder_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package icon // import "miniflux.app/v2/reader/icon" +package icon // import "miniflux.app/v2/internal/reader/icon" import ( "strings" diff --git a/reader/json/json.go b/internal/reader/json/json.go similarity index 93% rename from reader/json/json.go rename to internal/reader/json/json.go index 677fd456..48879541 100644 --- a/reader/json/json.go +++ b/internal/reader/json/json.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package json // import "miniflux.app/v2/reader/json" +package json // import "miniflux.app/v2/internal/reader/json" import ( "strings" "time" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/date" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/date" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/url" ) type jsonFeed struct { diff --git a/reader/json/parser.go b/internal/reader/json/parser.go similarity index 80% rename from reader/json/parser.go rename to internal/reader/json/parser.go index c4edadc7..09963e83 100644 --- a/reader/json/parser.go +++ b/internal/reader/json/parser.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package json // import "miniflux.app/v2/reader/json" +package json // import "miniflux.app/v2/internal/reader/json" import ( "encoding/json" "io" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" ) // Parse returns a normalized feed struct from a JSON feed. diff --git a/reader/json/parser_test.go b/internal/reader/json/parser_test.go similarity index 99% rename from reader/json/parser_test.go rename to internal/reader/json/parser_test.go index 08571360..02664f5c 100644 --- a/reader/json/parser_test.go +++ b/internal/reader/json/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package json // import "miniflux.app/v2/reader/json" +package json // import "miniflux.app/v2/internal/reader/json" import ( "bytes" diff --git a/reader/media/media.go b/internal/reader/media/media.go similarity index 98% rename from reader/media/media.go rename to internal/reader/media/media.go index b3a02b8c..bd846100 100644 --- a/reader/media/media.go +++ b/internal/reader/media/media.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package media // import "miniflux.app/v2/reader/media" +package media // import "miniflux.app/v2/internal/reader/media" import ( "regexp" diff --git a/reader/media/media_test.go b/internal/reader/media/media_test.go similarity index 97% rename from reader/media/media_test.go rename to internal/reader/media/media_test.go index 8345b42e..c3e943ca 100644 --- a/reader/media/media_test.go +++ b/internal/reader/media/media_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package media // import "miniflux.app/v2/reader/media" +package media // import "miniflux.app/v2/internal/reader/media" import "testing" diff --git a/reader/opml/handler.go b/internal/reader/opml/handler.go similarity index 92% rename from reader/opml/handler.go rename to internal/reader/opml/handler.go index 8ef736c4..1d874a87 100644 --- a/reader/opml/handler.go +++ b/internal/reader/opml/handler.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" import ( "errors" "fmt" "io" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) // Handler handles the logic for OPML import/export. diff --git a/reader/opml/opml.go b/internal/reader/opml/opml.go similarity index 96% rename from reader/opml/opml.go rename to internal/reader/opml/opml.go index cf50563c..2f7147a0 100644 --- a/reader/opml/opml.go +++ b/internal/reader/opml/opml.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" import ( "encoding/xml" diff --git a/reader/opml/parser.go b/internal/reader/opml/parser.go similarity index 89% rename from reader/opml/parser.go rename to internal/reader/opml/parser.go index 84032a95..7dac0de5 100644 --- a/reader/opml/parser.go +++ b/internal/reader/opml/parser.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" import ( "encoding/xml" "io" - "miniflux.app/v2/errors" - "miniflux.app/v2/reader/encoding" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/reader/encoding" ) // Parse reads an OPML file and returns a SubcriptionList. diff --git a/reader/opml/parser_test.go b/internal/reader/opml/parser_test.go similarity index 99% rename from reader/opml/parser_test.go rename to internal/reader/opml/parser_test.go index c02dd1b2..c1d2ca5b 100644 --- a/reader/opml/parser_test.go +++ b/internal/reader/opml/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" import ( "bytes" diff --git a/reader/opml/serializer.go b/internal/reader/opml/serializer.go similarity index 94% rename from reader/opml/serializer.go rename to internal/reader/opml/serializer.go index 243e5d05..69581100 100644 --- a/reader/opml/serializer.go +++ b/internal/reader/opml/serializer.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" import ( "bufio" @@ -10,7 +10,7 @@ import ( "sort" "time" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/logger" ) // Serialize returns a SubcriptionList in OPML format. diff --git a/reader/opml/serializer_test.go b/internal/reader/opml/serializer_test.go similarity index 97% rename from reader/opml/serializer_test.go rename to internal/reader/opml/serializer_test.go index 12d2b697..b0f5a5a6 100644 --- a/reader/opml/serializer_test.go +++ b/internal/reader/opml/serializer_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" import ( "bytes" diff --git a/reader/opml/subscription.go b/internal/reader/opml/subscription.go similarity index 91% rename from reader/opml/subscription.go rename to internal/reader/opml/subscription.go index 3c473849..6c05a204 100644 --- a/reader/opml/subscription.go +++ b/internal/reader/opml/subscription.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package opml // import "miniflux.app/v2/reader/opml" +package opml // import "miniflux.app/v2/internal/reader/opml" // Subcription represents a feed that will be imported or exported. type Subcription struct { diff --git a/reader/parser/format.go b/internal/reader/parser/format.go similarity index 88% rename from reader/parser/format.go rename to internal/reader/parser/format.go index 673f47c1..77a49d2c 100644 --- a/reader/parser/format.go +++ b/internal/reader/parser/format.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package parser // import "miniflux.app/v2/reader/parser" +package parser // import "miniflux.app/v2/internal/reader/parser" import ( "encoding/xml" "strings" - rxml "miniflux.app/v2/reader/xml" + rxml "miniflux.app/v2/internal/reader/xml" ) // List of feed formats. diff --git a/reader/parser/format_test.go b/internal/reader/parser/format_test.go similarity index 97% rename from reader/parser/format_test.go rename to internal/reader/parser/format_test.go index 70837475..936aa82e 100644 --- a/reader/parser/format_test.go +++ b/internal/reader/parser/format_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package parser // import "miniflux.app/v2/reader/parser" +package parser // import "miniflux.app/v2/internal/reader/parser" import ( "testing" diff --git a/reader/parser/parser.go b/internal/reader/parser/parser.go similarity index 70% rename from reader/parser/parser.go rename to internal/reader/parser/parser.go index bedea9b5..c87ac844 100644 --- a/reader/parser/parser.go +++ b/internal/reader/parser/parser.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package parser // import "miniflux.app/v2/reader/parser" +package parser // import "miniflux.app/v2/internal/reader/parser" import ( "strings" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/atom" - "miniflux.app/v2/reader/json" - "miniflux.app/v2/reader/rdf" - "miniflux.app/v2/reader/rss" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/atom" + "miniflux.app/v2/internal/reader/json" + "miniflux.app/v2/internal/reader/rdf" + "miniflux.app/v2/internal/reader/rss" ) // ParseFeed analyzes the input data and returns a normalized feed object. diff --git a/reader/parser/parser_test.go b/internal/reader/parser/parser_test.go similarity index 98% rename from reader/parser/parser_test.go rename to internal/reader/parser/parser_test.go index 2ec76f65..81ddc665 100644 --- a/reader/parser/parser_test.go +++ b/internal/reader/parser/parser_test.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package parser // import "miniflux.app/v2/reader/parser" +package parser // import "miniflux.app/v2/internal/reader/parser" import ( "bytes" "os" "testing" - "miniflux.app/v2/http/client" + "miniflux.app/v2/internal/http/client" ) func TestParseAtom(t *testing.T) { diff --git a/reader/parser/testdata/encoding_ISO-8859-1.xml b/internal/reader/parser/testdata/encoding_ISO-8859-1.xml similarity index 100% rename from reader/parser/testdata/encoding_ISO-8859-1.xml rename to internal/reader/parser/testdata/encoding_ISO-8859-1.xml diff --git a/reader/parser/testdata/encoding_WINDOWS-1251.xml b/internal/reader/parser/testdata/encoding_WINDOWS-1251.xml similarity index 100% rename from reader/parser/testdata/encoding_WINDOWS-1251.xml rename to internal/reader/parser/testdata/encoding_WINDOWS-1251.xml diff --git a/reader/parser/testdata/no_encoding_ISO-8859-1.xml b/internal/reader/parser/testdata/no_encoding_ISO-8859-1.xml similarity index 100% rename from reader/parser/testdata/no_encoding_ISO-8859-1.xml rename to internal/reader/parser/testdata/no_encoding_ISO-8859-1.xml diff --git a/reader/parser/testdata/rdf_UTF8.xml b/internal/reader/parser/testdata/rdf_UTF8.xml similarity index 100% rename from reader/parser/testdata/rdf_UTF8.xml rename to internal/reader/parser/testdata/rdf_UTF8.xml diff --git a/reader/parser/testdata/urdu_UTF8.xml b/internal/reader/parser/testdata/urdu_UTF8.xml similarity index 100% rename from reader/parser/testdata/urdu_UTF8.xml rename to internal/reader/parser/testdata/urdu_UTF8.xml diff --git a/reader/processor/processor.go b/internal/reader/processor/processor.go similarity index 95% rename from reader/processor/processor.go rename to internal/reader/processor/processor.go index 50f40b7b..2deac4cf 100644 --- a/reader/processor/processor.go +++ b/internal/reader/processor/processor.go @@ -13,18 +13,18 @@ import ( "time" "unicode/utf8" - "miniflux.app/v2/integration" + "miniflux.app/v2/internal/integration" - "miniflux.app/v2/config" - "miniflux.app/v2/http/client" - "miniflux.app/v2/logger" - "miniflux.app/v2/metric" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/browser" - "miniflux.app/v2/reader/rewrite" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/reader/scraper" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/metric" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/browser" + "miniflux.app/v2/internal/reader/rewrite" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/reader/scraper" + "miniflux.app/v2/internal/storage" "github.com/PuerkitoBio/goquery" "github.com/rylans/getlang" diff --git a/reader/processor/processor_test.go b/internal/reader/processor/processor_test.go similarity index 95% rename from reader/processor/processor_test.go rename to internal/reader/processor/processor_test.go index 5fccc8e6..a719c81f 100644 --- a/reader/processor/processor_test.go +++ b/internal/reader/processor/processor_test.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package processor // import "miniflux.app/v2/reader/processor" +package processor // import "miniflux.app/v2/internal/reader/processor" import ( "testing" "time" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) func TestBlockingEntries(t *testing.T) { diff --git a/reader/rdf/dublincore.go b/internal/reader/rdf/dublincore.go similarity index 91% rename from reader/rdf/dublincore.go rename to internal/reader/rdf/dublincore.go index 2fb4cc3a..6d0112c3 100644 --- a/reader/rdf/dublincore.go +++ b/internal/reader/rdf/dublincore.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rdf // import "miniflux.app/v2/reader/rdf" +package rdf // import "miniflux.app/v2/internal/reader/rdf" // DublinCoreFeedElement represents Dublin Core feed XML elements. type DublinCoreFeedElement struct { diff --git a/reader/rdf/parser.go b/internal/reader/rdf/parser.go similarity index 74% rename from reader/rdf/parser.go rename to internal/reader/rdf/parser.go index 4397601e..4c7fb556 100644 --- a/reader/rdf/parser.go +++ b/internal/reader/rdf/parser.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rdf // import "miniflux.app/v2/reader/rdf" +package rdf // import "miniflux.app/v2/internal/reader/rdf" import ( "io" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/xml" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/xml" ) // Parse returns a normalized feed struct from a RDF feed. diff --git a/reader/rdf/parser_test.go b/internal/reader/rdf/parser_test.go similarity index 99% rename from reader/rdf/parser_test.go rename to internal/reader/rdf/parser_test.go index 385395a4..52565956 100644 --- a/reader/rdf/parser_test.go +++ b/internal/reader/rdf/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rdf // import "miniflux.app/v2/reader/rdf" +package rdf // import "miniflux.app/v2/internal/reader/rdf" import ( "bytes" diff --git a/reader/rdf/rdf.go b/internal/reader/rdf/rdf.go similarity index 89% rename from reader/rdf/rdf.go rename to internal/reader/rdf/rdf.go index 60cb09e6..5b0e649f 100644 --- a/reader/rdf/rdf.go +++ b/internal/reader/rdf/rdf.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rdf // import "miniflux.app/v2/reader/rdf" +package rdf // import "miniflux.app/v2/internal/reader/rdf" import ( "encoding/xml" @@ -9,12 +9,12 @@ import ( "strings" "time" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/date" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/date" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/url" ) type rdfFeed struct { diff --git a/reader/readability/readability.go b/internal/reader/readability/readability.go similarity index 98% rename from reader/readability/readability.go rename to internal/reader/readability/readability.go index 019d24b3..27b45052 100644 --- a/reader/readability/readability.go +++ b/internal/reader/readability/readability.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package readability // import "miniflux.app/v2/reader/readability" +package readability // import "miniflux.app/v2/internal/reader/readability" import ( "bytes" @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/logger" "github.com/PuerkitoBio/goquery" "golang.org/x/net/html" diff --git a/reader/rewrite/rewrite_functions.go b/internal/reader/rewrite/rewrite_functions.go similarity index 98% rename from reader/rewrite/rewrite_functions.go rename to internal/reader/rewrite/rewrite_functions.go index b02acaa4..0e4aadbb 100644 --- a/reader/rewrite/rewrite_functions.go +++ b/internal/reader/rewrite/rewrite_functions.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rewrite // import "miniflux.app/v2/reader/rewrite" +package rewrite // import "miniflux.app/v2/internal/reader/rewrite" import ( "encoding/base64" @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "miniflux.app/v2/config" + "miniflux.app/v2/internal/config" "github.com/PuerkitoBio/goquery" "github.com/yuin/goldmark" diff --git a/reader/rewrite/rewriter.go b/internal/reader/rewrite/rewriter.go similarity index 95% rename from reader/rewrite/rewriter.go rename to internal/reader/rewrite/rewriter.go index 943832fb..c761ef96 100644 --- a/reader/rewrite/rewriter.go +++ b/internal/reader/rewrite/rewriter.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rewrite // import "miniflux.app/v2/reader/rewrite" +package rewrite // import "miniflux.app/v2/internal/reader/rewrite" import ( "strconv" "strings" "text/scanner" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/url" ) type rule struct { diff --git a/reader/rewrite/rewriter_test.go b/internal/reader/rewrite/rewriter_test.go similarity index 99% rename from reader/rewrite/rewriter_test.go rename to internal/reader/rewrite/rewriter_test.go index 18b97454..b38724e3 100644 --- a/reader/rewrite/rewriter_test.go +++ b/internal/reader/rewrite/rewriter_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rewrite // import "miniflux.app/v2/reader/rewrite" +package rewrite // import "miniflux.app/v2/internal/reader/rewrite" import ( "os" @@ -9,8 +9,8 @@ import ( "strings" "testing" - "miniflux.app/v2/config" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/model" ) func TestParseRules(t *testing.T) { diff --git a/reader/rewrite/rules.go b/internal/reader/rewrite/rules.go similarity index 96% rename from reader/rewrite/rules.go rename to internal/reader/rewrite/rules.go index 8033d920..89204e9d 100644 --- a/reader/rewrite/rules.go +++ b/internal/reader/rewrite/rules.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rewrite // import "miniflux.app/v2/reader/rewrite" +package rewrite // import "miniflux.app/v2/internal/reader/rewrite" // List of predefined rewrite rules (alphabetically sorted) // Available rules: "add_image_title", "add_youtube_video" diff --git a/reader/rss/dublincore.go b/internal/reader/rss/dublincore.go similarity index 88% rename from reader/rss/dublincore.go rename to internal/reader/rss/dublincore.go index 221b1a87..e8a8d243 100644 --- a/reader/rss/dublincore.go +++ b/internal/reader/rss/dublincore.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rss // import "miniflux.app/v2/reader/rss" +package rss // import "miniflux.app/v2/internal/reader/rss" // DublinCoreElement represents Dublin Core XML elements. type DublinCoreElement struct { diff --git a/reader/rss/feedburner.go b/internal/reader/rss/feedburner.go similarity index 87% rename from reader/rss/feedburner.go rename to internal/reader/rss/feedburner.go index f0004288..7b112dfa 100644 --- a/reader/rss/feedburner.go +++ b/internal/reader/rss/feedburner.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rss // import "miniflux.app/v2/reader/rss" +package rss // import "miniflux.app/v2/internal/reader/rss" // FeedBurnerElement represents FeedBurner XML elements. type FeedBurnerElement struct { diff --git a/reader/rss/parser.go b/internal/reader/rss/parser.go similarity index 74% rename from reader/rss/parser.go rename to internal/reader/rss/parser.go index bc046631..1e295534 100644 --- a/reader/rss/parser.go +++ b/internal/reader/rss/parser.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rss // import "miniflux.app/v2/reader/rss" +package rss // import "miniflux.app/v2/internal/reader/rss" import ( "io" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/xml" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/xml" ) // Parse returns a normalized feed struct from a RSS feed. diff --git a/reader/rss/parser_test.go b/internal/reader/rss/parser_test.go similarity index 99% rename from reader/rss/parser_test.go rename to internal/reader/rss/parser_test.go index 3d1ddad7..7846e89d 100644 --- a/reader/rss/parser_test.go +++ b/internal/reader/rss/parser_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rss // import "miniflux.app/v2/reader/rss" +package rss // import "miniflux.app/v2/internal/reader/rss" import ( "bytes" diff --git a/reader/rss/podcast.go b/internal/reader/rss/podcast.go similarity index 97% rename from reader/rss/podcast.go rename to internal/reader/rss/podcast.go index bf39870f..ae6780f1 100644 --- a/reader/rss/podcast.go +++ b/internal/reader/rss/podcast.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rss // import "miniflux.app/v2/reader/rss" +package rss // import "miniflux.app/v2/internal/reader/rss" import "strings" diff --git a/reader/rss/rss.go b/internal/reader/rss/rss.go similarity index 96% rename from reader/rss/rss.go rename to internal/reader/rss/rss.go index 46f957c8..add51a6c 100644 --- a/reader/rss/rss.go +++ b/internal/reader/rss/rss.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package rss // import "miniflux.app/v2/reader/rss" +package rss // import "miniflux.app/v2/internal/reader/rss" import ( "encoding/xml" @@ -11,13 +11,13 @@ import ( "strings" "time" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/reader/date" - "miniflux.app/v2/reader/media" - "miniflux.app/v2/reader/sanitizer" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/date" + "miniflux.app/v2/internal/reader/media" + "miniflux.app/v2/internal/reader/sanitizer" + "miniflux.app/v2/internal/url" ) // Specs: https://cyber.harvard.edu/rss/rss.html diff --git a/reader/sanitizer/sanitizer.go b/internal/reader/sanitizer/sanitizer.go similarity index 98% rename from reader/sanitizer/sanitizer.go rename to internal/reader/sanitizer/sanitizer.go index 620198c4..57a5fbff 100644 --- a/reader/sanitizer/sanitizer.go +++ b/internal/reader/sanitizer/sanitizer.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package sanitizer // import "miniflux.app/v2/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/internal/reader/sanitizer" import ( "bytes" @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "miniflux.app/v2/config" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/url" "golang.org/x/net/html" ) diff --git a/reader/sanitizer/sanitizer_test.go b/internal/reader/sanitizer/sanitizer_test.go similarity index 99% rename from reader/sanitizer/sanitizer_test.go rename to internal/reader/sanitizer/sanitizer_test.go index 79de66b5..907005ea 100644 --- a/reader/sanitizer/sanitizer_test.go +++ b/internal/reader/sanitizer/sanitizer_test.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package sanitizer // import "miniflux.app/v2/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/internal/reader/sanitizer" import ( "os" "testing" - "miniflux.app/v2/config" + "miniflux.app/v2/internal/config" ) func TestMain(m *testing.M) { diff --git a/reader/sanitizer/srcset.go b/internal/reader/sanitizer/srcset.go similarity index 100% rename from reader/sanitizer/srcset.go rename to internal/reader/sanitizer/srcset.go diff --git a/reader/sanitizer/srcset_test.go b/internal/reader/sanitizer/srcset_test.go similarity index 100% rename from reader/sanitizer/srcset_test.go rename to internal/reader/sanitizer/srcset_test.go diff --git a/reader/sanitizer/strip_tags.go b/internal/reader/sanitizer/strip_tags.go similarity index 89% rename from reader/sanitizer/strip_tags.go rename to internal/reader/sanitizer/strip_tags.go index 6d8ecc8b..91d4901f 100644 --- a/reader/sanitizer/strip_tags.go +++ b/internal/reader/sanitizer/strip_tags.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package sanitizer // import "miniflux.app/v2/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/internal/reader/sanitizer" import ( "bytes" diff --git a/reader/sanitizer/strip_tags_test.go b/internal/reader/sanitizer/strip_tags_test.go similarity index 86% rename from reader/sanitizer/strip_tags_test.go rename to internal/reader/sanitizer/strip_tags_test.go index 9798d914..ee0d7b1e 100644 --- a/reader/sanitizer/strip_tags_test.go +++ b/internal/reader/sanitizer/strip_tags_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package sanitizer // import "miniflux.app/v2/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/internal/reader/sanitizer" import "testing" diff --git a/reader/sanitizer/truncate.go b/internal/reader/sanitizer/truncate.go similarity index 100% rename from reader/sanitizer/truncate.go rename to internal/reader/sanitizer/truncate.go diff --git a/reader/sanitizer/truncate_test.go b/internal/reader/sanitizer/truncate_test.go similarity index 100% rename from reader/sanitizer/truncate_test.go rename to internal/reader/sanitizer/truncate_test.go diff --git a/reader/scraper/rules.go b/internal/reader/scraper/rules.go similarity index 97% rename from reader/scraper/rules.go rename to internal/reader/scraper/rules.go index a53db332..b0682aea 100644 --- a/reader/scraper/rules.go +++ b/internal/reader/scraper/rules.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package scraper // import "miniflux.app/v2/reader/scraper" +package scraper // import "miniflux.app/v2/internal/reader/scraper" // List of predefined scraper rules (alphabetically sorted) // domain => CSS selectors diff --git a/reader/scraper/scraper.go b/internal/reader/scraper/scraper.go similarity index 90% rename from reader/scraper/scraper.go rename to internal/reader/scraper/scraper.go index 3b1a1d8e..c6c81c40 100644 --- a/reader/scraper/scraper.go +++ b/internal/reader/scraper/scraper.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package scraper // import "miniflux.app/v2/reader/scraper" +package scraper // import "miniflux.app/v2/internal/reader/scraper" import ( "errors" @@ -9,11 +9,11 @@ import ( "io" "strings" - "miniflux.app/v2/config" - "miniflux.app/v2/http/client" - "miniflux.app/v2/logger" - "miniflux.app/v2/reader/readability" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/reader/readability" + "miniflux.app/v2/internal/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/scraper/scraper_test.go b/internal/reader/scraper/scraper_test.go similarity index 97% rename from reader/scraper/scraper_test.go rename to internal/reader/scraper/scraper_test.go index 414108f8..ced32d5e 100644 --- a/reader/scraper/scraper_test.go +++ b/internal/reader/scraper/scraper_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package scraper // import "miniflux.app/v2/reader/scraper" +package scraper // import "miniflux.app/v2/internal/reader/scraper" import ( "bytes" diff --git a/reader/scraper/testdata/iframe.html b/internal/reader/scraper/testdata/iframe.html similarity index 100% rename from reader/scraper/testdata/iframe.html rename to internal/reader/scraper/testdata/iframe.html diff --git a/reader/scraper/testdata/iframe.html-result b/internal/reader/scraper/testdata/iframe.html-result similarity index 100% rename from reader/scraper/testdata/iframe.html-result rename to internal/reader/scraper/testdata/iframe.html-result diff --git a/reader/scraper/testdata/img.html b/internal/reader/scraper/testdata/img.html similarity index 100% rename from reader/scraper/testdata/img.html rename to internal/reader/scraper/testdata/img.html diff --git a/reader/scraper/testdata/img.html-result b/internal/reader/scraper/testdata/img.html-result similarity index 100% rename from reader/scraper/testdata/img.html-result rename to internal/reader/scraper/testdata/img.html-result diff --git a/reader/scraper/testdata/p.html b/internal/reader/scraper/testdata/p.html similarity index 100% rename from reader/scraper/testdata/p.html rename to internal/reader/scraper/testdata/p.html diff --git a/reader/scraper/testdata/p.html-result b/internal/reader/scraper/testdata/p.html-result similarity index 100% rename from reader/scraper/testdata/p.html-result rename to internal/reader/scraper/testdata/p.html-result diff --git a/reader/subscription/finder.go b/internal/reader/subscription/finder.go similarity index 94% rename from reader/subscription/finder.go rename to internal/reader/subscription/finder.go index 877b3f86..4e07f23c 100644 --- a/reader/subscription/finder.go +++ b/internal/reader/subscription/finder.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package subscription // import "miniflux.app/v2/reader/subscription" +package subscription // import "miniflux.app/v2/internal/reader/subscription" import ( "fmt" @@ -9,12 +9,12 @@ import ( "regexp" "strings" - "miniflux.app/v2/config" - "miniflux.app/v2/errors" - "miniflux.app/v2/http/client" - "miniflux.app/v2/reader/browser" - "miniflux.app/v2/reader/parser" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/reader/browser" + "miniflux.app/v2/internal/reader/parser" + "miniflux.app/v2/internal/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/subscription/finder_test.go b/internal/reader/subscription/finder_test.go similarity index 100% rename from reader/subscription/finder_test.go rename to internal/reader/subscription/finder_test.go diff --git a/reader/subscription/subscription.go b/internal/reader/subscription/subscription.go similarity index 86% rename from reader/subscription/subscription.go rename to internal/reader/subscription/subscription.go index e2634b87..8facebc1 100644 --- a/reader/subscription/subscription.go +++ b/internal/reader/subscription/subscription.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package subscription // import "miniflux.app/v2/reader/subscription" +package subscription // import "miniflux.app/v2/internal/reader/subscription" import "fmt" diff --git a/reader/xml/decoder.go b/internal/reader/xml/decoder.go similarity index 95% rename from reader/xml/decoder.go rename to internal/reader/xml/decoder.go index cd702888..b8af6330 100644 --- a/reader/xml/decoder.go +++ b/internal/reader/xml/decoder.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package xml // import "miniflux.app/v2/reader/xml" +package xml // import "miniflux.app/v2/internal/reader/xml" import ( "bytes" @@ -10,7 +10,7 @@ import ( "io" "strings" - "miniflux.app/v2/reader/encoding" + "miniflux.app/v2/internal/reader/encoding" ) // NewDecoder returns a XML decoder that filters illegal characters. diff --git a/reader/xml/decoder_test.go b/internal/reader/xml/decoder_test.go similarity index 97% rename from reader/xml/decoder_test.go rename to internal/reader/xml/decoder_test.go index cfd7732f..b8d59b5c 100644 --- a/reader/xml/decoder_test.go +++ b/internal/reader/xml/decoder_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package xml // import "miniflux.app/v2/reader/xml" +package xml // import "miniflux.app/v2/internal/reader/xml" import ( "encoding/xml" diff --git a/storage/api_key.go b/internal/storage/api_key.go similarity index 96% rename from storage/api_key.go rename to internal/storage/api_key.go index 6b59c92b..7004a3a7 100644 --- a/storage/api_key.go +++ b/internal/storage/api_key.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "fmt" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // APIKeyExists checks if an API Key with the same description exists. diff --git a/storage/category.go b/internal/storage/category.go similarity index 98% rename from storage/category.go rename to internal/storage/category.go index 686b458c..5ee8404b 100644 --- a/storage/category.go +++ b/internal/storage/category.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" @@ -9,7 +9,7 @@ import ( "fmt" "github.com/lib/pq" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // AnotherCategoryExists checks if another category exists with the same title. diff --git a/storage/certificate_cache.go b/internal/storage/certificate_cache.go similarity index 96% rename from storage/certificate_cache.go rename to internal/storage/certificate_cache.go index f956d304..692497a0 100644 --- a/storage/certificate_cache.go +++ b/internal/storage/certificate_cache.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "context" diff --git a/storage/enclosure.go b/internal/storage/enclosure.go similarity index 97% rename from storage/enclosure.go rename to internal/storage/enclosure.go index e1461788..8f8ef8e1 100644 --- a/storage/enclosure.go +++ b/internal/storage/enclosure.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" "fmt" "strings" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // GetEnclosures returns all attachments for the given entry. diff --git a/storage/entry.go b/internal/storage/entry.go similarity index 98% rename from storage/entry.go rename to internal/storage/entry.go index a6ed1397..fd8a0110 100644 --- a/storage/entry.go +++ b/internal/storage/entry.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" @@ -9,9 +9,9 @@ import ( "fmt" "time" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" "github.com/lib/pq" ) diff --git a/storage/entry_pagination_builder.go b/internal/storage/entry_pagination_builder.go similarity index 97% rename from storage/entry_pagination_builder.go rename to internal/storage/entry_pagination_builder.go index ed85c927..b4f77c8c 100644 --- a/storage/entry_pagination_builder.go +++ b/internal/storage/entry_pagination_builder.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" @@ -9,8 +9,8 @@ import ( "strings" "time" - "miniflux.app/v2/model" - "miniflux.app/v2/timer" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/timer" ) // EntryPaginationBuilder is a builder for entry prev/next queries. diff --git a/storage/entry_query_builder.go b/internal/storage/entry_query_builder.go similarity index 98% rename from storage/entry_query_builder.go rename to internal/storage/entry_query_builder.go index 5e41abbb..70e72893 100644 --- a/storage/entry_query_builder.go +++ b/internal/storage/entry_query_builder.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" - "miniflux.app/v2/model" - "miniflux.app/v2/timezone" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/timezone" ) // EntryQueryBuilder builds a SQL query to fetch entries. diff --git a/storage/feed.go b/internal/storage/feed.go similarity index 98% rename from storage/feed.go rename to internal/storage/feed.go index 0461b6f2..e049c31e 100644 --- a/storage/feed.go +++ b/internal/storage/feed.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" @@ -10,9 +10,9 @@ import ( "runtime" "sort" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" ) type byStateAndName struct{ f model.Feeds } diff --git a/storage/feed_query_builder.go b/internal/storage/feed_query_builder.go similarity index 98% rename from storage/feed_query_builder.go rename to internal/storage/feed_query_builder.go index b1cf5a66..b9360d72 100644 --- a/storage/feed_query_builder.go +++ b/internal/storage/feed_query_builder.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" "fmt" "strings" - "miniflux.app/v2/model" - "miniflux.app/v2/timezone" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/timezone" ) // FeedQueryBuilder builds a SQL query to fetch feeds. diff --git a/storage/icon.go b/internal/storage/icon.go similarity index 97% rename from storage/icon.go rename to internal/storage/icon.go index f0d8253e..dc24ff89 100644 --- a/storage/icon.go +++ b/internal/storage/icon.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" "fmt" "strings" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // HasIcon checks if the given feed has an icon. diff --git a/storage/integration.go b/internal/storage/integration.go similarity index 99% rename from storage/integration.go rename to internal/storage/integration.go index 1293f75c..b0a10128 100644 --- a/storage/integration.go +++ b/internal/storage/integration.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" "fmt" "golang.org/x/crypto/bcrypt" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // HasDuplicateFeverUsername checks if another user have the same Fever username. diff --git a/storage/job.go b/internal/storage/job.go similarity index 94% rename from storage/job.go rename to internal/storage/job.go index 75597db5..de3fdb32 100644 --- a/storage/job.go +++ b/internal/storage/job.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "fmt" - "miniflux.app/v2/config" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/model" ) // NewBatch returns a series of jobs. diff --git a/storage/session.go b/internal/storage/session.go similarity index 95% rename from storage/session.go rename to internal/storage/session.go index b3369a4a..77e20c35 100644 --- a/storage/session.go +++ b/internal/storage/session.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" "fmt" - "miniflux.app/v2/crypto" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/model" ) // CreateAppSessionWithUserPrefs creates a new application session with the given user preferences. diff --git a/storage/storage.go b/internal/storage/storage.go similarity index 94% rename from storage/storage.go rename to internal/storage/storage.go index 59c6acab..d0cff3fc 100644 --- a/storage/storage.go +++ b/internal/storage/storage.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "context" diff --git a/storage/timezone.go b/internal/storage/timezone.go similarity index 93% rename from storage/timezone.go rename to internal/storage/timezone.go index a5b69c6a..263dae1e 100644 --- a/storage/timezone.go +++ b/internal/storage/timezone.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "fmt" diff --git a/storage/user.go b/internal/storage/user.go similarity index 98% rename from storage/user.go rename to internal/storage/user.go index dfcdbae2..0c5fcad0 100644 --- a/storage/user.go +++ b/internal/storage/user.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" @@ -9,9 +9,9 @@ import ( "runtime" "strings" - "miniflux.app/v2/crypto" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" "github.com/lib/pq" "golang.org/x/crypto/bcrypt" diff --git a/storage/user_session.go b/internal/storage/user_session.go similarity index 96% rename from storage/user_session.go rename to internal/storage/user_session.go index a3f54186..9853d758 100644 --- a/storage/user_session.go +++ b/internal/storage/user_session.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package storage // import "miniflux.app/v2/storage" +package storage // import "miniflux.app/v2/internal/storage" import ( "database/sql" "fmt" - "miniflux.app/v2/crypto" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/model" ) // UserSessions returns the list of sessions for the given user. diff --git a/systemd/systemd.go b/internal/systemd/systemd.go similarity index 96% rename from systemd/systemd.go rename to internal/systemd/systemd.go index 4f604690..a4d0ab37 100644 --- a/systemd/systemd.go +++ b/internal/systemd/systemd.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package systemd // import "miniflux.app/v2/systemd" +package systemd // import "miniflux.app/v2/internal/systemd" import ( "fmt" diff --git a/template/engine.go b/internal/template/engine.go similarity index 95% rename from template/engine.go rename to internal/template/engine.go index 306acddb..a156101d 100644 --- a/template/engine.go +++ b/internal/template/engine.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package template // import "miniflux.app/v2/template" +package template // import "miniflux.app/v2/internal/template" import ( "bytes" @@ -10,9 +10,9 @@ import ( "strings" "time" - "miniflux.app/v2/errors" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" "github.com/gorilla/mux" ) diff --git a/template/functions.go b/internal/template/functions.go similarity index 93% rename from template/functions.go rename to internal/template/functions.go index 698dee8a..08b02411 100644 --- a/template/functions.go +++ b/internal/template/functions.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package template // import "miniflux.app/v2/template" +package template // import "miniflux.app/v2/internal/template" import ( "fmt" @@ -11,14 +11,14 @@ import ( "strings" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/crypto" - "miniflux.app/v2/http/route" - "miniflux.app/v2/locale" - "miniflux.app/v2/model" - "miniflux.app/v2/proxy" - "miniflux.app/v2/timezone" - "miniflux.app/v2/url" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/proxy" + "miniflux.app/v2/internal/timezone" + "miniflux.app/v2/internal/url" "github.com/gorilla/mux" ) diff --git a/template/functions_test.go b/internal/template/functions_test.go similarity index 97% rename from template/functions_test.go rename to internal/template/functions_test.go index de3896a3..193ec128 100644 --- a/template/functions_test.go +++ b/internal/template/functions_test.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package template // import "miniflux.app/v2/template" +package template // import "miniflux.app/v2/internal/template" import ( "testing" "time" - "miniflux.app/v2/locale" + "miniflux.app/v2/internal/locale" ) func TestDict(t *testing.T) { diff --git a/template/templates/common/entry_pagination.html b/internal/template/templates/common/entry_pagination.html similarity index 100% rename from template/templates/common/entry_pagination.html rename to internal/template/templates/common/entry_pagination.html diff --git a/template/templates/common/feed_list.html b/internal/template/templates/common/feed_list.html similarity index 100% rename from template/templates/common/feed_list.html rename to internal/template/templates/common/feed_list.html diff --git a/template/templates/common/feed_menu.html b/internal/template/templates/common/feed_menu.html similarity index 100% rename from template/templates/common/feed_menu.html rename to internal/template/templates/common/feed_menu.html diff --git a/template/templates/common/item_meta.html b/internal/template/templates/common/item_meta.html similarity index 100% rename from template/templates/common/item_meta.html rename to internal/template/templates/common/item_meta.html diff --git a/template/templates/common/layout.html b/internal/template/templates/common/layout.html similarity index 100% rename from template/templates/common/layout.html rename to internal/template/templates/common/layout.html diff --git a/template/templates/common/pagination.html b/internal/template/templates/common/pagination.html similarity index 100% rename from template/templates/common/pagination.html rename to internal/template/templates/common/pagination.html diff --git a/template/templates/common/settings_menu.html b/internal/template/templates/common/settings_menu.html similarity index 100% rename from template/templates/common/settings_menu.html rename to internal/template/templates/common/settings_menu.html diff --git a/template/templates/standalone/offline.html b/internal/template/templates/standalone/offline.html similarity index 100% rename from template/templates/standalone/offline.html rename to internal/template/templates/standalone/offline.html diff --git a/template/templates/views/about.html b/internal/template/templates/views/about.html similarity index 100% rename from template/templates/views/about.html rename to internal/template/templates/views/about.html diff --git a/template/templates/views/add_subscription.html b/internal/template/templates/views/add_subscription.html similarity index 100% rename from template/templates/views/add_subscription.html rename to internal/template/templates/views/add_subscription.html diff --git a/template/templates/views/api_keys.html b/internal/template/templates/views/api_keys.html similarity index 100% rename from template/templates/views/api_keys.html rename to internal/template/templates/views/api_keys.html diff --git a/template/templates/views/bookmark_entries.html b/internal/template/templates/views/bookmark_entries.html similarity index 100% rename from template/templates/views/bookmark_entries.html rename to internal/template/templates/views/bookmark_entries.html diff --git a/template/templates/views/categories.html b/internal/template/templates/views/categories.html similarity index 100% rename from template/templates/views/categories.html rename to internal/template/templates/views/categories.html diff --git a/template/templates/views/category_entries.html b/internal/template/templates/views/category_entries.html similarity index 100% rename from template/templates/views/category_entries.html rename to internal/template/templates/views/category_entries.html diff --git a/template/templates/views/category_feeds.html b/internal/template/templates/views/category_feeds.html similarity index 100% rename from template/templates/views/category_feeds.html rename to internal/template/templates/views/category_feeds.html diff --git a/template/templates/views/choose_subscription.html b/internal/template/templates/views/choose_subscription.html similarity index 100% rename from template/templates/views/choose_subscription.html rename to internal/template/templates/views/choose_subscription.html diff --git a/template/templates/views/create_api_key.html b/internal/template/templates/views/create_api_key.html similarity index 100% rename from template/templates/views/create_api_key.html rename to internal/template/templates/views/create_api_key.html diff --git a/template/templates/views/create_category.html b/internal/template/templates/views/create_category.html similarity index 100% rename from template/templates/views/create_category.html rename to internal/template/templates/views/create_category.html diff --git a/template/templates/views/create_user.html b/internal/template/templates/views/create_user.html similarity index 100% rename from template/templates/views/create_user.html rename to internal/template/templates/views/create_user.html diff --git a/template/templates/views/edit_category.html b/internal/template/templates/views/edit_category.html similarity index 100% rename from template/templates/views/edit_category.html rename to internal/template/templates/views/edit_category.html diff --git a/template/templates/views/edit_feed.html b/internal/template/templates/views/edit_feed.html similarity index 100% rename from template/templates/views/edit_feed.html rename to internal/template/templates/views/edit_feed.html diff --git a/template/templates/views/edit_user.html b/internal/template/templates/views/edit_user.html similarity index 100% rename from template/templates/views/edit_user.html rename to internal/template/templates/views/edit_user.html diff --git a/template/templates/views/entry.html b/internal/template/templates/views/entry.html similarity index 100% rename from template/templates/views/entry.html rename to internal/template/templates/views/entry.html diff --git a/template/templates/views/feed_entries.html b/internal/template/templates/views/feed_entries.html similarity index 100% rename from template/templates/views/feed_entries.html rename to internal/template/templates/views/feed_entries.html diff --git a/template/templates/views/feeds.html b/internal/template/templates/views/feeds.html similarity index 100% rename from template/templates/views/feeds.html rename to internal/template/templates/views/feeds.html diff --git a/template/templates/views/history_entries.html b/internal/template/templates/views/history_entries.html similarity index 100% rename from template/templates/views/history_entries.html rename to internal/template/templates/views/history_entries.html diff --git a/template/templates/views/import.html b/internal/template/templates/views/import.html similarity index 100% rename from template/templates/views/import.html rename to internal/template/templates/views/import.html diff --git a/template/templates/views/integrations.html b/internal/template/templates/views/integrations.html similarity index 100% rename from template/templates/views/integrations.html rename to internal/template/templates/views/integrations.html diff --git a/template/templates/views/login.html b/internal/template/templates/views/login.html similarity index 100% rename from template/templates/views/login.html rename to internal/template/templates/views/login.html diff --git a/template/templates/views/search_entries.html b/internal/template/templates/views/search_entries.html similarity index 100% rename from template/templates/views/search_entries.html rename to internal/template/templates/views/search_entries.html diff --git a/template/templates/views/sessions.html b/internal/template/templates/views/sessions.html similarity index 100% rename from template/templates/views/sessions.html rename to internal/template/templates/views/sessions.html diff --git a/template/templates/views/settings.html b/internal/template/templates/views/settings.html similarity index 100% rename from template/templates/views/settings.html rename to internal/template/templates/views/settings.html diff --git a/template/templates/views/shared_entries.html b/internal/template/templates/views/shared_entries.html similarity index 100% rename from template/templates/views/shared_entries.html rename to internal/template/templates/views/shared_entries.html diff --git a/template/templates/views/unread_entries.html b/internal/template/templates/views/unread_entries.html similarity index 100% rename from template/templates/views/unread_entries.html rename to internal/template/templates/views/unread_entries.html diff --git a/template/templates/views/users.html b/internal/template/templates/views/users.html similarity index 100% rename from template/templates/views/users.html rename to internal/template/templates/views/users.html diff --git a/tests/category_test.go b/internal/tests/category_test.go similarity index 100% rename from tests/category_test.go rename to internal/tests/category_test.go diff --git a/tests/endpoint_test.go b/internal/tests/endpoint_test.go similarity index 100% rename from tests/endpoint_test.go rename to internal/tests/endpoint_test.go diff --git a/tests/entry_test.go b/internal/tests/entry_test.go similarity index 100% rename from tests/entry_test.go rename to internal/tests/entry_test.go diff --git a/tests/feed_test.go b/internal/tests/feed_test.go similarity index 100% rename from tests/feed_test.go rename to internal/tests/feed_test.go diff --git a/tests/import_export_test.go b/internal/tests/import_export_test.go similarity index 100% rename from tests/import_export_test.go rename to internal/tests/import_export_test.go diff --git a/tests/subscription_test.go b/internal/tests/subscription_test.go similarity index 100% rename from tests/subscription_test.go rename to internal/tests/subscription_test.go diff --git a/tests/tests.go b/internal/tests/tests.go similarity index 97% rename from tests/tests.go rename to internal/tests/tests.go index 76618635..817aab61 100644 --- a/tests/tests.go +++ b/internal/tests/tests.go @@ -11,7 +11,6 @@ import ( "strconv" "strings" "testing" - "time" miniflux "miniflux.app/v2/client" ) @@ -28,7 +27,6 @@ const ( ) func getRandomUsername() string { - rand.Seed(time.Now().UnixNano()) var suffix []string for i := 0; i < 10; i++ { suffix = append(suffix, strconv.Itoa(rand.Intn(1000))) diff --git a/tests/user_test.go b/internal/tests/user_test.go similarity index 100% rename from tests/user_test.go rename to internal/tests/user_test.go diff --git a/timer/timer.go b/internal/timer/timer.go similarity index 78% rename from timer/timer.go rename to internal/timer/timer.go index c1e29984..8122136c 100644 --- a/timer/timer.go +++ b/internal/timer/timer.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package timer // import "miniflux.app/v2/timer" +package timer // import "miniflux.app/v2/internal/timer" import ( "time" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/logger" ) // ExecutionTime returns the elapsed time of a block of code. diff --git a/timezone/timezone.go b/internal/timezone/timezone.go similarity index 94% rename from timezone/timezone.go rename to internal/timezone/timezone.go index 064bc756..3c7fa7c2 100644 --- a/timezone/timezone.go +++ b/internal/timezone/timezone.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package timezone // import "miniflux.app/v2/timezone" +package timezone // import "miniflux.app/v2/internal/timezone" import ( "time" diff --git a/timezone/timezone_test.go b/internal/timezone/timezone_test.go similarity index 97% rename from timezone/timezone_test.go rename to internal/timezone/timezone_test.go index dce8b584..dc80c22f 100644 --- a/timezone/timezone_test.go +++ b/internal/timezone/timezone_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package timezone // import "miniflux.app/v2/timezone" +package timezone // import "miniflux.app/v2/internal/timezone" import ( "testing" diff --git a/ui/about.go b/internal/ui/about.go similarity index 76% rename from ui/about.go rename to internal/ui/about.go index 1e844443..762e84dc 100644 --- a/ui/about.go +++ b/internal/ui/about.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "runtime" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" - "miniflux.app/v2/version" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" + "miniflux.app/v2/internal/version" ) func (h *handler) showAboutPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_create.go b/internal/ui/api_key_create.go similarity index 73% rename from ui/api_key_create.go rename to internal/ui/api_key_create.go index bb309d8d..05665037 100644 --- a/ui/api_key_create.go +++ b/internal/ui/api_key_create.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCreateAPIKeyPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_list.go b/internal/ui/api_key_list.go similarity index 78% rename from ui/api_key_list.go rename to internal/ui/api_key_list.go index 5d9ebfee..14879196 100644 --- a/ui/api_key_list.go +++ b/internal/ui/api_key_list.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showAPIKeysPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_remove.go b/internal/ui/api_key_remove.go similarity index 67% rename from ui/api_key_remove.go rename to internal/ui/api_key_remove.go index ecf2ab41..c478cd98 100644 --- a/ui/api_key_remove.go +++ b/internal/ui/api_key_remove.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" ) func (h *handler) removeAPIKey(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_save.go b/internal/ui/api_key_save.go similarity index 78% rename from ui/api_key_save.go rename to internal/ui/api_key_save.go index 94b76421..f311e311 100644 --- a/ui/api_key_save.go +++ b/internal/ui/api_key_save.go @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) saveAPIKey(w http.ResponseWriter, r *http.Request) { diff --git a/ui/bookmark_entries.go b/internal/ui/bookmark_entries.go similarity index 82% rename from ui/bookmark_entries.go rename to internal/ui/bookmark_entries.go index d459af47..049ab1ef 100644 --- a/ui/bookmark_entries.go +++ b/internal/ui/bookmark_entries.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showStarredPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_create.go b/internal/ui/category_create.go similarity index 75% rename from ui/category_create.go rename to internal/ui/category_create.go index f46ca8b5..a03fe678 100644 --- a/ui/category_create.go +++ b/internal/ui/category_create.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCreateCategoryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_edit.go b/internal/ui/category_edit.go similarity index 81% rename from ui/category_edit.go rename to internal/ui/category_edit.go index 791d3cb9..fdc98b59 100644 --- a/ui/category_edit.go +++ b/internal/ui/category_edit.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showEditCategoryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_entries.go b/internal/ui/category_entries.go similarity index 85% rename from ui/category_entries.go rename to internal/ui/category_entries.go index f588dfb2..25027c6c 100644 --- a/ui/category_entries.go +++ b/internal/ui/category_entries.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_entries_all.go b/internal/ui/category_entries_all.go similarity index 85% rename from ui/category_entries_all.go rename to internal/ui/category_entries_all.go index 4706e5ac..3068cfa1 100644 --- a/ui/category_entries_all.go +++ b/internal/ui/category_entries_all.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCategoryEntriesAllPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_feeds.go b/internal/ui/category_feeds.go similarity index 83% rename from ui/category_feeds.go rename to internal/ui/category_feeds.go index 979384d2..0d923e38 100644 --- a/ui/category_feeds.go +++ b/internal/ui/category_feeds.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCategoryFeedsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_list.go b/internal/ui/category_list.go similarity index 79% rename from ui/category_list.go rename to internal/ui/category_list.go index 83ab803b..39572f29 100644 --- a/ui/category_list.go +++ b/internal/ui/category_list.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCategoryListPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_mark_as_read.go b/internal/ui/category_mark_as_read.go similarity index 79% rename from ui/category_mark_as_read.go rename to internal/ui/category_mark_as_read.go index 8e3be25f..31503b14 100644 --- a/ui/category_mark_as_read.go +++ b/internal/ui/category_mark_as_read.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" ) func (h *handler) markCategoryAsRead(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_refresh.go b/internal/ui/category_refresh.go similarity index 84% rename from ui/category_refresh.go rename to internal/ui/category_refresh.go index 6cf63f1f..5d084c06 100644 --- a/ui/category_refresh.go +++ b/internal/ui/category_refresh.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" ) func (h *handler) refreshCategoryEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_remove.go b/internal/ui/category_remove.go similarity index 80% rename from ui/category_remove.go rename to internal/ui/category_remove.go index f68471c3..16b5ba3d 100644 --- a/ui/category_remove.go +++ b/internal/ui/category_remove.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" ) func (h *handler) removeCategory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_save.go b/internal/ui/category_save.go similarity index 76% rename from ui/category_save.go rename to internal/ui/category_save.go index 88f2fe99..bfdd3afe 100644 --- a/ui/category_save.go +++ b/internal/ui/category_save.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" + "miniflux.app/v2/internal/validator" ) func (h *handler) saveCategory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_update.go b/internal/ui/category_update.go similarity index 81% rename from ui/category_update.go rename to internal/ui/category_update.go index 9632fd15..5a8483fa 100644 --- a/ui/category_update.go +++ b/internal/ui/category_update.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" + "miniflux.app/v2/internal/validator" ) func (h *handler) updateCategory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_bookmark.go b/internal/ui/entry_bookmark.go similarity index 86% rename from ui/entry_bookmark.go rename to internal/ui/entry_bookmark.go index 70efba36..f1a72c08 100644 --- a/ui/entry_bookmark.go +++ b/internal/ui/entry_bookmark.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showStarredEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_category.go b/internal/ui/entry_category.go similarity index 87% rename from ui/entry_category.go rename to internal/ui/entry_category.go index 5ae553d6..ae6935ea 100644 --- a/ui/entry_category.go +++ b/internal/ui/entry_category.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCategoryEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_enclosure_save_position.go b/internal/ui/entry_enclosure_save_position.go similarity index 88% rename from ui/entry_enclosure_save_position.go rename to internal/ui/entry_enclosure_save_position.go index fd37dc16..c125ac15 100644 --- a/ui/entry_enclosure_save_position.go +++ b/internal/ui/entry_enclosure_save_position.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( json2 "encoding/json" "io" "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" ) func (h *handler) saveEnclosureProgression(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_feed.go b/internal/ui/entry_feed.go similarity index 86% rename from ui/entry_feed.go rename to internal/ui/entry_feed.go index 695b6f53..e64b17f3 100644 --- a/ui/entry_feed.go +++ b/internal/ui/entry_feed.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showFeedEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_read.go b/internal/ui/entry_read.go similarity index 84% rename from ui/entry_read.go rename to internal/ui/entry_read.go index 171549a5..48acac02 100644 --- a/ui/entry_read.go +++ b/internal/ui/entry_read.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showReadEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_save.go b/internal/ui/entry_save.go similarity index 78% rename from ui/entry_save.go rename to internal/ui/entry_save.go index 3ee2cd45..20cb9244 100644 --- a/ui/entry_save.go +++ b/internal/ui/entry_save.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/integration" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/integration" + "miniflux.app/v2/internal/model" ) func (h *handler) saveEntry(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_scraper.go b/internal/ui/entry_scraper.go similarity index 81% rename from ui/entry_scraper.go rename to internal/ui/entry_scraper.go index cd9fa9f8..b26bf04c 100644 --- a/ui/entry_scraper.go +++ b/internal/ui/entry_scraper.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/locale" - "miniflux.app/v2/model" - "miniflux.app/v2/proxy" - "miniflux.app/v2/reader/processor" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/proxy" + "miniflux.app/v2/internal/reader/processor" + "miniflux.app/v2/internal/storage" ) func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_search.go b/internal/ui/entry_search.go similarity index 87% rename from ui/entry_search.go rename to internal/ui/entry_search.go index ae89acaf..e3b8b920 100644 --- a/ui/entry_search.go +++ b/internal/ui/entry_search.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showSearchEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_toggle_bookmark.go b/internal/ui/entry_toggle_bookmark.go similarity index 74% rename from ui/entry_toggle_bookmark.go rename to internal/ui/entry_toggle_bookmark.go index 230d2237..7fb3cbe8 100644 --- a/ui/entry_toggle_bookmark.go +++ b/internal/ui/entry_toggle_bookmark.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" ) func (h *handler) toggleBookmark(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_unread.go b/internal/ui/entry_unread.go similarity index 88% rename from ui/entry_unread.go rename to internal/ui/entry_unread.go index 7f08d1ae..b30dad19 100644 --- a/ui/entry_unread.go +++ b/internal/ui/entry_unread.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showUnreadEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_update_status.go b/internal/ui/entry_update_status.go similarity index 79% rename from ui/entry_update_status.go rename to internal/ui/entry_update_status.go index 31d139f5..d0f7a522 100644 --- a/ui/entry_update_status.go +++ b/internal/ui/entry_update_status.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( json_parser "encoding/json" "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/model" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/validator" ) func (h *handler) updateEntriesStatus(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_edit.go b/internal/ui/feed_edit.go similarity index 88% rename from ui/feed_edit.go rename to internal/ui/feed_edit.go index 0ae5f3f5..a9bb4fe7 100644 --- a/ui/feed_edit.go +++ b/internal/ui/feed_edit.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showEditFeedPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_entries.go b/internal/ui/feed_entries.go similarity index 85% rename from ui/feed_entries.go rename to internal/ui/feed_entries.go index d85bb345..3d839216 100644 --- a/ui/feed_entries.go +++ b/internal/ui/feed_entries.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_entries_all.go b/internal/ui/feed_entries_all.go similarity index 85% rename from ui/feed_entries_all.go rename to internal/ui/feed_entries_all.go index 305196f5..d0b8c499 100644 --- a/ui/feed_entries_all.go +++ b/internal/ui/feed_entries_all.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showFeedEntriesAllPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_icon.go b/internal/ui/feed_icon.go similarity index 79% rename from ui/feed_icon.go rename to internal/ui/feed_icon.go index 69c26e40..f83f3f4c 100644 --- a/ui/feed_icon.go +++ b/internal/ui/feed_icon.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" ) func (h *handler) showIcon(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_list.go b/internal/ui/feed_list.go similarity index 79% rename from ui/feed_list.go rename to internal/ui/feed_list.go index 9c932954..1c0ef60f 100644 --- a/ui/feed_list.go +++ b/internal/ui/feed_list.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showFeedsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_mark_as_read.go b/internal/ui/feed_mark_as_read.go similarity index 78% rename from ui/feed_mark_as_read.go rename to internal/ui/feed_mark_as_read.go index 1aebeafd..3a2420f0 100644 --- a/ui/feed_mark_as_read.go +++ b/internal/ui/feed_mark_as_read.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" ) func (h *handler) markFeedAsRead(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_refresh.go b/internal/ui/feed_refresh.go similarity index 76% rename from ui/feed_refresh.go rename to internal/ui/feed_refresh.go index 38c755c5..22f87d01 100644 --- a/ui/feed_refresh.go +++ b/internal/ui/feed_refresh.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - feedHandler "miniflux.app/v2/reader/handler" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + feedHandler "miniflux.app/v2/internal/reader/handler" ) func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_remove.go b/internal/ui/feed_remove.go similarity index 74% rename from ui/feed_remove.go rename to internal/ui/feed_remove.go index c800a57d..ee7a55fc 100644 --- a/ui/feed_remove.go +++ b/internal/ui/feed_remove.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" ) func (h *handler) removeFeed(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_update.go b/internal/ui/feed_update.go similarity index 83% rename from ui/feed_update.go rename to internal/ui/feed_update.go index 75f23909..cdefab35 100644 --- a/ui/feed_update.go +++ b/internal/ui/feed_update.go @@ -1,21 +1,21 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" + "miniflux.app/v2/internal/validator" ) func (h *handler) updateFeed(w http.ResponseWriter, r *http.Request) { diff --git a/ui/form/api_key.go b/internal/ui/form/api_key.go similarity index 86% rename from ui/form/api_key.go rename to internal/ui/form/api_key.go index 70dc4ff6..1eb754bc 100644 --- a/ui/form/api_key.go +++ b/internal/ui/form/api_key.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" - "miniflux.app/v2/errors" + "miniflux.app/v2/internal/errors" ) // APIKeyForm represents the API Key form. diff --git a/ui/form/auth.go b/internal/ui/form/auth.go similarity index 87% rename from ui/form/auth.go rename to internal/ui/form/auth.go index 6f85672e..dbb4974b 100644 --- a/ui/form/auth.go +++ b/internal/ui/form/auth.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" - "miniflux.app/v2/errors" + "miniflux.app/v2/internal/errors" ) // AuthForm represents the authentication form. diff --git a/ui/form/category.go b/internal/ui/form/category.go similarity index 89% rename from ui/form/category.go rename to internal/ui/form/category.go index 3e673506..addd368f 100644 --- a/ui/form/category.go +++ b/internal/ui/form/category.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" diff --git a/ui/form/feed.go b/internal/ui/form/feed.go similarity index 97% rename from ui/form/feed.go rename to internal/ui/form/feed.go index 00d1d501..2e8bbd86 100644 --- a/ui/form/feed.go +++ b/internal/ui/form/feed.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" "strconv" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // FeedForm represents a feed form in the UI diff --git a/ui/form/integration.go b/internal/ui/form/integration.go similarity index 98% rename from ui/form/integration.go rename to internal/ui/form/integration.go index 6966f46d..9e60d6fd 100644 --- a/ui/form/integration.go +++ b/internal/ui/form/integration.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // IntegrationForm represents user integration settings form. diff --git a/ui/form/settings.go b/internal/ui/form/settings.go similarity index 97% rename from ui/form/settings.go rename to internal/ui/form/settings.go index d4fed0b0..b640eff7 100644 --- a/ui/form/settings.go +++ b/internal/ui/form/settings.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" "strconv" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" ) // SettingsForm represents the settings form. diff --git a/ui/form/settings_test.go b/internal/ui/form/settings_test.go similarity index 97% rename from ui/form/settings_test.go rename to internal/ui/form/settings_test.go index 87dbfc73..a8afdfb7 100644 --- a/ui/form/settings_test.go +++ b/internal/ui/form/settings_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "testing" diff --git a/ui/form/subscription.go b/internal/ui/form/subscription.go similarity index 95% rename from ui/form/subscription.go rename to internal/ui/form/subscription.go index eb2d127c..16dd215b 100644 --- a/ui/form/subscription.go +++ b/internal/ui/form/subscription.go @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" "strconv" - "miniflux.app/v2/errors" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/validator" ) // SubscriptionForm represents the subscription form. diff --git a/ui/form/user.go b/internal/ui/form/user.go similarity index 92% rename from ui/form/user.go rename to internal/ui/form/user.go index 4b3b03ca..4c6c4e13 100644 --- a/ui/form/user.go +++ b/internal/ui/form/user.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package form // import "miniflux.app/v2/ui/form" +package form // import "miniflux.app/v2/internal/ui/form" import ( "net/http" - "miniflux.app/v2/errors" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/errors" + "miniflux.app/v2/internal/model" ) // UserForm represents the user form. diff --git a/ui/handler.go b/internal/ui/handler.go similarity index 63% rename from ui/handler.go rename to internal/ui/handler.go index 5ab29585..cdf4d40e 100644 --- a/ui/handler.go +++ b/internal/ui/handler.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( - "miniflux.app/v2/storage" - "miniflux.app/v2/template" - "miniflux.app/v2/worker" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/template" + "miniflux.app/v2/internal/worker" "github.com/gorilla/mux" ) diff --git a/ui/history_entries.go b/internal/ui/history_entries.go similarity index 82% rename from ui/history_entries.go rename to internal/ui/history_entries.go index 75b1764a..9ac0204f 100644 --- a/ui/history_entries.go +++ b/internal/ui/history_entries.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showHistoryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/history_flush.go b/internal/ui/history_flush.go similarity index 71% rename from ui/history_flush.go rename to internal/ui/history_flush.go index 555027d2..25719d87 100644 --- a/ui/history_flush.go +++ b/internal/ui/history_flush.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" ) func (h *handler) flushHistory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/integration_pocket.go b/internal/ui/integration_pocket.go similarity index 85% rename from ui/integration_pocket.go rename to internal/ui/integration_pocket.go index eb12696f..30c1e6bf 100644 --- a/ui/integration_pocket.go +++ b/internal/ui/integration_pocket.go @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/integration/pocket" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/integration/pocket" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/ui/session" ) func (h *handler) pocketAuthorize(w http.ResponseWriter, r *http.Request) { diff --git a/ui/integration_show.go b/internal/ui/integration_show.go similarity index 92% rename from ui/integration_show.go rename to internal/ui/integration_show.go index 5e0256ed..405628dc 100644 --- a/ui/integration_show.go +++ b/internal/ui/integration_show.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showIntegrationPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/integration_update.go b/internal/ui/integration_update.go similarity index 86% rename from ui/integration_update.go rename to internal/ui/integration_update.go index a6ad2826..4a68691c 100644 --- a/ui/integration_update.go +++ b/internal/ui/integration_update.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "crypto/md5" "fmt" "net/http" - "miniflux.app/v2/crypto" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/locale" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" ) func (h *handler) updateIntegration(w http.ResponseWriter, r *http.Request) { diff --git a/ui/login_check.go b/internal/ui/login_check.go similarity index 78% rename from ui/login_check.go rename to internal/ui/login_check.go index 76a424cd..ba15b7c6 100644 --- a/ui/login_check.go +++ b/internal/ui/login_check.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/cookie" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/cookie" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) checkLogin(w http.ResponseWriter, r *http.Request) { diff --git a/ui/login_show.go b/internal/ui/login_show.go similarity index 69% rename from ui/login_show.go rename to internal/ui/login_show.go index b668d5e1..6f4d55da 100644 --- a/ui/login_show.go +++ b/internal/ui/login_show.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showLoginPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/logout.go b/internal/ui/logout.go similarity index 69% rename from ui/logout.go rename to internal/ui/logout.go index 80f8b652..40e51b0d 100644 --- a/ui/logout.go +++ b/internal/ui/logout.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/cookie" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/cookie" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/ui/session" ) func (h *handler) logout(w http.ResponseWriter, r *http.Request) { diff --git a/ui/middleware.go b/internal/ui/middleware.go similarity index 93% rename from ui/middleware.go rename to internal/ui/middleware.go index f5a538ba..93cd9491 100644 --- a/ui/middleware.go +++ b/internal/ui/middleware.go @@ -1,22 +1,22 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "context" "errors" "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/cookie" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/cookie" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" "github.com/gorilla/mux" ) diff --git a/ui/oauth2.go b/internal/ui/oauth2.go similarity index 76% rename from ui/oauth2.go rename to internal/ui/oauth2.go index 883b52f3..72b360d5 100644 --- a/ui/oauth2.go +++ b/internal/ui/oauth2.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "context" - "miniflux.app/v2/config" - "miniflux.app/v2/oauth2" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/oauth2" ) func getOAuth2Manager(ctx context.Context) *oauth2.Manager { diff --git a/ui/oauth2_callback.go b/internal/ui/oauth2_callback.go similarity index 89% rename from ui/oauth2_callback.go rename to internal/ui/oauth2_callback.go index 6563446e..f3d7a193 100644 --- a/ui/oauth2_callback.go +++ b/internal/ui/oauth2_callback.go @@ -1,21 +1,21 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "errors" "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/cookie" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/cookie" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" ) func (h *handler) oauth2Callback(w http.ResponseWriter, r *http.Request) { diff --git a/ui/oauth2_redirect.go b/internal/ui/oauth2_redirect.go similarity index 74% rename from ui/oauth2_redirect.go rename to internal/ui/oauth2_redirect.go index 0249655a..842b71e5 100644 --- a/ui/oauth2_redirect.go +++ b/internal/ui/oauth2_redirect.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/ui/session" ) func (h *handler) oauth2Redirect(w http.ResponseWriter, r *http.Request) { diff --git a/ui/oauth2_unlink.go b/internal/ui/oauth2_unlink.go similarity index 82% rename from ui/oauth2_unlink.go rename to internal/ui/oauth2_unlink.go index cf765884..6fe44cbb 100644 --- a/ui/oauth2_unlink.go +++ b/internal/ui/oauth2_unlink.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" - "miniflux.app/v2/ui/session" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/ui/session" ) func (h *handler) oauth2Unlink(w http.ResponseWriter, r *http.Request) { diff --git a/ui/offline.go b/internal/ui/offline.go similarity index 61% rename from ui/offline.go rename to internal/ui/offline.go index dd5175b4..3c96d38f 100644 --- a/ui/offline.go +++ b/internal/ui/offline.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showOfflinePage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/opml_export.go b/internal/ui/opml_export.go similarity index 63% rename from ui/opml_export.go rename to internal/ui/opml_export.go index b7e0f75c..0f5a994f 100644 --- a/ui/opml_export.go +++ b/internal/ui/opml_export.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/response/xml" - "miniflux.app/v2/reader/opml" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/response/xml" + "miniflux.app/v2/internal/reader/opml" ) func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) { diff --git a/ui/opml_import.go b/internal/ui/opml_import.go similarity index 75% rename from ui/opml_import.go rename to internal/ui/opml_import.go index 2cf54326..09b74073 100644 --- a/ui/opml_import.go +++ b/internal/ui/opml_import.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showImportPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/opml_upload.go b/internal/ui/opml_upload.go similarity index 85% rename from ui/opml_upload.go rename to internal/ui/opml_upload.go index 9ec95eaa..0d7c0507 100644 --- a/ui/opml_upload.go +++ b/internal/ui/opml_upload.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/client" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/reader/opml" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/client" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/reader/opml" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) { diff --git a/ui/pagination.go b/internal/ui/pagination.go similarity index 94% rename from ui/pagination.go rename to internal/ui/pagination.go index db5c5352..5a31192a 100644 --- a/ui/pagination.go +++ b/internal/ui/pagination.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" type pagination struct { Route string diff --git a/ui/proxy.go b/internal/ui/proxy.go similarity index 92% rename from ui/proxy.go rename to internal/ui/proxy.go index 97a75910..ce0c39b1 100644 --- a/ui/proxy.go +++ b/internal/ui/proxy.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "crypto/hmac" @@ -11,12 +11,12 @@ import ( "net/http" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/crypto" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/logger" ) func (h *handler) mediaProxy(w http.ResponseWriter, r *http.Request) { diff --git a/ui/search_entries.go b/internal/ui/search_entries.go similarity index 83% rename from ui/search_entries.go rename to internal/ui/search_entries.go index d9d1e194..68df5c9b 100644 --- a/ui/search_entries.go +++ b/internal/ui/search_entries.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showSearchEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/session/session.go b/internal/ui/session/session.go similarity index 93% rename from ui/session/session.go rename to internal/ui/session/session.go index fc8efe99..9b656682 100644 --- a/ui/session/session.go +++ b/internal/ui/session/session.go @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package session // import "miniflux.app/v2/ui/session" +package session // import "miniflux.app/v2/internal/ui/session" import ( - "miniflux.app/v2/crypto" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/crypto" + "miniflux.app/v2/internal/storage" ) // Session handles session data. diff --git a/ui/session_list.go b/internal/ui/session_list.go similarity index 80% rename from ui/session_list.go rename to internal/ui/session_list.go index dcc687d1..2dfcf7cc 100644 --- a/ui/session_list.go +++ b/internal/ui/session_list.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showSessionsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/session_remove.go b/internal/ui/session_remove.go similarity index 68% rename from ui/session_remove.go rename to internal/ui/session_remove.go index a8bcedfe..59e58881 100644 --- a/ui/session_remove.go +++ b/internal/ui/session_remove.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" ) func (h *handler) removeSession(w http.ResponseWriter, r *http.Request) { diff --git a/ui/settings_show.go b/internal/ui/settings_show.go similarity index 85% rename from ui/settings_show.go rename to internal/ui/settings_show.go index fe698d2c..edbf0345 100644 --- a/ui/settings_show.go +++ b/internal/ui/settings_show.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/locale" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showSettingsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/settings_update.go b/internal/ui/settings_update.go similarity index 86% rename from ui/settings_update.go rename to internal/ui/settings_update.go index 31ecf0ff..9bd51552 100644 --- a/ui/settings_update.go +++ b/internal/ui/settings_update.go @@ -1,21 +1,21 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/locale" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" + "miniflux.app/v2/internal/validator" ) func (h *handler) updateSettings(w http.ResponseWriter, r *http.Request) { diff --git a/ui/share.go b/internal/ui/share.go similarity index 82% rename from ui/share.go rename to internal/ui/share.go index 096d464a..d4d7a1eb 100644 --- a/ui/share.go +++ b/internal/ui/share.go @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/storage" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) createSharedEntry(w http.ResponseWriter, r *http.Request) { diff --git a/ui/shared_entries.go b/internal/ui/shared_entries.go similarity index 83% rename from ui/shared_entries.go rename to internal/ui/shared_entries.go index 6fbf6b46..7c9bc6eb 100644 --- a/ui/shared_entries.go +++ b/internal/ui/shared_entries.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) sharedEntries(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static/bin/favicon-16.png b/internal/ui/static/bin/favicon-16.png similarity index 100% rename from ui/static/bin/favicon-16.png rename to internal/ui/static/bin/favicon-16.png diff --git a/ui/static/bin/favicon-32.png b/internal/ui/static/bin/favicon-32.png similarity index 100% rename from ui/static/bin/favicon-32.png rename to internal/ui/static/bin/favicon-32.png diff --git a/ui/static/bin/favicon.ico b/internal/ui/static/bin/favicon.ico similarity index 100% rename from ui/static/bin/favicon.ico rename to internal/ui/static/bin/favicon.ico diff --git a/ui/static/bin/icon-120.png b/internal/ui/static/bin/icon-120.png similarity index 100% rename from ui/static/bin/icon-120.png rename to internal/ui/static/bin/icon-120.png diff --git a/ui/static/bin/icon-128.png b/internal/ui/static/bin/icon-128.png similarity index 100% rename from ui/static/bin/icon-128.png rename to internal/ui/static/bin/icon-128.png diff --git a/ui/static/bin/icon-152.png b/internal/ui/static/bin/icon-152.png similarity index 100% rename from ui/static/bin/icon-152.png rename to internal/ui/static/bin/icon-152.png diff --git a/ui/static/bin/icon-167.png b/internal/ui/static/bin/icon-167.png similarity index 100% rename from ui/static/bin/icon-167.png rename to internal/ui/static/bin/icon-167.png diff --git a/ui/static/bin/icon-180.png b/internal/ui/static/bin/icon-180.png similarity index 100% rename from ui/static/bin/icon-180.png rename to internal/ui/static/bin/icon-180.png diff --git a/ui/static/bin/icon-192.png b/internal/ui/static/bin/icon-192.png similarity index 100% rename from ui/static/bin/icon-192.png rename to internal/ui/static/bin/icon-192.png diff --git a/ui/static/bin/icon-512.png b/internal/ui/static/bin/icon-512.png similarity index 100% rename from ui/static/bin/icon-512.png rename to internal/ui/static/bin/icon-512.png diff --git a/ui/static/bin/maskable-icon-120.png b/internal/ui/static/bin/maskable-icon-120.png similarity index 100% rename from ui/static/bin/maskable-icon-120.png rename to internal/ui/static/bin/maskable-icon-120.png diff --git a/ui/static/bin/maskable-icon-192.png b/internal/ui/static/bin/maskable-icon-192.png similarity index 100% rename from ui/static/bin/maskable-icon-192.png rename to internal/ui/static/bin/maskable-icon-192.png diff --git a/ui/static/bin/maskable-icon-512.png b/internal/ui/static/bin/maskable-icon-512.png similarity index 100% rename from ui/static/bin/maskable-icon-512.png rename to internal/ui/static/bin/maskable-icon-512.png diff --git a/ui/static/bin/sprite.svg b/internal/ui/static/bin/sprite.svg similarity index 100% rename from ui/static/bin/sprite.svg rename to internal/ui/static/bin/sprite.svg diff --git a/ui/static/css/common.css b/internal/ui/static/css/common.css similarity index 100% rename from ui/static/css/common.css rename to internal/ui/static/css/common.css diff --git a/ui/static/css/dark.css b/internal/ui/static/css/dark.css similarity index 100% rename from ui/static/css/dark.css rename to internal/ui/static/css/dark.css diff --git a/ui/static/css/light.css b/internal/ui/static/css/light.css similarity index 100% rename from ui/static/css/light.css rename to internal/ui/static/css/light.css diff --git a/ui/static/css/sans_serif.css b/internal/ui/static/css/sans_serif.css similarity index 100% rename from ui/static/css/sans_serif.css rename to internal/ui/static/css/sans_serif.css diff --git a/ui/static/css/serif.css b/internal/ui/static/css/serif.css similarity index 100% rename from ui/static/css/serif.css rename to internal/ui/static/css/serif.css diff --git a/ui/static/css/system.css b/internal/ui/static/css/system.css similarity index 100% rename from ui/static/css/system.css rename to internal/ui/static/css/system.css diff --git a/ui/static/js/.jshintrc b/internal/ui/static/js/.jshintrc similarity index 100% rename from ui/static/js/.jshintrc rename to internal/ui/static/js/.jshintrc diff --git a/ui/static/js/app.js b/internal/ui/static/js/app.js similarity index 100% rename from ui/static/js/app.js rename to internal/ui/static/js/app.js diff --git a/ui/static/js/bootstrap.js b/internal/ui/static/js/bootstrap.js similarity index 100% rename from ui/static/js/bootstrap.js rename to internal/ui/static/js/bootstrap.js diff --git a/ui/static/js/dom_helper.js b/internal/ui/static/js/dom_helper.js similarity index 100% rename from ui/static/js/dom_helper.js rename to internal/ui/static/js/dom_helper.js diff --git a/ui/static/js/keyboard_handler.js b/internal/ui/static/js/keyboard_handler.js similarity index 100% rename from ui/static/js/keyboard_handler.js rename to internal/ui/static/js/keyboard_handler.js diff --git a/ui/static/js/modal_handler.js b/internal/ui/static/js/modal_handler.js similarity index 100% rename from ui/static/js/modal_handler.js rename to internal/ui/static/js/modal_handler.js diff --git a/ui/static/js/request_builder.js b/internal/ui/static/js/request_builder.js similarity index 100% rename from ui/static/js/request_builder.js rename to internal/ui/static/js/request_builder.js diff --git a/ui/static/js/service_worker.js b/internal/ui/static/js/service_worker.js similarity index 100% rename from ui/static/js/service_worker.js rename to internal/ui/static/js/service_worker.js diff --git a/ui/static/js/touch_handler.js b/internal/ui/static/js/touch_handler.js similarity index 100% rename from ui/static/js/touch_handler.js rename to internal/ui/static/js/touch_handler.js diff --git a/ui/static/static.go b/internal/ui/static/static.go similarity index 98% rename from ui/static/static.go rename to internal/ui/static/static.go index a9b52df5..5ea2a263 100644 --- a/ui/static/static.go +++ b/internal/ui/static/static.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package static // import "miniflux.app/v2/ui/static" +package static // import "miniflux.app/v2/internal/ui/static" import ( "bytes" diff --git a/ui/static_app_icon.go b/internal/ui/static_app_icon.go similarity index 78% rename from ui/static_app_icon.go rename to internal/ui/static_app_icon.go index eeb031ac..668becd8 100644 --- a/ui/static_app_icon.go +++ b/internal/ui/static_app_icon.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "path/filepath" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/static" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/static" ) func (h *handler) showAppIcon(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_favicon.go b/internal/ui/static_favicon.go similarity index 78% rename from ui/static_favicon.go rename to internal/ui/static_favicon.go index bb689459..2775ca81 100644 --- a/ui/static_favicon.go +++ b/internal/ui/static_favicon.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "time" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/static" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/static" ) func (h *handler) showFavicon(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_javascript.go b/internal/ui/static_javascript.go similarity index 75% rename from ui/static_javascript.go rename to internal/ui/static_javascript.go index 5f0ae41e..1172252a 100644 --- a/ui/static_javascript.go +++ b/internal/ui/static_javascript.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "fmt" "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/ui/static" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/ui/static" ) func (h *handler) showJavascript(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_manifest.go b/internal/ui/static_manifest.go similarity index 93% rename from ui/static_manifest.go rename to internal/ui/static_manifest.go index 0de863c6..a3ed0f81 100644 --- a/ui/static_manifest.go +++ b/internal/ui/static_manifest.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" ) func (h *handler) showWebManifest(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_stylesheet.go b/internal/ui/static_stylesheet.go similarity index 72% rename from ui/static_stylesheet.go rename to internal/ui/static_stylesheet.go index 0fc22094..f37732ee 100644 --- a/ui/static_stylesheet.go +++ b/internal/ui/static_stylesheet.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "time" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/static" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/static" ) func (h *handler) showStylesheet(w http.ResponseWriter, r *http.Request) { diff --git a/ui/subscription_add.go b/internal/ui/subscription_add.go similarity index 77% rename from ui/subscription_add.go rename to internal/ui/subscription_add.go index 6abe76b4..6e115aa8 100644 --- a/ui/subscription_add.go +++ b/internal/ui/subscription_add.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showAddSubscriptionPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/subscription_bookmarklet.go b/internal/ui/subscription_bookmarklet.go similarity index 83% rename from ui/subscription_bookmarklet.go rename to internal/ui/subscription_bookmarklet.go index 3ff53fbf..120ea9e2 100644 --- a/ui/subscription_bookmarklet.go +++ b/internal/ui/subscription_bookmarklet.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" "mvdan.cc/xurls/v2" ) diff --git a/ui/subscription_choose.go b/internal/ui/subscription_choose.go similarity index 84% rename from ui/subscription_choose.go rename to internal/ui/subscription_choose.go index 14755da5..ac6ea7e3 100644 --- a/ui/subscription_choose.go +++ b/internal/ui/subscription_choose.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - feedHandler "miniflux.app/v2/reader/handler" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + feedHandler "miniflux.app/v2/internal/reader/handler" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showChooseSubscriptionPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/subscription_submit.go b/internal/ui/subscription_submit.go similarity index 87% rename from ui/subscription_submit.go rename to internal/ui/subscription_submit.go index cfb44996..42a5c8e6 100644 --- a/ui/subscription_submit.go +++ b/internal/ui/subscription_submit.go @@ -1,22 +1,22 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - feedHandler "miniflux.app/v2/reader/handler" - "miniflux.app/v2/reader/subscription" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + feedHandler "miniflux.app/v2/internal/reader/handler" + "miniflux.app/v2/internal/reader/subscription" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) submitSubscription(w http.ResponseWriter, r *http.Request) { diff --git a/ui/ui.go b/internal/ui/ui.go similarity index 98% rename from ui/ui.go rename to internal/ui/ui.go index a82d24fd..3acc32ad 100644 --- a/ui/ui.go +++ b/internal/ui/ui.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/logger" - "miniflux.app/v2/storage" - "miniflux.app/v2/template" - "miniflux.app/v2/worker" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/storage" + "miniflux.app/v2/internal/template" + "miniflux.app/v2/internal/worker" "github.com/gorilla/mux" ) diff --git a/ui/unread_entries.go b/internal/ui/unread_entries.go similarity index 87% rename from ui/unread_entries.go rename to internal/ui/unread_entries.go index 956a7269..9a361ae1 100644 --- a/ui/unread_entries.go +++ b/internal/ui/unread_entries.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "fmt" "net/http" "time" - "miniflux.app/v2/config" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/unread_mark_all_read.go b/internal/ui/unread_mark_all_read.go similarity index 72% rename from ui/unread_mark_all_read.go rename to internal/ui/unread_mark_all_read.go index aab67036..5547fc72 100644 --- a/ui/unread_mark_all_read.go +++ b/internal/ui/unread_mark_all_read.go @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/json" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/json" ) func (h *handler) markAllAsRead(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_create.go b/internal/ui/user_create.go similarity index 74% rename from ui/user_create.go rename to internal/ui/user_create.go index 85534854..d35596a5 100644 --- a/ui/user_create.go +++ b/internal/ui/user_create.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showCreateUserPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_edit.go b/internal/ui/user_edit.go similarity index 81% rename from ui/user_edit.go rename to internal/ui/user_edit.go index 6819f43d..199feaa8 100644 --- a/ui/user_edit.go +++ b/internal/ui/user_edit.go @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) // EditUser shows the form to edit a user. diff --git a/ui/user_list.go b/internal/ui/user_list.go similarity index 79% rename from ui/user_list.go rename to internal/ui/user_list.go index f3a9ed80..d514708f 100644 --- a/ui/user_list.go +++ b/internal/ui/user_list.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) showUsersPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_remove.go b/internal/ui/user_remove.go similarity index 83% rename from ui/user_remove.go rename to internal/ui/user_remove.go index 5f66d203..eab3eec4 100644 --- a/ui/user_remove.go +++ b/internal/ui/user_remove.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "errors" "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" ) func (h *handler) removeUser(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_save.go b/internal/ui/user_save.go similarity index 80% rename from ui/user_save.go rename to internal/ui/user_save.go index 848a9eb4..79b4bc36 100644 --- a/ui/user_save.go +++ b/internal/ui/user_save.go @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/model" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" - "miniflux.app/v2/validator" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" + "miniflux.app/v2/internal/validator" ) func (h *handler) saveUser(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_update.go b/internal/ui/user_update.go similarity index 83% rename from ui/user_update.go rename to internal/ui/user_update.go index fa3522c9..a3eb5b8d 100644 --- a/ui/user_update.go +++ b/internal/ui/user_update.go @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package ui // import "miniflux.app/v2/ui" +package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/http/response/html" - "miniflux.app/v2/http/route" - "miniflux.app/v2/logger" - "miniflux.app/v2/ui/form" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/view" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/http/response/html" + "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/ui/form" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/view" ) func (h *handler) updateUser(w http.ResponseWriter, r *http.Request) { diff --git a/ui/view/view.go b/internal/ui/view/view.go similarity index 85% rename from ui/view/view.go rename to internal/ui/view/view.go index 40ea93bb..1720cfc5 100644 --- a/ui/view/view.go +++ b/internal/ui/view/view.go @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package view // import "miniflux.app/v2/ui/view" +package view // import "miniflux.app/v2/internal/ui/view" import ( "net/http" - "miniflux.app/v2/http/request" - "miniflux.app/v2/template" - "miniflux.app/v2/ui/session" - "miniflux.app/v2/ui/static" + "miniflux.app/v2/internal/http/request" + "miniflux.app/v2/internal/template" + "miniflux.app/v2/internal/ui/session" + "miniflux.app/v2/internal/ui/static" ) // View wraps template argument building. diff --git a/url/url.go b/internal/url/url.go similarity index 96% rename from url/url.go rename to internal/url/url.go index 9357baa4..3345deec 100644 --- a/url/url.go +++ b/internal/url/url.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package url // import "miniflux.app/v2/url" +package url // import "miniflux.app/v2/internal/url" import ( "fmt" diff --git a/url/url_test.go b/internal/url/url_test.go similarity index 98% rename from url/url_test.go rename to internal/url/url_test.go index e1e5ae60..c275767b 100644 --- a/url/url_test.go +++ b/internal/url/url_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package url // import "miniflux.app/v2/url" +package url // import "miniflux.app/v2/internal/url" import "testing" diff --git a/validator/category.go b/internal/validator/category.go similarity index 87% rename from validator/category.go rename to internal/validator/category.go index 8db71a04..54d74078 100644 --- a/validator/category.go +++ b/internal/validator/category.go @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import ( - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) // ValidateCategoryCreation validates category creation. diff --git a/validator/entry.go b/internal/validator/entry.go similarity index 92% rename from validator/entry.go rename to internal/validator/entry.go index c1d5908e..dd7216a0 100644 --- a/validator/entry.go +++ b/internal/validator/entry.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import ( "fmt" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) // ValidateEntriesStatusUpdateRequest validates a status update for a list of entries. diff --git a/validator/entry_test.go b/internal/validator/entry_test.go similarity index 94% rename from validator/entry_test.go rename to internal/validator/entry_test.go index 74f69468..035b49cd 100644 --- a/validator/entry_test.go +++ b/internal/validator/entry_test.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import ( "testing" - "miniflux.app/v2/model" + "miniflux.app/v2/internal/model" ) func TestValidateEntriesStatusUpdateRequest(t *testing.T) { diff --git a/validator/feed.go b/internal/validator/feed.go similarity index 94% rename from validator/feed.go rename to internal/validator/feed.go index 612725ee..3d3a1caf 100644 --- a/validator/feed.go +++ b/internal/validator/feed.go @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import ( - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) // ValidateFeedCreation validates feed creation. diff --git a/validator/subscription.go b/internal/validator/subscription.go similarity index 79% rename from validator/subscription.go rename to internal/validator/subscription.go index 68c70cea..d09ddc01 100644 --- a/validator/subscription.go +++ b/internal/validator/subscription.go @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" -import "miniflux.app/v2/model" +import "miniflux.app/v2/internal/model" // ValidateSubscriptionDiscovery validates subscription discovery requests. func ValidateSubscriptionDiscovery(request *model.SubscriptionDiscoveryRequest) *ValidationError { diff --git a/validator/user.go b/internal/validator/user.go similarity index 96% rename from validator/user.go rename to internal/validator/user.go index e43fe416..edaa3fe1 100644 --- a/validator/user.go +++ b/internal/validator/user.go @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import ( - "miniflux.app/v2/locale" - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) // ValidateUserCreationWithPassword validates user creation with a password. diff --git a/validator/validator.go b/internal/validator/validator.go similarity index 93% rename from validator/validator.go rename to internal/validator/validator.go index b08186c6..b96b0aa7 100644 --- a/validator/validator.go +++ b/internal/validator/validator.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import ( "errors" @@ -9,7 +9,7 @@ import ( "net/url" "regexp" - "miniflux.app/v2/locale" + "miniflux.app/v2/internal/locale" ) // ValidationError represents a validation error. diff --git a/validator/validator_test.go b/internal/validator/validator_test.go similarity index 95% rename from validator/validator_test.go rename to internal/validator/validator_test.go index 62f9db48..0a51973b 100644 --- a/validator/validator_test.go +++ b/internal/validator/validator_test.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package validator // import "miniflux.app/v2/validator" +package validator // import "miniflux.app/v2/internal/validator" import "testing" diff --git a/version/version.go b/internal/version/version.go similarity index 79% rename from version/version.go rename to internal/version/version.go index 4c6e082f..e028add4 100644 --- a/version/version.go +++ b/internal/version/version.go @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package version // import "miniflux.app/v2/version" +package version // import "miniflux.app/v2/internal/version" // Variables populated at build time. var ( diff --git a/worker/pool.go b/internal/worker/pool.go similarity index 83% rename from worker/pool.go rename to internal/worker/pool.go index 656964a4..bd9e1313 100644 --- a/worker/pool.go +++ b/internal/worker/pool.go @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package worker // import "miniflux.app/v2/worker" +package worker // import "miniflux.app/v2/internal/worker" import ( - "miniflux.app/v2/model" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/storage" ) // Pool handles a pool of workers. diff --git a/worker/worker.go b/internal/worker/worker.go similarity index 76% rename from worker/worker.go rename to internal/worker/worker.go index fd65dc0d..8cd59a56 100644 --- a/worker/worker.go +++ b/internal/worker/worker.go @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package worker // import "miniflux.app/v2/worker" +package worker // import "miniflux.app/v2/internal/worker" import ( "time" - "miniflux.app/v2/config" - "miniflux.app/v2/logger" - "miniflux.app/v2/metric" - "miniflux.app/v2/model" - feedHandler "miniflux.app/v2/reader/handler" - "miniflux.app/v2/storage" + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/logger" + "miniflux.app/v2/internal/metric" + "miniflux.app/v2/internal/model" + feedHandler "miniflux.app/v2/internal/reader/handler" + "miniflux.app/v2/internal/storage" ) // Worker refreshes a feed in the background. diff --git a/main.go b/main.go index ee233332..320a1f05 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ package main // import "miniflux.app/v2" import ( - "miniflux.app/v2/cli" + "miniflux.app/v2/internal/cli" ) func main() { diff --git a/packaging/docker/alpine/Dockerfile b/packaging/docker/alpine/Dockerfile index c56e6f3c..234ce916 100644 --- a/packaging/docker/alpine/Dockerfile +++ b/packaging/docker/alpine/Dockerfile @@ -5,7 +5,7 @@ ADD . /go/src/app WORKDIR /go/src/app RUN go build \ -o miniflux \ - -ldflags="-s -w -X 'miniflux.app/v2/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/v2/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/v2/version.BuildDate=`date +%FT%T%z`'" \ + -ldflags="-s -w -X 'miniflux.app/v2/internal/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/v2/internal/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/v2/internal/version.BuildDate=`date +%FT%T%z`'" \ main.go FROM alpine:latest diff --git a/packaging/docker/distroless/Dockerfile b/packaging/docker/distroless/Dockerfile index 46ee2db8..b5e9cabf 100644 --- a/packaging/docker/distroless/Dockerfile +++ b/packaging/docker/distroless/Dockerfile @@ -4,7 +4,7 @@ ADD . /go/src/app WORKDIR /go/src/app RUN go build \ -o miniflux \ - -ldflags="-s -w -X 'miniflux.app/v2/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/v2/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/v2/version.BuildDate=`date +%FT%T%z`'" \ + -ldflags="-s -w -X 'miniflux.app/v2/internal/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/v2/internal/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/v2/internal/version.BuildDate=`date +%FT%T%z`'" \ main.go FROM gcr.io/distroless/base