Split cache and feed packages

1 files changed, 30 insertions, 23 deletions

diff --git a/internal/feed/item.go b/internal/feed/item.go
index 3cb9089..39f41ba 100644
--- a/internal/feed/item.go
+++ b/internal/feed/item.go
@@ -2,6 +2,7 @@ package feed
 
 import (
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"time"
 
@@ -17,26 +18,26 @@ type feedImage struct {
 	mime  string
 }
 
-type item struct {
-	*gofeed.Item
-	Feed       *gofeed.Feed
-	feed       *Feed
-	Body       string
-	TextBody   string
-	updateOnly bool
-	reasons    []string
-	images     []feedImage
-	itemId     uuid.UUID
+type Item struct {
+	*gofeed.Item              // access fields implicitly
+	Feed         *gofeed.Feed // named explicitly to not shadow common fields with Item
+	feed         *Feed
+	Body         string
+	TextBody     string
+	UpdateOnly   bool
+	reasons      []string
+	images       []feedImage
+	ID           uuid.UUID
 }
 
-func (item *item) DateParsed() *time.Time {
+func (item *Item) DateParsed() *time.Time {
 	if item.UpdatedParsed == nil || item.UpdatedParsed.IsZero() {
 		return item.PublishedParsed
 	}
 	return item.UpdatedParsed
 }
 
-func (item *item) Date() string {
+func (item *Item) Date() string {
 	if item.Updated == "" {
 		return item.Published
 	}
@@ -44,14 +45,14 @@ func (item *item) Date() string {
 }
 
 // Creator returns the name of the creating author.
-func (item *item) Creator() string {
+func (item *Item) Creator() string {
 	if item.Author != nil {
 		return item.Author.Name
 	}
 	return ""
 }
 
-func (item *item) FeedLink() string {
+func (item *Item) FeedLink() string {
 	if item.Feed.FeedLink != "" {
 		// the one in the feed itself
 		return item.Feed.FeedLink
@@ -60,31 +61,37 @@ func (item *item) FeedLink() string {
 	return item.feed.Url
 }
 
-func (item *item) addReason(reason string) {
+func (item *Item) AddReason(reason string) {
 	if !util.StrContains(item.reasons, reason) {
 		item.reasons = append(item.reasons, reason)
 	}
 }
 
-func (item *item) addImage(img []byte, mime string) int {
+func (item *Item) addImage(img []byte, mime string) int {
 	i := feedImage{img, mime}
 	item.images = append(item.images, i)
 	return len(item.images)
 }
 
-func (item *item) clearImages() {
+func (item *Item) clearImages() {
 	item.images = []feedImage{}
 }
 
-func (item *item) defaultEmail() string {
+func (item *Item) defaultEmail() string {
 	return item.feed.Global.DefaultEmail
 }
 
-func (item *item) id() string {
-	idStr := base64.RawURLEncoding.EncodeToString(item.itemId[:])
-	return item.feed.cached.ID() + "#" + idStr
+func (item *Item) Id() string {
+	idStr := base64.RawURLEncoding.EncodeToString(item.ID[:])
+	return item.feed.id() + "#" + idStr
 }
 
-func (item *item) messageId() string {
-	return fmt.Sprintf("<feed#%s@%s>", item.id(), config.Hostname())
+func (item *Item) messageId() string {
+	return fmt.Sprintf("<feed#%s@%s>", item.Id(), config.Hostname())
+}
+
+func printItem(item *gofeed.Item) string {
+	// analogous to gofeed.Feed.String
+	json, _ := json.MarshalIndent(item, "", "    ")
+	return string(json)
 }