X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=ef71a962df52a6b34899b49a217e4aaab239ebd7;hb=cfa3be96597e79a98184ca6c3675fdfbe96c9841;hp=a21794dfe70f62bde4159290419a37c419a03836;hpb=7e85943e2f45b035483f01514a13976ad4607526;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index a21794d..ef71a96 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -17,10 +17,15 @@
 
 package net.pterodactylus.sone.template;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.freenet.wot.Trust;
+import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Accessor;
 import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -44,6 +49,9 @@ import net.pterodactylus.util.template.ReflectionAccessor;
  */
 public class SoneAccessor extends ReflectionAccessor {
 
+	/** The logger. */
+	private static final Logger logger = Logging.getLogger(SoneAccessor.class);
+
 	/** The core. */
 	private final Core core;
 
@@ -68,13 +76,13 @@ public class SoneAccessor extends ReflectionAccessor {
 		} else if (member.equals("local")) {
 			return sone.getInsertUri() != null;
 		} else if (member.equals("friend")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return (currentSone != null) && currentSone.hasFriend(sone);
+			Sone currentSone = (Sone) dataProvider.get("currentSone");
+			return (currentSone != null) && currentSone.hasFriend(sone.getId());
 		} else if (member.equals("current")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
+			Sone currentSone = (Sone) dataProvider.get("currentSone");
 			return (currentSone != null) && currentSone.equals(sone);
 		} else if (member.equals("modified")) {
-			return sone.getModificationCounter() > 0;
+			return core.isModifiedSone(sone);
 		} else if (member.equals("status")) {
 			return core.getSoneStatus(sone);
 		} else if (member.equals("unknown")) {
@@ -85,6 +93,20 @@ public class SoneAccessor extends ReflectionAccessor {
 			return core.getSoneStatus(sone) == SoneStatus.inserting;
 		} else if (member.equals("downloading")) {
 			return core.getSoneStatus(sone) == SoneStatus.downloading;
+		} else if (member.equals("new")) {
+			return core.isNewSone(sone);
+		} else if (member.equals("locked")) {
+			return core.isLocked(sone);
+		} else if (member.equals("trust")) {
+			Sone currentSone = (Sone) dataProvider.get("currentSone");
+			if (currentSone == null) {
+				return null;
+			}
+			Trust trust = core.getTrust(currentSone, sone);
+			logger.log(Level.FINEST, "Trust for %s by %s: %s", new Object[] { sone, currentSone, trust });
+			if (trust == null) {
+				return new Trust(null, null, null);
+			}
 		}
 		return super.get(dataProvider, object, member);
 	}