From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 5 Sep 2012 10:13:30 +0000 (+0200)
Subject: Return configured trust values immediately.
X-Git-Tag: 0.8.3^2~54^2~8
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=056abe07e4ce6ba8ebca48396e36fcbefbbcc5e4;hp=304cf43f37de2866339ddbdad25cbb04154d569c

Return configured trust values immediately.
---

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
--- 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.freenet.wot.Trust;
 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);
-		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
--- 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.freenet.wot.Trust;
 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);
-		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
--- 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.freenet.wot.Trust;
 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);
-		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);
 	}
 
 }