remove wonky pubsub support

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java

@@ -70,8 +70,6 @@ public class FeedParser {
 
 			String title = rss.getTitle();
 			Feed feed = new Feed();
-			feed.setPushHub(findHub(rss));
-			feed.setPushTopic(findSelf(rss));
 			feed.setUrl(feedUrl);
 			feed.setLink(rss.getLink());
 

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java

@@ -11,7 +11,6 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
@@ -26,7 +25,6 @@ import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.FeedEntryService;
 import com.commafeed.backend.service.FeedService;
-import com.commafeed.backend.service.PubSubService;
 import com.commafeed.frontend.ws.WebSocketMessageBuilder;
 import com.commafeed.frontend.ws.WebSocketSessions;
 import com.google.common.util.concurrent.Striped;
@@ -47,7 +45,6 @@ public class FeedRefreshUpdater implements Managed {
 	private final UnitOfWork unitOfWork;
 	private final FeedService feedService;
 	private final FeedEntryService feedEntryService;
-	private final PubSubService pubSubService;
 	private final CommaFeedConfiguration config;
 	private final FeedSubscriptionDAO feedSubscriptionDAO;
 	private final CacheService cache;
@@ -62,12 +59,11 @@ public class FeedRefreshUpdater implements Managed {
 
 	@Inject
 	public FeedRefreshUpdater(UnitOfWork unitOfWork, FeedService feedService, FeedEntryService feedEntryService,
-			PubSubService pubSubService, CommaFeedConfiguration config, MetricRegistry metrics, FeedSubscriptionDAO feedSubscriptionDAO,
-			CacheService cache, WebSocketSessions webSocketSessions) {
+			CommaFeedConfiguration config, MetricRegistry metrics, FeedSubscriptionDAO feedSubscriptionDAO, CacheService cache,
+			WebSocketSessions webSocketSessions) {
 		this.unitOfWork = unitOfWork;
 		this.feedService = feedService;
 		this.feedEntryService = feedEntryService;
-		this.pubSubService = pubSubService;
 		this.config = config;
 		this.feedSubscriptionDAO = feedSubscriptionDAO;
 		this.cache = cache;
@@ -125,29 +121,6 @@ public class FeedRefreshUpdater implements Managed {
 		return new AddEntryResult(processed, inserted);
 	}
 
-	private void handlePubSub(final Feed feed) {
-		if (feed.getPushHub() != null && feed.getPushTopic() != null) {
-			Date lastPing = feed.getPushLastPing();
-			Date now = new Date();
-			if (lastPing == null || lastPing.before(DateUtils.addDays(now, -3))) {
-				new Thread() {
-					@Override
-					public void run() {
-						try {
-							// make sure the feed has been updated in the database so that the
-							// callback works
-							Thread.sleep(30000);
-						} catch (InterruptedException e1) {
-							// do nothing
-						}
-
-						pubSubService.subscribe(feed);
-					}
-				}.start();
-			}
-		}
-	}
-
 	public boolean update(Feed feed, List<FeedEntry> entries) {
 		boolean processed = true;
 		boolean insertedAtLeastOneEntry = false;
@@ -190,9 +163,6 @@ public class FeedRefreshUpdater implements Managed {
 			}
 		}
 
-		if (Boolean.TRUE.equals(config.getApplicationSettings().getPubsubhubbub())) {
-			handlePubSub(feed);
-		}
 		if (!processed) {
 			// requeue asap
 			feed.setDisabledUntil(new Date(0));

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.Meter;
@@ -73,8 +72,6 @@ public class FeedRefreshWorker {
 			feed.setMessage(null);
 			feed.setDisabledUntil(refreshIntervalCalculator.onFetchSuccess(feedFetcherResult.getFeed()));
 
-			handlePubSub(feed, feedFetcherResult.getFeed());
-
 			return new FeedRefreshWorkerResult(feed, entries);
 		} catch (NotModifiedException e) {
 			log.debug("Feed not modified : {} - {}", feed.getUrl(), e.getMessage());
@@ -105,28 +102,6 @@ public class FeedRefreshWorker {
 		}
 	}
 
-	private void handlePubSub(Feed feed, Feed fetchedFeed) {
-		String hub = fetchedFeed.getPushHub();
-		String topic = fetchedFeed.getPushTopic();
-		if (hub != null && topic != null) {
-			if (hub.contains("hubbub.api.typepad.com")) {
-				// that hub does not exist anymore
-				return;
-			}
-			if (topic.startsWith("www.")) {
-				topic = "http://" + topic;
-			} else if (topic.startsWith("feed://")) {
-				topic = "http://" + topic.substring(7);
-			} else if (!topic.startsWith("http")) {
-				topic = "http://" + topic;
-			}
-			log.debug("feed {} has pubsub info: {}", feed.getUrl(), topic);
-			feed.setPushHub(hub);
-			feed.setPushTopic(topic);
-			feed.setPushTopicHash(DigestUtils.sha1Hex(topic));
-		}
-	}
-
 	@Value
 	public static class FeedRefreshWorkerResult {
 		Feed feed;