X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=beb7f2ae05ab55395d88917d59861d44de817d11;hb=415b8c3b295775d66fb1db1d0f641e05fbbcca98;hp=54a5a863520f35b8c7710c892561a2e992e39e09;hpb=1c57e8be327fe76dbc82ba438bcaeb4023259e71;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 54a5a86..beb7f2a 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -17,8 +17,11 @@
 
 package net.pterodactylus.sone.template;
 
+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.template.Accessor;
 import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -33,7 +36,7 @@ import net.pterodactylus.util.template.ReflectionAccessor;
  * <dd>Will return {@code true} if the sone in question is a friend of the
  * currently logged in Sone (as determined by accessing the “currentSone”
  * variable of the given {@link DataProvider}).</dd>
- * <dt>isCurrent</dt>
+ * <dt>current</dt>
  * <dd>Will return {@code true} if the sone in question is the currently logged
  * in Sone.</dd>
  * </dl>
@@ -42,6 +45,19 @@ import net.pterodactylus.util.template.ReflectionAccessor;
  */
 public class SoneAccessor extends ReflectionAccessor {
 
+	/** The core. */
+	private final Core core;
+
+	/**
+	 * Creates a new Sone accessor.
+	 *
+	 * @param core
+	 *            The Sone core
+	 */
+	public SoneAccessor(Core core) {
+		this.core = core;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -50,15 +66,39 @@ public class SoneAccessor extends ReflectionAccessor {
 		Sone sone = (Sone) object;
 		if (member.equals("niceName")) {
 			return getNiceName(sone);
+		} else if (member.equals("local")) {
+			return sone.getInsertUri() != null;
 		} else if (member.equals("friend")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.hasFriend(sone) ? true : null;
-		} else if (member.equals("isCurrent")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.equals(sone);
-		} else if (member.equals("blocked")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.isSoneBlocked(sone.getId());
+			Sone currentSone = (Sone) dataProvider.get("currentSone");
+			return (currentSone != null) && currentSone.hasFriend(sone.getId());
+		} else if (member.equals("current")) {
+			Sone currentSone = (Sone) dataProvider.get("currentSone");
+			return (currentSone != null) && currentSone.equals(sone);
+		} else if (member.equals("modified")) {
+			return core.isModifiedSone(sone);
+		} else if (member.equals("status")) {
+			return core.getSoneStatus(sone);
+		} else if (member.equals("unknown")) {
+			return core.getSoneStatus(sone) == SoneStatus.unknown;
+		} else if (member.equals("idle")) {
+			return core.getSoneStatus(sone) == SoneStatus.idle;
+		} else if (member.equals("inserting")) {
+			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);
+			if (trust == null) {
+				return new Trust(null, null, null);
+			}
 		}
 		return super.get(dataProvider, object, member);
 	}
@@ -81,7 +121,7 @@ public class SoneAccessor extends ReflectionAccessor {
 		String lastName = profile.getLastName();
 		if (firstName == null) {
 			if (lastName == null) {
-				return sone.getName();
+				return String.valueOf(sone.getName());
 			}
 			return lastName;
 		}