projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add optional parameter to hide moving buttons
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
FollowSoneAjaxPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
index
5b4fdc2
..
64c402a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - FollowSoneAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - FollowSoneAjaxPage.java - Copyright © 2010
–2013
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,9
+17,11
@@
package net.pterodactylus.sone.web.ajax;
package net.pterodactylus.sone.web.ajax;
+import com.google.common.base.Optional;
+
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.
util.json.JsonObjec
t;
+import net.pterodactylus.
sone.web.page.FreenetReques
t;
/**
* AJAX page that lets a Sone follow another Sone.
/**
* AJAX page that lets a Sone follow another Sone.
@@
-35,25
+37,26
@@
public class FollowSoneAjaxPage extends JsonPage {
* The Sone web interface
*/
public FollowSoneAjaxPage(WebInterface webInterface) {
* The Sone web interface
*/
public FollowSoneAjaxPage(WebInterface webInterface) {
- super("
ajax/
followSone.ajax", webInterface);
+ super("followSone.ajax", webInterface);
}
/**
* {@inheritDoc}
*/
@Override
}
/**
* {@inheritDoc}
*/
@Override
- protected Json
Object createJsonObject(
Request request) {
+ protected Json
ReturnObject createJsonObject(Freenet
Request request) {
String soneId = request.getHttpRequest().getParam("sone");
String soneId = request.getHttpRequest().getParam("sone");
-
Sone sone = webInterface.c
ore().getSone(soneId);
- if (
sone == null
) {
- return
new JsonObject().put("success", false).put("error",
"invalid-sone-id");
+
Optional<Sone> sone = webInterface.getC
ore().getSone(soneId);
+ if (
!sone.isPresent()
) {
+ return
createErrorJsonObject(
"invalid-sone-id");
}
Sone currentSone = getCurrentSone(request.getToadletContext());
if (currentSone == null) {
}
Sone currentSone = getCurrentSone(request.getToadletContext());
if (currentSone == null) {
- return
new JsonObject().put("success", false).put("error",
"auth-required");
+ return
createErrorJsonObject(
"auth-required");
}
}
- currentSone.addFriend(sone);
- return new JsonObject().put("success", true);
+ webInterface.getCore().followSone(currentSone, soneId);
+ webInterface.getCore().markSoneKnown(sone.get());
+ return createSuccessJsonObject();
}
}
}
}