X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=27b4c24ca64526cd993e688a8801d175ee0fb5e5;hb=ecf753a31601e558b681daab0598009fe9eec99a;hp=60e2e9be7312972ffcdf4aa0a5a978709009b0b4;hpb=181af5c8af499a60095f46748d6f0a40c40f88db;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 60e2e9b..27b4c24 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -17,13 +17,18 @@
package net.pterodactylus.sone.template;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
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.logging.Logging;
import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
/**
* {@link Accessor} for {@link Sone}s that adds a couple of properties to Sones.
@@ -34,7 +39,7 @@ import net.pterodactylus.util.template.ReflectionAccessor;
*
friend
* 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}).
+ * variable of the given {@link TemplateContext}).
* current
* Will return {@code true} if the sone in question is the currently logged
* in Sone.
@@ -44,6 +49,9 @@ import net.pterodactylus.util.template.ReflectionAccessor;
*/
public class SoneAccessor extends ReflectionAccessor {
+ /** The logger. */
+ private static final Logger logger = Logging.getLogger(SoneAccessor.class);
+
/** The core. */
private final Core core;
@@ -61,23 +69,22 @@ public class SoneAccessor extends ReflectionAccessor {
* {@inheritDoc}
*/
@Override
- public Object get(DataProvider dataProvider, Object object, String member) {
+ public Object get(TemplateContext templateContext, Object object, String member) {
Sone sone = (Sone) object;
if (member.equals("niceName")) {
return getNiceName(sone);
+ } else if (member.equals("local")) {
+ return core.isLocalSone(sone);
} else if (member.equals("friend")) {
- Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return (currentSone != null) && currentSone.hasFriend(sone);
+ Sone currentSone = (Sone) templateContext.get("currentSone");
+ return (currentSone != null) && currentSone.hasFriend(sone.getId());
} else if (member.equals("current")) {
- Sone currentSone = (Sone) dataProvider.getData("currentSone");
+ Sone currentSone = (Sone) templateContext.get("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")) {
@@ -86,8 +93,23 @@ 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.getId(), false);
+ } else if (member.equals("locked")) {
+ return core.isLocked(sone);
+ } else if (member.equals("trust")) {
+ Sone currentSone = (Sone) templateContext.get("currentSone");
+ if (currentSone == null) {
+ return null;
+ }
+ Trust trust = core.getTrust(currentSone, sone);
+ logger.log(Level.FINEST, "Trust for %s by %s: %s", new Object[] { sone, currentSone, trust });
+ if (trust == null) {
+ return new Trust(null, null, null);
+ }
+ return trust;
}
- return super.get(dataProvider, object, member);
+ return super.get(templateContext, object, member);
}
//
@@ -108,7 +130,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;
}