southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move internal packages to an internal folder

Browse source 
For reference: https://go.dev/doc/go1.4#internalpackages
This commit is contained in:
Frédéric Guillot 2023-08-10 19:46:45 -07:00
parent c234903255
commit 168a870c02
433 changed files with 1121 additions and 1123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -3,7 +3,7 @@ DOCKER_IMAGE := miniflux/miniflux
VERSION := $(shell git describe --tags --abbrev=0) VERSION := $(shell git describe --tags --abbrev=0)
COMMIT := $(shell git rev-parse --short HEAD) COMMIT := $(shell git rev-parse --short HEAD)
BUILD_DATE := `date +%FT%T%z` BUILD_DATE := `date +%FT%T%z`
LD_FLAGS := "-s -w -X 'miniflux.app/v2/version.Version=$(VERSION)' -X 'miniflux.app/v2/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/version.BuildDate=$(BUILD_DATE)'" LD_FLAGS := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)' -X 'miniflux.app/v2/internal/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/internal/version.BuildDate=$(BUILD_DATE)'"
PKG_LIST := $(shell go list ./... | grep -v /vendor/) PKG_LIST := $(shell go list ./... | grep -v /vendor/)
DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
DEB_IMG_ARCH := amd64 DEB_IMG_ARCH := amd64
@ -122,7 +122,7 @@ integration-test:
./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid" ./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid"
while ! nc -z localhost 8080; do sleep 1; done while ! nc -z localhost 8080; do sleep 1; done
go test -v -tags=integration -count=1 miniflux.app/v2/tests go test -v -tags=integration -count=1 miniflux.app/v2/internal/tests
clean-integration-test: clean-integration-test:
@ kill -9 `cat /tmp/miniflux.pid` @ kill -9 `cat /tmp/miniflux.pid`

4
client/README.md
View file

@ -1,7 +1,7 @@
Miniflux API Client Miniflux API Client
=================== ===================
[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/client)](https://pkg.go.dev/miniflux.app/client) [![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/v2/client)](https://pkg.go.dev/miniflux.app/v2/client)
Client library for Miniflux REST API. Client library for Miniflux REST API.
@ -9,7 +9,7 @@ Installation
------------ ------------
```bash ```bash
go get -u miniflux.app/client go get -u miniflux.app/v2/client
``` ```
Example Example

6
api/api.go → internal/api/api.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
"net/http" "net/http"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/worker" "miniflux.app/v2/internal/worker"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

10
api/category.go → internal/api/category.go
View file

@ -1,17 +1,17 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
json_parser "encoding/json" json_parser "encoding/json"
"net/http" "net/http"
"time" "time"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) { func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) {

22
api/entry.go → internal/api/entry.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
json_parser "encoding/json" json_parser "encoding/json"
@ -11,16 +11,16 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/integration" "miniflux.app/v2/internal/integration"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/proxy" "miniflux.app/v2/internal/proxy"
"miniflux.app/v2/reader/processor" "miniflux.app/v2/internal/reader/processor"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/url" "miniflux.app/v2/internal/url"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func (h *handler) getEntryFromBuilder(w http.ResponseWriter, r *http.Request, b *storage.EntryQueryBuilder) { func (h *handler) getEntryFromBuilder(w http.ResponseWriter, r *http.Request, b *storage.EntryQueryBuilder) {

12
api/feed.go → internal/api/feed.go
View file

@ -1,18 +1,18 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
json_parser "encoding/json" json_parser "encoding/json"
"net/http" "net/http"
"time" "time"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
feedHandler "miniflux.app/v2/reader/handler" feedHandler "miniflux.app/v2/internal/reader/handler"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) { func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) {

6
api/icon.go → internal/api/icon.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
"net/http" "net/http"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
) )
func (h *handler) feedIcon(w http.ResponseWriter, r *http.Request) { func (h *handler) feedIcon(w http.ResponseWriter, r *http.Request) {

10
api/middleware.go → internal/api/middleware.go
View file

@ -1,16 +1,16 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
"context" "context"
"net/http" "net/http"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
) )
type middleware struct { type middleware struct {

10
api/opml.go → internal/api/opml.go
View file

@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
"net/http" "net/http"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/http/response/xml" "miniflux.app/v2/internal/http/response/xml"
"miniflux.app/v2/reader/opml" "miniflux.app/v2/internal/reader/opml"
) )
func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) { func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) {

4
api/payload.go → internal/api/payload.go
View file

@ -1,10 +1,10 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
) )
type feedIconResponse struct { type feedIconResponse struct {

10
api/subscription.go → internal/api/subscription.go
View file

@ -1,16 +1,16 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
json_parser "encoding/json" json_parser "encoding/json"
"net/http" "net/http"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/reader/subscription" "miniflux.app/v2/internal/reader/subscription"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) { func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) {

10
api/user.go → internal/api/user.go
View file

@ -1,17 +1,17 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package api // import "miniflux.app/v2/api" package api // import "miniflux.app/v2/internal/api"
import ( import (
json_parser "encoding/json" json_parser "encoding/json"
"errors" "errors"
"net/http" "net/http"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func (h *handler) currentUser(w http.ResponseWriter, r *http.Request) { func (h *handler) currentUser(w http.ResponseWriter, r *http.Request) {

2
cli/ask_credentials.go → internal/cli/ask_credentials.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"bufio" "bufio"

12
cli/cleanup_tasks.go → internal/cli/cleanup_tasks.go
View file

@ -1,16 +1,16 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/metric" "miniflux.app/v2/internal/metric"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
) )
func runCleanupTasks(store *storage.Storage) { func runCleanupTasks(store *storage.Storage) {

16
cli/cli.go → internal/cli/cli.go
View file

@ -1,19 +1,19 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"flag" "flag"
"fmt" "fmt"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/database" "miniflux.app/v2/internal/database"
"miniflux.app/v2/locale" "miniflux.app/v2/internal/locale"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/ui/static" "miniflux.app/v2/internal/ui/static"
"miniflux.app/v2/version" "miniflux.app/v2/internal/version"
) )
const ( const (

12
cli/create_admin.go → internal/cli/create_admin.go
View file

@ -1,17 +1,17 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"fmt" "fmt"
"os" "os"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func createAdmin(store *storage.Storage) { func createAdmin(store *storage.Storage) {

16
cli/daemon.go → internal/cli/daemon.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"context" "context"
@ -11,13 +11,13 @@ import (
"syscall" "syscall"
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
httpd "miniflux.app/v2/http/server" httpd "miniflux.app/v2/internal/http/server"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/metric" "miniflux.app/v2/internal/metric"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/systemd" "miniflux.app/v2/internal/systemd"
"miniflux.app/v2/worker" "miniflux.app/v2/internal/worker"
) )
func startDaemon(store *storage.Storage) { func startDaemon(store *storage.Storage) {

4
cli/flush_sessions.go → internal/cli/flush_sessions.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"fmt" "fmt"
"os" "os"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
) )
func flushSessions(store *storage.Storage) { func flushSessions(store *storage.Storage) {

6
cli/health_check.go → internal/cli/health_check.go
View file

@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"net/http" "net/http"
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
func doHealthCheck(healthCheckEndpoint string) { func doHealthCheck(healthCheckEndpoint string) {

4
cli/info.go → internal/cli/info.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"fmt" "fmt"
"runtime" "runtime"
"miniflux.app/v2/version" "miniflux.app/v2/internal/version"
) )
func info() { func info() {

12
cli/refresh_feeds.go → internal/cli/refresh_feeds.go
View file

@ -1,17 +1,17 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"sync" "sync"
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
feedHandler "miniflux.app/v2/reader/handler" feedHandler "miniflux.app/v2/internal/reader/handler"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
) )
func refreshFeeds(store *storage.Storage) { func refreshFeeds(store *storage.Storage) {

8
cli/reset_password.go → internal/cli/reset_password.go
View file

@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"fmt" "fmt"
"os" "os"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
func resetPassword(store *storage.Storage) { func resetPassword(store *storage.Storage) {

10
cli/scheduler.go → internal/cli/scheduler.go
View file

@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cli // import "miniflux.app/v2/cli" package cli // import "miniflux.app/v2/internal/cli"
import ( import (
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/worker" "miniflux.app/v2/internal/worker"
) )
func runScheduler(store *storage.Storage, pool *worker.Pool) { func runScheduler(store *storage.Storage, pool *worker.Pool) {

2
config/config.go → internal/config/config.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package config // import "miniflux.app/v2/config" package config // import "miniflux.app/v2/internal/config"
// Opts holds parsed configuration options. // Opts holds parsed configuration options.
var Opts *Options var Opts *Options

2
config/config_test.go → internal/config/config_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package config // import "miniflux.app/v2/config" package config // import "miniflux.app/v2/internal/config"
import ( import (
"os" "os"

4
config/options.go → internal/config/options.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package config // import "miniflux.app/v2/config" package config // import "miniflux.app/v2/internal/config"
import ( import (
"crypto/rand" "crypto/rand"
@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/version" "miniflux.app/v2/internal/version"
) )
const ( const (

2
config/parser.go → internal/config/parser.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package config // import "miniflux.app/v2/config" package config // import "miniflux.app/v2/internal/config"
import ( import (
"bufio" "bufio"

2
config/parser_test.go → internal/config/parser_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package config // import "miniflux.app/v2/config" package config // import "miniflux.app/v2/internal/config"
import ( import (
"testing" "testing"

2
crypto/crypto.go → internal/crypto/crypto.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package crypto // import "miniflux.app/v2/crypto" package crypto // import "miniflux.app/v2/internal/crypto"
import ( import (
"crypto/rand" "crypto/rand"

2
database/database.go → internal/database/database.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package database // import "miniflux.app/v2/database" package database // import "miniflux.app/v2/internal/database"
import ( import (
"database/sql" "database/sql"

2
database/migrations.go → internal/database/migrations.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package database // import "miniflux.app/v2/database" package database // import "miniflux.app/v2/internal/database"
import ( import (
"database/sql" "database/sql"

4
errors/errors.go → internal/errors/errors.go
View file

@ -1,12 +1,12 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package errors // import "miniflux.app/v2/errors" package errors // import "miniflux.app/v2/internal/errors"
import ( import (
"fmt" "fmt"
"miniflux.app/v2/locale" "miniflux.app/v2/internal/locale"
) )
// LocalizedError represents an error than could be translated to another language. // LocalizedError represents an error than could be translated to another language.

16
fever/handler.go → internal/fever/handler.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package fever // import "miniflux.app/v2/fever" package fever // import "miniflux.app/v2/internal/fever"
import ( import (
"net/http" "net/http"
@ -9,13 +9,13 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/integration" "miniflux.app/v2/internal/integration"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/proxy" "miniflux.app/v2/internal/proxy"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

10
fever/middleware.go → internal/fever/middleware.go
View file

@ -1,16 +1,16 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package fever // import "miniflux.app/v2/fever" package fever // import "miniflux.app/v2/internal/fever"
import ( import (
"context" "context"
"net/http" "net/http"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
) )
type middleware struct { type middleware struct {

2
fever/response.go → internal/fever/response.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package fever // import "miniflux.app/v2/fever" package fever // import "miniflux.app/v2/internal/fever"
import ( import (
"time" "time"

28
googlereader/handler.go → internal/googlereader/handler.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package googlereader // import "miniflux.app/v2/googlereader" package googlereader // import "miniflux.app/v2/internal/googlereader"
import ( import (
"errors" "errors"
@ -13,19 +13,19 @@ import (
"time" "time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/http/route" "miniflux.app/v2/internal/http/route"
"miniflux.app/v2/integration" "miniflux.app/v2/internal/integration"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/proxy" "miniflux.app/v2/internal/proxy"
mff "miniflux.app/v2/reader/handler" mff "miniflux.app/v2/internal/reader/handler"
mfs "miniflux.app/v2/reader/subscription" mfs "miniflux.app/v2/internal/reader/subscription"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/url" "miniflux.app/v2/internal/url"
"miniflux.app/v2/validator" "miniflux.app/v2/internal/validator"
) )
type handler struct { type handler struct {

14
googlereader/middleware.go → internal/googlereader/middleware.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package googlereader // import "miniflux.app/v2/googlereader" package googlereader // import "miniflux.app/v2/internal/googlereader"
import ( import (
"context" "context"
@ -11,12 +11,12 @@ import (
"net/http" "net/http"
"strings" "strings"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/http/response" "miniflux.app/v2/internal/http/response"
"miniflux.app/v2/http/response/json" "miniflux.app/v2/internal/http/response/json"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
) )
type middleware struct { type middleware struct {

6
googlereader/response.go → internal/googlereader/response.go
View file

@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package googlereader // import "miniflux.app/v2/googlereader" package googlereader // import "miniflux.app/v2/internal/googlereader"
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"miniflux.app/v2/http/response" "miniflux.app/v2/internal/http/response"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
type login struct { type login struct {

10
http/client/client.go → internal/http/client/client.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package client // import "miniflux.app/v2/http/client" package client // import "miniflux.app/v2/internal/http/client"
import ( import (
"bytes" "bytes"
@ -16,10 +16,10 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/errors" "miniflux.app/v2/internal/errors"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/timer" "miniflux.app/v2/internal/timer"
) )
const ( const (

2
http/client/client_test.go → internal/http/client/client_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package client // import "miniflux.app/v2/http/client" package client // import "miniflux.app/v2/internal/http/client"
import ( import (
"fmt" "fmt"

2
http/client/response.go → internal/http/client/response.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package client // import "miniflux.app/v2/http/client" package client // import "miniflux.app/v2/internal/http/client"
import ( import (
"bytes" "bytes"

2
http/client/response_test.go → internal/http/client/response_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package client // import "miniflux.app/v2/http/client" package client // import "miniflux.app/v2/internal/http/client"
import ( import (
"bytes" "bytes"

0
http/client/testdata/HTTP-charset.html → internal/http/client/testdata/HTTP-charset.html vendored
View file

0
http/client/testdata/HTTP-vs-UTF-8-BOM.html → internal/http/client/testdata/HTTP-vs-UTF-8-BOM.html vendored
View file

0
http/client/testdata/HTTP-vs-meta-charset.html → internal/http/client/testdata/HTTP-vs-meta-charset.html vendored
View file

0
http/client/testdata/HTTP-vs-meta-content.html → internal/http/client/testdata/HTTP-vs-meta-content.html vendored
View file

0
http/client/testdata/No-encoding-declaration.html → internal/http/client/testdata/No-encoding-declaration.html vendored
View file

0
http/client/testdata/README → internal/http/client/testdata/README vendored
View file

0
http/client/testdata/UTF-16BE-BOM.html → internal/http/client/testdata/UTF-16BE-BOM.html vendored
View file

0
http/client/testdata/UTF-16LE-BOM.html → internal/http/client/testdata/UTF-16LE-BOM.html vendored
View file

0
http/client/testdata/UTF-8-BOM-vs-meta-charset.html → internal/http/client/testdata/UTF-8-BOM-vs-meta-charset.html vendored
View file

0
http/client/testdata/UTF-8-BOM-vs-meta-content.html → internal/http/client/testdata/UTF-8-BOM-vs-meta-content.html vendored
View file

0
http/client/testdata/charset-content-type-xml-iso88591.xml → internal/http/client/testdata/charset-content-type-xml-iso88591.xml vendored
View file

0
http/client/testdata/content-type-only-win-8859-1.xml → internal/http/client/testdata/content-type-only-win-8859-1.xml vendored
View file

0
http/client/testdata/gb2312.html → internal/http/client/testdata/gb2312.html vendored
View file

0
http/client/testdata/meta-charset-attribute.html → internal/http/client/testdata/meta-charset-attribute.html vendored
View file

0
http/client/testdata/meta-content-attribute.html → internal/http/client/testdata/meta-content-attribute.html vendored
View file

0
http/client/testdata/rdf_utf8.xml → internal/http/client/testdata/rdf_utf8.xml vendored
View file

0
http/client/testdata/single_quote_xml_encoding.xml → internal/http/client/testdata/single_quote_xml_encoding.xml vendored
View file

0
http/client/testdata/smallfile.xml → internal/http/client/testdata/smallfile.xml vendored
View file

0
http/client/testdata/urdu.xml → internal/http/client/testdata/urdu.xml vendored
View file

0
http/client/testdata/windows_1251.html → internal/http/client/testdata/windows_1251.html vendored
View file

0
http/client/testdata/windows_1251.xml → internal/http/client/testdata/windows_1251.xml vendored
View file

2
http/cookie/cookie.go → internal/http/cookie/cookie.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package cookie // import "miniflux.app/v2/http/cookie" package cookie // import "miniflux.app/v2/internal/http/cookie"
import ( import (
"net/http" "net/http"

2
http/request/client_ip.go → internal/http/request/client_ip.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import ( import (
"net" "net"

2
http/request/client_ip_test.go → internal/http/request/client_ip_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import ( import (
"net/http" "net/http"

2
http/request/context.go → internal/http/request/context.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import "net/http" import "net/http"

2
http/request/context_test.go → internal/http/request/context_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import ( import (
"context" "context"

2
http/request/cookie.go → internal/http/request/cookie.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import "net/http" import "net/http"

2
http/request/cookie_test.go → internal/http/request/cookie_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import ( import (
"net/http" "net/http"

2
http/request/params.go → internal/http/request/params.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import ( import (
"net/http" "net/http"

2
http/request/params_test.go → internal/http/request/params_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package request // import "miniflux.app/v2/http/request" package request // import "miniflux.app/v2/internal/http/request"
import ( import (
"net/http" "net/http"

4
http/response/builder.go → internal/http/response/builder.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package response // import "miniflux.app/v2/http/response" package response // import "miniflux.app/v2/internal/http/response"
import ( import (
"compress/flate" "compress/flate"
@ -12,7 +12,7 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
const compressionThreshold = 1024 const compressionThreshold = 1024

2
http/response/builder_test.go → internal/http/response/builder_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package response // import "miniflux.app/v2/http/response" package response // import "miniflux.app/v2/internal/http/response"
import ( import (
"errors" "errors"

6
http/response/html/html.go → internal/http/response/html/html.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package html // import "miniflux.app/v2/http/response/html" package html // import "miniflux.app/v2/internal/http/response/html"
import ( import (
"net/http" "net/http"
"miniflux.app/v2/http/response" "miniflux.app/v2/internal/http/response"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
// OK creates a new HTML response with a 200 status code. // OK creates a new HTML response with a 200 status code.

2
http/response/html/html_test.go → internal/http/response/html/html_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package html // import "miniflux.app/v2/http/response/html" package html // import "miniflux.app/v2/internal/http/response/html"
import ( import (
"errors" "errors"

6
http/response/json/json.go → internal/http/response/json/json.go
View file

@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package json // import "miniflux.app/v2/http/response/json" package json // import "miniflux.app/v2/internal/http/response/json"
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"net/http" "net/http"
"miniflux.app/v2/http/response" "miniflux.app/v2/internal/http/response"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
const contentTypeHeader = `application/json` const contentTypeHeader = `application/json`

2
http/response/json/json_test.go → internal/http/response/json/json_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package json // import "miniflux.app/v2/http/response/json" package json // import "miniflux.app/v2/internal/http/response/json"
import ( import (
"errors" "errors"

4
http/response/xml/xml.go → internal/http/response/xml/xml.go
View file

@ -1,12 +1,12 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package xml // import "miniflux.app/v2/http/response/xml" package xml // import "miniflux.app/v2/internal/http/response/xml"
import ( import (
"net/http" "net/http"
"miniflux.app/v2/http/response" "miniflux.app/v2/internal/http/response"
) )
// OK writes a standard XML response with a status 200 OK. // OK writes a standard XML response with a status 200 OK.

2
http/response/xml/xml_test.go → internal/http/response/xml/xml_test.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package xml // import "miniflux.app/v2/http/response/xml" package xml // import "miniflux.app/v2/internal/http/response/xml"
import ( import (
"net/http" "net/http"

4
http/route/route.go → internal/http/route/route.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package route // import "miniflux.app/v2/http/route" package route // import "miniflux.app/v2/internal/http/route"
import ( import (
"strconv" "strconv"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
// Path returns the defined route based on given arguments. // Path returns the defined route based on given arguments.

22
http/server/httpd.go → internal/http/server/httpd.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package httpd // import "miniflux.app/v2/http/server" package httpd // import "miniflux.app/v2/internal/http/server"
import ( import (
"crypto/tls" "crypto/tls"
@ -12,16 +12,16 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/api" "miniflux.app/v2/internal/api"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/fever" "miniflux.app/v2/internal/fever"
"miniflux.app/v2/googlereader" "miniflux.app/v2/internal/googlereader"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/storage" "miniflux.app/v2/internal/storage"
"miniflux.app/v2/ui" "miniflux.app/v2/internal/ui"
"miniflux.app/v2/version" "miniflux.app/v2/internal/version"
"miniflux.app/v2/worker" "miniflux.app/v2/internal/worker"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"

8
http/server/middleware.go → internal/http/server/middleware.go
View file

@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package httpd // import "miniflux.app/v2/http/server" package httpd // import "miniflux.app/v2/internal/http/server"
import ( import (
"context" "context"
"net/http" "net/http"
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/http/request" "miniflux.app/v2/internal/http/request"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
) )
func middleware(next http.Handler) http.Handler { func middleware(next http.Handler) http.Handler {

4
integration/apprise/apprise.go → internal/integration/apprise/apprise.go
View file

@ -9,8 +9,8 @@ import (
"strings" "strings"
"time" "time"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
) )
// Client represents a Apprise client. // Client represents a Apprise client.

0
integration/apprise/wrapper.go → internal/integration/apprise/wrapper.go
View file

4
integration/espial/espial.go → internal/integration/espial/espial.go
View file

@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package espial // import "miniflux.app/v2/integration/espial" package espial // import "miniflux.app/v2/internal/integration/espial"
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"path" "path"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Document structure of an Espial document // Document structure of an Espial document

4
integration/instapaper/instapaper.go → internal/integration/instapaper/instapaper.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package instapaper // import "miniflux.app/v2/integration/instapaper" package instapaper // import "miniflux.app/v2/internal/integration/instapaper"
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Client represents an Instapaper client. // Client represents an Instapaper client.

32
integration/integration.go → internal/integration/integration.go
View file

@ -1,24 +1,24 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package integration // import "miniflux.app/v2/integration" package integration // import "miniflux.app/v2/internal/integration"
import ( import (
"miniflux.app/v2/config" "miniflux.app/v2/internal/config"
"miniflux.app/v2/integration/apprise" "miniflux.app/v2/internal/integration/apprise"
"miniflux.app/v2/integration/espial" "miniflux.app/v2/internal/integration/espial"
"miniflux.app/v2/integration/instapaper" "miniflux.app/v2/internal/integration/instapaper"
"miniflux.app/v2/integration/linkding" "miniflux.app/v2/internal/integration/linkding"
"miniflux.app/v2/integration/matrixbot" "miniflux.app/v2/internal/integration/matrixbot"
"miniflux.app/v2/integration/notion" "miniflux.app/v2/internal/integration/notion"
"miniflux.app/v2/integration/nunuxkeeper" "miniflux.app/v2/internal/integration/nunuxkeeper"
"miniflux.app/v2/integration/pinboard" "miniflux.app/v2/internal/integration/pinboard"
"miniflux.app/v2/integration/pocket" "miniflux.app/v2/internal/integration/pocket"
"miniflux.app/v2/integration/readwise" "miniflux.app/v2/internal/integration/readwise"
"miniflux.app/v2/integration/telegrambot" "miniflux.app/v2/internal/integration/telegrambot"
"miniflux.app/v2/integration/wallabag" "miniflux.app/v2/internal/integration/wallabag"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
) )
// SendEntry sends the entry to third-party providers when the user click on "Save". // SendEntry sends the entry to third-party providers when the user click on "Save".

4
integration/linkding/linkding.go → internal/integration/linkding/linkding.go
View file

@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package linkding // import "miniflux.app/v2/integration/linkding" package linkding // import "miniflux.app/v2/internal/integration/linkding"
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"strings" "strings"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Document structure of a Linkding document // Document structure of a Linkding document

6
integration/matrixbot/matrixbot.go → internal/integration/matrixbot/matrixbot.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package matrixbot // import "miniflux.app/v2/integration/matrixbot" package matrixbot // import "miniflux.app/v2/internal/integration/matrixbot"
import ( import (
"fmt" "fmt"
"miniflux.app/v2/logger" "miniflux.app/v2/internal/logger"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
"github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrix"
) )

2
integration/notion/notion.go → internal/integration/notion/notion.go
View file

@ -6,7 +6,7 @@ package notion
import ( import (
"fmt" "fmt"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Client represents a Notion client. // Client represents a Notion client.

0
integration/notion/wrapper.go → internal/integration/notion/wrapper.go
View file

4
integration/nunuxkeeper/nunuxkeeper.go → internal/integration/nunuxkeeper/nunuxkeeper.go
View file

@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package nunuxkeeper // import "miniflux.app/v2/integration/nunuxkeeper" package nunuxkeeper // import "miniflux.app/v2/internal/integration/nunuxkeeper"
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"path" "path"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Document structure of a Nununx Keeper document // Document structure of a Nununx Keeper document

4
integration/pinboard/pinboard.go → internal/integration/pinboard/pinboard.go
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package pinboard // import "miniflux.app/v2/integration/pinboard" package pinboard // import "miniflux.app/v2/internal/integration/pinboard"
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Client represents a Pinboard client. // Client represents a Pinboard client.

4
integration/pocket/connector.go → internal/integration/pocket/connector.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package pocket // import "miniflux.app/v2/integration/pocket" package pocket // import "miniflux.app/v2/internal/integration/pocket"
import ( import (
"errors" "errors"
@ -9,7 +9,7 @@ import (
"io" "io"
"net/url" "net/url"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Connector manages the authorization flow with Pocket to get a personal access token. // Connector manages the authorization flow with Pocket to get a personal access token.

4
integration/pocket/pocket.go → internal/integration/pocket/pocket.go
View file

@ -1,12 +1,12 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package pocket // import "miniflux.app/v2/integration/pocket" package pocket // import "miniflux.app/v2/internal/integration/pocket"
import ( import (
"fmt" "fmt"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Client represents a Pocket client. // Client represents a Pocket client.

4
integration/readwise/readwise.go → internal/integration/readwise/readwise.go
View file

@ -3,13 +3,13 @@
// Readwise Reader API documentation: https://readwise.io/reader_api // Readwise Reader API documentation: https://readwise.io/reader_api
package readwise // import "miniflux.app/v2/integration/readwise" package readwise // import "miniflux.app/v2/internal/integration/readwise"
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Document structure of a Readwise Reader document // Document structure of a Readwise Reader document

4
integration/telegrambot/telegrambot.go → internal/integration/telegrambot/telegrambot.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package telegrambot // import "miniflux.app/v2/integration/telegrambot" package telegrambot // import "miniflux.app/v2/internal/integration/telegrambot"
import ( import (
"bytes" "bytes"
@ -10,7 +10,7 @@ import (
"strconv" "strconv"
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
"miniflux.app/v2/model" "miniflux.app/v2/internal/model"
) )
// PushEntry pushes entry to telegram chat using integration settings provided // PushEntry pushes entry to telegram chat using integration settings provided

4
integration/wallabag/wallabag.go → internal/integration/wallabag/wallabag.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package wallabag // import "miniflux.app/v2/integration/wallabag" package wallabag // import "miniflux.app/v2/internal/integration/wallabag"
import ( import (
"encoding/json" "encoding/json"
@ -9,7 +9,7 @@ import (
"io" "io"
"net/url" "net/url"
"miniflux.app/v2/http/client" "miniflux.app/v2/internal/http/client"
) )
// Client represents a Wallabag client. // Client represents a Wallabag client.

2
locale/catalog.go → internal/locale/catalog.go
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package locale // import "miniflux.app/v2/locale" package locale // import "miniflux.app/v2/internal/locale"
import ( import (
"embed" "embed"

Some files were not shown because too many files have changed in this diff Show more