X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=a21794dfe70f62bde4159290419a37c419a03836;hb=f740e30811efaa1f1a0e110218984e242755f897;hp=e22738aa1f05b9d48ed44e27b125742e3ea7ca30;hpb=b1660609f6574ed43afd61d332be9f3764900405;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 e22738a..a21794d 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -65,19 +65,20 @@ 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;
+			return (currentSone != null) && currentSone.hasFriend(sone);
 		} else if (member.equals("current")) {
 			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());
+			return (currentSone != null) && currentSone.equals(sone);
 		} else if (member.equals("modified")) {
 			return sone.getModificationCounter() > 0;
 		} else if (member.equals("status")) {
-			return core.getSoneStatus(sone).toString();
+			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")) {
@@ -106,7 +107,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;
 		}