Move packages http and url

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.

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)
 	}

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

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

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

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

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

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

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"