diff --git a/Makefile b/Makefile index 1a4280b0..55d239c2 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/version.Version=$(VERSION)' -X 'miniflux.app/version.Commit=$(COMMIT)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" +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)'" 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/tests + go test -v -tags=integration -count=1 miniflux.app/v2/tests clean-integration-test: @ kill -9 `cat /tmp/miniflux.pid` diff --git a/api/api.go b/api/api.go index 54fa0ad5..ed1f17c6 100644 --- a/api/api.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( "net/http" - "miniflux.app/storage" - "miniflux.app/worker" + "miniflux.app/v2/storage" + "miniflux.app/v2/worker" "github.com/gorilla/mux" ) diff --git a/api/category.go b/api/category.go index f35b0295..381aef1e 100644 --- a/api/category.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( json_parser "encoding/json" "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/model" - "miniflux.app/validator" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/model" + "miniflux.app/v2/validator" ) func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) { diff --git a/api/entry.go b/api/entry.go index 820a5306..f6c37242 100644 --- a/api/entry.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( json_parser "encoding/json" @@ -11,16 +11,16 @@ import ( "strings" "time" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/integration" - "miniflux.app/model" - "miniflux.app/proxy" - "miniflux.app/reader/processor" - "miniflux.app/storage" - "miniflux.app/url" - "miniflux.app/validator" + "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" ) func (h *handler) getEntryFromBuilder(w http.ResponseWriter, r *http.Request, b *storage.EntryQueryBuilder) { diff --git a/api/feed.go b/api/feed.go index 12cbf919..d89b3ecd 100644 --- a/api/feed.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( json_parser "encoding/json" "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/model" - feedHandler "miniflux.app/reader/handler" - "miniflux.app/validator" + "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" ) func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) { diff --git a/api/icon.go b/api/icon.go index 6dc19dff..866386c9 100644 --- a/api/icon.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" ) func (h *handler) feedIcon(w http.ResponseWriter, r *http.Request) { diff --git a/api/middleware.go b/api/middleware.go index da7b4652..44bf12ae 100644 --- a/api/middleware.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( "context" "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/logger" - "miniflux.app/storage" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/logger" + "miniflux.app/v2/storage" ) type middleware struct { diff --git a/api/opml.go b/api/opml.go index bc269286..db00e7fa 100644 --- a/api/opml.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/http/response/xml" - "miniflux.app/reader/opml" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/http/response/xml" + "miniflux.app/v2/reader/opml" ) func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) { diff --git a/api/payload.go b/api/payload.go index 1bd8505d..2df91bf4 100644 --- a/api/payload.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( - "miniflux.app/model" + "miniflux.app/v2/model" ) type feedIconResponse struct { diff --git a/api/subscription.go b/api/subscription.go index 5f7be916..a6148e95 100644 --- a/api/subscription.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( json_parser "encoding/json" "net/http" - "miniflux.app/http/response/json" - "miniflux.app/model" - "miniflux.app/reader/subscription" - "miniflux.app/validator" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/model" + "miniflux.app/v2/reader/subscription" + "miniflux.app/v2/validator" ) func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) { diff --git a/api/user.go b/api/user.go index b985d1e9..4d6b31fb 100644 --- a/api/user.go +++ b/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/api" +package api // import "miniflux.app/v2/api" import ( json_parser "encoding/json" "errors" "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/model" - "miniflux.app/validator" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/model" + "miniflux.app/v2/validator" ) func (h *handler) currentUser(w http.ResponseWriter, r *http.Request) { diff --git a/cli/ask_credentials.go b/cli/ask_credentials.go index d8aa0de5..3751cb9c 100644 --- a/cli/ask_credentials.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "bufio" diff --git a/cli/cleanup_tasks.go b/cli/cleanup_tasks.go index fba722b9..d078030b 100644 --- a/cli/cleanup_tasks.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "time" - "miniflux.app/config" - "miniflux.app/logger" - "miniflux.app/metric" - "miniflux.app/model" - "miniflux.app/storage" + "miniflux.app/v2/config" + "miniflux.app/v2/logger" + "miniflux.app/v2/metric" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" ) func runCleanupTasks(store *storage.Storage) { diff --git a/cli/cli.go b/cli/cli.go index c7be42ab..5d666d69 100644 --- a/cli/cli.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "flag" "fmt" - "miniflux.app/config" - "miniflux.app/database" - "miniflux.app/locale" - "miniflux.app/logger" - "miniflux.app/storage" - "miniflux.app/ui/static" - "miniflux.app/version" + "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" ) const ( diff --git a/cli/create_admin.go b/cli/create_admin.go index 8070e646..fd93da2d 100644 --- a/cli/create_admin.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "fmt" "os" - "miniflux.app/config" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/validator" + "miniflux.app/v2/config" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" + "miniflux.app/v2/validator" ) func createAdmin(store *storage.Storage) { diff --git a/cli/daemon.go b/cli/daemon.go index dcea6e56..0e3c2a0d 100644 --- a/cli/daemon.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "context" @@ -11,13 +11,13 @@ import ( "syscall" "time" - "miniflux.app/config" - httpd "miniflux.app/http/server" - "miniflux.app/logger" - "miniflux.app/metric" - "miniflux.app/storage" - "miniflux.app/systemd" - "miniflux.app/worker" + "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" ) func startDaemon(store *storage.Storage) { diff --git a/cli/flush_sessions.go b/cli/flush_sessions.go index 0d02d1bc..7472094b 100644 --- a/cli/flush_sessions.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "fmt" "os" - "miniflux.app/storage" + "miniflux.app/v2/storage" ) func flushSessions(store *storage.Storage) { diff --git a/cli/health_check.go b/cli/health_check.go index b04135b1..0a727a0a 100644 --- a/cli/health_check.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "net/http" "time" - "miniflux.app/config" - "miniflux.app/logger" + "miniflux.app/v2/config" + "miniflux.app/v2/logger" ) func doHealthCheck(healthCheckEndpoint string) { diff --git a/cli/info.go b/cli/info.go index 182d2587..3cb26599 100644 --- a/cli/info.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "fmt" "runtime" - "miniflux.app/version" + "miniflux.app/v2/version" ) func info() { diff --git a/cli/refresh_feeds.go b/cli/refresh_feeds.go index 63ef9efb..beaca17c 100644 --- a/cli/refresh_feeds.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "sync" "time" - "miniflux.app/config" - "miniflux.app/logger" - "miniflux.app/model" - feedHandler "miniflux.app/reader/handler" - "miniflux.app/storage" + "miniflux.app/v2/config" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" + feedHandler "miniflux.app/v2/reader/handler" + "miniflux.app/v2/storage" ) func refreshFeeds(store *storage.Storage) { diff --git a/cli/reset_password.go b/cli/reset_password.go index 3fb634cf..dc266e36 100644 --- a/cli/reset_password.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "fmt" "os" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/validator" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" + "miniflux.app/v2/validator" ) func resetPassword(store *storage.Storage) { diff --git a/cli/scheduler.go b/cli/scheduler.go index 839d7f54..5046ab2f 100644 --- a/cli/scheduler.go +++ b/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/cli" +package cli // import "miniflux.app/v2/cli" import ( "time" - "miniflux.app/config" - "miniflux.app/logger" - "miniflux.app/storage" - "miniflux.app/worker" + "miniflux.app/v2/config" + "miniflux.app/v2/logger" + "miniflux.app/v2/storage" + "miniflux.app/v2/worker" ) func runScheduler(store *storage.Storage, pool *worker.Pool) { diff --git a/client/README.md b/client/README.md index aa58e8d7..80764407 100644 --- a/client/README.md +++ b/client/README.md @@ -22,7 +22,7 @@ import ( "fmt" "os" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func main() { diff --git a/client/client.go b/client/client.go index 892fa5fd..18964459 100644 --- a/client/client.go +++ b/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/client" +package client // import "miniflux.app/v2/client" import ( "encoding/json" diff --git a/client/doc.go b/client/doc.go index b44495a1..c395793b 100644 --- a/client/doc.go +++ b/client/doc.go @@ -9,7 +9,7 @@ Package client implements a client library for the Miniflux REST API. This code snippet fetch the list of users: import ( - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) client := miniflux.New("https://api.example.org", "admin", "secret") @@ -29,4 +29,4 @@ This one discover subscriptions on a website: } fmt.Println(subscriptions) */ -package client // import "miniflux.app/client" +package client // import "miniflux.app/v2/client" diff --git a/client/model.go b/client/model.go index 6d1209ba..8a9ae17f 100644 --- a/client/model.go +++ b/client/model.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/client" +package client // import "miniflux.app/v2/client" import ( "fmt" diff --git a/client/request.go b/client/request.go index f409f979..1c91316e 100644 --- a/client/request.go +++ b/client/request.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/client" +package client // import "miniflux.app/v2/client" import ( "bytes" diff --git a/config/config.go b/config/config.go index fa999b7d..17ef8fe3 100644 --- a/config/config.go +++ b/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/config" +package config // import "miniflux.app/v2/config" // Opts holds parsed configuration options. var Opts *Options diff --git a/config/config_test.go b/config/config_test.go index 2e1ae401..5ab1cb22 100644 --- a/config/config_test.go +++ b/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/config" +package config // import "miniflux.app/v2/config" import ( "os" diff --git a/config/options.go b/config/options.go index 7147a754..d95e85bc 100644 --- a/config/options.go +++ b/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/config" +package config // import "miniflux.app/v2/config" import ( "crypto/rand" @@ -10,7 +10,7 @@ import ( "strings" "time" - "miniflux.app/version" + "miniflux.app/v2/version" ) const ( diff --git a/config/parser.go b/config/parser.go index 41d81d3c..89165b6c 100644 --- a/config/parser.go +++ b/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/config" +package config // import "miniflux.app/v2/config" import ( "bufio" diff --git a/config/parser_test.go b/config/parser_test.go index 8b080cb1..c9be769f 100644 --- a/config/parser_test.go +++ b/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/config" +package config // import "miniflux.app/v2/config" import ( "testing" diff --git a/crypto/crypto.go b/crypto/crypto.go index 684c2197..a73a1c1e 100644 --- a/crypto/crypto.go +++ b/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/crypto" +package crypto // import "miniflux.app/v2/crypto" import ( "crypto/rand" diff --git a/database/database.go b/database/database.go index 274f128c..d32bd609 100644 --- a/database/database.go +++ b/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/database" +package database // import "miniflux.app/v2/database" import ( "database/sql" diff --git a/database/migrations.go b/database/migrations.go index 2bc806c7..19595737 100644 --- a/database/migrations.go +++ b/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/database" +package database // import "miniflux.app/v2/database" import ( "database/sql" diff --git a/errors/errors.go b/errors/errors.go index 7abdae73..bb0e04df 100644 --- a/errors/errors.go +++ b/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/errors" +package errors // import "miniflux.app/v2/errors" import ( "fmt" - "miniflux.app/locale" + "miniflux.app/v2/locale" ) // LocalizedError represents an error than could be translated to another language. diff --git a/fever/handler.go b/fever/handler.go index c7c576b3..5f954489 100644 --- a/fever/handler.go +++ b/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/fever" +package fever // import "miniflux.app/v2/fever" import ( "net/http" @@ -9,13 +9,13 @@ import ( "strings" "time" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/integration" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/proxy" - "miniflux.app/storage" + "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" "github.com/gorilla/mux" ) diff --git a/fever/middleware.go b/fever/middleware.go index 0f8f8482..8283a9bc 100644 --- a/fever/middleware.go +++ b/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/fever" +package fever // import "miniflux.app/v2/fever" import ( "context" "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/logger" - "miniflux.app/storage" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/logger" + "miniflux.app/v2/storage" ) type middleware struct { diff --git a/fever/response.go b/fever/response.go index 6c8346d7..f5d47eff 100644 --- a/fever/response.go +++ b/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/fever" +package fever // import "miniflux.app/v2/fever" import ( "time" diff --git a/go.mod b/go.mod index af910f37..17d458f0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module miniflux.app +module miniflux.app/v2 // +heroku goVersion go1.21 diff --git a/googlereader/handler.go b/googlereader/handler.go index 49815012..6648c664 100644 --- a/googlereader/handler.go +++ b/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/googlereader" +package googlereader // import "miniflux.app/v2/googlereader" import ( "errors" @@ -13,19 +13,19 @@ import ( "time" "github.com/gorilla/mux" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/http/route" - "miniflux.app/integration" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/proxy" - mff "miniflux.app/reader/handler" - mfs "miniflux.app/reader/subscription" - "miniflux.app/storage" - "miniflux.app/url" - "miniflux.app/validator" + "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" ) type handler struct { diff --git a/googlereader/middleware.go b/googlereader/middleware.go index d999582e..770e1cc1 100644 --- a/googlereader/middleware.go +++ b/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/googlereader" +package googlereader // import "miniflux.app/v2/googlereader" import ( "context" @@ -11,12 +11,12 @@ import ( "net/http" "strings" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/json" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/storage" + "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" ) type middleware struct { diff --git a/googlereader/response.go b/googlereader/response.go index 6ea96a58..f8cfc7a7 100644 --- a/googlereader/response.go +++ b/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/googlereader" +package googlereader // import "miniflux.app/v2/googlereader" import ( "fmt" "net/http" - "miniflux.app/http/response" - "miniflux.app/logger" + "miniflux.app/v2/http/response" + "miniflux.app/v2/logger" ) type login struct { diff --git a/http/client/client.go b/http/client/client.go index 46388998..955c8388 100644 --- a/http/client/client.go +++ b/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/http/client" +package client // import "miniflux.app/v2/http/client" import ( "bytes" @@ -16,10 +16,10 @@ import ( "strings" "time" - "miniflux.app/config" - "miniflux.app/errors" - "miniflux.app/logger" - "miniflux.app/timer" + "miniflux.app/v2/config" + "miniflux.app/v2/errors" + "miniflux.app/v2/logger" + "miniflux.app/v2/timer" ) const ( diff --git a/http/client/client_test.go b/http/client/client_test.go index 2a5a4db4..9ea72361 100644 --- a/http/client/client_test.go +++ b/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/http/client" +package client // import "miniflux.app/v2/http/client" import ( "fmt" diff --git a/http/client/response.go b/http/client/response.go index 5f25eaf1..c7a09bf5 100644 --- a/http/client/response.go +++ b/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/http/client" +package client // import "miniflux.app/v2/http/client" import ( "bytes" diff --git a/http/client/response_test.go b/http/client/response_test.go index 42aa2ec0..133c8c05 100644 --- a/http/client/response_test.go +++ b/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/http/client" +package client // import "miniflux.app/v2/http/client" import ( "bytes" diff --git a/http/cookie/cookie.go b/http/cookie/cookie.go index 37688b55..0bf46731 100644 --- a/http/cookie/cookie.go +++ b/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/http/cookie" +package cookie // import "miniflux.app/v2/http/cookie" import ( "net/http" diff --git a/http/request/client_ip.go b/http/request/client_ip.go index 32952b67..a76b0e2e 100644 --- a/http/request/client_ip.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import ( "net" diff --git a/http/request/client_ip_test.go b/http/request/client_ip_test.go index 5a76fd6b..d9fb4e75 100644 --- a/http/request/client_ip_test.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import ( "net/http" diff --git a/http/request/context.go b/http/request/context.go index 3fdaf798..31639b3e 100644 --- a/http/request/context.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import "net/http" diff --git a/http/request/context_test.go b/http/request/context_test.go index 6f3858fb..d6026d54 100644 --- a/http/request/context_test.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import ( "context" diff --git a/http/request/cookie.go b/http/request/cookie.go index dddf1aed..fdc65c3a 100644 --- a/http/request/cookie.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import "net/http" diff --git a/http/request/cookie_test.go b/http/request/cookie_test.go index ec8f1a8a..f00a4b37 100644 --- a/http/request/cookie_test.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import ( "net/http" diff --git a/http/request/params.go b/http/request/params.go index cd0eff38..d6c8bf3d 100644 --- a/http/request/params.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import ( "net/http" diff --git a/http/request/params_test.go b/http/request/params_test.go index 852959af..7804f055 100644 --- a/http/request/params_test.go +++ b/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/http/request" +package request // import "miniflux.app/v2/http/request" import ( "net/http" diff --git a/http/response/builder.go b/http/response/builder.go index 33c144b5..b8fcbd46 100644 --- a/http/response/builder.go +++ b/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/http/response" +package response // import "miniflux.app/v2/http/response" import ( "compress/flate" @@ -12,7 +12,7 @@ import ( "strings" "time" - "miniflux.app/logger" + "miniflux.app/v2/logger" ) const compressionThreshold = 1024 diff --git a/http/response/builder_test.go b/http/response/builder_test.go index 069eba78..864fbb9f 100644 --- a/http/response/builder_test.go +++ b/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/http/response" +package response // import "miniflux.app/v2/http/response" import ( "errors" diff --git a/http/response/html/html.go b/http/response/html/html.go index 29d00592..7a2391d3 100644 --- a/http/response/html/html.go +++ b/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/http/response/html" +package html // import "miniflux.app/v2/http/response/html" import ( "net/http" - "miniflux.app/http/response" - "miniflux.app/logger" + "miniflux.app/v2/http/response" + "miniflux.app/v2/logger" ) // OK creates a new HTML response with a 200 status code. diff --git a/http/response/html/html_test.go b/http/response/html/html_test.go index 433e1691..3d990617 100644 --- a/http/response/html/html_test.go +++ b/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/http/response/html" +package html // import "miniflux.app/v2/http/response/html" import ( "errors" diff --git a/http/response/json/json.go b/http/response/json/json.go index 17eca55a..f0f88033 100644 --- a/http/response/json/json.go +++ b/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/http/response/json" +package json // import "miniflux.app/v2/http/response/json" import ( "encoding/json" "errors" "net/http" - "miniflux.app/http/response" - "miniflux.app/logger" + "miniflux.app/v2/http/response" + "miniflux.app/v2/logger" ) const contentTypeHeader = `application/json` diff --git a/http/response/json/json_test.go b/http/response/json/json_test.go index 43f72713..93a477c8 100644 --- a/http/response/json/json_test.go +++ b/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/http/response/json" +package json // import "miniflux.app/v2/http/response/json" import ( "errors" diff --git a/http/response/xml/xml.go b/http/response/xml/xml.go index de26ad66..3bfd5723 100644 --- a/http/response/xml/xml.go +++ b/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/http/response/xml" +package xml // import "miniflux.app/v2/http/response/xml" import ( "net/http" - "miniflux.app/http/response" + "miniflux.app/v2/http/response" ) // OK writes a standard XML response with a status 200 OK. diff --git a/http/response/xml/xml_test.go b/http/response/xml/xml_test.go index 638e14d4..e490f19e 100644 --- a/http/response/xml/xml_test.go +++ b/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/http/response/xml" +package xml // import "miniflux.app/v2/http/response/xml" import ( "net/http" diff --git a/http/route/route.go b/http/route/route.go index 4cee659e..4e3b615d 100644 --- a/http/route/route.go +++ b/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/http/route" +package route // import "miniflux.app/v2/http/route" import ( "strconv" "github.com/gorilla/mux" - "miniflux.app/logger" + "miniflux.app/v2/logger" ) // Path returns the defined route based on given arguments. diff --git a/http/server/httpd.go b/http/server/httpd.go index ace2eb0d..156fb0be 100644 --- a/http/server/httpd.go +++ b/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/http/server" +package httpd // import "miniflux.app/v2/http/server" import ( "crypto/tls" @@ -12,16 +12,16 @@ import ( "strings" "time" - "miniflux.app/api" - "miniflux.app/config" - "miniflux.app/fever" - "miniflux.app/googlereader" - "miniflux.app/http/request" - "miniflux.app/logger" - "miniflux.app/storage" - "miniflux.app/ui" - "miniflux.app/version" - "miniflux.app/worker" + "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" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/http/server/middleware.go b/http/server/middleware.go index 3c4a7c5c..470712c4 100644 --- a/http/server/middleware.go +++ b/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/http/server" +package httpd // import "miniflux.app/v2/http/server" import ( "context" "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/logger" + "miniflux.app/v2/config" + "miniflux.app/v2/http/request" + "miniflux.app/v2/logger" ) func middleware(next http.Handler) http.Handler { diff --git a/integration/apprise/apprise.go b/integration/apprise/apprise.go index 62cfc941..348b0d33 100644 --- a/integration/apprise/apprise.go +++ b/integration/apprise/apprise.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "miniflux.app/http/client" - "miniflux.app/model" + "miniflux.app/v2/http/client" + "miniflux.app/v2/model" ) // Client represents a Apprise client. diff --git a/integration/espial/espial.go b/integration/espial/espial.go index c276774f..7532a64b 100644 --- a/integration/espial/espial.go +++ b/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/integration/espial" +package espial // import "miniflux.app/v2/integration/espial" import ( "fmt" "net/url" "path" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Document structure of an Espial document diff --git a/integration/instapaper/instapaper.go b/integration/instapaper/instapaper.go index 2f24a813..8d073383 100644 --- a/integration/instapaper/instapaper.go +++ b/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/integration/instapaper" +package instapaper // import "miniflux.app/v2/integration/instapaper" import ( "fmt" "net/url" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Client represents an Instapaper client. diff --git a/integration/integration.go b/integration/integration.go index 7e535313..c03b63a9 100644 --- a/integration/integration.go +++ b/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/integration" +package integration // import "miniflux.app/v2/integration" import ( - "miniflux.app/config" - "miniflux.app/integration/apprise" - "miniflux.app/integration/espial" - "miniflux.app/integration/instapaper" - "miniflux.app/integration/linkding" - "miniflux.app/integration/matrixbot" - "miniflux.app/integration/notion" - "miniflux.app/integration/nunuxkeeper" - "miniflux.app/integration/pinboard" - "miniflux.app/integration/pocket" - "miniflux.app/integration/readwise" - "miniflux.app/integration/telegrambot" - "miniflux.app/integration/wallabag" - "miniflux.app/logger" - "miniflux.app/model" + "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" ) // SendEntry sends the entry to third-party providers when the user click on "Save". diff --git a/integration/linkding/linkding.go b/integration/linkding/linkding.go index 8c506bdb..0b921995 100644 --- a/integration/linkding/linkding.go +++ b/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/integration/linkding" +package linkding // import "miniflux.app/v2/integration/linkding" import ( "fmt" "net/url" "strings" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Document structure of a Linkding document diff --git a/integration/matrixbot/matrixbot.go b/integration/matrixbot/matrixbot.go index b9aab38c..b68588c1 100644 --- a/integration/matrixbot/matrixbot.go +++ b/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/integration/matrixbot" +package matrixbot // import "miniflux.app/v2/integration/matrixbot" import ( "fmt" - "miniflux.app/logger" - "miniflux.app/model" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" "github.com/matrix-org/gomatrix" ) diff --git a/integration/notion/notion.go b/integration/notion/notion.go index 16f29dc3..b3df63ee 100644 --- a/integration/notion/notion.go +++ b/integration/notion/notion.go @@ -6,7 +6,7 @@ package notion import ( "fmt" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Client represents a Notion client. diff --git a/integration/nunuxkeeper/nunuxkeeper.go b/integration/nunuxkeeper/nunuxkeeper.go index 217cb371..32cad605 100644 --- a/integration/nunuxkeeper/nunuxkeeper.go +++ b/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/integration/nunuxkeeper" +package nunuxkeeper // import "miniflux.app/v2/integration/nunuxkeeper" import ( "fmt" "net/url" "path" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Document structure of a Nununx Keeper document diff --git a/integration/pinboard/pinboard.go b/integration/pinboard/pinboard.go index 5a56ef20..ca5727d6 100644 --- a/integration/pinboard/pinboard.go +++ b/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/integration/pinboard" +package pinboard // import "miniflux.app/v2/integration/pinboard" import ( "fmt" "net/url" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Client represents a Pinboard client. diff --git a/integration/pocket/connector.go b/integration/pocket/connector.go index 3df818d4..2a51d1e5 100644 --- a/integration/pocket/connector.go +++ b/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/integration/pocket" +package pocket // import "miniflux.app/v2/integration/pocket" import ( "errors" @@ -9,7 +9,7 @@ import ( "io" "net/url" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Connector manages the authorization flow with Pocket to get a personal access token. diff --git a/integration/pocket/pocket.go b/integration/pocket/pocket.go index 6d46ccfc..aca3ca55 100644 --- a/integration/pocket/pocket.go +++ b/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/integration/pocket" +package pocket // import "miniflux.app/v2/integration/pocket" import ( "fmt" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Client represents a Pocket client. diff --git a/integration/readwise/readwise.go b/integration/readwise/readwise.go index 538db68f..0025cba4 100644 --- a/integration/readwise/readwise.go +++ b/integration/readwise/readwise.go @@ -3,13 +3,13 @@ // Readwise Reader API documentation: https://readwise.io/reader_api -package readwise // import "miniflux.app/integration/readwise" +package readwise // import "miniflux.app/v2/integration/readwise" import ( "fmt" "net/url" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Document structure of a Readwise Reader document diff --git a/integration/telegrambot/telegrambot.go b/integration/telegrambot/telegrambot.go index b7dbbcdc..e7e74bde 100644 --- a/integration/telegrambot/telegrambot.go +++ b/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/integration/telegrambot" +package telegrambot // import "miniflux.app/v2/integration/telegrambot" import ( "bytes" @@ -10,7 +10,7 @@ import ( "strconv" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" - "miniflux.app/model" + "miniflux.app/v2/model" ) // PushEntry pushes entry to telegram chat using integration settings provided diff --git a/integration/wallabag/wallabag.go b/integration/wallabag/wallabag.go index 5eb5fe8a..27f92742 100644 --- a/integration/wallabag/wallabag.go +++ b/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/integration/wallabag" +package wallabag // import "miniflux.app/v2/integration/wallabag" import ( "encoding/json" @@ -9,7 +9,7 @@ import ( "io" "net/url" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) // Client represents a Wallabag client. diff --git a/locale/catalog.go b/locale/catalog.go index 71053c41..0aa82359 100644 --- a/locale/catalog.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" import ( "embed" diff --git a/locale/catalog_test.go b/locale/catalog_test.go index 203a9f0c..6a242683 100644 --- a/locale/catalog_test.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" import "testing" diff --git a/locale/locale.go b/locale/locale.go index 8c6e4915..3882b321 100644 --- a/locale/locale.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" // AvailableLanguages returns the list of available languages. func AvailableLanguages() map[string]string { diff --git a/locale/locale_test.go b/locale/locale_test.go index c69157fe..f79bd8ea 100644 --- a/locale/locale_test.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" import "testing" diff --git a/locale/plural.go b/locale/plural.go index 37ef1580..b29384c1 100644 --- a/locale/plural.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" type pluralFormFunc func(n int) int diff --git a/locale/plural_test.go b/locale/plural_test.go index 5d1d3b61..6f8f3799 100644 --- a/locale/plural_test.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" import "testing" diff --git a/locale/printer.go b/locale/printer.go index 1a2812f2..8d58b261 100644 --- a/locale/printer.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" import "fmt" diff --git a/locale/printer_test.go b/locale/printer_test.go index 54510a6a..7595c64c 100644 --- a/locale/printer_test.go +++ b/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/locale" +package locale // import "miniflux.app/v2/locale" import "testing" diff --git a/logger/logger.go b/logger/logger.go index 67e8ce3d..5a5ec0a3 100644 --- a/logger/logger.go +++ b/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/logger" +package logger // import "miniflux.app/v2/logger" import ( "fmt" diff --git a/main.go b/main.go index a3b9c6d0..ee233332 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package main // import "miniflux.app" +package main // import "miniflux.app/v2" import ( - "miniflux.app/cli" + "miniflux.app/v2/cli" ) func main() { diff --git a/metric/metric.go b/metric/metric.go index 2ec51978..050c21e7 100644 --- a/metric/metric.go +++ b/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/metric" +package metric // import "miniflux.app/v2/metric" import ( "time" - "miniflux.app/logger" - "miniflux.app/storage" + "miniflux.app/v2/logger" + "miniflux.app/v2/storage" "github.com/prometheus/client_golang/prometheus" ) diff --git a/model/api_key.go b/model/api_key.go index 7f105a68..e47e9838 100644 --- a/model/api_key.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "time" - "miniflux.app/crypto" + "miniflux.app/v2/crypto" ) // APIKey represents an application API key. diff --git a/model/app_session.go b/model/app_session.go index ad4fb5dc..c3349faf 100644 --- a/model/app_session.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "database/sql/driver" diff --git a/model/categories_sort_options.go b/model/categories_sort_options.go index 0ec086bf..fbd17d67 100644 --- a/model/categories_sort_options.go +++ b/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/model" +package model // import "miniflux.app/v2/model" func CategoriesSortingOptions() map[string]string { return map[string]string{ diff --git a/model/category.go b/model/category.go index ed223286..b16a3def 100644 --- a/model/category.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import "fmt" diff --git a/model/enclosure.go b/model/enclosure.go index b25657e5..5ed0e5cd 100644 --- a/model/enclosure.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import "strings" // Enclosure represents an attachment. diff --git a/model/entry.go b/model/entry.go index 3bb396b8..5630875c 100644 --- a/model/entry.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "time" diff --git a/model/feed.go b/model/feed.go index 5abaa9eb..46d757c6 100644 --- a/model/feed.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "fmt" "math" "time" - "miniflux.app/config" - "miniflux.app/http/client" + "miniflux.app/v2/config" + "miniflux.app/v2/http/client" ) // List of supported schedulers. diff --git a/model/feed_test.go b/model/feed_test.go index 0083c2f4..28474aab 100644 --- a/model/feed_test.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "fmt" @@ -9,8 +9,8 @@ import ( "testing" "time" - "miniflux.app/config" - "miniflux.app/http/client" + "miniflux.app/v2/config" + "miniflux.app/v2/http/client" ) func TestFeedWithResponse(t *testing.T) { diff --git a/model/home_page.go b/model/home_page.go index 4f0737ef..3ffffaa6 100644 --- a/model/home_page.go +++ b/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/model" +package model // import "miniflux.app/v2/model" // HomePages returns the list of available home pages. func HomePages() map[string]string { diff --git a/model/icon.go b/model/icon.go index f039798b..e05bfbf3 100644 --- a/model/icon.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "encoding/base64" diff --git a/model/integration.go b/model/integration.go index 83ab8366..8c46152b 100644 --- a/model/integration.go +++ b/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/model" +package model // import "miniflux.app/v2/model" // Integration represents user integration settings. type Integration struct { diff --git a/model/job.go b/model/job.go index af303d17..2e5df360 100644 --- a/model/job.go +++ b/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/model" +package model // import "miniflux.app/v2/model" // Job represents a payload sent to the processing queue. type Job struct { diff --git a/model/model.go b/model/model.go index fa990c98..4470fe17 100644 --- a/model/model.go +++ b/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/model" +package model // import "miniflux.app/v2/model" // OptionalString populates an optional string field. func OptionalString(value string) *string { diff --git a/model/subscription.go b/model/subscription.go index 281ec30d..b24d36bb 100644 --- a/model/subscription.go +++ b/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/model" +package model // import "miniflux.app/v2/model" // SubscriptionDiscoveryRequest represents a request to discover subscriptions. type SubscriptionDiscoveryRequest struct { diff --git a/model/theme.go b/model/theme.go index 64cc3e37..9381e450 100644 --- a/model/theme.go +++ b/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/model" +package model // import "miniflux.app/v2/model" // Themes returns the list of available themes. func Themes() map[string]string { diff --git a/model/user.go b/model/user.go index 235827f4..4af4a20a 100644 --- a/model/user.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "time" - "miniflux.app/timezone" + "miniflux.app/v2/timezone" ) // User represents a user in the system. diff --git a/model/user_session.go b/model/user_session.go index 6db92b0c..9dca57e0 100644 --- a/model/user_session.go +++ b/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/model" +package model // import "miniflux.app/v2/model" import ( "fmt" "time" - "miniflux.app/timezone" + "miniflux.app/v2/timezone" ) // UserSession represents a user session in the system. diff --git a/oauth2/google.go b/oauth2/google.go index ba5f33d6..48e48d68 100644 --- a/oauth2/google.go +++ b/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/oauth2" +package oauth2 // import "miniflux.app/v2/oauth2" import ( "context" "encoding/json" "fmt" - "miniflux.app/model" + "miniflux.app/v2/model" "golang.org/x/oauth2" ) diff --git a/oauth2/manager.go b/oauth2/manager.go index dd8abf9f..a808b97e 100644 --- a/oauth2/manager.go +++ b/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/oauth2" +package oauth2 // import "miniflux.app/v2/oauth2" import ( "context" "errors" - "miniflux.app/logger" + "miniflux.app/v2/logger" ) // Manager handles OAuth2 providers. diff --git a/oauth2/oidc.go b/oauth2/oidc.go index c2cbb4ef..f4a358ac 100644 --- a/oauth2/oidc.go +++ b/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/oauth2" +package oauth2 // import "miniflux.app/v2/oauth2" import ( "context" - "miniflux.app/model" + "miniflux.app/v2/model" "github.com/coreos/go-oidc/v3/oidc" "golang.org/x/oauth2" diff --git a/oauth2/profile.go b/oauth2/profile.go index 4a9e6135..92c8382f 100644 --- a/oauth2/profile.go +++ b/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/oauth2" +package oauth2 // import "miniflux.app/v2/oauth2" import ( "fmt" diff --git a/oauth2/provider.go b/oauth2/provider.go index 41de8916..f96b4a19 100644 --- a/oauth2/provider.go +++ b/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/oauth2" +package oauth2 // import "miniflux.app/v2/oauth2" import ( "context" - "miniflux.app/model" + "miniflux.app/v2/model" ) // Provider is an interface for OAuth2 providers. diff --git a/packaging/docker/alpine/Dockerfile b/packaging/docker/alpine/Dockerfile index a8727624..c56e6f3c 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/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \ + -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`'" \ main.go FROM alpine:latest diff --git a/packaging/docker/distroless/Dockerfile b/packaging/docker/distroless/Dockerfile index c6c0a0ef..46ee2db8 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/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \ + -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`'" \ main.go FROM gcr.io/distroless/base diff --git a/proxy/media_proxy.go b/proxy/media_proxy.go index 1e433f2a..8499f331 100644 --- a/proxy/media_proxy.go +++ b/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/proxy" +package proxy // import "miniflux.app/v2/proxy" import ( "strings" - "miniflux.app/config" - "miniflux.app/reader/sanitizer" - "miniflux.app/url" + "miniflux.app/v2/config" + "miniflux.app/v2/reader/sanitizer" + "miniflux.app/v2/url" "github.com/PuerkitoBio/goquery" "github.com/gorilla/mux" diff --git a/proxy/media_proxy_test.go b/proxy/media_proxy_test.go index 2afd27f1..6a5bc38d 100644 --- a/proxy/media_proxy_test.go +++ b/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/proxy" +package proxy // import "miniflux.app/v2/proxy" import ( "net/http" @@ -9,7 +9,7 @@ import ( "testing" "github.com/gorilla/mux" - "miniflux.app/config" + "miniflux.app/v2/config" ) func TestProxyFilterWithHttpDefault(t *testing.T) { diff --git a/proxy/proxy.go b/proxy/proxy.go index a701ecfb..7a95e02f 100644 --- a/proxy/proxy.go +++ b/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/proxy" +package proxy // import "miniflux.app/v2/proxy" import ( "crypto/hmac" @@ -10,11 +10,11 @@ import ( "net/url" "path" - "miniflux.app/http/route" + "miniflux.app/v2/http/route" "github.com/gorilla/mux" - "miniflux.app/config" + "miniflux.app/v2/config" ) // ProxifyURL generates a relative URL for a proxified resource. diff --git a/reader/atom/atom_03.go b/reader/atom/atom_03.go index 1b9ff48f..6e7db395 100644 --- a/reader/atom/atom_03.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import ( "encoding/base64" @@ -9,12 +9,12 @@ import ( "strings" "time" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/reader/date" - "miniflux.app/reader/sanitizer" - "miniflux.app/url" + "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" ) // 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/reader/atom/atom_03_test.go index b9cb6f49..88d957e6 100644 --- a/reader/atom/atom_03_test.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import ( "bytes" diff --git a/reader/atom/atom_10.go b/reader/atom/atom_10.go index 1779d25a..76052a26 100644 --- a/reader/atom/atom_10.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import ( "encoding/xml" @@ -10,13 +10,13 @@ import ( "strings" "time" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/reader/date" - "miniflux.app/reader/media" - "miniflux.app/reader/sanitizer" - "miniflux.app/url" + "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" ) // Specs: diff --git a/reader/atom/atom_10_test.go b/reader/atom/atom_10_test.go index 632fde9e..194f16f0 100644 --- a/reader/atom/atom_10_test.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import ( "bytes" diff --git a/reader/atom/atom_common.go b/reader/atom/atom_common.go index 4b965d97..99a1a605 100644 --- a/reader/atom/atom_common.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import "strings" diff --git a/reader/atom/parser.go b/reader/atom/parser.go index 76eaf605..846c96b6 100644 --- a/reader/atom/parser.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import ( "bytes" "encoding/xml" "io" - "miniflux.app/errors" - "miniflux.app/model" - xml_decoder "miniflux.app/reader/xml" + "miniflux.app/v2/errors" + "miniflux.app/v2/model" + xml_decoder "miniflux.app/v2/reader/xml" ) type atomFeed interface { diff --git a/reader/atom/parser_test.go b/reader/atom/parser_test.go index ad3ff2ab..2e5a7a57 100644 --- a/reader/atom/parser_test.go +++ b/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/reader/atom" +package atom // import "miniflux.app/v2/reader/atom" import ( "bytes" diff --git a/reader/browser/browser.go b/reader/browser/browser.go index c539bc09..52d3ab00 100644 --- a/reader/browser/browser.go +++ b/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/reader/browser" +package browser // import "miniflux.app/v2/reader/browser" import ( - "miniflux.app/errors" - "miniflux.app/http/client" + "miniflux.app/v2/errors" + "miniflux.app/v2/http/client" ) var ( diff --git a/reader/date/parser.go b/reader/date/parser.go index b7169bfe..746fd1f5 100644 --- a/reader/date/parser.go +++ b/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/reader/date" +package date // import "miniflux.app/v2/reader/date" import ( "errors" diff --git a/reader/date/parser_test.go b/reader/date/parser_test.go index a639e756..bdd00274 100644 --- a/reader/date/parser_test.go +++ b/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/reader/date" +package date // import "miniflux.app/v2/reader/date" import ( "testing" diff --git a/reader/encoding/encoding.go b/reader/encoding/encoding.go index a69ccf44..deb57897 100644 --- a/reader/encoding/encoding.go +++ b/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/reader/encoding" +package encoding // import "miniflux.app/v2/reader/encoding" import ( "bytes" diff --git a/reader/handler/handler.go b/reader/handler/handler.go index 03beee8f..13118863 100644 --- a/reader/handler/handler.go +++ b/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/reader/handler" +package handler // import "miniflux.app/v2/reader/handler" import ( "fmt" "time" - "miniflux.app/config" - "miniflux.app/errors" - "miniflux.app/http/client" - "miniflux.app/locale" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/reader/browser" - "miniflux.app/reader/icon" - "miniflux.app/reader/parser" - "miniflux.app/reader/processor" - "miniflux.app/storage" - "miniflux.app/timer" + "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" ) var ( diff --git a/reader/icon/finder.go b/reader/icon/finder.go index 02d0fe61..debc60b4 100644 --- a/reader/icon/finder.go +++ b/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/reader/icon" +package icon // import "miniflux.app/v2/reader/icon" import ( "encoding/base64" @@ -11,12 +11,12 @@ import ( stdlib_url "net/url" - "miniflux.app/config" - "miniflux.app/crypto" - "miniflux.app/http/client" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/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" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/icon/finder_test.go b/reader/icon/finder_test.go index 321b2f7b..90deaedc 100644 --- a/reader/icon/finder_test.go +++ b/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/reader/icon" +package icon // import "miniflux.app/v2/reader/icon" import ( "strings" diff --git a/reader/json/json.go b/reader/json/json.go index 0011dc23..677fd456 100644 --- a/reader/json/json.go +++ b/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/reader/json" +package json // import "miniflux.app/v2/reader/json" import ( "strings" "time" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/reader/date" - "miniflux.app/reader/sanitizer" - "miniflux.app/url" + "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" ) type jsonFeed struct { diff --git a/reader/json/parser.go b/reader/json/parser.go index f7ef8331..c4edadc7 100644 --- a/reader/json/parser.go +++ b/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/reader/json" +package json // import "miniflux.app/v2/reader/json" import ( "encoding/json" "io" - "miniflux.app/errors" - "miniflux.app/model" + "miniflux.app/v2/errors" + "miniflux.app/v2/model" ) // Parse returns a normalized feed struct from a JSON feed. diff --git a/reader/json/parser_test.go b/reader/json/parser_test.go index 4640502c..08571360 100644 --- a/reader/json/parser_test.go +++ b/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/reader/json" +package json // import "miniflux.app/v2/reader/json" import ( "bytes" diff --git a/reader/media/media.go b/reader/media/media.go index 8a507598..b3a02b8c 100644 --- a/reader/media/media.go +++ b/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/reader/media" +package media // import "miniflux.app/v2/reader/media" import ( "regexp" diff --git a/reader/media/media_test.go b/reader/media/media_test.go index 5a1cee15..8345b42e 100644 --- a/reader/media/media_test.go +++ b/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/reader/media" +package media // import "miniflux.app/v2/reader/media" import "testing" diff --git a/reader/opml/handler.go b/reader/opml/handler.go index a5ad9d8e..8ef736c4 100644 --- a/reader/opml/handler.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" import ( "errors" "fmt" "io" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/storage" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" ) // Handler handles the logic for OPML import/export. diff --git a/reader/opml/opml.go b/reader/opml/opml.go index d65136fe..cf50563c 100644 --- a/reader/opml/opml.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" import ( "encoding/xml" diff --git a/reader/opml/parser.go b/reader/opml/parser.go index 7fc4255f..84032a95 100644 --- a/reader/opml/parser.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" import ( "encoding/xml" "io" - "miniflux.app/errors" - "miniflux.app/reader/encoding" + "miniflux.app/v2/errors" + "miniflux.app/v2/reader/encoding" ) // Parse reads an OPML file and returns a SubcriptionList. diff --git a/reader/opml/parser_test.go b/reader/opml/parser_test.go index 04d2ff14..c02dd1b2 100644 --- a/reader/opml/parser_test.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" import ( "bytes" diff --git a/reader/opml/serializer.go b/reader/opml/serializer.go index 54f72f40..243e5d05 100644 --- a/reader/opml/serializer.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" import ( "bufio" @@ -10,7 +10,7 @@ import ( "sort" "time" - "miniflux.app/logger" + "miniflux.app/v2/logger" ) // Serialize returns a SubcriptionList in OPML format. diff --git a/reader/opml/serializer_test.go b/reader/opml/serializer_test.go index f53fcc08..12d2b697 100644 --- a/reader/opml/serializer_test.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" import ( "bytes" diff --git a/reader/opml/subscription.go b/reader/opml/subscription.go index 5fd9e9ed..3c473849 100644 --- a/reader/opml/subscription.go +++ b/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/reader/opml" +package opml // import "miniflux.app/v2/reader/opml" // Subcription represents a feed that will be imported or exported. type Subcription struct { diff --git a/reader/parser/format.go b/reader/parser/format.go index 27cd8302..673f47c1 100644 --- a/reader/parser/format.go +++ b/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/reader/parser" +package parser // import "miniflux.app/v2/reader/parser" import ( "encoding/xml" "strings" - rxml "miniflux.app/reader/xml" + rxml "miniflux.app/v2/reader/xml" ) // List of feed formats. diff --git a/reader/parser/format_test.go b/reader/parser/format_test.go index 7010abd3..70837475 100644 --- a/reader/parser/format_test.go +++ b/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/reader/parser" +package parser // import "miniflux.app/v2/reader/parser" import ( "testing" diff --git a/reader/parser/parser.go b/reader/parser/parser.go index ea8e7eaa..bedea9b5 100644 --- a/reader/parser/parser.go +++ b/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/reader/parser" +package parser // import "miniflux.app/v2/reader/parser" import ( "strings" - "miniflux.app/errors" - "miniflux.app/model" - "miniflux.app/reader/atom" - "miniflux.app/reader/json" - "miniflux.app/reader/rdf" - "miniflux.app/reader/rss" + "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" ) // ParseFeed analyzes the input data and returns a normalized feed object. diff --git a/reader/parser/parser_test.go b/reader/parser/parser_test.go index 03b8fb2c..2ec76f65 100644 --- a/reader/parser/parser_test.go +++ b/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/reader/parser" +package parser // import "miniflux.app/v2/reader/parser" import ( "bytes" "os" "testing" - "miniflux.app/http/client" + "miniflux.app/v2/http/client" ) func TestParseAtom(t *testing.T) { diff --git a/reader/processor/processor.go b/reader/processor/processor.go index 181eaa6d..50f40b7b 100644 --- a/reader/processor/processor.go +++ b/reader/processor/processor.go @@ -13,18 +13,18 @@ import ( "time" "unicode/utf8" - "miniflux.app/integration" + "miniflux.app/v2/integration" - "miniflux.app/config" - "miniflux.app/http/client" - "miniflux.app/logger" - "miniflux.app/metric" - "miniflux.app/model" - "miniflux.app/reader/browser" - "miniflux.app/reader/rewrite" - "miniflux.app/reader/sanitizer" - "miniflux.app/reader/scraper" - "miniflux.app/storage" + "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" "github.com/PuerkitoBio/goquery" "github.com/rylans/getlang" diff --git a/reader/processor/processor_test.go b/reader/processor/processor_test.go index acdd674c..5fccc8e6 100644 --- a/reader/processor/processor_test.go +++ b/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/reader/processor" +package processor // import "miniflux.app/v2/reader/processor" import ( "testing" "time" - "miniflux.app/model" + "miniflux.app/v2/model" ) func TestBlockingEntries(t *testing.T) { diff --git a/reader/rdf/dublincore.go b/reader/rdf/dublincore.go index fc0a2dfe..2fb4cc3a 100644 --- a/reader/rdf/dublincore.go +++ b/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/reader/rdf" +package rdf // import "miniflux.app/v2/reader/rdf" // DublinCoreFeedElement represents Dublin Core feed XML elements. type DublinCoreFeedElement struct { diff --git a/reader/rdf/parser.go b/reader/rdf/parser.go index 75ec39fe..4397601e 100644 --- a/reader/rdf/parser.go +++ b/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/reader/rdf" +package rdf // import "miniflux.app/v2/reader/rdf" import ( "io" - "miniflux.app/errors" - "miniflux.app/model" - "miniflux.app/reader/xml" + "miniflux.app/v2/errors" + "miniflux.app/v2/model" + "miniflux.app/v2/reader/xml" ) // Parse returns a normalized feed struct from a RDF feed. diff --git a/reader/rdf/parser_test.go b/reader/rdf/parser_test.go index 280ddc80..385395a4 100644 --- a/reader/rdf/parser_test.go +++ b/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/reader/rdf" +package rdf // import "miniflux.app/v2/reader/rdf" import ( "bytes" diff --git a/reader/rdf/rdf.go b/reader/rdf/rdf.go index 0d0e4606..60cb09e6 100644 --- a/reader/rdf/rdf.go +++ b/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/reader/rdf" +package rdf // import "miniflux.app/v2/reader/rdf" import ( "encoding/xml" @@ -9,12 +9,12 @@ import ( "strings" "time" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/reader/date" - "miniflux.app/reader/sanitizer" - "miniflux.app/url" + "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" ) type rdfFeed struct { diff --git a/reader/readability/readability.go b/reader/readability/readability.go index bf303e78..019d24b3 100644 --- a/reader/readability/readability.go +++ b/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/reader/readability" +package readability // import "miniflux.app/v2/reader/readability" import ( "bytes" @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "miniflux.app/logger" + "miniflux.app/v2/logger" "github.com/PuerkitoBio/goquery" "golang.org/x/net/html" diff --git a/reader/rewrite/rewrite_functions.go b/reader/rewrite/rewrite_functions.go index 9443230e..b02acaa4 100644 --- a/reader/rewrite/rewrite_functions.go +++ b/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/reader/rewrite" +package rewrite // import "miniflux.app/v2/reader/rewrite" import ( "encoding/base64" @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "miniflux.app/config" + "miniflux.app/v2/config" "github.com/PuerkitoBio/goquery" "github.com/yuin/goldmark" diff --git a/reader/rewrite/rewriter.go b/reader/rewrite/rewriter.go index ae5397d1..943832fb 100644 --- a/reader/rewrite/rewriter.go +++ b/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/reader/rewrite" +package rewrite // import "miniflux.app/v2/reader/rewrite" import ( "strconv" "strings" "text/scanner" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/url" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" + "miniflux.app/v2/url" ) type rule struct { diff --git a/reader/rewrite/rewriter_test.go b/reader/rewrite/rewriter_test.go index 2781a2a9..18b97454 100644 --- a/reader/rewrite/rewriter_test.go +++ b/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/reader/rewrite" +package rewrite // import "miniflux.app/v2/reader/rewrite" import ( "os" @@ -9,8 +9,8 @@ import ( "strings" "testing" - "miniflux.app/config" - "miniflux.app/model" + "miniflux.app/v2/config" + "miniflux.app/v2/model" ) func TestParseRules(t *testing.T) { diff --git a/reader/rewrite/rules.go b/reader/rewrite/rules.go index 8d98dc5b..8033d920 100644 --- a/reader/rewrite/rules.go +++ b/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/reader/rewrite" +package rewrite // import "miniflux.app/v2/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/reader/rss/dublincore.go index 320d5c61..221b1a87 100644 --- a/reader/rss/dublincore.go +++ b/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/reader/rss" +package rss // import "miniflux.app/v2/reader/rss" // DublinCoreElement represents Dublin Core XML elements. type DublinCoreElement struct { diff --git a/reader/rss/feedburner.go b/reader/rss/feedburner.go index 87c9f875..f0004288 100644 --- a/reader/rss/feedburner.go +++ b/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/reader/rss" +package rss // import "miniflux.app/v2/reader/rss" // FeedBurnerElement represents FeedBurner XML elements. type FeedBurnerElement struct { diff --git a/reader/rss/parser.go b/reader/rss/parser.go index 13f8e4b4..bc046631 100644 --- a/reader/rss/parser.go +++ b/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/reader/rss" +package rss // import "miniflux.app/v2/reader/rss" import ( "io" - "miniflux.app/errors" - "miniflux.app/model" - "miniflux.app/reader/xml" + "miniflux.app/v2/errors" + "miniflux.app/v2/model" + "miniflux.app/v2/reader/xml" ) // Parse returns a normalized feed struct from a RSS feed. diff --git a/reader/rss/parser_test.go b/reader/rss/parser_test.go index e3d106da..3d1ddad7 100644 --- a/reader/rss/parser_test.go +++ b/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/reader/rss" +package rss // import "miniflux.app/v2/reader/rss" import ( "bytes" diff --git a/reader/rss/podcast.go b/reader/rss/podcast.go index a7d9ab53..bf39870f 100644 --- a/reader/rss/podcast.go +++ b/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/reader/rss" +package rss // import "miniflux.app/v2/reader/rss" import "strings" diff --git a/reader/rss/rss.go b/reader/rss/rss.go index 48c436af..46f957c8 100644 --- a/reader/rss/rss.go +++ b/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/reader/rss" +package rss // import "miniflux.app/v2/reader/rss" import ( "encoding/xml" @@ -11,13 +11,13 @@ import ( "strings" "time" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/reader/date" - "miniflux.app/reader/media" - "miniflux.app/reader/sanitizer" - "miniflux.app/url" + "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" ) // Specs: https://cyber.harvard.edu/rss/rss.html diff --git a/reader/sanitizer/sanitizer.go b/reader/sanitizer/sanitizer.go index e811dd91..620198c4 100644 --- a/reader/sanitizer/sanitizer.go +++ b/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/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/reader/sanitizer" import ( "bytes" @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "miniflux.app/config" - "miniflux.app/url" + "miniflux.app/v2/config" + "miniflux.app/v2/url" "golang.org/x/net/html" ) diff --git a/reader/sanitizer/sanitizer_test.go b/reader/sanitizer/sanitizer_test.go index 100bf684..79de66b5 100644 --- a/reader/sanitizer/sanitizer_test.go +++ b/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/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/reader/sanitizer" import ( "os" "testing" - "miniflux.app/config" + "miniflux.app/v2/config" ) func TestMain(m *testing.M) { diff --git a/reader/sanitizer/strip_tags.go b/reader/sanitizer/strip_tags.go index 263ef91f..6d8ecc8b 100644 --- a/reader/sanitizer/strip_tags.go +++ b/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/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/reader/sanitizer" import ( "bytes" diff --git a/reader/sanitizer/strip_tags_test.go b/reader/sanitizer/strip_tags_test.go index 33a07016..9798d914 100644 --- a/reader/sanitizer/strip_tags_test.go +++ b/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/reader/sanitizer" +package sanitizer // import "miniflux.app/v2/reader/sanitizer" import "testing" diff --git a/reader/scraper/rules.go b/reader/scraper/rules.go index 6dcda370..a53db332 100644 --- a/reader/scraper/rules.go +++ b/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/reader/scraper" +package scraper // import "miniflux.app/v2/reader/scraper" // List of predefined scraper rules (alphabetically sorted) // domain => CSS selectors diff --git a/reader/scraper/scraper.go b/reader/scraper/scraper.go index d2fef40a..3b1a1d8e 100644 --- a/reader/scraper/scraper.go +++ b/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/reader/scraper" +package scraper // import "miniflux.app/v2/reader/scraper" import ( "errors" @@ -9,11 +9,11 @@ import ( "io" "strings" - "miniflux.app/config" - "miniflux.app/http/client" - "miniflux.app/logger" - "miniflux.app/reader/readability" - "miniflux.app/url" + "miniflux.app/v2/config" + "miniflux.app/v2/http/client" + "miniflux.app/v2/logger" + "miniflux.app/v2/reader/readability" + "miniflux.app/v2/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/scraper/scraper_test.go b/reader/scraper/scraper_test.go index 9d586c78..414108f8 100644 --- a/reader/scraper/scraper_test.go +++ b/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/reader/scraper" +package scraper // import "miniflux.app/v2/reader/scraper" import ( "bytes" diff --git a/reader/subscription/finder.go b/reader/subscription/finder.go index df3d275a..877b3f86 100644 --- a/reader/subscription/finder.go +++ b/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/reader/subscription" +package subscription // import "miniflux.app/v2/reader/subscription" import ( "fmt" @@ -9,12 +9,12 @@ import ( "regexp" "strings" - "miniflux.app/config" - "miniflux.app/errors" - "miniflux.app/http/client" - "miniflux.app/reader/browser" - "miniflux.app/reader/parser" - "miniflux.app/url" + "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" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/subscription/subscription.go b/reader/subscription/subscription.go index 2a7ff55b..e2634b87 100644 --- a/reader/subscription/subscription.go +++ b/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/reader/subscription" +package subscription // import "miniflux.app/v2/reader/subscription" import "fmt" diff --git a/reader/xml/decoder.go b/reader/xml/decoder.go index edf58f47..cd702888 100644 --- a/reader/xml/decoder.go +++ b/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/reader/xml" +package xml // import "miniflux.app/v2/reader/xml" import ( "bytes" @@ -10,7 +10,7 @@ import ( "io" "strings" - "miniflux.app/reader/encoding" + "miniflux.app/v2/reader/encoding" ) // NewDecoder returns a XML decoder that filters illegal characters. diff --git a/reader/xml/decoder_test.go b/reader/xml/decoder_test.go index a350955a..cfd7732f 100644 --- a/reader/xml/decoder_test.go +++ b/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/reader/xml" +package xml // import "miniflux.app/v2/reader/xml" import ( "encoding/xml" diff --git a/storage/api_key.go b/storage/api_key.go index ea25e484..6b59c92b 100644 --- a/storage/api_key.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "fmt" - "miniflux.app/model" + "miniflux.app/v2/model" ) // APIKeyExists checks if an API Key with the same description exists. diff --git a/storage/category.go b/storage/category.go index c5e5f74d..686b458c 100644 --- a/storage/category.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" @@ -9,7 +9,7 @@ import ( "fmt" "github.com/lib/pq" - "miniflux.app/model" + "miniflux.app/v2/model" ) // AnotherCategoryExists checks if another category exists with the same title. diff --git a/storage/certificate_cache.go b/storage/certificate_cache.go index 0e0c26e0..f956d304 100644 --- a/storage/certificate_cache.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "context" diff --git a/storage/enclosure.go b/storage/enclosure.go index 3573609b..e1461788 100644 --- a/storage/enclosure.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" "fmt" "strings" - "miniflux.app/model" + "miniflux.app/v2/model" ) // GetEnclosures returns all attachments for the given entry. diff --git a/storage/entry.go b/storage/entry.go index 5dbb9c04..a6ed1397 100644 --- a/storage/entry.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" @@ -9,9 +9,9 @@ import ( "fmt" "time" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" + "miniflux.app/v2/crypto" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" "github.com/lib/pq" ) diff --git a/storage/entry_pagination_builder.go b/storage/entry_pagination_builder.go index 13987c84..ed85c927 100644 --- a/storage/entry_pagination_builder.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" @@ -9,8 +9,8 @@ import ( "strings" "time" - "miniflux.app/model" - "miniflux.app/timer" + "miniflux.app/v2/model" + "miniflux.app/v2/timer" ) // EntryPaginationBuilder is a builder for entry prev/next queries. diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go index ce50e342..5e41abbb 100644 --- a/storage/entry_query_builder.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" - "miniflux.app/model" - "miniflux.app/timezone" + "miniflux.app/v2/model" + "miniflux.app/v2/timezone" ) // EntryQueryBuilder builds a SQL query to fetch entries. diff --git a/storage/feed.go b/storage/feed.go index df36bdec..0461b6f2 100644 --- a/storage/feed.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" @@ -10,9 +10,9 @@ import ( "runtime" "sort" - "miniflux.app/config" - "miniflux.app/logger" - "miniflux.app/model" + "miniflux.app/v2/config" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" ) type byStateAndName struct{ f model.Feeds } diff --git a/storage/feed_query_builder.go b/storage/feed_query_builder.go index 88862b55..b1cf5a66 100644 --- a/storage/feed_query_builder.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" "fmt" "strings" - "miniflux.app/model" - "miniflux.app/timezone" + "miniflux.app/v2/model" + "miniflux.app/v2/timezone" ) // FeedQueryBuilder builds a SQL query to fetch feeds. diff --git a/storage/icon.go b/storage/icon.go index ffae3ac2..f0d8253e 100644 --- a/storage/icon.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" "fmt" "strings" - "miniflux.app/model" + "miniflux.app/v2/model" ) // HasIcon checks if the given feed has an icon. diff --git a/storage/integration.go b/storage/integration.go index 21e3a2cb..1293f75c 100644 --- a/storage/integration.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" "fmt" "golang.org/x/crypto/bcrypt" - "miniflux.app/model" + "miniflux.app/v2/model" ) // HasDuplicateFeverUsername checks if another user have the same Fever username. diff --git a/storage/job.go b/storage/job.go index e983b55c..75597db5 100644 --- a/storage/job.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "fmt" - "miniflux.app/config" - "miniflux.app/model" + "miniflux.app/v2/config" + "miniflux.app/v2/model" ) // NewBatch returns a series of jobs. diff --git a/storage/session.go b/storage/session.go index 71de8291..b3369a4a 100644 --- a/storage/session.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" "fmt" - "miniflux.app/crypto" - "miniflux.app/model" + "miniflux.app/v2/crypto" + "miniflux.app/v2/model" ) // CreateAppSessionWithUserPrefs creates a new application session with the given user preferences. diff --git a/storage/storage.go b/storage/storage.go index 5b582b1f..59c6acab 100644 --- a/storage/storage.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "context" diff --git a/storage/timezone.go b/storage/timezone.go index 14545093..a5b69c6a 100644 --- a/storage/timezone.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "fmt" diff --git a/storage/user.go b/storage/user.go index 1f074cc9..dfcdbae2 100644 --- a/storage/user.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" @@ -9,9 +9,9 @@ import ( "runtime" "strings" - "miniflux.app/crypto" - "miniflux.app/logger" - "miniflux.app/model" + "miniflux.app/v2/crypto" + "miniflux.app/v2/logger" + "miniflux.app/v2/model" "github.com/lib/pq" "golang.org/x/crypto/bcrypt" diff --git a/storage/user_session.go b/storage/user_session.go index edc3c2a4..a3f54186 100644 --- a/storage/user_session.go +++ b/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/storage" +package storage // import "miniflux.app/v2/storage" import ( "database/sql" "fmt" - "miniflux.app/crypto" - "miniflux.app/model" + "miniflux.app/v2/crypto" + "miniflux.app/v2/model" ) // UserSessions returns the list of sessions for the given user. diff --git a/systemd/systemd.go b/systemd/systemd.go index 5f7a149e..4f604690 100644 --- a/systemd/systemd.go +++ b/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/systemd" +package systemd // import "miniflux.app/v2/systemd" import ( "fmt" diff --git a/template/engine.go b/template/engine.go index 2d3071c4..306acddb 100644 --- a/template/engine.go +++ b/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/template" +package template // import "miniflux.app/v2/template" import ( "bytes" @@ -10,9 +10,9 @@ import ( "strings" "time" - "miniflux.app/errors" - "miniflux.app/locale" - "miniflux.app/logger" + "miniflux.app/v2/errors" + "miniflux.app/v2/locale" + "miniflux.app/v2/logger" "github.com/gorilla/mux" ) diff --git a/template/functions.go b/template/functions.go index 0a3a5657..698dee8a 100644 --- a/template/functions.go +++ b/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/template" +package template // import "miniflux.app/v2/template" import ( "fmt" @@ -11,14 +11,14 @@ import ( "strings" "time" - "miniflux.app/config" - "miniflux.app/crypto" - "miniflux.app/http/route" - "miniflux.app/locale" - "miniflux.app/model" - "miniflux.app/proxy" - "miniflux.app/timezone" - "miniflux.app/url" + "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" "github.com/gorilla/mux" ) diff --git a/template/functions_test.go b/template/functions_test.go index 5b6e4341..de3896a3 100644 --- a/template/functions_test.go +++ b/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/template" +package template // import "miniflux.app/v2/template" import ( "testing" "time" - "miniflux.app/locale" + "miniflux.app/v2/locale" ) func TestDict(t *testing.T) { diff --git a/tests/category_test.go b/tests/category_test.go index 5ef4a0bf..c5b7b389 100644 --- a/tests/category_test.go +++ b/tests/category_test.go @@ -9,7 +9,7 @@ package tests import ( "testing" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func TestCreateCategory(t *testing.T) { diff --git a/tests/endpoint_test.go b/tests/endpoint_test.go index c864f9e1..16b122d2 100644 --- a/tests/endpoint_test.go +++ b/tests/endpoint_test.go @@ -9,7 +9,7 @@ package tests import ( "testing" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func TestWithBadEndpoint(t *testing.T) { diff --git a/tests/entry_test.go b/tests/entry_test.go index 8807c951..5d9ac03e 100644 --- a/tests/entry_test.go +++ b/tests/entry_test.go @@ -9,7 +9,7 @@ package tests import ( "testing" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func TestGetAllFeedEntries(t *testing.T) { diff --git a/tests/feed_test.go b/tests/feed_test.go index 7409a550..cbcaf4c0 100644 --- a/tests/feed_test.go +++ b/tests/feed_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func TestCreateFeed(t *testing.T) { diff --git a/tests/subscription_test.go b/tests/subscription_test.go index 01201097..d9ed9311 100644 --- a/tests/subscription_test.go +++ b/tests/subscription_test.go @@ -9,7 +9,7 @@ package tests import ( "testing" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func TestDiscoverSubscriptions(t *testing.T) { diff --git a/tests/tests.go b/tests/tests.go index 56965ce6..76618635 100644 --- a/tests/tests.go +++ b/tests/tests.go @@ -13,7 +13,7 @@ import ( "testing" "time" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) const ( diff --git a/tests/user_test.go b/tests/user_test.go index 8b2fe8f3..6952bc06 100644 --- a/tests/user_test.go +++ b/tests/user_test.go @@ -9,7 +9,7 @@ package tests import ( "testing" - miniflux "miniflux.app/client" + miniflux "miniflux.app/v2/client" ) func TestWithWrongCredentials(t *testing.T) { diff --git a/timer/timer.go b/timer/timer.go index 92c14970..c1e29984 100644 --- a/timer/timer.go +++ b/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/timer" +package timer // import "miniflux.app/v2/timer" import ( "time" - "miniflux.app/logger" + "miniflux.app/v2/logger" ) // ExecutionTime returns the elapsed time of a block of code. diff --git a/timezone/timezone.go b/timezone/timezone.go index c14ae25e..064bc756 100644 --- a/timezone/timezone.go +++ b/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/timezone" +package timezone // import "miniflux.app/v2/timezone" import ( "time" diff --git a/timezone/timezone_test.go b/timezone/timezone_test.go index 0e8cfb94..dce8b584 100644 --- a/timezone/timezone_test.go +++ b/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/timezone" +package timezone // import "miniflux.app/v2/timezone" import ( "testing" diff --git a/ui/about.go b/ui/about.go index 3bfa554b..1e844443 100644 --- a/ui/about.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "runtime" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" - "miniflux.app/version" + "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" ) func (h *handler) showAboutPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_create.go b/ui/api_key_create.go index 68535089..bb309d8d 100644 --- a/ui/api_key_create.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showCreateAPIKeyPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_list.go b/ui/api_key_list.go index 5fd1d0e3..5d9ebfee 100644 --- a/ui/api_key_list.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showAPIKeysPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_remove.go b/ui/api_key_remove.go index 50345478..ecf2ab41 100644 --- a/ui/api_key_remove.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" + "miniflux.app/v2/logger" ) func (h *handler) removeAPIKey(w http.ResponseWriter, r *http.Request) { diff --git a/ui/api_key_save.go b/ui/api_key_save.go index 84537385..94b76421 100644 --- a/ui/api_key_save.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) saveAPIKey(w http.ResponseWriter, r *http.Request) { diff --git a/ui/bookmark_entries.go b/ui/bookmark_entries.go index 38815a4c..d459af47 100644 --- a/ui/bookmark_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showStarredPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_create.go b/ui/category_create.go index 506dc331..f46ca8b5 100644 --- a/ui/category_create.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showCreateCategoryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_edit.go b/ui/category_edit.go index 71fcbf2d..791d3cb9 100644 --- a/ui/category_edit.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showEditCategoryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_entries.go b/ui/category_entries.go index f3ee0a2f..f588dfb2 100644 --- a/ui/category_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_entries_all.go b/ui/category_entries_all.go index fe860cf4..4706e5ac 100644 --- a/ui/category_entries_all.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showCategoryEntriesAllPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_feeds.go b/ui/category_feeds.go index 7bec8419..979384d2 100644 --- a/ui/category_feeds.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showCategoryFeedsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_list.go b/ui/category_list.go index 120d4dcd..83ab803b 100644 --- a/ui/category_list.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showCategoryListPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_mark_as_read.go b/ui/category_mark_as_read.go index aae83780..8e3be25f 100644 --- a/ui/category_mark_as_read.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" ) func (h *handler) markCategoryAsRead(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_refresh.go b/ui/category_refresh.go index 9c871eea..6cf63f1f 100644 --- a/ui/category_refresh.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" ) func (h *handler) refreshCategoryEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_remove.go b/ui/category_remove.go index 11080ece..f68471c3 100644 --- a/ui/category_remove.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" ) func (h *handler) removeCategory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_save.go b/ui/category_save.go index c6f083ce..88f2fe99 100644 --- a/ui/category_save.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" - "miniflux.app/validator" + "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" ) func (h *handler) saveCategory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/category_update.go b/ui/category_update.go index f0e71274..9632fd15 100644 --- a/ui/category_update.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" - "miniflux.app/validator" + "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" ) func (h *handler) updateCategory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_bookmark.go b/ui/entry_bookmark.go index d67ef0e9..70efba36 100644 --- a/ui/entry_bookmark.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showStarredEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_category.go b/ui/entry_category.go index a40ff09c..5ae553d6 100644 --- a/ui/entry_category.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showCategoryEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_enclosure_save_position.go b/ui/entry_enclosure_save_position.go index 91fd0078..fd37dc16 100644 --- a/ui/entry_enclosure_save_position.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( json2 "encoding/json" "io" "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" ) func (h *handler) saveEnclosureProgression(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_feed.go b/ui/entry_feed.go index c1ce09d3..695b6f53 100644 --- a/ui/entry_feed.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showFeedEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_read.go b/ui/entry_read.go index 3185b09d..171549a5 100644 --- a/ui/entry_read.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showReadEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_save.go b/ui/entry_save.go index b467d68b..3ee2cd45 100644 --- a/ui/entry_save.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/integration" - "miniflux.app/model" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/integration" + "miniflux.app/v2/model" ) func (h *handler) saveEntry(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_scraper.go b/ui/entry_scraper.go index ec9cfa9f..cd9fa9f8 100644 --- a/ui/entry_scraper.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/locale" - "miniflux.app/model" - "miniflux.app/proxy" - "miniflux.app/reader/processor" - "miniflux.app/storage" + "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" ) func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_search.go b/ui/entry_search.go index de487259..ae89acaf 100644 --- a/ui/entry_search.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showSearchEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_toggle_bookmark.go b/ui/entry_toggle_bookmark.go index 54cc416b..230d2237 100644 --- a/ui/entry_toggle_bookmark.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" ) func (h *handler) toggleBookmark(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_unread.go b/ui/entry_unread.go index ba75e1e9..7f08d1ae 100644 --- a/ui/entry_unread.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showUnreadEntryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/entry_update_status.go b/ui/entry_update_status.go index f1228310..31d139f5 100644 --- a/ui/entry_update_status.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( json_parser "encoding/json" "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/model" - "miniflux.app/validator" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/model" + "miniflux.app/v2/validator" ) func (h *handler) updateEntriesStatus(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_edit.go b/ui/feed_edit.go index b13abc4f..0ae5f3f5 100644 --- a/ui/feed_edit.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showEditFeedPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_entries.go b/ui/feed_entries.go index 7b93b8ff..d85bb345 100644 --- a/ui/feed_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_entries_all.go b/ui/feed_entries_all.go index 6493d258..305196f5 100644 --- a/ui/feed_entries_all.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showFeedEntriesAllPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_icon.go b/ui/feed_icon.go index 093952d7..69c26e40 100644 --- a/ui/feed_icon.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/html" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response" + "miniflux.app/v2/http/response/html" ) func (h *handler) showIcon(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_list.go b/ui/feed_list.go index 1d218349..9c932954 100644 --- a/ui/feed_list.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showFeedsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_mark_as_read.go b/ui/feed_mark_as_read.go index 65400a95..1aebeafd 100644 --- a/ui/feed_mark_as_read.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" ) func (h *handler) markFeedAsRead(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_refresh.go b/ui/feed_refresh.go index 26afbe84..38c755c5 100644 --- a/ui/feed_refresh.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - feedHandler "miniflux.app/reader/handler" + "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" ) func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_remove.go b/ui/feed_remove.go index 3874d47a..c800a57d 100644 --- a/ui/feed_remove.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" ) func (h *handler) removeFeed(w http.ResponseWriter, r *http.Request) { diff --git a/ui/feed_update.go b/ui/feed_update.go index e8080110..75f23909 100644 --- a/ui/feed_update.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" - "miniflux.app/validator" + "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" ) func (h *handler) updateFeed(w http.ResponseWriter, r *http.Request) { diff --git a/ui/form/api_key.go b/ui/form/api_key.go index b2a56991..70dc4ff6 100644 --- a/ui/form/api_key.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" - "miniflux.app/errors" + "miniflux.app/v2/errors" ) // APIKeyForm represents the API Key form. diff --git a/ui/form/auth.go b/ui/form/auth.go index 9d0ad884..6f85672e 100644 --- a/ui/form/auth.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" - "miniflux.app/errors" + "miniflux.app/v2/errors" ) // AuthForm represents the authentication form. diff --git a/ui/form/category.go b/ui/form/category.go index e7488c9f..3e673506 100644 --- a/ui/form/category.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" diff --git a/ui/form/feed.go b/ui/form/feed.go index 3a673379..00d1d501 100644 --- a/ui/form/feed.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" "strconv" - "miniflux.app/model" + "miniflux.app/v2/model" ) // FeedForm represents a feed form in the UI diff --git a/ui/form/integration.go b/ui/form/integration.go index 7c9731d4..6966f46d 100644 --- a/ui/form/integration.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" - "miniflux.app/model" + "miniflux.app/v2/model" ) // IntegrationForm represents user integration settings form. diff --git a/ui/form/settings.go b/ui/form/settings.go index f8773997..d4fed0b0 100644 --- a/ui/form/settings.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" "strconv" - "miniflux.app/errors" - "miniflux.app/model" + "miniflux.app/v2/errors" + "miniflux.app/v2/model" ) // SettingsForm represents the settings form. diff --git a/ui/form/settings_test.go b/ui/form/settings_test.go index 3a58c838..87dbfc73 100644 --- a/ui/form/settings_test.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "testing" diff --git a/ui/form/subscription.go b/ui/form/subscription.go index 4a36f792..eb2d127c 100644 --- a/ui/form/subscription.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" "strconv" - "miniflux.app/errors" - "miniflux.app/validator" + "miniflux.app/v2/errors" + "miniflux.app/v2/validator" ) // SubscriptionForm represents the subscription form. diff --git a/ui/form/user.go b/ui/form/user.go index ed626f29..4b3b03ca 100644 --- a/ui/form/user.go +++ b/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/ui/form" +package form // import "miniflux.app/v2/ui/form" import ( "net/http" - "miniflux.app/errors" - "miniflux.app/model" + "miniflux.app/v2/errors" + "miniflux.app/v2/model" ) // UserForm represents the user form. diff --git a/ui/handler.go b/ui/handler.go index 78600ea0..5ab29585 100644 --- a/ui/handler.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( - "miniflux.app/storage" - "miniflux.app/template" - "miniflux.app/worker" + "miniflux.app/v2/storage" + "miniflux.app/v2/template" + "miniflux.app/v2/worker" "github.com/gorilla/mux" ) diff --git a/ui/history_entries.go b/ui/history_entries.go index c5275105..75b1764a 100644 --- a/ui/history_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showHistoryPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/history_flush.go b/ui/history_flush.go index 8a8a1203..555027d2 100644 --- a/ui/history_flush.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" ) func (h *handler) flushHistory(w http.ResponseWriter, r *http.Request) { diff --git a/ui/integration_pocket.go b/ui/integration_pocket.go index 7d2d476c..eb12696f 100644 --- a/ui/integration_pocket.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/integration/pocket" - "miniflux.app/locale" - "miniflux.app/logger" - "miniflux.app/ui/session" + "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" ) func (h *handler) pocketAuthorize(w http.ResponseWriter, r *http.Request) { diff --git a/ui/integration_show.go b/ui/integration_show.go index 4a6419d3..5e0256ed 100644 --- a/ui/integration_show.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showIntegrationPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/integration_update.go b/ui/integration_update.go index 007239f4..a6ad2826 100644 --- a/ui/integration_update.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "crypto/md5" "fmt" "net/http" - "miniflux.app/crypto" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/locale" - "miniflux.app/ui/form" - "miniflux.app/ui/session" + "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" ) func (h *handler) updateIntegration(w http.ResponseWriter, r *http.Request) { diff --git a/ui/login_check.go b/ui/login_check.go index cdd7417b..76a424cd 100644 --- a/ui/login_check.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/cookie" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) checkLogin(w http.ResponseWriter, r *http.Request) { diff --git a/ui/login_show.go b/ui/login_show.go index 81be88cc..b668d5e1 100644 --- a/ui/login_show.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showLoginPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/logout.go b/ui/logout.go index 34dfe000..80f8b652 100644 --- a/ui/logout.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/cookie" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/ui/session" + "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" ) func (h *handler) logout(w http.ResponseWriter, r *http.Request) { diff --git a/ui/middleware.go b/ui/middleware.go index 72334088..f5a538ba 100644 --- a/ui/middleware.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "context" "errors" "net/http" - "miniflux.app/config" - "miniflux.app/http/cookie" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/storage" - "miniflux.app/ui/session" + "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" "github.com/gorilla/mux" ) diff --git a/ui/oauth2.go b/ui/oauth2.go index 7cf5aa3d..883b52f3 100644 --- a/ui/oauth2.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "context" - "miniflux.app/config" - "miniflux.app/oauth2" + "miniflux.app/v2/config" + "miniflux.app/v2/oauth2" ) func getOAuth2Manager(ctx context.Context) *oauth2.Manager { diff --git a/ui/oauth2_callback.go b/ui/oauth2_callback.go index ac1e19e8..6563446e 100644 --- a/ui/oauth2_callback.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "errors" "net/http" - "miniflux.app/config" - "miniflux.app/http/cookie" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/locale" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/session" + "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" ) func (h *handler) oauth2Callback(w http.ResponseWriter, r *http.Request) { diff --git a/ui/oauth2_redirect.go b/ui/oauth2_redirect.go index fb24df37..0249655a 100644 --- a/ui/oauth2_redirect.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/ui/session" + "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" ) func (h *handler) oauth2Redirect(w http.ResponseWriter, r *http.Request) { diff --git a/ui/oauth2_unlink.go b/ui/oauth2_unlink.go index fa2f51bd..cf765884 100644 --- a/ui/oauth2_unlink.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/locale" - "miniflux.app/logger" - "miniflux.app/ui/session" + "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" ) func (h *handler) oauth2Unlink(w http.ResponseWriter, r *http.Request) { diff --git a/ui/offline.go b/ui/offline.go index da04e910..dd5175b4 100644 --- a/ui/offline.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showOfflinePage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/opml_export.go b/ui/opml_export.go index a7b14161..b7e0f75c 100644 --- a/ui/opml_export.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/response/xml" - "miniflux.app/reader/opml" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/response/xml" + "miniflux.app/v2/reader/opml" ) func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) { diff --git a/ui/opml_import.go b/ui/opml_import.go index 0f7bbac0..2cf54326 100644 --- a/ui/opml_import.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showImportPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/opml_upload.go b/ui/opml_upload.go index bebab3e8..9ec95eaa 100644 --- a/ui/opml_upload.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/client" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/reader/opml" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) { diff --git a/ui/pagination.go b/ui/pagination.go index 395e1714..db5c5352 100644 --- a/ui/pagination.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" type pagination struct { Route string diff --git a/ui/proxy.go b/ui/proxy.go index a21d75f5..97a75910 100644 --- a/ui/proxy.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "crypto/hmac" @@ -11,12 +11,12 @@ import ( "net/http" "time" - "miniflux.app/config" - "miniflux.app/crypto" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/html" - "miniflux.app/logger" + "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" ) func (h *handler) mediaProxy(w http.ResponseWriter, r *http.Request) { diff --git a/ui/search_entries.go b/ui/search_entries.go index 28f648ac..d9d1e194 100644 --- a/ui/search_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showSearchEntriesPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/session/session.go b/ui/session/session.go index b0756daf..fc8efe99 100644 --- a/ui/session/session.go +++ b/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/ui/session" +package session // import "miniflux.app/v2/ui/session" import ( - "miniflux.app/crypto" - "miniflux.app/storage" + "miniflux.app/v2/crypto" + "miniflux.app/v2/storage" ) // Session handles session data. diff --git a/ui/session_list.go b/ui/session_list.go index 2db9e1cf..dcc687d1 100644 --- a/ui/session_list.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showSessionsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/session_remove.go b/ui/session_remove.go index 024ebdf2..a8bcedfe 100644 --- a/ui/session_remove.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" + "miniflux.app/v2/logger" ) func (h *handler) removeSession(w http.ResponseWriter, r *http.Request) { diff --git a/ui/settings_show.go b/ui/settings_show.go index 39700d17..fe698d2c 100644 --- a/ui/settings_show.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/locale" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showSettingsPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/settings_update.go b/ui/settings_update.go index 5d0b0d1c..31ecf0ff 100644 --- a/ui/settings_update.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/locale" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" - "miniflux.app/validator" + "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" ) func (h *handler) updateSettings(w http.ResponseWriter, r *http.Request) { diff --git a/ui/share.go b/ui/share.go index 0ee405da..096d464a 100644 --- a/ui/share.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/storage" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) createSharedEntry(w http.ResponseWriter, r *http.Request) { diff --git a/ui/shared_entries.go b/ui/shared_entries.go index 3a00cbe7..6fbf6b46 100644 --- a/ui/shared_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) sharedEntries(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static/static.go b/ui/static/static.go index 0201cc98..a9b52df5 100644 --- a/ui/static/static.go +++ b/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/ui/static" +package static // import "miniflux.app/v2/ui/static" import ( "bytes" diff --git a/ui/static_app_icon.go b/ui/static_app_icon.go index 40f41011..eeb031ac 100644 --- a/ui/static_app_icon.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "path/filepath" "time" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/html" - "miniflux.app/ui/static" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/static" ) func (h *handler) showAppIcon(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_favicon.go b/ui/static_favicon.go index 426fa52d..bb689459 100644 --- a/ui/static_favicon.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "time" - "miniflux.app/http/response" - "miniflux.app/http/response/html" - "miniflux.app/ui/static" + "miniflux.app/v2/http/response" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/static" ) func (h *handler) showFavicon(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_javascript.go b/ui/static_javascript.go index a722c868..5f0ae41e 100644 --- a/ui/static_javascript.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "fmt" "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/ui/static" + "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" ) func (h *handler) showJavascript(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_manifest.go b/ui/static_manifest.go index 5f2424f9..0de863c6 100644 --- a/ui/static_manifest.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" - "miniflux.app/http/route" - "miniflux.app/model" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" + "miniflux.app/v2/http/route" + "miniflux.app/v2/model" ) func (h *handler) showWebManifest(w http.ResponseWriter, r *http.Request) { diff --git a/ui/static_stylesheet.go b/ui/static_stylesheet.go index f95e2ddf..0fc22094 100644 --- a/ui/static_stylesheet.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" "time" - "miniflux.app/http/request" - "miniflux.app/http/response" - "miniflux.app/http/response/html" - "miniflux.app/ui/static" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/static" ) func (h *handler) showStylesheet(w http.ResponseWriter, r *http.Request) { diff --git a/ui/subscription_add.go b/ui/subscription_add.go index d42aabe6..6abe76b4 100644 --- a/ui/subscription_add.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showAddSubscriptionPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/subscription_bookmarklet.go b/ui/subscription_bookmarklet.go index 38b09123..3ff53fbf 100644 --- a/ui/subscription_bookmarklet.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" "mvdan.cc/xurls/v2" ) diff --git a/ui/subscription_choose.go b/ui/subscription_choose.go index d4b0e9a2..14755da5 100644 --- a/ui/subscription_choose.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - feedHandler "miniflux.app/reader/handler" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showChooseSubscriptionPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/subscription_submit.go b/ui/subscription_submit.go index ce88c0fc..cfb44996 100644 --- a/ui/subscription_submit.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - feedHandler "miniflux.app/reader/handler" - "miniflux.app/reader/subscription" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) submitSubscription(w http.ResponseWriter, r *http.Request) { diff --git a/ui/ui.go b/ui/ui.go index ecdc1800..a82d24fd 100644 --- a/ui/ui.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/logger" - "miniflux.app/storage" - "miniflux.app/template" - "miniflux.app/worker" + "miniflux.app/v2/logger" + "miniflux.app/v2/storage" + "miniflux.app/v2/template" + "miniflux.app/v2/worker" "github.com/gorilla/mux" ) diff --git a/ui/unread_entries.go b/ui/unread_entries.go index 5fe1ab2b..956a7269 100644 --- a/ui/unread_entries.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "fmt" "net/http" "time" - "miniflux.app/config" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/model" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/unread_mark_all_read.go b/ui/unread_mark_all_read.go index 54effa16..aab67036 100644 --- a/ui/unread_mark_all_read.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/json" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/json" ) func (h *handler) markAllAsRead(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_create.go b/ui/user_create.go index e8d3d408..85534854 100644 --- a/ui/user_create.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) showCreateUserPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_edit.go b/ui/user_edit.go index f675f4b7..6819f43d 100644 --- a/ui/user_edit.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) // EditUser shows the form to edit a user. diff --git a/ui/user_list.go b/ui/user_list.go index 9e9cce31..f3a9ed80 100644 --- a/ui/user_list.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/view" ) func (h *handler) showUsersPage(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_remove.go b/ui/user_remove.go index e6cc9847..5f66d203 100644 --- a/ui/user_remove.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "errors" "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" + "miniflux.app/v2/http/request" + "miniflux.app/v2/http/response/html" + "miniflux.app/v2/http/route" ) func (h *handler) removeUser(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_save.go b/ui/user_save.go index 49827def..848a9eb4 100644 --- a/ui/user_save.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/model" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" - "miniflux.app/validator" + "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" ) func (h *handler) saveUser(w http.ResponseWriter, r *http.Request) { diff --git a/ui/user_update.go b/ui/user_update.go index abdbe925..fa3522c9 100644 --- a/ui/user_update.go +++ b/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/ui" +package ui // import "miniflux.app/v2/ui" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/http/response/html" - "miniflux.app/http/route" - "miniflux.app/logger" - "miniflux.app/ui/form" - "miniflux.app/ui/session" - "miniflux.app/ui/view" + "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" ) func (h *handler) updateUser(w http.ResponseWriter, r *http.Request) { diff --git a/ui/view/view.go b/ui/view/view.go index d63deefa..40ea93bb 100644 --- a/ui/view/view.go +++ b/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/ui/view" +package view // import "miniflux.app/v2/ui/view" import ( "net/http" - "miniflux.app/http/request" - "miniflux.app/template" - "miniflux.app/ui/session" - "miniflux.app/ui/static" + "miniflux.app/v2/http/request" + "miniflux.app/v2/template" + "miniflux.app/v2/ui/session" + "miniflux.app/v2/ui/static" ) // View wraps template argument building. diff --git a/url/url.go b/url/url.go index 2806572a..9357baa4 100644 --- a/url/url.go +++ b/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/url" +package url // import "miniflux.app/v2/url" import ( "fmt" diff --git a/url/url_test.go b/url/url_test.go index 5d3d2ccc..e1e5ae60 100644 --- a/url/url_test.go +++ b/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/url" +package url // import "miniflux.app/v2/url" import "testing" diff --git a/validator/category.go b/validator/category.go index b4255176..8db71a04 100644 --- a/validator/category.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import ( - "miniflux.app/model" - "miniflux.app/storage" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" ) // ValidateCategoryCreation validates category creation. diff --git a/validator/entry.go b/validator/entry.go index 2d4c7eb2..c1d5908e 100644 --- a/validator/entry.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import ( "fmt" - "miniflux.app/model" + "miniflux.app/v2/model" ) // ValidateEntriesStatusUpdateRequest validates a status update for a list of entries. diff --git a/validator/entry_test.go b/validator/entry_test.go index 2022ad71..74f69468 100644 --- a/validator/entry_test.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import ( "testing" - "miniflux.app/model" + "miniflux.app/v2/model" ) func TestValidateEntriesStatusUpdateRequest(t *testing.T) { diff --git a/validator/feed.go b/validator/feed.go index 89f086ca..612725ee 100644 --- a/validator/feed.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import ( - "miniflux.app/model" - "miniflux.app/storage" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" ) // ValidateFeedCreation validates feed creation. diff --git a/validator/subscription.go b/validator/subscription.go index adfda342..68c70cea 100644 --- a/validator/subscription.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" -import "miniflux.app/model" +import "miniflux.app/v2/model" // ValidateSubscriptionDiscovery validates subscription discovery requests. func ValidateSubscriptionDiscovery(request *model.SubscriptionDiscoveryRequest) *ValidationError { diff --git a/validator/user.go b/validator/user.go index 7a552ee7..e43fe416 100644 --- a/validator/user.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import ( - "miniflux.app/locale" - "miniflux.app/model" - "miniflux.app/storage" + "miniflux.app/v2/locale" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" ) // ValidateUserCreationWithPassword validates user creation with a password. diff --git a/validator/validator.go b/validator/validator.go index 4ef0a586..b08186c6 100644 --- a/validator/validator.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import ( "errors" @@ -9,7 +9,7 @@ import ( "net/url" "regexp" - "miniflux.app/locale" + "miniflux.app/v2/locale" ) // ValidationError represents a validation error. diff --git a/validator/validator_test.go b/validator/validator_test.go index fd72b4f9..62f9db48 100644 --- a/validator/validator_test.go +++ b/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/validator" +package validator // import "miniflux.app/v2/validator" import "testing" diff --git a/version/version.go b/version/version.go index c4494048..4c6e082f 100644 --- a/version/version.go +++ b/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/version" +package version // import "miniflux.app/v2/version" // Variables populated at build time. var ( diff --git a/worker/pool.go b/worker/pool.go index b914cc20..656964a4 100644 --- a/worker/pool.go +++ b/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/worker" +package worker // import "miniflux.app/v2/worker" import ( - "miniflux.app/model" - "miniflux.app/storage" + "miniflux.app/v2/model" + "miniflux.app/v2/storage" ) // Pool handles a pool of workers. diff --git a/worker/worker.go b/worker/worker.go index 4075ffdb..fd65dc0d 100644 --- a/worker/worker.go +++ b/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/worker" +package worker // import "miniflux.app/v2/worker" import ( "time" - "miniflux.app/config" - "miniflux.app/logger" - "miniflux.app/metric" - "miniflux.app/model" - feedHandler "miniflux.app/reader/handler" - "miniflux.app/storage" + "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" ) // Worker refreshes a feed in the background.