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/gemini.go
+10 -8
View File
@@ -27,9 +27,9 @@ import (
)
// fetchGemini will make a request for a gemini resource
func fetchGemini(remote *url.URL) (*gemini.Response, error) {
func fetchGemini(remote string) (*gemini.Response, error) {
client := &gemini.Client{}
resp, err := client.Get(context.Background(), remote.String())
resp, err := client.Get(context.Background(), remote)
if err != nil {
return nil, err
}
@@ -42,7 +42,7 @@ func fetchGemini(remote *url.URL) (*gemini.Response, error) {
// geminiFeed will fetch and insert a new core.Feed into a core.FullData given
// a gemini url (or update if it's preexisting)
func geminiFeed(data *core.FullData, remote *url.URL, title string) error {
func geminiFeed(data *core.FullData, remote string, title string) error {
resp, err := fetchGemini(remote)
if err != nil {
return err
@@ -60,9 +60,11 @@ func geminiFeed(data *core.FullData, remote *url.URL, title string) error {
case "text/gemini":
var feed core.Feed
feed.Title = title // will be set later if given title is ""
feed.Link = remote.String()
feed.FeedLink = remote.String()
feed.Link = remote
feed.FeedLink = remote
feed.Updated = time.Now()
// we know that remote is a good url because it's been parsed previously
parsedRemote, _ := url.ParseRequestURI(remote)
text, err := gemini.ParseText(resp.Body)
if err != nil {
@@ -87,7 +89,7 @@ func geminiFeed(data *core.FullData, remote *url.URL, title string) error {
if err != nil {
continue
}
link = remote.ResolveReference(link)
link = parsedRemote.ResolveReference(link)
item := &core.Item{}
item.Title = strings.TrimLeft(line.Name[10:], " :-–—")
item.Published = date
@@ -119,7 +121,7 @@ func geminiFeed(data *core.FullData, remote *url.URL, title string) error {
// geminiPage will fetch and insert a new core.Page into a core.FullData given
// a gemini url (or update if it's preexisting)
func geminiPage(data *core.FullData, remote *url.URL, title string) error {
func geminiPage(data *core.FullData, remote string, title string) error {
resp, err := fetchGemini(remote)
if err != nil {
return err
@@ -130,7 +132,7 @@ func geminiPage(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