Improve handling of missing author and content
This commit is contained in:
parent
0a7696ea6b
commit
999bc0d456
|
|
@ -29,7 +29,6 @@ import (
|
|||
"log"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"rss"
|
||||
"strings"
|
||||
"time"
|
||||
|
|
@ -259,7 +258,7 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
|
|||
|
||||
log.Printf("%#v\n", feed)
|
||||
|
||||
author := microsub.Card{}
|
||||
author := µsub.Card{}
|
||||
author.Type = "card"
|
||||
author.Name = feed.Author.Name
|
||||
author.URL = feed.Author.URL
|
||||
|
|
@ -273,6 +272,7 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
|
|||
var item microsub.Item
|
||||
item.Type = "entry"
|
||||
item.Name = feedItem.Title
|
||||
item.Content = µsub.Content{}
|
||||
item.Content.HTML = feedItem.ContentHTML
|
||||
item.Content.Text = feedItem.ContentText
|
||||
item.URL = feedItem.URL
|
||||
|
|
@ -280,7 +280,7 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
|
|||
item.ID = hex.EncodeToString([]byte(feedItem.ID))
|
||||
item.Published = feedItem.DatePublished
|
||||
|
||||
itemAuthor := microsub.Card{}
|
||||
itemAuthor := µsub.Card{}
|
||||
itemAuthor.Type = "card"
|
||||
itemAuthor.Name = feedItem.Author.Name
|
||||
itemAuthor.URL = feedItem.Author.URL
|
||||
|
|
@ -309,6 +309,7 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader)
|
|||
var item microsub.Item
|
||||
item.Type = "entry"
|
||||
item.Name = feedItem.Title
|
||||
item.Content = µsub.Content{}
|
||||
if len(feedItem.Content) > 0 {
|
||||
item.Content.HTML = feedItem.Content
|
||||
} else if len(feedItem.Summary) > 0 {
|
||||
|
|
@ -481,156 +482,156 @@ func Fetch2(fetchURL string) (*http.Response, error) {
|
|||
return cachedResp, err
|
||||
}
|
||||
|
||||
func Fetch(fetchURL string) []microsub.Item {
|
||||
result := []microsub.Item{}
|
||||
// func Fetch(fetchURL string) []microsub.Item {
|
||||
// result := []microsub.Item{}
|
||||
|
||||
if !strings.HasPrefix(fetchURL, "http") {
|
||||
return result
|
||||
}
|
||||
// if !strings.HasPrefix(fetchURL, "http") {
|
||||
// return result
|
||||
// }
|
||||
|
||||
u, err := url.Parse(fetchURL)
|
||||
if err != nil {
|
||||
log.Printf("error parsing %s as url: %s", fetchURL, err)
|
||||
return result
|
||||
}
|
||||
resp, err := http.Get(u.String())
|
||||
if err != nil {
|
||||
log.Printf("error while fetching %s: %s", u, err)
|
||||
return result
|
||||
}
|
||||
// u, err := url.Parse(fetchURL)
|
||||
// if err != nil {
|
||||
// log.Printf("error parsing %s as url: %s", fetchURL, err)
|
||||
// return result
|
||||
// }
|
||||
// resp, err := http.Get(u.String())
|
||||
// if err != nil {
|
||||
// log.Printf("error while fetching %s: %s", u, err)
|
||||
// return result
|
||||
// }
|
||||
|
||||
if !strings.HasPrefix(resp.Header.Get("Content-Type"), "text/html") {
|
||||
log.Printf("Content Type of %s = %s", fetchURL, resp.Header.Get("Content-Type"))
|
||||
return result
|
||||
}
|
||||
// if !strings.HasPrefix(resp.Header.Get("Content-Type"), "text/html") {
|
||||
// log.Printf("Content Type of %s = %s", fetchURL, resp.Header.Get("Content-Type"))
|
||||
// return result
|
||||
// }
|
||||
|
||||
defer resp.Body.Close()
|
||||
data := microformats.Parse(resp.Body, u)
|
||||
jw := json.NewEncoder(os.Stdout)
|
||||
jw.SetIndent("", " ")
|
||||
jw.Encode(data)
|
||||
// defer resp.Body.Close()
|
||||
// data := microformats.Parse(resp.Body, u)
|
||||
// jw := json.NewEncoder(os.Stdout)
|
||||
// jw.SetIndent("", " ")
|
||||
// jw.Encode(data)
|
||||
|
||||
author := microsub.Card{}
|
||||
// author := µsub.Card{}
|
||||
|
||||
for _, item := range data.Items {
|
||||
if item.Type[0] == "h-feed" {
|
||||
for _, child := range item.Children {
|
||||
previewItem := convertMfToItem(child)
|
||||
result = append(result, previewItem)
|
||||
}
|
||||
} else if item.Type[0] == "h-card" {
|
||||
mf := item
|
||||
author.Filled = true
|
||||
author.Type = "card"
|
||||
for prop, value := range mf.Properties {
|
||||
switch prop {
|
||||
case "url":
|
||||
author.URL = value[0].(string)
|
||||
break
|
||||
case "name":
|
||||
author.Name = value[0].(string)
|
||||
break
|
||||
case "photo":
|
||||
author.Photo = value[0].(string)
|
||||
break
|
||||
default:
|
||||
fmt.Printf("prop name not implemented for author: %s with value %#v\n", prop, value)
|
||||
break
|
||||
}
|
||||
}
|
||||
} else if item.Type[0] == "h-entry" {
|
||||
previewItem := convertMfToItem(item)
|
||||
result = append(result, previewItem)
|
||||
}
|
||||
}
|
||||
// for _, item := range data.Items {
|
||||
// if item.Type[0] == "h-feed" {
|
||||
// for _, child := range item.Children {
|
||||
// previewItem := convertMfToItem(child)
|
||||
// result = append(result, previewItem)
|
||||
// }
|
||||
// } else if item.Type[0] == "h-card" {
|
||||
// mf := item
|
||||
// author.Filled = true
|
||||
// author.Type = "card"
|
||||
// for prop, value := range mf.Properties {
|
||||
// switch prop {
|
||||
// case "url":
|
||||
// author.URL = value[0].(string)
|
||||
// break
|
||||
// case "name":
|
||||
// author.Name = value[0].(string)
|
||||
// break
|
||||
// case "photo":
|
||||
// author.Photo = value[0].(string)
|
||||
// break
|
||||
// default:
|
||||
// fmt.Printf("prop name not implemented for author: %s with value %#v\n", prop, value)
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
// } else if item.Type[0] == "h-entry" {
|
||||
// previewItem := convertMfToItem(item)
|
||||
// result = append(result, previewItem)
|
||||
// }
|
||||
// }
|
||||
|
||||
for i, item := range result {
|
||||
if !item.Author.Filled {
|
||||
result[i].Author = author
|
||||
}
|
||||
}
|
||||
// for i, item := range result {
|
||||
// if !item.Author.Filled {
|
||||
// result[i].Author = author
|
||||
// }
|
||||
// }
|
||||
|
||||
return result
|
||||
}
|
||||
// return result
|
||||
// }
|
||||
|
||||
func convertMfToItem(mf *microformats.Microformat) microsub.Item {
|
||||
item := microsub.Item{}
|
||||
// func convertMfToItem(mf *microformats.Microformat) microsub.Item {
|
||||
// item := microsub.Item{}
|
||||
|
||||
item.Type = mf.Type[0]
|
||||
// item.Type = mf.Type[0]
|
||||
|
||||
for prop, value := range mf.Properties {
|
||||
switch prop {
|
||||
case "published":
|
||||
item.Published = value[0].(string)
|
||||
break
|
||||
case "url":
|
||||
item.URL = value[0].(string)
|
||||
break
|
||||
case "name":
|
||||
item.Name = value[0].(string)
|
||||
break
|
||||
case "latitude":
|
||||
item.Latitude = value[0].(string)
|
||||
break
|
||||
case "longitude":
|
||||
item.Longitude = value[0].(string)
|
||||
break
|
||||
case "like-of":
|
||||
for _, v := range value {
|
||||
item.LikeOf = append(item.LikeOf, v.(string))
|
||||
}
|
||||
break
|
||||
case "bookmark-of":
|
||||
for _, v := range value {
|
||||
item.BookmarkOf = append(item.BookmarkOf, v.(string))
|
||||
}
|
||||
break
|
||||
case "in-reply-to":
|
||||
for _, v := range value {
|
||||
item.InReplyTo = append(item.InReplyTo, v.(string))
|
||||
}
|
||||
break
|
||||
case "summary":
|
||||
if content, ok := value[0].(map[string]interface{}); ok {
|
||||
item.Content.HTML = content["html"].(string)
|
||||
item.Content.Text = content["value"].(string)
|
||||
} else if content, ok := value[0].(string); ok {
|
||||
item.Content.Text = content
|
||||
}
|
||||
break
|
||||
case "photo":
|
||||
for _, v := range value {
|
||||
item.Photo = append(item.Photo, v.(string))
|
||||
}
|
||||
break
|
||||
case "category":
|
||||
for _, v := range value {
|
||||
item.Category = append(item.Category, v.(string))
|
||||
}
|
||||
break
|
||||
case "content":
|
||||
if content, ok := value[0].(map[string]interface{}); ok {
|
||||
item.Content.HTML = content["html"].(string)
|
||||
item.Content.Text = content["value"].(string)
|
||||
} else if content, ok := value[0].(string); ok {
|
||||
item.Content.Text = content
|
||||
}
|
||||
break
|
||||
default:
|
||||
fmt.Printf("prop name not implemented: %s with value %#v\n", prop, value)
|
||||
break
|
||||
}
|
||||
}
|
||||
// for prop, value := range mf.Properties {
|
||||
// switch prop {
|
||||
// case "published":
|
||||
// item.Published = value[0].(string)
|
||||
// break
|
||||
// case "url":
|
||||
// item.URL = value[0].(string)
|
||||
// break
|
||||
// case "name":
|
||||
// item.Name = value[0].(string)
|
||||
// break
|
||||
// case "latitude":
|
||||
// item.Latitude = value[0].(string)
|
||||
// break
|
||||
// case "longitude":
|
||||
// item.Longitude = value[0].(string)
|
||||
// break
|
||||
// case "like-of":
|
||||
// for _, v := range value {
|
||||
// item.LikeOf = append(item.LikeOf, v.(string))
|
||||
// }
|
||||
// break
|
||||
// case "bookmark-of":
|
||||
// for _, v := range value {
|
||||
// item.BookmarkOf = append(item.BookmarkOf, v.(string))
|
||||
// }
|
||||
// break
|
||||
// case "in-reply-to":
|
||||
// for _, v := range value {
|
||||
// item.InReplyTo = append(item.InReplyTo, v.(string))
|
||||
// }
|
||||
// break
|
||||
// case "summary":
|
||||
// if content, ok := value[0].(map[string]interface{}); ok {
|
||||
// item.Content.HTML = content["html"].(string)
|
||||
// item.Content.Text = content["value"].(string)
|
||||
// } else if content, ok := value[0].(string); ok {
|
||||
// item.Content.Text = content
|
||||
// }
|
||||
// break
|
||||
// case "photo":
|
||||
// for _, v := range value {
|
||||
// item.Photo = append(item.Photo, v.(string))
|
||||
// }
|
||||
// break
|
||||
// case "category":
|
||||
// for _, v := range value {
|
||||
// item.Category = append(item.Category, v.(string))
|
||||
// }
|
||||
// break
|
||||
// case "content":
|
||||
// if content, ok := value[0].(map[string]interface{}); ok {
|
||||
// item.Content.HTML = content["html"].(string)
|
||||
// item.Content.Text = content["value"].(string)
|
||||
// } else if content, ok := value[0].(string); ok {
|
||||
// item.Content.Text = content
|
||||
// }
|
||||
// break
|
||||
// default:
|
||||
// fmt.Printf("prop name not implemented: %s with value %#v\n", prop, value)
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
|
||||
if item.Name == strings.TrimSpace(item.Content.Text) {
|
||||
item.Name = ""
|
||||
}
|
||||
// if item.Name == strings.TrimSpace(item.Content.Text) {
|
||||
// item.Name = ""
|
||||
// }
|
||||
|
||||
// TODO: for like name is the field that is set
|
||||
if item.Content.HTML == "" && len(item.LikeOf) > 0 {
|
||||
item.Name = ""
|
||||
}
|
||||
// // TODO: for like name is the field that is set
|
||||
// if item.Content.HTML == "" && len(item.LikeOf) > 0 {
|
||||
// item.Name = ""
|
||||
// }
|
||||
|
||||
fmt.Printf("%#v\n", item)
|
||||
return item
|
||||
}
|
||||
// fmt.Printf("%#v\n", item)
|
||||
// return item
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -183,8 +183,8 @@ func (b *memoryBackend) ChannelsDelete(uid string) {
|
|||
}
|
||||
}
|
||||
|
||||
func mapToAuthor(result map[string]string) microsub.Card {
|
||||
item := microsub.Card{}
|
||||
func mapToAuthor(result map[string]string) *microsub.Card {
|
||||
item := µsub.Card{}
|
||||
item.Type = "card"
|
||||
if name, e := result["name"]; e {
|
||||
item.Name = name
|
||||
|
|
@ -236,14 +236,21 @@ func mapToItem(result map[string]interface{}) microsub.Item {
|
|||
}
|
||||
|
||||
if content, e := result["content"]; e {
|
||||
itemContent := µsub.Content{}
|
||||
set := false
|
||||
if c, ok := content.(map[string]interface{}); ok {
|
||||
if html, e2 := c["html"]; e2 {
|
||||
item.Content.HTML = html.(string)
|
||||
itemContent.HTML = html.(string)
|
||||
set = true
|
||||
}
|
||||
if text, e2 := c["value"]; e2 {
|
||||
item.Content.Text = text.(string)
|
||||
itemContent.Text = text.(string)
|
||||
set = true
|
||||
}
|
||||
}
|
||||
if set {
|
||||
item.Content = itemContent
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Check how to improve this
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ type Content struct {
|
|||
type Item struct {
|
||||
Type string `json:"type"`
|
||||
Name string `json:"name,omitempty"`
|
||||
Published string `json:"published"`
|
||||
Updated string `json:"updated"`
|
||||
URL string `json:"url"`
|
||||
Published string `json:"published,omitempty"`
|
||||
Updated string `json:"updated,omitempty"`
|
||||
URL string `json:"url,omitempty"`
|
||||
UID string `json:"uid,omitempty"`
|
||||
Author Card `json:"author,omitempty"`
|
||||
Author *Card `json:"author,omitempty"`
|
||||
Category []string `json:"category,omitempty"`
|
||||
Photo []string `json:"photo,omitempty"`
|
||||
LikeOf []string `json:"like-of,omitempty"`
|
||||
|
|
@ -71,11 +71,11 @@ type Item struct {
|
|||
RepostOf []string `json:"repost-of,omitempty"`
|
||||
InReplyTo []string `json:"in-reply-to,omitempty"`
|
||||
Summary []string `json:"summary,omitempty"`
|
||||
Content Content `json:"content,omitempty"`
|
||||
Content *Content `json:"content,omitempty"`
|
||||
Latitude string `json:"latitude,omitempty"`
|
||||
Longitude string `json:"longitude,omitempty"`
|
||||
Checkin Card `json:"checkin,omitempty"`
|
||||
ID string `json:"_id"`
|
||||
Checkin *Card `json:"checkin,omitempty"`
|
||||
ID string `json:"_id,omitempty"`
|
||||
Read bool `json:"_is_read"`
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user