Parse photos

cmd/eksterd/hubbackend.go

@@ -181,8 +181,12 @@ func (h *hubIncomingBackend) GetFeeds() []Feed {
 			}
 		}
 
-		log.Printf("Websub feed: %#v\n", feed)
+		// Skip feeds without a Hub
+		if feed.Hub == "" {
+			continue
+		}
 
+		log.Printf("Websub feed: %#v\n", feed)
 		feeds = append(feeds, feed)
 	}
 
@@ -210,7 +214,7 @@ func (h *hubIncomingBackend) run() error {
 						if feed.Callback == "" {
 							feed.Callback = fmt.Sprintf("%s/incoming/%d", h.baseURL, feed.ID)
 						}
-						log.Printf("Send resubscribe for %s\n", feed.URL)
+						log.Printf("Send resubscribe for %q on %q\n", feed.URL, feed.Hub)
 						err := h.Subscribe(&feed)
 						if err != nil {
 							log.Printf("Error while subscribing: %s", err)

pkg/jf2/simplify.go

@@ -111,7 +111,7 @@ func simplifyToItem(itemType string, item map[string][]interface{}) microsub.Ite
 		case "author":
 			author, _ := simplifyCard(v[0])
 			feedItem.Author = &author
-		case "checkin":
+		case "checkin", "location":
 			author, _ := simplifyCard(v[0])
 			feedItem.Checkin = &author
 		case "name", "published", "updated", "url", "uid", "latitude", "longitude":
@@ -120,6 +120,14 @@ func simplifyToItem(itemType string, item map[string][]interface{}) microsub.Ite
 					*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":
 			if resultPtr := itemPtr(&feedItem, k); resultPtr != nil {
 				for _, c := range v {