Просмотр исходного кода

Rename Miniflux package name to follow Go module naming convention

For reference: https://go.dev/ref/mod#major-version-suffixes
Frédéric Guillot 2 лет назад
Родитель
Сommit
c234903255
100 измененных файлов с 276 добавлено и 276 удалено
  1. 2 2
      Makefile
  2. 3 3
      api/api.go
  3. 5 5
      api/category.go
  4. 11 11
      api/entry.go
  5. 6 6
      api/feed.go
  6. 3 3
      api/icon.go
  7. 5 5
      api/middleware.go
  8. 5 5
      api/opml.go
  9. 2 2
      api/payload.go
  10. 5 5
      api/subscription.go
  11. 5 5
      api/user.go
  12. 1 1
      cli/ask_credentials.go
  13. 6 6
      cli/cleanup_tasks.go
  14. 8 8
      cli/cli.go
  15. 6 6
      cli/create_admin.go
  16. 8 8
      cli/daemon.go
  17. 2 2
      cli/flush_sessions.go
  18. 3 3
      cli/health_check.go
  19. 2 2
      cli/info.go
  20. 6 6
      cli/refresh_feeds.go
  21. 4 4
      cli/reset_password.go
  22. 5 5
      cli/scheduler.go
  23. 1 1
      client/README.md
  24. 1 1
      client/client.go
  25. 2 2
      client/doc.go
  26. 1 1
      client/model.go
  27. 1 1
      client/request.go
  28. 1 1
      config/config.go
  29. 1 1
      config/config_test.go
  30. 2 2
      config/options.go
  31. 1 1
      config/parser.go
  32. 1 1
      config/parser_test.go
  33. 1 1
      crypto/crypto.go
  34. 1 1
      database/database.go
  35. 1 1
      database/migrations.go
  36. 2 2
      errors/errors.go
  37. 8 8
      fever/handler.go
  38. 5 5
      fever/middleware.go
  39. 1 1
      fever/response.go
  40. 1 1
      go.mod
  41. 14 14
      googlereader/handler.go
  42. 7 7
      googlereader/middleware.go
  43. 3 3
      googlereader/response.go
  44. 5 5
      http/client/client.go
  45. 1 1
      http/client/client_test.go
  46. 1 1
      http/client/response.go
  47. 1 1
      http/client/response_test.go
  48. 1 1
      http/cookie/cookie.go
  49. 1 1
      http/request/client_ip.go
  50. 1 1
      http/request/client_ip_test.go
  51. 1 1
      http/request/context.go
  52. 1 1
      http/request/context_test.go
  53. 1 1
      http/request/cookie.go
  54. 1 1
      http/request/cookie_test.go
  55. 1 1
      http/request/params.go
  56. 1 1
      http/request/params_test.go
  57. 2 2
      http/response/builder.go
  58. 1 1
      http/response/builder_test.go
  59. 3 3
      http/response/html/html.go
  60. 1 1
      http/response/html/html_test.go
  61. 3 3
      http/response/json/json.go
  62. 1 1
      http/response/json/json_test.go
  63. 2 2
      http/response/xml/xml.go
  64. 1 1
      http/response/xml/xml_test.go
  65. 2 2
      http/route/route.go
  66. 11 11
      http/server/httpd.go
  67. 4 4
      http/server/middleware.go
  68. 2 2
      integration/apprise/apprise.go
  69. 2 2
      integration/espial/espial.go
  70. 2 2
      integration/instapaper/instapaper.go
  71. 16 16
      integration/integration.go
  72. 2 2
      integration/linkding/linkding.go
  73. 3 3
      integration/matrixbot/matrixbot.go
  74. 1 1
      integration/notion/notion.go
  75. 2 2
      integration/nunuxkeeper/nunuxkeeper.go
  76. 2 2
      integration/pinboard/pinboard.go
  77. 2 2
      integration/pocket/connector.go
  78. 2 2
      integration/pocket/pocket.go
  79. 2 2
      integration/readwise/readwise.go
  80. 2 2
      integration/telegrambot/telegrambot.go
  81. 2 2
      integration/wallabag/wallabag.go
  82. 1 1
      locale/catalog.go
  83. 1 1
      locale/catalog_test.go
  84. 1 1
      locale/locale.go
  85. 1 1
      locale/locale_test.go
  86. 1 1
      locale/plural.go
  87. 1 1
      locale/plural_test.go
  88. 1 1
      locale/printer.go
  89. 1 1
      locale/printer_test.go
  90. 1 1
      logger/logger.go
  91. 2 2
      main.go
  92. 3 3
      metric/metric.go
  93. 2 2
      model/api_key.go
  94. 1 1
      model/app_session.go
  95. 1 1
      model/categories_sort_options.go
  96. 1 1
      model/category.go
  97. 1 1
      model/enclosure.go
  98. 1 1
      model/entry.go
  99. 3 3
      model/feed.go
  100. 3 3
      model/feed_test.go

+ 2 - 2
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`

+ 3 - 3
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"
 )

+ 5 - 5
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) {

+ 11 - 11
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) {

+ 6 - 6
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) {

+ 3 - 3
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) {

+ 5 - 5
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 {

+ 5 - 5
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) {

+ 2 - 2
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 {

+ 5 - 5
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) {

+ 5 - 5
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) {

+ 1 - 1
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"

+ 6 - 6
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) {

+ 8 - 8
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 (

+ 6 - 6
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) {

+ 8 - 8
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) {

+ 2 - 2
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) {

+ 3 - 3
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) {

+ 2 - 2
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() {

+ 6 - 6
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) {

+ 4 - 4
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) {

+ 5 - 5
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) {

+ 1 - 1
client/README.md

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"os"
 
-	miniflux "miniflux.app/client"
+	miniflux "miniflux.app/v2/client"
 )
 
 func main() {

+ 1 - 1
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"

+ 2 - 2
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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

+ 1 - 1
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"

+ 2 - 2
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 (

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 2 - 2
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.

+ 8 - 8
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"
 )

+ 5 - 5
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 {

+ 1 - 1
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"

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module miniflux.app
+module miniflux.app/v2
 
 // +heroku goVersion go1.21
 

+ 14 - 14
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 {

+ 7 - 7
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 {

+ 3 - 3
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 {

+ 5 - 5
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 (

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"
 

+ 1 - 1
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"

+ 1 - 1
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"
 

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 2 - 2
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

+ 1 - 1
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"

+ 3 - 3
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.

+ 1 - 1
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"

+ 3 - 3
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`

+ 1 - 1
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"

+ 2 - 2
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.

+ 1 - 1
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"

+ 2 - 2
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.

+ 11 - 11
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"

+ 4 - 4
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 {

+ 2 - 2
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.

+ 2 - 2
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

+ 2 - 2
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.

+ 16 - 16
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".

+ 2 - 2
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

+ 3 - 3
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"
 )

+ 1 - 1
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.

+ 2 - 2
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

+ 2 - 2
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.

+ 2 - 2
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.

+ 2 - 2
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.

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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.

+ 1 - 1
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"

+ 1 - 1
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"
 

+ 1 - 1
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 {

+ 1 - 1
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"
 

+ 1 - 1
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
 

+ 1 - 1
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"
 

+ 1 - 1
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"
 

+ 1 - 1
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"
 

+ 1 - 1
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"

+ 2 - 2
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() {

+ 3 - 3
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"
 )

+ 2 - 2
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.

+ 1 - 1
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"

+ 1 - 1
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{

+ 1 - 1
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"
 

+ 1 - 1
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.

+ 1 - 1
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"

+ 3 - 3
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.

+ 3 - 3
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) {

Некоторые файлы не были показаны из-за большого количества измененных файлов