From 6fa3600e9583b2ab6f7311357a5a8dac55a18c8a Mon Sep 17 00:00:00 2001 From: makeworld Date: Mon, 19 Apr 2021 10:01:48 -0400 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Switch=20off=20gofeed=20fo?= =?UTF-8?q?rk=20now=20that=20PR=20is=20merged?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 - README.md | 4 ++-- go.mod | 4 +--- go.sum | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58ccd5c..6283c17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bookmarks are stored using XML in the XBEL format, old bookmarks are transferred (#68) - Text no longer disappears under the left margin when scrolling (regression from v1.8.0) (#197) - Default search engine changed to geminispace.info from gus.guru -- Update [gofeed fork](https://github.com/mmcdole/gofeed/pull/164) to `d407d33` to add the [v1.1.1 changes](https://github.com/mmcdole/gofeed/compare/v1.1.0...v1.1.1) in the upstream repo ### Fixed - Help text is now the same color as `regular_text` in the theme config diff --git a/README.md b/README.md index 4f2d517..fe1fa7b 100644 --- a/README.md +++ b/README.md @@ -148,9 +148,9 @@ Amfora ❤️ open source! - It uses [tcell](https://github.com/gdamore/tcell) for low level terminal operations - [Viper](https://github.com/spf13/viper) for configuration and TOFU storing - [go-gemini](https://github.com/makeworld-the-better-one/go-gemini), my forked and updated Gemini client/server library -- [schollz/progressbar](https://github.com/schollz/progressbar) for downloading +- [progressbar](https://github.com/schollz/progressbar) - [go-humanize](https://github.com/dustin/go-humanize) -- My [gofeed fork](https://github.com/makeworld-the-better-one/gofeed) - pull request [here](https://github.com/mmcdole/gofeed/pull/164) +- [gofeed](https://github.com/mmcdole/gofeed) ## License This project is licensed under the GPL v3.0. See the [LICENSE](./LICENSE) file for details. diff --git a/go.mod b/go.mod index 51911d4..dfb59ce 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/makeworld-the-better-one/go-gemini v0.11.0 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.3.1 // indirect - github.com/mmcdole/gofeed v1.1.0 + github.com/mmcdole/gofeed v1.1.2 github.com/pelletier/go-toml v1.8.0 // indirect github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b github.com/schollz/progressbar/v3 v3.8.0 @@ -26,5 +26,3 @@ require ( gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect ) - -replace github.com/mmcdole/gofeed => github.com/makeworld-the-better-one/gofeed v1.1.1-0.20210412225217-d407d33eb43a diff --git a/go.sum b/go.sum index 6dbb696..69e5e7b 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,6 @@ github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzR github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/makeworld-the-better-one/go-gemini v0.11.0 h1:MNGiULJFvcqls9oCy40tE897hDeKvNmEK9i5kRucgQk= github.com/makeworld-the-better-one/go-gemini v0.11.0/go.mod h1:F+3x+R1xeYK90jMtBq+U+8Sh64r2dHleDZ/en3YgSmg= -github.com/makeworld-the-better-one/gofeed v1.1.1-0.20210412225217-d407d33eb43a h1:nFn7wCBHpxImHihAlPWCDXofutuA2bypy4gtFwlQmX0= -github.com/makeworld-the-better-one/gofeed v1.1.1-0.20210412225217-d407d33eb43a/go.mod h1:QQO3maftbOu+hiVOGOZDRLymqGQCos4zxbA4j89gMrE= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -161,6 +159,8 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA= github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mmcdole/gofeed v1.1.2 h1:7I5su6dO5/Rg2LEKS5ofPISVbi2vfxO2SNVSA/QN1y4= +github.com/mmcdole/gofeed v1.1.2/go.mod h1:QQO3maftbOu+hiVOGOZDRLymqGQCos4zxbA4j89gMrE= github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf h1:sWGE2v+hO0Nd4yFU/S/mDBM5plIU8v/Qhfz41hkDIAI= github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf/go.mod h1:pasqhqstspkosTneA62Nc+2p9SOBBYAPbnmRRWPQ0V8= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=