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

more config checks on startup

Browse Source
This commit is contained in:
Athou
2014-12-04 10:52:41 +01:00
parent 9110cfd923
commit c702f47927
13 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/commafeed/frontend/resource/CategoryREST.java
View File

@@ -143,7 +143,7 @@ public class CategoryREST {
for (FeedEntryStatus status : list) {
entries.getEntries().add(
Entry.build(status, config.getApplicationSettings().getPublicUrl(), config.getApplicationSettings()
.isImageProxyEnabled()));
.getImageProxyEnabled()));
}
} else if (STARRED.equals(id)) {
@@ -152,7 +152,7 @@ public class CategoryREST {
for (FeedEntryStatus status : starred) {
entries.getEntries().add(
Entry.build(status, config.getApplicationSettings().getPublicUrl(), config.getApplicationSettings()
.isImageProxyEnabled()));
.getImageProxyEnabled()));
}
} else {
FeedCategory parent = feedCategoryDAO.findById(user, Long.valueOf(id));
@@ -166,7 +166,7 @@ public class CategoryREST {
for (FeedEntryStatus status : list) {
entries.getEntries().add(
Entry.build(status, config.getApplicationSettings().getPublicUrl(), config.getApplicationSettings()
.isImageProxyEnabled()));
.getImageProxyEnabled()));
}
entries.setName(parent.getName());
} else {

2
src/main/java/com/commafeed/frontend/resource/FeedREST.java
View File

@@ -173,7 +173,7 @@ public class FeedREST {
for (FeedEntryStatus status : list) {
entries.getEntries().add(
Entry.build(status, config.getApplicationSettings().getPublicUrl(), config.getApplicationSettings()
.isImageProxyEnabled()));
.getImageProxyEnabled()));
}
boolean hasMore = entries.getEntries().size() > limit;

4
src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java
View File

@@ -57,7 +57,7 @@ public class PubSubHubbubCallbackREST {
public Response verify(@QueryParam("hub.mode") String mode, @QueryParam("hub.topic") String topic,
@QueryParam("hub.challenge") String challenge, @QueryParam("hub.lease_seconds") String leaseSeconds,
@QueryParam("hub.verify_token") String verifyToken) {
if (!config.getApplicationSettings().isPubsubhubbub()) {
if (!config.getApplicationSettings().getPubsubhubbub()) {
return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build();
}
@@ -87,7 +87,7 @@ public class PubSubHubbubCallbackREST {
@Consumes({ MediaType.APPLICATION_ATOM_XML, "application/rss+xml" })
public Response callback() {
if (!config.getApplicationSettings().isPubsubhubbub()) {
if (!config.getApplicationSettings().getPubsubhubbub()) {
return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build();
}

4
src/main/java/com/commafeed/frontend/resource/ServerREST.java
View File

@@ -47,7 +47,7 @@ public class ServerREST {
infos.setAnnouncement(config.getApplicationSettings().getAnnouncement());
infos.setVersion(config.getVersion());
infos.setGitCommit(config.getGitCommit());
infos.setAllowRegistrations(config.getApplicationSettings().isAllowRegistrations());
infos.setAllowRegistrations(config.getApplicationSettings().getAllowRegistrations());
infos.setGoogleAnalyticsCode(config.getApplicationSettings().getGoogleAnalyticsTrackingCode());
infos.setSmtpEnabled(StringUtils.isNotBlank(config.getApplicationSettings().getSmtpHost()));
return Response.ok(infos).build();
@@ -59,7 +59,7 @@ public class ServerREST {
@ApiOperation(value = "proxy image")
@Produces("image/png")
public Response get(@SecurityCheck User user, @QueryParam("u") String url) {
if (!config.getApplicationSettings().isImageProxyEnabled()) {
if (!config.getApplicationSettings().getImageProxyEnabled()) {
return Response.status(Status.FORBIDDEN).build();
}