Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve entry link when url is relative (fix #181)

Browse Source
This commit is contained in:
Athou
2013-05-26 07:28:32 +02:00
parent 122acfcf70
commit f04b24796c
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/backend/feeds/FeedParser.java
View File

@@ -76,7 +76,9 @@ public class FeedParser {
entry.setGuid(FeedUtils.truncate(item.getUri(), 2048));
entry.setGuidHash(DigestUtils.sha1Hex(item.getUri()));
entry.setUrl(FeedUtils.truncate(item.getLink(), 2048));
entry.setUrl(FeedUtils.toAbsoluteUrl(
FeedUtils.truncate(item.getLink(), 2048),
feed.getLink()));
entry.setUpdated(validateDate(getUpdateDate(item)));
entry.setAuthor(FeedUtils.truncate(item.getAuthor(), 128));

19
src/main/java/com/commafeed/backend/feeds/FeedUtils.java
View File

@@ -185,4 +185,23 @@ public class FeedUtils {
Collections.reverse(timestamps);
return timestamps;
}
public static String removeTrailingSlash(String url) {
if (url.endsWith("/")) {
url = url.substring(0, url.length() - 1);
}
return url;
}
public static String toAbsoluteUrl(String url, String baseUrl) {
if (baseUrl == null || url == null || url.startsWith("http")) {
return url;
}
if (url.startsWith("/") == false) {
url = "/" + url;
}
return baseUrl + url;
}
}

8
src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java
View File

@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
import com.commafeed.backend.HttpGetter;
import com.commafeed.backend.dao.FeedPushInfoDAO;
import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedPushInfo;
import com.commafeed.backend.services.ApplicationSettingsService;
@@ -39,10 +40,9 @@ public class SubscriptionHandler {
FeedPushInfo info = feed.getPushInfo();
String hub = info.getHub();
String topic = info.getTopic();
String publicUrl = applicationSettingsService.get().getPublicUrl();
if (publicUrl.endsWith("/")) {
publicUrl = publicUrl.substring(0, publicUrl.length() - 1);
}
String publicUrl = FeedUtils
.removeTrailingSlash(applicationSettingsService.get()
.getPublicUrl());
log.debug("sending new pubsub subscription to {} for {}", hub, topic);

6
src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java
View File

@@ -9,6 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.commafeed.backend.StartupBean;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.feeds.OPMLImporter;
import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.User;
@@ -44,10 +45,7 @@ public class GoogleImportCallbackPage extends WebPage {
UserDAO userDAO;
public static String getCallbackUrl(String publicUrl) {
if (publicUrl.endsWith("/")) {
publicUrl = publicUrl.substring(0, publicUrl.length() - 1);
}
return publicUrl + "/" + PAGE_PATH;
return FeedUtils.removeTrailingSlash(publicUrl) + "/" + PAGE_PATH;
}
public GoogleImportCallbackPage(PageParameters params) {

8
src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java
View File

@@ -14,6 +14,7 @@ import org.apache.wicket.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.model.User;
import com.commafeed.frontend.pages.components.BootstrapFeedbackPanel;
@@ -67,10 +68,9 @@ public class PasswordRecoveryPage extends BasePage {
private String buildEmailContent(User user) throws Exception {
String publicUrl = applicationSettingsService.get().getPublicUrl();
if (publicUrl.endsWith("/")) {
publicUrl = publicUrl.substring(0, publicUrl.length() - 1);
}
String publicUrl = FeedUtils
.removeTrailingSlash(applicationSettingsService.get()
.getPublicUrl());
publicUrl += "/recover2";
return String