Use canonical imports

reader/atom/atom.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package atom
+package atom // import "miniflux.app/reader/atom"
 
 import (
 	"encoding/xml"
@@ -10,12 +10,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/crypto"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/date"
-	"github.com/miniflux/miniflux/reader/sanitizer"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/crypto"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/date"
+	"miniflux.app/reader/sanitizer"
+	"miniflux.app/url"
 )
 
 type atomFeed struct {

reader/atom/parser.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package atom
+package atom // import "miniflux.app/reader/atom"
 
 import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/encoding"
+	"miniflux.app/errors"
+	"miniflux.app/model"
+	"miniflux.app/reader/encoding"
 )
 
 // Parse returns a normalized feed struct from a Atom feed.

reader/atom/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package atom
+package atom // import "miniflux.app/reader/atom"
 
 import (
 	"bytes"

reader/date/parser.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package date
+package date // import "miniflux.app/reader/date"
 
 import (
 	"errors"

reader/date/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package date
+package date // import "miniflux.app/reader/date"
 
 import "testing"
 

reader/doc.go

@@ -7,4 +7,4 @@
 Package reader implements everything related to feed parsing.
 
 */
-package reader
+package reader // import "miniflux.app/reader"

reader/encoding/doc.go

@@ -7,4 +7,4 @@
 Package encoding handles workarounds to deal with encoding edge cases found into the wild.
 
 */
-package encoding
+package encoding // import "miniflux.app/reader/encoding"

reader/encoding/encoding.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package encoding
+package encoding // import "miniflux.app/reader/encoding"
 
 import (
 	"bytes"

reader/feed/handler.go

@@ -2,21 +2,21 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package feed
+package feed // import "miniflux.app/reader/feed"
 
 import (
 	"fmt"
 	"time"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/http/client"
-	"github.com/miniflux/miniflux/locale"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/icon"
-	"github.com/miniflux/miniflux/reader/processor"
-	"github.com/miniflux/miniflux/storage"
-	"github.com/miniflux/miniflux/timer"
+	"miniflux.app/errors"
+	"miniflux.app/http/client"
+	"miniflux.app/locale"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/icon"
+	"miniflux.app/reader/processor"
+	"miniflux.app/storage"
+	"miniflux.app/timer"
 )
 
 var (

reader/feed/parser.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package feed
+package feed // import "miniflux.app/reader/feed"
 
 import (
 	"bytes"
@@ -11,15 +11,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/atom"
-	"github.com/miniflux/miniflux/reader/encoding"
-	"github.com/miniflux/miniflux/reader/json"
-	"github.com/miniflux/miniflux/reader/rdf"
-	"github.com/miniflux/miniflux/reader/rss"
-	"github.com/miniflux/miniflux/timer"
+	"miniflux.app/errors"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/atom"
+	"miniflux.app/reader/encoding"
+	"miniflux.app/reader/json"
+	"miniflux.app/reader/rdf"
+	"miniflux.app/reader/rss"
+	"miniflux.app/timer"
 )
 
 // List of feed formats.

reader/feed/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package feed
+package feed // import "miniflux.app/reader/feed"
 
 import (
 	"bytes"

reader/icon/finder.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package icon
+package icon // import "miniflux.app/reader/icon"
 
 import (
 	"encoding/base64"
@@ -11,11 +11,11 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/miniflux/miniflux/crypto"
-	"github.com/miniflux/miniflux/http/client"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/crypto"
+	"miniflux.app/http/client"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/url"
 
 	"github.com/PuerkitoBio/goquery"
 )

reader/icon/finder_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package icon
+package icon // import "miniflux.app/reader/icon"
 
 import "testing"
 

reader/json/json.go

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package json
+package json // import "miniflux.app/reader/json"
 
 import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/crypto"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/date"
-	"github.com/miniflux/miniflux/reader/sanitizer"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/crypto"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/date"
+	"miniflux.app/reader/sanitizer"
+	"miniflux.app/url"
 )
 
 type jsonFeed struct {

reader/json/parser.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package json
+package json // import "miniflux.app/reader/json"
 
 import (
 	"encoding/json"
 	"io"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/errors"
+	"miniflux.app/model"
 )
 
 // Parse returns a normalized feed struct from a JON feed.

reader/json/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package json
+package json // import "miniflux.app/reader/json"
 
 import (
 	"bytes"

reader/opml/handler.go

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 import (
 	"errors"
 	"fmt"
 	"io"
 
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/storage"
 )
 
 // Handler handles the logic for OPML import/export.

reader/opml/opml.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 import "encoding/xml"
 

reader/opml/parser.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/reader/encoding"
+	"miniflux.app/errors"
+	"miniflux.app/reader/encoding"
 )
 
 // Parse reads an OPML file and returns a SubcriptionList.

reader/opml/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 import (
 	"bytes"

reader/opml/serializer.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 import (
 	"bufio"
 	"bytes"
 	"encoding/xml"
 
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // Serialize returns a SubcriptionList in OPML format.

reader/opml/serializer_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 import (
 	"bytes"

reader/opml/subscription.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package opml
+package opml // import "miniflux.app/reader/opml"
 
 // Subcription represents a feed that will be imported or exported.
 type Subcription struct {

reader/processor/processor.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package processor
+package processor // import "miniflux.app/reader/processor"
 
 import (
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/rewrite"
-	"github.com/miniflux/miniflux/reader/sanitizer"
-	"github.com/miniflux/miniflux/reader/scraper"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/rewrite"
+	"miniflux.app/reader/sanitizer"
+	"miniflux.app/reader/scraper"
+	"miniflux.app/storage"
 )
 
 // FeedProcessor handles the processing of feed contents.

reader/rdf/parser.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rdf
+package rdf // import "miniflux.app/reader/rdf"
 
 import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/encoding"
+	"miniflux.app/errors"
+	"miniflux.app/model"
+	"miniflux.app/reader/encoding"
 )
 
 // Parse returns a normalized feed struct from a RDF feed.

reader/rdf/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rdf
+package rdf // import "miniflux.app/reader/rdf"
 
 import (
 	"bytes"

reader/rdf/rdf.go

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rdf
+package rdf // import "miniflux.app/reader/rdf"
 
 import (
 	"encoding/xml"
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/crypto"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/date"
-	"github.com/miniflux/miniflux/reader/sanitizer"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/crypto"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/date"
+	"miniflux.app/reader/sanitizer"
+	"miniflux.app/url"
 )
 
 type rdfFeed struct {

reader/readability/readability.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package readability
+package readability // import "miniflux.app/reader/readability"
 
 import (
 	"bytes"
@@ -12,8 +12,9 @@ import (
 	"regexp"
 	"strings"
 
+	"miniflux.app/logger"
+
 	"github.com/PuerkitoBio/goquery"
-	"github.com/miniflux/miniflux/logger"
 	"golang.org/x/net/html"
 )
 

reader/rewrite/rewrite_functions.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rewrite
+package rewrite // import "miniflux.app/reader/rewrite"
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ import (
 
 var (
 	youtubeRegex = regexp.MustCompile(`youtube\.com/watch\?v=(.*)`)
-	imgRegex = regexp.MustCompile(`<img [^>]+>`)
+	imgRegex     = regexp.MustCompile(`<img [^>]+>`)
 )
 
 func addImageTitle(entryURL, entryContent string) string {
@@ -72,13 +72,13 @@ func addDynamicImage(entryURL, entryContent string) string {
 				changed = true
 
 				if img.Is("img") {
-					img.SetAttr("src",srcAttr)
+					img.SetAttr("src", srcAttr)
 				} else {
 					altAttr := img.AttrOr("alt", "")
 					img.ReplaceWithHtml(`<img src="` + srcAttr + `" alt="` + altAttr + `"/>`)
 				}
 
-				break;
+				break
 			}
 		}
 	})

reader/rewrite/rewriter.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rewrite
+package rewrite // import "miniflux.app/reader/rewrite"
 
 import (
 	"strings"
 
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/url"
 )
 
 // Rewriter modify item contents with a set of rewriting rules.

reader/rewrite/rewriter_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rewrite
+package rewrite // import "miniflux.app/reader/rewrite"
 
 import "testing"
 

reader/rewrite/rules.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rewrite
+package rewrite // import "miniflux.app/reader/rewrite"
 
 // List of predefined rewrite rules (alphabetically sorted)
 // Available rules: "add_image_title", "add_youtube_video"

reader/rss/parser.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rss
+package rss // import "miniflux.app/reader/rss"
 
 import (
 	"encoding/xml"
 	"io"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/encoding"
+	"miniflux.app/errors"
+	"miniflux.app/model"
+	"miniflux.app/reader/encoding"
 )
 
 // Parse returns a normalized feed struct from a RSS feed.

reader/rss/parser_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rss
+package rss // import "miniflux.app/reader/rss"
 
 import (
 	"bytes"

reader/rss/rss.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package rss
+package rss // import "miniflux.app/reader/rss"
 
 import (
 	"encoding/xml"
@@ -11,12 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/crypto"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
-	"github.com/miniflux/miniflux/reader/date"
-	"github.com/miniflux/miniflux/reader/sanitizer"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/crypto"
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/date"
+	"miniflux.app/reader/sanitizer"
+	"miniflux.app/url"
 )
 
 type rssFeed struct {

reader/sanitizer/sanitizer.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package sanitizer
+package sanitizer // import "miniflux.app/reader/sanitizer"
 
 import (
 	"bytes"
@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/url"
 
 	"golang.org/x/net/html"
 )

reader/sanitizer/sanitizer_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package sanitizer
+package sanitizer // import "miniflux.app/reader/sanitizer"
 
 import "testing"
 

reader/sanitizer/strip_tags.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package sanitizer
+package sanitizer // import "miniflux.app/reader/sanitizer"
 
 import (
 	"bytes"

reader/sanitizer/strip_tags_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package sanitizer
+package sanitizer // import "miniflux.app/reader/sanitizer"
 
 import "testing"
 

reader/scraper/rules.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package scraper
+package scraper // import "miniflux.app/reader/scraper"
 
 // List of predefined scraper rules (alphabetically sorted)
 // domain => CSS selectors

reader/scraper/scraper.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package scraper
+package scraper // import "miniflux.app/reader/scraper"
 
 import (
 	"errors"
@@ -10,11 +10,12 @@ import (
 	"io"
 	"strings"
 
+	"miniflux.app/http/client"
+	"miniflux.app/logger"
+	"miniflux.app/reader/readability"
+	"miniflux.app/url"
+
 	"github.com/PuerkitoBio/goquery"
-	"github.com/miniflux/miniflux/http/client"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/reader/readability"
-	"github.com/miniflux/miniflux/url"
 )
 
 // Fetch downloads a web page a returns relevant contents.

reader/scraper/scraper_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package scraper
+package scraper // import "miniflux.app/reader/scraper"
 
 import "testing"
 

reader/subscription/finder.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package subscription
+package subscription // import "miniflux.app/reader/subscription"
 
 import (
 	"bytes"
@@ -10,12 +10,12 @@ import (
 	"io"
 	"time"
 
-	"github.com/miniflux/miniflux/errors"
-	"github.com/miniflux/miniflux/http/client"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/reader/feed"
-	"github.com/miniflux/miniflux/timer"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/errors"
+	"miniflux.app/http/client"
+	"miniflux.app/logger"
+	"miniflux.app/reader/feed"
+	"miniflux.app/timer"
+	"miniflux.app/url"
 
 	"github.com/PuerkitoBio/goquery"
 )

reader/subscription/subscription.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package subscription
+package subscription // import "miniflux.app/reader/subscription"
 
 import "fmt"