joeac/comitium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use strings for URLs internally for consistency.

Browse Source
This commit is contained in:
nytpu
2021-03-18 13:02:17 -06:00
parent 794b1fc04f
commit f8601b82ab
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fetch/gopher.go
+5 -6
View File
@@ -9,7 +9,6 @@ import (
"crypto/sha256"
"fmt"
"io"
"net/url"
"time"
"github.com/prologic/go-gopher"
@@ -18,8 +17,8 @@ import (
)
// fetchGopher will make a request for a gopher resource
func fetchGopher(remoteURL *url.URL) (*gopher.Response, error) {
resp, err := gopher.Get(remoteURL.String())
func fetchGopher(remote string) (*gopher.Response, error) {
resp, err := gopher.Get(remote)
if err != nil {
return nil, err
}
@@ -28,14 +27,14 @@ func fetchGopher(remoteURL *url.URL) (*gopher.Response, error) {
// gopherFeed will fetch and insert a new core.Feed into a core.FullData given a
// gopher url (or update if it's preexisting)
func gopherFeed(data *core.FullData, remote *url.URL, title string) error {
func gopherFeed(data *core.FullData, remote string, title string) error {
// TODO
return fmt.Errorf("Feeds served over gopher are currently unsupported.")
}
// gopherPage will fetch and insert a new core.Page into a core.FullData given a
// gopher url (or update if it's preexisting)
func gopherPage(data *core.FullData, remote *url.URL, title string) error {
func gopherPage(data *core.FullData, remote string, title string) error {
resp, err := fetchGopher(remote)
if err != nil {
return err
@@ -55,7 +54,7 @@ func gopherPage(data *core.FullData, remote *url.URL, title string) error {
var page core.Page
page.Title = title
page.Link = remote.String()
page.Link = remote
h := sha256.New()
if _, err := io.Copy(h, reader); err != nil {
return err