cmd/eksterd/hubbackend.go

@@ -199,15 +199,12 @@ func (h *hubIncomingBackend) run() error {
 		for {
 			select {
 			case <-ticker.C:
-				log.Println("Getting feeds for WebSub")
 				feeds := h.GetFeeds()
 				for _, feed := range feeds {
-					log.Printf("Looking at %s\n", feed.URL)
 					if feed.ResubscribeAt == 0 || time.Now().After(time.Unix(feed.ResubscribeAt, 0)) {
 						if feed.Callback == "" {
 							feed.Callback = fmt.Sprintf("%s/incoming/%d", os.Getenv("EKSTER_BASEURL"), feed.ID)
 						}
-						log.Printf("Send resubscribe for %s\n", feed.URL)
 						h.Subscribe(&feed)
 					}
 				}

cmd/eksterd/memory.go

@@ -641,10 +641,6 @@ func (b *memoryBackend) Fetch3(channel, fetchURL string) (*http.Response, error)
 }
 
 func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel string, item microsub.Item) error {
-	// an item is posted
-	// check for all channels as channel
-	// if regex matches item
-	//  - add item to channel
 	for channelKey, setting := range b.Settings {
 		if setting.IncludeRegex != "" {
 			included := false
@@ -675,15 +671,9 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
 			if err != nil {
 				log.Printf("error in regexp: %q\n", excludeRegex)
 			} else {
-				if item.Content != nil {
+				if item.Content != nil && excludeRegex.MatchString(item.Content.Text) {
-					if excludeRegex.MatchString(item.Content.Text) {
+					log.Printf("Excluded %#v\n", item)
-						log.Printf("Excluded %#v\n", item)
+					return nil
-						return nil
-					}
-					if excludeRegex.MatchString(item.Content.HTML) {
-						log.Printf("Excluded %#v\n", item)
-						return nil
-					}
 				}
 
 				if excludeRegex.MatchString(item.Name) {