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

remove google+ and readability sharing support since they're dead

Browse Source
This commit is contained in:
Athou
2022-01-02 08:21:32 +01:00
parent e01e59b72c
commit 3f3ef27d6b
8 changed files with 59 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/backend/model/UserSettings.java
View File

@@ -71,11 +71,9 @@ public class UserSettings extends AbstractModel {
private boolean gmail;
private boolean facebook;
private boolean twitter;
private boolean googleplus;
private boolean tumblr;
private boolean pocket;
private boolean instapaper;
private boolean buffer;
private boolean readability;
}

7
src/main/java/com/commafeed/frontend/model/Settings.java
View File

@@ -50,9 +50,6 @@ public class Settings implements Serializable {
@ApiModelProperty(required = true)
private boolean twitter;
@ApiModelProperty(required = true)
private boolean googleplus;
@ApiModelProperty(required = true)
private boolean tumblr;
@@ -64,8 +61,4 @@ public class Settings implements Serializable {
@ApiModelProperty(required = true)
private boolean buffer;
@ApiModelProperty(required = true)
private boolean readability;
}

23
src/main/java/com/commafeed/frontend/resource/UserREST.java
View File

@@ -96,12 +96,10 @@ public class UserREST {
s.setGmail(settings.isGmail());
s.setFacebook(settings.isFacebook());
s.setTwitter(settings.isTwitter());
s.setGoogleplus(settings.isGoogleplus());
s.setTumblr(settings.isTumblr());
s.setPocket(settings.isPocket());
s.setInstapaper(settings.isInstapaper());
s.setBuffer(settings.isBuffer());
s.setReadability(settings.isReadability());
s.setScrollMarks(settings.isScrollMarks());
s.setTheme(settings.getTheme());
@@ -119,12 +117,10 @@ public class UserREST {
s.setGmail(true);
s.setFacebook(true);
s.setTwitter(true);
s.setGoogleplus(true);
s.setTumblr(true);
s.setPocket(true);
s.setInstapaper(true);
s.setBuffer(true);
s.setReadability(true);
s.setScrollMarks(true);
s.setLanguage("en");
@@ -160,12 +156,10 @@ public class UserREST {
s.setGmail(settings.isGmail());
s.setFacebook(settings.isFacebook());
s.setTwitter(settings.isTwitter());
s.setGoogleplus(settings.isGoogleplus());
s.setTumblr(settings.isTumblr());
s.setPocket(settings.isPocket());
s.setInstapaper(settings.isInstapaper());
s.setBuffer(settings.isBuffer());
s.setReadability(settings.isReadability());
userSettingsDAO.saveOrUpdate(s);
return Response.ok().build();
@@ -235,7 +229,9 @@ public class UserREST {
sessionHelper.setLoggedInUser(registeredUser);
return Response.ok().build();
} catch (final IllegalArgumentException e) {
return Response.status(422).entity(new ValidationErrorMessage(ImmutableList.of(e.getMessage()))).type(MediaType.TEXT_PLAIN)
return Response.status(422)
.entity(new ValidationErrorMessage(ImmutableList.of(e.getMessage())))
.type(MediaType.TEXT_PLAIN)
.build();
}
}
@@ -273,8 +269,10 @@ public class UserREST {
return Response.ok().build();
} catch (Exception e) {
log.error(e.getMessage(), e);
return Response.status(Status.INTERNAL_SERVER_ERROR).entity("could not send email: " + e.getMessage())
.type(MediaType.TEXT_PLAIN).build();
return Response.status(Status.INTERNAL_SERVER_ERROR)
.entity("could not send email: " + e.getMessage())
.type(MediaType.TEXT_PLAIN)
.build();
}
}
@@ -287,8 +285,11 @@ public class UserREST {
}
private String callbackUrl(User user, String publicUrl) throws Exception {
return new URIBuilder(publicUrl).addParameter("email", user.getEmail()).addParameter("token", user.getRecoverPasswordToken())
.build().toURL().toString();
return new URIBuilder(publicUrl).addParameter("email", user.getEmail())
.addParameter("token", user.getRecoverPasswordToken())
.build()
.toURL()
.toString();
}
@Path("/passwordResetCallback")