X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=a9ee78bd35642a17aca97e655aa0a0a6718da568;hb=6f1e7806171eb6af95c8669f2ac0801e34b9246a;hp=dc4c0abab6a675d395ff7116a5c429dd6893c75f;hpb=9d9ede6b0344ef1edf8af5bd32e59797d216b6c4;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 dc4c0ab..a9ee78b 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -17,6 +17,8 @@
 
 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.util.template.Accessor;
@@ -29,11 +31,11 @@ import net.pterodactylus.util.template.ReflectionAccessor;
  * <dt>niceName</dt>
  * <dd>Will show a combination of first name, middle name, and last name, if
  * available, otherwise the username of the Sone is returned.</dd>
- * <dt>isFriend</dt>
+ * <dt>friend</dt>
  * <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 +44,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 +65,28 @@ public class SoneAccessor extends ReflectionAccessor {
 		Sone sone = (Sone) object;
 		if (member.equals("niceName")) {
 			return getNiceName(sone);
-		} else if (member.equals("isFriend")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.hasFriend(sone) ? true : null;
-		} else if (member.equals("isCurrent")) {
+		} else if (member.equals("local")) {
+			return sone.getInsertUri() != null;
+		} else if (member.equals("friend")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.equals(sone);
-		} else if (member.equals("isBlocked")) {
+			return (currentSone != null) && currentSone.hasFriend(sone.getId());
+		} else if (member.equals("current")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.isSoneBlocked(sone.getId());
+			return (currentSone != null) && currentSone.equals(sone);
+		} else if (member.equals("modified")) {
+			return sone.getModificationCounter() > 0;
+		} 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);
 		}
 		return super.get(dataProvider, object, member);
 	}
@@ -81,7 +109,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;
 		}