diff --git a/.travis.yml b/.travis.yml index c29034d25e13295508f6594f260c3fb47d49378a..6d8bb05a33e4f861d10aab6edcbf1cad3e14cac9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ services: addons: postgresql: "9.4" language: go +go_import_path: "miniflux.app" go: - "1.10" before_install: diff --git a/Makefile b/Makefile index ea60bd3f1de033fc7e3be559982e48b69147919e..1063ed3ae063d94715e53972bdc289184859310f 100644 --- a/Makefile +++ b/Makefile @@ -8,22 +8,22 @@ DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable linux: @ go generate - @ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-amd64 main.go + @ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-amd64 main.go linux-arm: @ go generate - @ GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv8 main.go - @ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv7 main.go - @ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv6 main.go - @ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv5 main.go + @ GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv8 main.go + @ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv7 main.go + @ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv6 main.go + @ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv5 main.go darwin: @ go generate - @ GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-darwin-amd64 main.go + @ GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-darwin-amd64 main.go freebsd: @ go generate - @ GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w -X 'githug.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-freebsd-amd64 main.go + @ GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-freebsd-amd64 main.go build: linux linux-arm darwin freebsd diff --git a/README.md b/README.md index 4289b79522f2823d8fc1f9ec9fa5f36160dc0d3e..02eceb13f5b6ec0d75c7bd6568c8e842c7929f1a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Miniflux 2 ========== [](https://travis-ci.org/miniflux/miniflux) -[](https://godoc.org/github.com/miniflux/miniflux) +[](https://godoc.org/miniflux.app) [](https://docs.miniflux.app/) Miniflux is a minimalist and opinionated feed reader: diff --git a/api/category.go b/api/category.go index b7b5c028215395ca604a9931e5aafc079a85e488..86766c91d411b7b5c6689b3248d757b7c4567e42 100644 --- a/api/category.go +++ b/api/category.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" ) // CreateCategory is the API handler to create a new category. diff --git a/api/controller.go b/api/controller.go index c9798e3c1b0c041fa41addff8b4c33100f01ad35..5cdc056b77691e5ddfedffffa9276c750b495cdb 100644 --- a/api/controller.go +++ b/api/controller.go @@ -2,11 +2,11 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( - "github.com/miniflux/miniflux/reader/feed" - "github.com/miniflux/miniflux/storage" + "miniflux.app/reader/feed" + "miniflux.app/storage" ) // Controller holds all handlers for the API. diff --git a/api/doc.go b/api/doc.go index a43e463059c6e879109695af5acb70beb539e72f..68ddc3248156835547a9834e5774c76dc8109ddb 100644 --- a/api/doc.go +++ b/api/doc.go @@ -7,4 +7,4 @@ Package api implements API endpoints for Miniflux application. */ -package api +package api // import "miniflux.app/api" diff --git a/api/entry.go b/api/entry.go index b2a4d9dc5a441a480d5a02a620aa995f092d365f..cb9c0435381cca6ac34aa943dedd3a100f5338f0 100644 --- a/api/entry.go +++ b/api/entry.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "errors" "net/http" "time" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" + "miniflux.app/model" + "miniflux.app/storage" ) // GetFeedEntry is the API handler to get a single feed entry. diff --git a/api/feed.go b/api/feed.go index b6b635780df86340bac2929d44fbe3a182265d1c..047400521fdd8b5b998763b0a2cdf5aa8c68c4d1 100644 --- a/api/feed.go +++ b/api/feed.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" ) // CreateFeed is the API handler to create a new feed. diff --git a/api/icon.go b/api/icon.go index 052cdbc335effc4142def5f812daf37c31cba4bb..2d2171a86ba0aa75a72834984eace1e2c7e45107 100644 --- a/api/icon.go +++ b/api/icon.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" ) // FeedIcon returns a feed icon. diff --git a/api/opml.go b/api/opml.go index 8613ded726a95c597d7a3cab62e87da89db74426..8554dc1d380a7186cfa269ec05f7f6d141e57ad0 100644 --- a/api/opml.go +++ b/api/opml.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/http/response/xml" - "github.com/miniflux/miniflux/reader/opml" + "miniflux.app/http/context" + "miniflux.app/http/response/json" + "miniflux.app/http/response/xml" + "miniflux.app/reader/opml" ) // Export is the API handler that export feeds to OPML. diff --git a/api/payload.go b/api/payload.go index ed5255a0b3e70ff377c7e26e85ee8660d3753c6b..ee1e41b01cc9ad70991e56bae8fbd4ee32b3a634 100644 --- a/api/payload.go +++ b/api/payload.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "encoding/json" "fmt" "io" - "github.com/miniflux/miniflux/model" + "miniflux.app/model" ) type feedIcon struct { diff --git a/api/payload_test.go b/api/payload_test.go index debf897e59d4a225638513eb002cfdddbc6c8f6e..f890fe6f08088e12a11b11b8a33e5d89211e1340 100644 --- a/api/payload_test.go +++ b/api/payload_test.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "testing" - "github.com/miniflux/miniflux/model" + "miniflux.app/model" ) func TestUpdateFeedURL(t *testing.T) { diff --git a/api/subscription.go b/api/subscription.go index a28c3b25f48fefb3acea7324f557fe0c6c3ad2d7..ee471c6bf936f5e17f18a1b8269de94301c8b49d 100644 --- a/api/subscription.go +++ b/api/subscription.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "errors" "fmt" "net/http" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/reader/subscription" + "miniflux.app/http/response/json" + "miniflux.app/reader/subscription" ) // GetSubscriptions is the API handler to find subscriptions. diff --git a/api/user.go b/api/user.go index b880ba303486cda14aac57f322fc3ac66209debb..1222ccdf323d8645856da43da63dd7f733a0e40c 100644 --- a/api/user.go +++ b/api/user.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package api +package api // import "miniflux.app/api" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" ) // CurrentUser is the API handler to retrieve the authenticated user. diff --git a/cli/ask_credentials.go b/cli/ask_credentials.go index 3755f43675f97295af8bee052ac57469eb2da668..bd4bf5f9c798bcc6a1f3d2f4eb590b24de2f23f4 100644 --- a/cli/ask_credentials.go +++ b/cli/ask_credentials.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cli +package cli // import "miniflux.app/cli" import ( "bufio" diff --git a/cli/cli.go b/cli/cli.go index f4014db36b5002ff9510991797bcc42a839bc205..aae547591f9bfb17a9102e6ea09dc2b233b0d4de 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cli +package cli // import "miniflux.app/cli" import ( "flag" "fmt" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/daemon" - "github.com/miniflux/miniflux/database" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/version" + "miniflux.app/config" + "miniflux.app/daemon" + "miniflux.app/database" + "miniflux.app/logger" + "miniflux.app/storage" + "miniflux.app/version" ) // Parse parses command line arguments. diff --git a/cli/create_admin.go b/cli/create_admin.go index fc6eb6ebb44dd89ca032eee3390ae93adf299742..372b712f0fdab439c375f6984e37db79707e75d8 100644 --- a/cli/create_admin.go +++ b/cli/create_admin.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cli +package cli // import "miniflux.app/cli" import ( "fmt" "os" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" + "miniflux.app/model" + "miniflux.app/storage" ) func createAdmin(store *storage.Storage) { diff --git a/cli/doc.go b/cli/doc.go index 9d4954f108c179492f8d408d9af3a625c380bd7b..d46072630b63fd772b6de0c0a7dd6394988a08fd 100644 --- a/cli/doc.go +++ b/cli/doc.go @@ -7,4 +7,4 @@ Package cli implements command line arguments for Miniflux application. */ -package cli +package cli // import "miniflux.app/cli" diff --git a/cli/flush_sessions.go b/cli/flush_sessions.go index 06a56d0b2fb455bf5fd3e14b8e0b2fb0080172fd..5e16d3ca1fd82bdff9ef22efa7c0028086b9c712 100644 --- a/cli/flush_sessions.go +++ b/cli/flush_sessions.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cli +package cli // import "miniflux.app/cli" import ( "fmt" "os" - "github.com/miniflux/miniflux/storage" + "miniflux.app/storage" ) func flushSessions(store *storage.Storage) { diff --git a/cli/info.go b/cli/info.go index 2ae1cefea002008139bf822e2fce58918eed1e51..40db0d944037ee75a4d9cb66679ffdbd1a538c3c 100644 --- a/cli/info.go +++ b/cli/info.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cli +package cli // import "miniflux.app/cli" import ( "fmt" "runtime" - "github.com/miniflux/miniflux/version" + "miniflux.app/version" ) func info() { diff --git a/cli/reset_password.go b/cli/reset_password.go index 05a9b51f4974c9f08c1d83ba5fed47e57640bbbe..b9e5150d94f09da3374fb6b3901ebcec5937513e 100644 --- a/cli/reset_password.go +++ b/cli/reset_password.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cli +package cli // import "miniflux.app/cli" import ( "fmt" "os" - "github.com/miniflux/miniflux/storage" + "miniflux.app/storage" ) func resetPassword(store *storage.Storage) { diff --git a/config/config.go b/config/config.go index 580f01d6284eaed40d9b9c6eb66355168f4827da..c13a7f9bddeaf304f68e866735b29da7aef1dec2 100644 --- a/config/config.go +++ b/config/config.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package config +package config // import "miniflux.app/config" import ( "net/url" @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/miniflux/miniflux/logger" + "miniflux.app/logger" ) const ( diff --git a/config/config_test.go b/config/config_test.go index 1f91add5fc1ce76be73de1e034b1432076a2dce6..a32edfcd591bfbbfbf2dff96c0c47162dcb976a5 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package config +package config // import "miniflux.app/config" import ( "os" diff --git a/config/doc.go b/config/doc.go index f2e9211ef39613e45b2042a8ba4ae9c28eba7074..a5c6547b5e188c7476683490721a94d79c552e7c 100644 --- a/config/doc.go +++ b/config/doc.go @@ -7,4 +7,4 @@ Package config handles configuration values for Miniflux application. */ -package config +package config // import "miniflux.app/config" diff --git a/crypto/crypto.go b/crypto/crypto.go index ea8ea2b7f0ed997134a90a96bb2bf565f59d0ec0..fa236ab45bec0dd25885ab9bdec2dafd7d1c481b 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package crypto +package crypto // import "miniflux.app/crypto" import ( "crypto/rand" diff --git a/crypto/doc.go b/crypto/doc.go index 2bca85afd736f1d5ef15bd4343519138de07fa2c..4213e3ff8e0a36c5847645baae3aa808500cd88f 100644 --- a/crypto/doc.go +++ b/crypto/doc.go @@ -7,4 +7,4 @@ Package crypto implements helpers related to cryptography. */ -package crypto +package crypto // import "miniflux.app/crypto" diff --git a/daemon/daemon.go b/daemon/daemon.go index de91d71ae9b4f8f314825ae13e757495487f0639..b33d882799aeeb71a6dc21473800330c8db03bf8 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package daemon +package daemon // import "miniflux.app/daemon" import ( "context" @@ -12,12 +12,12 @@ import ( "syscall" "time" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/reader/feed" - "github.com/miniflux/miniflux/scheduler" - "github.com/miniflux/miniflux/storage" + "miniflux.app/config" + "miniflux.app/locale" + "miniflux.app/logger" + "miniflux.app/reader/feed" + "miniflux.app/scheduler" + "miniflux.app/storage" ) // Run starts the daemon. diff --git a/daemon/doc.go b/daemon/doc.go index e246949669eb435441832edb9f0b153df130fa22..448c6c738c8a2126fed524eacd336acbbfa22a95 100644 --- a/daemon/doc.go +++ b/daemon/doc.go @@ -7,4 +7,4 @@ Package daemon handles the main application process. */ -package daemon +package daemon // import "miniflux.app/daemon" diff --git a/daemon/routes.go b/daemon/routes.go index d720b5bb0ea3efabec048fe48db3d36aa3dd17f9..b0a6464d9eae178f15e7db62593babc372a55cec 100644 --- a/daemon/routes.go +++ b/daemon/routes.go @@ -2,21 +2,21 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package daemon +package daemon // import "miniflux.app/daemon" import ( "net/http" - "github.com/miniflux/miniflux/api" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/fever" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/middleware" - "github.com/miniflux/miniflux/reader/feed" - "github.com/miniflux/miniflux/scheduler" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/template" - "github.com/miniflux/miniflux/ui" + "miniflux.app/api" + "miniflux.app/config" + "miniflux.app/fever" + "miniflux.app/locale" + "miniflux.app/middleware" + "miniflux.app/reader/feed" + "miniflux.app/scheduler" + "miniflux.app/storage" + "miniflux.app/template" + "miniflux.app/ui" "github.com/gorilla/mux" ) diff --git a/daemon/server.go b/daemon/server.go index d32cd6873824625162c3427a54ea96a6790cdad9..c00027fa7e1f1c194e4bfa84ac9a7f468165ef24 100644 --- a/daemon/server.go +++ b/daemon/server.go @@ -2,19 +2,19 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package daemon +package daemon // import "miniflux.app/daemon" import ( "crypto/tls" "net/http" "time" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/reader/feed" - "github.com/miniflux/miniflux/scheduler" - "github.com/miniflux/miniflux/storage" + "miniflux.app/config" + "miniflux.app/locale" + "miniflux.app/logger" + "miniflux.app/reader/feed" + "miniflux.app/scheduler" + "miniflux.app/storage" "golang.org/x/crypto/acme/autocert" ) diff --git a/database/database.go b/database/database.go index 42f2292559bf7763e992c683f27974fa4dd8328e..f5d8a3cd6c9e379c2ae272e4f9453e52db1e7629 100644 --- a/database/database.go +++ b/database/database.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package database +package database // import "miniflux.app/database" import ( "database/sql" diff --git a/database/migration.go b/database/migration.go index e348e40cf428c15a3db54b972f62ef66224a2e98..31797059d1180fffcad99f03bf22472933eb43b6 100644 --- a/database/migration.go +++ b/database/migration.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package database +package database // import "miniflux.app/database" import ( "database/sql" "fmt" "strconv" - "github.com/miniflux/miniflux/logger" + "miniflux.app/logger" ) const schemaVersion = 20 diff --git a/database/sql.go b/database/sql.go index a9468ecbfe988b21edf6aec1b9bf92f4ef22e75b..34fecd878ef8bb521242b9127f87b2807e896016 100644 --- a/database/sql.go +++ b/database/sql.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package database +package database // import "miniflux.app/database" var SqlMap = map[string]string{ "schema_version_1": `create table schema_version ( diff --git a/doc.go b/doc.go index 0d021914fcf4af4d5f42f615590fdc7ea2c0a4db..3f8e1e5987017a15a17352beeaf8a9a1b2cafa83 100644 --- a/doc.go +++ b/doc.go @@ -4,7 +4,7 @@ /* -Package main implements a feed reader application. +Miniflux is a feed reader application. */ -package main +package main // import "miniflux.app" diff --git a/errors/doc.go b/errors/doc.go index 4c3114d95e69bb94ec08f78c1fc12f0b7eae8fca..234ee5c9b8034295a4bba6cc5c6d15859a63e4af 100644 --- a/errors/doc.go +++ b/errors/doc.go @@ -7,4 +7,4 @@ Package errors handles localized errors. */ -package errors +package errors // import "miniflux.app/errors" diff --git a/errors/errors.go b/errors/errors.go index e7af7b10bed4352621771b4fb0bde2542b5c02f7..b3c55301bd5558bf7ac7407b3e1b6a5bab388116 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package errors +package errors // import "miniflux.app/errors" import ( "fmt" - "github.com/miniflux/miniflux/locale" + "miniflux.app/locale" ) // LocalizedError represents an error than could be translated to another language. diff --git a/fever/doc.go b/fever/doc.go index f01f098d0383b7afd263c3d7e37a6e03a4620b66..ea18da8bad64156a6f9d7900918204a36f542216 100644 --- a/fever/doc.go +++ b/fever/doc.go @@ -7,4 +7,4 @@ Package fever implements Fever API endpoints. */ -package fever +package fever // import "miniflux.app/fever" diff --git a/fever/fever.go b/fever/fever.go index 44e155a94ca3aac1ec35f040db3ba56bf9492aca..2f17fd2e50fc06a33de76deb6b2a9c38b5f34bef 100644 --- a/fever/fever.go +++ b/fever/fever.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package fever +package fever // import "miniflux.app/fever" import ( "net/http" @@ -10,14 +10,14 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/integration" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" + "miniflux.app/config" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" + "miniflux.app/integration" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" ) type baseResponse struct { diff --git a/filter/doc.go b/filter/doc.go index 5fd9fef1112fcdd9666f8d83e9f217e31d0fe1e3..db4d610299036e604a9b23c85c2bf671bdb00bed 100644 --- a/filter/doc.go +++ b/filter/doc.go @@ -7,4 +7,4 @@ Package filter implements a content filter to rewrite image links. */ -package filter +package filter // import "miniflux.app/filter" diff --git a/filter/image_proxy_filter.go b/filter/image_proxy_filter.go index 99884e375528894245fe4fb70f4a861c785f2bfc..01ae59173ec362bd573aa70710fa782393a6a906 100644 --- a/filter/image_proxy_filter.go +++ b/filter/image_proxy_filter.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package filter +package filter // import "miniflux.app/filter" import ( "encoding/base64" "strings" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/url" + "miniflux.app/config" + "miniflux.app/http/route" + "miniflux.app/url" "github.com/PuerkitoBio/goquery" "github.com/gorilla/mux" diff --git a/filter/image_proxy_filter_test.go b/filter/image_proxy_filter_test.go index 7c1376ed348e23769722de6cfeb59d226019e808..8e97cd009695d9aa0dced0e2f05e0f832cfdfa6f 100644 --- a/filter/image_proxy_filter_test.go +++ b/filter/image_proxy_filter_test.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package filter +package filter // import "miniflux.app/filter" import ( "net/http" "os" "testing" - "github.com/miniflux/miniflux/config" + "miniflux.app/config" "github.com/gorilla/mux" ) diff --git a/generate.go b/generate.go index cba64e313c148857a600d91b989eab44e73f5c51..7136cc3b54148f064a7481955218972f27ddf3f0 100644 --- a/generate.go +++ b/generate.go @@ -24,7 +24,7 @@ import ( const tpl = `// Code generated by go generate; DO NOT EDIT. -package {{ .Package }} +package {{ .Package }} // import "miniflux.app/{{ .ImportPath }}" var {{ .Map }} = map[string]string{ {{ range $constant, $content := .Files }}` + "\t" + `"{{ $constant }}": ` + "`{{ $content }}`" + `, @@ -38,9 +38,11 @@ var {{ .Map }}Checksums = map[string]string{ var bundleTpl = template.Must(template.New("").Parse(tpl)) type Bundle struct { - Package, Map string - Files map[string]string - Checksums map[string]string + Package string + Map string + ImportPath string + Files map[string]string + Checksums map[string]string } func (b *Bundle) Write(filename string) { @@ -53,12 +55,13 @@ func (b *Bundle) Write(filename string) { bundleTpl.Execute(f, b) } -func NewBundle(pkg, mapName string) *Bundle { +func NewBundle(pkg, mapName, importPath string) *Bundle { return &Bundle{ - Package: pkg, - Map: mapName, - Files: make(map[string]string), - Checksums: make(map[string]string), + Package: pkg, + Map: mapName, + ImportPath: importPath, + Files: make(map[string]string), + Checksums: make(map[string]string), } } @@ -97,7 +100,7 @@ func concat(files []string) string { } func generateJSBundle(bundleFile string, bundleFiles map[string][]string, prefixes, suffixes map[string]string) { - bundle := NewBundle("static", "Javascripts") + bundle := NewBundle("static", "Javascripts", "ui/static") m := minify.New() m.AddFunc("text/javascript", js.Minify) @@ -127,7 +130,7 @@ func generateJSBundle(bundleFile string, bundleFiles map[string][]string, prefix } func generateCSSBundle(bundleFile string, themes map[string][]string) { - bundle := NewBundle("static", "Stylesheets") + bundle := NewBundle("static", "Stylesheets", "ui/static") m := minify.New() m.AddFunc("text/css", css.Minify) @@ -146,7 +149,7 @@ func generateCSSBundle(bundleFile string, themes map[string][]string) { } func generateBinaryBundle(bundleFile string, srcFiles []string) { - bundle := NewBundle("static", "Binaries") + bundle := NewBundle("static", "Binaries", "ui/static") for _, srcFile := range srcFiles { data := readFile(srcFile) @@ -161,7 +164,7 @@ func generateBinaryBundle(bundleFile string, srcFiles []string) { } func generateBundle(bundleFile, pkg, mapName string, srcFiles []string) { - bundle := NewBundle(pkg, mapName) + bundle := NewBundle(pkg, mapName, pkg) for _, srcFile := range srcFiles { data := readFile(srcFile) diff --git a/http/client/client.go b/http/client/client.go index d9f3524adfffba46b45a785b9f67b7b3a1ab9cad..201b136c9406e44882e576dfe685ad0d50559868 100644 --- a/http/client/client.go +++ b/http/client/client.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package client +package client // import "miniflux.app/http/client" import ( "bytes" @@ -18,10 +18,10 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/timer" - "github.com/miniflux/miniflux/version" + "miniflux.app/errors" + "miniflux.app/logger" + "miniflux.app/timer" + "miniflux.app/version" ) const ( diff --git a/http/client/response.go b/http/client/response.go index d4e3cdca82283603c70b740de44631bcc147b76b..0efd8e2456722fe888b519ef2095945417d7cb9b 100644 --- a/http/client/response.go +++ b/http/client/response.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package client +package client // import "miniflux.app/http/client" import ( "io" "mime" "strings" - "github.com/miniflux/miniflux/logger" "golang.org/x/net/html/charset" + "miniflux.app/logger" ) // Response wraps a server response. diff --git a/http/client/response_test.go b/http/client/response_test.go index f3402a8096ec2b9a390dae8c16fc3f7d2c82f4e2..cd0f73dd0f0420393c558aa6e2b8edabdaa7e7f6 100644 --- a/http/client/response_test.go +++ b/http/client/response_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package client +package client // import "miniflux.app/http/client" import "testing" diff --git a/http/context/context.go b/http/context/context.go index 4ca95c5c4d3f9284b7d4715d72ded91a74e4d5bd..1c65e64c241a3aaf2241a33e7447453edf925dbd 100644 --- a/http/context/context.go +++ b/http/context/context.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package context +package context // import "miniflux.app/http/context" import ( "net/http" - "github.com/miniflux/miniflux/middleware" + "miniflux.app/middleware" ) // Context contains helper functions related to the current request. diff --git a/http/cookie/cookie.go b/http/cookie/cookie.go index 4407daabcdff3381ebddabc11a11040ddbe4d071..d0e55eb1178da4da2a015c9e314d56e3ed34b24a 100644 --- a/http/cookie/cookie.go +++ b/http/cookie/cookie.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package cookie +package cookie // import "miniflux.app/http/cookie" import ( "net/http" diff --git a/http/request/request.go b/http/request/request.go index cc5a4dd7448a8687368253a0d8491108317eb833..802b1d016d1781ae3e89b0a8a05c1d2ee7c39ee9 100644 --- a/http/request/request.go +++ b/http/request/request.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package request +package request // import "miniflux.app/http/request" import ( "fmt" diff --git a/http/request/request_test.go b/http/request/request_test.go index a4aaabf6e340902fdae98f482a9141f2a1f22f2c..fa2c4b1485bf7489bec88e359cd093f46617bd78 100644 --- a/http/request/request_test.go +++ b/http/request/request_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package request +package request // import "miniflux.app/http/request" import ( "net/http" diff --git a/http/response/html/html.go b/http/response/html/html.go index a17ce04be0c9d021c2330f10091e7ccfc8141661..65a46490ddc2a308696a1caf09effdf55cad6855 100644 --- a/http/response/html/html.go +++ b/http/response/html/html.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package html +package html // import "miniflux.app/http/response/html" import ( "net/http" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/response" + "miniflux.app/logger" ) // OK writes a standard HTML response. diff --git a/http/response/json/json.go b/http/response/json/json.go index 6f3eb15cc00c1a23a81e2d62ddef22e0e3baa9eb..f19efb0bc3fa6975a32b76adb2b95e911b0b4d99 100644 --- a/http/response/json/json.go +++ b/http/response/json/json.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package json +package json // import "miniflux.app/http/response/json" import ( "encoding/json" "errors" "net/http" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/response" + "miniflux.app/logger" ) // OK sends a JSON response with the status code 200. diff --git a/http/response/response.go b/http/response/response.go index f79262542637b818333e3114157817b25f018f04..4d731719dc70a11fbdc109e65d9d9cd39eca8eb7 100644 --- a/http/response/response.go +++ b/http/response/response.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package response +package response // import "miniflux.app/http/response" import ( "compress/flate" diff --git a/http/response/xml/xml.go b/http/response/xml/xml.go index 9e37e8756cb4fa586a0a3040f313b49cf19658e8..bceb5f16656212ae9c75e592c9b669fe7ac9567a 100644 --- a/http/response/xml/xml.go +++ b/http/response/xml/xml.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package xml +package xml // import "miniflux.app/http/response/xml" import ( "fmt" diff --git a/http/route/route.go b/http/route/route.go index ee574a58637ac09a1ada08da3fe88c16da495045..e7b1dc28a8ed50580a3e911e9c7c0d63a0b54c39 100644 --- a/http/route/route.go +++ b/http/route/route.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package route +package route // import "miniflux.app/http/route" import ( "strconv" "github.com/gorilla/mux" - "github.com/miniflux/miniflux/logger" + "miniflux.app/logger" ) // Path returns the defined route based on given arguments. diff --git a/integration/doc.go b/integration/doc.go index fb1fc08636669fc170d6f5563f66dfc41d9bc9c9..abbf5527dabd6918dc09bd35f0525c981d9e7723 100644 --- a/integration/doc.go +++ b/integration/doc.go @@ -7,4 +7,4 @@ Package integration implements API clients for third-party services. */ -package integration +package integration // import "miniflux.app/integration" diff --git a/integration/instapaper/instapaper.go b/integration/instapaper/instapaper.go index 3b9e91c1ce552eb2af612024801f9b2ce4b597ba..a3973ff4d1b331457c8fb7032cff894380ca6421 100644 --- a/integration/instapaper/instapaper.go +++ b/integration/instapaper/instapaper.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package instapaper +package instapaper // import "miniflux.app/integration/instapaper" import ( "fmt" "net/url" - "github.com/miniflux/miniflux/http/client" + "miniflux.app/http/client" ) // Client represents an Instapaper client. diff --git a/integration/integration.go b/integration/integration.go index af19939bd3fd489769259c81984f45745dd7274a..38a215f9e4ac96cf285966a0e08366fa33fcac5a 100644 --- a/integration/integration.go +++ b/integration/integration.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package integration +package integration // import "miniflux.app/integration" import ( - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/integration/instapaper" - "github.com/miniflux/miniflux/integration/nunuxkeeper" - "github.com/miniflux/miniflux/integration/pinboard" - "github.com/miniflux/miniflux/integration/pocket" - "github.com/miniflux/miniflux/integration/wallabag" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" + "miniflux.app/config" + "miniflux.app/integration/instapaper" + "miniflux.app/integration/nunuxkeeper" + "miniflux.app/integration/pinboard" + "miniflux.app/integration/pocket" + "miniflux.app/integration/wallabag" + "miniflux.app/logger" + "miniflux.app/model" ) // SendEntry send the entry to the activated providers. diff --git a/integration/nunuxkeeper/nunuxkeeper.go b/integration/nunuxkeeper/nunuxkeeper.go index 76367e1715947ee058e7d9c5d8ceed615f18af3d..87192d329176e107d3e30dcb17789eecbc213ce4 100644 --- a/integration/nunuxkeeper/nunuxkeeper.go +++ b/integration/nunuxkeeper/nunuxkeeper.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package nunuxkeeper +package nunuxkeeper // import "miniflux.app/integration/nunuxkeeper" import ( "fmt" "net/url" "path" - "github.com/miniflux/miniflux/http/client" + "miniflux.app/http/client" ) // Document structure of a Nununx Keeper document diff --git a/integration/pinboard/pinboard.go b/integration/pinboard/pinboard.go index 0de1dd26e4b53f794cac6f2cdf06bac85218a89b..4bef3cac217e79392c874598360b8dcd80259518 100644 --- a/integration/pinboard/pinboard.go +++ b/integration/pinboard/pinboard.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package pinboard +package pinboard // import "miniflux.app/integration/pinboard" import ( "fmt" "net/url" - "github.com/miniflux/miniflux/http/client" + "miniflux.app/http/client" ) // Client represents a Pinboard client. diff --git a/integration/pocket/connector.go b/integration/pocket/connector.go index b3ed79df1a893c1ef39fdfc22c40400c1fadf4e4..4cb0931f816b75d69e15bee5f3c41e364b6ab36f 100644 --- a/integration/pocket/connector.go +++ b/integration/pocket/connector.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package pocket +package pocket // import "miniflux.app/integration/pocket" import ( "errors" @@ -10,7 +10,7 @@ import ( "io/ioutil" "net/url" - "github.com/miniflux/miniflux/http/client" + "miniflux.app/http/client" ) // Connector manages the authorization flow with Pocket to get a personal access token. diff --git a/integration/pocket/pocket.go b/integration/pocket/pocket.go index 77f77d4bc2819f66e271e593ea447fcd93fe4d15..6f1b197c376ec4abcdba8f1fb04931e6f5c62f16 100644 --- a/integration/pocket/pocket.go +++ b/integration/pocket/pocket.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package pocket +package pocket // import "miniflux.app/integration/pocket" import ( "fmt" - "github.com/miniflux/miniflux/http/client" + "miniflux.app/http/client" ) // Client represents a Pocket client. diff --git a/integration/wallabag/wallabag.go b/integration/wallabag/wallabag.go index 02a36b507d81ed57c1019d216650973f13f47884..786470f7a0798af3c2da7523765adb2654632e17 100644 --- a/integration/wallabag/wallabag.go +++ b/integration/wallabag/wallabag.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package wallabag +package wallabag // import "miniflux.app/integration/wallabag" import ( "encoding/json" @@ -10,7 +10,7 @@ import ( "io" "net/url" - "github.com/miniflux/miniflux/http/client" + "miniflux.app/http/client" ) // Client represents a Wallabag client. diff --git a/locale/doc.go b/locale/doc.go index 5e92c6fc2dc427b54480852bf8e45c0d64397b29..2602cc7b4850da7cd45f7d1cb9b4def55334df0e 100644 --- a/locale/doc.go +++ b/locale/doc.go @@ -7,4 +7,4 @@ Package locale handles the internationalization of the application. */ -package locale +package locale // import "miniflux.app/locale" diff --git a/locale/language.go b/locale/language.go index b63976ca0b49021d647ac50e016e5aaee7e87992..2146960f3335c013770939bac9574dcccc5e34cc 100644 --- a/locale/language.go +++ b/locale/language.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package locale +package locale // import "miniflux.app/locale" import "fmt" diff --git a/locale/locale.go b/locale/locale.go index c76ad8ab1d319d21e88d7e6fbcd540563c406402..64d3b8652564eb8486522e49e2fa45e12dc3012c 100755 --- a/locale/locale.go +++ b/locale/locale.go @@ -2,9 +2,9 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package locale +package locale // import "miniflux.app/locale" -import "github.com/miniflux/miniflux/logger" +import "miniflux.app/logger" // Translation is the translation mapping table. type Translation map[string]interface{} diff --git a/locale/locale_test.go b/locale/locale_test.go index baddd1e17787727f59a27df03ba9e73ef5c75c6f..28e2a80064995a376ffc14fc0d255569d6ccb868 100644 --- a/locale/locale_test.go +++ b/locale/locale_test.go @@ -1,7 +1,7 @@ // Copyright 2017 Frédéric Guillot. All rights reserved. // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package locale +package locale // import "miniflux.app/locale" import "testing" diff --git a/locale/plurals.go b/locale/plurals.go index d94f238afb687f772ab04dc3273d10eb0f884756..c4e47cf453c5a11b4412cab364a46bc9970265a2 100644 --- a/locale/plurals.go +++ b/locale/plurals.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package locale +package locale // import "miniflux.app/locale" // See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html // And http://www.unicode.org/cldr/charts/29/supplemental/language_plural_rules.html diff --git a/locale/translations.go b/locale/translations.go index 962e091c068048301979b5ae7533ae14fb49c41a..c1174e428824ce250a9a0adf127b430b4fde1e26 100755 --- a/locale/translations.go +++ b/locale/translations.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package locale +package locale // import "miniflux.app/locale" var translations = map[string]string{ "de_DE": `{ diff --git a/locale/translator.go b/locale/translator.go index 18206b075d204f9d6c97834551616e2e0c1cfc78..dff8b2cf943a61b5453bb8b61c6652355a866262 100644 --- a/locale/translator.go +++ b/locale/translator.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package locale +package locale // import "miniflux.app/locale" import ( "encoding/json" diff --git a/logger/doc.go b/logger/doc.go index 4d63bcd69532cee38b06e9de8568677530c3d750..d6b6a35c8956e51dc5e340e2b0fd4513ea227f84 100644 --- a/logger/doc.go +++ b/logger/doc.go @@ -7,4 +7,4 @@ Package logger handles application log messages with different levels. */ -package logger +package logger // import "miniflux.app/logger" diff --git a/logger/logger.go b/logger/logger.go index a7ef3c1a9673759f6dc53ec2069f88ccef196569..33a08e3eb5fe4d50a72e383dbf24cbbc1e24a285 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package logger +package logger // import "miniflux.app/logger" import ( "fmt" diff --git a/main.go b/main.go index 44f38dbb98a2ac458963cb14958e200f60ac35b9..b56e427a304673cdc1e03f0e6cff666dfaa3c219 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package main +package main // import "miniflux.app" //go:generate go run generate.go //go:generate gofmt -s -w database/sql.go @@ -14,7 +14,7 @@ package main //go:generate gofmt -s -w locale/translations.go import ( - "github.com/miniflux/miniflux/cli" + "miniflux.app/cli" ) func main() { diff --git a/middleware/app_session.go b/middleware/app_session.go index ae1d8e926b0c986a0c253430788a3fb15f6dda26..8b3284b51cdf6ab4c55c4fd5d1b9d7573d5911d4 100644 --- a/middleware/app_session.go +++ b/middleware/app_session.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "context" "errors" "net/http" - "github.com/miniflux/miniflux/http/cookie" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" + "miniflux.app/http/cookie" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/logger" + "miniflux.app/model" ) // AppSession handles application session middleware. diff --git a/middleware/basic_auth.go b/middleware/basic_auth.go index edea3338c4d5cec50a7f1ca85668358cd707cc79..c02913fabe5e7bd9894a37636f2a9afd5b32e510 100644 --- a/middleware/basic_auth.go +++ b/middleware/basic_auth.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "context" "net/http" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/response/json" + "miniflux.app/logger" ) // BasicAuth handles HTTP basic authentication. diff --git a/middleware/common_headers.go b/middleware/common_headers.go index bdec580c487df75f2b8fa72dc8dc16fa3214dd29..a60969f7a7c9e48769b7b67cbb03753de9463264 100644 --- a/middleware/common_headers.go +++ b/middleware/common_headers.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "net/http" diff --git a/middleware/context_keys.go b/middleware/context_keys.go index 03a3e2bf73e0a77c97d8b9093d61506635caa91a..80b5e965dcf6dc378c2eec1958885997770dbb16 100644 --- a/middleware/context_keys.go +++ b/middleware/context_keys.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" // ContextKey represents a context key. type ContextKey struct { diff --git a/middleware/fever.go b/middleware/fever.go index 6211fb79c9f52621816cbb7b3875bdb5c47b198c..3fdbcfdd4ec07412d5f1b231478cb144ebb88cce 100644 --- a/middleware/fever.go +++ b/middleware/fever.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "context" "net/http" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/response/json" + "miniflux.app/logger" ) // FeverAuth handles Fever API authentication. diff --git a/middleware/header_config.go b/middleware/header_config.go index 91d182010644ec734f5861083aa05665f3daf83b..4302ac8066ee24f0a6ddef93d42f54b066a852e8 100644 --- a/middleware/header_config.go +++ b/middleware/header_config.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "net/http" diff --git a/middleware/logging.go b/middleware/logging.go index 48158b43c8eff7ea82233af582c461cbc0c52806..2e78ea8e614ae2c4be0f5b09e31c0dacc528bc7a 100644 --- a/middleware/logging.go +++ b/middleware/logging.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "net/http" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/request" + "miniflux.app/logger" ) // Logging logs the HTTP request. diff --git a/middleware/middleware.go b/middleware/middleware.go index 3c1bb0ecab8dbccb1ce3c2a0759150aa1bfb6436..cf393d2342062860e2ecb0bcd37f65e9eb259ae2 100644 --- a/middleware/middleware.go +++ b/middleware/middleware.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "github.com/gorilla/mux" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/storage" + "miniflux.app/config" + "miniflux.app/storage" ) // Middleware handles different middleware handlers. diff --git a/middleware/user_session.go b/middleware/user_session.go index b27858fc7f5b6654f6e73c9f40d4d89e1b8f9260..764cbdbc9e09b6caffcf4bf720c850dee19178ca 100644 --- a/middleware/user_session.go +++ b/middleware/user_session.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package middleware +package middleware // import "miniflux.app/middleware" import ( "context" "net/http" - "github.com/miniflux/miniflux/http/cookie" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" + "miniflux.app/http/cookie" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" "github.com/gorilla/mux" ) diff --git a/model/app_session.go b/model/app_session.go index e9ee06e85ce79237298648a877eecca532eb01e1..4f97c4c1cd3c299ce9e1c08b26e0a55dd10361e6 100644 --- a/model/app_session.go +++ b/model/app_session.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "database/sql/driver" diff --git a/model/category.go b/model/category.go index 1c72851b419fe8e9439a6cdc3fbe7a8b1038b80c..40a132d5610d710bfcaffad3cc93c445fd762b54 100644 --- a/model/category.go +++ b/model/category.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "errors" diff --git a/model/category_test.go b/model/category_test.go index 9f8a054f596c0330bc404d33492f438b031f86f3..47a524dfa1f411b28708273180207ad5ce66d66d 100644 --- a/model/category_test.go +++ b/model/category_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import "testing" diff --git a/model/doc.go b/model/doc.go index 4718d8ae0cb22b81f71bb93517115200df8e7971..bef8495e15e2407a3f4e5fbc45efa7516a069596 100644 --- a/model/doc.go +++ b/model/doc.go @@ -7,4 +7,4 @@ Package model contains all data structures used by the application. */ -package model +package model // import "miniflux.app/model" diff --git a/model/enclosure.go b/model/enclosure.go index 6de1af7385334fa87ee6b7efe9b5eb2952e1da10..5238879468b99e74858b1884b4cd4b740260d97f 100644 --- a/model/enclosure.go +++ b/model/enclosure.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" // Enclosure represents an attachment. type Enclosure struct { diff --git a/model/entry.go b/model/entry.go index 104601e117a5ec8dfe93ca90d1bf97205b1b7a2a..75ffaca90a0a2cbc388fa48a87a021ea6350e885 100644 --- a/model/entry.go +++ b/model/entry.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "fmt" diff --git a/model/entry_test.go b/model/entry_test.go index 8b92d3f0401f82879b12adb5f1ac30275ea97791..d6440df72002923727617209d31badf98590cecc 100644 --- a/model/entry_test.go +++ b/model/entry_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import "testing" diff --git a/model/feed.go b/model/feed.go index d019eeb8065f136786fdff8aae382eaca81182ec..d6ce0d1682679ce019df80be16cad791ccb1ef53 100644 --- a/model/feed.go +++ b/model/feed.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "fmt" diff --git a/model/icon.go b/model/icon.go index 3608a0a08f2b1f027008e3194585f86c250d2c90..5e3bd769b0cae13839d12a9163e1fbb2719e9859 100644 --- a/model/icon.go +++ b/model/icon.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "encoding/base64" diff --git a/model/integration.go b/model/integration.go index e4282a48de1d170243aaf2c77526965b6187cb2f..9fc5696ab707bc3ceeb7334e5ae4269272c8443a 100644 --- a/model/integration.go +++ b/model/integration.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" // Integration represents user integration settings. type Integration struct { diff --git a/model/job.go b/model/job.go index 9f9167bc15fe0ea3176a46ddc5b8a458eb3e20b2..7a42437aa62da809ccd72faa4f28eda5681f07d7 100644 --- a/model/job.go +++ b/model/job.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" // Job represents a payload sent to the processing queue. type Job struct { diff --git a/model/theme.go b/model/theme.go index f58f91c87ff5fa010c87bb02d30ed753870949a4..9d379fd34197ee325ee751c1844f35d17e895152 100644 --- a/model/theme.go +++ b/model/theme.go @@ -2,9 +2,9 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" -import "github.com/miniflux/miniflux/errors" +import "miniflux.app/errors" // Themes returns the list of available themes. func Themes() map[string]string { diff --git a/model/theme_test.go b/model/theme_test.go index ddf58c4339ea5ecdeb21cba35d6c3a1b5f8e066a..0e710db4dc90764f8e80c516ae2b502d9beb9f37 100644 --- a/model/theme_test.go +++ b/model/theme_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import "testing" diff --git a/model/user.go b/model/user.go index 6a985e3aa8292717e53e4393b45b233c57c76395..6c537b2137c45a529f6f6d8b803c2f3cc12485e3 100644 --- a/model/user.go +++ b/model/user.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "errors" "time" - "github.com/miniflux/miniflux/timezone" + "miniflux.app/timezone" ) // User represents a user in the system. diff --git a/model/user_session.go b/model/user_session.go index 51b25438507230f05726514fe3af4b81ade07956..55c2d67cbbb091d120e3f1afcc17f0858197e3ce 100644 --- a/model/user_session.go +++ b/model/user_session.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import ( "fmt" "time" - "github.com/miniflux/miniflux/timezone" + "miniflux.app/timezone" ) // UserSession represents a user session in the system. diff --git a/model/user_test.go b/model/user_test.go index e7bcb1e3e48dec20b5a022460b03f9f66dd812ac..d560e35dc5640252dfa57f44d71aef5ce1df98ae 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package model +package model // import "miniflux.app/model" import "testing" diff --git a/oauth2/doc.go b/oauth2/doc.go index 2254a3fe58f0b53e6b4736d6e2d21c4c4996db44..4fee93198330d3e483ab1c1c7f96ea6ed717b7b7 100644 --- a/oauth2/doc.go +++ b/oauth2/doc.go @@ -7,4 +7,4 @@ Package oauth2 abstracts different OAuth2 providers. */ -package oauth2 +package oauth2 // import "miniflux.app/oauth2" diff --git a/oauth2/google.go b/oauth2/google.go index e57e027fd4f22b704ce623f813f789622e6bde48..5d3ca49c46cb00c5501aa8c4ad1de7b1b5541a5b 100644 --- a/oauth2/google.go +++ b/oauth2/google.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package oauth2 +package oauth2 // import "miniflux.app/oauth2" import ( "context" diff --git a/oauth2/manager.go b/oauth2/manager.go index 08360a9754a4662ca1cf080118500b3e75b08bd8..f1ba7d97eef458cd2d4ddcc971a708fb503c4ad5 100644 --- a/oauth2/manager.go +++ b/oauth2/manager.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package oauth2 +package oauth2 // import "miniflux.app/oauth2" import "errors" diff --git a/oauth2/profile.go b/oauth2/profile.go index 488ffb2923574ba804a0ea733119d97ad741e59e..b43f07c20f1ae78892c0acb1151af104eb7b5ce6 100644 --- a/oauth2/profile.go +++ b/oauth2/profile.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package oauth2 +package oauth2 // import "miniflux.app/oauth2" // Profile is the OAuth2 user profile. type Profile struct { diff --git a/oauth2/provider.go b/oauth2/provider.go index c43931c0bc4856ace84f948cad3a0a0e9c730480..04f92149212eb119bc8c5bc089c1831174771cdc 100644 --- a/oauth2/provider.go +++ b/oauth2/provider.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package oauth2 +package oauth2 // import "miniflux.app/oauth2" // Provider is an interface for OAuth2 providers. type Provider interface { diff --git a/reader/atom/atom.go b/reader/atom/atom.go index 274d67f70b9efdd098fa4e154b72ad521b1087e2..7fbf0407f6827fee6d645db8e8eaf365e343047c 100644 --- a/reader/atom/atom.go +++ b/reader/atom/atom.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package atom +package atom // import "miniflux.app/reader/atom" import ( "encoding/xml" @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/date" - "github.com/miniflux/miniflux/reader/sanitizer" - "github.com/miniflux/miniflux/url" + "miniflux.app/crypto" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/date" + "miniflux.app/reader/sanitizer" + "miniflux.app/url" ) type atomFeed struct { diff --git a/reader/atom/parser.go b/reader/atom/parser.go index d560c273e5f05d403dddafc2993122f078c632c6..152626c0ff986b15496b4b53e179aa458252a02a 100644 --- a/reader/atom/parser.go +++ b/reader/atom/parser.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package atom +package atom // import "miniflux.app/reader/atom" import ( "encoding/xml" "io" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/encoding" + "miniflux.app/errors" + "miniflux.app/model" + "miniflux.app/reader/encoding" ) // Parse returns a normalized feed struct from a Atom feed. diff --git a/reader/atom/parser_test.go b/reader/atom/parser_test.go index e6cfdd78920d0a187f860ef165853de3a0ee78ac..82a569acae786a35ba8394a1d78516e895ed6d55 100644 --- a/reader/atom/parser_test.go +++ b/reader/atom/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package atom +package atom // import "miniflux.app/reader/atom" import ( "bytes" diff --git a/reader/date/parser.go b/reader/date/parser.go index d223ceb90c70cebed584f03affbf83c6b55b36d9..8a22df83395e119039fe3cd5781430e661012741 100644 --- a/reader/date/parser.go +++ b/reader/date/parser.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package date +package date // import "miniflux.app/reader/date" import ( "errors" diff --git a/reader/date/parser_test.go b/reader/date/parser_test.go index f796b535397be491b6c6be33c7d05e2f1829356e..b3306326fbc2eccedfaaa53e801b880b0e10711d 100644 --- a/reader/date/parser_test.go +++ b/reader/date/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package date +package date // import "miniflux.app/reader/date" import "testing" diff --git a/reader/doc.go b/reader/doc.go index 1698644a78094b40f5f306493a667e715c78cb94..2101266994aa5ca15908c7ae46a27494ea650b4d 100644 --- a/reader/doc.go +++ b/reader/doc.go @@ -7,4 +7,4 @@ Package reader implements everything related to feed parsing. */ -package reader +package reader // import "miniflux.app/reader" diff --git a/reader/encoding/doc.go b/reader/encoding/doc.go index bd3a42e1a9916513b411b5c86117d323681f8d82..8498cf3abd4f0d122cd829f43523145faa3811b7 100644 --- a/reader/encoding/doc.go +++ b/reader/encoding/doc.go @@ -7,4 +7,4 @@ Package encoding handles workarounds to deal with encoding edge cases found into the wild. */ -package encoding +package encoding // import "miniflux.app/reader/encoding" diff --git a/reader/encoding/encoding.go b/reader/encoding/encoding.go index 7f726adf7e9910f308a78a59a0da4f685a85c42e..497b2d04a080185b3c00a832cb4f9ab6ad66a240 100644 --- a/reader/encoding/encoding.go +++ b/reader/encoding/encoding.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package encoding +package encoding // import "miniflux.app/reader/encoding" import ( "bytes" diff --git a/reader/feed/handler.go b/reader/feed/handler.go index f01b87723eb95693029cf30b0ab9aafc3be000a3..fa09cb65ce67f64b7e19b3ed7b211d9798e6c1e5 100644 --- a/reader/feed/handler.go +++ b/reader/feed/handler.go @@ -2,21 +2,21 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package feed +package feed // import "miniflux.app/reader/feed" import ( "fmt" "time" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/http/client" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/icon" - "github.com/miniflux/miniflux/reader/processor" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/timer" + "miniflux.app/errors" + "miniflux.app/http/client" + "miniflux.app/locale" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/icon" + "miniflux.app/reader/processor" + "miniflux.app/storage" + "miniflux.app/timer" ) var ( diff --git a/reader/feed/parser.go b/reader/feed/parser.go index f76a071af83c6730d577d82ae25b583f98f3c0f4..70c05244b22f4c1056fc689cb70aecdf332d870e 100644 --- a/reader/feed/parser.go +++ b/reader/feed/parser.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package feed +package feed // import "miniflux.app/reader/feed" import ( "bytes" @@ -11,15 +11,15 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/atom" - "github.com/miniflux/miniflux/reader/encoding" - "github.com/miniflux/miniflux/reader/json" - "github.com/miniflux/miniflux/reader/rdf" - "github.com/miniflux/miniflux/reader/rss" - "github.com/miniflux/miniflux/timer" + "miniflux.app/errors" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/atom" + "miniflux.app/reader/encoding" + "miniflux.app/reader/json" + "miniflux.app/reader/rdf" + "miniflux.app/reader/rss" + "miniflux.app/timer" ) // List of feed formats. diff --git a/reader/feed/parser_test.go b/reader/feed/parser_test.go index 31dbedf2bbdd881be1367ae7b92012c35832e2cd..46dc34eb8570673b837cd672f4795eed05a93429 100644 --- a/reader/feed/parser_test.go +++ b/reader/feed/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package feed +package feed // import "miniflux.app/reader/feed" import ( "bytes" diff --git a/reader/icon/finder.go b/reader/icon/finder.go index 296ddecacbc8e4cd42e83880707457d05e8c62a7..c9da1bc02adf81a09df90c72ea704bd63af30e2d 100644 --- a/reader/icon/finder.go +++ b/reader/icon/finder.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package icon +package icon // import "miniflux.app/reader/icon" import ( "encoding/base64" @@ -11,11 +11,11 @@ import ( "io/ioutil" "strings" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/http/client" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/url" + "miniflux.app/crypto" + "miniflux.app/http/client" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/icon/finder_test.go b/reader/icon/finder_test.go index e76f68c51ad468ea60ec45216743cbdfaa90357e..5fcbaa9a3d14cb4e47e1cc2e2c943e138dd5adef 100644 --- a/reader/icon/finder_test.go +++ b/reader/icon/finder_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package icon +package icon // import "miniflux.app/reader/icon" import "testing" diff --git a/reader/json/json.go b/reader/json/json.go index 2c812abf8cfdf3cda5e515f5ab38737cbf2dbac5..af059f07bddf50872f0120e1d5c44b64ef8171c4 100644 --- a/reader/json/json.go +++ b/reader/json/json.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package json +package json // import "miniflux.app/reader/json" import ( "strings" "time" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/date" - "github.com/miniflux/miniflux/reader/sanitizer" - "github.com/miniflux/miniflux/url" + "miniflux.app/crypto" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/date" + "miniflux.app/reader/sanitizer" + "miniflux.app/url" ) type jsonFeed struct { diff --git a/reader/json/parser.go b/reader/json/parser.go index 55c93726cc8493049f796cb5f75a99dfaa8019c3..babbde156390c597006d9e379faed4ef34792c3b 100644 --- a/reader/json/parser.go +++ b/reader/json/parser.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package json +package json // import "miniflux.app/reader/json" import ( "encoding/json" "io" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" + "miniflux.app/errors" + "miniflux.app/model" ) // Parse returns a normalized feed struct from a JON feed. diff --git a/reader/json/parser_test.go b/reader/json/parser_test.go index 19c12c937e514b7f7c80b8fcdcb1df956a08a766..482212be27af921644d71b33ec17c338dab3ecd6 100644 --- a/reader/json/parser_test.go +++ b/reader/json/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package json +package json // import "miniflux.app/reader/json" import ( "bytes" diff --git a/reader/opml/handler.go b/reader/opml/handler.go index 3bbce6c57e0c207a9195b8973e97aefdd2537a8a..98612439d96144a353cb3c8e1e0da4381b35df7a 100644 --- a/reader/opml/handler.go +++ b/reader/opml/handler.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" import ( "errors" "fmt" "io" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" ) // Handler handles the logic for OPML import/export. diff --git a/reader/opml/opml.go b/reader/opml/opml.go index ab818125fc73b9337712913828e98bc63208e900..27d0167e0668cec44463c06b6afd247372581c8b 100644 --- a/reader/opml/opml.go +++ b/reader/opml/opml.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" import "encoding/xml" diff --git a/reader/opml/parser.go b/reader/opml/parser.go index 93f2f259a552d4cb9498356c697c9c062ded0a75..1c24a70ae42ce654320535981fb56927d9d660ae 100644 --- a/reader/opml/parser.go +++ b/reader/opml/parser.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" import ( "encoding/xml" "io" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/reader/encoding" + "miniflux.app/errors" + "miniflux.app/reader/encoding" ) // Parse reads an OPML file and returns a SubcriptionList. diff --git a/reader/opml/parser_test.go b/reader/opml/parser_test.go index e00d5784af13c8a0ef0ce5faf45c6dda8df7fb95..ef8e9f17db873f45e2823dafb79c61302e23f5b7 100644 --- a/reader/opml/parser_test.go +++ b/reader/opml/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" import ( "bytes" diff --git a/reader/opml/serializer.go b/reader/opml/serializer.go index 68cafa92305c3ed02e6385f11a32c5a799bc0e2b..c094f4c4f167b01225c4992937f6fe6f896012b0 100644 --- a/reader/opml/serializer.go +++ b/reader/opml/serializer.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" import ( "bufio" "bytes" "encoding/xml" - "github.com/miniflux/miniflux/logger" + "miniflux.app/logger" ) // Serialize returns a SubcriptionList in OPML format. diff --git a/reader/opml/serializer_test.go b/reader/opml/serializer_test.go index dd431d9d3e902a480e968adc65ffaab0c5c84307..9c598eef239e0b1cf09cf60fcd2c7e1cc7bac502 100644 --- a/reader/opml/serializer_test.go +++ b/reader/opml/serializer_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" import ( "bytes" diff --git a/reader/opml/subscription.go b/reader/opml/subscription.go index 45f2597d35b2d68ccb7c36662eb9c2ec4f1586b6..415b095714bd07bb675c8aa80305fab2daeaac08 100644 --- a/reader/opml/subscription.go +++ b/reader/opml/subscription.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package opml +package opml // import "miniflux.app/reader/opml" // Subcription represents a feed that will be imported or exported. type Subcription struct { diff --git a/reader/processor/processor.go b/reader/processor/processor.go index eacce9f65bf00614b758d297c4f9948980d6802a..002f7e883ff9b0b5417385e4b7b752f579fd18aa 100644 --- a/reader/processor/processor.go +++ b/reader/processor/processor.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package processor +package processor // import "miniflux.app/reader/processor" import ( - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/rewrite" - "github.com/miniflux/miniflux/reader/sanitizer" - "github.com/miniflux/miniflux/reader/scraper" - "github.com/miniflux/miniflux/storage" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/rewrite" + "miniflux.app/reader/sanitizer" + "miniflux.app/reader/scraper" + "miniflux.app/storage" ) // FeedProcessor handles the processing of feed contents. diff --git a/reader/rdf/parser.go b/reader/rdf/parser.go index 76b731c50583d1883f7c7ad8e11eda8350a5a275..90eb1dce7fcff9a93a269e2ae404259979fd8d2c 100644 --- a/reader/rdf/parser.go +++ b/reader/rdf/parser.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rdf +package rdf // import "miniflux.app/reader/rdf" import ( "encoding/xml" "io" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/encoding" + "miniflux.app/errors" + "miniflux.app/model" + "miniflux.app/reader/encoding" ) // Parse returns a normalized feed struct from a RDF feed. diff --git a/reader/rdf/parser_test.go b/reader/rdf/parser_test.go index 392b9871967bbd58163b2a10c8740689c7e9bd22..30c341395afddaf2f254e04ed10c25376f1a583d 100644 --- a/reader/rdf/parser_test.go +++ b/reader/rdf/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rdf +package rdf // import "miniflux.app/reader/rdf" import ( "bytes" diff --git a/reader/rdf/rdf.go b/reader/rdf/rdf.go index 44ff0afc8cf441b75f24a8c6e1315c9c8ec14873..6ee6828dcf6128455bc882f4259522d8c4ca6822 100644 --- a/reader/rdf/rdf.go +++ b/reader/rdf/rdf.go @@ -2,19 +2,19 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rdf +package rdf // import "miniflux.app/reader/rdf" import ( "encoding/xml" "strings" "time" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/date" - "github.com/miniflux/miniflux/reader/sanitizer" - "github.com/miniflux/miniflux/url" + "miniflux.app/crypto" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/date" + "miniflux.app/reader/sanitizer" + "miniflux.app/url" ) type rdfFeed struct { diff --git a/reader/readability/readability.go b/reader/readability/readability.go index 5eb4cc3ea292a55b3dcd58fc98876b08a7d352f8..d58ff22166852c00b8105822e8c8aaa0f56d7ac6 100644 --- a/reader/readability/readability.go +++ b/reader/readability/readability.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package readability +package readability // import "miniflux.app/reader/readability" import ( "bytes" @@ -12,8 +12,9 @@ import ( "regexp" "strings" + "miniflux.app/logger" + "github.com/PuerkitoBio/goquery" - "github.com/miniflux/miniflux/logger" "golang.org/x/net/html" ) diff --git a/reader/rewrite/rewrite_functions.go b/reader/rewrite/rewrite_functions.go index 4348584fc7b93634a8718632ad42fb5742865472..fee2a85e9faa372a57f3bffcda97d83d26e27087 100644 --- a/reader/rewrite/rewrite_functions.go +++ b/reader/rewrite/rewrite_functions.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rewrite +package rewrite // import "miniflux.app/reader/rewrite" import ( "fmt" @@ -14,7 +14,7 @@ import ( var ( youtubeRegex = regexp.MustCompile(`youtube\.com/watch\?v=(.*)`) - imgRegex = regexp.MustCompile(`<img [^>]+>`) + imgRegex = regexp.MustCompile(`<img [^>]+>`) ) func addImageTitle(entryURL, entryContent string) string { @@ -72,13 +72,13 @@ func addDynamicImage(entryURL, entryContent string) string { changed = true if img.Is("img") { - img.SetAttr("src",srcAttr) + img.SetAttr("src", srcAttr) } else { altAttr := img.AttrOr("alt", "") img.ReplaceWithHtml(`<img src="` + srcAttr + `" alt="` + altAttr + `"/>`) } - break; + break } } }) diff --git a/reader/rewrite/rewriter.go b/reader/rewrite/rewriter.go index 39a499cf5b59f537cf4d8ce00c193473addf7e24..e9b1fae1b300faf857c8ce628846ccb87cf88c7d 100644 --- a/reader/rewrite/rewriter.go +++ b/reader/rewrite/rewriter.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rewrite +package rewrite // import "miniflux.app/reader/rewrite" import ( "strings" - "github.com/miniflux/miniflux/url" + "miniflux.app/url" ) // Rewriter modify item contents with a set of rewriting rules. diff --git a/reader/rewrite/rewriter_test.go b/reader/rewrite/rewriter_test.go index 2e4aeaca88f30846be355ddb405ce20e0e3bddc9..7ceb0dc9ddf97fae7e58514d2e67075ae819120d 100644 --- a/reader/rewrite/rewriter_test.go +++ b/reader/rewrite/rewriter_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rewrite +package rewrite // import "miniflux.app/reader/rewrite" import "testing" diff --git a/reader/rewrite/rules.go b/reader/rewrite/rules.go index 76a1c0b15b43cbd74da1434c1d1eb00a72f326fe..500459f2bef6c5febcf8c42bf2a461691b431122 100644 --- a/reader/rewrite/rules.go +++ b/reader/rewrite/rules.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rewrite +package rewrite // import "miniflux.app/reader/rewrite" // List of predefined rewrite rules (alphabetically sorted) // Available rules: "add_image_title", "add_youtube_video" diff --git a/reader/rss/parser.go b/reader/rss/parser.go index 709f8ff6cb6f17a298e2c8762c5eeb706b42c15c..96339ae8079f4f974fa412a899a8b8a7ea56e060 100644 --- a/reader/rss/parser.go +++ b/reader/rss/parser.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rss +package rss // import "miniflux.app/reader/rss" import ( "encoding/xml" "io" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/encoding" + "miniflux.app/errors" + "miniflux.app/model" + "miniflux.app/reader/encoding" ) // Parse returns a normalized feed struct from a RSS feed. diff --git a/reader/rss/parser_test.go b/reader/rss/parser_test.go index f3ca697eb7300d952e841b57426cd86c45822a5e..c0afe5907e0ba3d44bc4ff1184d3f1aba4fce269 100644 --- a/reader/rss/parser_test.go +++ b/reader/rss/parser_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rss +package rss // import "miniflux.app/reader/rss" import ( "bytes" diff --git a/reader/rss/rss.go b/reader/rss/rss.go index 5ccbb0ee9a712afe5cb716492e22cc55208ef1b4..fa6c8322451b5a9ee0606a9e8e40f9ba17ff7ad7 100644 --- a/reader/rss/rss.go +++ b/reader/rss/rss.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package rss +package rss // import "miniflux.app/reader/rss" import ( "encoding/xml" @@ -11,12 +11,12 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/date" - "github.com/miniflux/miniflux/reader/sanitizer" - "github.com/miniflux/miniflux/url" + "miniflux.app/crypto" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/date" + "miniflux.app/reader/sanitizer" + "miniflux.app/url" ) type rssFeed struct { diff --git a/reader/sanitizer/sanitizer.go b/reader/sanitizer/sanitizer.go index 6de46145ca28a2f16300a03107616ec43e4eefca..eae9b21172d0ed96808b43efe7bb582583be9512 100644 --- a/reader/sanitizer/sanitizer.go +++ b/reader/sanitizer/sanitizer.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package sanitizer +package sanitizer // import "miniflux.app/reader/sanitizer" import ( "bytes" @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "github.com/miniflux/miniflux/url" + "miniflux.app/url" "golang.org/x/net/html" ) diff --git a/reader/sanitizer/sanitizer_test.go b/reader/sanitizer/sanitizer_test.go index 8db0bda5949c544df7ff175b907a20652f464ce1..b6588f03b1afdfea1d713929ec3dd144ac1a0b35 100644 --- a/reader/sanitizer/sanitizer_test.go +++ b/reader/sanitizer/sanitizer_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package sanitizer +package sanitizer // import "miniflux.app/reader/sanitizer" import "testing" diff --git a/reader/sanitizer/strip_tags.go b/reader/sanitizer/strip_tags.go index f3cecd112de8efcaec2a4c8fde251bd7919ee375..8dc944fcd08c0965d38d612172c9b359dff379ef 100644 --- a/reader/sanitizer/strip_tags.go +++ b/reader/sanitizer/strip_tags.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package sanitizer +package sanitizer // import "miniflux.app/reader/sanitizer" import ( "bytes" diff --git a/reader/sanitizer/strip_tags_test.go b/reader/sanitizer/strip_tags_test.go index 763ccc9eb47146f5be5685adfd2af662d60230dc..18a0ce820606728082130adaf11e04deeeff215a 100644 --- a/reader/sanitizer/strip_tags_test.go +++ b/reader/sanitizer/strip_tags_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package sanitizer +package sanitizer // import "miniflux.app/reader/sanitizer" import "testing" diff --git a/reader/scraper/rules.go b/reader/scraper/rules.go index 7967869f8b2b483ce8f15b24012841ec83ae3d35..e84b882b9a9aa40ddc95d9186206c2aaeff4bf86 100644 --- a/reader/scraper/rules.go +++ b/reader/scraper/rules.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package scraper +package scraper // import "miniflux.app/reader/scraper" // List of predefined scraper rules (alphabetically sorted) // domain => CSS selectors diff --git a/reader/scraper/scraper.go b/reader/scraper/scraper.go index 17e671453c710e245d2996400f86582becbcb70d..d2cccdbb1f5adac6f6be6b9d34472a9990864f82 100644 --- a/reader/scraper/scraper.go +++ b/reader/scraper/scraper.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package scraper +package scraper // import "miniflux.app/reader/scraper" import ( "errors" @@ -10,11 +10,12 @@ import ( "io" "strings" + "miniflux.app/http/client" + "miniflux.app/logger" + "miniflux.app/reader/readability" + "miniflux.app/url" + "github.com/PuerkitoBio/goquery" - "github.com/miniflux/miniflux/http/client" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/reader/readability" - "github.com/miniflux/miniflux/url" ) // Fetch downloads a web page a returns relevant contents. diff --git a/reader/scraper/scraper_test.go b/reader/scraper/scraper_test.go index b493e25c102222385d3247e1e1a62b931309a703..e43ac11848a088896ec17304c22479706aeaf88d 100644 --- a/reader/scraper/scraper_test.go +++ b/reader/scraper/scraper_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package scraper +package scraper // import "miniflux.app/reader/scraper" import "testing" diff --git a/reader/subscription/finder.go b/reader/subscription/finder.go index 57fbd1188805c81594ef8736dbfae6cf1fe21ac0..8be6f73e28243e7663e2ce2668753847941e4dbb 100644 --- a/reader/subscription/finder.go +++ b/reader/subscription/finder.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package subscription +package subscription // import "miniflux.app/reader/subscription" import ( "bytes" @@ -10,12 +10,12 @@ import ( "io" "time" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/http/client" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/reader/feed" - "github.com/miniflux/miniflux/timer" - "github.com/miniflux/miniflux/url" + "miniflux.app/errors" + "miniflux.app/http/client" + "miniflux.app/logger" + "miniflux.app/reader/feed" + "miniflux.app/timer" + "miniflux.app/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/subscription/subscription.go b/reader/subscription/subscription.go index f619f738803686191caab17f7f915fe779ad843c..604dce564151e9392dde1aa9a66f3fcf009241e9 100644 --- a/reader/subscription/subscription.go +++ b/reader/subscription/subscription.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package subscription +package subscription // import "miniflux.app/reader/subscription" import "fmt" diff --git a/scheduler/doc.go b/scheduler/doc.go index ea5becc5e5d05a9eb2f089f7a70a5b42371dfab8..1afa2a8cf9723f3b546a75d6bad6575ae0663470 100644 --- a/scheduler/doc.go +++ b/scheduler/doc.go @@ -7,4 +7,4 @@ Package scheduler implements the application internal scheduler. */ -package scheduler +package scheduler // import "miniflux.app/scheduler" diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index e354c09ed2d6799aa52bf9e53819b6a3030aeb2f..f0a8134031c77c2ee035ea158cc47414b7331bb4 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package scheduler +package scheduler // import "miniflux.app/scheduler" import ( "time" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/storage" + "miniflux.app/logger" + "miniflux.app/storage" ) // NewFeedScheduler starts a new scheduler that push jobs to a pool of workers. diff --git a/scheduler/worker.go b/scheduler/worker.go index 934f31cd6e4a66c66e7fe2b02afff6d1d343ea4b..68efed777f3ebb419c6b6ed009a8642de9cf56eb 100644 --- a/scheduler/worker.go +++ b/scheduler/worker.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package scheduler +package scheduler // import "miniflux.app/scheduler" import ( "time" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/feed" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/reader/feed" ) // Worker refreshes a feed in the background. diff --git a/scheduler/worker_pool.go b/scheduler/worker_pool.go index 1b9f08602c6a14972b6105573ae70ac0a9e65b6c..ce5a4539a0fa1cd24142d4ef9774f3f90637fd3d 100644 --- a/scheduler/worker_pool.go +++ b/scheduler/worker_pool.go @@ -2,11 +2,11 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package scheduler +package scheduler // import "miniflux.app/scheduler" import ( - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/feed" + "miniflux.app/model" + "miniflux.app/reader/feed" ) // WorkerPool handle a pool of workers. diff --git a/storage/category.go b/storage/category.go index bbb4c865f8fed77230875885fe379904ebd64c94..deb8e242b8a2f554f4b28e155865c2351acccf18 100644 --- a/storage/category.go +++ b/storage/category.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" + "miniflux.app/model" + "miniflux.app/timer" ) // AnotherCategoryExists checks if another category exists with the same title. diff --git a/storage/doc.go b/storage/doc.go index aede4e86aa495c0a06316eb40e4e173c50056572..ab8d0b537242cf2e07d37d8576b7b1b0bf47f426 100644 --- a/storage/doc.go +++ b/storage/doc.go @@ -7,4 +7,4 @@ Package storage implements a set of functions to interact with the database. */ -package storage +package storage // import "miniflux.app/storage" diff --git a/storage/enclosure.go b/storage/enclosure.go index 5ae0a4321d48103f31df77e61c0f01acf4893daf..0fc7be7e4a448240df13d0807cdcd90cfe303933 100644 --- a/storage/enclosure.go +++ b/storage/enclosure.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "fmt" - "github.com/miniflux/miniflux/model" + "miniflux.app/model" ) // GetEnclosures returns all attachments for the given entry. diff --git a/storage/entry.go b/storage/entry.go index b703a4cecc49e02bb3be5b907f67e5ac9a434d75..9fd8a53f3e74d46f9944d08ca52a0e2a9788d41b 100644 --- a/storage/entry.go +++ b/storage/entry.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "errors" "fmt" "time" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/timer" "github.com/lib/pq" ) diff --git a/storage/entry_pagination_builder.go b/storage/entry_pagination_builder.go index e443b009549ad31d42833c4b1880e8f369584031..ce6f7fcc1a45a53ade3c74dda3cc8fa2dfe95301 100644 --- a/storage/entry_pagination_builder.go +++ b/storage/entry_pagination_builder.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" + "miniflux.app/model" + "miniflux.app/timer" ) // EntryPaginationBuilder is a builder for entry prev/next queries. diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go index 8c0d706ee3fc31a77c89c4f961568907dd3f48cf..18cf735084096292fc21c474ef336584cb1c4907 100644 --- a/storage/entry_query_builder.go +++ b/storage/entry_query_builder.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "fmt" @@ -11,9 +11,9 @@ import ( "github.com/lib/pq" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" - "github.com/miniflux/miniflux/timezone" + "miniflux.app/model" + "miniflux.app/timer" + "miniflux.app/timezone" ) // EntryQueryBuilder builds a SQL query to fetch entries. diff --git a/storage/feed.go b/storage/feed.go index 326ada87ff894d6e69e0b0ceb0bf39102735428b..283b0958d739f9e73fb6d3b7628249879c7a2b76 100644 --- a/storage/feed.go +++ b/storage/feed.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" @@ -10,9 +10,9 @@ import ( "fmt" "time" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" - "github.com/miniflux/miniflux/timezone" + "miniflux.app/model" + "miniflux.app/timer" + "miniflux.app/timezone" ) // FeedExists checks if the given feed exists. diff --git a/storage/icon.go b/storage/icon.go index 5e8b5dc62d80682d145afb9594e696a0b6ef093e..3a3686dcafc0990f25abc7ce0df69fac0e27ed84 100644 --- a/storage/icon.go +++ b/storage/icon.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" + "miniflux.app/model" + "miniflux.app/timer" ) // HasIcon checks if the given feed has an icon. diff --git a/storage/integration.go b/storage/integration.go index 5a7ef193f24fd079ffe8c4c1a81af079f1c3e7b7..6bc70641fb7d73a9c3efb237cb4bb54420862dc8 100644 --- a/storage/integration.go +++ b/storage/integration.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" "fmt" - "github.com/miniflux/miniflux/model" + "miniflux.app/model" ) // HasDuplicateFeverUsername checks if another user have the same fever username. diff --git a/storage/job.go b/storage/job.go index e20a0c42ce762d3f02327edc147f9e22dd28b3ef..41e63fa25f84518da0fd94d464fa6c9c908857af 100644 --- a/storage/job.go +++ b/storage/job.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "fmt" "time" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" + "miniflux.app/model" + "miniflux.app/timer" ) const maxParsingError = 3 diff --git a/storage/session.go b/storage/session.go index 1e6fb42d58cb27817fca94ce8c9ca7aab2901030..41396848a2567b17cd33e00bae03c7b799591015 100644 --- a/storage/session.go +++ b/storage/session.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" "fmt" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/model" + "miniflux.app/crypto" + "miniflux.app/model" ) // CreateSession creates a new session. diff --git a/storage/storage.go b/storage/storage.go index 19372f074845e3646b3e7d29f2b908506930c527..c2aef77e894b864acfeacc65f714740773f13731 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" diff --git a/storage/timezone.go b/storage/timezone.go index 396c7d416f210f3e3b9ce63bab15da7f15f2bf18..714d0032b95b7ec9fd9b9f0faa9eb7e9d3f6d569 100644 --- a/storage/timezone.go +++ b/storage/timezone.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "fmt" "strings" "time" - "github.com/miniflux/miniflux/timer" + "miniflux.app/timer" ) // Timezones returns all timezones supported by the database. diff --git a/storage/user.go b/storage/user.go index de58c098fbed719d724d62d8558937d3bd27e251..9d584d55a0d746231aee202ed539e1d4d709e3de 100644 --- a/storage/user.go +++ b/storage/user.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/timer" + "miniflux.app/model" + "miniflux.app/timer" "github.com/lib/pq/hstore" "golang.org/x/crypto/bcrypt" diff --git a/storage/user_session.go b/storage/user_session.go index 990157d4a691ab60a6a51e7d8a362d7891d0f865..9c1381e0dc1a5ca48b9e8b04577bb46ea25de261 100644 --- a/storage/user_session.go +++ b/storage/user_session.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package storage +package storage // import "miniflux.app/storage" import ( "database/sql" "fmt" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/model" + "miniflux.app/crypto" + "miniflux.app/model" ) // UserSessions returns the list of sessions for the given user. diff --git a/template/common.go b/template/common.go index 665e90f75e9c986cd6a0384ca780ab37e7e37c9d..a25239170f3fa0f20a9af01db185d46f53068691 100644 --- a/template/common.go +++ b/template/common.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package template +package template // import "miniflux.app/template" var templateCommonMap = map[string]string{ "entry_pagination": `{{ define "entry_pagination" }} diff --git a/template/dict.go b/template/dict.go index 3056bcd592cee1acad03edbd7ef79ad4054a6489..1251bb6aa47357ad34ede7ec0603f59ff8a50d85 100644 --- a/template/dict.go +++ b/template/dict.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package template +package template // import "miniflux.app/template" import "fmt" diff --git a/template/dict_test.go b/template/dict_test.go index 8b236e049f7c526a77664098c0f9dc29346e2882..ef4b17c1e513f7b71a06fa300be4627e23a64c17 100644 --- a/template/dict_test.go +++ b/template/dict_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package template +package template // import "miniflux.app/template" import ( "testing" diff --git a/template/doc.go b/template/doc.go index 5bdae47a6d4127b66502ad5c4a817235160e1be9..ead768de1fd684fb93724f16c34b43044959154c 100644 --- a/template/doc.go +++ b/template/doc.go @@ -7,4 +7,4 @@ Package template handles template parsing and execution. */ -package template +package template // import "miniflux.app/template" diff --git a/template/elapsed.go b/template/elapsed.go index 5c5d98cf6abd15977bc81826090470faeae594f2..bfcc3eefa92ecfc7ab61e18931ed06ea5bd703dd 100644 --- a/template/elapsed.go +++ b/template/elapsed.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT License // that can be found in the LICENSE file. -package template +package template // import "miniflux.app/template" import ( "math" "time" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/timezone" + "miniflux.app/locale" + "miniflux.app/timezone" ) // Texts to be translated if necessary. diff --git a/template/elapsed_test.go b/template/elapsed_test.go index b5fd4fa83c94545578c078b1672a2d04a08d4b3f..987833a6016025e4115bda4fd0248c6ca4aeea70 100644 --- a/template/elapsed_test.go +++ b/template/elapsed_test.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT License // that can be found in the LICENSE file. -package template +package template // import "miniflux.app/template" import ( "fmt" "testing" "time" - "github.com/miniflux/miniflux/locale" + "miniflux.app/locale" ) func TestElapsedTime(t *testing.T) { diff --git a/template/engine.go b/template/engine.go index 80555821a315afc50c970ff9e52082ea6f6acae7..5a46e0cee8f835b6c1e3bd5b18013902f2020d5b 100644 --- a/template/engine.go +++ b/template/engine.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package template +package template // import "miniflux.app/template" import ( "bytes" "html/template" "time" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/logger" + "miniflux.app/config" + "miniflux.app/errors" + "miniflux.app/locale" + "miniflux.app/logger" "github.com/gorilla/mux" ) diff --git a/template/functions.go b/template/functions.go index 225984b991a9c61b2de571b177a4d06c0c4fe113..d20b4458a516b1698fb36890d5ed6c9dafecb8e9 100644 --- a/template/functions.go +++ b/template/functions.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package template +package template // import "miniflux.app/template" import ( "bytes" @@ -12,11 +12,11 @@ import ( "time" "github.com/gorilla/mux" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/filter" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/url" + "miniflux.app/config" + "miniflux.app/filter" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/url" ) type funcMap struct { diff --git a/template/views.go b/template/views.go index 861dea690c182b1195468f50ead750f79062e614..2912f22a6d7a3ad90d0bf05fc8ecc7a8b6afc237 100644 --- a/template/views.go +++ b/template/views.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package template +package template // import "miniflux.app/template" var templateViewsMap = map[string]string{ "about": `{{ define "title"}}{{ t "About" }}{{ end }} diff --git a/timer/doc.go b/timer/doc.go index 8d330aecb809dd6128cea0c1f83a5b2d83b71f6d..e27af9280980cb5333ac11905dbb894b5e417a75 100644 --- a/timer/doc.go +++ b/timer/doc.go @@ -7,4 +7,4 @@ Package timer implements utility functions to measure the execution time of a block of code. */ -package timer +package timer // import "miniflux.app/timer" diff --git a/timer/timer.go b/timer/timer.go index d7444ca5cdf039bc24f374330320c533cdb7d86e..8f311c3d4354d8035825ca9d12ae41e96a3bea1a 100644 --- a/timer/timer.go +++ b/timer/timer.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package timer +package timer // import "miniflux.app/timer" import ( "time" - "github.com/miniflux/miniflux/logger" + "miniflux.app/logger" ) // ExecutionTime returns the elapsed time of a block of code. diff --git a/timezone/timezone.go b/timezone/timezone.go index 96b7fe41fb7f99588442b814a1ffd45f0e112a42..aaef655bc94641aa716f5f4c4e137095f55eb0bb 100644 --- a/timezone/timezone.go +++ b/timezone/timezone.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package timezone +package timezone // import "miniflux.app/timezone" import ( "time" diff --git a/timezone/timezone_test.go b/timezone/timezone_test.go index eb960f24291002cd51b41e6b5dd552eb571d7834..ad62343d722c1b146d6230990685aad34a6ff33b 100644 --- a/timezone/timezone_test.go +++ b/timezone/timezone_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package timezone +package timezone // import "miniflux.app/timezone" import ( "testing" diff --git a/ui/about.go b/ui/about.go index 9a2bcfbce7d05cbc6dc76b56b15ff4e9409b9872..484fdc0798bcf5b93f47ceeb6f845518eedb2563 100644 --- a/ui/about.go +++ b/ui/about.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" - "github.com/miniflux/miniflux/version" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" + "miniflux.app/version" ) // About shows the about page. diff --git a/ui/bookmark_entries.go b/ui/bookmark_entries.go index 9d64119bc00f06fbae64f0019330a341635553b3..8bf3095049e517e448733fbcd423d6460a72141c 100644 --- a/ui/bookmark_entries.go +++ b/ui/bookmark_entries.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowStarredPage renders the page with all starred entries. diff --git a/ui/category_create.go b/ui/category_create.go index 7c0e0d9b270c0cae8fd32f074fe70370232c5eb4..2d8c9d99b656ee3c4da7acb897ce0f5207354020 100644 --- a/ui/category_create.go +++ b/ui/category_create.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // CreateCategory shows the form to create a new category. diff --git a/ui/category_edit.go b/ui/category_edit.go index e84c96d043a9c75ea77213eb3cad8985d464bf53..c61d9308112087db781680fbc4eece524abb4e27 100644 --- a/ui/category_edit.go +++ b/ui/category_edit.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // EditCategory shows the form to modify a category. diff --git a/ui/category_entries.go b/ui/category_entries.go index 49ff891065616b820d395b2aa854be2bf6474317..bb04d8b6893be465439a0a62c426d8fbc758df7b 100644 --- a/ui/category_entries.go +++ b/ui/category_entries.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // CategoryEntries shows all entries for the given category. diff --git a/ui/category_list.go b/ui/category_list.go index dea961fb42e32e94ed54090f4bb1046774c3f908..663bafe22f971a574c15a2b7577040efb78fa754 100644 --- a/ui/category_list.go +++ b/ui/category_list.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // CategoryList shows the page with all categories. diff --git a/ui/category_remove.go b/ui/category_remove.go index 6656ee36cacfc2bd62a504d525623600caf178e0..6cdb0e458cbf4d1fa0e07b82abacd92325a8dc46 100644 --- a/ui/category_remove.go +++ b/ui/category_remove.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" ) // RemoveCategory deletes a category from the database. diff --git a/ui/category_save.go b/ui/category_save.go index bdf10a8f422ddd0de460064fdffb2e4d7702ddcf..a41e2c4fbac8cb18e66a5e388d161701db7fad18 100644 --- a/ui/category_save.go +++ b/ui/category_save.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // SaveCategory validate and save the new category into the database. diff --git a/ui/category_update.go b/ui/category_update.go index bf217345f24687eccb8700b222c34f5d6c245f9a..64bebe1bfdcee9a088aa1e894596b849dea9ca77 100644 --- a/ui/category_update.go +++ b/ui/category_update.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // UpdateCategory validates and updates a category. diff --git a/ui/controller.go b/ui/controller.go index b3e85af4762136013481e3cfa75c9672852ee444..5b1bbafe9bd6d8014a4f0487feae139e6772f7a6 100644 --- a/ui/controller.go +++ b/ui/controller.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "github.com/gorilla/mux" - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/reader/feed" - "github.com/miniflux/miniflux/scheduler" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/template" + "miniflux.app/config" + "miniflux.app/locale" + "miniflux.app/reader/feed" + "miniflux.app/scheduler" + "miniflux.app/storage" + "miniflux.app/template" ) // Controller contains all HTTP handlers for the user interface. diff --git a/ui/doc.go b/ui/doc.go index 30154e9749af692163bd567d2895a4defa8d40c0..2e6cc39bc025bb03c87a6589309c3070569b0eb0 100644 --- a/ui/doc.go +++ b/ui/doc.go @@ -7,4 +7,4 @@ Package ui implements handlers to render to user interface. */ -package ui +package ui // import "miniflux.app/ui" diff --git a/ui/entry_bookmark.go b/ui/entry_bookmark.go index c65cccf6f568412c0f9ce54c4a4341ea468aab45..a9a4a97a5345ad16df8b464d02124a806a039efe 100644 --- a/ui/entry_bookmark.go +++ b/ui/entry_bookmark.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowStarredEntry shows a single feed entry in "starred" mode. diff --git a/ui/entry_category.go b/ui/entry_category.go index 163bd08be0ba7cdf3395cb8ec337f13d4650b622..03115a60a8e31c07179daa49e67ec28d904d35aa 100644 --- a/ui/entry_category.go +++ b/ui/entry_category.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowCategoryEntry shows a single feed entry in "category" mode. diff --git a/ui/entry_feed.go b/ui/entry_feed.go index ea68ab4e910e11c88e6166709bfd2917ce0c5da3..13e545269d69401bc1dc97c45dc285f520fbcd9d 100644 --- a/ui/entry_feed.go +++ b/ui/entry_feed.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowFeedEntry shows a single feed entry in "feed" mode. diff --git a/ui/entry_read.go b/ui/entry_read.go index 2f89119f29c7706352a521f189e3174d515b8374..83bb108f3a2e6e944eebd1e6a684f358fc18b720 100644 --- a/ui/entry_read.go +++ b/ui/entry_read.go @@ -2,19 +2,19 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/storage" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowReadEntry shows a single feed entry in "history" mode. diff --git a/ui/entry_save.go b/ui/entry_save.go index 12ebf2a06bce061b51d08beac57085147afd5fe0..292b5268017ab7dc61360947d634db6edb34ce1b 100644 --- a/ui/entry_save.go +++ b/ui/entry_save.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/integration" - "github.com/miniflux/miniflux/model" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" + "miniflux.app/integration" + "miniflux.app/model" ) // SaveEntry send the link to external services. diff --git a/ui/entry_scraper.go b/ui/entry_scraper.go index aea9b209e5e26ba016403bc3e311ec6f847398d0..52e084679077e8458937755a145a82ab6d8de3e8 100644 --- a/ui/entry_scraper.go +++ b/ui/entry_scraper.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/reader/sanitizer" - "github.com/miniflux/miniflux/reader/scraper" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" + "miniflux.app/model" + "miniflux.app/reader/sanitizer" + "miniflux.app/reader/scraper" ) // FetchContent downloads the original HTML page and returns relevant contents. diff --git a/ui/entry_search.go b/ui/entry_search.go index 21fdf56a63a51ce57f9c52e92b9d11de28e98002..67954b978ba1136c909d15b79e2052ea8dc4c1f8 100644 --- a/ui/entry_search.go +++ b/ui/entry_search.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowSearchEntry shows a single entry in "search" mode. diff --git a/ui/entry_toggle_bookmark.go b/ui/entry_toggle_bookmark.go index 9d94cd18a6b2efaa24a9feadf26f94565c596819..13de9719f0df248a4f90278ddbad2cdeb06e9b46 100644 --- a/ui/entry_toggle_bookmark.go +++ b/ui/entry_toggle_bookmark.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/json" + "miniflux.app/logger" ) // ToggleBookmark handles Ajax request to toggle bookmark value. diff --git a/ui/entry_unread.go b/ui/entry_unread.go index 021df72c74bca849bf2a9eda63cfaef99c2c1093..784255e64858d7a369b2bde40b004f7bc26447bd 100644 --- a/ui/entry_unread.go +++ b/ui/entry_unread.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/storage" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/storage" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowUnreadEntry shows a single feed entry in "unread" mode. diff --git a/ui/entry_update_status.go b/ui/entry_update_status.go index bafa0a092adab997e0a70da87a600b2840ca79af..4f5c114e70784da7522caf93a13c07ad28b69bd8 100644 --- a/ui/entry_update_status.go +++ b/ui/entry_update_status.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "errors" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/context" + "miniflux.app/http/response/json" + "miniflux.app/logger" ) // UpdateEntriesStatus updates the status for a list of entries. diff --git a/ui/feed_edit.go b/ui/feed_edit.go index b4fb86f951104669c2fb7ccb592a65dacd2f57a2..4d2aabd0887a5008955501dc4a08b00b25693228 100644 --- a/ui/feed_edit.go +++ b/ui/feed_edit.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // EditFeed shows the form to modify a subscription. diff --git a/ui/feed_entries.go b/ui/feed_entries.go index 7f056c5eae80376bf4d3e622a35311d3cc5e8309..92aaab750fb79799b727877de3ac980bf054ed73 100644 --- a/ui/feed_entries.go +++ b/ui/feed_entries.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowFeedEntries shows all entries for the given feed. diff --git a/ui/feed_icon.go b/ui/feed_icon.go index c05efe557999cd6d4705851262c827aa6e156b2a..c5a74148540c5470b22a4857be8770746a789c2d 100644 --- a/ui/feed_icon.go +++ b/ui/feed_icon.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" "time" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" ) // ShowIcon shows the feed icon. diff --git a/ui/feed_list.go b/ui/feed_list.go index 54f09f20b9873ad594b9af668207901baf39a7df..74877e3ff70164aa01a016263e6bf6b23a7abbe2 100644 --- a/ui/feed_list.go +++ b/ui/feed_list.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowFeedsPage shows the page with all subscriptions. diff --git a/ui/feed_refresh.go b/ui/feed_refresh.go index eb86b042e4261c7360c129c8c06ff6e14d8ae29f..634edfad88a4db97d23a6dd01851b04028a6320f 100644 --- a/ui/feed_refresh.go +++ b/ui/feed_refresh.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" ) // RefreshFeed refresh a subscription and redirect to the feed entries page. diff --git a/ui/feed_remove.go b/ui/feed_remove.go index 23d877b688ace26750bbc5f2892781cbd4d2848f..4a7294e2f32caa0cd582ef938619998d11a05536 100644 --- a/ui/feed_remove.go +++ b/ui/feed_remove.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" ) // RemoveFeed deletes a subscription from the database and redirect to the list of feeds page. diff --git a/ui/feed_update.go b/ui/feed_update.go index b960d1176483a1e77c5531a1ba976781d08938b1..821f850e0a2ffac00db6ebc14ae5f85ebe6e7864 100644 --- a/ui/feed_update.go +++ b/ui/feed_update.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // UpdateFeed update a subscription and redirect to the feed entries page. diff --git a/ui/form/auth.go b/ui/form/auth.go index c18a0bef50daae6048047511e2500bf0d8c94259..7635efe4327199b8a1c519c843c0a45ffe65e751 100644 --- a/ui/form/auth.go +++ b/ui/form/auth.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" - "github.com/miniflux/miniflux/errors" + "miniflux.app/errors" ) // AuthForm represents the authentication form. diff --git a/ui/form/category.go b/ui/form/category.go index 31b71968f6e96a2b935c5dac7e870b69d3079b3c..f255cb4221dfe9ea3fd86dce0d1ed5422401c2e5 100644 --- a/ui/form/category.go +++ b/ui/form/category.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" + "miniflux.app/errors" + "miniflux.app/model" ) // CategoryForm represents a feed form in the UI diff --git a/ui/form/feed.go b/ui/form/feed.go index 853287a33640e19e8ce7e443c827543db371c65e..a8a4343b1c1f8083fa48b7b2fccc32ea231d5a69 100644 --- a/ui/form/feed.go +++ b/ui/form/feed.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" "strconv" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" + "miniflux.app/errors" + "miniflux.app/model" ) // FeedForm represents a feed form in the UI diff --git a/ui/form/integration.go b/ui/form/integration.go index db095aaedd2777525fb1407638349626072269c6..77e0295ff56520a8b87eb2f9fe6c6f7a9cde8527 100644 --- a/ui/form/integration.go +++ b/ui/form/integration.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" - "github.com/miniflux/miniflux/model" + "miniflux.app/model" ) // IntegrationForm represents user integration settings form. diff --git a/ui/form/settings.go b/ui/form/settings.go index e5f6939b4f7b6cecf29b23b8b818c97fcd25e80d..86f2d15603e997ef1cffe992653837c932c21eae 100644 --- a/ui/form/settings.go +++ b/ui/form/settings.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" + "miniflux.app/errors" + "miniflux.app/model" ) // SettingsForm represents the settings form. diff --git a/ui/form/subscription.go b/ui/form/subscription.go index 122d25ab0b73edc82d85c92f7d924d5f83764ba6..a1a73b9f5e8324a6666cbc4137b7b6ccb975637a 100644 --- a/ui/form/subscription.go +++ b/ui/form/subscription.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" "strconv" - "github.com/miniflux/miniflux/errors" + "miniflux.app/errors" ) // SubscriptionForm represents the subscription form. diff --git a/ui/form/user.go b/ui/form/user.go index 8b8346ea282bde524024538bb29c79d722d05220..404f9c7bb566a81f635467c0b1f97a0fc2e6e921 100644 --- a/ui/form/user.go +++ b/ui/form/user.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package form +package form // import "miniflux.app/ui/form" import ( "net/http" - "github.com/miniflux/miniflux/errors" - "github.com/miniflux/miniflux/model" + "miniflux.app/errors" + "miniflux.app/model" ) // UserForm represents the user form. diff --git a/ui/history_entries.go b/ui/history_entries.go index 2f18bbf43627a78fc7df63e75877d0087efcf7be..3835b3496fea6615026a9aca20330c0fbca01523 100644 --- a/ui/history_entries.go +++ b/ui/history_entries.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowHistoryPage renders the page with all read entries. diff --git a/ui/history_flush.go b/ui/history_flush.go index 96b6f3de3857f61829c88a371593a1f813315d24..0776f9c87ac23ce69d122fc38721021b70dbc4af 100644 --- a/ui/history_flush.go +++ b/ui/history_flush.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" ) // FlushHistory changes all "read" items to "removed". diff --git a/ui/integration_pocket.go b/ui/integration_pocket.go index 02497c73ea4c9444f54b9e40c0e72368920159bf..62d3ddc856a0ca87d92e7dff2194bfba93e47ffc 100644 --- a/ui/integration_pocket.go +++ b/ui/integration_pocket.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/integration/pocket" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/session" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/integration/pocket" + "miniflux.app/logger" + "miniflux.app/ui/session" ) // PocketAuthorize redirects the end-user to Pocket website to authorize the application. diff --git a/ui/integration_show.go b/ui/integration_show.go index b3dc6d94eb1f8d55c4b69313d5626ee85faea193..c32479f4843bc545549335ec04c11e5a725c3dd4 100644 --- a/ui/integration_show.go +++ b/ui/integration_show.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowIntegrations renders the page with all external integrations. diff --git a/ui/integration_update.go b/ui/integration_update.go index a1e98cb7900229d0cf20413edf938e78cbfe3e32..22c90001c8e71421424b8ead4ad6952aa3f71750 100644 --- a/ui/integration_update.go +++ b/ui/integration_update.go @@ -2,19 +2,19 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "crypto/md5" "fmt" "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/ui/form" + "miniflux.app/ui/session" ) // UpdateIntegration updates integration settings. diff --git a/ui/login_check.go b/ui/login_check.go index 36fafea6bd2ec885e02ffaef033382ae46068086..8f501b8942dc971d1486025d85d51c47cdde6367 100644 --- a/ui/login_check.go +++ b/ui/login_check.go @@ -1,18 +1,18 @@ -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/cookie" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/cookie" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // CheckLogin validates the username/password and redirects the user to the unread page. diff --git a/ui/login_show.go b/ui/login_show.go index 88e12d41a7cf3f808ca7853e9a2935e2331c0f4d..d963df506b03df6503a375dac70a66ccb1d48f70 100644 --- a/ui/login_show.go +++ b/ui/login_show.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowLoginPage shows the login form. diff --git a/ui/logout.go b/ui/logout.go index 0c777cef59b3e51ddb008ee82071f20abfa6f194..e610282f0c3c1d215adf9860ad686efd63510fc7 100644 --- a/ui/logout.go +++ b/ui/logout.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/cookie" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/session" + "miniflux.app/http/context" + "miniflux.app/http/cookie" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/session" ) // Logout destroy the session and redirects the user to the login page. diff --git a/ui/oauth2.go b/ui/oauth2.go index f1e6a4ee0eec9a8e91411d923c6decdf1dc87c49..3f964a6231af94a2ec070fc1da68020197c96d5f 100644 --- a/ui/oauth2.go +++ b/ui/oauth2.go @@ -2,11 +2,11 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( - "github.com/miniflux/miniflux/config" - "github.com/miniflux/miniflux/oauth2" + "miniflux.app/config" + "miniflux.app/oauth2" ) func getOAuth2Manager(cfg *config.Config) *oauth2.Manager { diff --git a/ui/oauth2_callback.go b/ui/oauth2_callback.go index a39c0ac74564af3b77be80135a00eb18a93fb403..4e0cd748bb36aa4f8439a9caf08957316d44a455 100644 --- a/ui/oauth2_callback.go +++ b/ui/oauth2_callback.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/cookie" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" + "miniflux.app/http/context" + "miniflux.app/http/cookie" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/ui/session" ) // OAuth2Callback receives the authorization code and create a new session. diff --git a/ui/oauth2_redirect.go b/ui/oauth2_redirect.go index 7f472ac174ef444e0890fe9897ec3ce776cc7682..08f065d76fc69bd7daf92458503d20825ab0ae95 100644 --- a/ui/oauth2_redirect.go +++ b/ui/oauth2_redirect.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/session" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/session" ) // OAuth2Redirect redirects the user to the consent page to ask for permission. diff --git a/ui/oauth2_unlink.go b/ui/oauth2_unlink.go index 4421092ca3b8b154f1cc109f6197800c629a94f6..e0dbd16ecae73cc4ac0c07a19c50a76a5f85f544 100644 --- a/ui/oauth2_unlink.go +++ b/ui/oauth2_unlink.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/session" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/session" ) // OAuth2Unlink unlink an account from the external provider. diff --git a/ui/opml_export.go b/ui/opml_export.go index ec396f0de0f6f394ce55b825f4440872abcb9103..561c6c3b1331062c03bf299889621d4a7b6e4519 100644 --- a/ui/opml_export.go +++ b/ui/opml_export.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/response/xml" - "github.com/miniflux/miniflux/reader/opml" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/http/response/xml" + "miniflux.app/reader/opml" ) // Export generates the OPML file. diff --git a/ui/opml_import.go b/ui/opml_import.go index 1017272972055d350b69ef5c1d09b9af38f85389..10d09fc4de9b93925a634fbb7084ac24fa6a2092 100644 --- a/ui/opml_import.go +++ b/ui/opml_import.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // Import shows the import form. diff --git a/ui/opml_upload.go b/ui/opml_upload.go index 2e0a1b8c582c44e3805dae5dfd473d243bb52984..e11eb730ac7985a27615892dae5bcd85e184e35d 100644 --- a/ui/opml_upload.go +++ b/ui/opml_upload.go @@ -2,19 +2,19 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/reader/opml" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/reader/opml" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // UploadOPML handles OPML file importation. diff --git a/ui/pagination.go b/ui/pagination.go index aaf9d12c1785fa7fd31daaa61859f91208ef7689..5fdf715a8ab0b3884a668efd24937ba1703b8aa8 100644 --- a/ui/pagination.go +++ b/ui/pagination.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" const ( nbItemsPerPage = 100 diff --git a/ui/payload.go b/ui/payload.go index bd65c8306d0265e155307b7b0573ac724c29be15..76e92064302c88846e7985ecba0b129acb22a620 100644 --- a/ui/payload.go +++ b/ui/payload.go @@ -2,14 +2,14 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "encoding/json" "fmt" "io" - "github.com/miniflux/miniflux/model" + "miniflux.app/model" ) func decodeEntryStatusPayload(r io.ReadCloser) (entryIDs []int64, status string, err error) { diff --git a/ui/proxy.go b/ui/proxy.go index 62364aa47ac8c5bba469618671e41fff156bf048..68e4db007b3c9557add83922ab8f8bb54cf87160 100644 --- a/ui/proxy.go +++ b/ui/proxy.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "encoding/base64" @@ -11,12 +11,12 @@ import ( "net/http" "time" - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/http/client" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/logger" + "miniflux.app/crypto" + "miniflux.app/http/client" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/logger" ) // ImageProxy fetch an image from a remote server and sent it back to the browser. diff --git a/ui/search_entries.go b/ui/search_entries.go index 60d35c7382fa3a5ba74cdc16ead4eb00001bddd9..267176efd7b652db2d5246ddd423b921f2d91439 100644 --- a/ui/search_entries.go +++ b/ui/search_entries.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowSearchEntries shows all entries for the given feed. diff --git a/ui/session/session.go b/ui/session/session.go index 474bd187d6a81cc424d4021dd5febd27faab63bf..f6a35c2868fe911f1fc5766ffca8693a6265f0cb 100644 --- a/ui/session/session.go +++ b/ui/session/session.go @@ -2,12 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package session +package session // import "miniflux.app/ui/session" import ( - "github.com/miniflux/miniflux/crypto" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/storage" + "miniflux.app/crypto" + "miniflux.app/http/context" + "miniflux.app/storage" ) // Session handles session data. diff --git a/ui/session_list.go b/ui/session_list.go index ad296c6fcd66d4f1fffde98e8b59f1d23bb0464b..19aa13efd261287ef985006ea40fe1183864dd64 100644 --- a/ui/session_list.go +++ b/ui/session_list.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/ui/session" + "miniflux.app/ui/view" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" + "miniflux.app/http/context" + "miniflux.app/http/response/html" ) // ShowSessions shows the list of active user sessions. diff --git a/ui/session_remove.go b/ui/session_remove.go index 1ee2a6b9e5d55981931af5522ef809b39a6ac6f7..6bec368bf7fa21d08fb0034d4f52a780cffb4c87 100644 --- a/ui/session_remove.go +++ b/ui/session_remove.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" ) // RemoveSession remove a user session. diff --git a/ui/settings_show.go b/ui/settings_show.go index aa43f3ebe389f2876b12742f234578a4dd76c5bb..fd2ec4f3878530ada6a3c69559371b1727d3c70c 100644 --- a/ui/settings_show.go +++ b/ui/settings_show.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/locale" + "miniflux.app/model" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowSettings shows the settings page. diff --git a/ui/settings_update.go b/ui/settings_update.go index 229042d76df94e6eb89ecae44333af08df3f5b92..b86146663c3d1140d4cf1d55b12bc47e9ec47078 100644 --- a/ui/settings_update.go +++ b/ui/settings_update.go @@ -2,21 +2,21 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/locale" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/locale" + "miniflux.app/logger" + "miniflux.app/model" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // UpdateSettings update the settings. diff --git a/ui/static/bin.go b/ui/static/bin.go index b525027112e8b02faabbc8598c5eeca00f236dab..a740bb6501ce8a1350d56fd713afa1fc149a96ce 100644 --- a/ui/static/bin.go +++ b/ui/static/bin.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package static +package static // import "miniflux.app/ui/static" var Binaries = map[string]string{ "favicon-16.png": `iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADBQTFRF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL92gewAAAA90Uk5TABAgMEBQYHCAkLDA0ODw5J0j2QAAADtJREFUCNdjYMADVJvME1kKGRiY7v/+/+v8fwcGhv6fsv+T/k8AMr5w/2f4v4E0BtP9v5z/J9x/hsdKAKKaKtBX2IhFAAAAAElFTkSuQmCC`, diff --git a/ui/static/css.go b/ui/static/css.go index c661fa242974ebb9c62e8e7985ba4dd5d257388a..d689e20223c8fd9dd9ec024528218ed04b442ee3 100644 --- a/ui/static/css.go +++ b/ui/static/css.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package static +package static // import "miniflux.app/ui/static" var Stylesheets = map[string]string{ "black": `*{margin:0;padding:0;box-sizing:border-box}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{font-family:helvetica neue,Helvetica,Arial,sans-serif;text-rendering:optimizeLegibility}main{padding-left:5px;padding-right:5px;margin-bottom:30px}a{color:#36c}a:focus{outline:0;color:red;text-decoration:none;border:1px dotted #aaa}a:hover{color:#333;text-decoration:none}.header{margin-top:10px;margin-bottom:20px}.header nav ul{display:none}.header li{cursor:pointer;padding-left:10px;line-height:2.1em;font-size:1.2em;border-bottom:1px dotted #ddd}.header li:hover a{color:#888}.header a{font-size:.9em;color:#444;text-decoration:none;border:0}.header .active a{font-weight:600}.header a:hover,.header a:focus{color:#888}.page-header{margin-bottom:25px}.page-header h1{font-weight:500;border-bottom:1px dotted #ddd}.page-header ul{margin-left:25px}.page-header li{list-style-type:circle;line-height:1.8em}.logo{cursor:pointer;text-align:center}.logo a{color:#000;letter-spacing:1px}.logo a:hover{color:#396}.logo a span{color:#396}.logo a:hover span{color:#000}.search{text-align:center;display:none}.search-toggle-switch{display:none}@media(min-width:600px){body{margin:auto;max-width:750px}.header{margin-bottom:0}.logo{text-align:left;float:left;margin-right:15px;margin-left:5px}.header nav ul{display:block}.header li{display:inline;padding:0;padding-right:15px;line-height:normal;border:0;font-size:1em}.page-header ul{margin-left:0}.page-header li{display:inline;padding-right:15px}.search{text-align:right;display:block;margin-top:10px}.search-toggle-switch{display:block}.search-form{display:none}.search-toggle-switch.has-search-query{display:none}.search-form.has-search-query{display:block}}table{width:100%;border-collapse:collapse}table,th,td{border:1px solid #ddd}th,td{padding:5px;text-align:left}td{vertical-align:top}th{background:#fcfcfc}tr:hover{background-color:#f9f9f9}.column-40{width:40%}.column-25{width:25%}.column-20{width:20%}fieldset{border:1px solid #ddd;padding:8px}legend{font-weight:500;padding-left:3px;padding-right:3px}label{cursor:pointer;display:block}.radio-group{line-height:1.9em}div.radio-group label{display:inline-block}select{margin-bottom:15px}input[type=search],input[type=url],input[type=password],input[type=text]{border:1px solid #ccc;padding:3px;line-height:20px;width:250px;font-size:99%;margin-bottom:10px;margin-top:5px;-webkit-appearance:none}input[type=search]:focus,input[type=url]:focus,input[type=password]:focus,input[type=text]:focus{color:#000;border-color:rgba(82,168,236,.8);outline:0;box-shadow:0 0 8px rgba(82,168,236,.6)}input[type=checkbox]{margin-bottom:15px}::-moz-placeholder,::-ms-input-placeholder,::-webkit-input-placeholder{color:#ddd;padding-top:2px}.form-help{font-size:.9em;color:brown;margin-bottom:15px}.form-section{border-left:2px dotted #ddd;padding-left:20px;margin-left:10px}a.button{text-decoration:none}.button{display:inline-block;-webkit-appearance:none;-moz-appearance:none;font-size:1.1em;cursor:pointer;padding:3px 10px;border:1px solid;border-radius:unset}.button-primary{border-color:#3079ed;background:#4d90fe;color:#fff}.button-primary:hover,.button-primary:focus{border-color:#2f5bb7;background:#357ae8}.button-danger{border-color:#b0281a;background:#d14836;color:#fff}.button-danger:hover,.button-danger:focus{color:#fff;background:#c53727}.button:disabled{color:#ccc;background:#f7f7f7;border-color:#ccc}.buttons{margin-top:10px;margin-bottom:20px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;color:#c09853;background-color:#fcf8e3;border:1px solid #fbeed5;border-radius:4px;overflow:auto}.alert h3{margin-top:0;margin-bottom:15px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-error a{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel{color:#333;background-color:#fcfcfc;border:1px solid #ddd;border-radius:5px;padding:10px;margin-bottom:15px}.panel h3{font-weight:500;margin-top:0;margin-bottom:20px}.panel ul{margin-left:30px}#modal-left{position:fixed;top:0;left:0;bottom:0;width:360px;overflow:auto;background:#f0f0f0;box-shadow:2px 0 5px 0 #ccc;padding:5px;padding-top:30px}#modal-left h3{font-weight:400;margin:0}.btn-close-modal{position:absolute;top:0;right:0;font-size:1.7em;color:#ccc;padding:0 .2em;margin:10px;text-decoration:none}.btn-close-modal:hover{color:#999}.keyboard-shortcuts li{margin-left:25px;list-style-type:square;color:#333;font-size:.95em;line-height:1.45em}.keyboard-shortcuts p{line-height:1.9em}.login-form{margin:50px auto 0;max-width:280px}.unread-counter-wrapper{font-size:.9em;font-weight:300;color:#666}.category{font-size:.75em;background-color:#fffcd7;border:1px solid #d5d458;border-radius:5px;margin-left:.25em;padding:1px .4em;white-space:nowrap}.category a{color:#555;text-decoration:none}.category a:hover,.category a:focus{color:#000}.pagination{font-size:1.1em;display:flex;align-items:center;padding-top:8px}.pagination-bottom{border-top:1px dotted #ddd;margin-bottom:15px;margin-top:50px}.pagination>div{flex:1}.pagination-next{text-align:right}.pagination-prev:before{content:"« "}.pagination-next:after{content:" »"}.pagination a{color:#333}.pagination a:hover,.pagination a:focus{text-decoration:none}.item{border:1px dotted #ddd;margin-bottom:20px;padding:5px;overflow:hidden}.item.current-item{border:3px solid #bce;padding:3px}.item-title a{text-decoration:none;font-weight:600}.item-status-read .item-title a{color:#777}.item-meta{color:#777;font-size:.8em}.item-meta a{color:#777;text-decoration:none}.item-meta a:hover,.item-meta a:focus{color:#333}.item-meta ul{margin-top:5px}.item-meta li{display:inline}.item-meta li:after{content:"|";color:#aaa}.item-meta li:last-child:after{content:""}.items{overflow-x:hidden}.hide-read-items .item-status-read{display:none}article.feed-parsing-error{background-color:#fcf8e3;border-color:#aaa}.parsing-error{font-size:.85em;margin-top:2px;color:#333}.parsing-error-count{cursor:pointer}.entry header{padding-bottom:5px;border-bottom:1px dotted #ddd}.entry header h1{font-size:2em;line-height:1.25em;margin:5px 0 30px}.entry header h1 a{text-decoration:none;color:#333}.entry header h1 a:hover,.entry header h1 a:focus{color:#666}.entry-actions{margin-bottom:20px}.entry-actions a{text-decoration:none}.entry-actions li{display:inline}.entry-actions li:not(:last-child):after{content:"|"}.entry-meta{font-size:.95em;margin:0 0 20px;color:#666;overflow-wrap:break-word}.entry-website img{vertical-align:top}.entry-website a{color:#666;vertical-align:top;text-decoration:none}.entry-website a:hover,.entry-website a:focus{text-decoration:underline}.entry-date{font-size:.65em;font-style:italic;color:#555}.entry-content{padding-top:15px;font-size:1.2em;font-weight:300;font-family:Georgia,times new roman,Times,serif;color:#555;line-height:1.4em;overflow-wrap:break-word}.entry-content h1,h2,h3,h4,h5,h6{margin-top:15px;margin-bottom:10px}.entry-content iframe,.entry-content video,.entry-content img{max-width:100%}.entry-content figure{margin-top:15px;margin-bottom:15px}.entry-content figure img{border:1px solid #000}.entry-content figcaption{font-size:.75em;text-transform:uppercase;color:#777}.entry-content p{margin-top:10px;margin-bottom:15px}.entry-content a{overflow-wrap:break-word}.entry-content a:visited{color:purple}.entry-content dt{font-weight:500;margin-top:15px;color:#555}.entry-content dd{margin-left:15px;margin-top:5px;padding-left:20px;border-left:3px solid #ddd;color:#777;font-weight:300;line-height:1.4em}.entry-content blockquote{border-left:4px solid #ddd;padding-left:25px;margin-left:20px;margin-top:20px;margin-bottom:20px;color:#888;line-height:1.4em;font-family:Georgia,serif}.entry-content q{color:purple;font-family:Georgia,serif;font-style:italic}.entry-content q:before{content:"“"}.entry-content q:after{content:"â€"}.entry-content pre{padding:5px;background:#f0f0f0;border:1px solid #ddd;overflow:scroll;overflow-wrap:initial}.entry-content table{table-layout:fixed;max-width:100%}.entry-content ul,.entry-content ol{margin-left:30px}.entry-content ul{list-style-type:square}.entry-enclosures h3{font-weight:500}.entry-enclosure{border:1px dotted #ddd;padding:5px;margin-top:10px;max-width:100%}.entry-enclosure-download{font-size:.85em;overflow-wrap:break-word}.enclosure-video video,.enclosure-image img{max-width:100%}.confirm{font-weight:500;color:#ed2d04}.confirm a{color:#ed2d04}.loading{font-style:italic}.bookmarklet{border:1px dashed #ccc;border-radius:5px;padding:15px;margin:15px;text-align:center}.bookmarklet a{font-weight:600;text-decoration:none;font-size:1.2em}body{background:#222;color:#efefef}h1,h2,h3{color:#aaa}a{color:#aaa}a:focus,a:hover{color:#ddd}.header li{border-color:#333}.header a{color:#ddd;font-weight:400}.header .active a{font-weight:400;color:#9b9494}.header a:focus,.header a:hover{color:rgba(82,168,236,.85)}.page-header h1{border-color:#333}.logo a:hover span{color:#555}table,th,td{border:1px solid #555}th{background:#333;color:#aaa;font-weight:400}tr:hover{background-color:#333;color:#aaa}input[type=search],input[type=url],input[type=password],input[type=text]{border:1px solid #555;background:#333;color:#ccc}input[type=search]:focus,input[type=url]:focus,input[type=password]:focus,input[type=text]:focus{color:#efefef;border-color:rgba(82,168,236,.8);box-shadow:0 0 8px rgba(82,168,236,.6)}.button-primary{border-color:#444;background:#333;color:#efefef}.button-primary:hover,.button-primary:focus{border-color:#888;background:#555}.alert,.alert-success,.alert-error,.alert-info,.alert-normal{color:#efefef;background-color:#333;border-color:#444}.panel{background:#333;border-color:#555;color:#9b9b9b}#modal-left{background:#333;color:#efefef;box-shadow:0 0 10px rgba(82,168,236,.6)}.keyboard-shortcuts li{color:#9b9b9b}.unread-counter-wrapper{color:#bbb}.category{color:#efefef;background-color:#333;border-color:#444}.category a{color:#999}.category a:hover,.category a:focus{color:#aaa}.pagination a{color:#aaa}.pagination-bottom{border-color:#333}.item{border-color:#666;padding:4px}.item.current-item{border-width:2px;border-color:rgba(82,168,236,.8);box-shadow:0 0 8px rgba(82,168,236,.6)}.item-title a{font-weight:400}.item-status-read .item-title a{color:#666}.item-status-read .item-title a:focus,.item-status-read .item-title a:hover{color:rgba(82,168,236,.6)}.item-meta a:hover,.item-meta a:focus{color:#aaa}.item-meta li:after{color:#ddd}article.feed-parsing-error{background-color:#343434}.parsing-error{color:#eee}.entry header{border-color:#333}.entry header h1 a{color:#bbb}.entry-content,.entry-content p,ul{color:#999}.entry-content pre,.entry-content code{color:#fff;background:#555;border-color:#888}.entry-content q{color:#777}.entry-enclosure{border-color:#333}`, diff --git a/ui/static/js.go b/ui/static/js.go index 5c901e7861c12237c235563b36489de2d7b9a6c1..555bec6d1a4bf11a47dfa9054610f7262c917ba1 100644 --- a/ui/static/js.go +++ b/ui/static/js.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. -package static +package static // import "miniflux.app/ui/static" var Javascripts = map[string]string{ "app": `(function(){'use strict';class DomHelper{static isVisible(element){return element.offsetParent!==null;} diff --git a/ui/static_app_icon.go b/ui/static_app_icon.go index 19a823e2d6580d847d2f8b15326d14b774a5dde1..6da3f1ad3dc26e2a87e7e8719646fffd53f6f595 100644 --- a/ui/static_app_icon.go +++ b/ui/static_app_icon.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "encoding/base64" "net/http" "time" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/static" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/logger" + "miniflux.app/ui/static" ) // AppIcon renders application icons. diff --git a/ui/static_favicon.go b/ui/static_favicon.go index c68c5560485900ee19c3b23625d4335ae3673da9..2e19c05557ef648ed44877f1f32fdfc1923f7e8e 100644 --- a/ui/static_favicon.go +++ b/ui/static_favicon.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "encoding/base64" "net/http" "time" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/static" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/logger" + "miniflux.app/ui/static" ) // Favicon renders the application favicon. diff --git a/ui/static_javascript.go b/ui/static_javascript.go index 990368b55985392b30b3a421b2a321159b419f24..c52251c9f4ed782ba218c2ed60651776d0d531bd 100644 --- a/ui/static_javascript.go +++ b/ui/static_javascript.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" "time" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/static" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/ui/static" ) // Javascript renders application client side code. diff --git a/ui/static_manifest.go b/ui/static_manifest.go index 96814fe16007da8962459411c3ef7ebe19669148..f8f6ac01917def1a5824cc2ebc4a30670047076b 100644 --- a/ui/static_manifest.go +++ b/ui/static_manifest.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/json" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" + "miniflux.app/http/context" + "miniflux.app/http/response/json" + "miniflux.app/http/route" + "miniflux.app/model" ) // WebManifest renders web manifest file. diff --git a/ui/static_stylesheet.go b/ui/static_stylesheet.go index 37a06e057fbe4c5a337d955a10a7f9dea13b2581..de540fe30f2c76bcf0dcffb0f4b2096ce71cf242 100644 --- a/ui/static_stylesheet.go +++ b/ui/static_stylesheet.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" "time" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/static" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/ui/static" ) // Stylesheet renders the CSS. diff --git a/ui/subscription_add.go b/ui/subscription_add.go index b710cf04fc142d8ec552a0b6d43842030db6add4..607f19bd586db75c01e5991f479e3bc35d5e22de 100644 --- a/ui/subscription_add.go +++ b/ui/subscription_add.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // AddSubscription shows the form to add a new feed. diff --git a/ui/subscription_bookmarklet.go b/ui/subscription_bookmarklet.go index 33e82b42afd15b36b0b3fc3af1d4aae9d6f1ba89..23dcd5207a28ddfc19c8aab7ee8c50cfec1ddfee 100644 --- a/ui/subscription_bookmarklet.go +++ b/ui/subscription_bookmarklet.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // Bookmarklet prefill the form to add a subscription from the URL provided by the bookmarklet. diff --git a/ui/subscription_choose.go b/ui/subscription_choose.go index e4a77fd29dad5ef81b677d95943f87a5466806c6..65e3b6de0a9ad774a89af17f2f46d8f3438d5776 100644 --- a/ui/subscription_choose.go +++ b/ui/subscription_choose.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ChooseSubscription shows a page to choose a subscription. diff --git a/ui/subscription_submit.go b/ui/subscription_submit.go index d7f4e616d6f87fbf5203783d70b065ae9f91bad4..f7a0181ca932a0d1fa6c4fe02c998470e3744081 100644 --- a/ui/subscription_submit.go +++ b/ui/subscription_submit.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/reader/subscription" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/reader/subscription" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // SubmitSubscription try to find a feed from the URL provided by the user. diff --git a/ui/unread_entries.go b/ui/unread_entries.go index 0d10bb6cddb78c4a6c81893939c0254fba48b199..18fc2cd2a197ef5a72899fc61edede5bfc66b840 100644 --- a/ui/unread_entries.go +++ b/ui/unread_entries.go @@ -2,18 +2,18 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/model" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowUnreadPage render the page with all unread entries. diff --git a/ui/unread_mark_all_read.go b/ui/unread_mark_all_read.go index 2c745e49dbe5779b4eec5e41eb191c1bf568c4a8..7d47523927dd70dc13505cdf06832fc45b7c5ce9 100644 --- a/ui/unread_mark_all_read.go +++ b/ui/unread_mark_all_read.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/route" + "miniflux.app/logger" ) // MarkAllAsRead marks all unread entries as read. diff --git a/ui/user_create.go b/ui/user_create.go index 9c47c6ab9b77c1f6c4f3871b18af64f25d5b245e..6b95e34e007718d30f8a60ecd30f39470cf96253 100644 --- a/ui/user_create.go +++ b/ui/user_create.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // CreateUser shows the user creation form. diff --git a/ui/user_edit.go b/ui/user_edit.go index 953d1ef4ca5753bdc3cd65b02a6e82031d339343..20acdde7861e0b73a5a7ce429ab18e1ad5b620b1 100644 --- a/ui/user_edit.go +++ b/ui/user_edit.go @@ -2,17 +2,17 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // EditUser shows the form to edit a user. diff --git a/ui/user_list.go b/ui/user_list.go index f9ec35f802af6ee63942f199811fa3c4532e7420..57bad4e1b179137bee3217486fbc745a02d83614 100644 --- a/ui/user_list.go +++ b/ui/user_list.go @@ -2,15 +2,15 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response/html" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // ShowUsers renders the list of users. diff --git a/ui/user_remove.go b/ui/user_remove.go index 0b9113b021ed2aeece49603783fcd602d482a31c..63d2c46a3ae9e06aba106dd8833abf025a0e406a 100644 --- a/ui/user_remove.go +++ b/ui/user_remove.go @@ -2,16 +2,16 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" ) // RemoveUser deletes a user from the database. diff --git a/ui/user_save.go b/ui/user_save.go index b5638772cd83b81f581cc8bdee3ceb257dc6a696..01d70dc4d964eaf40efa28a8748bed81e6a93e48 100644 --- a/ui/user_save.go +++ b/ui/user_save.go @@ -2,19 +2,19 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // SaveUser validate and save the new user into the database. diff --git a/ui/user_update.go b/ui/user_update.go index 1b785f5552b3d25010cbb2c7f586682f5f619444..54a47a618424e30a19294147ecb7066cb73195cb 100644 --- a/ui/user_update.go +++ b/ui/user_update.go @@ -2,20 +2,20 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui +package ui // import "miniflux.app/ui" import ( "net/http" - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/http/request" - "github.com/miniflux/miniflux/http/response" - "github.com/miniflux/miniflux/http/response/html" - "github.com/miniflux/miniflux/http/route" - "github.com/miniflux/miniflux/logger" - "github.com/miniflux/miniflux/ui/form" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/view" + "miniflux.app/http/context" + "miniflux.app/http/request" + "miniflux.app/http/response" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/logger" + "miniflux.app/ui/form" + "miniflux.app/ui/session" + "miniflux.app/ui/view" ) // UpdateUser validate and update a user. diff --git a/ui/view/view.go b/ui/view/view.go index 2dafa08bbdd90b83cd716292f0cec7a291b22a51..0351756237c29c5f151cb366c92032f4388730d2 100644 --- a/ui/view/view.go +++ b/ui/view/view.go @@ -2,13 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package view +package view // import "miniflux.app/ui/view" import ( - "github.com/miniflux/miniflux/http/context" - "github.com/miniflux/miniflux/template" - "github.com/miniflux/miniflux/ui/session" - "github.com/miniflux/miniflux/ui/static" + "miniflux.app/http/context" + "miniflux.app/template" + "miniflux.app/ui/session" + "miniflux.app/ui/static" ) // View wraps template argument building. diff --git a/url/doc.go b/url/doc.go index e7ddf890d4c943e4aa1d78a6b507f8488f6faa98..9b80dd807cb16bdad87516b0496be66408bd28cf 100644 --- a/url/doc.go +++ b/url/doc.go @@ -7,4 +7,4 @@ Package url implements a set of utility functions to parse URL. */ -package url +package url // import "miniflux.app/url" diff --git a/url/url.go b/url/url.go index e5a7c62d48df935c0f7b6d1cd2c45f582092b9f4..cc35e2f0cf94ac9eb41ac9f35225cf7008d707a1 100644 --- a/url/url.go +++ b/url/url.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package url +package url // import "miniflux.app/url" import "net/url" import "fmt" diff --git a/url/url_test.go b/url/url_test.go index 12e131f343165b5cf0c0e1cb2fd1b53541315aa6..ef333f9a5b1a2e7f582c9d50ccf04da60a19c7e1 100644 --- a/url/url_test.go +++ b/url/url_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package url +package url // import "miniflux.app/url" import "testing" diff --git a/version/doc.go b/version/doc.go index fd58a6d905cba4778349f727c26500d7c22258bd..0d5942968bfe8636669a03e29c934c26754ec730 100644 --- a/version/doc.go +++ b/version/doc.go @@ -7,4 +7,4 @@ Package version contains application and build information. */ -package version +package version // import "miniflux.app/version" diff --git a/version/version.go b/version/version.go index 2b9c050d73d52c32d672afe9e2a11ad08400bf75..0a9e488401dd21112257ade102eb14219c263c28 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package version +package version // import "miniflux.app/version" // Version of the application (generated with "make build") var Version = "2.0.x-dev"