X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=c4eac6c73cae5d43062ecf10ae0651381111ee5e;hb=4a2fdf3b0b3dfcfc761c83797018237ec4c82a4b;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..c4eac6c 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;
@@ -33,7 +35,7 @@ import net.pterodactylus.util.template.ReflectionAccessor;
*
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}).
- * isCurrent
+ * current
* Will return {@code true} if the sone in question is the currently logged
* in Sone.
*
@@ -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,33 @@ 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")) {
+ return (currentSone != null) && currentSone.hasFriend(sone.getId());
+ } else if (member.equals("current")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return currentSone.equals(sone);
- } else if (member.equals("blocked")) {
+ 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.getData("currentSone");
- return currentSone.isSoneBlocked(sone.getId());
+ return core.getTrust(currentSone, sone);
}
return super.get(dataProvider, object, member);
}
@@ -81,7 +114,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;
}