Rewrite imports

server/api/controller/category.go

@@ -7,8 +7,8 @@ package api
 import (
 	"errors"
 
-	"github.com/miniflux/miniflux2/server/api/payload"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/server/api/payload"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // CreateCategory is the API handler to create a new category.

server/api/controller/controller.go

@@ -5,8 +5,8 @@
 package api
 
 import (
-	"github.com/miniflux/miniflux2/reader/feed"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // Controller holds all handlers for the API.

server/api/controller/entry.go

@@ -7,9 +7,9 @@ package api
 import (
 	"errors"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/api/payload"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/api/payload"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // GetEntry is the API handler to get a single feed entry.

server/api/controller/feed.go

@@ -7,8 +7,8 @@ package api
 import (
 	"errors"
 
-	"github.com/miniflux/miniflux2/server/api/payload"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/server/api/payload"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // CreateFeed is the API handler to create a new feed.

server/api/controller/subscription.go

@@ -7,9 +7,10 @@ package api
 import (
 	"errors"
 	"fmt"
-	"github.com/miniflux/miniflux2/reader/subscription"
-	"github.com/miniflux/miniflux2/server/api/payload"
-	"github.com/miniflux/miniflux2/server/core"
+
+	"github.com/miniflux/miniflux/reader/subscription"
+	"github.com/miniflux/miniflux/server/api/payload"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // GetSubscriptions is the API handler to find subscriptions.

server/api/controller/user.go

@@ -7,8 +7,8 @@ package api
 import (
 	"errors"
 
-	"github.com/miniflux/miniflux2/server/api/payload"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/server/api/payload"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // CreateUser is the API handler to create a new user.

server/api/payload/payload.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/model"
 )
 
 // EntriesResponse represents the response sent when fetching entries.

server/core/context.go

@@ -8,10 +8,10 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/middleware"
-	"github.com/miniflux/miniflux2/server/route"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/middleware"
+	"github.com/miniflux/miniflux/server/route"
+	"github.com/miniflux/miniflux/storage"
 
 	"github.com/gorilla/mux"
 )

server/core/handler.go

@@ -9,11 +9,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/locale"
-	"github.com/miniflux/miniflux2/server/middleware"
-	"github.com/miniflux/miniflux2/server/template"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/locale"
+	"github.com/miniflux/miniflux/server/middleware"
+	"github.com/miniflux/miniflux/server/template"
+	"github.com/miniflux/miniflux/storage"
 
 	"github.com/gorilla/mux"
 )

server/core/html_response.go

@@ -8,7 +8,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/server/template"
+	"github.com/miniflux/miniflux/server/template"
 )
 
 // HTMLResponse handles HTML responses.

server/core/response.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/miniflux/miniflux2/server/template"
+	"github.com/miniflux/miniflux/server/template"
 )
 
 // Response handles HTTP responses.

server/fever/fever.go

@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/integration"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/integration"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/storage"
 )
 
 type baseResponse struct {

server/middleware/basic_auth.go

@@ -9,7 +9,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // BasicAuthMiddleware is the middleware for HTTP Basic authentication.

server/middleware/fever.go

@@ -9,7 +9,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // FeverMiddleware is the middleware that handles Fever API.

server/middleware/session.go

@@ -9,9 +9,9 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/route"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/route"
+	"github.com/miniflux/miniflux/storage"
 
 	"github.com/gorilla/mux"
 )

server/middleware/token.go

@@ -9,8 +9,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // TokenMiddleware represents a token middleware.

server/routes.go

@@ -7,19 +7,19 @@ package server
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux2/scheduler"
+	"github.com/miniflux/miniflux/scheduler"
 
-	"github.com/miniflux/miniflux2/config"
-	"github.com/miniflux/miniflux2/locale"
-	"github.com/miniflux/miniflux2/reader/feed"
-	"github.com/miniflux/miniflux2/reader/opml"
-	api_controller "github.com/miniflux/miniflux2/server/api/controller"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/fever"
-	"github.com/miniflux/miniflux2/server/middleware"
-	"github.com/miniflux/miniflux2/server/template"
-	ui_controller "github.com/miniflux/miniflux2/server/ui/controller"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/locale"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/reader/opml"
+	api_controller "github.com/miniflux/miniflux/server/api/controller"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/fever"
+	"github.com/miniflux/miniflux/server/middleware"
+	"github.com/miniflux/miniflux/server/template"
+	ui_controller "github.com/miniflux/miniflux/server/ui/controller"
+	"github.com/miniflux/miniflux/storage"
 
 	"github.com/gorilla/mux"
 )

server/server.go

@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/miniflux/miniflux2/scheduler"
+	"github.com/miniflux/miniflux/scheduler"
 	"golang.org/x/crypto/acme/autocert"
 
-	"github.com/miniflux/miniflux2/config"
-	"github.com/miniflux/miniflux2/reader/feed"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // NewServer returns a new HTTP server.

server/static/bin.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-11 22:04:47.832384663 -0800 PST m=+0.014706233
+// 2017-12-12 21:44:02.652999925 -0800 PST m=+0.007410628
 
 package static
 

server/static/css.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-11 22:04:47.835872498 -0800 PST m=+0.018194068
+// 2017-12-12 21:44:02.654843418 -0800 PST m=+0.009254121
 
 package static
 

server/static/js.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-11 22:04:47.840119593 -0800 PST m=+0.022441163
+// 2017-12-12 21:44:02.656535482 -0800 PST m=+0.010946185
 
 package static
 

server/template/common.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-12 19:14:08.437349475 -0800 PST m=+0.019432121
+// 2017-12-12 21:44:02.670455816 -0800 PST m=+0.024866519
 
 package template
 

server/template/helper/elapsed.go

@@ -5,9 +5,10 @@
 package helper
 
 import (
-	"github.com/miniflux/miniflux2/locale"
 	"math"
 	"time"
+
+	"github.com/miniflux/miniflux/locale"
 )
 
 // Texts to be translated if necessary.

server/template/helper/elapsed_test.go

@@ -6,9 +6,10 @@ package helper
 
 import (
 	"fmt"
-	"github.com/miniflux/miniflux2/locale"
 	"testing"
 	"time"
+
+	"github.com/miniflux/miniflux/locale"
 )
 
 func TestElapsedTime(t *testing.T) {

server/template/template.go

@@ -13,13 +13,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/config"
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/locale"
-	"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/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/locale"
+	"github.com/miniflux/miniflux/server/route"
+	"github.com/miniflux/miniflux/server/template/helper"
+	"github.com/miniflux/miniflux/server/ui/filter"
+	"github.com/miniflux/miniflux/url"
 
 	"github.com/gorilla/mux"
 )

server/template/views.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-12 19:14:08.427613446 -0800 PST m=+0.009696092
+// 2017-12-12 21:44:02.658745181 -0800 PST m=+0.013155884
 
 package template
 

server/ui/controller/about.go

@@ -5,8 +5,8 @@
 package controller
 
 import (
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/version"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/version"
 )
 
 // AboutPage shows the about page.

server/ui/controller/category.go

@@ -8,9 +8,9 @@ import (
 	"errors"
 	"log"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 )
 
 // ShowCategories shows the page with all categories.

server/ui/controller/controller.go

@@ -5,13 +5,13 @@
 package controller
 
 import (
-	"github.com/miniflux/miniflux2/config"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/feed"
-	"github.com/miniflux/miniflux2/reader/opml"
-	"github.com/miniflux/miniflux2/scheduler"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/reader/opml"
+	"github.com/miniflux/miniflux/scheduler"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/storage"
 )
 
 type tplParams map[string]interface{}

server/ui/controller/entry.go

@@ -8,14 +8,14 @@ import (
 	"errors"
 	"log"
 
-	"github.com/miniflux/miniflux2/reader/sanitizer"
+	"github.com/miniflux/miniflux/reader/sanitizer"
 
-	"github.com/miniflux/miniflux2/integration"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/scraper"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/payload"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/integration"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/scraper"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/payload"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // FetchContent downloads the original HTML page and returns relevant contents.

server/ui/controller/feed.go

@@ -8,9 +8,9 @@ import (
 	"errors"
 	"log"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 )
 
 // RefreshAllFeeds refresh all feeds in the background.

server/ui/controller/history.go

@@ -5,8 +5,8 @@
 package controller
 
 import (
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // ShowHistoryPage renders the page with all read entries.

server/ui/controller/icon.go

@@ -7,7 +7,7 @@ package controller
 import (
 	"time"
 
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // ShowIcon shows the feed icon.

server/ui/controller/integrations.go

@@ -8,8 +8,8 @@ import (
 	"crypto/md5"
 	"fmt"
 
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 )
 
 // ShowIntegrations renders the page with all external integrations.

server/ui/controller/login.go

@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 
 	"github.com/tomasen/realip"
 )

server/ui/controller/oauth2.go

@@ -8,10 +8,10 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/miniflux/miniflux2/config"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/oauth2"
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/oauth2"
 	"github.com/tomasen/realip"
 )
 

server/ui/controller/opml.go

@@ -7,7 +7,7 @@ package controller
 import (
 	"log"
 
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // Export generates the OPML file.

server/ui/controller/proxy.go

@@ -11,9 +11,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/http"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/http"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // ImageProxy fetch an image from a remote server and sent it back to the browser.

server/ui/controller/session.go

@@ -7,7 +7,7 @@ package controller
 import (
 	"log"
 
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // ShowSessions shows the list of active sessions.

server/ui/controller/settings.go

@@ -7,10 +7,10 @@ package controller
 import (
 	"log"
 
-	"github.com/miniflux/miniflux2/locale"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/locale"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 )
 
 // ShowSettings shows the settings page.

server/ui/controller/static.go

@@ -9,8 +9,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/static"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/static"
 )
 
 // Stylesheet renders the CSS.

server/ui/controller/subscription.go

@@ -7,10 +7,10 @@ package controller
 import (
 	"log"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/subscription"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/subscription"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 )
 
 // Bookmarklet prefill the form to add a subscription from the URL provided by the bookmarklet.

server/ui/controller/unread.go

@@ -5,8 +5,8 @@
 package controller
 
 import (
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
 )
 
 // ShowUnreadPage render the page with all unread entries.

server/ui/controller/user.go

@@ -8,9 +8,9 @@ import (
 	"errors"
 	"log"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/server/core"
-	"github.com/miniflux/miniflux2/server/ui/form"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+	"github.com/miniflux/miniflux/server/ui/form"
 )
 
 // ShowUsers shows the list of users.

server/ui/filter/image_proxy_filter.go

@@ -8,8 +8,8 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"github.com/miniflux/miniflux2/server/route"
-	"github.com/miniflux/miniflux2/url"
+	"github.com/miniflux/miniflux/server/route"
+	"github.com/miniflux/miniflux/url"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/gorilla/mux"

server/ui/form/auth.go

@@ -7,7 +7,7 @@ package form
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 // AuthForm represents the authentication form.

server/ui/form/category.go

@@ -7,8 +7,8 @@ package form
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 )
 
 // CategoryForm represents a feed form in the UI

server/ui/form/feed.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 )
 
 // FeedForm represents a feed form in the UI

server/ui/form/integration.go

@@ -7,7 +7,7 @@ package form
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/model"
 )
 
 // IntegrationForm represents user integration settings form.

server/ui/form/settings.go

@@ -7,8 +7,8 @@ package form
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 )
 
 // SettingsForm represents the settings form.

server/ui/form/subscription.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 // SubscriptionForm represents the subscription form.

server/ui/form/user.go

@@ -7,8 +7,8 @@ package form
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 )
 
 // UserForm represents the user form.

server/ui/payload/payload.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/model"
 )
 
 // DecodeEntryStatusPayload unserialize JSON request to update entry statuses.