projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace get translation ajax page with Kotlin version
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
UnfollowSoneAjaxPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java
index
26f1a11
..
28ffbf2
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - UnfollowSoneAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - UnfollowSoneAjaxPage.java - Copyright © 2010
–2016
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-17,17
+17,18
@@
package net.pterodactylus.sone.web.ajax;
package net.pterodactylus.sone.web.ajax;
+import javax.annotation.Nonnull;
+
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
/**
* AJAX page that lets a Sone unfollow another Sone.
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
/**
* AJAX page that lets a Sone unfollow another Sone.
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class UnfollowSoneAjaxPage extends JsonPage {
+public class UnfollowSoneAjaxPage extends
LoggedIn
JsonPage {
/**
* Creates a new “unfollow Sone” AJAX page.
/**
* Creates a new “unfollow Sone” AJAX page.
@@
-42,18
+43,14
@@
public class UnfollowSoneAjaxPage extends JsonPage {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Nonnull
@Override
@Override
- protected Json
Object createJsonObject(
FreenetRequest request) {
+ protected Json
ReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull
FreenetRequest request) {
String soneId = request.getHttpRequest().getParam("sone");
String soneId = request.getHttpRequest().getParam("sone");
- if (!webInterface.getCore().
hasSone(soneId
)) {
+ if (!webInterface.getCore().
getSone(soneId).isPresent(
)) {
return createErrorJsonObject("invalid-sone-id");
}
return createErrorJsonObject("invalid-sone-id");
}
- Sone currentSone = getCurrentSone(request.getToadletContext());
- if (currentSone == null) {
- return createErrorJsonObject("auth-required");
- }
- currentSone.removeFriend(soneId);
- webInterface.getCore().touchConfiguration();
+ webInterface.getCore().unfollowSone(currentSone, soneId);
return createSuccessJsonObject();
}
return createSuccessJsonObject();
}