peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Improve JSON feed handling (add author)

Browse Source
This commit is contained in:
Peter Stuifzand 2018-04-08 10:43:06 +02:00
parent cf5b84fd19
commit ce169ec397
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/server/fetch.go
View File

@ -126,6 +126,13 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
log.Printf("Error while parsing json feed: %s\n", err) log.Printf("Error while parsing json feed: %s\n", err)
return items, err return items, err
} }
author := microsub.Author{}
author.Type = "card"
author.Name = feed.Author.Name
author.URL = feed.Author.URL
author.Photo = feed.Author.Avatar
for _, feedItem := range feed.Items { for _, feedItem := range feed.Items {
var item microsub.Item var item microsub.Item
item.Name = feedItem.Title item.Name = feedItem.Title
@ -135,6 +142,7 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
item.Summary = []string{feedItem.Summary} item.Summary = []string{feedItem.Summary}
item.Id = hex.EncodeToString([]byte(feedItem.ID)) item.Id = hex.EncodeToString([]byte(feedItem.ID))
item.Published = feedItem.DatePublished item.Published = feedItem.DatePublished
item.Author = author
items = append(items, item) items = append(items, item)
} }
} else if strings.HasPrefix(contentType, "text/xml") || strings.HasPrefix(contentType, "application/rss+xml") || strings.HasPrefix(contentType, "application/atom+xml") { } else if strings.HasPrefix(contentType, "text/xml") || strings.HasPrefix(contentType, "application/rss+xml") || strings.HasPrefix(contentType, "application/atom+xml") {
@ -152,8 +160,8 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
for _, feedItem := range feed.Items { for _, feedItem := range feed.Items {
var item microsub.Item var item microsub.Item
item.Name = feedItem.Title item.Name = feedItem.Title
item.Content.HTML = feedItem.Summary item.Content.HTML = feedItem.Content
item.Content.Text = feedItem.Content item.Content.Text = feedItem.Summary
item.URL = feedItem.Link item.URL = feedItem.Link
item.Id = hex.EncodeToString([]byte(feedItem.ID)) item.Id = hex.EncodeToString([]byte(feedItem.ID))
item.Published = feedItem.Date.Format(time.RFC3339) item.Published = feedItem.Date.Format(time.RFC3339)

16
cmd/server/jsonfeed.go
View File

@ -21,10 +21,26 @@ type JSONFeedItem struct {
Attachments []JSONFeedAttachment `json:"attachments,omitempty"` Attachments []JSONFeedAttachment `json:"attachments,omitempty"`
} }
type JSONFeedAuthor struct {
Name string `json:"name,omitempty"`
URL string `json:"url,omitempty"`
Avatar string `json:"avatar,omitempty"`
}
type JSONFeedHub struct {
Type string `json:"type"`
URL string `json:"url"`
}
type JSONFeed struct { type JSONFeed struct {
Version string `json:"version"` Version string `json:"version"`
Title string `json:"title"` Title string `json:"title"`
HomePageURL string `json:"home_page_url"` HomePageURL string `json:"home_page_url"`
FeedURL string `json:"feed_url"` FeedURL string `json:"feed_url"`
NextUrl string `json:"next_url"`
Icon string `json:"icon"`
Favicon string `json:"favicon"`
Author JSONFeedAuthor `json:"author,omitempty"`
Items []JSONFeedItem `json:"items"` Items []JSONFeedItem `json:"items"`
Hubs []JSONFeedHub `json:"hubs"`
} }