diff options
| -rw-r--r-- | go.mod | 9 | ||||
| -rw-r--r-- | go.sum | 8 | ||||
| -rw-r--r-- | internal/feed/feed.go | 2 | ||||
| -rw-r--r-- | internal/feed/filter/filter.go | 2 | ||||
| -rw-r--r-- | internal/feed/item.go | 2 | ||||
| -rw-r--r-- | internal/feed/mail.go | 4 | ||||
| -rw-r--r-- | internal/feed/parse.go | 2 |
7 files changed, 12 insertions, 17 deletions
@@ -3,6 +3,8 @@ module github.com/Necoro/feed2imap-go go 1.17 require ( + github.com/Necoro/gofeed v1.1.4-0.20211029114605-b1a032d3e32f + github.com/Necoro/html2text v0.0.0-20211029113451-0e111ca632ef github.com/PuerkitoBio/goquery v1.7.1 github.com/antonmedv/expr v1.9.0 github.com/emersion/go-imap v1.2.0 @@ -11,8 +13,6 @@ require ( github.com/gabriel-vasile/mimetype v1.4.0 github.com/google/go-cmp v0.5.6 github.com/google/uuid v1.3.0 - github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 - github.com/mmcdole/gofeed v1.1.3 github.com/nightlyone/lockfile v1.0.0 golang.org/x/net v0.0.0-20210614182718-04defd469f4e gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b @@ -31,8 +31,3 @@ require ( github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect golang.org/x/text v0.3.7 // indirect ) - -replace ( - github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20211023142101-a2cddff396b8 - github.com/mmcdole/gofeed => github.com/Necoro/gofeed v1.1.4-0.20211023142840-2a3ded0d3583 -) @@ -1,8 +1,8 @@ github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/Necoro/gofeed v1.1.4-0.20211023142840-2a3ded0d3583 h1:r6mxmySGOCkaLXOrdmBGHuY+X9+/5JSu9OKPacrK6SY= -github.com/Necoro/gofeed v1.1.4-0.20211023142840-2a3ded0d3583/go.mod h1:qMokUhCe5JcXgt0xsuM7ICvPebotEt73AHcXGiFKVZs= -github.com/Necoro/html2text v0.0.0-20211023142101-a2cddff396b8 h1:W26nXQe858oQoLPL6p8Yv2TZcePsMklGDPDCVbGibKI= -github.com/Necoro/html2text v0.0.0-20211023142101-a2cddff396b8/go.mod h1:2JhXrGcEB2XalmwgSajx/U5Mg6xt10KOmBTITLiLRGk= +github.com/Necoro/gofeed v1.1.4-0.20211029114605-b1a032d3e32f h1:4U61yP/+eEhN03KS4vs9nZb1BIof32BTexlDhumniF8= +github.com/Necoro/gofeed v1.1.4-0.20211029114605-b1a032d3e32f/go.mod h1:O4tTFVp3PQj8ZXBtP8BEdN3+FAi0OTFBkNhJ01jHxVU= +github.com/Necoro/html2text v0.0.0-20211029113451-0e111ca632ef h1:ug4tZhYWJ2kio0apzEUzuCdFGJw2eIjNm/+Je2DvlE4= +github.com/Necoro/html2text v0.0.0-20211029113451-0e111ca632ef/go.mod h1:ZuQPJl0H5qfZKIQp5L5Kun61DZa/XwJR0WQnsaaR1NQ= github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4= github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY= github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE= diff --git a/internal/feed/feed.go b/internal/feed/feed.go index 3b9aba1..014f8b6 100644 --- a/internal/feed/feed.go +++ b/internal/feed/feed.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/mmcdole/gofeed" + "github.com/Necoro/gofeed" "github.com/Necoro/feed2imap-go/internal/feed/filter" "github.com/Necoro/feed2imap-go/pkg/config" diff --git a/internal/feed/filter/filter.go b/internal/feed/filter/filter.go index 8ff8a97..6377944 100644 --- a/internal/feed/filter/filter.go +++ b/internal/feed/filter/filter.go @@ -1,9 +1,9 @@ package filter import ( + "github.com/Necoro/gofeed" "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "github.com/mmcdole/gofeed" ) type Filter struct { diff --git a/internal/feed/item.go b/internal/feed/item.go index b45f5c5..44e878c 100644 --- a/internal/feed/item.go +++ b/internal/feed/item.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/Necoro/gofeed" "github.com/google/uuid" - "github.com/mmcdole/gofeed" "github.com/Necoro/feed2imap-go/pkg/config" "github.com/Necoro/feed2imap-go/pkg/util" diff --git a/internal/feed/mail.go b/internal/feed/mail.go index f5863a6..2865800 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -11,12 +11,12 @@ import ( "strings" "time" + "github.com/Necoro/gofeed" + "github.com/Necoro/html2text" "github.com/PuerkitoBio/goquery" "github.com/emersion/go-message" "github.com/emersion/go-message/mail" "github.com/gabriel-vasile/mimetype" - "github.com/jaytaylor/html2text" - "github.com/mmcdole/gofeed" "golang.org/x/net/html" "github.com/Necoro/feed2imap-go/internal/feed/template" diff --git a/internal/feed/parse.go b/internal/feed/parse.go index a2812bd..520def8 100644 --- a/internal/feed/parse.go +++ b/internal/feed/parse.go @@ -5,8 +5,8 @@ import ( "io" "os/exec" + "github.com/Necoro/gofeed" "github.com/google/uuid" - "github.com/mmcdole/gofeed" "github.com/Necoro/feed2imap-go/internal/http" ) |