Rewrite imports

README.md

@@ -1,6 +1,6 @@
 Miniflux 2
 ==========
-[![Build Status](https://travis-ci.org/miniflux/miniflux2.svg?branch=master)](https://travis-ci.org/miniflux/miniflux2)
+[![Build Status](https://travis-ci.org/miniflux/miniflux.svg?branch=master)](https://travis-ci.org/miniflux/miniflux)
 [![Documentation Status](https://readthedocs.org/projects/miniflux/badge/?version=latest)](https://docs.miniflux.net/)
 
 Miniflux is a minimalist and opinionated feed reader:
@@ -14,7 +14,7 @@ Miniflux is a minimalist and opinionated feed reader:
 
 It's simple, fast, lightweight and super easy to install.
 
-Miniflux 2 is a rewrite of Miniflux 1.x in Golang.
+Miniflux 2 is a rewrite of [Miniflux 1.x](https://github.com/miniflux/miniflux-legacy) in Golang.
 
 Notes
 -----

errors/errors.go

@@ -7,7 +7,7 @@ package errors
 import (
 	"fmt"
 
-	"github.com/miniflux/miniflux2/locale"
+	"github.com/miniflux/miniflux/locale"
 )
 
 // LocalizedError represents an error than could be translated to another language.

http/client.go

@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
+	"github.com/miniflux/miniflux/helper"
 )
 
 const userAgent = "Miniflux <https://miniflux.net/>"

integration/instapaper/instapaper.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/miniflux/miniflux2/http"
+	"github.com/miniflux/miniflux/http"
 )
 
 // Client represents an Instapaper client.

integration/integration.go

@@ -7,9 +7,9 @@ package integration
 import (
 	"log"
 
-	"github.com/miniflux/miniflux2/integration/instapaper"
-	"github.com/miniflux/miniflux2/integration/pinboard"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/integration/instapaper"
+	"github.com/miniflux/miniflux/integration/pinboard"
+	"github.com/miniflux/miniflux/model"
 )
 
 // SendEntry send the entry to the activated providers.

integration/pinboard/pinboard.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/miniflux/miniflux2/http"
+	"github.com/miniflux/miniflux/http"
 )
 
 // Client represents a Pinboard client.

locale/translations.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-12 19:14:08.438401734 -0800 PST m=+0.020484380
+// 2017-12-12 21:44:02.672642313 -0800 PST m=+0.027053016
 
 package locale
 

main.go

@@ -25,13 +25,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/config"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/feed"
-	"github.com/miniflux/miniflux2/scheduler"
-	"github.com/miniflux/miniflux2/server"
-	"github.com/miniflux/miniflux2/storage"
-	"github.com/miniflux/miniflux2/version"
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/scheduler"
+	"github.com/miniflux/miniflux/server"
+	"github.com/miniflux/miniflux/storage"
+	"github.com/miniflux/miniflux/version"
 
 	_ "github.com/lib/pq"
 	"golang.org/x/crypto/ssh/terminal"

model/theme.go

@@ -4,7 +4,7 @@
 
 package model
 
-import "github.com/miniflux/miniflux2/errors"
+import "github.com/miniflux/miniflux/errors"
 
 // Themes returns the list of available themes.
 func Themes() map[string]string {

reader/atom/atom.go

@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/date"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/date"
 )
 
 type atomFeed struct {

reader/atom/parser.go

@@ -8,8 +8,8 @@ import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 
 	"golang.org/x/net/html/charset"
 )

reader/atom/parser_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 func TestParseAtomSample(t *testing.T) {

reader/feed/handler.go

@@ -9,13 +9,13 @@ import (
 	"log"
 	"time"
 
-	"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/icon"
-	"github.com/miniflux/miniflux2/reader/processor"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/http"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/icon"
+	"github.com/miniflux/miniflux/reader/processor"
+	"github.com/miniflux/miniflux/storage"
 )
 
 var (

reader/feed/parser.go

@@ -12,12 +12,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/atom"
-	"github.com/miniflux/miniflux2/reader/json"
-	"github.com/miniflux/miniflux2/reader/rdf"
-	"github.com/miniflux/miniflux2/reader/rss"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/atom"
+	"github.com/miniflux/miniflux/reader/json"
+	"github.com/miniflux/miniflux/reader/rdf"
+	"github.com/miniflux/miniflux/reader/rss"
 
 	"golang.org/x/net/html/charset"
 )

reader/icon/finder.go

@@ -10,10 +10,10 @@ import (
 	"io/ioutil"
 	"log"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/http"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/url"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/http"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/url"
 
 	"github.com/PuerkitoBio/goquery"
 )

reader/json/json.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/date"
-	"github.com/miniflux/miniflux2/reader/sanitizer"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/date"
+	"github.com/miniflux/miniflux/reader/sanitizer"
 )
 
 type jsonFeed struct {

reader/json/parser.go

@@ -8,8 +8,8 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 )
 
 // Parse returns a normalized feed struct from a JON feed.

reader/json/parser_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 func TestParseJsonFeed(t *testing.T) {

reader/opml/handler.go

@@ -10,8 +10,8 @@ import (
 	"io"
 	"log"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // Handler handles the logic for OPML import/export.

reader/opml/parser.go

@@ -8,7 +8,7 @@ import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 	"golang.org/x/net/html/charset"
 )
 

reader/opml/parser_test.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 func TestParseOpmlWithoutCategories(t *testing.T) {

reader/processor/processor.go

@@ -7,10 +7,10 @@ package processor
 import (
 	"log"
 
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/rewrite"
-	"github.com/miniflux/miniflux2/reader/sanitizer"
-	"github.com/miniflux/miniflux2/reader/scraper"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/rewrite"
+	"github.com/miniflux/miniflux/reader/sanitizer"
+	"github.com/miniflux/miniflux/reader/scraper"
 )
 
 // FeedProcessor handles the processing of feed contents.

reader/rdf/parser.go

@@ -8,8 +8,8 @@ import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 	"golang.org/x/net/html/charset"
 )
 

reader/rdf/parser_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 func TestParseRDFSample(t *testing.T) {

reader/rdf/rdf.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/sanitizer"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/sanitizer"
 )
 
 type rdfFeed struct {

reader/rewrite/rewriter.go

@@ -7,7 +7,7 @@ package rewrite
 import (
 	"strings"
 
-	"github.com/miniflux/miniflux2/url"
+	"github.com/miniflux/miniflux/url"
 )
 
 // Rewriter modify item contents with a set of rewriting rules.

reader/rss/parser.go

@@ -8,8 +8,8 @@ import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux2/errors"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/model"
 
 	"golang.org/x/net/html/charset"
 )

reader/rss/parser_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miniflux/miniflux2/errors"
+	"github.com/miniflux/miniflux/errors"
 )
 
 func TestParseRss2Sample(t *testing.T) {

reader/rss/rss.go

@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/date"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/date"
 )
 
 type rssFeed struct {

reader/sanitizer/sanitizer.go

@@ -10,7 +10,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/miniflux/miniflux2/url"
+	"github.com/miniflux/miniflux/url"
 
 	"golang.org/x/net/html"
 )

reader/scraper/scraper.go

@@ -11,9 +11,9 @@ import (
 	"strings"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/miniflux/miniflux2/http"
-	"github.com/miniflux/miniflux2/reader/readability"
-	"github.com/miniflux/miniflux2/url"
+	"github.com/miniflux/miniflux/http"
+	"github.com/miniflux/miniflux/reader/readability"
+	"github.com/miniflux/miniflux/url"
 )
 
 // Fetch download a web page a returns relevant contents.

reader/subscription/finder.go

@@ -11,11 +11,11 @@ import (
 	"log"
 	"time"
 
-	"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/url"
+	"github.com/miniflux/miniflux/errors"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/http"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/url"
 
 	"github.com/PuerkitoBio/goquery"
 )

scheduler/scheduler.go

@@ -8,7 +8,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/miniflux/miniflux2/storage"
+	"github.com/miniflux/miniflux/storage"
 )
 
 // NewScheduler starts a new scheduler that push jobs to a pool of workers.

scheduler/worker.go

@@ -5,13 +5,14 @@
 package scheduler
 
 import (
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/feed"
 	"log"
 	"time"
+
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/feed"
 )
 
-// A Worker refresh a feed in the background.
+// Worker refreshes a feed in the background.
 type Worker struct {
 	id          int
 	feedHandler *feed.Handler

scheduler/worker_pool.go

@@ -5,8 +5,8 @@
 package scheduler
 
 import (
-	"github.com/miniflux/miniflux2/model"
-	"github.com/miniflux/miniflux2/reader/feed"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/reader/feed"
 )
 
 // WorkerPool handle a pool of workers.

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.

sql/sql.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-12 19:14:08.420562729 -0800 PST m=+0.002645375
+// 2017-12-12 21:44:02.647917692 -0800 PST m=+0.002328395
 
 package sql
 

storage/category.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 )
 
 // AnotherCategoryExists checks if another category exists with the same title.

storage/enclosure.go

@@ -7,7 +7,7 @@ package storage
 import (
 	"fmt"
 
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/model"
 )
 
 // GetEnclosures returns all attachments for the given entry.

storage/entry.go

@@ -10,8 +10,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 
 	"github.com/lib/pq"
 )

storage/entry_query_builder.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/lib/pq"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 )
 
 // EntryQueryBuilder builds a SQL query to fetch entries.

storage/feed.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 )
 
 // FeedExists checks if the given feed exists.

storage/icon.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 )
 
 // HasIcon checks if the given feed has an icon.

storage/integration.go

@@ -8,7 +8,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/model"
 )
 
 // UserByFeverToken returns a user by using the Fever API token.

storage/job.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 )
 
 const maxParsingError = 3

storage/migration.go

@@ -9,7 +9,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/miniflux/miniflux2/sql"
+	"github.com/miniflux/miniflux/sql"
 )
 
 const schemaVersion = 8

storage/session.go

@@ -8,8 +8,8 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/miniflux/miniflux2/helper"
-	"github.com/miniflux/miniflux2/model"
+	"github.com/miniflux/miniflux/helper"
+	"github.com/miniflux/miniflux/model"
 )
 
 // Sessions returns the list of sessions for the given user.