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

Add Source to Preview items
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2021-10-21 22:10:08 +02:00
parent 31caee7c18
commit a331f4a300
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/eksterd/memory.go
View File

@ -555,7 +555,8 @@ func (b *memoryBackend) PreviewURL(previewURL string) (microsub.Timeline, error)
return microsub.Timeline{}, fmt.Errorf("error while fetching %s: %v", previewURL, err) return microsub.Timeline{}, fmt.Errorf("error while fetching %s: %v", previewURL, err)
} }
defer resp.Body.Close() defer resp.Body.Close()
items, err := fetch.FeedItems(cachingFetch, previewURL, resp.Header.Get("content-type"), resp.Body)
items, err := ProcessSourcedItems(cachingFetch, previewURL, resp.Header.Get("content-type"), resp.Body)
if err != nil { if err != nil {
return microsub.Timeline{}, fmt.Errorf("error while fetching %s: %v", previewURL, err) return microsub.Timeline{}, fmt.Errorf("error while fetching %s: %v", previewURL, err)
} }
@ -585,12 +586,11 @@ func (b *memoryBackend) Events() (chan sse.Message, error) {
return sse.StartConnection(b.broker) return sse.StartConnection(b.broker)
} }
func (b *memoryBackend) ProcessContent(channel, fetchURL, contentType string, body io.Reader) error { // ProcessSourcedItems processes items and adds the Source
cachingFetch := WithCaching(b.pool, Fetch2) func ProcessSourcedItems(fetcher fetch.FetcherFunc, fetchURL, contentType string, body io.Reader) ([]microsub.Item, error) {
// When the source is available from the Header, we fill the Source of the item // When the source is available from the Header, we fill the Source of the item
var source *microsub.Source var source *microsub.Source
if header, err := fetch.FeedHeader(cachingFetch, fetchURL, contentType, body); err == nil { if header, err := fetch.FeedHeader(fetcher, fetchURL, contentType, body); err == nil {
source = &microsub.Source{ source = &microsub.Source{
ID: header.URL, ID: header.URL,
URL: header.URL, URL: header.URL,
@ -604,14 +604,28 @@ func (b *memoryBackend) ProcessContent(channel, fetchURL, contentType string, bo
} }
} }
items, err := fetch.FeedItems(cachingFetch, fetchURL, contentType, body) items, err := fetch.FeedItems(fetcher, fetchURL, contentType, body)
if err != nil { if err != nil {
return err return nil, err
} }
for _, item := range items { for _, item := range items {
item.Read = false item.Read = false
item.Source = source item.Source = source
}
return items, nil
}
func (b *memoryBackend) ProcessContent(channel, fetchURL, contentType string, body io.Reader) error {
cachingFetch := WithCaching(b.pool, Fetch2)
items, err := ProcessSourcedItems(cachingFetch, fetchURL, contentType, body)
if err != nil {
return err
}
for _, item := range items {
err = b.channelAddItemWithMatcher(channel, item) err = b.channelAddItemWithMatcher(channel, item)
if err != nil { if err != nil {
log.Printf("ERROR: %s\n", err) log.Printf("ERROR: %s\n", err)