projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
304cf43
)
Return configured trust values immediately.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 5 Sep 2012 10:13:30 +0000
(12:13 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 5 Sep 2012 10:13:30 +0000
(12:13 +0200)
src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
index
f25b19c
..
6e72a5a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
@@
-19,7
+19,6
@@
package net.pterodactylus.sone.web.ajax;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
@@
-57,11
+56,7
@@
public class DistrustAjaxPage extends JsonPage {
return createErrorJsonObject("invalid-sone-id");
}
webInterface.getCore().distrustSone(currentSone, sone);
return createErrorJsonObject("invalid-sone-id");
}
webInterface.getCore().distrustSone(currentSone, sone);
- Trust trust = webInterface.getCore().getTrust(currentSone, sone);
- if (trust == null) {
- return createErrorJsonObject("wot-plugin");
- }
- return createSuccessJsonObject().put("trustValue", trust.getExplicit());
+ return createSuccessJsonObject().put("trustValue", webInterface.getCore().getPreferences().getNegativeTrust());
}
}
}
}
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
index
9b86c5e
..
5b27d1b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
@@
-19,7
+19,6
@@
package net.pterodactylus.sone.web.ajax;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
@@
-57,11
+56,7
@@
public class TrustAjaxPage extends JsonPage {
return createErrorJsonObject("invalid-sone-id");
}
webInterface.getCore().trustSone(currentSone, sone);
return createErrorJsonObject("invalid-sone-id");
}
webInterface.getCore().trustSone(currentSone, sone);
- Trust trust = webInterface.getCore().getTrust(currentSone, sone);
- if (trust == null) {
- return createErrorJsonObject("wot-plugin");
- }
- return createSuccessJsonObject().put("trustValue", trust.getExplicit());
+ return createSuccessJsonObject().put("trustValue", webInterface.getCore().getPreferences().getPositiveTrust());
}
}
}
}
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
index
932be6c
..
916b6e9
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
@@
-19,7
+19,6
@@
package net.pterodactylus.sone.web.ajax;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.json.JsonObject;
@@
-57,11
+56,7
@@
public class UntrustAjaxPage extends JsonPage {
return createErrorJsonObject("invalid-sone-id");
}
webInterface.getCore().untrustSone(currentSone, sone);
return createErrorJsonObject("invalid-sone-id");
}
webInterface.getCore().untrustSone(currentSone, sone);
- Trust trust = webInterface.getCore().getTrust(currentSone, sone);
- if (trust == null) {
- return createErrorJsonObject("wot-plugin");
- }
- return createSuccessJsonObject().put("trustValue", trust.getExplicit());
+ return createSuccessJsonObject().put("trustValue", (String) null);
}
}
}
}