From 1e378fced2c5a34c94fd52335a0bd3e21e227932 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 7 Aug 2020 12:27:50 -0400
Subject: [PATCH 01/33] =?UTF-8?q?=F0=9F=8E=A8=20Reorder=20config.Init=20co?=
 =?UTF-8?q?de?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md     |   3 +-
 README.md        |   4 +-
 config/config.go | 108 +++++++++++++++++++++++++++--------------------
 config/theme.go  |   4 +-
 4 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4be83a0..98364e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- Emoji favicons can now be seen if `emoji_favicons` is enabled in the config (#62)
+- **Feed & page subscription** (#61)
+- **Emoji favicons** can now be seen if `emoji_favicons` is enabled in the config (#62)
 - The `shift_numbers` key in the config was added, so that non US keyboard users can navigate tabs (#64)
 - <kbd>F1</kbd> and <kbd>F2</kbd> keys for navigating to the previous and next tabs (#64)
 
diff --git a/README.md b/README.md
index 243b639..ffbae0c 100644
--- a/README.md
+++ b/README.md
@@ -97,8 +97,8 @@ Features in *italics* are in the master branch, but not in the latest release.
 - [x] Theming
 - [x] *Emoji favicons*
   - See `gemini://mozz.us/files/rfc_gemini_favicon.gmi` for details
-- [ ] Subscribe to RSS and Atom feeds and display them
-  - Subscribing to page changes, similar to how Spacewalk works, will also be supported
+- [x] *Subscribe to RSS and Atom feeds and display them*
+  - Subscribing to page changes, similar to how Spacewalk works, is also supported
 - [ ] Stream support
 - [ ] Full client certificate UX within the client
   - Create transient and permanent certs within the client, per domain
diff --git a/config/config.go b/config/config.go
index 528b7c4..38887a4 100644
--- a/config/config.go
+++ b/config/config.go
@@ -30,7 +30,15 @@ var bkmkPath string
 // For other pkgs to use
 var DownloadsDir string
 
+// Feeds
+var Feeds = viper.New()
+var feedsDir string
+var feedsPath string
+
 func Init() error {
+
+	// *** Set paths ***
+
 	home, err := homedir.Dir()
 	if err != nil {
 		return err
@@ -92,7 +100,7 @@ func Init() error {
 	}
 	bkmkPath = filepath.Join(bkmkDir, "bookmarks.toml")
 
-	// Create necessary files and folders
+	// *** Create necessary files and folders ***
 
 	// Config
 	err = os.MkdirAll(configDir, 0755)
@@ -114,56 +122,21 @@ func Init() error {
 	if err != nil {
 		return err
 	}
-	os.OpenFile(tofuDBPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
+	f, err = os.OpenFile(tofuDBPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
+	if err == nil {
+		f.Close()
+	}
 	// Bookmarks
 	err = os.MkdirAll(bkmkDir, 0755)
 	if err != nil {
 		return err
 	}
-	os.OpenFile(bkmkPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
-
-	// Setup vipers
-
-	TofuStore.SetConfigFile(tofuDBPath)
-	TofuStore.SetConfigType("toml")
-	err = TofuStore.ReadInConfig()
-	if err != nil {
-		return err
+	f, err = os.OpenFile(bkmkPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
+	if err == nil {
+		f.Close()
 	}
 
-	BkmkStore.SetConfigFile(bkmkPath)
-	BkmkStore.SetConfigType("toml")
-	err = BkmkStore.ReadInConfig()
-	if err != nil {
-		return err
-	}
-	BkmkStore.Set("DO NOT TOUCH", true)
-	err = BkmkStore.WriteConfig()
-	if err != nil {
-		return err
-	}
-
-	viper.SetDefault("a-general.home", "gemini.circumlunar.space")
-	viper.SetDefault("a-general.http", "default")
-	viper.SetDefault("a-general.search", "gus.guru/search")
-	viper.SetDefault("a-general.color", true)
-	viper.SetDefault("a-general.bullets", true)
-	viper.SetDefault("a-general.left_margin", 0.15)
-	viper.SetDefault("a-general.max_width", 100)
-	viper.SetDefault("a-general.downloads", "")
-	viper.SetDefault("a-general.page_max_size", 2097152)
-	viper.SetDefault("a-general.page_max_time", 10)
-	viper.SetDefault("a-general.emoji_favicons", false)
-	viper.SetDefault("keybindings.shift_numbers", "!@#$%^&*()")
-	viper.SetDefault("cache.max_size", 0)
-	viper.SetDefault("cache.max_pages", 20)
-
-	viper.SetConfigFile(configPath)
-	viper.SetConfigType("toml")
-	err = viper.ReadInConfig()
-	if err != nil {
-		return err
-	}
+	// *** Downloads paths, setup, and creation ***
 
 	// Setup downloads dir
 	if viper.GetString("a-general.downloads") == "" {
@@ -196,11 +169,56 @@ func Init() error {
 		DownloadsDir = dDir
 	}
 
+	// *** Setup vipers ***
+
+	TofuStore.SetConfigFile(tofuDBPath)
+	TofuStore.SetConfigType("toml")
+	err = TofuStore.ReadInConfig()
+	if err != nil {
+		return err
+	}
+
+	BkmkStore.SetConfigFile(bkmkPath)
+	BkmkStore.SetConfigType("toml")
+	err = BkmkStore.ReadInConfig()
+	if err != nil {
+		return err
+	}
+	BkmkStore.Set("DO NOT TOUCH", true)
+	err = BkmkStore.WriteConfig()
+	if err != nil {
+		return err
+	}
+
+	// Setup main config
+
+	viper.SetDefault("a-general.home", "gemini.circumlunar.space")
+	viper.SetDefault("a-general.http", "default")
+	viper.SetDefault("a-general.search", "gus.guru/search")
+	viper.SetDefault("a-general.color", true)
+	viper.SetDefault("a-general.bullets", true)
+	viper.SetDefault("a-general.left_margin", 0.15)
+	viper.SetDefault("a-general.max_width", 100)
+	viper.SetDefault("a-general.downloads", "")
+	viper.SetDefault("a-general.page_max_size", 2097152)
+	viper.SetDefault("a-general.page_max_time", 10)
+	viper.SetDefault("a-general.emoji_favicons", false)
+	viper.SetDefault("keybindings.shift_numbers", "!@#$%^&*()")
+	viper.SetDefault("cache.max_size", 0)
+	viper.SetDefault("cache.max_pages", 20)
+
+	viper.SetConfigFile(configPath)
+	viper.SetConfigType("toml")
+	err = viper.ReadInConfig()
+	if err != nil {
+		return err
+	}
+
 	// Setup cache from config
 	cache.SetMaxSize(viper.GetInt("cache.max_size"))
 	cache.SetMaxPages(viper.GetInt("cache.max_pages"))
 
-	// Theme
+	// Setup theme
 	configTheme := viper.Sub("theme")
 	if configTheme != nil {
 		for k, v := range configTheme.AllSettings() {
diff --git a/config/theme.go b/config/theme.go
index 6c021cc..7de75f9 100644
--- a/config/theme.go
+++ b/config/theme.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Functions to allow themeing configuration.
-// UI element colors are mapped to a string key, such as "error" or "tab_background"
+// UI element colors are mapped to a string key, such as "error" or "tab_bg"
 // These are the same keys used in the config file.
 
 var themeMu = sync.RWMutex{}
@@ -64,8 +64,8 @@ var theme = map[string]tcell.Color{
 
 func SetColor(key string, color tcell.Color) {
 	themeMu.Lock()
-	defer themeMu.Unlock()
 	theme[key] = color
+	themeMu.Unlock()
 }
 
 // GetColor will return tcell.ColorBlack if there is no color for the provided key.

From 4e91ad87bd48be7f88440423f38e77ab3d9957c6 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Mon, 10 Aug 2020 18:50:40 -0400
Subject: [PATCH 02/33] =?UTF-8?q?=F0=9F=9A=A7=20Adding=20feeds=20&=20pages?=
 =?UTF-8?q?,=20and=20JSON=20enc/dec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 amfora.go        |   8 +++-
 config/config.go |  33 +++++++++++--
 feeds/feeds.go   | 117 +++++++++++++++++++++++++++++++++++++++++++++++
 go.mod           |   1 +
 go.sum           |  11 +++++
 5 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 feeds/feeds.go

diff --git a/amfora.go b/amfora.go
index 34e2e40..0ed153d 100644
--- a/amfora.go
+++ b/amfora.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/display"
+	"github.com/makeworld-the-better-one/amfora/feeds"
 )
 
 var version = "1.5.0-unreleased"
@@ -33,7 +34,12 @@ func main() {
 
 	err := config.Init()
 	if err != nil {
-		fmt.Printf("Config error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
+		os.Exit(1)
+	}
+	err = feeds.Init()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
 		os.Exit(1)
 	}
 
diff --git a/config/config.go b/config/config.go
index 38887a4..7d6cf8a 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,7 +1,11 @@
+// Package config initializes all files required for Amfora, even those used by
+// other packages. It also reads in the config file and initializes a Viper and
+// the theme
 package config
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -31,9 +35,9 @@ var bkmkPath string
 var DownloadsDir string
 
 // Feeds
-var Feeds = viper.New()
-var feedsDir string
-var feedsPath string
+var FeedJson io.ReadCloser
+var feedDir string
+var FeedPath string
 
 func Init() error {
 
@@ -100,6 +104,22 @@ func Init() error {
 	}
 	bkmkPath = filepath.Join(bkmkDir, "bookmarks.toml")
 
+	// Feeds dir and path
+	if runtime.GOOS == "windows" {
+		// In APPDATA beside other Amfora files
+		feedDir = amforaAppData
+	} else {
+		// XDG data dir on POSIX systems
+		xdg_data, ok := os.LookupEnv("XDG_DATA_HOME")
+		if ok && strings.TrimSpace(xdg_data) != "" {
+			feedDir = filepath.Join(xdg_data, "amfora")
+		} else {
+			// Default to ~/.local/share/amfora
+			feedDir = filepath.Join(home, ".local", "share", "amfora")
+		}
+	}
+	FeedPath = filepath.Join(feedDir, "feeds.json")
+
 	// *** Create necessary files and folders ***
 
 	// Config
@@ -135,6 +155,13 @@ func Init() error {
 	if err == nil {
 		f.Close()
 	}
+	// Feeds
+	err = os.MkdirAll(feedDir, 0755)
+	if err != nil {
+		return err
+	}
+	f, _ = os.OpenFile(FeedPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
+	FeedJson = f
 
 	// *** Downloads paths, setup, and creation ***
 
diff --git a/feeds/feeds.go b/feeds/feeds.go
new file mode 100644
index 0000000..47b69cb
--- /dev/null
+++ b/feeds/feeds.go
@@ -0,0 +1,117 @@
+package feeds
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"sort"
+	"strings"
+
+	"github.com/makeworld-the-better-one/amfora/config"
+	"github.com/mmcdole/gofeed"
+)
+
+/*
+Example JSON.
+{
+	"feeds": {
+		"url1": <gofeed.Feed>,
+		"url2: <gofeed.Feed>"
+	},
+	"pages": {
+		"url1": "hash",
+		"url2": "hash"
+	}
+}
+
+"pages" are the pages tracked for changes that aren't feeds.
+The hash is SHA-256.
+
+*/
+
+// Decoded JSON
+type feedJson struct {
+	Feeds map[string]*gofeed.Feed `json:"feeds"`
+	Pages map[string]string       `json:"pages"`
+}
+
+var data feedJson
+
+var ErrSaving = errors.New("couldn't save JSON to disk")
+
+// Init should be called after config.Init.
+func Init() error {
+	defer config.FeedJson.Close()
+
+	dec := json.NewDecoder(config.FeedJson)
+	err := dec.Decode(&data)
+	if err != nil && err != io.EOF {
+		return fmt.Errorf("feeds json is corrupted: %v", err)
+	}
+	return nil
+}
+
+// IsTracked returns true of the feed/page URL is already being tracked.
+func IsTracked(url string) bool {
+	for u := range data.Feeds {
+		if url == u {
+			return true
+		}
+	}
+	for u := range data.Pages {
+		if url == u {
+			return true
+		}
+	}
+	return false
+}
+
+// GetFeed returns a Feed object and a bool indicating whether the passed
+// content was actually recognized as a feed.
+func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
+	// Check mediatype and filename
+	if mediatype != "application/atom+xml" && mediatype != "application/rss+xml" &&
+		filename != "atom.xml" && filename != "feed.xml" &&
+		!strings.HasSuffix(filename, ".atom") && !strings.HasSuffix(filename, ".rss") {
+		// No part of the above is true
+		return nil, false
+	}
+	feed, err := gofeed.NewParser().Parse(r)
+	return feed, err == nil
+}
+
+func writeJson() error {
+	f, err := os.OpenFile(config.FeedPath, os.O_WRONLY|os.O_CREATE, 0666)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	enc := json.NewEncoder(f)
+	enc.SetEscapeHTML(false)
+	enc.SetIndent("", "  ")
+	err = enc.Encode(&data)
+	return err
+}
+
+// AddFeed stores a feed.
+func AddFeed(url string, feed *gofeed.Feed) error {
+	sort.Sort(feed)
+	data.Feeds[url] = feed
+	err := writeJson()
+	if err != nil {
+		return ErrSaving
+	}
+	return nil
+}
+
+// AddPage stores a page URL to track for changes.
+func AddPage(url string) error {
+	data.Pages[url] = "" // No hash yet
+	err := writeJson()
+	if err != nil {
+		return ErrSaving
+	}
+	return nil
+}
diff --git a/go.mod b/go.mod
index 92ee038..9b59051 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.3.1 // indirect
+	github.com/mmcdole/gofeed v1.0.0
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
diff --git a/go.sum b/go.sum
index be1cd19..e188571 100644
--- a/go.sum
+++ b/go.sum
@@ -16,8 +16,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
+github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
+github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -27,6 +31,7 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -152,6 +157,10 @@ 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.0.0 h1:PHqwr8fsEm8xarj9s53XeEAFYhRM3E9Ib7Ie766/LTE=
+github.com/mmcdole/gofeed v1.0.0/go.mod h1:tkVcyzS3qVMlQrQxJoEH1hkTiuo9a8emDzkMi7TZBu0=
+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-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -245,6 +254,7 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -258,6 +268,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

From d254917b3639637e662ab4cd5289844087396c03 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sun, 16 Aug 2020 17:42:45 -0400
Subject: [PATCH 03/33] =?UTF-8?q?=F0=9F=9A=A7=20Sorting,=20update=20funcs,?=
 =?UTF-8?q?=20mutexes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 amfora.go        |   2 +-
 feeds/feeds.go   | 156 ++++++++++++++++++++++++++++++++++++++---------
 feeds/structs.go |  83 +++++++++++++++++++++++++
 3 files changed, 212 insertions(+), 29 deletions(-)
 create mode 100644 feeds/structs.go

diff --git a/amfora.go b/amfora.go
index 0ed153d..263f586 100644
--- a/amfora.go
+++ b/amfora.go
@@ -39,7 +39,7 @@ func main() {
 	}
 	err = feeds.Init()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "feeds.json error: %v\n", err)
 		os.Exit(1)
 	}
 
diff --git a/feeds/feeds.go b/feeds/feeds.go
index 47b69cb..d496a7d 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -1,45 +1,32 @@
 package feeds
 
 import (
+	"crypto/sha256"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
+	"mime"
 	"os"
+	"path"
 	"sort"
 	"strings"
+	"sync"
+	"time"
 
+	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
+	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/mmcdole/gofeed"
 )
 
-/*
-Example JSON.
-{
-	"feeds": {
-		"url1": <gofeed.Feed>,
-		"url2: <gofeed.Feed>"
-	},
-	"pages": {
-		"url1": "hash",
-		"url2": "hash"
-	}
-}
+var (
+	ErrSaving     = errors.New("couldn't save JSON to disk")
+	ErrNotSuccess = errors.New("status 20 not returned")
+	ErrNotFeed    = errors.New("not a valid feed")
+)
 
-"pages" are the pages tracked for changes that aren't feeds.
-The hash is SHA-256.
-
-*/
-
-// Decoded JSON
-type feedJson struct {
-	Feeds map[string]*gofeed.Feed `json:"feeds"`
-	Pages map[string]string       `json:"pages"`
-}
-
-var data feedJson
-
-var ErrSaving = errors.New("couldn't save JSON to disk")
+var writeMu = sync.Mutex{}
 
 // Init should be called after config.Init.
 func Init() error {
@@ -51,20 +38,28 @@ func Init() error {
 		return fmt.Errorf("feeds json is corrupted: %v", err)
 	}
 	return nil
+
+	// TODO: Start pulling all feeds in another thread
 }
 
-// IsTracked returns true of the feed/page URL is already being tracked.
+// IsTracked returns true if the feed/page URL is already being tracked.
 func IsTracked(url string) bool {
+	data.feedMu.RLock()
 	for u := range data.Feeds {
 		if url == u {
+			data.feedMu.RUnlock()
 			return true
 		}
 	}
+	data.feedMu.RUnlock()
+	data.pageMu.RLock()
 	for u := range data.Pages {
 		if url == u {
+			data.pageMu.RUnlock()
 			return true
 		}
 	}
+	data.pageMu.RUnlock()
 	return false
 }
 
@@ -79,10 +74,16 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
 		return nil, false
 	}
 	feed, err := gofeed.NewParser().Parse(r)
+	if feed == nil {
+		return nil, false
+	}
 	return feed, err == nil
 }
 
 func writeJson() error {
+	writeMu.Lock()
+	defer writeMu.Unlock()
+
 	f, err := os.OpenFile(config.FeedPath, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
 		return err
@@ -91,27 +92,126 @@ func writeJson() error {
 	enc := json.NewEncoder(f)
 	enc.SetEscapeHTML(false)
 	enc.SetIndent("", "  ")
+
+	data.feedMu.Lock()
+	data.pageMu.Lock()
 	err = enc.Encode(&data)
+	data.feedMu.Unlock()
+	data.pageMu.Unlock()
+
 	return err
 }
 
 // AddFeed stores a feed.
+// It can be used to update a feed for a URL, although the package
+// will handle that on its own.
 func AddFeed(url string, feed *gofeed.Feed) error {
+	if feed == nil {
+		panic("feed is nil")
+	}
+
 	sort.Sort(feed)
+	// Remove any content to save memory and disk space
+	for _, item := range feed.Items {
+		item.Content = ""
+	}
+
+	data.feedMu.Lock()
 	data.Feeds[url] = feed
+	data.feedMu.Unlock()
+
 	err := writeJson()
 	if err != nil {
+		// Don't use in-memory if it couldn't be saved
+		data.feedMu.Lock()
+		delete(data.Feeds, url)
+		data.feedMu.Unlock()
 		return ErrSaving
 	}
 	return nil
 }
 
 // AddPage stores a page URL to track for changes.
+// Do not use it to update a page, as it only resets the hash.
 func AddPage(url string) error {
-	data.Pages[url] = "" // No hash yet
+	data.pageMu.Lock()
+	data.Pages[url] = &pageJson{} // No hash yet
+	data.pageMu.Unlock()
+
 	err := writeJson()
 	if err != nil {
+		// Don't use in-memory if it couldn't be saved
+		data.pageMu.Lock()
+		delete(data.Pages, url)
+		data.pageMu.Unlock()
 		return ErrSaving
 	}
 	return nil
 }
+
+func updateFeed(url string) error {
+	res, err := client.Fetch(url)
+	if err != nil {
+		if res != nil {
+			res.Body.Close()
+		}
+		return err
+	}
+	defer res.Body.Close()
+
+	if res.Status != gemini.StatusSuccess {
+		return ErrNotSuccess
+	}
+	mediatype, _, err := mime.ParseMediaType(res.Meta)
+	if err != nil {
+		return err
+	}
+	filename := path.Base(url)
+	feed, ok := GetFeed(mediatype, filename, res.Body)
+	if !ok {
+		return ErrNotFeed
+	}
+	return AddFeed(url, feed)
+}
+
+func updatePage(url string) error {
+	res, err := client.Fetch(url)
+	if err != nil {
+		if res != nil {
+			res.Body.Close()
+		}
+		return err
+	}
+	defer res.Body.Close()
+
+	if res.Status != gemini.StatusSuccess {
+		return ErrNotSuccess
+	}
+	h := sha256.New()
+	if _, err := io.Copy(h, res.Body); err != nil {
+		return err
+	}
+	data.pageMu.Lock()
+	data.Pages[url] = &pageJson{
+		Hash:    fmt.Sprintf("%x", h.Sum(nil)),
+		Updated: time.Now().UTC(),
+	}
+	data.pageMu.Unlock()
+
+	err = writeJson()
+	if err != nil {
+		// Don't use in-memory if it couldn't be saved
+		data.pageMu.Lock()
+		delete(data.Pages, url)
+		data.pageMu.Unlock()
+		return err
+	}
+
+	return nil
+}
+
+// updateAll updates all feeds and pages.
+// It should run in goroutine at a regular interval.
+func updateAll() {
+
+}
diff --git a/feeds/structs.go b/feeds/structs.go
new file mode 100644
index 0000000..01e2ac4
--- /dev/null
+++ b/feeds/structs.go
@@ -0,0 +1,83 @@
+package feeds
+
+import (
+	"sync"
+	"time"
+
+	"github.com/mmcdole/gofeed"
+)
+
+/*
+Example JSON.
+{
+	"feeds": {
+		"url1": <gofeed.Feed>,
+		"url2": <gofeed.Feed>,
+	},
+	"pages": {
+		"url1": {
+			"hash": <hash>,
+			"updated": <time>
+		},
+		"url2": {
+			"hash": <hash>,
+			"updated": <time>
+		}
+	}
+}
+
+"pages" are the pages tracked for changes that aren't feeds.
+The hash used is SHA-256.
+The time is in RFC 3339 format, preferably in the UTC timezone.
+*/
+
+// Decoded JSON
+type jsonData struct {
+	feedMu sync.RWMutex
+	pageMu sync.RWMutex
+	Feeds  map[string]*gofeed.Feed `json:"feeds,omitempty"`
+	Pages  map[string]*pageJson    `json:"pages,omitempty"`
+}
+
+type pageJson struct {
+	Hash    string    `json:"hash"`
+	Updated time.Time `json:"updated"`
+}
+
+var data jsonData // Global instance of jsonData - loaded from JSON and used
+
+// PageEntry is a single item on a feed page.
+// It is used both for tracked feeds and pages.
+type PageEntry struct {
+	Author    string
+	Title     string
+	URL       string
+	Published time.Time
+}
+
+// PageEntries is new-to-old list of Entry structs, used to create a feed page.
+// It should always be assumed to be sorted when used in other packages.
+type PageEntries struct {
+	sync.RWMutex
+	Entries []*PageEntry
+}
+
+// Implement sort.Interface
+
+func (e *PageEntries) Len() int {
+	e.RLock()
+	defer e.RUnlock()
+	return len(e.Entries)
+}
+
+func (e *PageEntries) Less(i, j int) bool {
+	e.RLock()
+	defer e.RUnlock()
+	return e.Entries[i].Published.Before(e.Entries[j].Published)
+}
+
+func (e *PageEntries) Swap(i, j int) {
+	e.Lock()
+	e.Entries[i], e.Entries[j] = e.Entries[j], e.Entries[i]
+	e.Unlock()
+}

From c63861230efb2b7b4d179ba169f1003f29e35ea1 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Mon, 17 Aug 2020 13:31:45 -0400
Subject: [PATCH 04/33] =?UTF-8?q?=F0=9F=9A=A7=20Added=20updateAll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feeds/feeds.go   | 77 +++++++++++++++++++++++++++++++++++++++++++-----
 feeds/structs.go | 30 +++++++++++++++++--
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/feeds/feeds.go b/feeds/feeds.go
index d496a7d..6ae33f8 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -20,6 +20,9 @@ import (
 	"github.com/mmcdole/gofeed"
 )
 
+// TODO: Test for deadlocks and whether there should be more
+// goroutines for file writing or other things.
+
 var (
 	ErrSaving     = errors.New("couldn't save JSON to disk")
 	ErrNotSuccess = errors.New("status 20 not returned")
@@ -93,11 +96,9 @@ func writeJson() error {
 	enc.SetEscapeHTML(false)
 	enc.SetIndent("", "  ")
 
-	data.feedMu.Lock()
-	data.pageMu.Lock()
+	data.Lock()
 	err = enc.Encode(&data)
-	data.feedMu.Unlock()
-	data.pageMu.Unlock()
+	data.Unlock()
 
 	return err
 }
@@ -191,10 +192,15 @@ func updatePage(url string) error {
 	if _, err := io.Copy(h, res.Body); err != nil {
 		return err
 	}
+	newHash := fmt.Sprintf("%x", h.Sum(nil))
+
 	data.pageMu.Lock()
-	data.Pages[url] = &pageJson{
-		Hash:    fmt.Sprintf("%x", h.Sum(nil)),
-		Updated: time.Now().UTC(),
+	if data.Pages[url].Hash != newHash {
+		// Page content is different
+		data.Pages[url] = &pageJson{
+			Hash:    newHash,
+			Changed: time.Now().UTC(),
+		}
 	}
 	data.pageMu.Unlock()
 
@@ -211,7 +217,62 @@ func updatePage(url string) error {
 }
 
 // updateAll updates all feeds and pages.
-// It should run in goroutine at a regular interval.
 func updateAll() {
+	// TODO: Is two goroutines the right amount?
 
+	worker := func(jobs <-chan [2]string, wg *sync.WaitGroup) {
+		// Each job is: []string{<type>, "url"}
+		// where <type> is "feed" or "page"
+
+		defer wg.Done()
+		for j := range jobs {
+			if j[0] == "feed" {
+				updateFeed(j[1])
+			}
+			if j[0] == "page" {
+				updatePage(j[1])
+			}
+		}
+	}
+
+	var wg sync.WaitGroup
+
+	data.RLock()
+	numJobs := len(data.Feeds) + len(data.Pages)
+	jobs := make(chan [2]string, numJobs)
+
+	// Start 2 workers, waiting for jobs
+	for w := 0; w < 2; w++ {
+		wg.Add(1)
+		go worker(jobs, &wg)
+	}
+
+	// Get map keys in a slice
+
+	feedKeys := make([]string, len(data.Feeds))
+	i := 0
+	for k := range data.Feeds {
+		feedKeys[i] = k
+		i++
+	}
+
+	pageKeys := make([]string, len(data.Pages))
+	i = 0
+	for k := range data.Pages {
+		pageKeys[i] = k
+		i++
+	}
+
+	data.RUnlock()
+
+	for j := 0; j < numJobs; j++ {
+		if j < len(feedKeys) {
+			jobs <- [2]string{"feed", feedKeys[j]}
+		} else {
+			// In the Pages
+			jobs <- [2]string{"page", pageKeys[j-len(feedKeys)]}
+		}
+	}
+
+	wg.Wait()
 }
diff --git a/feeds/structs.go b/feeds/structs.go
index 01e2ac4..2f38adf 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -17,11 +17,11 @@ Example JSON.
 	"pages": {
 		"url1": {
 			"hash": <hash>,
-			"updated": <time>
+			"changed": <time>
 		},
 		"url2": {
 			"hash": <hash>,
-			"updated": <time>
+			"changed": <time>
 		}
 	}
 }
@@ -39,9 +39,33 @@ type jsonData struct {
 	Pages  map[string]*pageJson    `json:"pages,omitempty"`
 }
 
+// Lock locks both feed and page mutexes.
+func (j *jsonData) Lock() {
+	j.feedMu.Lock()
+	j.pageMu.Lock()
+}
+
+// Unlock unlocks both feed and page mutexes.
+func (j *jsonData) Unlock() {
+	j.feedMu.Unlock()
+	j.pageMu.Unlock()
+}
+
+// RLock read-locks both feed and page mutexes.
+func (j *jsonData) RLock() {
+	j.feedMu.RLock()
+	j.pageMu.RLock()
+}
+
+// RUnlock read-unlocks both feed and page mutexes.
+func (j *jsonData) RUnlock() {
+	j.feedMu.RUnlock()
+	j.pageMu.RUnlock()
+}
+
 type pageJson struct {
 	Hash    string    `json:"hash"`
-	Updated time.Time `json:"updated"`
+	Changed time.Time `json:"changed"` // When the latest change happened
 }
 
 var data jsonData // Global instance of jsonData - loaded from JSON and used

From e5fe550bc2c16741c053a529327f3cdef97f3d8f Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Mon, 17 Aug 2020 15:33:53 -0400
Subject: [PATCH 05/33] =?UTF-8?q?=F0=9F=9A=A7=20Feeds=20page=20rendering,?=
 =?UTF-8?q?=20untested?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 display/bookmarks.go |  9 ++++----
 display/feeds.go     | 44 +++++++++++++++++++++++++++++++++++
 feeds/feeds.go       | 55 ++++++++++++++++++++++++++++++++++++++++----
 feeds/structs.go     |  7 ------
 4 files changed, 100 insertions(+), 15 deletions(-)
 create mode 100644 display/feeds.go

diff --git a/display/bookmarks.go b/display/bookmarks.go
index 4fbc07f..5b36e2a 100644
--- a/display/bookmarks.go
+++ b/display/bookmarks.go
@@ -106,18 +106,19 @@ func openBkmkModal(name string, exists bool) (string, int) {
 	return bkmkModalText, action
 }
 
+var bkmkPageRaw = "# Bookmarks\r\n\r\n"
+
 // Bookmarks displays the bookmarks page on the current tab.
 func Bookmarks(t *tab) {
 	// Gather bookmarks
-	rawContent := "# Bookmarks\r\n\r\n"
 	m, keys := bookmarks.All()
 	for i := range keys {
-		rawContent += fmt.Sprintf("=> %s %s\r\n", keys[i], m[keys[i]])
+		bkmkPageRaw += fmt.Sprintf("=> %s %s\r\n", keys[i], m[keys[i]])
 	}
 	// Render and display
-	content, links := renderer.RenderGemini(rawContent, textWidth(), leftMargin())
+	content, links := renderer.RenderGemini(bkmkPageRaw, textWidth(), leftMargin())
 	page := structs.Page{
-		Raw:       rawContent,
+		Raw:       bkmkPageRaw,
 		Content:   content,
 		Links:     links,
 		Url:       "about:bookmarks",
diff --git a/display/feeds.go b/display/feeds.go
new file mode 100644
index 0000000..52a52c7
--- /dev/null
+++ b/display/feeds.go
@@ -0,0 +1,44 @@
+package display
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/makeworld-the-better-one/amfora/feeds"
+	"github.com/makeworld-the-better-one/amfora/renderer"
+	"github.com/makeworld-the-better-one/amfora/structs"
+)
+
+var feedPageRaw = "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
+	strings.Repeat("-", 80) + "\n\n"
+
+// Feeds displays the feeds page on the current tab.
+func Feeds(t *tab) {
+	// TODO; Decide about date in local time vs UTC
+	// TODO: Cache
+
+	pe := feeds.GetPageEntries()
+
+	curDay := time.Time.Round(time.Day)
+
+	for _, entry := range pe.Entries {
+		if entry.Published.Round(time.Day).After(curDay) {
+			// This post is on a new day, add a day header
+			curDay := entry.Published.Round(time.Day)
+			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
+		}
+		feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
+	}
+
+	content, links := renderer.RenderGemini(feedPageRaw, textWidth(), leftMargin())
+	page := structs.Page{
+		Raw:       feedPageRaw,
+		Content:   content,
+		Links:     links,
+		Url:       "about:feeds",
+		Width:     termW,
+		Mediatype: structs.TextGemini,
+	}
+	setPage(t, &page)
+	t.applyBottomBar()
+}
diff --git a/feeds/feeds.go b/feeds/feeds.go
index 6ae33f8..cc94f62 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"mime"
+	urlPkg "net/url"
 	"os"
 	"path"
 	"sort"
@@ -40,9 +41,9 @@ func Init() error {
 	if err != nil && err != io.EOF {
 		return fmt.Errorf("feeds json is corrupted: %v", err)
 	}
-	return nil
 
-	// TODO: Start pulling all feeds in another thread
+	go updateAll()
+	return nil
 }
 
 // IsTracked returns true if the feed/page URL is already being tracked.
@@ -111,7 +112,6 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 		panic("feed is nil")
 	}
 
-	sort.Sort(feed)
 	// Remove any content to save memory and disk space
 	for _, item := range feed.Items {
 		item.Content = ""
@@ -262,7 +262,6 @@ func updateAll() {
 		pageKeys[i] = k
 		i++
 	}
-
 	data.RUnlock()
 
 	for j := 0; j < numJobs; j++ {
@@ -276,3 +275,51 @@ func updateAll() {
 
 	wg.Wait()
 }
+
+// GetPageEntries returns the current list of PageEntries
+// for use in rendering a page.
+// The contents of the entries will never change, and this
+// function should be called again to get updates.
+func GetPageEntries() *PageEntries {
+	var pe PageEntries
+
+	data.RLock()
+
+	for _, feed := range data.Feeds {
+		for _, item := range feed.Items {
+
+			var pub time.Time
+
+			if !item.UpdatedParsed.IsZero() {
+				pub = *item.UpdatedParsed
+			} else if !item.PublishedParsed.IsZero() {
+				pub = *item.PublishedParsed
+			} else {
+				// No time on the post
+				pub = time.Now()
+			}
+
+			pe.Entries = append(pe.Entries, &PageEntry{
+				Author:    feed.Author.Name,
+				Title:     item.Title,
+				URL:       item.Link,
+				Published: pub,
+			})
+		}
+	}
+
+	for url, page := range data.Pages {
+		parsed, _ := urlPkg.Parse(url)
+		pe.Entries = append(pe.Entries, &PageEntry{
+			Author:    parsed.Host,            // Domain is author
+			Title:     path.Base(parsed.Path), // Filename is title
+			URL:       url,
+			Published: page.Changed,
+		})
+	}
+
+	data.RUnlock()
+
+	sort.Sort(&pe)
+	return &pe
+}
diff --git a/feeds/structs.go b/feeds/structs.go
index 2f38adf..9deab89 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -82,26 +82,19 @@ type PageEntry struct {
 // PageEntries is new-to-old list of Entry structs, used to create a feed page.
 // It should always be assumed to be sorted when used in other packages.
 type PageEntries struct {
-	sync.RWMutex
 	Entries []*PageEntry
 }
 
 // Implement sort.Interface
 
 func (e *PageEntries) Len() int {
-	e.RLock()
-	defer e.RUnlock()
 	return len(e.Entries)
 }
 
 func (e *PageEntries) Less(i, j int) bool {
-	e.RLock()
-	defer e.RUnlock()
 	return e.Entries[i].Published.Before(e.Entries[j].Published)
 }
 
 func (e *PageEntries) Swap(i, j int) {
-	e.Lock()
 	e.Entries[i], e.Entries[j] = e.Entries[j], e.Entries[i]
-	e.Unlock()
 }

From 8ea57ee5c5a5ec6a7152c13240354fb0eb216f82 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Mon, 17 Aug 2020 17:36:50 -0400
Subject: [PATCH 06/33] =?UTF-8?q?=F0=9F=9A=A7=20Fix=20lint=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 display/feeds.go | 9 ++++++---
 display/util.go  | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/display/feeds.go b/display/feeds.go
index 52a52c7..9d19389 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -3,6 +3,7 @@ package display
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/makeworld-the-better-one/amfora/feeds"
 	"github.com/makeworld-the-better-one/amfora/renderer"
@@ -12,6 +13,8 @@ import (
 var feedPageRaw = "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
 	strings.Repeat("-", 80) + "\n\n"
 
+var timeDay = 24 * time.Hour
+
 // Feeds displays the feeds page on the current tab.
 func Feeds(t *tab) {
 	// TODO; Decide about date in local time vs UTC
@@ -19,12 +22,12 @@ func Feeds(t *tab) {
 
 	pe := feeds.GetPageEntries()
 
-	curDay := time.Time.Round(time.Day)
+	curDay := time.Time{}.Round(timeDay)
 
 	for _, entry := range pe.Entries {
-		if entry.Published.Round(time.Day).After(curDay) {
+		if entry.Published.Round(timeDay).After(curDay) {
 			// This post is on a new day, add a day header
-			curDay := entry.Published.Round(time.Day)
+			curDay := entry.Published.Round(timeDay)
 			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
 		feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
diff --git a/display/util.go b/display/util.go
index e3e7124..37b6f1d 100644
--- a/display/util.go
+++ b/display/util.go
@@ -47,8 +47,8 @@ func textWidth() int {
 
 // queryEscape is the same as url.PathEscape, but it also replaces the +.
 // This is because Gemini requires percent-escaping for queries.
-func queryEscape(path string) string {
-	return strings.ReplaceAll(url.PathEscape(path), "+", "%2B")
+func queryEscape(query string) string {
+	return strings.ReplaceAll(url.PathEscape(query), "+", "%2B")
 }
 
 // resolveRelLink returns an absolute link for the given absolute link and relative one.

From 2357e25b075a9e01b10c7fccb82b2917b2afdac3 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 28 Aug 2020 12:18:30 -0400
Subject: [PATCH 07/33] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20lint=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .golangci.yml        |  5 +++++
 config/config.go     |  5 +++--
 display/tab.go       |  2 +-
 feeds/feeds.go       | 22 +++++++++++-----------
 feeds/structs.go     |  4 ++--
 renderer/renderer.go |  4 ++--
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index e010a47..a26853f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -36,3 +36,8 @@ linters:
 issues:
   exclude-use-default: true
   max-issues-per-linter: 0
+
+linters-settings:
+  gocritic:
+    disabled-checks:
+      - ifElseChain
diff --git a/config/config.go b/config/config.go
index 9917e09..c9d756a 100644
--- a/config/config.go
+++ b/config/config.go
@@ -35,7 +35,8 @@ var bkmkPath string
 var DownloadsDir string
 
 // Feeds
-var FeedJson io.ReadCloser
+
+var FeedJSON io.ReadCloser
 var feedDir string
 var FeedPath string
 
@@ -162,7 +163,7 @@ func Init() error {
 		return err
 	}
 	f, _ = os.OpenFile(FeedPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
-	FeedJson = f
+	FeedJSON = f
 
 	// *** Downloads paths, setup, and creation ***
 
diff --git a/display/tab.go b/display/tab.go
index b8982aa..f192720 100644
--- a/display/tab.go
+++ b/display/tab.go
@@ -102,7 +102,7 @@ func makeNewTab() *tab {
 			// There's still a selection, but a different key was pressed, not Enter
 
 			index, _ := strconv.Atoi(currentSelection[0])
-			if key == tcell.KeyTab { //nolint:gocritic
+			if key == tcell.KeyTab {
 				index = (index + 1) % numSelections
 			} else if key == tcell.KeyBacktab {
 				index = (index - 1 + numSelections) % numSelections
diff --git a/feeds/feeds.go b/feeds/feeds.go
index cc94f62..f5eeb64 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -34,12 +34,12 @@ var writeMu = sync.Mutex{}
 
 // Init should be called after config.Init.
 func Init() error {
-	defer config.FeedJson.Close()
+	defer config.FeedJSON.Close()
 
-	dec := json.NewDecoder(config.FeedJson)
+	dec := json.NewDecoder(config.FeedJSON)
 	err := dec.Decode(&data)
 	if err != nil && err != io.EOF {
-		return fmt.Errorf("feeds json is corrupted: %v", err)
+		return fmt.Errorf("feeds json is corrupted: %v", err) //nolint:goerr113
 	}
 
 	go updateAll()
@@ -84,7 +84,7 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
 	return feed, err == nil
 }
 
-func writeJson() error {
+func writeJSON() error {
 	writeMu.Lock()
 	defer writeMu.Unlock()
 
@@ -121,7 +121,7 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 	data.Feeds[url] = feed
 	data.feedMu.Unlock()
 
-	err := writeJson()
+	err := writeJSON()
 	if err != nil {
 		// Don't use in-memory if it couldn't be saved
 		data.feedMu.Lock()
@@ -136,10 +136,10 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 // Do not use it to update a page, as it only resets the hash.
 func AddPage(url string) error {
 	data.pageMu.Lock()
-	data.Pages[url] = &pageJson{} // No hash yet
+	data.Pages[url] = &pageJSON{} // No hash yet
 	data.pageMu.Unlock()
 
-	err := writeJson()
+	err := writeJSON()
 	if err != nil {
 		// Don't use in-memory if it couldn't be saved
 		data.pageMu.Lock()
@@ -197,14 +197,14 @@ func updatePage(url string) error {
 	data.pageMu.Lock()
 	if data.Pages[url].Hash != newHash {
 		// Page content is different
-		data.Pages[url] = &pageJson{
+		data.Pages[url] = &pageJSON{
 			Hash:    newHash,
 			Changed: time.Now().UTC(),
 		}
 	}
 	data.pageMu.Unlock()
 
-	err = writeJson()
+	err = writeJSON()
 	if err != nil {
 		// Don't use in-memory if it couldn't be saved
 		data.pageMu.Lock()
@@ -227,10 +227,10 @@ func updateAll() {
 		defer wg.Done()
 		for j := range jobs {
 			if j[0] == "feed" {
-				updateFeed(j[1])
+				updateFeed(j[1]) //nolint:errcheck
 			}
 			if j[0] == "page" {
-				updatePage(j[1])
+				updatePage(j[1]) //nolint:errcheck
 			}
 		}
 	}
diff --git a/feeds/structs.go b/feeds/structs.go
index 9deab89..7832495 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -36,7 +36,7 @@ type jsonData struct {
 	feedMu sync.RWMutex
 	pageMu sync.RWMutex
 	Feeds  map[string]*gofeed.Feed `json:"feeds,omitempty"`
-	Pages  map[string]*pageJson    `json:"pages,omitempty"`
+	Pages  map[string]*pageJSON    `json:"pages,omitempty"`
 }
 
 // Lock locks both feed and page mutexes.
@@ -63,7 +63,7 @@ func (j *jsonData) RUnlock() {
 	j.pageMu.RUnlock()
 }
 
-type pageJson struct {
+type pageJSON struct {
 	Hash    string    `json:"hash"`
 	Changed time.Time `json:"changed"` // When the latest change happened
 }
diff --git a/renderer/renderer.go b/renderer/renderer.go
index 05a17b1..4046553 100644
--- a/renderer/renderer.go
+++ b/renderer/renderer.go
@@ -101,11 +101,11 @@ func convertRegularGemini(s string, numLinks, width int) (string, []string) {
 	for i := range lines {
 		lines[i] = strings.TrimRight(lines[i], " \r\t\n")
 
-		if strings.HasPrefix(lines[i], "#") { //nolint:gocritic
+		if strings.HasPrefix(lines[i], "#") {
 			// Headings
 			var tag string
 			if viper.GetBool("a-general.color") {
-				if strings.HasPrefix(lines[i], "###") { //nolint:gocritic
+				if strings.HasPrefix(lines[i], "###") {
 					tag = fmt.Sprintf("[%s::b]", config.GetColorString("hdg_3"))
 				} else if strings.HasPrefix(lines[i], "##") {
 					tag = fmt.Sprintf("[%s::b]", config.GetColorString("hdg_2"))

From 5c8499194006e8c6c187c846a3742f2c797a6408 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 28 Aug 2020 19:33:37 -0400
Subject: [PATCH 08/33] =?UTF-8?q?=F0=9F=9A=A7=20Feeds=20page=20rendering?=
 =?UTF-8?q?=20fixed,=20still=20untested?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cache/{favicons.go => favicon.go}     |  0
 cache/{cache.go => page.go}           |  3 +-
 cache/{cache_test.go => page_test.go} |  0
 display/feeds.go                      | 34 ++++++++--
 display/modals.go                     |  1 +
 feeds/feeds.go                        | 90 +++++++++++++++------------
 feeds/structs.go                      |  3 +-
 7 files changed, 81 insertions(+), 50 deletions(-)
 rename cache/{favicons.go => favicon.go} (100%)
 rename cache/{cache.go => page.go} (96%)
 rename cache/{cache_test.go => page_test.go} (100%)

diff --git a/cache/favicons.go b/cache/favicon.go
similarity index 100%
rename from cache/favicons.go
rename to cache/favicon.go
diff --git a/cache/cache.go b/cache/page.go
similarity index 96%
rename from cache/cache.go
rename to cache/page.go
index fa0bc3d..e31135d 100644
--- a/cache/cache.go
+++ b/cache/page.go
@@ -1,6 +1,5 @@
 // Package cache provides an interface for a cache of strings, aka text/gemini pages, and redirects.
 // It is fully thread safe.
-// The redirect cache is not limited.
 package cache
 
 import (
@@ -22,7 +21,7 @@ func SetMaxPages(max int) {
 	maxPages = max
 }
 
-// SetMaxSize sets the max size the cache can be, in bytes.
+// SetMaxSize sets the max size the page cache can be, in bytes.
 // A value <= 0 means infinite size.
 func SetMaxSize(max int) {
 	maxSize = max
diff --git a/cache/cache_test.go b/cache/page_test.go
similarity index 100%
rename from cache/cache_test.go
rename to cache/page_test.go
diff --git a/display/feeds.go b/display/feeds.go
index 4f230da..5d05115 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/makeworld-the-better-one/amfora/cache"
 	"github.com/makeworld-the-better-one/amfora/feeds"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
@@ -15,19 +16,33 @@ var feedPageRaw = "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[
 
 var timeDay = 24 * time.Hour
 
+var feedPageUpdated time.Time
+
 // Feeds displays the feeds page on the current tab.
 func Feeds(t *tab) {
-	// TODO; Decide about date in local time vs UTC
-	// TODO: Cache
+	// Retrieve cached version if there hasn't been updates
+	p, ok := cache.GetPage("about:feeds")
+	if feedPageUpdated == feeds.LastUpdated && ok {
+		setPage(t, p)
+		t.applyBottomBar()
+		return
+	}
 
 	pe := feeds.GetPageEntries()
 
-	curDay := time.Time{}.Round(timeDay)
+	// curDay represents what day of posts the loop is on.
+	// It only goes backwards in time.
+	// It's initial setting means:
+	// only display posts older than a day in the future.
+	curDay := time.Now().Round(timeDay).Add(timeDay)
 
-	for _, entry := range pe.Entries {
-		if entry.Published.Round(timeDay).After(curDay) {
+	for _, entry := range pe.Entries { // From new to old
+		// Convert to local time, remove sub-day info
+		pub := entry.Published.In(time.Local).Round(timeDay)
+
+		if pub.Before(curDay) {
 			// This post is on a new day, add a day header
-			curDay := entry.Published.Round(timeDay)
+			curDay := pub
 			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
 		feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
@@ -42,6 +57,13 @@ func Feeds(t *tab) {
 		Width:     termW,
 		Mediatype: structs.TextGemini,
 	}
+	cache.AddPage(&page)
 	setPage(t, &page)
 	t.applyBottomBar()
+
+	feedPageUpdated = time.Now()
+}
+
+func feedInit() {
+	// TODO
 }
diff --git a/display/modals.go b/display/modals.go
index 5a472d9..fa8ddc3 100644
--- a/display/modals.go
+++ b/display/modals.go
@@ -150,6 +150,7 @@ func modalInit() {
 
 	bkmkInit()
 	dlInit()
+	feedInit()
 }
 
 // Error displays an error on the screen in a modal.
diff --git a/feeds/feeds.go b/feeds/feeds.go
index f5eeb64..1d6ef42 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -30,7 +30,11 @@ var (
 	ErrNotFeed    = errors.New("not a valid feed")
 )
 
-var writeMu = sync.Mutex{}
+var writeMu = sync.Mutex{} // Prevent concurrent writes to feeds.json file
+
+// LastUpdated is the time when the in-memory data was last updated.
+// It can be used to know if the feed page should be regenerated.
+var LastUpdated time.Time
 
 // Init should be called after config.Init.
 func Init() error {
@@ -42,6 +46,8 @@ func Init() error {
 		return fmt.Errorf("feeds json is corrupted: %v", err) //nolint:goerr113
 	}
 
+	LastUpdated = time.Now()
+
 	go updateAll()
 	return nil
 }
@@ -70,6 +76,10 @@ func IsTracked(url string) bool {
 // GetFeed returns a Feed object and a bool indicating whether the passed
 // content was actually recognized as a feed.
 func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
+	if r == nil {
+		return nil, false
+	}
+
 	// Check mediatype and filename
 	if mediatype != "application/atom+xml" && mediatype != "application/rss+xml" &&
 		filename != "atom.xml" && filename != "feed.xml" &&
@@ -119,34 +129,53 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 
 	data.feedMu.Lock()
 	data.Feeds[url] = feed
-	data.feedMu.Unlock()
-
 	err := writeJSON()
 	if err != nil {
 		// Don't use in-memory if it couldn't be saved
-		data.feedMu.Lock()
 		delete(data.Feeds, url)
 		data.feedMu.Unlock()
 		return ErrSaving
 	}
+	data.feedMu.Unlock()
+
+	LastUpdated = time.Now()
 	return nil
 }
 
-// AddPage stores a page URL to track for changes.
-// Do not use it to update a page, as it only resets the hash.
-func AddPage(url string) error {
+// AddPage stores a page to track for changes.
+// It can be used to update the page as well, although the package
+// will handle that on its own.
+func AddPage(url string, r io.Reader) error {
+	if r == nil {
+		return nil
+	}
+
+	h := sha256.New()
+	if _, err := io.Copy(h, r); err != nil {
+		return err
+	}
+	newHash := fmt.Sprintf("%x", h.Sum(nil))
+
 	data.pageMu.Lock()
-	data.Pages[url] = &pageJSON{} // No hash yet
-	data.pageMu.Unlock()
+	_, ok := data.Pages[url]
+	if !ok || data.Pages[url].Hash != newHash {
+		// Page content is different, or it didn't exist
+		data.Pages[url] = &pageJSON{
+			Hash:    newHash,
+			Changed: time.Now().UTC(),
+		}
+	}
 
 	err := writeJSON()
 	if err != nil {
 		// Don't use in-memory if it couldn't be saved
-		data.pageMu.Lock()
 		delete(data.Pages, url)
 		data.pageMu.Unlock()
-		return ErrSaving
+		return err
 	}
+	data.pageMu.Unlock()
+
+	LastUpdated = time.Now()
 	return nil
 }
 
@@ -188,32 +217,8 @@ func updatePage(url string) error {
 	if res.Status != gemini.StatusSuccess {
 		return ErrNotSuccess
 	}
-	h := sha256.New()
-	if _, err := io.Copy(h, res.Body); err != nil {
-		return err
-	}
-	newHash := fmt.Sprintf("%x", h.Sum(nil))
 
-	data.pageMu.Lock()
-	if data.Pages[url].Hash != newHash {
-		// Page content is different
-		data.Pages[url] = &pageJSON{
-			Hash:    newHash,
-			Changed: time.Now().UTC(),
-		}
-	}
-	data.pageMu.Unlock()
-
-	err = writeJSON()
-	if err != nil {
-		// Don't use in-memory if it couldn't be saved
-		data.pageMu.Lock()
-		delete(data.Pages, url)
-		data.pageMu.Unlock()
-		return err
-	}
-
-	return nil
+	return AddPage(url, res.Body)
 }
 
 // updateAll updates all feeds and pages.
@@ -221,15 +226,14 @@ func updateAll() {
 	// TODO: Is two goroutines the right amount?
 
 	worker := func(jobs <-chan [2]string, wg *sync.WaitGroup) {
-		// Each job is: []string{<type>, "url"}
+		// Each job is: [2]string{<type>, "url"}
 		// where <type> is "feed" or "page"
 
 		defer wg.Done()
 		for j := range jobs {
 			if j[0] == "feed" {
 				updateFeed(j[1]) //nolint:errcheck
-			}
-			if j[0] == "page" {
+			} else if j[0] == "page" {
 				updatePage(j[1]) //nolint:errcheck
 			}
 		}
@@ -278,8 +282,9 @@ func updateAll() {
 
 // GetPageEntries returns the current list of PageEntries
 // for use in rendering a page.
-// The contents of the entries will never change, and this
-// function should be called again to get updates.
+// The contents of the returned entries will never change,
+// so this function needs to be called again to get updates.
+// It always returns sorted entries - by post time, from newest to oldest.
 func GetPageEntries() *PageEntries {
 	var pe PageEntries
 
@@ -290,6 +295,8 @@ func GetPageEntries() *PageEntries {
 
 			var pub time.Time
 
+			// Try to use updated time first, then published
+
 			if !item.UpdatedParsed.IsZero() {
 				pub = *item.UpdatedParsed
 			} else if !item.PublishedParsed.IsZero() {
@@ -321,5 +328,6 @@ func GetPageEntries() *PageEntries {
 	data.RUnlock()
 
 	sort.Sort(&pe)
+
 	return &pe
 }
diff --git a/feeds/structs.go b/feeds/structs.go
index 7832495..51bb61e 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -81,6 +81,7 @@ type PageEntry struct {
 
 // PageEntries is new-to-old list of Entry structs, used to create a feed page.
 // It should always be assumed to be sorted when used in other packages.
+// Sorted by post time, from newest to oldest.
 type PageEntries struct {
 	Entries []*PageEntry
 }
@@ -92,7 +93,7 @@ func (e *PageEntries) Len() int {
 }
 
 func (e *PageEntries) Less(i, j int) bool {
-	return e.Entries[i].Published.Before(e.Entries[j].Published)
+	return e.Entries[i].Published.After(e.Entries[j].Published)
 }
 
 func (e *PageEntries) Swap(i, j int) {

From d4c23638f162ec8c8d46fd0273793bf6bac2655a Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sat, 29 Aug 2020 20:51:51 -0400
Subject: [PATCH 09/33] =?UTF-8?q?=F0=9F=90=9B=20Fix=20date=20rounding=20an?=
 =?UTF-8?q?d=20update=20time=20comparison?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 display/feeds.go | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/display/feeds.go b/display/feeds.go
index 5d05115..2e7c969 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -14,31 +14,37 @@ import (
 var feedPageRaw = "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
 	strings.Repeat("-", 80) + "\n\n"
 
-var timeDay = 24 * time.Hour
-
 var feedPageUpdated time.Time
 
+// toLocalDay truncates the provided time to a date only,
+// but converts to the local time first.
+func toLocalDay(t time.Time) time.Time {
+	t = t.Local()
+	return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
+}
+
 // Feeds displays the feeds page on the current tab.
 func Feeds(t *tab) {
 	// Retrieve cached version if there hasn't been updates
 	p, ok := cache.GetPage("about:feeds")
-	if feedPageUpdated == feeds.LastUpdated && ok {
+	if feedPageUpdated.After(feeds.LastUpdated) && ok {
 		setPage(t, p)
 		t.applyBottomBar()
 		return
 	}
 
-	pe := feeds.GetPageEntries()
-
 	// curDay represents what day of posts the loop is on.
 	// It only goes backwards in time.
 	// It's initial setting means:
-	// only display posts older than a day in the future.
-	curDay := time.Now().Round(timeDay).Add(timeDay)
+	// Only display posts older than 6 hours in the future,
+	// nothing further in the future.
+	curDay := toLocalDay(time.Now()).Add(6 * time.Hour)
+
+	pe := feeds.GetPageEntries()
 
 	for _, entry := range pe.Entries { // From new to old
 		// Convert to local time, remove sub-day info
-		pub := entry.Published.In(time.Local).Round(timeDay)
+		pub := toLocalDay(entry.Published)
 
 		if pub.Before(curDay) {
 			// This post is on a new day, add a day header
@@ -57,7 +63,7 @@ func Feeds(t *tab) {
 		Width:     termW,
 		Mediatype: structs.TextGemini,
 	}
-	cache.AddPage(&page)
+	go cache.AddPage(&page)
 	setPage(t, &page)
 	t.applyBottomBar()
 

From 9ba405a42f2f48fd7e08f36ef8aa528a8af6fdc8 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Mon, 31 Aug 2020 12:06:06 -0400
Subject: [PATCH 10/33] =?UTF-8?q?=F0=9F=93=9D=20Remove=20from=20v1.5.0=20c?=
 =?UTF-8?q?hangelog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 1 -
 README.md    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36b6743..81fc0be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- **Feed & page subscription** (#61)
 - **Emoji favicons** can now be seen if `emoji_favicons` is enabled in the config (#62)
 - **Proxy support** - specify a proxy in the config for all requests to go through it (#66)
 - The `shift_numbers` key in the config was added, so that non US keyboard users can navigate tabs (#64)
diff --git a/README.md b/README.md
index b061c3b..87b5c9d 100644
--- a/README.md
+++ b/README.md
@@ -97,11 +97,11 @@ Features in *italics* are in the master branch, but not in the latest release.
 - [x] Theming
 - [x] *Emoji favicons*
   - See `gemini://mozz.us/files/rfc_gemini_favicon.gmi` for details
-- [x] *Subscribe to RSS and Atom feeds and display them*
-  - Subscribing to page changes, similar to how Spacewalk works, is also supported
 - [x] *Proxying*
   - All requests can optionally be sent through another server
   - A gemini proxy server implementation currently does not exist, but Amfora will support it when it does!
+- [x] *Subscribe to RSS and Atom feeds and display them*
+  - Subscribing to page changes, similar to how Spacewalk works, is also supported
 - [ ] Support Markdown rendering
 - [ ] Search in pages with <kbd>Ctrl-F</kbd>
 - [ ] Full client certificate UX within the client

From 69faa5e31f5a6be3326a947b3250493f471e8076 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Wed, 16 Sep 2020 13:33:50 -0400
Subject: [PATCH 11/33] =?UTF-8?q?=F0=9F=94=A8=20Remove=20-D=20flag=20for?=
 =?UTF-8?q?=20macOS=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b9a1a5b..8df09ad 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@ clean:
 
 .PHONY: install
 install: amfora amfora.desktop
-	install -Dm 755 amfora $(PREFIX)/bin/amfora
-	install -Dm 644 amfora.desktop $(PREFIX)/share/applications/amfora.desktop
+	install -m 755 amfora $(PREFIX)/bin/amfora
+	install -m 644 amfora.desktop $(PREFIX)/share/applications/amfora.desktop
 
 .PHONY: uninstall
 uninstall:

From 0a963a0d8d8c1ddd990540fce5cda7ccd445b3c5 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Tue, 17 Nov 2020 11:26:49 -0500
Subject: [PATCH 12/33] =?UTF-8?q?=F0=9F=9A=A7=20Support=20JSON=20feeds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feeds/feeds.go   |  7 ++++---
 feeds/structs.go |  3 ++-
 go.mod           |  2 +-
 go.sum           | 28 +++++++++++++++++++++-------
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/feeds/feeds.go b/feeds/feeds.go
index 1d6ef42..c4c4986 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -81,8 +81,8 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
 	}
 
 	// Check mediatype and filename
-	if mediatype != "application/atom+xml" && mediatype != "application/rss+xml" &&
-		filename != "atom.xml" && filename != "feed.xml" &&
+	if mediatype != "application/atom+xml" && mediatype != "application/rss+xml" && mediatype != "application/json+feed" &&
+		filename != "atom.xml" && filename != "feed.xml" && filename != "feed.json" &&
 		!strings.HasSuffix(filename, ".atom") && !strings.HasSuffix(filename, ".rss") {
 		// No part of the above is true
 		return nil, false
@@ -221,7 +221,8 @@ func updatePage(url string) error {
 	return AddPage(url, res.Body)
 }
 
-// updateAll updates all feeds and pages.
+// updateAll updates all feeds and pages using workers.
+// It only returns once all the workers are done.
 func updateAll() {
 	// TODO: Is two goroutines the right amount?
 
diff --git a/feeds/structs.go b/feeds/structs.go
index 51bb61e..a5263a8 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -8,7 +8,8 @@ import (
 )
 
 /*
-Example JSON.
+Example JSON
+
 {
 	"feeds": {
 		"url1": <gofeed.Feed>,
diff --git a/go.mod b/go.mod
index 4925424..63c4281 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.3.1 // indirect
-	github.com/mmcdole/gofeed v1.0.0
+	github.com/mmcdole/gofeed v1.1.0
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b
 	github.com/spf13/afero v1.2.2 // indirect
diff --git a/go.sum b/go.sum
index 4affab9..c15d2a0 100644
--- a/go.sum
+++ b/go.sum
@@ -16,12 +16,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
-github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
+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/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
-github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
+github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -31,12 +31,12 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -76,6 +76,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -111,6 +112,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@@ -158,11 +161,15 @@ 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.0.0 h1:PHqwr8fsEm8xarj9s53XeEAFYhRM3E9Ib7Ie766/LTE=
-github.com/mmcdole/gofeed v1.0.0/go.mod h1:tkVcyzS3qVMlQrQxJoEH1hkTiuo9a8emDzkMi7TZBu0=
+github.com/mmcdole/gofeed v1.1.0 h1:T2WrGLVJRV04PY2qwhEJLHCt9JiCtBhb6SmC8ZvJH08=
+github.com/mmcdole/gofeed v1.1.0/go.mod h1:PPiVwgDXLlz2N83KB4TrIim2lyYM5Zn7ZWH9Pi4oHUk=
 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=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -190,8 +197,10 @@ github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b h1:8NiY6v9/IlFU8osj1
 github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b/go.mod h1:T1HolqzmdHnJIH6p7A9LDuvYGQgEHx9ijX3vKgDKU60=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -223,6 +232,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 gitlab.com/tslocum/cbind v0.1.1 h1:JXXtxMWHgWLvoF+QkrvcNvOQ59juy7OE1RhT7hZfdt0=
 gitlab.com/tslocum/cbind v0.1.1/go.mod h1:rX7vkl0pUSg/yy427MmD1FZAf99S7WwpUlxF/qTpPqk=
@@ -273,6 +283,9 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -360,6 +373,7 @@ gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

From 781b89af6131e0c6fecc811b0322014cc0a03314 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Tue, 17 Nov 2020 11:59:06 -0500
Subject: [PATCH 13/33] =?UTF-8?q?=F0=9F=9A=A7=20Allow=20caching,=20increas?=
 =?UTF-8?q?e=20curDay=20initial"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cache/page.go    |  3 +--
 display/feeds.go | 14 +++++++++-----
 feeds/feeds.go   |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cache/page.go b/cache/page.go
index e31135d..0175e2f 100644
--- a/cache/page.go
+++ b/cache/page.go
@@ -3,7 +3,6 @@
 package cache
 
 import (
-	"strings"
 	"sync"
 
 	"github.com/makeworld-the-better-one/amfora/structs"
@@ -47,7 +46,7 @@ func removeURL(url string) {
 // If your page is larger than the max cache size, the provided page
 // will silently not be added to the cache.
 func AddPage(p *structs.Page) {
-	if p.URL == "" || strings.HasPrefix(p.URL, "about:") {
+	if p.URL == "" {
 		// Just in case, these pages shouldn't be cached
 		return
 	}
diff --git a/display/feeds.go b/display/feeds.go
index 921eafd..e326c7a 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -25,7 +25,7 @@ func toLocalDay(t time.Time) time.Time {
 
 // Feeds displays the feeds page on the current tab.
 func Feeds(t *tab) {
-	// Retrieve cached version if there hasn't been updates
+	// Retrieve cached version if there hasn't been any updates
 	p, ok := cache.GetPage("about:feeds")
 	if feedPageUpdated.After(feeds.LastUpdated) && ok {
 		setPage(t, p)
@@ -35,10 +35,14 @@ func Feeds(t *tab) {
 
 	// curDay represents what day of posts the loop is on.
 	// It only goes backwards in time.
-	// It's initial setting means:
-	// Only display posts older than 6 hours in the future,
-	// nothing further in the future.
-	curDay := toLocalDay(time.Now()).Add(6 * time.Hour)
+	// Its initial setting means:
+	// Only display posts older than 26 hours in the future, nothing further in the future.
+	//
+	// 26 hours was chosen because it is the largest timezone difference
+	// currently in the world. Posts may be dated in the future
+	// due to software bugs, where the local user's date is used, but
+	// the UTC timezone is specified. I believe gemfeed does this.
+	curDay := toLocalDay(time.Now()).Add(26 * time.Hour)
 
 	pe := feeds.GetPageEntries()
 
diff --git a/feeds/feeds.go b/feeds/feeds.go
index c4c4986..5ac320a 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -329,6 +329,5 @@ func GetPageEntries() *PageEntries {
 	data.RUnlock()
 
 	sort.Sort(&pe)
-
 	return &pe
 }

From cf5e65f75abf164468d5f4b996589e70722e75c4 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Tue, 17 Nov 2020 20:56:15 -0500
Subject: [PATCH 14/33] =?UTF-8?q?=F0=9F=9A=A7=20Adding=20&=20displaying=20?=
 =?UTF-8?q?feeds/pages=20works?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See NOTES.md for things still left
---
 NOTES.md            |   8 +++
 amfora.go           |  11 +++--
 config/config.go    |   5 +-
 config/default.go   |   5 ++
 config/theme.go     |   2 +
 default-config.toml |   5 ++
 display/display.go  |  13 +++++
 display/feeds.go    | 118 ++++++++++++++++++++++++++++++++++++++++++--
 display/help.go     |   2 +
 display/modals.go   |   1 -
 display/newtab.go   |   1 +
 display/private.go  |  24 +++++++++
 feeds/feeds.go      |  96 +++++++++++++++++++++++++----------
 feeds/structs.go    |  12 +++--
 renderer/page.go    |  33 +++++++------
 structs/structs.go  |  25 +++++-----
 16 files changed, 293 insertions(+), 68 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index d72eda9..974e1ad 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,5 +1,13 @@
 # Notes
 
+## Temp
+- Recalculating `about:feeds` adds pages multiple times to the view
+- Only options for feed files is the download modal - there should be a feed modal before that one
+- Auto feed detection fails on `ebc.li/atom.xml`
+
+- TODO: remove all logger lines
+  
+
 ## Issues
 - URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
 
diff --git a/amfora.go b/amfora.go
index c63eeca..d99a94a 100644
--- a/amfora.go
+++ b/amfora.go
@@ -7,6 +7,7 @@ import (
 	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/display"
 	"github.com/makeworld-the-better-one/amfora/feeds"
+	"github.com/makeworld-the-better-one/amfora/logger"
 )
 
 var (
@@ -16,10 +17,10 @@ var (
 )
 
 func main() {
-	// err := logger.Init()
-	// if err != nil {
-	// 	panic(err)
-	// }
+	err := logger.Init()
+	if err != nil {
+		panic(err)
+	}
 
 	if len(os.Args) > 1 {
 		if os.Args[1] == "--version" || os.Args[1] == "-v" {
@@ -38,7 +39,7 @@ func main() {
 		}
 	}
 
-	err := config.Init()
+	err = config.Init()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
 		os.Exit(1)
diff --git a/config/config.go b/config/config.go
index c68a62b..8f783f2 100644
--- a/config/config.go
+++ b/config/config.go
@@ -6,7 +6,6 @@ package config
 
 import (
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -41,7 +40,6 @@ var bkmkPath string
 var DownloadsDir string
 
 // Feeds
-var FeedJSON io.ReadCloser
 var feedDir string
 var FeedPath string
 
@@ -158,8 +156,6 @@ func Init() error {
 	if err != nil {
 		return err
 	}
-	f, _ = os.OpenFile(FeedPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
-	FeedJSON = f
 
 	// *** Downloads paths, setup, and creation ***
 
@@ -234,6 +230,7 @@ func Init() error {
 	viper.SetDefault("a-general.page_max_size", 2097152)
 	viper.SetDefault("a-general.page_max_time", 10)
 	viper.SetDefault("a-general.emoji_favicons", false)
+	viper.SetDefault("a-general.feeds_popup", true)
 	viper.SetDefault("keybindings.shift_numbers", "!@#$%^&*()")
 	viper.SetDefault("url-handlers.other", "off")
 	viper.SetDefault("cache.max_size", 0)
diff --git a/config/default.go b/config/default.go
index 6329539..556da67 100644
--- a/config/default.go
+++ b/config/default.go
@@ -68,6 +68,9 @@ page_max_time = 10
 # Whether to replace tab numbers with emoji favicons, which are cached.
 emoji_favicons = false
 
+# Whether a pop-up appears when viewing a potential feed
+feed_popup = true
+
 
 [auth]
 # Authentication settings
@@ -189,6 +192,8 @@ max_pages = 30 # The maximum number of pages the cache will store
 # yesno_modal_text
 # tofu_modal_bg
 # tofu_modal_text
+# feed_modal_bg
+# feed_modal_text
 
 # input_modal_bg
 # input_modal_text
diff --git a/config/theme.go b/config/theme.go
index 6559864..8a34655 100644
--- a/config/theme.go
+++ b/config/theme.go
@@ -38,6 +38,8 @@ var theme = map[string]tcell.Color{
 	"yesno_modal_text":     tcell.ColorWhite,
 	"tofu_modal_bg":        tcell.ColorMaroon,
 	"tofu_modal_text":      tcell.ColorWhite,
+	"feed_modal_bg":        tcell.Color61, // xterm:SlateBlue3, #5f5faf
+	"feed_modal_text":      tcell.ColorWhite,
 
 	"input_modal_bg":         tcell.ColorGreen,
 	"input_modal_text":       tcell.ColorWhite,
diff --git a/default-config.toml b/default-config.toml
index 9ac0d21..5855c02 100644
--- a/default-config.toml
+++ b/default-config.toml
@@ -65,6 +65,9 @@ page_max_time = 10
 # Whether to replace tab numbers with emoji favicons, which are cached.
 emoji_favicons = false
 
+# Whether a pop-up appears when viewing a potential feed
+feed_popup = true
+
 
 [auth]
 # Authentication settings
@@ -186,6 +189,8 @@ max_pages = 30 # The maximum number of pages the cache will store
 # yesno_modal_text
 # tofu_modal_bg
 # tofu_modal_text
+# feed_modal_bg
+# feed_modal_text
 
 # input_modal_bg
 # input_modal_text
diff --git a/display/display.go b/display/display.go
index d2b6921..eaf48d3 100644
--- a/display/display.go
+++ b/display/display.go
@@ -207,6 +207,7 @@ func Init() {
 	})
 
 	// Render the default new tab content ONCE and store it for later
+	// This code is repeated in Reload()
 	newTabContent := getNewTabContent()
 	renderedNewTabContent, newTabLinks := renderer.RenderGemini(newTabContent, textWidth(), leftMargin(), false)
 	newTabPage = structs.Page{
@@ -292,6 +293,13 @@ func Init() {
 					Info("The current page has no content, so it couldn't be downloaded.")
 				}
 				return nil
+			case tcell.KeyCtrlA:
+				Feeds(tabs[curTab])
+				tabs[curTab].addToHistory("about:feeds")
+				return nil
+			case tcell.KeyCtrlX:
+				go addFeed()
+				return nil
 			case tcell.KeyRune:
 				// Regular key was sent
 				switch string(event.Rune()) {
@@ -575,6 +583,11 @@ func URL(u string) {
 		tabs[curTab].addToHistory("about:bookmarks")
 		return
 	}
+	if u == "about:feeds" { //nolint:goconst
+		Feeds(tabs[curTab])
+		tabs[curTab].addToHistory("about:feeds")
+		return
+	}
 	if u == "about:newtab" {
 		temp := newTabPage // Copy
 		setPage(tabs[curTab], &temp)
diff --git a/display/feeds.go b/display/feeds.go
index e326c7a..0203746 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -2,17 +2,25 @@ package display
 
 import (
 	"fmt"
+	"net/url"
+	"path"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/gdamore/tcell"
 	"github.com/makeworld-the-better-one/amfora/cache"
+	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/feeds"
+	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
+	"github.com/mmcdole/gofeed"
+	"github.com/spf13/viper"
 )
 
 var feedPageRaw = "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
-	strings.Repeat("-", 80) + "\n\n"
+	strings.Repeat("-", 80) + "\nSee the help (by pressing ?) for details on how to use this page.\n\n"
 
 var feedPageUpdated time.Time
 
@@ -25,6 +33,8 @@ func toLocalDay(t time.Time) time.Time {
 
 // Feeds displays the feeds page on the current tab.
 func Feeds(t *tab) {
+	logger.Log.Println("display.Feeds called")
+
 	// Retrieve cached version if there hasn't been any updates
 	p, ok := cache.GetPage("about:feeds")
 	if feedPageUpdated.After(feeds.LastUpdated) && ok {
@@ -74,6 +84,108 @@ func Feeds(t *tab) {
 	feedPageUpdated = time.Now()
 }
 
-func feedInit() {
-	// TODO
+// openFeedModal displays the "Add feed/page" modal
+// It returns whether the user wanted to add the feed/page.
+// The tracked arg specifies whether this feed/page is already
+// being tracked.
+func openFeedModal(validFeed, tracked bool) bool {
+	logger.Log.Println("display.openFeedModal called")
+	// Reuses yesNoModal
+
+	if viper.GetBool("a-general.color") {
+		yesNoModal.
+			SetBackgroundColor(config.GetColor("feed_modal_bg")).
+			SetTextColor(config.GetColor("feed_modal_text"))
+		yesNoModal.GetFrame().
+			SetBorderColor(config.GetColor("feed_modal_text")).
+			SetTitleColor(config.GetColor("feed_modal_text"))
+	} else {
+		yesNoModal.
+			SetBackgroundColor(tcell.ColorBlack).
+			SetTextColor(tcell.ColorWhite)
+		yesNoModal.GetFrame().
+			SetBorderColor(tcell.ColorWhite).
+			SetTitleColor(tcell.ColorWhite)
+	}
+	if validFeed {
+		yesNoModal.GetFrame().SetTitle("Feed Tracking")
+		if tracked {
+			yesNoModal.SetText("This is already being tracked. Would you like to manually update it?")
+		} else {
+			yesNoModal.SetText("Would you like to start tracking this feed?")
+		}
+	} else {
+		yesNoModal.GetFrame().SetTitle("Page Tracking")
+		if tracked {
+			yesNoModal.SetText("This is already being tracked. Would you like to manually update it?")
+		} else {
+			yesNoModal.SetText("Would you like to start tracking this page?")
+		}
+	}
+
+	tabPages.ShowPage("yesno")
+	tabPages.SendToFront("yesno")
+	App.SetFocus(yesNoModal)
+	App.Draw()
+
+	resp := <-yesNoCh
+	tabPages.SwitchToPage(strconv.Itoa(curTab))
+	App.SetFocus(tabs[curTab].view)
+	App.Draw()
+	return resp
+}
+
+// getFeedFromPage is like feeds.GetFeed but takes a structs.Page as input.
+func getFeedFromPage(p *structs.Page) (*gofeed.Feed, bool) {
+	parsed, _ := url.Parse(p.URL)
+	filename := path.Base(parsed.Path)
+	r := strings.NewReader(p.Raw)
+	return feeds.GetFeed(p.RawMediatype, filename, r)
+}
+
+// addFeedDirect is only for adding feeds, not pages.
+// It's for when you already have a feed and know if it's tracked.
+// Use mainly by handleURL because it already did a lot of the work.
+//
+// Like addFeed, it should be called in a goroutine.
+func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) {
+	logger.Log.Println("display.addFeedDirect called")
+
+	if openFeedModal(true, tracked) {
+		err := feeds.AddFeed(u, feed)
+		if err != nil {
+			Error("Feed Error", err.Error())
+		}
+	}
+}
+
+// addFeed goes through the process of adding a bookmark for the current page.
+// It is the high-level way of doing it. It should be called in a goroutine.
+func addFeed() {
+	logger.Log.Println("display.addFeed called")
+
+	t := tabs[curTab]
+	p := t.page
+
+	if !t.hasContent() {
+		// It's an about: page, or a malformed one
+		return
+	}
+
+	feed, isFeed := getFeedFromPage(p)
+	tracked := feeds.IsTracked(p.URL)
+
+	if openFeedModal(isFeed, tracked) {
+		var err error
+
+		if isFeed {
+			err = feeds.AddFeed(p.URL, feed)
+		} else {
+			err = feeds.AddPage(p.URL, strings.NewReader(p.Raw))
+		}
+
+		if err != nil {
+			Error("Feed/Page Error", err.Error())
+		}
+	}
 }
diff --git a/display/help.go b/display/help.go
index 1391a07..9a4c8de 100644
--- a/display/help.go
+++ b/display/help.go
@@ -42,6 +42,8 @@ Ctrl-R, R|Reload a page, discarding the cached version.
 Ctrl-B|View bookmarks
 Ctrl-D|Add, change, or remove a bookmark for the current page.
 Ctrl-S|Save the current page to your downloads.
+Ctrl-A|View tracked feeds and pages.
+Ctrl-X|Track or update the current feed/page.
 q, Ctrl-Q|Quit
 Ctrl-C|Hard quit. This can be used when in the middle of downloading,
 |for example.
diff --git a/display/modals.go b/display/modals.go
index fa8ddc3..5a472d9 100644
--- a/display/modals.go
+++ b/display/modals.go
@@ -150,7 +150,6 @@ func modalInit() {
 
 	bkmkInit()
 	dlInit()
-	feedInit()
 }
 
 // Error displays an error on the screen in a modal.
diff --git a/display/newtab.go b/display/newtab.go
index e1755c5..ff212d0 100644
--- a/display/newtab.go
+++ b/display/newtab.go
@@ -18,6 +18,7 @@ You can customize this page by creating a gemtext file called newtab.gmi, in Amf
 Happy browsing!
 
 => about:bookmarks Bookmarks
+=> about:feeds Feed and Page Tracking
 
 => //gemini.circumlunar.space Project Gemini
 => https://github.com/makeworld-the-better-one/amfora Amfora homepage [HTTPS]
diff --git a/display/private.go b/display/private.go
index 8686fd7..ff41f91 100644
--- a/display/private.go
+++ b/display/private.go
@@ -14,6 +14,7 @@ import (
 	"github.com/makeworld-the-better-one/amfora/cache"
 	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
+	"github.com/makeworld-the-better-one/amfora/feeds"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
 	"github.com/makeworld-the-better-one/amfora/webbrowser"
@@ -36,6 +37,11 @@ func followLink(t *tab, prev, next string) {
 		t.addToHistory("about:bookmarks")
 		return
 	}
+	if next == "about:feeds" {
+		Feeds(t)
+		t.addToHistory("about:feeds")
+		return
+	}
 	if strings.HasPrefix(next, "about:") {
 		Error("Error", "Not a valid 'about:' URL for linking")
 		return
@@ -328,6 +334,20 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 			t.barText = oldText
 		}
 		t.mode = tabModeDone
+
+		go func(p *structs.Page) {
+			if b && t.hasContent() && !feeds.IsTracked(s) && viper.GetBool("a-general.feed_popup") {
+				// The current page might be an untracked feed, and the user wants
+				// to be notified in such cases.
+
+				feed, isFeed := getFeedFromPage(p)
+				if isFeed && isValidTab(t) && t.page == p {
+					// After parsing and track-checking time, the page is still being displayed
+					addFeedDirect(p.URL, feed, false)
+				}
+			}
+		}(t.page)
+
 		return s, b
 	}
 
@@ -341,6 +361,10 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 		Bookmarks(t)
 		return ret("about:bookmarks", true)
 	}
+	if u == "about:feeds" {
+		Feeds(t)
+		return ret("about:feeds", true)
+	}
 
 	u = normalizeURL(u)
 	u = cache.Redirect(u)
diff --git a/feeds/feeds.go b/feeds/feeds.go
index 5ac320a..224a797 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -10,6 +10,7 @@ import (
 	urlPkg "net/url"
 	"os"
 	"path"
+	"reflect"
 	"sort"
 	"strings"
 	"sync"
@@ -17,6 +18,7 @@ import (
 
 	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
+	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/mmcdole/gofeed"
 )
@@ -38,22 +40,32 @@ var LastUpdated time.Time
 
 // Init should be called after config.Init.
 func Init() error {
-	defer config.FeedJSON.Close()
+	f, err := os.Open(config.FeedPath)
+	if err == nil {
+		defer f.Close()
 
-	dec := json.NewDecoder(config.FeedJSON)
-	err := dec.Decode(&data)
-	if err != nil && err != io.EOF {
-		return fmt.Errorf("feeds json is corrupted: %v", err) //nolint:goerr113
+		fi, err := f.Stat()
+		if err == nil && fi.Size() > 0 {
+			dec := json.NewDecoder(f)
+			err = dec.Decode(&data)
+			if err != nil && err != io.EOF {
+				return fmt.Errorf("feeds.json is corrupted: %w", err) //nolint:goerr113
+			}
+		}
+	} else if !os.IsNotExist(err) {
+		// There's an error opening the file, but it's not bc is doesn't exist
+		return fmt.Errorf("open feeds.json error: %w", err) //nolint:goerr113
 	}
 
 	LastUpdated = time.Now()
-
 	go updateAll()
 	return nil
 }
 
 // IsTracked returns true if the feed/page URL is already being tracked.
 func IsTracked(url string) bool {
+	logger.Log.Println("feeds.IsTracked called")
+
 	data.feedMu.RLock()
 	for u := range data.Feeds {
 		if url == u {
@@ -76,6 +88,8 @@ func IsTracked(url string) bool {
 // GetFeed returns a Feed object and a bool indicating whether the passed
 // content was actually recognized as a feed.
 func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
+	logger.Log.Println("feeds.GetFeed called")
+
 	if r == nil {
 		return nil, false
 	}
@@ -95,11 +109,14 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
 }
 
 func writeJSON() error {
+	logger.Log.Println("feeds.writeJSON called")
+
 	writeMu.Lock()
 	defer writeMu.Unlock()
 
 	f, err := os.OpenFile(config.FeedPath, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
+		logger.Log.Println("feeds.writeJSON error", err)
 		return err
 	}
 	defer f.Close()
@@ -108,9 +125,14 @@ func writeJSON() error {
 	enc.SetIndent("", "  ")
 
 	data.Lock()
+	logger.Log.Println("feeds.writeJSON acquired data lock")
 	err = enc.Encode(&data)
 	data.Unlock()
 
+	if err != nil {
+		logger.Log.Println("feeds.writeJSON error", err)
+	}
+
 	return err
 }
 
@@ -118,6 +140,8 @@ func writeJSON() error {
 // It can be used to update a feed for a URL, although the package
 // will handle that on its own.
 func AddFeed(url string, feed *gofeed.Feed) error {
+	logger.Log.Println("feeds.AddFeed called")
+
 	if feed == nil {
 		panic("feed is nil")
 	}
@@ -128,17 +152,20 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 	}
 
 	data.feedMu.Lock()
-	data.Feeds[url] = feed
-	err := writeJSON()
-	if err != nil {
-		// Don't use in-memory if it couldn't be saved
-		delete(data.Feeds, url)
-		data.feedMu.Unlock()
-		return ErrSaving
-	}
-	data.feedMu.Unlock()
+	oldFeed, ok := data.Feeds[url]
+	if !ok || !reflect.DeepEqual(feed, oldFeed) {
+		// Feeds are different, or there was never an old one
 
-	LastUpdated = time.Now()
+		data.Feeds[url] = feed
+		data.feedMu.Unlock()
+		err := writeJSON()
+		if err != nil {
+			return ErrSaving
+		}
+		LastUpdated = time.Now()
+	} else {
+		data.feedMu.Unlock()
+	}
 	return nil
 }
 
@@ -146,6 +173,8 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 // It can be used to update the page as well, although the package
 // will handle that on its own.
 func AddPage(url string, r io.Reader) error {
+	logger.Log.Println("feeds.AddPage called")
+
 	if r == nil {
 		return nil
 	}
@@ -164,22 +193,23 @@ func AddPage(url string, r io.Reader) error {
 			Hash:    newHash,
 			Changed: time.Now().UTC(),
 		}
-	}
 
-	err := writeJSON()
-	if err != nil {
-		// Don't use in-memory if it couldn't be saved
-		delete(data.Pages, url)
 		data.pageMu.Unlock()
-		return err
+		err := writeJSON()
+		if err != nil {
+			return ErrSaving
+		}
+		LastUpdated = time.Now()
+	} else {
+		data.pageMu.Unlock()
 	}
-	data.pageMu.Unlock()
 
-	LastUpdated = time.Now()
 	return nil
 }
 
 func updateFeed(url string) error {
+	logger.Log.Println("feeds.updateFeed called")
+
 	res, err := client.Fetch(url)
 	if err != nil {
 		if res != nil {
@@ -205,6 +235,8 @@ func updateFeed(url string) error {
 }
 
 func updatePage(url string) error {
+	logger.Log.Println("feeds.updatePage called")
+
 	res, err := client.Fetch(url)
 	if err != nil {
 		if res != nil {
@@ -224,6 +256,8 @@ func updatePage(url string) error {
 // updateAll updates all feeds and pages using workers.
 // It only returns once all the workers are done.
 func updateAll() {
+	logger.Log.Println("feeds.updateAll called")
+
 	// TODO: Is two goroutines the right amount?
 
 	worker := func(jobs <-chan [2]string, wg *sync.WaitGroup) {
@@ -246,10 +280,19 @@ func updateAll() {
 	numJobs := len(data.Feeds) + len(data.Pages)
 	jobs := make(chan [2]string, numJobs)
 
+	if numJobs == 0 {
+		data.RUnlock()
+		return
+	}
+
 	// Start 2 workers, waiting for jobs
 	for w := 0; w < 2; w++ {
 		wg.Add(1)
-		go worker(jobs, &wg)
+		go func(i int) {
+			logger.Log.Println("started worker", i)
+			worker(jobs, &wg)
+			logger.Log.Println("ended worker", i)
+		}(w)
 	}
 
 	// Get map keys in a slice
@@ -277,6 +320,7 @@ func updateAll() {
 			jobs <- [2]string{"page", pageKeys[j-len(feedKeys)]}
 		}
 	}
+	close(jobs)
 
 	wg.Wait()
 }
@@ -287,6 +331,8 @@ func updateAll() {
 // so this function needs to be called again to get updates.
 // It always returns sorted entries - by post time, from newest to oldest.
 func GetPageEntries() *PageEntries {
+	logger.Log.Println("feeds.GetPageEntries called")
+
 	var pe PageEntries
 
 	data.RLock()
diff --git a/feeds/structs.go b/feeds/structs.go
index a5263a8..b21ae07 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -34,8 +34,8 @@ The time is in RFC 3339 format, preferably in the UTC timezone.
 
 // Decoded JSON
 type jsonData struct {
-	feedMu sync.RWMutex
-	pageMu sync.RWMutex
+	feedMu *sync.RWMutex
+	pageMu *sync.RWMutex
 	Feeds  map[string]*gofeed.Feed `json:"feeds,omitempty"`
 	Pages  map[string]*pageJSON    `json:"pages,omitempty"`
 }
@@ -69,7 +69,13 @@ type pageJSON struct {
 	Changed time.Time `json:"changed"` // When the latest change happened
 }
 
-var data jsonData // Global instance of jsonData - loaded from JSON and used
+// Global instance of jsonData - loaded from JSON and used
+var data = jsonData{
+	feedMu: &sync.RWMutex{},
+	pageMu: &sync.RWMutex{},
+	Feeds:  make(map[string]*gofeed.Feed),
+	Pages:  make(map[string]*pageJSON),
+}
 
 // PageEntry is a single item on a feed page.
 // It is used both for tracked feeds and pages.
diff --git a/renderer/page.go b/renderer/page.go
index d7afb80..1319d16 100644
--- a/renderer/page.go
+++ b/renderer/page.go
@@ -104,31 +104,34 @@ func MakePage(url string, res *gemini.Response, width, leftMargin int, proxied b
 	if mediatype == "text/gemini" {
 		rendered, links := RenderGemini(utfText, width, leftMargin, proxied)
 		return &structs.Page{
-			Mediatype: structs.TextGemini,
-			URL:       url,
-			Raw:       utfText,
-			Content:   rendered,
-			Links:     links,
+			Mediatype:    structs.TextGemini,
+			RawMediatype: mediatype,
+			URL:          url,
+			Raw:          utfText,
+			Content:      rendered,
+			Links:        links,
 		}, nil
 	} else if strings.HasPrefix(mediatype, "text/") {
 		if mediatype == "text/x-ansi" || strings.HasSuffix(url, ".ans") || strings.HasSuffix(url, ".ansi") {
 			// ANSI
 			return &structs.Page{
-				Mediatype: structs.TextAnsi,
-				URL:       url,
-				Raw:       utfText,
-				Content:   RenderANSI(utfText, leftMargin),
-				Links:     []string{},
+				Mediatype:    structs.TextAnsi,
+				RawMediatype: mediatype,
+				URL:          url,
+				Raw:          utfText,
+				Content:      RenderANSI(utfText, leftMargin),
+				Links:        []string{},
 			}, nil
 		}
 
 		// Treated as plaintext
 		return &structs.Page{
-			Mediatype: structs.TextPlain,
-			URL:       url,
-			Raw:       utfText,
-			Content:   RenderPlainText(utfText, leftMargin),
-			Links:     []string{},
+			Mediatype:    structs.TextPlain,
+			RawMediatype: mediatype,
+			URL:          url,
+			Raw:          utfText,
+			Content:      RenderPlainText(utfText, leftMargin),
+			Links:        []string{},
 		}, nil
 	}
 
diff --git a/structs/structs.go b/structs/structs.go
index 4dd194c..ce78fe0 100644
--- a/structs/structs.go
+++ b/structs/structs.go
@@ -18,18 +18,19 @@ const (
 
 // Page is for storing UTF-8 text/gemini pages, as well as text/plain pages.
 type Page struct {
-	URL        string
-	Mediatype  Mediatype
-	Raw        string   // The raw response, as received over the network
-	Content    string   // The processed content, NOT raw. Uses cview color tags. It will also have a left margin.
-	Links      []string // URLs, for each region in the content.
-	Row        int      // Scroll position
-	Column     int      // ditto
-	Width      int      // The terminal width when the Content was set, to know when reformatting should happen.
-	Selected   string   // The current text or link selected
-	SelectedID string   // The cview region ID for the selected text/link
-	Mode       PageMode
-	Favicon    string
+	URL          string
+	Mediatype    Mediatype // Used for rendering purposes, generalized
+	RawMediatype string    // The actual mediatype sent by the server
+	Raw          string    // The raw response, as received over the network
+	Content      string    // The processed content, NOT raw. Uses cview color tags. It will also have a left margin.
+	Links        []string  // URLs, for each region in the content.
+	Row          int       // Scroll position
+	Column       int       // ditto
+	Width        int       // The terminal width when the Content was set, to know when reformatting should happen.
+	Selected     string    // The current text or link selected
+	SelectedID   string    // The cview region ID for the selected text/link
+	Mode         PageMode
+	Favicon      string
 }
 
 // Size returns an approx. size of a Page in bytes.

From c72a225a43148176a11271a29c6cb18e2e780d4d Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Wed, 18 Nov 2020 16:10:22 -0500
Subject: [PATCH 15/33] =?UTF-8?q?=F0=9F=9A=A7=20Fix=20duplicate=20entries?=
 =?UTF-8?q?=20in=20feed=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NOTES.md         |  9 +++------
 display/feeds.go | 15 ++++++++++-----
 feeds/feeds.go   |  7 +++++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index 974e1ad..f79e8d9 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,17 +1,14 @@
 # Notes
 
-## Temp
-- Recalculating `about:feeds` adds pages multiple times to the view
-- Only options for feed files is the download modal - there should be a feed modal before that one
-- Auto feed detection fails on `ebc.li/atom.xml`
-
+## Feeds (temp)
+- Only options for "non-text" feed files is the download modal - there should be a feed modal before that one
+- Auto feed detection fails on `ebc.li/atom.xml` - which is text
 - TODO: remove all logger lines
   
 
 ## Issues
 - URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
 
-
 ## Regressions
 
 
diff --git a/display/feeds.go b/display/feeds.go
index 0203746..21c04ed 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -19,9 +19,6 @@ import (
 	"github.com/spf13/viper"
 )
 
-var feedPageRaw = "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
-	strings.Repeat("-", 80) + "\nSee the help (by pressing ?) for details on how to use this page.\n\n"
-
 var feedPageUpdated time.Time
 
 // toLocalDay truncates the provided time to a date only,
@@ -38,11 +35,17 @@ func Feeds(t *tab) {
 	// Retrieve cached version if there hasn't been any updates
 	p, ok := cache.GetPage("about:feeds")
 	if feedPageUpdated.After(feeds.LastUpdated) && ok {
+		logger.Log.Println("using cached feeds page")
 		setPage(t, p)
 		t.applyBottomBar()
 		return
 	}
 
+	logger.Log.Println("started rendering feeds page")
+
+	feedPageRaw := "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
+		strings.Repeat("-", 80) + "\nSee the help (by pressing ?) for details on how to use this page.\n\n"
+
 	// curDay represents what day of posts the loop is on.
 	// It only goes backwards in time.
 	// Its initial setting means:
@@ -62,7 +65,7 @@ func Feeds(t *tab) {
 
 		if pub.Before(curDay) {
 			// This post is on a new day, add a day header
-			curDay := pub
+			curDay = pub
 			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
 		feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
@@ -82,6 +85,8 @@ func Feeds(t *tab) {
 	t.applyBottomBar()
 
 	feedPageUpdated = time.Now()
+
+	logger.Log.Println("done rendering feeds page")
 }
 
 // openFeedModal displays the "Add feed/page" modal
@@ -159,7 +164,7 @@ func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) {
 	}
 }
 
-// addFeed goes through the process of adding a bookmark for the current page.
+// addFeed goes through the process of tracking the current page/feed.
 // It is the high-level way of doing it. It should be called in a goroutine.
 func addFeed() {
 	logger.Log.Println("display.addFeed called")
diff --git a/feeds/feeds.go b/feeds/feeds.go
index 224a797..a813eff 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -42,10 +42,12 @@ var LastUpdated time.Time
 func Init() error {
 	f, err := os.Open(config.FeedPath)
 	if err == nil {
+		// File exists and could be opened
 		defer f.Close()
 
 		fi, err := f.Stat()
 		if err == nil && fi.Size() > 0 {
+			// File is not empty
 			dec := json.NewDecoder(f)
 			err = dec.Decode(&data)
 			if err != nil && err != io.EOF {
@@ -156,13 +158,13 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 	if !ok || !reflect.DeepEqual(feed, oldFeed) {
 		// Feeds are different, or there was never an old one
 
+		LastUpdated = time.Now()
 		data.Feeds[url] = feed
 		data.feedMu.Unlock()
 		err := writeJSON()
 		if err != nil {
 			return ErrSaving
 		}
-		LastUpdated = time.Now()
 	} else {
 		data.feedMu.Unlock()
 	}
@@ -189,6 +191,8 @@ func AddPage(url string, r io.Reader) error {
 	_, ok := data.Pages[url]
 	if !ok || data.Pages[url].Hash != newHash {
 		// Page content is different, or it didn't exist
+
+		LastUpdated = time.Now()
 		data.Pages[url] = &pageJSON{
 			Hash:    newHash,
 			Changed: time.Now().UTC(),
@@ -199,7 +203,6 @@ func AddPage(url string, r io.Reader) error {
 		if err != nil {
 			return ErrSaving
 		}
-		LastUpdated = time.Now()
 	} else {
 		data.pageMu.Unlock()
 	}

From e026eb25e0e453cce7d61541ecb5d5a900c31886 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Wed, 18 Nov 2020 19:29:22 -0500
Subject: [PATCH 16/33] =?UTF-8?q?=F0=9F=90=9B=20Fix=20'concurrent=20map=20?=
 =?UTF-8?q?writes'=20panic=20and=20don't=20check=20for=20cert=20every=20ti?=
 =?UTF-8?q?me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/client.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/client/client.go b/client/client.go
index 2ec65d5..5f45f90 100644
--- a/client/client.go
+++ b/client/client.go
@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"net"
 	"net/url"
+	"sync"
 
 	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/mitchellh/go-homedir"
@@ -12,10 +13,14 @@ import (
 )
 
 var certCache = make(map[string][][]byte)
+var certCacheMu = &sync.RWMutex{}
 
 func clientCert(host string) ([]byte, []byte) {
-	if cert := certCache[host]; cert != nil {
-		return cert[0], cert[1]
+	certCacheMu.RLock()
+	pair, ok := certCache[host]
+	certCacheMu.RUnlock()
+	if ok {
+		return pair[0], pair[1]
 	}
 
 	// Expand paths starting with ~/
@@ -28,22 +33,30 @@ func clientCert(host string) ([]byte, []byte) {
 		keyPath = viper.GetString("auth.keys." + host)
 	}
 	if certPath == "" && keyPath == "" {
+		certCacheMu.Lock()
 		certCache[host] = [][]byte{nil, nil}
+		certCacheMu.Unlock()
 		return nil, nil
 	}
 
 	cert, err := ioutil.ReadFile(certPath)
 	if err != nil {
+		certCacheMu.Lock()
 		certCache[host] = [][]byte{nil, nil}
+		certCacheMu.Unlock()
 		return nil, nil
 	}
 	key, err := ioutil.ReadFile(keyPath)
 	if err != nil {
+		certCacheMu.Lock()
 		certCache[host] = [][]byte{nil, nil}
+		certCacheMu.Unlock()
 		return nil, nil
 	}
 
+	certCacheMu.Lock()
 	certCache[host] = [][]byte{cert, key}
+	certCacheMu.Unlock()
 	return cert, key
 }
 

From d0d8b15bbb06c4118f2f7973a8baf942adf005c8 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Wed, 18 Nov 2020 20:39:27 -0500
Subject: [PATCH 17/33] =?UTF-8?q?=F0=9F=9A=A7=20Autodetect=20all=20kinds?=
 =?UTF-8?q?=20of=20feeds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NOTES.md           |  3 ---
 config/config.go   |  2 +-
 display/private.go | 13 +++++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index f79e8d9..65a43a6 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,11 +1,8 @@
 # Notes
 
 ## Feeds (temp)
-- Only options for "non-text" feed files is the download modal - there should be a feed modal before that one
-- Auto feed detection fails on `ebc.li/atom.xml` - which is text
 - TODO: remove all logger lines
   
-
 ## Issues
 - URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
 
diff --git a/config/config.go b/config/config.go
index 8f783f2..8f988b6 100644
--- a/config/config.go
+++ b/config/config.go
@@ -230,7 +230,7 @@ func Init() error {
 	viper.SetDefault("a-general.page_max_size", 2097152)
 	viper.SetDefault("a-general.page_max_time", 10)
 	viper.SetDefault("a-general.emoji_favicons", false)
-	viper.SetDefault("a-general.feeds_popup", true)
+	viper.SetDefault("a-general.feed_popup", true)
 	viper.SetDefault("keybindings.shift_numbers", "!@#$%^&*()")
 	viper.SetDefault("url-handlers.other", "off")
 	viper.SetDefault("cache.max_size", 0)
diff --git a/display/private.go b/display/private.go
index ff41f91..6d06d69 100644
--- a/display/private.go
+++ b/display/private.go
@@ -5,9 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"mime"
 	"net"
 	"net/url"
 	"os/exec"
+	"path"
 	"strconv"
 	"strings"
 
@@ -585,6 +587,17 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 	}
 
 	// Status code 20, but not a document that can be displayed
+
+	// First see if it's a feed, and ask the user about adding it if it is
+	filename := path.Base(parsed.Path)
+	mediatype, _, _ := mime.ParseMediaType(res.Meta)
+	feed, ok := feeds.GetFeed(mediatype, filename, res.Body)
+	if ok {
+		go addFeedDirect(u, feed, feeds.IsTracked(u))
+		return ret("", false)
+	}
+
+	// Otherwise offer download choices
 	go dlChoice("That file could not be displayed. What would you like to do?", u, res)
 	return ret("", false)
 }

From 12321f82a7f3fe2012d96981d100db5f5db14e2e Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Wed, 18 Nov 2020 21:24:26 -0500
Subject: [PATCH 18/33] Update every X minutes with X workers

---
 config/config.go    |  4 +++-
 config/default.go   | 22 +++++++++++++++++++---
 default-config.toml | 22 +++++++++++++++++++---
 display/feeds.go    |  5 +++--
 display/private.go  |  2 +-
 feeds/feeds.go      | 26 +++++++++++++++++++++++---
 6 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/config/config.go b/config/config.go
index 8f988b6..65b2772 100644
--- a/config/config.go
+++ b/config/config.go
@@ -230,11 +230,13 @@ func Init() error {
 	viper.SetDefault("a-general.page_max_size", 2097152)
 	viper.SetDefault("a-general.page_max_time", 10)
 	viper.SetDefault("a-general.emoji_favicons", false)
-	viper.SetDefault("a-general.feed_popup", true)
 	viper.SetDefault("keybindings.shift_numbers", "!@#$%^&*()")
 	viper.SetDefault("url-handlers.other", "off")
 	viper.SetDefault("cache.max_size", 0)
 	viper.SetDefault("cache.max_pages", 20)
+	viper.SetDefault("feeds.popup", true)
+	viper.SetDefault("feeds.update_interval", 1800)
+	viper.SetDefault("feeds.workers", 3)
 
 	viper.SetConfigFile(configPath)
 	viper.SetConfigType("toml")
diff --git a/config/default.go b/config/default.go
index 556da67..ea8e65f 100644
--- a/config/default.go
+++ b/config/default.go
@@ -68,9 +68,6 @@ page_max_time = 10
 # Whether to replace tab numbers with emoji favicons, which are cached.
 emoji_favicons = false
 
-# Whether a pop-up appears when viewing a potential feed
-feed_popup = true
-
 
 [auth]
 # Authentication settings
@@ -134,6 +131,25 @@ max_pages = 30 # The maximum number of pages the cache will store
 # Note that HTTP and HTTPS are treated as separate protocols here.
 
 
+[feeds]
+# For tracking feeds and pages
+
+# Whether a pop-up appears when viewing a potential feed
+popup = true
+
+# How often to check for new feeds and pages in the background, in seconds.
+# Note Amfora will check for updates on browser start anyway.
+# Set it to 0 or below to disable this feature. You can still update individual
+# feeds manually, or just restart the browser to update all of them.
+update_interval = 1800 # 30 mins
+
+# How many pages/feeds can be checked at the same time when updating.
+# If you are tracking many feeds and pages you may want to increase this for
+# faster update times.
+# Any value below 1 will be corrected to 1.
+workers = 3
+
+
 [theme]
 # This section is for changing the COLORS used in Amfora.
 # These colors only apply if 'color' is enabled above.
diff --git a/default-config.toml b/default-config.toml
index 5855c02..0365613 100644
--- a/default-config.toml
+++ b/default-config.toml
@@ -65,9 +65,6 @@ page_max_time = 10
 # Whether to replace tab numbers with emoji favicons, which are cached.
 emoji_favicons = false
 
-# Whether a pop-up appears when viewing a potential feed
-feed_popup = true
-
 
 [auth]
 # Authentication settings
@@ -131,6 +128,25 @@ max_pages = 30 # The maximum number of pages the cache will store
 # Note that HTTP and HTTPS are treated as separate protocols here.
 
 
+[feeds]
+# For tracking feeds and pages
+
+# Whether a pop-up appears when viewing a potential feed
+popup = true
+
+# How often to check for new feeds and pages in the background, in seconds.
+# Note Amfora will check for updates on browser start anyway.
+# Set it to 0 or below to disable this feature. You can still update individual
+# feeds manually, or just restart the browser to update all of them.
+update_interval = 1800 # 30 mins
+
+# How many pages/feeds can be checked at the same time when updating.
+# If you are tracking many feeds and pages you may want to increase this for
+# faster update times.
+# Any value below 1 will be corrected to 1.
+workers = 3
+
+
 [theme]
 # This section is for changing the COLORS used in Amfora.
 # These colors only apply if 'color' is enabled above.
diff --git a/display/feeds.go b/display/feeds.go
index 21c04ed..40ea59a 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -43,8 +43,9 @@ func Feeds(t *tab) {
 
 	logger.Log.Println("started rendering feeds page")
 
-	feedPageRaw := "# Feeds & Pages\n\nUpdates" + strings.Repeat(" ", 80-25) + "[Newest -> Oldest]\n" +
-		strings.Repeat("-", 80) + "\nSee the help (by pressing ?) for details on how to use this page.\n\n"
+	feedPageRaw := "# Feeds & Pages\n\n" +
+		"See the help (by pressing ?) for details on how to use this page.\n\n" +
+		"If you just opened Amfora then updates will appear incrementally. Reload the page to see them.\n"
 
 	// curDay represents what day of posts the loop is on.
 	// It only goes backwards in time.
diff --git a/display/private.go b/display/private.go
index 6d06d69..69b5200 100644
--- a/display/private.go
+++ b/display/private.go
@@ -338,7 +338,7 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 		t.mode = tabModeDone
 
 		go func(p *structs.Page) {
-			if b && t.hasContent() && !feeds.IsTracked(s) && viper.GetBool("a-general.feed_popup") {
+			if b && t.hasContent() && !feeds.IsTracked(s) && viper.GetBool("feeds.popup") {
 				// The current page might be an untracked feed, and the user wants
 				// to be notified in such cases.
 
diff --git a/feeds/feeds.go b/feeds/feeds.go
index a813eff..cb0b0bf 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -21,6 +21,7 @@ import (
 	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/mmcdole/gofeed"
+	"github.com/spf13/viper"
 )
 
 // TODO: Test for deadlocks and whether there should be more
@@ -60,7 +61,21 @@ func Init() error {
 	}
 
 	LastUpdated = time.Now()
-	go updateAll()
+
+	if viper.GetInt("feeds.update_interval") > 0 {
+		// Update feeds and pages every so often
+		go func() {
+			for {
+				updateAll()
+				time.Sleep(time.Duration(viper.GetInt("feeds.update_interval")) * time.Second)
+			}
+		}()
+	} else {
+		// User disabled automatic feed/page updates
+		// So just update once at the beginning
+		go updateAll()
+	}
+
 	return nil
 }
 
@@ -288,8 +303,13 @@ func updateAll() {
 		return
 	}
 
-	// Start 2 workers, waiting for jobs
-	for w := 0; w < 2; w++ {
+	numWorkers := viper.GetInt("feed.workers")
+	if numWorkers < 1 {
+		numWorkers = 1
+	}
+
+	// Start workers, waiting for jobs
+	for w := 0; w < numWorkers; w++ {
 		wg.Add(1)
 		go func(i int) {
 			logger.Log.Println("started worker", i)

From ce81c97defe476564056e6e55056a97c5890563c Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Thu, 19 Nov 2020 11:34:10 -0500
Subject: [PATCH 19/33] Display paths better, remove more unused content, fix
 author nil panic

---
 display/feeds.go |  9 ++++++++-
 feeds/feeds.go   | 38 ++++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/display/feeds.go b/display/feeds.go
index 40ea59a..24dd886 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -69,7 +69,14 @@ func Feeds(t *tab) {
 			curDay = pub
 			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
-		feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
+		if entry.Title == "" || entry.Title == "/" {
+			// Just put author
+			// Mainly used for when you're tracking the root domain of a site
+			feedPageRaw += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Author)
+		} else {
+			// Include title and dash
+			feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
+		}
 	}
 
 	content, links := renderer.RenderGemini(feedPageRaw, textWidth(), leftMargin(), false)
diff --git a/feeds/feeds.go b/feeds/feeds.go
index cb0b0bf..fa426eb 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -163,9 +163,23 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 		panic("feed is nil")
 	}
 
-	// Remove any content to save memory and disk space
+	// Remove any unused fields to save memory and disk space
+	feed.Image = nil
+	feed.Generator = ""
+	feed.Categories = nil
+	feed.DublinCoreExt = nil
+	feed.ITunesExt = nil
+	feed.Custom = nil
 	for _, item := range feed.Items {
+		item.Description = ""
 		item.Content = ""
+		item.Image = nil
+		item.Categories = nil
+		item.Enclosures = nil
+		item.DublinCoreExt = nil
+		item.ITunesExt = nil
+		item.Extensions = nil
+		item.Custom = nil
 	}
 
 	data.feedMu.Lock()
@@ -376,8 +390,19 @@ func GetPageEntries() *PageEntries {
 				pub = time.Now()
 			}
 
+			var author string
+			if feed.Author == nil {
+				if item.Author == nil {
+					author = "[author unknown]"
+				} else {
+					author = item.Author.Name
+				}
+			} else {
+				author = feed.Author.Name
+			}
+
 			pe.Entries = append(pe.Entries, &PageEntry{
-				Author:    feed.Author.Name,
+				Author:    author,
 				Title:     item.Title,
 				URL:       item.Link,
 				Published: pub,
@@ -387,9 +412,14 @@ func GetPageEntries() *PageEntries {
 
 	for url, page := range data.Pages {
 		parsed, _ := urlPkg.Parse(url)
+
+		// Path is title
+		// "/users/" is removed for aesthetics when tracking hosted users
+		title := strings.TrimPrefix(parsed.Path, "/users/")
+
 		pe.Entries = append(pe.Entries, &PageEntry{
-			Author:    parsed.Host,            // Domain is author
-			Title:     path.Base(parsed.Path), // Filename is title
+			Author:    parsed.Host, // Domain is author
+			Title:     title,
 			URL:       url,
 			Published: page.Changed,
 		})

From fb8af885abd34e06717528448089e3dc8ecc9b5a Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Thu, 19 Nov 2020 11:39:08 -0500
Subject: [PATCH 20/33] Fix duplicated bookmarks bug

---
 display/bookmarks.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/display/bookmarks.go b/display/bookmarks.go
index 8b0fe9a..0c8e658 100644
--- a/display/bookmarks.go
+++ b/display/bookmarks.go
@@ -108,10 +108,10 @@ func openBkmkModal(name string, exists bool, favicon string) (string, int) {
 	return bkmkModalText, action
 }
 
-var bkmkPageRaw = "# Bookmarks\r\n\r\n"
-
 // Bookmarks displays the bookmarks page on the current tab.
 func Bookmarks(t *tab) {
+	bkmkPageRaw := "# Bookmarks\r\n\r\n"
+
 	// Gather bookmarks
 	m, keys := bookmarks.All()
 	for i := range keys {

From 8ffc0ca29c0ad0c85616b9ba16d977f49bb7bed8 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Thu, 19 Nov 2020 12:50:49 -0500
Subject: [PATCH 21/33] Refine post prefix logic

Improved for hosted users and feeds with titles and authors.
---
 NOTES.md         |  1 +
 README.md        |  5 +++--
 display/feeds.go |  6 ++---
 feeds/feeds.go   | 57 ++++++++++++++++++++++++++++++++++++++----------
 feeds/structs.go |  2 +-
 5 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index 65a43a6..9c5a0af 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,6 +1,7 @@
 # Notes
 
 ## Feeds (temp)
+- Feed page doesn't update automatically if you add a feed by bottom bar URL while already on the feed page
 - TODO: remove all logger lines
   
 ## Issues
diff --git a/README.md b/README.md
index 844ed66..faeac87 100644
--- a/README.md
+++ b/README.md
@@ -127,8 +127,9 @@ Features in *italics* are in the master branch, but not in the latest release.
     - Manage and browse them
     - Similar to [Kristall](https://github.com/MasterQ32/kristall)
     - https://lists.orbitalfox.eu/archives/gemini/2020/001400.html
-- [x] *Subscribe to RSS and Atom feeds and display them*
-  - Subscribing to page changes, similar to how Spacewalk works, will also be supported
+- [x] Subscribe to feeds and display them
+  - Tracking page changes is also supported
+  - RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
 - [ ] Stream support
 - [ ] Table of contents for pages
 - [ ] History browser
diff --git a/display/feeds.go b/display/feeds.go
index 24dd886..3478a32 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -70,12 +70,12 @@ func Feeds(t *tab) {
 			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
 		if entry.Title == "" || entry.Title == "/" {
-			// Just put author
+			// Just put author/title
 			// Mainly used for when you're tracking the root domain of a site
-			feedPageRaw += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Author)
+			feedPageRaw += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
 		} else {
 			// Include title and dash
-			feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Author, entry.Title)
+			feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
 		}
 	}
 
diff --git a/feeds/feeds.go b/feeds/feeds.go
index fa426eb..35c318c 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -317,7 +317,7 @@ func updateAll() {
 		return
 	}
 
-	numWorkers := viper.GetInt("feed.workers")
+	numWorkers := viper.GetInt("feeds.workers")
 	if numWorkers < 1 {
 		numWorkers = 1
 	}
@@ -390,19 +390,39 @@ func GetPageEntries() *PageEntries {
 				pub = time.Now()
 			}
 
-			var author string
-			if feed.Author == nil {
-				if item.Author == nil {
-					author = "[author unknown]"
+			// Prefer using the feed title over anything else.
+			// Many feeds in Gemini only have this due to gemfeed's default settings.
+			prefix := feed.Title
+
+			if prefix == "" {
+				// feed.Title was empty
+				if feed.Author != nil {
+					// Prefer using the feed author over the item author
+					prefix = feed.Author.Name
 				} else {
-					author = item.Author.Name
+					if item.Author != nil {
+						prefix = item.Author.Name
+					} else {
+						prefix = "[author unknown]"
+					}
 				}
 			} else {
-				author = feed.Author.Name
+				// There's already a title, so add the author (if exists) to
+				// the end of the title in parentheses.
+				// Don't add the author if it's the same as the title.
+
+				if feed.Author != nil && feed.Author.Name != prefix {
+					// Prefer using the feed author over the item author
+					prefix += " (" + feed.Author.Name + ")"
+				} else {
+					if item.Author != nil && item.Author.Name != prefix {
+						prefix += " (" + item.Author.Name + ")"
+					}
+				}
 			}
 
 			pe.Entries = append(pe.Entries, &PageEntry{
-				Author:    author,
+				Prefix:    prefix,
 				Title:     item.Title,
 				URL:       item.Link,
 				Published: pub,
@@ -414,11 +434,26 @@ func GetPageEntries() *PageEntries {
 		parsed, _ := urlPkg.Parse(url)
 
 		// Path is title
-		// "/users/" is removed for aesthetics when tracking hosted users
-		title := strings.TrimPrefix(parsed.Path, "/users/")
+		title := parsed.Path
+		if strings.HasPrefix(title, "/~") {
+			// A user dir
+			title = title[2:] // Remove beginning slash and tilde
+			// Remove trailing slash if the root of a user dir is being tracked
+			if strings.Count(title, "/") <= 1 && title[len(title)-1] == '/' {
+				title = title[:len(title)-1]
+			}
+		} else if strings.HasPrefix(title, "/users/") {
+			// "/users/" is removed for aesthetics when tracking hosted users
+			title = strings.TrimPrefix(title, "/users/")
+			title = strings.TrimPrefix(title, "~") // Remove leading tilde
+			// Remove trailing slash if the root of a user dir is being tracked
+			if strings.Count(title, "/") <= 1 && title[len(title)-1] == '/' {
+				title = title[:len(title)-1]
+			}
+		}
 
 		pe.Entries = append(pe.Entries, &PageEntry{
-			Author:    parsed.Host, // Domain is author
+			Prefix:    parsed.Host,
 			Title:     title,
 			URL:       url,
 			Published: page.Changed,
diff --git a/feeds/structs.go b/feeds/structs.go
index b21ae07..a44b190 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -80,7 +80,7 @@ var data = jsonData{
 // PageEntry is a single item on a feed page.
 // It is used both for tracked feeds and pages.
 type PageEntry struct {
-	Author    string
+	Prefix    string // Feed/log title, author, etc - something before the post title
 	Title     string
 	URL       string
 	Published time.Time

From 8875af6c5721a6f3bb1c86c3c7161e601b0856b2 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Thu, 19 Nov 2020 21:14:19 -0500
Subject: [PATCH 22/33] Ask about downloading if user doesn't add feed

---
 NOTES.md           | 5 +----
 display/feeds.go   | 8 ++++++--
 display/private.go | 8 +++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index 9c5a0af..da2c060 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -3,13 +3,10 @@
 ## Feeds (temp)
 - Feed page doesn't update automatically if you add a feed by bottom bar URL while already on the feed page
 - TODO: remove all logger lines
-  
+
 ## Issues
 - URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
 
-## Regressions
-
-
 ## Upstream Bugs
 - Wrapping messes up on brackets
   - Filed [issue 23](https://gitlab.com/tslocum/cview/-/issues/23)
diff --git a/display/feeds.go b/display/feeds.go
index 3478a32..aacd1b7 100644
--- a/display/feeds.go
+++ b/display/feeds.go
@@ -158,10 +158,12 @@ func getFeedFromPage(p *structs.Page) (*gofeed.Feed, bool) {
 
 // addFeedDirect is only for adding feeds, not pages.
 // It's for when you already have a feed and know if it's tracked.
-// Use mainly by handleURL because it already did a lot of the work.
+// Used mainly by handleURL because it already did a lot of the work.
+// It returns a bool indicating whether the user actually wanted to
+// add the feed or not.
 //
 // Like addFeed, it should be called in a goroutine.
-func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) {
+func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) bool {
 	logger.Log.Println("display.addFeedDirect called")
 
 	if openFeedModal(true, tracked) {
@@ -169,7 +171,9 @@ func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) {
 		if err != nil {
 			Error("Feed Error", err.Error())
 		}
+		return true
 	}
+	return false
 }
 
 // addFeed goes through the process of tracking the current page/feed.
diff --git a/display/private.go b/display/private.go
index 69b5200..3ebe5f8 100644
--- a/display/private.go
+++ b/display/private.go
@@ -593,7 +593,13 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 	mediatype, _, _ := mime.ParseMediaType(res.Meta)
 	feed, ok := feeds.GetFeed(mediatype, filename, res.Body)
 	if ok {
-		go addFeedDirect(u, feed, feeds.IsTracked(u))
+		go func() {
+			added := addFeedDirect(u, feed, feeds.IsTracked(u))
+			if !added {
+				// Otherwise offer download choices
+				go dlChoice("That file could not be displayed. What would you like to do?", u, res)
+			}
+		}()
 		return ret("", false)
 	}
 

From ef8295b0a42491360833d831360f48aa2e047455 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sun, 22 Nov 2020 20:04:09 -0500
Subject: [PATCH 23/33] Handle multiple links per post, prefer item author over
 feed author

---
 NOTES.md         |   3 +-
 feeds/entries.go | 148 +++++++++++++++++++++++++++++++++++++++++++++++
 feeds/feeds.go   | 109 +---------------------------------
 feeds/structs.go |   2 +-
 go.mod           |   2 +
 go.sum           |   4 +-
 6 files changed, 158 insertions(+), 110 deletions(-)
 create mode 100644 feeds/entries.go

diff --git a/NOTES.md b/NOTES.md
index da2c060..bd6951a 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,7 +1,8 @@
 # Notes
 
 ## Feeds (temp)
-- Feed page doesn't update automatically if you add a feed by bottom bar URL while already on the feed page
+- Support multiple links in Atom feeds
+  - Display gemini one if it exist, then HTTP(S), then whatever is first
 - TODO: remove all logger lines
 
 ## Issues
diff --git a/feeds/entries.go b/feeds/entries.go
new file mode 100644
index 0000000..9e40998
--- /dev/null
+++ b/feeds/entries.go
@@ -0,0 +1,148 @@
+package feeds
+
+import (
+	"net/url"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/makeworld-the-better-one/amfora/logger"
+)
+
+// This file contains funcs for creating PageEntries, which
+// are consumed by display/feeds.go
+
+// getURL returns a URL to be used in a PageEntry, from a
+// list of URLs for that item. It prefers gemini URLs, then
+// HTTP(S), then by order.
+func getURL(urls []string) string {
+	if len(urls) == 0 {
+		return ""
+	}
+
+	var firstHTTP string
+	for _, u := range urls {
+		if strings.HasPrefix(u, "gemini://") {
+			return u
+		}
+		if (strings.HasPrefix(u, "http://") || strings.HasPrefix(u, "https://")) && firstHTTP == "" {
+			// First HTTP(S) URL in the list
+			firstHTTP = u
+		}
+	}
+	if firstHTTP != "" {
+		return firstHTTP
+	}
+	return urls[0]
+}
+
+// GetPageEntries returns the current list of PageEntries
+// for use in rendering a page.
+// The contents of the returned entries will never change,
+// so this function needs to be called again to get updates.
+// It always returns sorted entries - by post time, from newest to oldest.
+func GetPageEntries() *PageEntries {
+	logger.Log.Println("feeds.GetPageEntries called")
+
+	var pe PageEntries
+
+	data.RLock()
+
+	for _, feed := range data.Feeds {
+		for _, item := range feed.Items {
+			if item.Links == nil || len(item.Links) == 0 {
+				// Ignore items without links
+				continue
+			}
+
+			// Set pub
+
+			var pub time.Time
+
+			// Try to use updated time first, then published
+
+			if !item.UpdatedParsed.IsZero() {
+				pub = *item.UpdatedParsed
+			} else if !item.PublishedParsed.IsZero() {
+				pub = *item.PublishedParsed
+			} else {
+				// No time on the post
+				pub = time.Now()
+			}
+
+			// Set prefix
+
+			// Prefer using the feed title over anything else.
+			// Many feeds in Gemini only have this due to gemfeed's default settings.
+			prefix := feed.Title
+
+			if prefix == "" {
+				// feed.Title was empty
+
+				if item.Author != nil {
+					// Prefer using the item author over the feed author
+					prefix = item.Author.Name
+				} else {
+					if feed.Author != nil {
+						prefix = feed.Author.Name
+					} else {
+						prefix = "[author unknown]"
+					}
+				}
+			} else {
+				// There's already a title, so add the author (if exists) to
+				// the end of the title in parentheses.
+				// Don't add the author if it's the same as the title.
+
+				if item.Author != nil && item.Author.Name != prefix {
+					// Prefer using the item author over the feed author
+					prefix += " (" + item.Author.Name + ")"
+				} else if feed.Author != nil && feed.Author.Name != prefix {
+					prefix += " (" + feed.Author.Name + ")"
+				}
+			}
+
+			pe.Entries = append(pe.Entries, &PageEntry{
+				Prefix:    prefix,
+				Title:     item.Title,
+				URL:       getURL(item.Links),
+				Published: pub,
+			})
+		}
+	}
+
+	for u, page := range data.Pages {
+		parsed, _ := url.Parse(u)
+
+		// Path is title
+		title := parsed.Path
+		if strings.HasPrefix(title, "/~") {
+			// A user dir
+			title = title[2:] // Remove beginning slash and tilde
+			// Remove trailing slash if the root of a user dir is being tracked
+			if strings.Count(title, "/") <= 1 && title[len(title)-1] == '/' {
+				title = title[:len(title)-1]
+			}
+		} else if strings.HasPrefix(title, "/users/") {
+			// "/users/" is removed for aesthetics when tracking hosted users
+			title = strings.TrimPrefix(title, "/users/")
+			title = strings.TrimPrefix(title, "~") // Remove leading tilde
+			// Remove trailing slash if the root of a user dir is being tracked
+			if strings.Count(title, "/") <= 1 && title[len(title)-1] == '/' {
+				title = title[:len(title)-1]
+			}
+		}
+
+		pe.Entries = append(pe.Entries, &PageEntry{
+			Prefix:    parsed.Host,
+			Title:     title,
+			URL:       u,
+			Published: page.Changed,
+		})
+	}
+
+	data.RUnlock()
+
+	sort.Sort(&pe)
+	return &pe
+}
diff --git a/feeds/feeds.go b/feeds/feeds.go
index 35c318c..61b532a 100644
--- a/feeds/feeds.go
+++ b/feeds/feeds.go
@@ -7,11 +7,9 @@ import (
 	"fmt"
 	"io"
 	"mime"
-	urlPkg "net/url"
 	"os"
 	"path"
 	"reflect"
-	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -170,6 +168,8 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 	feed.DublinCoreExt = nil
 	feed.ITunesExt = nil
 	feed.Custom = nil
+	feed.Link = ""
+	feed.Links = nil
 	for _, item := range feed.Items {
 		item.Description = ""
 		item.Content = ""
@@ -180,6 +180,7 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 		item.ITunesExt = nil
 		item.Extensions = nil
 		item.Custom = nil
+		item.Link = "" // Links is used instead
 	}
 
 	data.feedMu.Lock()
@@ -361,107 +362,3 @@ func updateAll() {
 
 	wg.Wait()
 }
-
-// GetPageEntries returns the current list of PageEntries
-// for use in rendering a page.
-// The contents of the returned entries will never change,
-// so this function needs to be called again to get updates.
-// It always returns sorted entries - by post time, from newest to oldest.
-func GetPageEntries() *PageEntries {
-	logger.Log.Println("feeds.GetPageEntries called")
-
-	var pe PageEntries
-
-	data.RLock()
-
-	for _, feed := range data.Feeds {
-		for _, item := range feed.Items {
-
-			var pub time.Time
-
-			// Try to use updated time first, then published
-
-			if !item.UpdatedParsed.IsZero() {
-				pub = *item.UpdatedParsed
-			} else if !item.PublishedParsed.IsZero() {
-				pub = *item.PublishedParsed
-			} else {
-				// No time on the post
-				pub = time.Now()
-			}
-
-			// Prefer using the feed title over anything else.
-			// Many feeds in Gemini only have this due to gemfeed's default settings.
-			prefix := feed.Title
-
-			if prefix == "" {
-				// feed.Title was empty
-				if feed.Author != nil {
-					// Prefer using the feed author over the item author
-					prefix = feed.Author.Name
-				} else {
-					if item.Author != nil {
-						prefix = item.Author.Name
-					} else {
-						prefix = "[author unknown]"
-					}
-				}
-			} else {
-				// There's already a title, so add the author (if exists) to
-				// the end of the title in parentheses.
-				// Don't add the author if it's the same as the title.
-
-				if feed.Author != nil && feed.Author.Name != prefix {
-					// Prefer using the feed author over the item author
-					prefix += " (" + feed.Author.Name + ")"
-				} else {
-					if item.Author != nil && item.Author.Name != prefix {
-						prefix += " (" + item.Author.Name + ")"
-					}
-				}
-			}
-
-			pe.Entries = append(pe.Entries, &PageEntry{
-				Prefix:    prefix,
-				Title:     item.Title,
-				URL:       item.Link,
-				Published: pub,
-			})
-		}
-	}
-
-	for url, page := range data.Pages {
-		parsed, _ := urlPkg.Parse(url)
-
-		// Path is title
-		title := parsed.Path
-		if strings.HasPrefix(title, "/~") {
-			// A user dir
-			title = title[2:] // Remove beginning slash and tilde
-			// Remove trailing slash if the root of a user dir is being tracked
-			if strings.Count(title, "/") <= 1 && title[len(title)-1] == '/' {
-				title = title[:len(title)-1]
-			}
-		} else if strings.HasPrefix(title, "/users/") {
-			// "/users/" is removed for aesthetics when tracking hosted users
-			title = strings.TrimPrefix(title, "/users/")
-			title = strings.TrimPrefix(title, "~") // Remove leading tilde
-			// Remove trailing slash if the root of a user dir is being tracked
-			if strings.Count(title, "/") <= 1 && title[len(title)-1] == '/' {
-				title = title[:len(title)-1]
-			}
-		}
-
-		pe.Entries = append(pe.Entries, &PageEntry{
-			Prefix:    parsed.Host,
-			Title:     title,
-			URL:       url,
-			Published: page.Changed,
-		})
-	}
-
-	data.RUnlock()
-
-	sort.Sort(&pe)
-	return &pe
-}
diff --git a/feeds/structs.go b/feeds/structs.go
index a44b190..6fa2aa9 100644
--- a/feeds/structs.go
+++ b/feeds/structs.go
@@ -8,7 +8,7 @@ import (
 )
 
 /*
-Example JSON
+Example stored JSON.
 
 {
 	"feeds": {
diff --git a/go.mod b/go.mod
index 63c4281..796274e 100644
--- a/go.mod
+++ b/go.mod
@@ -27,3 +27,5 @@ require (
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/ini.v1 v1.57.0 // indirect
 )
+
+replace github.com/mmcdole/gofeed => github.com/makeworld-the-better-one/gofeed v1.1.1-0.20201123002655-c0c6354134fe
diff --git a/go.sum b/go.sum
index c15d2a0..f26e776 100644
--- a/go.sum
+++ b/go.sum
@@ -137,6 +137,8 @@ github.com/makeworld-the-better-one/go-gemini v0.9.1 h1:/Vc6Y4Y1aOi4lZIBA1wDe+4N
 github.com/makeworld-the-better-one/go-gemini v0.9.1/go.mod h1:P7/FbZ+IEIbA/d+A0Y3w2GNgD8SA2AcNv7aDGJbaWG4=
 github.com/makeworld-the-better-one/go-isemoji v1.1.0 h1:wZBHOKB5zAIgaU2vaWnXFDDhatebB8TySrNVxjVV84g=
 github.com/makeworld-the-better-one/go-isemoji v1.1.0/go.mod h1:FBjkPl9rr0G4vlZCc+Mr+QcnOfGCTbGWYW8/1sp06I0=
+github.com/makeworld-the-better-one/gofeed v1.1.1-0.20201123002655-c0c6354134fe h1:i3b9Qy5z23DcXRnrsMYcM5s9Ng5VIidM1xZd+szuTsY=
+github.com/makeworld-the-better-one/gofeed v1.1.1-0.20201123002655-c0c6354134fe/go.mod h1:QQO3maftbOu+hiVOGOZDRLymqGQCos4zxbA4j89gMrE=
 github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f h1:YEUlTs5gb35UlBLTgqrub9axWTYB3d7/8TxrkJDZpRI=
 github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f/go.mod h1:X6sxWNi9PBgQybpR4fpXPVD5fm7svLqZTQ5DJuERIoM=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -161,8 +163,6 @@ 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.0 h1:T2WrGLVJRV04PY2qwhEJLHCt9JiCtBhb6SmC8ZvJH08=
-github.com/mmcdole/gofeed v1.1.0/go.mod h1:PPiVwgDXLlz2N83KB4TrIim2lyYM5Zn7ZWH9Pi4oHUk=
 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=

From f6e89fdaa14d1860f3548e39ced48510075592e5 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 27 Nov 2020 17:01:29 -0500
Subject: [PATCH 24/33] Switch subscription-based naming

---
 NOTES.md                                      |  2 +-
 README.md                                     |  4 +-
 amfora.go                                     |  6 +-
 config/config.go                              | 22 ++---
 config/default.go                             | 22 ++---
 config/theme.go                               | 28 +++---
 default-config.toml                           | 22 ++---
 display/display.go                            | 12 +--
 display/help.go                               |  4 +-
 display/newtab.go                             |  2 +-
 display/private.go                            | 20 ++--
 display/{feeds.go => subscriptions.go}        | 92 +++++++++----------
 {feeds => subscriptions}/entries.go           |  6 +-
 {feeds => subscriptions}/structs.go           | 13 +--
 .../subscriptions.go                          | 53 +++++------
 15 files changed, 155 insertions(+), 153 deletions(-)
 rename display/{feeds.go => subscriptions.go} (59%)
 rename {feeds => subscriptions}/entries.go (96%)
 rename {feeds => subscriptions}/structs.go (91%)
 rename feeds/feeds.go => subscriptions/subscriptions.go (80%)

diff --git a/NOTES.md b/NOTES.md
index 0ed9778..57b0ee2 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,6 +1,6 @@
 # Notes
 
-## Feeds (temp)
+## Subscriptions (temp)
 - TODO: remove all logger lines
 
 ## Issues
diff --git a/README.md b/README.md
index 667e750..28a3ad1 100644
--- a/README.md
+++ b/README.md
@@ -128,9 +128,9 @@ Features in *italics* are in the master branch, but not in the latest release.
     - Manage and browse them
     - Similar to [Kristall](https://github.com/MasterQ32/kristall)
     - https://lists.orbitalfox.eu/archives/gemini/2020/001400.html
-- [x] Subscribe to feeds and display them
-  - Tracking page changes is also supported
+- [x] Subscriptions
   - RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
+  - So is tracking any page to be notified when it changes
 - [ ] Stream support
 - [ ] Table of contents for pages
 - [ ] History browser
diff --git a/amfora.go b/amfora.go
index 25d9365..e3c5690 100644
--- a/amfora.go
+++ b/amfora.go
@@ -7,8 +7,8 @@ import (
 	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/display"
-	"github.com/makeworld-the-better-one/amfora/feeds"
 	"github.com/makeworld-the-better-one/amfora/logger"
+	"github.com/makeworld-the-better-one/amfora/subscriptions"
 )
 
 var (
@@ -45,9 +45,9 @@ func main() {
 		fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
 		os.Exit(1)
 	}
-	err = feeds.Init()
+	err = subscriptions.Init()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "feeds.json error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "subscriptions.json error: %v\n", err)
 		os.Exit(1)
 	}
 
diff --git a/config/config.go b/config/config.go
index 65b2772..e32654b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -39,9 +39,9 @@ var bkmkPath string
 
 var DownloadsDir string
 
-// Feeds
-var feedDir string
-var FeedPath string
+// Subscriptions
+var subscriptionDir string
+var SubscriptionPath string
 
 // Command for opening HTTP(S) URLs in the browser, from "a-general.http" in config.
 var HTTPCommand []string
@@ -103,18 +103,18 @@ func Init() error {
 	// Feeds dir and path
 	if runtime.GOOS == "windows" {
 		// In APPDATA beside other Amfora files
-		feedDir = amforaAppData
+		subscriptionDir = amforaAppData
 	} else {
 		// XDG data dir on POSIX systems
 		xdg_data, ok := os.LookupEnv("XDG_DATA_HOME")
 		if ok && strings.TrimSpace(xdg_data) != "" {
-			feedDir = filepath.Join(xdg_data, "amfora")
+			subscriptionDir = filepath.Join(xdg_data, "amfora")
 		} else {
 			// Default to ~/.local/share/amfora
-			feedDir = filepath.Join(home, ".local", "share", "amfora")
+			subscriptionDir = filepath.Join(home, ".local", "share", "amfora")
 		}
 	}
-	FeedPath = filepath.Join(feedDir, "feeds.json")
+	SubscriptionPath = filepath.Join(subscriptionDir, "subscriptions.json")
 
 	// *** Create necessary files and folders ***
 
@@ -152,7 +152,7 @@ func Init() error {
 		f.Close()
 	}
 	// Feeds
-	err = os.MkdirAll(feedDir, 0755)
+	err = os.MkdirAll(subscriptionDir, 0755)
 	if err != nil {
 		return err
 	}
@@ -234,9 +234,9 @@ func Init() error {
 	viper.SetDefault("url-handlers.other", "off")
 	viper.SetDefault("cache.max_size", 0)
 	viper.SetDefault("cache.max_pages", 20)
-	viper.SetDefault("feeds.popup", true)
-	viper.SetDefault("feeds.update_interval", 1800)
-	viper.SetDefault("feeds.workers", 3)
+	viper.SetDefault("subscriptions.popup", true)
+	viper.SetDefault("subscriptions.update_interval", 1800)
+	viper.SetDefault("subscriptions.workers", 3)
 
 	viper.SetConfigFile(configPath)
 	viper.SetConfigType("toml")
diff --git a/config/default.go b/config/default.go
index b3dca36..705664e 100644
--- a/config/default.go
+++ b/config/default.go
@@ -135,22 +135,22 @@ max_pages = 30 # The maximum number of pages the cache will store
 # Note that HTTP and HTTPS are treated as separate protocols here.
 
 
-[feeds]
+[subscriptions]
 # For tracking feeds and pages
 
 # Whether a pop-up appears when viewing a potential feed
 popup = true
 
-# How often to check for new feeds and pages in the background, in seconds.
-# Note Amfora will check for updates on browser start anyway.
-# Set it to 0 or below to disable this feature. You can still update individual
-# feeds manually, or just restart the browser to update all of them.
+# How often to check for updates to subscriptions in the background, in seconds.
+# Set it to 0 to disable this feature. You can still update individual feeds
+# manually, or restart the browser.
+#
+# Note Amfora will check for updates on browser start no matter what this setting is.
 update_interval = 1800 # 30 mins
 
-# How many pages/feeds can be checked at the same time when updating.
-# If you are tracking many feeds and pages you may want to increase this for
-# faster update times.
-# Any value below 1 will be corrected to 1.
+# How many subscriptions can be checked at the same time when updating.
+# If you have many subscriptions you may want to increase this for faster
+# update times. Any value below 1 will be corrected to 1.
 workers = 3
 
 
@@ -212,8 +212,8 @@ workers = 3
 # yesno_modal_text
 # tofu_modal_bg
 # tofu_modal_text
-# feed_modal_bg
-# feed_modal_text
+# subscription_modal_bg
+# subscription_modal_text
 
 # input_modal_bg
 # input_modal_text
diff --git a/config/theme.go b/config/theme.go
index 71f42dc..9bb05d7 100644
--- a/config/theme.go
+++ b/config/theme.go
@@ -26,20 +26,20 @@ var theme = map[string]tcell.Color{
 	"btn_bg":   tcell.ColorNavy, // All modal buttons
 	"btn_text": tcell.ColorWhite,
 
-	"dl_choice_modal_bg":   tcell.ColorPurple,
-	"dl_choice_modal_text": tcell.ColorWhite,
-	"dl_modal_bg":          tcell.Color130, // xterm:DarkOrange3, #af5f00
-	"dl_modal_text":        tcell.ColorWhite,
-	"info_modal_bg":        tcell.ColorGray,
-	"info_modal_text":      tcell.ColorWhite,
-	"error_modal_bg":       tcell.ColorMaroon,
-	"error_modal_text":     tcell.ColorWhite,
-	"yesno_modal_bg":       tcell.ColorPurple,
-	"yesno_modal_text":     tcell.ColorWhite,
-	"tofu_modal_bg":        tcell.ColorMaroon,
-	"tofu_modal_text":      tcell.ColorWhite,
-	"feed_modal_bg":        tcell.Color61, // xterm:SlateBlue3, #5f5faf
-	"feed_modal_text":      tcell.ColorWhite,
+	"dl_choice_modal_bg":      tcell.ColorPurple,
+	"dl_choice_modal_text":    tcell.ColorWhite,
+	"dl_modal_bg":             tcell.Color130, // xterm:DarkOrange3, #af5f00
+	"dl_modal_text":           tcell.ColorWhite,
+	"info_modal_bg":           tcell.ColorGray,
+	"info_modal_text":         tcell.ColorWhite,
+	"error_modal_bg":          tcell.ColorMaroon,
+	"error_modal_text":        tcell.ColorWhite,
+	"yesno_modal_bg":          tcell.ColorPurple,
+	"yesno_modal_text":        tcell.ColorWhite,
+	"tofu_modal_bg":           tcell.ColorMaroon,
+	"tofu_modal_text":         tcell.ColorWhite,
+	"subscription_modal_bg":   tcell.Color61, // xterm:SlateBlue3, #5f5faf
+	"subscription_modal_text": tcell.ColorWhite,
 
 	"input_modal_bg":         tcell.ColorGreen,
 	"input_modal_text":       tcell.ColorWhite,
diff --git a/default-config.toml b/default-config.toml
index 09a4c61..4ba508d 100644
--- a/default-config.toml
+++ b/default-config.toml
@@ -132,22 +132,22 @@ max_pages = 30 # The maximum number of pages the cache will store
 # Note that HTTP and HTTPS are treated as separate protocols here.
 
 
-[feeds]
+[subscriptions]
 # For tracking feeds and pages
 
 # Whether a pop-up appears when viewing a potential feed
 popup = true
 
-# How often to check for new feeds and pages in the background, in seconds.
-# Note Amfora will check for updates on browser start anyway.
-# Set it to 0 or below to disable this feature. You can still update individual
-# feeds manually, or just restart the browser to update all of them.
+# How often to check for updates to subscriptions in the background, in seconds.
+# Set it to 0 to disable this feature. You can still update individual feeds
+# manually, or restart the browser.
+#
+# Note Amfora will check for updates on browser start no matter what this setting is.
 update_interval = 1800 # 30 mins
 
-# How many pages/feeds can be checked at the same time when updating.
-# If you are tracking many feeds and pages you may want to increase this for
-# faster update times.
-# Any value below 1 will be corrected to 1.
+# How many subscriptions can be checked at the same time when updating.
+# If you have many subscriptions you may want to increase this for faster
+# update times. Any value below 1 will be corrected to 1.
 workers = 3
 
 
@@ -209,8 +209,8 @@ workers = 3
 # yesno_modal_text
 # tofu_modal_bg
 # tofu_modal_text
-# feed_modal_bg
-# feed_modal_text
+# subscription_modal_bg
+# subscription_modal_text
 
 # input_modal_bg
 # input_modal_text
diff --git a/display/display.go b/display/display.go
index eaf48d3..919cfb8 100644
--- a/display/display.go
+++ b/display/display.go
@@ -294,11 +294,11 @@ func Init() {
 				}
 				return nil
 			case tcell.KeyCtrlA:
-				Feeds(tabs[curTab])
-				tabs[curTab].addToHistory("about:feeds")
+				Subscriptions(tabs[curTab])
+				tabs[curTab].addToHistory("about:subscriptions")
 				return nil
 			case tcell.KeyCtrlX:
-				go addFeed()
+				go addSubscription()
 				return nil
 			case tcell.KeyRune:
 				// Regular key was sent
@@ -583,9 +583,9 @@ func URL(u string) {
 		tabs[curTab].addToHistory("about:bookmarks")
 		return
 	}
-	if u == "about:feeds" { //nolint:goconst
-		Feeds(tabs[curTab])
-		tabs[curTab].addToHistory("about:feeds")
+	if u == "about:subscriptions" { //nolint:goconst
+		Subscriptions(tabs[curTab])
+		tabs[curTab].addToHistory("about:subscriptions")
 		return
 	}
 	if u == "about:newtab" {
diff --git a/display/help.go b/display/help.go
index 9a4c8de..4128d39 100644
--- a/display/help.go
+++ b/display/help.go
@@ -42,8 +42,8 @@ Ctrl-R, R|Reload a page, discarding the cached version.
 Ctrl-B|View bookmarks
 Ctrl-D|Add, change, or remove a bookmark for the current page.
 Ctrl-S|Save the current page to your downloads.
-Ctrl-A|View tracked feeds and pages.
-Ctrl-X|Track or update the current feed/page.
+Ctrl-A|View subscriptions
+Ctrl-X|Add or update a subscription
 q, Ctrl-Q|Quit
 Ctrl-C|Hard quit. This can be used when in the middle of downloading,
 |for example.
diff --git a/display/newtab.go b/display/newtab.go
index ff212d0..dde3c2f 100644
--- a/display/newtab.go
+++ b/display/newtab.go
@@ -18,7 +18,7 @@ You can customize this page by creating a gemtext file called newtab.gmi, in Amf
 Happy browsing!
 
 => about:bookmarks Bookmarks
-=> about:feeds Feed and Page Tracking
+=> about:subscriptions Feed and Page Tracking
 
 => //gemini.circumlunar.space Project Gemini
 => https://github.com/makeworld-the-better-one/amfora Amfora homepage [HTTPS]
diff --git a/display/private.go b/display/private.go
index ba7d976..a2248e4 100644
--- a/display/private.go
+++ b/display/private.go
@@ -16,9 +16,9 @@ import (
 	"github.com/makeworld-the-better-one/amfora/cache"
 	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
-	"github.com/makeworld-the-better-one/amfora/feeds"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
+	"github.com/makeworld-the-better-one/amfora/subscriptions"
 	"github.com/makeworld-the-better-one/amfora/webbrowser"
 	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/makeworld-the-better-one/go-isemoji"
@@ -39,9 +39,9 @@ func followLink(t *tab, prev, next string) {
 		t.addToHistory("about:bookmarks")
 		return
 	}
-	if next == "about:feeds" {
-		Feeds(t)
-		t.addToHistory("about:feeds")
+	if next == "about:subscriptions" {
+		Subscriptions(t)
+		t.addToHistory("about:subscriptions")
 		return
 	}
 	if strings.HasPrefix(next, "about:") {
@@ -340,7 +340,7 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 		t.mode = tabModeDone
 
 		go func(p *structs.Page) {
-			if b && t.hasContent() && !feeds.IsTracked(s) && viper.GetBool("feeds.popup") {
+			if b && t.hasContent() && !subscriptions.IsSubscribed(s) && viper.GetBool("subscriptions.popup") {
 				// The current page might be an untracked feed, and the user wants
 				// to be notified in such cases.
 
@@ -365,9 +365,9 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 		Bookmarks(t)
 		return ret("about:bookmarks", true)
 	}
-	if u == "about:feeds" {
-		Feeds(t)
-		return ret("about:feeds", true)
+	if u == "about:subscriptions" {
+		Subscriptions(t)
+		return ret("about:subscriptions", true)
 	}
 
 	u = normalizeURL(u)
@@ -613,10 +613,10 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 	// First see if it's a feed, and ask the user about adding it if it is
 	filename := path.Base(parsed.Path)
 	mediatype, _, _ := mime.ParseMediaType(res.Meta)
-	feed, ok := feeds.GetFeed(mediatype, filename, res.Body)
+	feed, ok := subscriptions.GetFeed(mediatype, filename, res.Body)
 	if ok {
 		go func() {
-			added := addFeedDirect(u, feed, feeds.IsTracked(u))
+			added := addFeedDirect(u, feed, subscriptions.IsSubscribed(u))
 			if !added {
 				// Otherwise offer download choices
 				go dlChoice("That file could not be displayed. What would you like to do?", u, res)
diff --git a/display/feeds.go b/display/subscriptions.go
similarity index 59%
rename from display/feeds.go
rename to display/subscriptions.go
index aacd1b7..58bdd9a 100644
--- a/display/feeds.go
+++ b/display/subscriptions.go
@@ -11,15 +11,15 @@ import (
 	"github.com/gdamore/tcell"
 	"github.com/makeworld-the-better-one/amfora/cache"
 	"github.com/makeworld-the-better-one/amfora/config"
-	"github.com/makeworld-the-better-one/amfora/feeds"
 	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
+	"github.com/makeworld-the-better-one/amfora/subscriptions"
 	"github.com/mmcdole/gofeed"
 	"github.com/spf13/viper"
 )
 
-var feedPageUpdated time.Time
+var subscriptionPageUpdated time.Time
 
 // toLocalDay truncates the provided time to a date only,
 // but converts to the local time first.
@@ -29,21 +29,21 @@ func toLocalDay(t time.Time) time.Time {
 }
 
 // Feeds displays the feeds page on the current tab.
-func Feeds(t *tab) {
-	logger.Log.Println("display.Feeds called")
+func Subscriptions(t *tab) {
+	logger.Log.Println("display.Subscriptions called")
 
 	// Retrieve cached version if there hasn't been any updates
-	p, ok := cache.GetPage("about:feeds")
-	if feedPageUpdated.After(feeds.LastUpdated) && ok {
-		logger.Log.Println("using cached feeds page")
+	p, ok := cache.GetPage("about:subscriptions")
+	if subscriptionPageUpdated.After(subscriptions.LastUpdated) && ok {
+		logger.Log.Println("using cached subscriptions page")
 		setPage(t, p)
 		t.applyBottomBar()
 		return
 	}
 
-	logger.Log.Println("started rendering feeds page")
+	logger.Log.Println("started rendering subscriptions page")
 
-	feedPageRaw := "# Feeds & Pages\n\n" +
+	subscriptionPageRaw := "# Subscriptions\n\n" +
 		"See the help (by pressing ?) for details on how to use this page.\n\n" +
 		"If you just opened Amfora then updates will appear incrementally. Reload the page to see them.\n"
 
@@ -58,7 +58,7 @@ func Feeds(t *tab) {
 	// the UTC timezone is specified. I believe gemfeed does this.
 	curDay := toLocalDay(time.Now()).Add(26 * time.Hour)
 
-	pe := feeds.GetPageEntries()
+	pe := subscriptions.GetPageEntries()
 
 	for _, entry := range pe.Entries { // From new to old
 		// Convert to local time, remove sub-day info
@@ -67,24 +67,24 @@ func Feeds(t *tab) {
 		if pub.Before(curDay) {
 			// This post is on a new day, add a day header
 			curDay = pub
-			feedPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
+			subscriptionPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
 		if entry.Title == "" || entry.Title == "/" {
 			// Just put author/title
 			// Mainly used for when you're tracking the root domain of a site
-			feedPageRaw += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
+			subscriptionPageRaw += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
 		} else {
 			// Include title and dash
-			feedPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
+			subscriptionPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
 		}
 	}
 
-	content, links := renderer.RenderGemini(feedPageRaw, textWidth(), leftMargin(), false)
+	content, links := renderer.RenderGemini(subscriptionPageRaw, textWidth(), leftMargin(), false)
 	page := structs.Page{
-		Raw:       feedPageRaw,
+		Raw:       subscriptionPageRaw,
 		Content:   content,
 		Links:     links,
-		URL:       "about:feeds",
+		URL:       "about:subscriptions",
 		Width:     termW,
 		Mediatype: structs.TextGemini,
 	}
@@ -92,26 +92,26 @@ func Feeds(t *tab) {
 	setPage(t, &page)
 	t.applyBottomBar()
 
-	feedPageUpdated = time.Now()
+	subscriptionPageUpdated = time.Now()
 
-	logger.Log.Println("done rendering feeds page")
+	logger.Log.Println("done rendering subscriptions page")
 }
 
-// openFeedModal displays the "Add feed/page" modal
-// It returns whether the user wanted to add the feed/page.
-// The tracked arg specifies whether this feed/page is already
-// being tracked.
-func openFeedModal(validFeed, tracked bool) bool {
+// openSubscriptionModal displays the "Add subscription" modal
+// It returns whether the user wanted to subscribe to feed/page.
+// The subscribed arg specifies whether this feed/page is already
+// subscribed to.
+func openSubscriptionModal(validFeed, subscribed bool) bool {
 	logger.Log.Println("display.openFeedModal called")
 	// Reuses yesNoModal
 
 	if viper.GetBool("a-general.color") {
 		yesNoModal.
-			SetBackgroundColor(config.GetColor("feed_modal_bg")).
-			SetTextColor(config.GetColor("feed_modal_text"))
+			SetBackgroundColor(config.GetColor("subscription_modal_bg")).
+			SetTextColor(config.GetColor("subscription_modal_text"))
 		yesNoModal.GetFrame().
-			SetBorderColor(config.GetColor("feed_modal_text")).
-			SetTitleColor(config.GetColor("feed_modal_text"))
+			SetBorderColor(config.GetColor("subscription_modal_text")).
+			SetTitleColor(config.GetColor("subscription_modal_text"))
 	} else {
 		yesNoModal.
 			SetBackgroundColor(tcell.ColorBlack).
@@ -121,18 +121,18 @@ func openFeedModal(validFeed, tracked bool) bool {
 			SetTitleColor(tcell.ColorWhite)
 	}
 	if validFeed {
-		yesNoModal.GetFrame().SetTitle("Feed Tracking")
-		if tracked {
-			yesNoModal.SetText("This is already being tracked. Would you like to manually update it?")
+		yesNoModal.GetFrame().SetTitle("Feed Subscription")
+		if subscribed {
+			yesNoModal.SetText("You are already subscribed to this feed. Would you like to manually update it?")
 		} else {
-			yesNoModal.SetText("Would you like to start tracking this feed?")
+			yesNoModal.SetText("Would you like to subscribe to this feed?")
 		}
 	} else {
-		yesNoModal.GetFrame().SetTitle("Page Tracking")
-		if tracked {
-			yesNoModal.SetText("This is already being tracked. Would you like to manually update it?")
+		yesNoModal.GetFrame().SetTitle("Page Subscription")
+		if subscribed {
+			yesNoModal.SetText("You are already subscribed to this page. Would you like to manually update it?")
 		} else {
-			yesNoModal.SetText("Would you like to start tracking this page?")
+			yesNoModal.SetText("Would you like to subscribe to this page?")
 		}
 	}
 
@@ -148,12 +148,12 @@ func openFeedModal(validFeed, tracked bool) bool {
 	return resp
 }
 
-// getFeedFromPage is like feeds.GetFeed but takes a structs.Page as input.
+// getFeedFromPage is like subscriptions.GetFeed but takes a structs.Page as input.
 func getFeedFromPage(p *structs.Page) (*gofeed.Feed, bool) {
 	parsed, _ := url.Parse(p.URL)
 	filename := path.Base(parsed.Path)
 	r := strings.NewReader(p.Raw)
-	return feeds.GetFeed(p.RawMediatype, filename, r)
+	return subscriptions.GetFeed(p.RawMediatype, filename, r)
 }
 
 // addFeedDirect is only for adding feeds, not pages.
@@ -166,8 +166,8 @@ func getFeedFromPage(p *structs.Page) (*gofeed.Feed, bool) {
 func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) bool {
 	logger.Log.Println("display.addFeedDirect called")
 
-	if openFeedModal(true, tracked) {
-		err := feeds.AddFeed(u, feed)
+	if openSubscriptionModal(true, tracked) {
+		err := subscriptions.AddFeed(u, feed)
 		if err != nil {
 			Error("Feed Error", err.Error())
 		}
@@ -176,10 +176,10 @@ func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) bool {
 	return false
 }
 
-// addFeed goes through the process of tracking the current page/feed.
+// addFeed goes through the process of subscribing to the current page/feed.
 // It is the high-level way of doing it. It should be called in a goroutine.
-func addFeed() {
-	logger.Log.Println("display.addFeed called")
+func addSubscription() {
+	logger.Log.Println("display.addSubscription called")
 
 	t := tabs[curTab]
 	p := t.page
@@ -190,15 +190,15 @@ func addFeed() {
 	}
 
 	feed, isFeed := getFeedFromPage(p)
-	tracked := feeds.IsTracked(p.URL)
+	tracked := subscriptions.IsSubscribed(p.URL)
 
-	if openFeedModal(isFeed, tracked) {
+	if openSubscriptionModal(isFeed, tracked) {
 		var err error
 
 		if isFeed {
-			err = feeds.AddFeed(p.URL, feed)
+			err = subscriptions.AddFeed(p.URL, feed)
 		} else {
-			err = feeds.AddPage(p.URL, strings.NewReader(p.Raw))
+			err = subscriptions.AddPage(p.URL, strings.NewReader(p.Raw))
 		}
 
 		if err != nil {
diff --git a/feeds/entries.go b/subscriptions/entries.go
similarity index 96%
rename from feeds/entries.go
rename to subscriptions/entries.go
index 9e40998..8729867 100644
--- a/feeds/entries.go
+++ b/subscriptions/entries.go
@@ -1,4 +1,4 @@
-package feeds
+package subscriptions
 
 import (
 	"net/url"
@@ -10,7 +10,7 @@ import (
 )
 
 // This file contains funcs for creating PageEntries, which
-// are consumed by display/feeds.go
+// are consumed by display/subscriptions.go
 
 // getURL returns a URL to be used in a PageEntry, from a
 // list of URLs for that item. It prefers gemini URLs, then
@@ -42,7 +42,7 @@ func getURL(urls []string) string {
 // so this function needs to be called again to get updates.
 // It always returns sorted entries - by post time, from newest to oldest.
 func GetPageEntries() *PageEntries {
-	logger.Log.Println("feeds.GetPageEntries called")
+	logger.Log.Println("subscriptions.GetPageEntries called")
 
 	var pe PageEntries
 
diff --git a/feeds/structs.go b/subscriptions/structs.go
similarity index 91%
rename from feeds/structs.go
rename to subscriptions/structs.go
index 6fa2aa9..ba6fc16 100644
--- a/feeds/structs.go
+++ b/subscriptions/structs.go
@@ -1,4 +1,4 @@
-package feeds
+package subscriptions
 
 import (
 	"sync"
@@ -77,8 +77,8 @@ var data = jsonData{
 	Pages:  make(map[string]*pageJSON),
 }
 
-// PageEntry is a single item on a feed page.
-// It is used both for tracked feeds and pages.
+// PageEntry is a single item on a subscriptions page.
+// It is used for both feeds and pages.
 type PageEntry struct {
 	Prefix    string // Feed/log title, author, etc - something before the post title
 	Title     string
@@ -86,9 +86,10 @@ type PageEntry struct {
 	Published time.Time
 }
 
-// PageEntries is new-to-old list of Entry structs, used to create a feed page.
-// It should always be assumed to be sorted when used in other packages.
-// Sorted by post time, from newest to oldest.
+// PageEntries is new-to-old list of Entry structs, used to create a
+// subscriptions page.
+// It should always be assumed to be sorted when used in other packages,
+// by post time, from newest to oldest.
 type PageEntries struct {
 	Entries []*PageEntry
 }
diff --git a/feeds/feeds.go b/subscriptions/subscriptions.go
similarity index 80%
rename from feeds/feeds.go
rename to subscriptions/subscriptions.go
index 61b532a..bdf4f8c 100644
--- a/feeds/feeds.go
+++ b/subscriptions/subscriptions.go
@@ -1,4 +1,4 @@
-package feeds
+package subscriptions
 
 import (
 	"crypto/sha256"
@@ -31,15 +31,15 @@ var (
 	ErrNotFeed    = errors.New("not a valid feed")
 )
 
-var writeMu = sync.Mutex{} // Prevent concurrent writes to feeds.json file
+var writeMu = sync.Mutex{} // Prevent concurrent writes to subscriptions.json file
 
 // LastUpdated is the time when the in-memory data was last updated.
-// It can be used to know if the feed page should be regenerated.
+// It can be used to know if the subscriptions page should be regenerated.
 var LastUpdated time.Time
 
 // Init should be called after config.Init.
 func Init() error {
-	f, err := os.Open(config.FeedPath)
+	f, err := os.Open(config.SubscriptionPath)
 	if err == nil {
 		// File exists and could be opened
 		defer f.Close()
@@ -50,26 +50,26 @@ func Init() error {
 			dec := json.NewDecoder(f)
 			err = dec.Decode(&data)
 			if err != nil && err != io.EOF {
-				return fmt.Errorf("feeds.json is corrupted: %w", err) //nolint:goerr113
+				return fmt.Errorf("subscriptions.json is corrupted: %w", err) //nolint:goerr113
 			}
 		}
 	} else if !os.IsNotExist(err) {
 		// There's an error opening the file, but it's not bc is doesn't exist
-		return fmt.Errorf("open feeds.json error: %w", err) //nolint:goerr113
+		return fmt.Errorf("open subscriptions.json error: %w", err) //nolint:goerr113
 	}
 
 	LastUpdated = time.Now()
 
-	if viper.GetInt("feeds.update_interval") > 0 {
-		// Update feeds and pages every so often
+	if viper.GetInt("subscriptions.update_interval") > 0 {
+		// Update subscriptions every so often
 		go func() {
 			for {
 				updateAll()
-				time.Sleep(time.Duration(viper.GetInt("feeds.update_interval")) * time.Second)
+				time.Sleep(time.Duration(viper.GetInt("subscriptions.update_interval")) * time.Second)
 			}
 		}()
 	} else {
-		// User disabled automatic feed/page updates
+		// User disabled automatic updates
 		// So just update once at the beginning
 		go updateAll()
 	}
@@ -77,9 +77,10 @@ func Init() error {
 	return nil
 }
 
-// IsTracked returns true if the feed/page URL is already being tracked.
-func IsTracked(url string) bool {
-	logger.Log.Println("feeds.IsTracked called")
+// IsSubscribed returns true if the URL is already subscribed to,
+// whether a feed or page.
+func IsSubscribed(url string) bool {
+	logger.Log.Println("subscriptions.IsSubscribed called")
 
 	data.feedMu.RLock()
 	for u := range data.Feeds {
@@ -103,7 +104,7 @@ func IsTracked(url string) bool {
 // GetFeed returns a Feed object and a bool indicating whether the passed
 // content was actually recognized as a feed.
 func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
-	logger.Log.Println("feeds.GetFeed called")
+	logger.Log.Println("subscriptions.GetFeed called")
 
 	if r == nil {
 		return nil, false
@@ -124,14 +125,14 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
 }
 
 func writeJSON() error {
-	logger.Log.Println("feeds.writeJSON called")
+	logger.Log.Println("subscriptions.writeJSON called")
 
 	writeMu.Lock()
 	defer writeMu.Unlock()
 
-	f, err := os.OpenFile(config.FeedPath, os.O_WRONLY|os.O_CREATE, 0666)
+	f, err := os.OpenFile(config.SubscriptionPath, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
-		logger.Log.Println("feeds.writeJSON error", err)
+		logger.Log.Println("subscriptions.writeJSON error", err)
 		return err
 	}
 	defer f.Close()
@@ -140,12 +141,12 @@ func writeJSON() error {
 	enc.SetIndent("", "  ")
 
 	data.Lock()
-	logger.Log.Println("feeds.writeJSON acquired data lock")
+	logger.Log.Println("subscriptions.writeJSON acquired data lock")
 	err = enc.Encode(&data)
 	data.Unlock()
 
 	if err != nil {
-		logger.Log.Println("feeds.writeJSON error", err)
+		logger.Log.Println("subscriptions.writeJSON error", err)
 	}
 
 	return err
@@ -155,7 +156,7 @@ func writeJSON() error {
 // It can be used to update a feed for a URL, although the package
 // will handle that on its own.
 func AddFeed(url string, feed *gofeed.Feed) error {
-	logger.Log.Println("feeds.AddFeed called")
+	logger.Log.Println("subscriptions.AddFeed called")
 
 	if feed == nil {
 		panic("feed is nil")
@@ -205,7 +206,7 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 // It can be used to update the page as well, although the package
 // will handle that on its own.
 func AddPage(url string, r io.Reader) error {
-	logger.Log.Println("feeds.AddPage called")
+	logger.Log.Println("subscriptions.AddPage called")
 
 	if r == nil {
 		return nil
@@ -241,7 +242,7 @@ func AddPage(url string, r io.Reader) error {
 }
 
 func updateFeed(url string) error {
-	logger.Log.Println("feeds.updateFeed called")
+	logger.Log.Println("subscriptions.updateFeed called")
 
 	res, err := client.Fetch(url)
 	if err != nil {
@@ -268,7 +269,7 @@ func updateFeed(url string) error {
 }
 
 func updatePage(url string) error {
-	logger.Log.Println("feeds.updatePage called")
+	logger.Log.Println("subscriptions.updatePage called")
 
 	res, err := client.Fetch(url)
 	if err != nil {
@@ -286,10 +287,10 @@ func updatePage(url string) error {
 	return AddPage(url, res.Body)
 }
 
-// updateAll updates all feeds and pages using workers.
+// updateAll updates all subscriptions using workers.
 // It only returns once all the workers are done.
 func updateAll() {
-	logger.Log.Println("feeds.updateAll called")
+	logger.Log.Println("subscriptions.updateAll called")
 
 	// TODO: Is two goroutines the right amount?
 
@@ -318,7 +319,7 @@ func updateAll() {
 		return
 	}
 
-	numWorkers := viper.GetInt("feeds.workers")
+	numWorkers := viper.GetInt("subscriptions.workers")
 	if numWorkers < 1 {
 		numWorkers = 1
 	}

From 71be668652982f5840b99f7d0c7ddc7be0cc2201 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 27 Nov 2020 17:52:36 -0500
Subject: [PATCH 25/33] Prevent potential nil error on timestamps

---
 subscriptions/entries.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subscriptions/entries.go b/subscriptions/entries.go
index 8729867..f985122 100644
--- a/subscriptions/entries.go
+++ b/subscriptions/entries.go
@@ -61,12 +61,12 @@ func GetPageEntries() *PageEntries {
 
 			// Try to use updated time first, then published
 
-			if !item.UpdatedParsed.IsZero() {
+			if item.UpdatedParsed != nil && !item.UpdatedParsed.IsZero() {
 				pub = *item.UpdatedParsed
-			} else if !item.PublishedParsed.IsZero() {
+			} else if item.PublishedParsed != nil && !item.PublishedParsed.IsZero() {
 				pub = *item.PublishedParsed
 			} else {
-				// No time on the post
+				// No time on the post, use now
 				pub = time.Now()
 			}
 

From 5722c504324b6923f5db13614f2ef597afdcbd01 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 27 Nov 2020 17:57:19 -0500
Subject: [PATCH 26/33] Move funcs to handlers.go

---
 display/handlers.go | 486 ++++++++++++++++++++++++++++++++++++++++++++
 display/private.go  | 475 -------------------------------------------
 2 files changed, 486 insertions(+), 475 deletions(-)
 create mode 100644 display/handlers.go

diff --git a/display/handlers.go b/display/handlers.go
new file mode 100644
index 0000000..b3ae20a
--- /dev/null
+++ b/display/handlers.go
@@ -0,0 +1,486 @@
+package display
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"mime"
+	"net"
+	"net/url"
+	"os/exec"
+	"path"
+	"strings"
+
+	"github.com/makeworld-the-better-one/amfora/cache"
+	"github.com/makeworld-the-better-one/amfora/client"
+	"github.com/makeworld-the-better-one/amfora/config"
+	"github.com/makeworld-the-better-one/amfora/renderer"
+	"github.com/makeworld-the-better-one/amfora/structs"
+	"github.com/makeworld-the-better-one/amfora/subscriptions"
+	"github.com/makeworld-the-better-one/amfora/webbrowser"
+	"github.com/makeworld-the-better-one/go-gemini"
+	"github.com/makeworld-the-better-one/go-isemoji"
+	"github.com/spf13/viper"
+)
+
+// handleHTTP is used by handleURL.
+// It opens HTTP links and displays Info and Error modals.
+// Returns false if there was an error.
+func handleHTTP(u string, showInfo bool) bool {
+	if len(config.HTTPCommand) == 1 {
+		// Possibly a non-command
+
+		switch strings.TrimSpace(config.HTTPCommand[0]) {
+		case "", "off":
+			Error("HTTP Error", "Opening HTTP URLs is turned off.")
+			return false
+		case "default":
+			s, err := webbrowser.Open(u)
+			if err != nil {
+				Error("Webbrowser Error", err.Error())
+				return false
+			}
+			if showInfo {
+				Info(s)
+			}
+			return true
+		}
+	}
+
+	// Custom command
+	var err error = nil
+	if len(config.HTTPCommand) > 1 {
+		err = exec.Command(config.HTTPCommand[0], append(config.HTTPCommand[1:], u)...).Start()
+	} else {
+		err = exec.Command(config.HTTPCommand[0], u).Start()
+	}
+	if err != nil {
+		Error("HTTP Error", "Error executing custom browser command: "+err.Error())
+		return false
+	}
+
+	App.Draw()
+	return true
+}
+
+// handleOther is used by handleURL.
+// It opens links other than Gemini and HTTP and displays Error modals.
+func handleOther(u string) {
+	// The URL should have a scheme due to a previous call to normalizeURL
+	parsed, _ := url.Parse(u)
+
+	// Search for a handler for the URL scheme
+	handler := strings.TrimSpace(viper.GetString("url-handlers." + parsed.Scheme))
+	if len(handler) == 0 {
+		handler = strings.TrimSpace(viper.GetString("url-handlers.other"))
+	}
+	switch handler {
+	case "", "off":
+		Error("URL Error", "Opening "+parsed.Scheme+" URLs is turned off.")
+	default:
+		// The config has a custom command to execute for URLs
+		fields := strings.Fields(handler)
+		err := exec.Command(fields[0], append(fields[1:], u)...).Start()
+		if err != nil {
+			Error("URL Error", "Error executing custom command: "+err.Error())
+		}
+	}
+	App.Draw()
+}
+
+// handleFavicon handles getting and displaying a favicon.
+// `old` is the previous favicon for the tab.
+func handleFavicon(t *tab, host, old string) {
+	defer func() {
+		// Update display if needed
+		if t.page.Favicon != old && isValidTab(t) {
+			rewriteTabRow()
+		}
+	}()
+
+	if !viper.GetBool("a-general.emoji_favicons") {
+		// Not enabled
+		return
+	}
+	if t.page.Favicon != "" {
+		return
+	}
+	if host == "" {
+		return
+	}
+
+	fav := cache.GetFavicon(host)
+	if fav == cache.KnownNoFavicon {
+		// It's been cached that this host doesn't have a favicon
+		return
+	}
+	if fav != "" {
+		t.page.Favicon = fav
+		rewriteTabRow()
+		return
+	}
+
+	// No favicon cached
+	res, err := client.Fetch("gemini://" + host + "/favicon.txt")
+	if err != nil {
+		if res != nil {
+			res.Body.Close()
+		}
+		cache.AddFavicon(host, cache.KnownNoFavicon)
+		return
+	}
+	defer res.Body.Close()
+
+	if res.Status != 20 {
+		cache.AddFavicon(host, cache.KnownNoFavicon)
+		return
+	}
+	if !strings.HasPrefix(res.Meta, "text/") {
+		cache.AddFavicon(host, cache.KnownNoFavicon)
+		return
+	}
+	// It's a regular plain response
+
+	buf := new(bytes.Buffer)
+	_, err = io.CopyN(buf, res.Body, 29+2+1) // 29 is the max emoji length, +2 for CRLF, +1 so that the right size will EOF
+	if err == nil {
+		// Content was too large
+		cache.AddFavicon(host, cache.KnownNoFavicon)
+		return
+	} else if err != io.EOF {
+		// Some network reading error
+		// No favicon is NOT known, could be a temporary error
+		return
+	}
+	// EOF, which is what we want.
+	emoji := strings.TrimRight(buf.String(), "\r\n")
+	if !isemoji.IsEmoji(emoji) {
+		cache.AddFavicon(host, cache.KnownNoFavicon)
+		return
+	}
+	// Valid favicon found
+	t.page.Favicon = emoji
+	cache.AddFavicon(host, emoji)
+}
+
+// handleURL displays whatever action is needed for the provided URL,
+// and applies it to the current tab.
+// It loads documents, handles errors, brings up a download prompt, etc.
+//
+// The string returned is the final URL, if redirects were involved.
+// In most cases it will be the same as the passed URL.
+// If there is some error, it will return "".
+// The second returned item is a bool indicating if page content was displayed.
+// It returns false for Errors, other protocols, etc.
+//
+// The bottomBar is not actually changed in this func, except during loading.
+// The func that calls this one should apply the bottomBar values if necessary.
+//
+// numRedirects is the number of redirects that resulted in the provided URL.
+// It should typically be 0.
+func handleURL(t *tab, u string, numRedirects int) (string, bool) {
+	defer App.Draw() // Just in case
+
+	// Save for resetting on error
+	oldLable := t.barLabel
+	oldText := t.barText
+
+	// Custom return function
+	ret := func(s string, b bool) (string, bool) {
+		if !b {
+			// Reset bottomBar if page wasn't loaded
+			t.barLabel = oldLable
+			t.barText = oldText
+		}
+		t.mode = tabModeDone
+
+		go func(p *structs.Page) {
+			if b && t.hasContent() && !subscriptions.IsSubscribed(s) && viper.GetBool("subscriptions.popup") {
+				// The current page might be an untracked feed, and the user wants
+				// to be notified in such cases.
+
+				feed, isFeed := getFeedFromPage(p)
+				if isFeed && isValidTab(t) && t.page == p {
+					// After parsing and track-checking time, the page is still being displayed
+					addFeedDirect(p.URL, feed, false)
+				}
+			}
+		}(t.page)
+
+		return s, b
+	}
+
+	t.barLabel = ""
+	bottomBar.SetLabel("")
+
+	App.SetFocus(t.view)
+
+	// To allow linking to the bookmarks page, and history browsing
+	if u == "about:bookmarks" {
+		Bookmarks(t)
+		return ret("about:bookmarks", true)
+	}
+	if u == "about:subscriptions" {
+		Subscriptions(t)
+		return ret("about:subscriptions", true)
+	}
+
+	u = normalizeURL(u)
+	u = cache.Redirect(u)
+
+	parsed, err := url.Parse(u)
+	if err != nil {
+		Error("URL Error", err.Error())
+		return ret("", false)
+	}
+
+	proxy := strings.TrimSpace(viper.GetString("proxies." + parsed.Scheme))
+	usingProxy := false
+
+	proxyHostname, proxyPort, err := net.SplitHostPort(proxy)
+	if err != nil {
+		// Error likely means there's no port in the host
+		proxyHostname = proxy
+		proxyPort = "1965"
+	}
+
+	if strings.HasPrefix(u, "http") {
+		if proxy == "" || proxy == "off" {
+			// No proxy available
+			handleHTTP(u, true)
+			return ret("", false)
+		}
+		usingProxy = true
+	}
+
+	if strings.HasPrefix(u, "file") {
+		page, ok := handleFile(u)
+		if !ok {
+			return ret("", false)
+		}
+		setPage(t, page)
+		return ret(u, true)
+	}
+
+	if !strings.HasPrefix(u, "http") && !strings.HasPrefix(u, "gemini") && !strings.HasPrefix(u, "file") {
+		// Not a Gemini URL
+		if proxy == "" || proxy == "off" {
+			// No proxy available
+			handleOther(u)
+			return ret("", false)
+		}
+		usingProxy = true
+	}
+
+	// Gemini URL, or one with a Gemini proxy available
+
+	// Load page from cache if it exists,
+	// and this isn't a page that was redirected to by the server (indicates dynamic content)
+	if numRedirects == 0 {
+		page, ok := cache.GetPage(u)
+		if ok {
+			setPage(t, page)
+			return ret(u, true)
+		}
+	}
+	// Otherwise download it
+	bottomBar.SetText("Loading...")
+	t.barText = "Loading..." // Save it too, in case the tab switches during loading
+	t.mode = tabModeLoading
+	App.Draw()
+
+	var res *gemini.Response
+	if usingProxy {
+		res, err = client.FetchWithProxy(proxyHostname, proxyPort, u)
+	} else {
+		res, err = client.Fetch(u)
+	}
+
+	// Loading may have taken a while, make sure tab is still valid
+	if !isValidTab(t) {
+		return ret("", false)
+	}
+
+	if errors.Is(err, client.ErrTofu) {
+		if usingProxy {
+			// They are using a proxy
+			if Tofu(proxy, client.GetExpiry(proxyHostname, proxyPort)) {
+				// They want to continue anyway
+				client.ResetTofuEntry(proxyHostname, proxyPort, res.Cert)
+				// Response can be used further down, no need to reload
+			} else {
+				// They don't want to continue
+				return ret("", false)
+			}
+		} else {
+			if Tofu(parsed.Host, client.GetExpiry(parsed.Hostname(), parsed.Port())) {
+				// They want to continue anyway
+				client.ResetTofuEntry(parsed.Hostname(), parsed.Port(), res.Cert)
+				// Response can be used further down, no need to reload
+			} else {
+				// They don't want to continue
+				return ret("", false)
+			}
+		}
+	} else if err != nil {
+		Error("URL Fetch Error", err.Error())
+		return ret("", false)
+	}
+	if renderer.CanDisplay(res) {
+		page, err := renderer.MakePage(u, res, textWidth(), leftMargin(), usingProxy)
+		// Rendering may have taken a while, make sure tab is still valid
+		if !isValidTab(t) {
+			return ret("", false)
+		}
+
+		var res2 *gemini.Response
+		var dlErr error
+
+		if errors.Is(err, renderer.ErrTooLarge) {
+			// Make new request for downloading purposes
+			if usingProxy {
+				res2, dlErr = client.DownloadWithProxy(proxyHostname, proxyPort, u)
+			} else {
+				res2, dlErr = client.Download(u)
+			}
+			if dlErr != nil && !errors.Is(dlErr, client.ErrTofu) {
+				Error("URL Fetch Error", err.Error())
+				return ret("", false)
+			}
+			go dlChoice("That page is too large. What would you like to do?", u, res2)
+			return ret("", false)
+		}
+		if errors.Is(err, renderer.ErrTimedOut) {
+			// Make new request for downloading purposes
+			if usingProxy {
+				res2, dlErr = client.DownloadWithProxy(proxyHostname, proxyPort, u)
+			} else {
+				res2, dlErr = client.Download(u)
+			}
+			if dlErr != nil && !errors.Is(dlErr, client.ErrTofu) {
+				Error("URL Fetch Error", err.Error())
+				return ret("", false)
+			}
+			go dlChoice("Loading that page timed out. What would you like to do?", u, res2)
+			return ret("", false)
+		}
+		if err != nil {
+			Error("Page Error", "Issuing creating page: "+err.Error())
+			return ret("", false)
+		}
+
+		page.Width = termW
+
+		if !client.HasClientCert(parsed.Host) {
+			// Don't cache pages with client certs
+			go cache.AddPage(page)
+		}
+
+		setPage(t, page)
+		return ret(u, true)
+	}
+	// Not displayable
+	// Could be a non 20 (or 21) status code, or a different kind of document
+
+	// Handle each status code
+	switch res.Status {
+	case 10, 11:
+		userInput, ok := Input(res.Meta)
+		if ok {
+			// Make another request with the query string added
+			// + chars are replaced because PathEscape doesn't do that
+			parsed.RawQuery = gemini.QueryEscape(userInput)
+			if len(parsed.String()) > gemini.URLMaxLength {
+				Error("Input Error", "URL for that input would be too long.")
+				return ret("", false)
+			}
+			return ret(handleURL(t, parsed.String(), 0))
+		}
+		return ret("", false)
+	case 30, 31:
+		parsedMeta, err := url.Parse(res.Meta)
+		if err != nil {
+			Error("Redirect Error", "Invalid URL: "+err.Error())
+			return ret("", false)
+		}
+		redir := parsed.ResolveReference(parsedMeta).String()
+		// Prompt before redirecting to non-Gemini protocol
+		redirect := false
+		if !strings.HasPrefix(redir, "gemini") {
+			if YesNo("Follow redirect to non-Gemini URL?\n" + redir) {
+				redirect = true
+			} else {
+				return ret("", false)
+			}
+		}
+		// Prompt before redirecting
+		autoRedirect := viper.GetBool("a-general.auto_redirect")
+		if redirect || (autoRedirect && numRedirects < 5) || YesNo("Follow redirect?\n"+redir) {
+			if res.Status == gemini.StatusRedirectPermanent {
+				go cache.AddRedir(u, redir)
+			}
+			return ret(handleURL(t, redir, numRedirects+1))
+		}
+		return ret("", false)
+	case 40:
+		Error("Temporary Failure", escapeMeta(res.Meta))
+		return ret("", false)
+	case 41:
+		Error("Server Unavailable", escapeMeta(res.Meta))
+		return ret("", false)
+	case 42:
+		Error("CGI Error", escapeMeta(res.Meta))
+		return ret("", false)
+	case 43:
+		Error("Proxy Failure", escapeMeta(res.Meta))
+		return ret("", false)
+	case 44:
+		Error("Slow Down", "You should wait "+escapeMeta(res.Meta)+" seconds before making another request.")
+		return ret("", false)
+	case 50:
+		Error("Permanent Failure", escapeMeta(res.Meta))
+		return ret("", false)
+	case 51:
+		Error("Not Found", escapeMeta(res.Meta))
+		return ret("", false)
+	case 52:
+		Error("Gone", escapeMeta(res.Meta))
+		return ret("", false)
+	case 53:
+		Error("Proxy Request Refused", escapeMeta(res.Meta))
+		return ret("", false)
+	case 59:
+		Error("Bad Request", escapeMeta(res.Meta))
+		return ret("", false)
+	case 60:
+		Error("Client Certificate Required", escapeMeta(res.Meta))
+		return ret("", false)
+	case 61:
+		Error("Certificate Not Authorised", escapeMeta(res.Meta))
+		return ret("", false)
+	case 62:
+		Error("Certificate Not Valid", escapeMeta(res.Meta))
+		return ret("", false)
+	}
+
+	// Status code 20, but not a document that can be displayed
+
+	// First see if it's a feed, and ask the user about adding it if it is
+	filename := path.Base(parsed.Path)
+	mediatype, _, _ := mime.ParseMediaType(res.Meta)
+	feed, ok := subscriptions.GetFeed(mediatype, filename, res.Body)
+	if ok {
+		go func() {
+			added := addFeedDirect(u, feed, subscriptions.IsSubscribed(u))
+			if !added {
+				// Otherwise offer download choices
+				go dlChoice("That file could not be displayed. What would you like to do?", u, res)
+			}
+		}()
+		return ret("", false)
+	}
+
+	// Otherwise offer download choices
+	go dlChoice("That file could not be displayed. What would you like to do?", u, res)
+	return ret("", false)
+}
diff --git a/display/private.go b/display/private.go
index a2248e4..63ea32e 100644
--- a/display/private.go
+++ b/display/private.go
@@ -1,27 +1,14 @@
 package display
 
 import (
-	"bytes"
-	"errors"
 	"fmt"
-	"io"
-	"mime"
-	"net"
 	"net/url"
-	"os/exec"
-	"path"
 	"strconv"
 	"strings"
 
-	"github.com/makeworld-the-better-one/amfora/cache"
-	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
-	"github.com/makeworld-the-better-one/amfora/subscriptions"
-	"github.com/makeworld-the-better-one/amfora/webbrowser"
-	"github.com/makeworld-the-better-one/go-gemini"
-	"github.com/makeworld-the-better-one/go-isemoji"
 	"github.com/spf13/viper"
 )
 
@@ -152,146 +139,6 @@ func setPage(t *tab, p *structs.Page) {
 	t.barText = p.URL
 }
 
-// handleHTTP is used by handleURL.
-// It opens HTTP links and displays Info and Error modals.
-// Returns false if there was an error.
-func handleHTTP(u string, showInfo bool) bool {
-	if len(config.HTTPCommand) == 1 {
-		// Possibly a non-command
-
-		switch strings.TrimSpace(config.HTTPCommand[0]) {
-		case "", "off":
-			Error("HTTP Error", "Opening HTTP URLs is turned off.")
-			return false
-		case "default":
-			s, err := webbrowser.Open(u)
-			if err != nil {
-				Error("Webbrowser Error", err.Error())
-				return false
-			}
-			if showInfo {
-				Info(s)
-			}
-			return true
-		}
-	}
-
-	// Custom command
-	var err error = nil
-	if len(config.HTTPCommand) > 1 {
-		err = exec.Command(config.HTTPCommand[0], append(config.HTTPCommand[1:], u)...).Start()
-	} else {
-		err = exec.Command(config.HTTPCommand[0], u).Start()
-	}
-	if err != nil {
-		Error("HTTP Error", "Error executing custom browser command: "+err.Error())
-		return false
-	}
-
-	App.Draw()
-	return true
-}
-
-// handleOther is used by handleURL.
-// It opens links other than Gemini and HTTP and displays Error modals.
-func handleOther(u string) {
-	// The URL should have a scheme due to a previous call to normalizeURL
-	parsed, _ := url.Parse(u)
-
-	// Search for a handler for the URL scheme
-	handler := strings.TrimSpace(viper.GetString("url-handlers." + parsed.Scheme))
-	if len(handler) == 0 {
-		handler = strings.TrimSpace(viper.GetString("url-handlers.other"))
-	}
-	switch handler {
-	case "", "off":
-		Error("URL Error", "Opening "+parsed.Scheme+" URLs is turned off.")
-	default:
-		// The config has a custom command to execute for URLs
-		fields := strings.Fields(handler)
-		err := exec.Command(fields[0], append(fields[1:], u)...).Start()
-		if err != nil {
-			Error("URL Error", "Error executing custom command: "+err.Error())
-		}
-	}
-	App.Draw()
-}
-
-// handleFavicon handles getting and displaying a favicon.
-// `old` is the previous favicon for the tab.
-func handleFavicon(t *tab, host, old string) {
-	defer func() {
-		// Update display if needed
-		if t.page.Favicon != old && isValidTab(t) {
-			rewriteTabRow()
-		}
-	}()
-
-	if !viper.GetBool("a-general.emoji_favicons") {
-		// Not enabled
-		return
-	}
-	if t.page.Favicon != "" {
-		return
-	}
-	if host == "" {
-		return
-	}
-
-	fav := cache.GetFavicon(host)
-	if fav == cache.KnownNoFavicon {
-		// It's been cached that this host doesn't have a favicon
-		return
-	}
-	if fav != "" {
-		t.page.Favicon = fav
-		rewriteTabRow()
-		return
-	}
-
-	// No favicon cached
-	res, err := client.Fetch("gemini://" + host + "/favicon.txt")
-	if err != nil {
-		if res != nil {
-			res.Body.Close()
-		}
-		cache.AddFavicon(host, cache.KnownNoFavicon)
-		return
-	}
-	defer res.Body.Close()
-
-	if res.Status != 20 {
-		cache.AddFavicon(host, cache.KnownNoFavicon)
-		return
-	}
-	if !strings.HasPrefix(res.Meta, "text/") {
-		cache.AddFavicon(host, cache.KnownNoFavicon)
-		return
-	}
-	// It's a regular plain response
-
-	buf := new(bytes.Buffer)
-	_, err = io.CopyN(buf, res.Body, 29+2+1) // 29 is the max emoji length, +2 for CRLF, +1 so that the right size will EOF
-	if err == nil {
-		// Content was too large
-		cache.AddFavicon(host, cache.KnownNoFavicon)
-		return
-	} else if err != io.EOF {
-		// Some network reading error
-		// No favicon is NOT known, could be a temporary error
-		return
-	}
-	// EOF, which is what we want.
-	emoji := strings.TrimRight(buf.String(), "\r\n")
-	if !isemoji.IsEmoji(emoji) {
-		cache.AddFavicon(host, cache.KnownNoFavicon)
-		return
-	}
-	// Valid favicon found
-	t.page.Favicon = emoji
-	cache.AddFavicon(host, emoji)
-}
-
 // goURL is like handleURL, but takes care of history and the bottomBar.
 // It should be preferred over handleURL in most cases.
 // It has no return values to be processed.
@@ -308,328 +155,6 @@ func goURL(t *tab, u string) {
 	}
 }
 
-// handleURL displays whatever action is needed for the provided URL,
-// and applies it to the current tab.
-// It loads documents, handles errors, brings up a download prompt, etc.
-//
-// The string returned is the final URL, if redirects were involved.
-// In most cases it will be the same as the passed URL.
-// If there is some error, it will return "".
-// The second returned item is a bool indicating if page content was displayed.
-// It returns false for Errors, other protocols, etc.
-//
-// The bottomBar is not actually changed in this func, except during loading.
-// The func that calls this one should apply the bottomBar values if necessary.
-//
-// numRedirects is the number of redirects that resulted in the provided URL.
-// It should typically be 0.
-func handleURL(t *tab, u string, numRedirects int) (string, bool) {
-	defer App.Draw() // Just in case
-
-	// Save for resetting on error
-	oldLable := t.barLabel
-	oldText := t.barText
-
-	// Custom return function
-	ret := func(s string, b bool) (string, bool) {
-		if !b {
-			// Reset bottomBar if page wasn't loaded
-			t.barLabel = oldLable
-			t.barText = oldText
-		}
-		t.mode = tabModeDone
-
-		go func(p *structs.Page) {
-			if b && t.hasContent() && !subscriptions.IsSubscribed(s) && viper.GetBool("subscriptions.popup") {
-				// The current page might be an untracked feed, and the user wants
-				// to be notified in such cases.
-
-				feed, isFeed := getFeedFromPage(p)
-				if isFeed && isValidTab(t) && t.page == p {
-					// After parsing and track-checking time, the page is still being displayed
-					addFeedDirect(p.URL, feed, false)
-				}
-			}
-		}(t.page)
-
-		return s, b
-	}
-
-	t.barLabel = ""
-	bottomBar.SetLabel("")
-
-	App.SetFocus(t.view)
-
-	// To allow linking to the bookmarks page, and history browsing
-	if u == "about:bookmarks" {
-		Bookmarks(t)
-		return ret("about:bookmarks", true)
-	}
-	if u == "about:subscriptions" {
-		Subscriptions(t)
-		return ret("about:subscriptions", true)
-	}
-
-	u = normalizeURL(u)
-	u = cache.Redirect(u)
-
-	parsed, err := url.Parse(u)
-	if err != nil {
-		Error("URL Error", err.Error())
-		return ret("", false)
-	}
-
-	proxy := strings.TrimSpace(viper.GetString("proxies." + parsed.Scheme))
-	usingProxy := false
-
-	proxyHostname, proxyPort, err := net.SplitHostPort(proxy)
-	if err != nil {
-		// Error likely means there's no port in the host
-		proxyHostname = proxy
-		proxyPort = "1965"
-	}
-
-	if strings.HasPrefix(u, "http") {
-		if proxy == "" || proxy == "off" {
-			// No proxy available
-			handleHTTP(u, true)
-			return ret("", false)
-		}
-		usingProxy = true
-	}
-
-	if strings.HasPrefix(u, "file") {
-		page, ok := handleFile(u)
-		if !ok {
-			return ret("", false)
-		}
-		setPage(t, page)
-		return ret(u, true)
-	}
-
-	if !strings.HasPrefix(u, "http") && !strings.HasPrefix(u, "gemini") && !strings.HasPrefix(u, "file") {
-		// Not a Gemini URL
-		if proxy == "" || proxy == "off" {
-			// No proxy available
-			handleOther(u)
-			return ret("", false)
-		}
-		usingProxy = true
-	}
-
-	// Gemini URL, or one with a Gemini proxy available
-
-	// Load page from cache if it exists,
-	// and this isn't a page that was redirected to by the server (indicates dynamic content)
-	if numRedirects == 0 {
-		page, ok := cache.GetPage(u)
-		if ok {
-			setPage(t, page)
-			return ret(u, true)
-		}
-	}
-	// Otherwise download it
-	bottomBar.SetText("Loading...")
-	t.barText = "Loading..." // Save it too, in case the tab switches during loading
-	t.mode = tabModeLoading
-	App.Draw()
-
-	var res *gemini.Response
-	if usingProxy {
-		res, err = client.FetchWithProxy(proxyHostname, proxyPort, u)
-	} else {
-		res, err = client.Fetch(u)
-	}
-
-	// Loading may have taken a while, make sure tab is still valid
-	if !isValidTab(t) {
-		return ret("", false)
-	}
-
-	if errors.Is(err, client.ErrTofu) {
-		if usingProxy {
-			// They are using a proxy
-			if Tofu(proxy, client.GetExpiry(proxyHostname, proxyPort)) {
-				// They want to continue anyway
-				client.ResetTofuEntry(proxyHostname, proxyPort, res.Cert)
-				// Response can be used further down, no need to reload
-			} else {
-				// They don't want to continue
-				return ret("", false)
-			}
-		} else {
-			if Tofu(parsed.Host, client.GetExpiry(parsed.Hostname(), parsed.Port())) {
-				// They want to continue anyway
-				client.ResetTofuEntry(parsed.Hostname(), parsed.Port(), res.Cert)
-				// Response can be used further down, no need to reload
-			} else {
-				// They don't want to continue
-				return ret("", false)
-			}
-		}
-	} else if err != nil {
-		Error("URL Fetch Error", err.Error())
-		return ret("", false)
-	}
-	if renderer.CanDisplay(res) {
-		page, err := renderer.MakePage(u, res, textWidth(), leftMargin(), usingProxy)
-		// Rendering may have taken a while, make sure tab is still valid
-		if !isValidTab(t) {
-			return ret("", false)
-		}
-
-		var res2 *gemini.Response
-		var dlErr error
-
-		if errors.Is(err, renderer.ErrTooLarge) {
-			// Make new request for downloading purposes
-			if usingProxy {
-				res2, dlErr = client.DownloadWithProxy(proxyHostname, proxyPort, u)
-			} else {
-				res2, dlErr = client.Download(u)
-			}
-			if dlErr != nil && !errors.Is(dlErr, client.ErrTofu) {
-				Error("URL Fetch Error", err.Error())
-				return ret("", false)
-			}
-			go dlChoice("That page is too large. What would you like to do?", u, res2)
-			return ret("", false)
-		}
-		if errors.Is(err, renderer.ErrTimedOut) {
-			// Make new request for downloading purposes
-			if usingProxy {
-				res2, dlErr = client.DownloadWithProxy(proxyHostname, proxyPort, u)
-			} else {
-				res2, dlErr = client.Download(u)
-			}
-			if dlErr != nil && !errors.Is(dlErr, client.ErrTofu) {
-				Error("URL Fetch Error", err.Error())
-				return ret("", false)
-			}
-			go dlChoice("Loading that page timed out. What would you like to do?", u, res2)
-			return ret("", false)
-		}
-		if err != nil {
-			Error("Page Error", "Issuing creating page: "+err.Error())
-			return ret("", false)
-		}
-
-		page.Width = termW
-
-		if !client.HasClientCert(parsed.Host) {
-			// Don't cache pages with client certs
-			go cache.AddPage(page)
-		}
-
-		setPage(t, page)
-		return ret(u, true)
-	}
-	// Not displayable
-	// Could be a non 20 (or 21) status code, or a different kind of document
-
-	// Handle each status code
-	switch res.Status {
-	case 10, 11:
-		userInput, ok := Input(res.Meta)
-		if ok {
-			// Make another request with the query string added
-			// + chars are replaced because PathEscape doesn't do that
-			parsed.RawQuery = gemini.QueryEscape(userInput)
-			if len(parsed.String()) > gemini.URLMaxLength {
-				Error("Input Error", "URL for that input would be too long.")
-				return ret("", false)
-			}
-			return ret(handleURL(t, parsed.String(), 0))
-		}
-		return ret("", false)
-	case 30, 31:
-		parsedMeta, err := url.Parse(res.Meta)
-		if err != nil {
-			Error("Redirect Error", "Invalid URL: "+err.Error())
-			return ret("", false)
-		}
-		redir := parsed.ResolveReference(parsedMeta).String()
-		// Prompt before redirecting to non-Gemini protocol
-		redirect := false
-		if !strings.HasPrefix(redir, "gemini") {
-			if YesNo("Follow redirect to non-Gemini URL?\n" + redir) {
-				redirect = true
-			} else {
-				return ret("", false)
-			}
-		}
-		// Prompt before redirecting
-		autoRedirect := viper.GetBool("a-general.auto_redirect")
-		if redirect || (autoRedirect && numRedirects < 5) || YesNo("Follow redirect?\n"+redir) {
-			if res.Status == gemini.StatusRedirectPermanent {
-				go cache.AddRedir(u, redir)
-			}
-			return ret(handleURL(t, redir, numRedirects+1))
-		}
-		return ret("", false)
-	case 40:
-		Error("Temporary Failure", escapeMeta(res.Meta))
-		return ret("", false)
-	case 41:
-		Error("Server Unavailable", escapeMeta(res.Meta))
-		return ret("", false)
-	case 42:
-		Error("CGI Error", escapeMeta(res.Meta))
-		return ret("", false)
-	case 43:
-		Error("Proxy Failure", escapeMeta(res.Meta))
-		return ret("", false)
-	case 44:
-		Error("Slow Down", "You should wait "+escapeMeta(res.Meta)+" seconds before making another request.")
-		return ret("", false)
-	case 50:
-		Error("Permanent Failure", escapeMeta(res.Meta))
-		return ret("", false)
-	case 51:
-		Error("Not Found", escapeMeta(res.Meta))
-		return ret("", false)
-	case 52:
-		Error("Gone", escapeMeta(res.Meta))
-		return ret("", false)
-	case 53:
-		Error("Proxy Request Refused", escapeMeta(res.Meta))
-		return ret("", false)
-	case 59:
-		Error("Bad Request", escapeMeta(res.Meta))
-		return ret("", false)
-	case 60:
-		Error("Client Certificate Required", escapeMeta(res.Meta))
-		return ret("", false)
-	case 61:
-		Error("Certificate Not Authorised", escapeMeta(res.Meta))
-		return ret("", false)
-	case 62:
-		Error("Certificate Not Valid", escapeMeta(res.Meta))
-		return ret("", false)
-	}
-
-	// Status code 20, but not a document that can be displayed
-
-	// First see if it's a feed, and ask the user about adding it if it is
-	filename := path.Base(parsed.Path)
-	mediatype, _, _ := mime.ParseMediaType(res.Meta)
-	feed, ok := subscriptions.GetFeed(mediatype, filename, res.Body)
-	if ok {
-		go func() {
-			added := addFeedDirect(u, feed, subscriptions.IsSubscribed(u))
-			if !added {
-				// Otherwise offer download choices
-				go dlChoice("That file could not be displayed. What would you like to do?", u, res)
-			}
-		}()
-		return ret("", false)
-	}
-
-	// Otherwise offer download choices
-	go dlChoice("That file could not be displayed. What would you like to do?", u, res)
-	return ret("", false)
-}
-
 // rewriteTabRow clears the tabRow and writes all the tabs number/favicons into it.
 func rewriteTabRow() {
 	tabRow.Clear()

From 62102d4f980e72a016bf9875a43b3c1fd97f0be1 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Fri, 27 Nov 2020 18:25:17 -0500
Subject: [PATCH 27/33] Add handleAbout()

---
 display/display.go  | 21 ++-------------------
 display/handlers.go | 39 +++++++++++++++++++++++++++++++--------
 display/private.go  | 16 ++--------------
 3 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/display/display.go b/display/display.go
index 919cfb8..a2c5bdb 100644
--- a/display/display.go
+++ b/display/display.go
@@ -576,25 +576,8 @@ func Reload() {
 // URL loads and handles the provided URL for the current tab.
 // It should be an absolute URL.
 func URL(u string) {
-	// Some code is copied in followLink()
-
-	if u == "about:bookmarks" { //nolint:goconst
-		Bookmarks(tabs[curTab])
-		tabs[curTab].addToHistory("about:bookmarks")
-		return
-	}
-	if u == "about:subscriptions" { //nolint:goconst
-		Subscriptions(tabs[curTab])
-		tabs[curTab].addToHistory("about:subscriptions")
-		return
-	}
-	if u == "about:newtab" {
-		temp := newTabPage // Copy
-		setPage(tabs[curTab], &temp)
-		return
-	}
-	if strings.HasPrefix(u, "about:") {
-		Error("Error", "Not a valid 'about:' URL.")
+	if u[:6] == "about:" {
+		handleAbout(tabs[curTab], u)
 		return
 	}
 
diff --git a/display/handlers.go b/display/handlers.go
index b3ae20a..e4440de 100644
--- a/display/handlers.go
+++ b/display/handlers.go
@@ -163,6 +163,35 @@ func handleFavicon(t *tab, host, old string) {
 	cache.AddFavicon(host, emoji)
 }
 
+// handleAbout can be called to deal with any URLs that start with
+// 'about:'. It will display errors if the URL is not recognized,
+// but not display anything if an 'about:' URL is not passed.
+//
+// It returns a bool indicating if the provided URL could be handled.
+func handleAbout(t *tab, u string) bool {
+	if u[:6] != "about:" {
+		return false
+	}
+
+	switch u {
+	case "about:bookmarks":
+		Bookmarks(t)
+		t.addToHistory("about:bookmarks")
+		return true
+	case "about:subscriptions":
+		Subscriptions(t)
+		t.addToHistory("about:subscriptions")
+		return true
+	case "about:newtab":
+		temp := newTabPage // Copy
+		setPage(t, &temp)
+		return true
+	}
+
+	Error("Error", "Not a valid 'about:' URL.")
+	return false
+}
+
 // handleURL displays whatever action is needed for the provided URL,
 // and applies it to the current tab.
 // It loads documents, handles errors, brings up a download prompt, etc.
@@ -215,14 +244,8 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 
 	App.SetFocus(t.view)
 
-	// To allow linking to the bookmarks page, and history browsing
-	if u == "about:bookmarks" {
-		Bookmarks(t)
-		return ret("about:bookmarks", true)
-	}
-	if u == "about:subscriptions" {
-		Subscriptions(t)
-		return ret("about:subscriptions", true)
+	if u[:6] == "about:" {
+		return ret(u, handleAbout(t, u))
 	}
 
 	u = normalizeURL(u)
diff --git a/display/private.go b/display/private.go
index 63ea32e..2758f0f 100644
--- a/display/private.go
+++ b/display/private.go
@@ -19,20 +19,8 @@ import (
 // Not when a URL is opened on a new tab for the first time.
 // It will handle setting the bottomBar.
 func followLink(t *tab, prev, next string) {
-
-	// Copied from URL()
-	if next == "about:bookmarks" {
-		Bookmarks(t)
-		t.addToHistory("about:bookmarks")
-		return
-	}
-	if next == "about:subscriptions" {
-		Subscriptions(t)
-		t.addToHistory("about:subscriptions")
-		return
-	}
-	if strings.HasPrefix(next, "about:") {
-		Error("Error", "Not a valid 'about:' URL for linking")
+	if next[:6] == "about:" {
+		handleAbout(t, next)
 		return
 	}
 

From 1a2fba92c2b65a7c00ea842085ff5340bc5a3c67 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sat, 5 Dec 2020 20:35:15 -0500
Subject: [PATCH 28/33] Add subscription manager, fix corrupt read/write &
 short URI panic

More info on corrupt reads and writes:
https://github.com/makeworld-the-better-one/amfora/issues/61#issuecomment-735042805

The panic was occuring due to lines like:

    if u[:6] == "about:"

These would cause panics for URIs that were shorter than 6, like "docs/".
strings.HasPrefix was used instead to fix this.
---
 NOTES.md                       |  2 +-
 README.md                      |  3 +-
 display/display.go             |  9 +++--
 display/handlers.go            | 15 +++++--
 display/newtab.go              |  2 +-
 display/private.go             |  6 ++-
 display/subscriptions.go       | 69 ++++++++++++++++++++++++++++----
 display/tab.go                 |  5 +--
 subscriptions/structs.go       |  3 +-
 subscriptions/subscriptions.go | 72 ++++++++++++++++++++++++++--------
 10 files changed, 145 insertions(+), 41 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index 57b0ee2..4cc6f77 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -20,4 +20,4 @@
 - Bookmark keys aren't deleted, just set to `""`
   - Waiting on [this viper PR](https://github.com/spf13/viper/pull/519) to be merged
 - Help table cells aren't dynamically wrapped
-  - Filed [issue 29](https://gitlab.com/tslocum/cview/-/issues/29)
\ No newline at end of file
+  - Filed [issue 29](https://gitlab.com/tslocum/cview/-/issues/29)
diff --git a/README.md b/README.md
index 28a3ad1..1cf6b42 100644
--- a/README.md
+++ b/README.md
@@ -165,8 +165,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
-- My [progressbar fork](https://github.com/makeworld-the-better-one/progressbar)
+- My [progressbar fork](https://github.com/makeworld-the-better-one/progressbar) - pull request [here](https://github.com/schollz/progressbar/pull/69)
 - [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)
 
 ## License
 This project is licensed under the GPL v3.0. See the [LICENSE](./LICENSE) file for details.
diff --git a/display/display.go b/display/display.go
index a2c5bdb..7bb147d 100644
--- a/display/display.go
+++ b/display/display.go
@@ -576,8 +576,11 @@ func Reload() {
 // URL loads and handles the provided URL for the current tab.
 // It should be an absolute URL.
 func URL(u string) {
-	if u[:6] == "about:" {
-		handleAbout(tabs[curTab], u)
+	t := tabs[curTab]
+	if strings.HasPrefix(u, "about:") {
+		if ok := handleAbout(t, u); ok {
+			t.addToHistory(u)
+		}
 		return
 	}
 
@@ -585,7 +588,7 @@ func URL(u string) {
 		// Assume it's a Gemini URL
 		u = "gemini://" + u
 	}
-	go goURL(tabs[curTab], u)
+	go goURL(t, u)
 }
 
 func NumTabs() int {
diff --git a/display/handlers.go b/display/handlers.go
index e4440de..5d791b4 100644
--- a/display/handlers.go
+++ b/display/handlers.go
@@ -167,27 +167,34 @@ func handleFavicon(t *tab, host, old string) {
 // 'about:'. It will display errors if the URL is not recognized,
 // but not display anything if an 'about:' URL is not passed.
 //
+// It does not add the displayed page to history.
+//
 // It returns a bool indicating if the provided URL could be handled.
 func handleAbout(t *tab, u string) bool {
-	if u[:6] != "about:" {
+	if !strings.HasPrefix(u, "about:") {
 		return false
 	}
 
 	switch u {
 	case "about:bookmarks":
 		Bookmarks(t)
-		t.addToHistory("about:bookmarks")
 		return true
 	case "about:subscriptions":
 		Subscriptions(t)
-		t.addToHistory("about:subscriptions")
 		return true
 	case "about:newtab":
 		temp := newTabPage // Copy
 		setPage(t, &temp)
+		t.applyBottomBar()
 		return true
 	}
 
+	if u == "about:manage-subscriptions" || (len(u) > 27 && u[:27] == "about:manage-subscriptions?") {
+		ManageSubscriptions(t, u)
+		// Don't count remove command in history
+		return u == "about:manage-subscriptions"
+	}
+
 	Error("Error", "Not a valid 'about:' URL.")
 	return false
 }
@@ -244,7 +251,7 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 
 	App.SetFocus(t.view)
 
-	if u[:6] == "about:" {
+	if strings.HasPrefix(u, "about:") {
 		return ret(u, handleAbout(t, u))
 	}
 
diff --git a/display/newtab.go b/display/newtab.go
index dde3c2f..fbc119b 100644
--- a/display/newtab.go
+++ b/display/newtab.go
@@ -18,7 +18,7 @@ You can customize this page by creating a gemtext file called newtab.gmi, in Amf
 Happy browsing!
 
 => about:bookmarks Bookmarks
-=> about:subscriptions Feed and Page Tracking
+=> about:subscriptions Subscriptions
 
 => //gemini.circumlunar.space Project Gemini
 => https://github.com/makeworld-the-better-one/amfora Amfora homepage [HTTPS]
diff --git a/display/private.go b/display/private.go
index 2758f0f..d718a9f 100644
--- a/display/private.go
+++ b/display/private.go
@@ -19,8 +19,10 @@ import (
 // Not when a URL is opened on a new tab for the first time.
 // It will handle setting the bottomBar.
 func followLink(t *tab, prev, next string) {
-	if next[:6] == "about:" {
-		handleAbout(t, next)
+	if strings.HasPrefix(next, "about:") {
+		if ok := handleAbout(t, next); ok {
+			t.addToHistory(next)
+		}
 		return
 	}
 
diff --git a/display/subscriptions.go b/display/subscriptions.go
index 58bdd9a..bfed1b6 100644
--- a/display/subscriptions.go
+++ b/display/subscriptions.go
@@ -15,6 +15,7 @@ import (
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
 	"github.com/makeworld-the-better-one/amfora/subscriptions"
+	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/mmcdole/gofeed"
 	"github.com/spf13/viper"
 )
@@ -28,7 +29,7 @@ func toLocalDay(t time.Time) time.Time {
 	return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
 }
 
-// Feeds displays the feeds page on the current tab.
+// Subscriptions displays the subscriptions page on the current tab.
 func Subscriptions(t *tab) {
 	logger.Log.Println("display.Subscriptions called")
 
@@ -43,9 +44,10 @@ func Subscriptions(t *tab) {
 
 	logger.Log.Println("started rendering subscriptions page")
 
-	subscriptionPageRaw := "# Subscriptions\n\n" +
+	rawPage := "# Subscriptions\n\n" +
 		"See the help (by pressing ?) for details on how to use this page.\n\n" +
-		"If you just opened Amfora then updates will appear incrementally. Reload the page to see them.\n"
+		"If you just opened Amfora then updates will appear incrementally. Reload the page to see them.\n\n" +
+		"=> about:manage-subscriptions Manage subscriptions\n"
 
 	// curDay represents what day of posts the loop is on.
 	// It only goes backwards in time.
@@ -67,21 +69,21 @@ func Subscriptions(t *tab) {
 		if pub.Before(curDay) {
 			// This post is on a new day, add a day header
 			curDay = pub
-			subscriptionPageRaw += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
+			rawPage += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
 		}
 		if entry.Title == "" || entry.Title == "/" {
 			// Just put author/title
 			// Mainly used for when you're tracking the root domain of a site
-			subscriptionPageRaw += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
+			rawPage += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
 		} else {
 			// Include title and dash
-			subscriptionPageRaw += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
+			rawPage += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
 		}
 	}
 
-	content, links := renderer.RenderGemini(subscriptionPageRaw, textWidth(), leftMargin(), false)
+	content, links := renderer.RenderGemini(rawPage, textWidth(), leftMargin(), false)
 	page := structs.Page{
-		Raw:       subscriptionPageRaw,
+		Raw:       rawPage,
 		Content:   content,
 		Links:     links,
 		URL:       "about:subscriptions",
@@ -97,6 +99,57 @@ func Subscriptions(t *tab) {
 	logger.Log.Println("done rendering subscriptions page")
 }
 
+// ManageSubscriptions displays the subscription managing page in
+// the current tab. `u` is the URL entered by the user.
+func ManageSubscriptions(t *tab, u string) {
+	if len(u) > 27 && u[:27] == "about:manage-subscriptions?" {
+		// There's a query string, aka a URL to unsubscribe from
+		manageSubscriptionQuery(t, u)
+		return
+	}
+
+	rawPage := "# Manage Subscriptions\n\n" +
+		"Below is list of URLs, both feeds and pages. Navigate to the link to unsubscribe from that feed or page.\n\n"
+
+	for _, u2 := range subscriptions.AllURLS() {
+		rawPage += fmt.Sprintf(
+			"=>%s %s\n",
+			"about:manage-subscriptions?"+gemini.QueryEscape(u2),
+			u2,
+		)
+	}
+
+	content, links := renderer.RenderGemini(rawPage, textWidth(), leftMargin(), false)
+	page := structs.Page{
+		Raw:       rawPage,
+		Content:   content,
+		Links:     links,
+		URL:       "about:manage-subscriptions",
+		Width:     termW,
+		Mediatype: structs.TextGemini,
+	}
+	go cache.AddPage(&page)
+	setPage(t, &page)
+	t.applyBottomBar()
+}
+
+func manageSubscriptionQuery(t *tab, u string) {
+	sub, err := gemini.QueryUnescape(u[27:])
+	if err != nil {
+		Error("URL Error", "Invalid query string: "+err.Error())
+		return
+	}
+
+	err = subscriptions.Remove(sub)
+	if err != nil {
+		ManageSubscriptions(t, "about:manage-subscriptions") // Reload
+		Error("Save Error", "Error saving the unsubscription to disk: "+err.Error())
+		return
+	}
+	ManageSubscriptions(t, "about:manage-subscriptions") // Reload
+	Info("Unsubscribed from " + sub)
+}
+
 // openSubscriptionModal displays the "Add subscription" modal
 // It returns whether the user wanted to subscribe to feed/page.
 // The subscribed arg specifies whether this feed/page is already
diff --git a/display/tab.go b/display/tab.go
index f192720..8c3f805 100644
--- a/display/tab.go
+++ b/display/tab.go
@@ -146,9 +146,8 @@ func (t *tab) pageDown() {
 	t.view.ScrollTo(row+(termH/4)*3, col)
 }
 
-// hasContent returns true when the tab has a page that could be displayed.
-// The most likely situation where false would be returned is when the default
-// new tab content is being displayed.
+// hasContent returns false when the tab's page is malformed,
+// has no content or URL, or if it's an 'about:' page.
 func (t *tab) hasContent() bool {
 	if t.page == nil || t.view == nil {
 		return false
diff --git a/subscriptions/structs.go b/subscriptions/structs.go
index ba6fc16..facb809 100644
--- a/subscriptions/structs.go
+++ b/subscriptions/structs.go
@@ -73,8 +73,7 @@ type pageJSON struct {
 var data = jsonData{
 	feedMu: &sync.RWMutex{},
 	pageMu: &sync.RWMutex{},
-	Feeds:  make(map[string]*gofeed.Feed),
-	Pages:  make(map[string]*pageJSON),
+	// Maps are created in Init()
 }
 
 // PageEntry is a single item on a subscriptions page.
diff --git a/subscriptions/subscriptions.go b/subscriptions/subscriptions.go
index bdf4f8c..16b4743 100644
--- a/subscriptions/subscriptions.go
+++ b/subscriptions/subscriptions.go
@@ -6,10 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"mime"
 	"os"
 	"path"
 	"reflect"
+	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -42,20 +44,29 @@ func Init() error {
 	f, err := os.Open(config.SubscriptionPath)
 	if err == nil {
 		// File exists and could be opened
-		defer f.Close()
 
 		fi, err := f.Stat()
 		if err == nil && fi.Size() > 0 {
 			// File is not empty
-			dec := json.NewDecoder(f)
-			err = dec.Decode(&data)
-			if err != nil && err != io.EOF {
+
+			jsonBytes, err := ioutil.ReadAll(f)
+			f.Close()
+			if err != nil {
+				return fmt.Errorf("read subscriptions.json error: %w", err)
+			}
+			err = json.Unmarshal(jsonBytes, &data)
+			if err != nil {
 				return fmt.Errorf("subscriptions.json is corrupted: %w", err) //nolint:goerr113
 			}
 		}
+		f.Close()
 	} else if !os.IsNotExist(err) {
 		// There's an error opening the file, but it's not bc is doesn't exist
 		return fmt.Errorf("open subscriptions.json error: %w", err) //nolint:goerr113
+	} else {
+		// File does not exist, initialize maps
+		data.Feeds = make(map[string]*gofeed.Feed)
+		data.Pages = make(map[string]*pageJSON)
 	}
 
 	LastUpdated = time.Now()
@@ -130,26 +141,21 @@ func writeJSON() error {
 	writeMu.Lock()
 	defer writeMu.Unlock()
 
-	f, err := os.OpenFile(config.SubscriptionPath, os.O_WRONLY|os.O_CREATE, 0666)
+	data.Lock()
+	logger.Log.Println("subscriptions.writeJSON acquired data lock")
+	jsonBytes, err := json.MarshalIndent(&data, "", "  ")
+	data.Unlock()
 	if err != nil {
 		logger.Log.Println("subscriptions.writeJSON error", err)
 		return err
 	}
-	defer f.Close()
-	enc := json.NewEncoder(f)
-	enc.SetEscapeHTML(false)
-	enc.SetIndent("", "  ")
-
-	data.Lock()
-	logger.Log.Println("subscriptions.writeJSON acquired data lock")
-	err = enc.Encode(&data)
-	data.Unlock()
-
+	err = ioutil.WriteFile(config.SubscriptionPath, jsonBytes, 0666)
 	if err != nil {
 		logger.Log.Println("subscriptions.writeJSON error", err)
+		return err
 	}
 
-	return err
+	return nil
 }
 
 // AddFeed stores a feed.
@@ -363,3 +369,37 @@ func updateAll() {
 
 	wg.Wait()
 }
+
+// AllURLs returns all the subscribed-to URLS, sorted alphabetically.
+func AllURLS() []string {
+	data.RLock()
+	defer data.RUnlock()
+
+	urls := make([]string, len(data.Feeds)+len(data.Pages))
+	i := 0
+	for k := range data.Feeds {
+		urls[i] = k
+		i++
+	}
+	for k := range data.Pages {
+		urls[i] = k
+		i++
+	}
+
+	sort.Strings(urls)
+	return urls
+}
+
+// Remove removes a subscription from memory and from the disk.
+// The URL must be provided. It will do nothing if the URL is
+// not an actual subscription.
+//
+// It returns any errors that occured when saving to disk.
+func Remove(u string) error {
+	data.Lock()
+	// Just delete from both instead of using a loop to find it
+	delete(data.Feeds, u)
+	delete(data.Pages, u)
+	data.Unlock()
+	return writeJSON()
+}

From dd7550dffb67b63c69ff8a0423ae58f1ce57760a Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sun, 6 Dec 2020 20:57:57 -0500
Subject: [PATCH 29/33] Add pagination

---
 NOTES.md                       |   2 +-
 README.md                      |   2 +-
 config/config.go               |   1 +
 config/default.go              |   3 +
 default-config.toml            |   3 +
 display/display.go             |   6 +-
 display/handlers.go            |  28 +++---
 display/private.go             |   4 +-
 display/subscriptions.go       | 158 +++++++++++++++++++++++++--------
 subscriptions/subscriptions.go |   6 +-
 10 files changed, 152 insertions(+), 61 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index 4cc6f77..9d4f3f9 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,6 +1,6 @@
 # Notes
 
-## Subscriptions (temp)
+## Subscriptions
 - TODO: remove all logger lines
 
 ## Issues
diff --git a/README.md b/README.md
index 1cf6b42..a13bcd6 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ Features in *italics* are in the master branch, but not in the latest release.
     - https://lists.orbitalfox.eu/archives/gemini/2020/001400.html
 - [x] Subscriptions
   - RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
-  - So is tracking any page to be notified when it changes
+  - So is tracking a page, to know when its content changes
 - [ ] Stream support
 - [ ] Table of contents for pages
 - [ ] History browser
diff --git a/config/config.go b/config/config.go
index e32654b..d69184a 100644
--- a/config/config.go
+++ b/config/config.go
@@ -237,6 +237,7 @@ func Init() error {
 	viper.SetDefault("subscriptions.popup", true)
 	viper.SetDefault("subscriptions.update_interval", 1800)
 	viper.SetDefault("subscriptions.workers", 3)
+	viper.SetDefault("subscriptions.entries_per_page", 20)
 
 	viper.SetConfigFile(configPath)
 	viper.SetConfigType("toml")
diff --git a/config/default.go b/config/default.go
index 705664e..dd1fc7b 100644
--- a/config/default.go
+++ b/config/default.go
@@ -153,6 +153,9 @@ update_interval = 1800 # 30 mins
 # update times. Any value below 1 will be corrected to 1.
 workers = 3
 
+# The number of subscription updates displayed per page.
+entries_per_page = 20
+
 
 [theme]
 # This section is for changing the COLORS used in Amfora.
diff --git a/default-config.toml b/default-config.toml
index 4ba508d..05cc68d 100644
--- a/default-config.toml
+++ b/default-config.toml
@@ -150,6 +150,9 @@ update_interval = 1800 # 30 mins
 # update times. Any value below 1 will be corrected to 1.
 workers = 3
 
+# The number of subscription updates displayed per page.
+entries_per_page = 20
+
 
 [theme]
 # This section is for changing the COLORS used in Amfora.
diff --git a/display/display.go b/display/display.go
index 7bb147d..2110745 100644
--- a/display/display.go
+++ b/display/display.go
@@ -294,7 +294,7 @@ func Init() {
 				}
 				return nil
 			case tcell.KeyCtrlA:
-				Subscriptions(tabs[curTab])
+				Subscriptions(tabs[curTab], "about:subscriptions")
 				tabs[curTab].addToHistory("about:subscriptions")
 				return nil
 			case tcell.KeyCtrlX:
@@ -578,8 +578,8 @@ func Reload() {
 func URL(u string) {
 	t := tabs[curTab]
 	if strings.HasPrefix(u, "about:") {
-		if ok := handleAbout(t, u); ok {
-			t.addToHistory(u)
+		if final, ok := handleAbout(t, u); ok {
+			t.addToHistory(final)
 		}
 		return
 	}
diff --git a/display/handlers.go b/display/handlers.go
index 5d791b4..58833f1 100644
--- a/display/handlers.go
+++ b/display/handlers.go
@@ -169,34 +169,40 @@ func handleFavicon(t *tab, host, old string) {
 //
 // It does not add the displayed page to history.
 //
-// It returns a bool indicating if the provided URL could be handled.
-func handleAbout(t *tab, u string) bool {
+// It returns the URL displayed, and a bool indicating if the provided
+// URL could be handled. The string returned will always be empty
+// if the bool is false.
+func handleAbout(t *tab, u string) (string, bool) {
 	if !strings.HasPrefix(u, "about:") {
-		return false
+		return "", false
 	}
 
 	switch u {
 	case "about:bookmarks":
 		Bookmarks(t)
-		return true
-	case "about:subscriptions":
-		Subscriptions(t)
-		return true
+		return u, true
 	case "about:newtab":
 		temp := newTabPage // Copy
 		setPage(t, &temp)
 		t.applyBottomBar()
-		return true
+		return u, true
 	}
 
+	if u == "about:subscriptions" || (len(u) > 20 && u[:20] == "about:subscriptions?") {
+		// about:subscriptions?2 views page 2
+		return Subscriptions(t, u), true
+	}
 	if u == "about:manage-subscriptions" || (len(u) > 27 && u[:27] == "about:manage-subscriptions?") {
 		ManageSubscriptions(t, u)
 		// Don't count remove command in history
-		return u == "about:manage-subscriptions"
+		if u == "about:manage-subscriptions" {
+			return u, true
+		}
+		return "", false
 	}
 
 	Error("Error", "Not a valid 'about:' URL.")
-	return false
+	return "", false
 }
 
 // handleURL displays whatever action is needed for the provided URL,
@@ -252,7 +258,7 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 	App.SetFocus(t.view)
 
 	if strings.HasPrefix(u, "about:") {
-		return ret(u, handleAbout(t, u))
+		return ret(handleAbout(t, u))
 	}
 
 	u = normalizeURL(u)
diff --git a/display/private.go b/display/private.go
index d718a9f..1ead234 100644
--- a/display/private.go
+++ b/display/private.go
@@ -20,8 +20,8 @@ import (
 // It will handle setting the bottomBar.
 func followLink(t *tab, prev, next string) {
 	if strings.HasPrefix(next, "about:") {
-		if ok := handleAbout(t, next); ok {
-			t.addToHistory(next)
+		if final, ok := handleAbout(t, next); ok {
+			t.addToHistory(final)
 		}
 		return
 	}
diff --git a/display/subscriptions.go b/display/subscriptions.go
index bfed1b6..27edfb9 100644
--- a/display/subscriptions.go
+++ b/display/subscriptions.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/url"
 	"path"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -20,7 +21,9 @@ import (
 	"github.com/spf13/viper"
 )
 
-var subscriptionPageUpdated time.Time
+// Map page number (zero-indexed) to the time it was made at.
+// This allows for caching the pages until there's an update.
+var subscriptionPageUpdated = make(map[int]time.Time)
 
 // toLocalDay truncates the provided time to a date only,
 // but converts to the local time first.
@@ -30,54 +33,125 @@ func toLocalDay(t time.Time) time.Time {
 }
 
 // Subscriptions displays the subscriptions page on the current tab.
-func Subscriptions(t *tab) {
+func Subscriptions(t *tab, u string) string {
 	logger.Log.Println("display.Subscriptions called")
 
+	pageN := 0 // Pages are zero-indexed internally
+
+	// Correct URL if query string exists
+	// The only valid query string is an int above 1.
+	// Anything "redirects" to the first page, with no query string.
+	// This is done over just serving the first page content for
+	// invalid query strings so that there won't be duplicate caches.
+	correctURL := func(u2 string) string {
+		if len(u2) > 20 && u2[:20] == "about:subscriptions?" {
+			query, err := gemini.QueryUnescape(u2[20:])
+			if err != nil {
+				return "about:subscriptions"
+			}
+			// Valid query string
+			i, err := strconv.Atoi(query)
+			if err != nil {
+				// Not an int
+				return "about:subscriptions"
+			}
+			if i < 2 {
+				return "about:subscriptions"
+			}
+			// Valid int above 1
+			pageN = i - 1 // Pages are zero-indexed internally
+			return u2
+		}
+		return u2
+	}
+	u = correctURL(u)
+
 	// Retrieve cached version if there hasn't been any updates
-	p, ok := cache.GetPage("about:subscriptions")
-	if subscriptionPageUpdated.After(subscriptions.LastUpdated) && ok {
+	p, ok := cache.GetPage(u)
+	if subscriptionPageUpdated[pageN].After(subscriptions.LastUpdated) && ok {
 		logger.Log.Println("using cached subscriptions page")
 		setPage(t, p)
 		t.applyBottomBar()
-		return
+		return u
 	}
 
 	logger.Log.Println("started rendering subscriptions page")
 
-	rawPage := "# Subscriptions\n\n" +
-		"See the help (by pressing ?) for details on how to use this page.\n\n" +
-		"If you just opened Amfora then updates will appear incrementally. Reload the page to see them.\n\n" +
-		"=> about:manage-subscriptions Manage subscriptions\n"
-
-	// curDay represents what day of posts the loop is on.
-	// It only goes backwards in time.
-	// Its initial setting means:
-	// Only display posts older than 26 hours in the future, nothing further in the future.
-	//
-	// 26 hours was chosen because it is the largest timezone difference
-	// currently in the world. Posts may be dated in the future
-	// due to software bugs, where the local user's date is used, but
-	// the UTC timezone is specified. I believe gemfeed does this.
-	curDay := toLocalDay(time.Now()).Add(26 * time.Hour)
-
 	pe := subscriptions.GetPageEntries()
 
-	for _, entry := range pe.Entries { // From new to old
-		// Convert to local time, remove sub-day info
-		pub := toLocalDay(entry.Published)
+	// Figure out where the entries for this page start, if at all.
+	epp := viper.GetInt("subscriptions.entries_per_page")
+	if epp <= 0 {
+		epp = 1
+	}
+	start := pageN * epp // Index of the first page entry to be displayed
+	end := start + epp
+	if end > len(pe.Entries) {
+		end = len(pe.Entries)
+	}
 
-		if pub.Before(curDay) {
-			// This post is on a new day, add a day header
-			curDay = pub
-			rawPage += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
+	var rawPage string
+	if pageN == 0 {
+		rawPage = "# Subscriptions\n\n" + rawPage
+	} else {
+		rawPage = fmt.Sprintf("# Subscriptions (page %d)\n\n", pageN+1) + rawPage
+	}
+
+	if start > len(pe.Entries)-1 && len(pe.Entries) != 0 {
+		// The page is out of range, doesn't exist
+		rawPage += "This page does not exist.\n\n=> about:subscriptions Subscriptions\n"
+	} else {
+		// Render page
+
+		rawPage += "You can use Ctrl-X to subscribe to a page, or to an Atom/RSS/JSON feed. See the online wiki for more.\n" +
+			"If you just opened Amfora then updates may appear incrementally. Reload the page to see them.\n\n" +
+			"=> about:manage-subscriptions Manage subscriptions\n\n"
+
+		// curDay represents what day of posts the loop is on.
+		// It only goes backwards in time.
+		// Its initial setting means:
+		// Only display posts older than 26 hours in the future, nothing further in the future.
+		//
+		// 26 hours was chosen because it is the largest timezone difference
+		// currently in the world. Posts may be dated in the future
+		// due to software bugs, where the local user's date is used, but
+		// the UTC timezone is specified. Gemfeed does this at the time of
+		// writing, but will not after #3 gets merged on its repo. Still,
+		// the older version will be used for a while.
+		curDay := toLocalDay(time.Now()).Add(26 * time.Hour)
+
+		for _, entry := range pe.Entries[start:end] { // From new to old
+			// Convert to local time, remove sub-day info
+			pub := toLocalDay(entry.Published)
+
+			if pub.Before(curDay) {
+				// This post is on a new day, add a day header
+				curDay = pub
+				rawPage += fmt.Sprintf("\n## %s\n\n", curDay.Format("Jan 02, 2006"))
+			}
+			if entry.Title == "" || entry.Title == "/" {
+				// Just put author/title
+				// Mainly used for when you're tracking the root domain of a site
+				rawPage += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
+			} else {
+				// Include title and dash
+				rawPage += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
+			}
 		}
-		if entry.Title == "" || entry.Title == "/" {
-			// Just put author/title
-			// Mainly used for when you're tracking the root domain of a site
-			rawPage += fmt.Sprintf("=>%s %s\n", entry.URL, entry.Prefix)
-		} else {
-			// Include title and dash
-			rawPage += fmt.Sprintf("=>%s %s - %s\n", entry.URL, entry.Prefix, entry.Title)
+
+		if pageN == 0 && len(pe.Entries) > epp {
+			// First page, and there's more than can fit
+			rawPage += "\n\n=> about:subscriptions?2 Next Page\n"
+		} else if pageN > 0 {
+			// A later page
+			rawPage += fmt.Sprintf(
+				"\n\n=> about:subscriptions?%d Previous Page\n",
+				pageN, // pageN is zero-indexed but the query string is one-indexed
+			)
+			if end != len(pe.Entries)-1 {
+				// There's more
+				rawPage += fmt.Sprintf("=> about:subscriptions?%d Next Page\n", pageN+2)
+			}
 		}
 	}
 
@@ -86,7 +160,7 @@ func Subscriptions(t *tab) {
 		Raw:       rawPage,
 		Content:   content,
 		Links:     links,
-		URL:       "about:subscriptions",
+		URL:       u,
 		Width:     termW,
 		Mediatype: structs.TextGemini,
 	}
@@ -94,9 +168,11 @@ func Subscriptions(t *tab) {
 	setPage(t, &page)
 	t.applyBottomBar()
 
-	subscriptionPageUpdated = time.Now()
+	subscriptionPageUpdated[pageN] = time.Now()
 
 	logger.Log.Println("done rendering subscriptions page")
+
+	return u
 }
 
 // ManageSubscriptions displays the subscription managing page in
@@ -109,9 +185,13 @@ func ManageSubscriptions(t *tab, u string) {
 	}
 
 	rawPage := "# Manage Subscriptions\n\n" +
-		"Below is list of URLs, both feeds and pages. Navigate to the link to unsubscribe from that feed or page.\n\n"
+		"Below is list of URLs you are subscribed to, both feeds and pages. " +
+		"Navigate to the link to unsubscribe from that feed or page.\n\n"
 
-	for _, u2 := range subscriptions.AllURLS() {
+	urls := subscriptions.AllURLS()
+	sort.Strings(urls)
+
+	for _, u2 := range urls {
 		rawPage += fmt.Sprintf(
 			"=>%s %s\n",
 			"about:manage-subscriptions?"+gemini.QueryEscape(u2),
diff --git a/subscriptions/subscriptions.go b/subscriptions/subscriptions.go
index 16b4743..d12a00d 100644
--- a/subscriptions/subscriptions.go
+++ b/subscriptions/subscriptions.go
@@ -11,7 +11,6 @@ import (
 	"os"
 	"path"
 	"reflect"
-	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -370,7 +369,7 @@ func updateAll() {
 	wg.Wait()
 }
 
-// AllURLs returns all the subscribed-to URLS, sorted alphabetically.
+// AllURLs returns all the subscribed-to URLS.
 func AllURLS() []string {
 	data.RLock()
 	defer data.RUnlock()
@@ -386,7 +385,6 @@ func AllURLS() []string {
 		i++
 	}
 
-	sort.Strings(urls)
 	return urls
 }
 
@@ -394,7 +392,7 @@ func AllURLS() []string {
 // The URL must be provided. It will do nothing if the URL is
 // not an actual subscription.
 //
-// It returns any errors that occured when saving to disk.
+// It returns any errors that occurred when saving to disk.
 func Remove(u string) error {
 	data.Lock()
 	// Just delete from both instead of using a loop to find it

From ef23d9e45f8c542ba6c7590869d4966128fe02d7 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sun, 6 Dec 2020 21:02:41 -0500
Subject: [PATCH 30/33] Logging removed

---
 NOTES.md                       |  3 ---
 amfora.go                      | 11 +++++------
 display/subscriptions.go       | 13 -------------
 subscriptions/entries.go       |  4 ----
 subscriptions/subscriptions.go | 22 ----------------------
 5 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index 9d4f3f9..783f1a9 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,8 +1,5 @@
 # Notes
 
-## Subscriptions
-- TODO: remove all logger lines
-
 ## Issues
 - URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
 
diff --git a/amfora.go b/amfora.go
index e3c5690..62e2c6d 100644
--- a/amfora.go
+++ b/amfora.go
@@ -7,7 +7,6 @@ import (
 	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/display"
-	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/amfora/subscriptions"
 )
 
@@ -18,10 +17,10 @@ var (
 )
 
 func main() {
-	err := logger.Init()
-	if err != nil {
-		panic(err)
-	}
+	// err := logger.Init()
+	// if err != nil {
+	// 	panic(err)
+	// }
 
 	if len(os.Args) > 1 {
 		if os.Args[1] == "--version" || os.Args[1] == "-v" {
@@ -40,7 +39,7 @@ func main() {
 		}
 	}
 
-	err = config.Init()
+	err := config.Init()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
 		os.Exit(1)
diff --git a/display/subscriptions.go b/display/subscriptions.go
index 27edfb9..a08e7a0 100644
--- a/display/subscriptions.go
+++ b/display/subscriptions.go
@@ -12,7 +12,6 @@ import (
 	"github.com/gdamore/tcell"
 	"github.com/makeworld-the-better-one/amfora/cache"
 	"github.com/makeworld-the-better-one/amfora/config"
-	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/amfora/renderer"
 	"github.com/makeworld-the-better-one/amfora/structs"
 	"github.com/makeworld-the-better-one/amfora/subscriptions"
@@ -34,8 +33,6 @@ func toLocalDay(t time.Time) time.Time {
 
 // Subscriptions displays the subscriptions page on the current tab.
 func Subscriptions(t *tab, u string) string {
-	logger.Log.Println("display.Subscriptions called")
-
 	pageN := 0 // Pages are zero-indexed internally
 
 	// Correct URL if query string exists
@@ -69,14 +66,11 @@ func Subscriptions(t *tab, u string) string {
 	// Retrieve cached version if there hasn't been any updates
 	p, ok := cache.GetPage(u)
 	if subscriptionPageUpdated[pageN].After(subscriptions.LastUpdated) && ok {
-		logger.Log.Println("using cached subscriptions page")
 		setPage(t, p)
 		t.applyBottomBar()
 		return u
 	}
 
-	logger.Log.Println("started rendering subscriptions page")
-
 	pe := subscriptions.GetPageEntries()
 
 	// Figure out where the entries for this page start, if at all.
@@ -170,8 +164,6 @@ func Subscriptions(t *tab, u string) string {
 
 	subscriptionPageUpdated[pageN] = time.Now()
 
-	logger.Log.Println("done rendering subscriptions page")
-
 	return u
 }
 
@@ -235,7 +227,6 @@ func manageSubscriptionQuery(t *tab, u string) {
 // The subscribed arg specifies whether this feed/page is already
 // subscribed to.
 func openSubscriptionModal(validFeed, subscribed bool) bool {
-	logger.Log.Println("display.openFeedModal called")
 	// Reuses yesNoModal
 
 	if viper.GetBool("a-general.color") {
@@ -297,8 +288,6 @@ func getFeedFromPage(p *structs.Page) (*gofeed.Feed, bool) {
 //
 // Like addFeed, it should be called in a goroutine.
 func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) bool {
-	logger.Log.Println("display.addFeedDirect called")
-
 	if openSubscriptionModal(true, tracked) {
 		err := subscriptions.AddFeed(u, feed)
 		if err != nil {
@@ -312,8 +301,6 @@ func addFeedDirect(u string, feed *gofeed.Feed, tracked bool) bool {
 // addFeed goes through the process of subscribing to the current page/feed.
 // It is the high-level way of doing it. It should be called in a goroutine.
 func addSubscription() {
-	logger.Log.Println("display.addSubscription called")
-
 	t := tabs[curTab]
 	p := t.page
 
diff --git a/subscriptions/entries.go b/subscriptions/entries.go
index f985122..5e45f10 100644
--- a/subscriptions/entries.go
+++ b/subscriptions/entries.go
@@ -5,8 +5,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-
-	"github.com/makeworld-the-better-one/amfora/logger"
 )
 
 // This file contains funcs for creating PageEntries, which
@@ -42,8 +40,6 @@ func getURL(urls []string) string {
 // so this function needs to be called again to get updates.
 // It always returns sorted entries - by post time, from newest to oldest.
 func GetPageEntries() *PageEntries {
-	logger.Log.Println("subscriptions.GetPageEntries called")
-
 	var pe PageEntries
 
 	data.RLock()
diff --git a/subscriptions/subscriptions.go b/subscriptions/subscriptions.go
index d12a00d..7227425 100644
--- a/subscriptions/subscriptions.go
+++ b/subscriptions/subscriptions.go
@@ -17,7 +17,6 @@ import (
 
 	"github.com/makeworld-the-better-one/amfora/client"
 	"github.com/makeworld-the-better-one/amfora/config"
-	"github.com/makeworld-the-better-one/amfora/logger"
 	"github.com/makeworld-the-better-one/go-gemini"
 	"github.com/mmcdole/gofeed"
 	"github.com/spf13/viper"
@@ -90,8 +89,6 @@ func Init() error {
 // IsSubscribed returns true if the URL is already subscribed to,
 // whether a feed or page.
 func IsSubscribed(url string) bool {
-	logger.Log.Println("subscriptions.IsSubscribed called")
-
 	data.feedMu.RLock()
 	for u := range data.Feeds {
 		if url == u {
@@ -114,8 +111,6 @@ func IsSubscribed(url string) bool {
 // GetFeed returns a Feed object and a bool indicating whether the passed
 // content was actually recognized as a feed.
 func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
-	logger.Log.Println("subscriptions.GetFeed called")
-
 	if r == nil {
 		return nil, false
 	}
@@ -135,22 +130,17 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) {
 }
 
 func writeJSON() error {
-	logger.Log.Println("subscriptions.writeJSON called")
-
 	writeMu.Lock()
 	defer writeMu.Unlock()
 
 	data.Lock()
-	logger.Log.Println("subscriptions.writeJSON acquired data lock")
 	jsonBytes, err := json.MarshalIndent(&data, "", "  ")
 	data.Unlock()
 	if err != nil {
-		logger.Log.Println("subscriptions.writeJSON error", err)
 		return err
 	}
 	err = ioutil.WriteFile(config.SubscriptionPath, jsonBytes, 0666)
 	if err != nil {
-		logger.Log.Println("subscriptions.writeJSON error", err)
 		return err
 	}
 
@@ -161,8 +151,6 @@ func writeJSON() error {
 // It can be used to update a feed for a URL, although the package
 // will handle that on its own.
 func AddFeed(url string, feed *gofeed.Feed) error {
-	logger.Log.Println("subscriptions.AddFeed called")
-
 	if feed == nil {
 		panic("feed is nil")
 	}
@@ -211,8 +199,6 @@ func AddFeed(url string, feed *gofeed.Feed) error {
 // It can be used to update the page as well, although the package
 // will handle that on its own.
 func AddPage(url string, r io.Reader) error {
-	logger.Log.Println("subscriptions.AddPage called")
-
 	if r == nil {
 		return nil
 	}
@@ -247,8 +233,6 @@ func AddPage(url string, r io.Reader) error {
 }
 
 func updateFeed(url string) error {
-	logger.Log.Println("subscriptions.updateFeed called")
-
 	res, err := client.Fetch(url)
 	if err != nil {
 		if res != nil {
@@ -274,8 +258,6 @@ func updateFeed(url string) error {
 }
 
 func updatePage(url string) error {
-	logger.Log.Println("subscriptions.updatePage called")
-
 	res, err := client.Fetch(url)
 	if err != nil {
 		if res != nil {
@@ -295,8 +277,6 @@ func updatePage(url string) error {
 // updateAll updates all subscriptions using workers.
 // It only returns once all the workers are done.
 func updateAll() {
-	logger.Log.Println("subscriptions.updateAll called")
-
 	// TODO: Is two goroutines the right amount?
 
 	worker := func(jobs <-chan [2]string, wg *sync.WaitGroup) {
@@ -333,9 +313,7 @@ func updateAll() {
 	for w := 0; w < numWorkers; w++ {
 		wg.Add(1)
 		go func(i int) {
-			logger.Log.Println("started worker", i)
 			worker(jobs, &wg)
-			logger.Log.Println("ended worker", i)
 		}(w)
 	}
 

From cf52850cb01feff93f5df4e762937d4bd092d584 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sun, 6 Dec 2020 21:05:36 -0500
Subject: [PATCH 31/33] Fix lint by not using goconst

---
 .golangci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.golangci.yml b/.golangci.yml
index ea23ce9..39ce25f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -15,7 +15,6 @@ linters:
     - dupl
     - exhaustive
     - exportloopref
-    - goconst
     - gocritic
     - goerr113
     - gofmt

From dd65368976e5dae55fbf12f550e9a6be793e4ad5 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Sun, 6 Dec 2020 22:15:24 -0500
Subject: [PATCH 32/33] Lint fixes

---
 subscriptions/subscriptions.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/subscriptions/subscriptions.go b/subscriptions/subscriptions.go
index 7227425..1d144f4 100644
--- a/subscriptions/subscriptions.go
+++ b/subscriptions/subscriptions.go
@@ -54,13 +54,13 @@ func Init() error {
 			}
 			err = json.Unmarshal(jsonBytes, &data)
 			if err != nil {
-				return fmt.Errorf("subscriptions.json is corrupted: %w", err) //nolint:goerr113
+				return fmt.Errorf("subscriptions.json is corrupted: %w", err)
 			}
 		}
 		f.Close()
 	} else if !os.IsNotExist(err) {
 		// There's an error opening the file, but it's not bc is doesn't exist
-		return fmt.Errorf("open subscriptions.json error: %w", err) //nolint:goerr113
+		return fmt.Errorf("open subscriptions.json error: %w", err)
 	} else {
 		// File does not exist, initialize maps
 		data.Feeds = make(map[string]*gofeed.Feed)
@@ -312,9 +312,9 @@ func updateAll() {
 	// Start workers, waiting for jobs
 	for w := 0; w < numWorkers; w++ {
 		wg.Add(1)
-		go func(i int) {
+		go func() {
 			worker(jobs, &wg)
-		}(w)
+		}()
 	}
 
 	// Get map keys in a slice

From 1cdcd1dbc059a2f0805ec32b0a6af98f3d428120 Mon Sep 17 00:00:00 2001
From: makeworld <colecmac@protonmail.com>
Date: Mon, 7 Dec 2020 15:18:47 -0500
Subject: [PATCH 33/33] Update docs to prep for merge

---
 CHANGELOG.md | 1 +
 README.md    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e23ebd..bc886f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+- **Subscriptions** to feeds and page changes (#61)
 - Opening local files with `file://` URIs (#103, #117)
 - `show_link` option added in config to optionally see the URL (#133)
 
diff --git a/README.md b/README.md
index 37958fd..1e37e50 100644
--- a/README.md
+++ b/README.md
@@ -122,9 +122,9 @@ Features in *italics* are in the master branch, but not in the latest release.
     - Manage and browse them
     - Similar to [Kristall](https://github.com/MasterQ32/kristall)
     - https://lists.orbitalfox.eu/archives/gemini/2020/001400.html
-- [x] Subscriptions
-  - RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
-  - So is tracking a page, to know when its content changes
+- [x] *Subscriptions*
+  - Subscribing to RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
+  - So is subscribing to a page, to know when it changes
 - [ ] Stream support
 - [ ] Table of contents for pages
 - [ ] Search in pages with <kbd>Ctrl-F</kbd>