diff --git a/reader/http/client.go b/http/client.go similarity index 100% rename from reader/http/client.go rename to http/client.go diff --git a/reader/http/response.go b/http/response.go similarity index 100% rename from reader/http/response.go rename to http/response.go diff --git a/reader/http/response_test.go b/http/response_test.go similarity index 100% rename from reader/http/response_test.go rename to http/response_test.go diff --git a/integration/pinboard/pinboard.go b/integration/pinboard/pinboard.go index 41794836..d9654589 100644 --- a/integration/pinboard/pinboard.go +++ b/integration/pinboard/pinboard.go @@ -8,7 +8,7 @@ import ( "fmt" "net/url" - "github.com/miniflux/miniflux2/reader/http" + "github.com/miniflux/miniflux2/http" ) // Client represents a Pinboard token. diff --git a/integration_test.go b/integration_test.go index 1acffa83..f422534c 100644 --- a/integration_test.go +++ b/integration_test.go @@ -854,7 +854,7 @@ func TestGetAllEntries(t *testing.T) { t.Fatal(`We should have 0 read entries`) } - resultWithDifferentSorting, err := client.Entries(&miniflux.Filter{Order: "published_at", Direction: "asc"}) + resultWithDifferentSorting, err := client.Entries(&miniflux.Filter{Order: "published_at", Direction: "desc"}) if err != nil { t.Fatal(err) } diff --git a/reader/feed/handler.go b/reader/feed/handler.go index f406c139..e978deb1 100644 --- a/reader/feed/handler.go +++ b/reader/feed/handler.go @@ -11,8 +11,8 @@ import ( "github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux2/helper" + "github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/http" "github.com/miniflux/miniflux2/reader/icon" "github.com/miniflux/miniflux2/storage" ) diff --git a/reader/icon/finder.go b/reader/icon/finder.go index c55e4d1c..c5f9a07b 100644 --- a/reader/icon/finder.go +++ b/reader/icon/finder.go @@ -11,9 +11,9 @@ import ( "log" "github.com/miniflux/miniflux2/helper" + "github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/http" - "github.com/miniflux/miniflux2/reader/url" + "github.com/miniflux/miniflux2/url" "github.com/PuerkitoBio/goquery" ) diff --git a/reader/sanitizer/sanitizer.go b/reader/sanitizer/sanitizer.go index 1c1c7c17..49fb1cb2 100644 --- a/reader/sanitizer/sanitizer.go +++ b/reader/sanitizer/sanitizer.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "github.com/miniflux/miniflux2/reader/url" + "github.com/miniflux/miniflux2/url" "golang.org/x/net/html" ) diff --git a/reader/subscription/finder.go b/reader/subscription/finder.go index 506fe1a8..239baf7e 100644 --- a/reader/subscription/finder.go +++ b/reader/subscription/finder.go @@ -13,9 +13,9 @@ import ( "github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux2/helper" + "github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux2/reader/feed" - "github.com/miniflux/miniflux2/reader/http" - "github.com/miniflux/miniflux2/reader/url" + "github.com/miniflux/miniflux2/url" "github.com/PuerkitoBio/goquery" ) diff --git a/server/template/template.go b/server/template/template.go index cfb2c55f..78b21cc1 100644 --- a/server/template/template.go +++ b/server/template/template.go @@ -16,10 +16,10 @@ import ( "github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux2/locale" - "github.com/miniflux/miniflux2/reader/url" "github.com/miniflux/miniflux2/server/route" "github.com/miniflux/miniflux2/server/template/helper" "github.com/miniflux/miniflux2/server/ui/filter" + "github.com/miniflux/miniflux2/url" "github.com/gorilla/mux" ) diff --git a/server/ui/controller/proxy.go b/server/ui/controller/proxy.go index fdbdb4e8..fca3c0f3 100644 --- a/server/ui/controller/proxy.go +++ b/server/ui/controller/proxy.go @@ -12,7 +12,7 @@ import ( "time" "github.com/miniflux/miniflux2/helper" - "github.com/miniflux/miniflux2/reader/http" + "github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux2/server/core" ) diff --git a/server/ui/filter/image_proxy_filter.go b/server/ui/filter/image_proxy_filter.go index d68def33..08f0300a 100644 --- a/server/ui/filter/image_proxy_filter.go +++ b/server/ui/filter/image_proxy_filter.go @@ -8,8 +8,8 @@ import ( "encoding/base64" "strings" - "github.com/miniflux/miniflux2/reader/url" "github.com/miniflux/miniflux2/server/route" + "github.com/miniflux/miniflux2/url" "github.com/PuerkitoBio/goquery" "github.com/gorilla/mux" diff --git a/reader/url/url.go b/url/url.go similarity index 100% rename from reader/url/url.go rename to url/url.go diff --git a/reader/url/url_test.go b/url/url_test.go similarity index 100% rename from reader/url/url_test.go rename to url/url_test.go