From 18590b218af3b70dcc751f4e4f9e85360ad1ba5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 22 Aug 2020 22:26:13 +0200 Subject: Switch back to 'replace' for html2text --- go.mod | 7 +++++-- go.sum | 4 ++-- internal/feed/mail.go | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a7c7e04..e255f0f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/Necoro/feed2imap-go go 1.15 require ( - github.com/Necoro/html2text v0.0.0-20200510210108-d7611f0be99f github.com/PuerkitoBio/goquery v1.5.1 github.com/antonmedv/expr v1.8.8 github.com/emersion/go-imap v1.0.5 @@ -12,10 +11,14 @@ require ( github.com/gabriel-vasile/mimetype v1.1.1 github.com/google/go-cmp v0.5.1 github.com/google/uuid v1.1.1 + github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 github.com/mmcdole/gofeed v1.0.0 github.com/nightlyone/lockfile v1.0.0 golang.org/x/net v0.0.0-20200822124328-c89045814202 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 ) -replace github.com/mmcdole/gofeed => github.com/Necoro/gofeed v1.0.1-0.20200822192128-d9090592eb44 +replace ( + github.com/mmcdole/gofeed => github.com/Necoro/gofeed v1.0.1-0.20200822192128-d9090592eb44 + github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20200822202223-2e8e4cfbb241 +) diff --git a/go.sum b/go.sum index 15c70f8..263b71d 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/Necoro/gofeed v1.0.1-0.20200822192128-d9090592eb44 h1:E/UcoJYKPXPXmYyMhPm9aiT3ZkpJ40Fw9S3pBjxDvLA= github.com/Necoro/gofeed v1.0.1-0.20200822192128-d9090592eb44/go.mod h1:BB1b+cyPQhDcmEQw4Bur45PgOr88dt+nM9RiDO1F8I4= -github.com/Necoro/html2text v0.0.0-20200510210108-d7611f0be99f h1:8p10S/q2hJbHlRu4vE4Y5geDc7g6CC2hkHfQvc6x/dA= -github.com/Necoro/html2text v0.0.0-20200510210108-d7611f0be99f/go.mod h1:9AnGXZMY/GCLWg9ozOQp8a+KcsHkudIrDDWRrjuJtv4= +github.com/Necoro/html2text v0.0.0-20200822202223-2e8e4cfbb241 h1:QczaY9IJE6NQHnNPcmPjS9D4KugiYBXXh7hCLy8l0Jc= +github.com/Necoro/html2text v0.0.0-20200822202223-2e8e4cfbb241/go.mod h1:y6pXhr56u9LvpBLiHBbACPbnEzqPUPg9o5XDVIoKSk0= github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo= diff --git a/internal/feed/mail.go b/internal/feed/mail.go index b778ee3..2dda3ca 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/Necoro/html2text" + "github.com/jaytaylor/html2text" "github.com/PuerkitoBio/goquery" "github.com/emersion/go-message" "github.com/emersion/go-message/mail" -- cgit v1.2.3