Compare commits
No commits in common. "a2f76c60717ae581093ed519e0ab0251763c6d82" and "3483b481e3c75c104bfc751079e86729fdc46403" have entirely different histories.
a2f76c6071
...
3483b481e3
|
|
@ -181,12 +181,8 @@ func (h *hubIncomingBackend) GetFeeds() []Feed {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip feeds without a Hub
|
|
||||||
if feed.Hub == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Printf("Websub feed: %#v\n", feed)
|
log.Printf("Websub feed: %#v\n", feed)
|
||||||
|
|
||||||
feeds = append(feeds, feed)
|
feeds = append(feeds, feed)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -214,7 +210,7 @@ func (h *hubIncomingBackend) run() error {
|
||||||
if feed.Callback == "" {
|
if feed.Callback == "" {
|
||||||
feed.Callback = fmt.Sprintf("%s/incoming/%d", h.baseURL, feed.ID)
|
feed.Callback = fmt.Sprintf("%s/incoming/%d", h.baseURL, feed.ID)
|
||||||
}
|
}
|
||||||
log.Printf("Send resubscribe for %q on %q\n", feed.URL, feed.Hub)
|
log.Printf("Send resubscribe for %s\n", feed.URL)
|
||||||
err := h.Subscribe(&feed)
|
err := h.Subscribe(&feed)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Error while subscribing: %s", err)
|
log.Printf("Error while subscribing: %s", err)
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@ func simplifyToItem(itemType string, item map[string][]interface{}) microsub.Ite
|
||||||
case "author":
|
case "author":
|
||||||
author, _ := simplifyCard(v[0])
|
author, _ := simplifyCard(v[0])
|
||||||
feedItem.Author = &author
|
feedItem.Author = &author
|
||||||
case "checkin", "location":
|
case "checkin":
|
||||||
author, _ := simplifyCard(v[0])
|
author, _ := simplifyCard(v[0])
|
||||||
feedItem.Checkin = &author
|
feedItem.Checkin = &author
|
||||||
case "name", "published", "updated", "url", "uid", "latitude", "longitude":
|
case "name", "published", "updated", "url", "uid", "latitude", "longitude":
|
||||||
|
|
@ -120,14 +120,6 @@ func simplifyToItem(itemType string, item map[string][]interface{}) microsub.Ite
|
||||||
*resultPtr = v[0].(string)
|
*resultPtr = v[0].(string)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case "photo":
|
|
||||||
if resultPtr := itemPtr(&feedItem, k); resultPtr != nil {
|
|
||||||
for _, c := range v {
|
|
||||||
if photo, ok := c.(string); ok {
|
|
||||||
*resultPtr = append(*resultPtr, photo)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case "category":
|
case "category":
|
||||||
if resultPtr := itemPtr(&feedItem, k); resultPtr != nil {
|
if resultPtr := itemPtr(&feedItem, k); resultPtr != nil {
|
||||||
for _, c := range v {
|
for _, c := range v {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user