X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=eac6e2cbd1a6c2b7f2eb1a3274ba681e1eed78a2;hb=4f686e5c5ddcf94ffdf074b953493c148fb2ab32;hp=f1ee6e545f94fec621f082a66dcbde6717c61498;hpb=4623504d164c0f3cf870f1b5c5707fb058657e71;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 f1ee6e5..eac6e2c 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -69,17 +69,14 @@ public class SoneAccessor extends ReflectionAccessor {
 			return sone.getInsertUri() != null;
 		} else if (member.equals("friend")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return (currentSone != null) && currentSone.hasFriend(sone);
+			return (currentSone != null) && currentSone.hasFriend(sone.getId());
 		} else if (member.equals("current")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
 			return (currentSone != null) && currentSone.equals(sone);
-		} else if (member.equals("blocked")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return (currentSone != null) && currentSone.isSoneBlocked(sone.getId());
 		} else if (member.equals("modified")) {
-			return sone.getModificationCounter() > 0;
+			return core.isModifiedSone(sone);
 		} 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")) {
@@ -88,6 +85,8 @@ 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);
 		}
 		return super.get(dataProvider, object, member);
 	}
@@ -110,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;
 		}