Use the core to check for the locality of a Sone.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / SoneAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index c4eac6c..119a28e 100644 (file)
--- 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;
 
@@ -66,12 +74,12 @@ public class SoneAccessor extends ReflectionAccessor {
                if (member.equals("niceName")) {
                        return getNiceName(sone);
                } else if (member.equals("local")) {
-                       return sone.getInsertUri() != null;
+                       return core.isLocalSone(sone);
                } else if (member.equals("friend")) {
-                       Sone currentSone = (Sone) dataProvider.getData("currentSone");
+                       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 core.isModifiedSone(sone);
@@ -90,8 +98,16 @@ public class SoneAccessor extends ReflectionAccessor {
                } else if (member.equals("locked")) {
                        return core.isLocked(sone);
                } else if (member.equals("trust")) {
-                       Sone currentSone = (Sone) dataProvider.getData("currentSone");
-                       return core.getTrust(currentSone, sone);
+                       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 trust;
                }
                return super.get(dataProvider, object, member);
        }