diff options
103 files changed, 247 insertions, 243 deletions
@@ -1,6 +1,6 @@ Miniflux 2 ========== -[](https://travis-ci.org/miniflux/miniflux2) +[](https://travis-ci.org/miniflux/miniflux) [](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 ----- diff --git a/errors/errors.go b/errors/errors.go index a99a3ab..71805ad 100644 --- a/errors/errors.go +++ b/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. diff --git a/http/client.go b/http/client.go index 3b4488f..602cdbd 100644 --- a/http/client.go +++ b/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/>" diff --git a/integration/instapaper/instapaper.go b/integration/instapaper/instapaper.go index c484573..51c5e05 100644 --- a/integration/instapaper/instapaper.go +++ b/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. diff --git a/integration/integration.go b/integration/integration.go index 074ce6d..0001235 100644 --- a/integration/integration.go +++ b/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. diff --git a/integration/pinboard/pinboard.go b/integration/pinboard/pinboard.go index 7e33065..2e1bbd7 100644 --- a/integration/pinboard/pinboard.go +++ b/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. diff --git a/locale/translations.go b/locale/translations.go index a01a618..b2a920f 100644 --- a/locale/translations.go +++ b/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 @@ -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" diff --git a/miniflux-test b/miniflux-test Binary files differdeleted file mode 100755 index 4f5d541..0000000 --- a/miniflux-test +++ /dev/null diff --git a/model/theme.go b/model/theme.go index 85307ce..6b87ec8 100644 --- a/model/theme.go +++ b/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 { diff --git a/reader/atom/atom.go b/reader/atom/atom.go index b62f42a..f72a150 100644 --- a/reader/atom/atom.go +++ b/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 { diff --git a/reader/atom/parser.go b/reader/atom/parser.go index 04bfd04..8e83bc9 100644 --- a/reader/atom/parser.go +++ b/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" ) diff --git a/reader/atom/parser_test.go b/reader/atom/parser_test.go index d5eea23..66ca0f0 100644 --- a/reader/atom/parser_test.go +++ b/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) { diff --git a/reader/feed/handler.go b/reader/feed/handler.go index 6b94627..5926bbc 100644 --- a/reader/feed/handler.go +++ b/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 ( diff --git a/reader/feed/parser.go b/reader/feed/parser.go index a28cf2d..5f87708 100644 --- a/reader/feed/parser.go +++ b/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" ) diff --git a/reader/icon/finder.go b/reader/icon/finder.go index c5f9a07..2a5beb5 100644 --- a/reader/icon/finder.go +++ b/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" ) diff --git a/reader/json/json.go b/reader/json/json.go index da6df24..5924916 100644 --- a/reader/json/json.go +++ b/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 { diff --git a/reader/json/parser.go b/reader/json/parser.go index 18329e7..52b4809 100644 --- a/reader/json/parser.go +++ b/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. diff --git a/reader/json/parser_test.go b/reader/json/parser_test.go index 60d7707..e6fa9ed 100644 --- a/reader/json/parser_test.go +++ b/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) { diff --git a/reader/opml/handler.go b/reader/opml/handler.go index 9d5fb0f..192e04a 100644 --- a/reader/opml/handler.go +++ b/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. diff --git a/reader/opml/parser.go b/reader/opml/parser.go index 1b2e1e7..8d61aa8 100644 --- a/reader/opml/parser.go +++ b/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" ) diff --git a/reader/opml/parser_test.go b/reader/opml/parser_test.go index 8d56df5..12c8048 100644 --- a/reader/opml/parser_test.go +++ b/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) { diff --git a/reader/processor/processor.go b/reader/processor/processor.go index 7cc5cb1..3cdefb0 100644 --- a/reader/processor/processor.go +++ b/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. diff --git a/reader/rdf/parser.go b/reader/rdf/parser.go index f854a97..7bd3092 100644 --- a/reader/rdf/parser.go +++ b/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" ) diff --git a/reader/rdf/parser_test.go b/reader/rdf/parser_test.go index bad3ed7..6447bf2 100644 --- a/reader/rdf/parser_test.go +++ b/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) { diff --git a/reader/rdf/rdf.go b/reader/rdf/rdf.go index c97085f..ad4d53a 100644 --- a/reader/rdf/rdf.go +++ b/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 { diff --git a/reader/rewrite/rewriter.go b/reader/rewrite/rewriter.go index 0fcd166..d4d5096 100644 --- a/reader/rewrite/rewriter.go +++ b/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. diff --git a/reader/rss/parser.go b/reader/rss/parser.go index a5b4434..0e9738a 100644 --- a/reader/rss/parser.go +++ b/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" ) diff --git a/reader/rss/parser_test.go b/reader/rss/parser_test.go index 3abdd17..982d4f0 100644 --- a/reader/rss/parser_test.go +++ b/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) { diff --git a/reader/rss/rss.go b/reader/rss/rss.go index e5800b6..b80692c 100644 --- a/reader/rss/rss.go +++ b/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 { diff --git a/reader/sanitizer/sanitizer.go b/reader/sanitizer/sanitizer.go index 49fb1cb..16f1624 100644 --- a/reader/sanitizer/sanitizer.go +++ b/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" ) diff --git a/reader/scraper/scraper.go b/reader/scraper/scraper.go index e799ad0..8f5ff15 100644 --- a/reader/scraper/scraper.go +++ b/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. diff --git a/reader/subscription/finder.go b/reader/subscription/finder.go index 239baf7..2935b93 100644 --- a/reader/subscription/finder.go +++ b/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" ) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index acfb401..a1f1778 100644 --- a/scheduler/scheduler.go +++ b/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. diff --git a/scheduler/worker.go b/scheduler/worker.go index 39382a3..be130ca 100644 --- a/scheduler/worker.go +++ b/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 diff --git a/scheduler/worker_pool.go b/scheduler/worker_pool.go index c4a8372..1b9f086 100644 --- a/scheduler/worker_pool.go +++ b/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. diff --git a/server/api/controller/category.go b/server/api/controller/category.go index 5cf88bd..13a7438 100644 --- a/server/api/controller/category.go +++ b/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. diff --git a/server/api/controller/controller.go b/server/api/controller/controller.go index 629d71a..c9798e3 100644 --- a/server/api/controller/controller.go +++ b/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. diff --git a/server/api/controller/entry.go b/server/api/controller/entry.go index b09cc8c..6d6ab7e 100644 --- a/server/api/controller/entry.go +++ b/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. diff --git a/server/api/controller/feed.go b/server/api/controller/feed.go index 6016e57..f0212c9 100644 --- a/server/api/controller/feed.go +++ b/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. diff --git a/server/api/controller/subscription.go b/server/api/controller/subscription.go index b3d6272..aa2a26f 100644 --- a/server/api/controller/subscription.go +++ b/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. diff --git a/server/api/controller/user.go b/server/api/controller/user.go index fcf24b6..8ca7fd2 100644 --- a/server/api/controller/user.go +++ b/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. diff --git a/server/api/payload/payload.go b/server/api/payload/payload.go index 310ba05..cb382a1 100644 --- a/server/api/payload/payload.go +++ b/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. diff --git a/server/core/context.go b/server/core/context.go index 393060d..0f064fe 100644 --- a/server/core/context.go +++ b/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" ) diff --git a/server/core/handler.go b/server/core/handler.go index db6204a..809282e 100644 --- a/server/core/handler.go +++ b/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" ) diff --git a/server/core/html_response.go b/server/core/html_response.go index 52b5145..1b29ee8 100644 --- a/server/core/html_response.go +++ b/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. diff --git a/server/core/response.go b/server/core/response.go index 70050a1..9fb4367 100644 --- a/server/core/response.go +++ b/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. diff --git a/server/fever/fever.go b/server/fever/fever.go index a54562e..b84813f 100644 --- a/server/fever/fever.go +++ b/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 { diff --git a/server/middleware/basic_auth.go b/server/middleware/basic_auth.go index 3ad5318..887acc0 100644 --- a/server/middleware/basic_auth.go +++ b/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. diff --git a/server/middleware/fever.go b/server/middleware/fever.go index d864390..7334d3d 100644 --- a/server/middleware/fever.go +++ b/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. diff --git a/server/middleware/session.go b/server/middleware/session.go index e857c1f..2ef7151 100644 --- a/server/middleware/session.go +++ b/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" ) diff --git a/server/middleware/token.go b/server/middleware/token.go index e250633..5b24606 100644 --- a/server/middleware/token.go +++ b/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. diff --git a/server/routes.go b/server/routes.go index 2549e0f..7a2fdd9 100644 --- a/server/routes.go +++ b/server/routes.go @@ -7,19 +7,19 @@ package server import ( "net/http" - "github.com/miniflux/miniflux2/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/scheduler" + + "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" ) diff --git a/server/server.go b/server/server.go index 0f2533d..7072fdc 100644 --- a/server/server.go +++ b/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. diff --git a/server/static/bin.go b/server/static/bin.go index adf4461..fa5dd4e 100644 --- a/server/static/bin.go +++ b/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 diff --git a/server/static/css.go b/server/static/css.go index 91db7b9..8c19d78 100644 --- a/server/static/css.go +++ b/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 diff --git a/server/static/js.go b/server/static/js.go index e77a8aa..4f21d2f 100644 --- a/server/static/js.go +++ b/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 diff --git a/server/template/common.go b/server/template/common.go index 1a2b948..8380d82 100644 --- a/server/template/common.go +++ b/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 diff --git a/server/template/helper/elapsed.go b/server/template/helper/elapsed.go index bc31206..df6fcdd 100644 --- a/server/template/helper/elapsed.go +++ b/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. diff --git a/server/template/helper/elapsed_test.go b/server/template/helper/elapsed_test.go index 67b8d6b..d65f84f 100644 --- a/server/template/helper/elapsed_test.go +++ b/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) { diff --git a/server/template/template.go b/server/template/template.go index 78b21cc..aa40aad 100644 --- a/server/template/template.go +++ b/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" ) diff --git a/server/template/views.go b/server/template/views.go index 6206552..cb85c83 100644 --- a/server/template/views.go +++ b/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 diff --git a/server/ui/controller/about.go b/server/ui/controller/about.go index 0b1e4e4..d6bfc27 100644 --- a/server/ui/controller/about.go +++ b/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. diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go index 75b7f90..747fca3 100644 --- a/server/ui/controller/category.go +++ b/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. diff --git a/server/ui/controller/controller.go b/server/ui/controller/controller.go index a8f5218..cfecf42 100644 --- a/server/ui/controller/controller.go +++ b/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{} diff --git a/server/ui/controller/entry.go b/server/ui/controller/entry.go index bfbfa70..0873dc7 100644 --- a/server/ui/controller/entry.go +++ b/server/ui/controller/entry.go @@ -8,14 +8,14 @@ import ( "errors" "log" - "github.com/miniflux/miniflux2/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/reader/sanitizer" + + "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. diff --git a/server/ui/controller/feed.go b/server/ui/controller/feed.go index c20c121..3bb7131 100644 --- a/server/ui/controller/feed.go +++ b/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. diff --git a/server/ui/controller/history.go b/server/ui/controller/history.go index 1052517..cadc65e 100644 --- a/server/ui/controller/history.go +++ b/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. diff --git a/server/ui/controller/icon.go b/server/ui/controller/icon.go index 4f9f247..f5ff1db 100644 --- a/server/ui/controller/icon.go +++ b/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. diff --git a/server/ui/controller/integrations.go b/server/ui/controller/integrations.go index 2035817..babcfb7 100644 --- a/server/ui/controller/integrations.go +++ b/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. diff --git a/server/ui/controller/login.go b/server/ui/controller/login.go index 2571f6e..d4f0f9c 100644 --- a/server/ui/controller/login.go +++ b/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" ) diff --git a/server/ui/controller/oauth2.go b/server/ui/controller/oauth2.go index 2ed928c..fdac30d 100644 --- a/server/ui/controller/oauth2.go +++ b/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" ) diff --git a/server/ui/controller/opml.go b/server/ui/controller/opml.go index ebde622..cf0e685 100644 --- a/server/ui/controller/opml.go +++ b/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. diff --git a/server/ui/controller/proxy.go b/server/ui/controller/proxy.go index fca3c0f..6c85bc2 100644 --- a/server/ui/controller/proxy.go +++ b/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. diff --git a/server/ui/controller/session.go b/server/ui/controller/session.go index ee0c75a..447e47a 100644 --- a/server/ui/controller/session.go +++ b/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. diff --git a/server/ui/controller/settings.go b/server/ui/controller/settings.go index a951e5d..7011378 100644 --- a/server/ui/controller/settings.go +++ b/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. diff --git a/server/ui/controller/static.go b/server/ui/controller/static.go index ae46815..2113808 100644 --- a/server/ui/controller/static.go +++ b/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. diff --git a/server/ui/controller/subscription.go b/server/ui/controller/subscription.go index 754ec42..362856a 100644 --- a/server/ui/controller/subscription.go +++ b/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. diff --git a/server/ui/controller/unread.go b/server/ui/controller/unread.go index 2c6be4b..87faafc 100644 --- a/server/ui/controller/unread.go +++ b/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. diff --git a/server/ui/controller/user.go b/server/ui/controller/user.go index 0d1fbb2..8401958 100644 --- a/server/ui/controller/user.go +++ b/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. diff --git a/server/ui/filter/image_proxy_filter.go b/server/ui/filter/image_proxy_filter.go index 08f0300..1b200a4 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/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" diff --git a/server/ui/form/auth.go b/server/ui/form/auth.go index 6849339..c18a0be 100644 --- a/server/ui/form/auth.go +++ b/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. diff --git a/server/ui/form/category.go b/server/ui/form/category.go index f977b7a..31b7196 100644 --- a/server/ui/form/category.go +++ b/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 diff --git a/server/ui/form/feed.go b/server/ui/form/feed.go index 5d52d87..896a6d7 100644 --- a/server/ui/form/feed.go +++ b/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 diff --git a/server/ui/form/integration.go b/server/ui/form/integration.go index bd32403..209b842 100644 --- a/server/ui/form/integration.go +++ b/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. diff --git a/server/ui/form/settings.go b/server/ui/form/settings.go index 2ebaa6d..e5f6939 100644 --- a/server/ui/form/settings.go +++ b/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. diff --git a/server/ui/form/subscription.go b/server/ui/form/subscription.go index 6385b18..7d2caaf 100644 --- a/server/ui/form/subscription.go +++ b/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. diff --git a/server/ui/form/user.go b/server/ui/form/user.go index 5319cb8..8b8346e 100644 --- a/server/ui/form/user.go +++ b/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. diff --git a/server/ui/payload/payload.go b/server/ui/payload/payload.go index 7312fb2..d91e34a 100644 --- a/server/ui/payload/payload.go +++ b/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. @@ -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 diff --git a/storage/category.go b/storage/category.go index 5591a89..a9de759 100644 --- a/storage/category.go +++ b/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. diff --git a/storage/enclosure.go b/storage/enclosure.go index 7b0acfd..5ae0a43 100644 --- a/storage/enclosure.go +++ b/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. diff --git a/storage/entry.go b/storage/entry.go index 151bf49..a75d41c 100644 --- a/storage/entry.go +++ b/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" ) diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go index 0d632bc..57e708c 100644 --- a/storage/entry_query_builder.go +++ b/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. diff --git a/storage/feed.go b/storage/feed.go index 2ea20bc..602bec7 100644 --- a/storage/feed.go +++ b/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. diff --git a/storage/icon.go b/storage/icon.go index 48b5f46..1f38938 100644 --- a/storage/icon.go +++ b/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. diff --git a/storage/integration.go b/storage/integration.go index 1c461b9..886e02f 100644 --- a/storage/integration.go +++ b/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. diff --git a/storage/job.go b/storage/job.go index c9ab64c..b66ae3b 100644 --- a/storage/job.go +++ b/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 diff --git a/storage/migration.go b/storage/migration.go index f60e8ac..c7d9851 100644 --- a/storage/migration.go +++ b/storage/migration.go @@ -9,7 +9,7 @@ import ( "log" "strconv" - "github.com/miniflux/miniflux2/sql" + "github.com/miniflux/miniflux/sql" ) const schemaVersion = 8 diff --git a/storage/session.go b/storage/session.go index 719fcff..dbf2dc3 100644 --- a/storage/session.go +++ b/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. diff --git a/storage/timezone.go b/storage/timezone.go index 257f44f..72dbb1d 100644 --- a/storage/timezone.go +++ b/storage/timezone.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/miniflux/miniflux2/helper" + "github.com/miniflux/miniflux/helper" ) // Timezones returns all timezones supported by the database. diff --git a/storage/token.go b/storage/token.go index dd14704..c5a614a 100644 --- a/storage/token.go +++ b/storage/token.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" ) // CreateToken creates a new token. diff --git a/storage/user.go b/storage/user.go index 689ed74..5fe04cd 100644 --- a/storage/user.go +++ b/storage/user.go @@ -14,8 +14,8 @@ import ( "github.com/lib/pq/hstore" - "github.com/miniflux/miniflux2/helper" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/helper" + "github.com/miniflux/miniflux/model" "golang.org/x/crypto/bcrypt" ) |