X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=0cb92fff48628e7b455169b2d3c6fa32e20c10d2;hb=1f70b96444f309fbbf338d474af395ff615d244b;hp=edc0eec599c5ee5ca11acaf3bf92085b8d7019ef;hpb=7f4d1f9fc01b2c0dfa8ce9788125f0ad21a2b7cd;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 edc0eec..0cb92ff 100644 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@ -21,6 +21,7 @@ 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.template.Accessor; import net.pterodactylus.util.template.DataProvider; import net.pterodactylus.util.template.ReflectionAccessor; @@ -69,12 +70,12 @@ 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("modified")) { - return sone.getModificationCounter() > 0; + return core.isModifiedSone(sone); } else if (member.equals("status")) { return core.getSoneStatus(sone); } else if (member.equals("unknown")) { @@ -87,6 +88,14 @@ public class SoneAccessor extends ReflectionAccessor { 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"); + Trust trust = core.getTrust(currentSone, sone); + if (trust == null) { + return new Trust(null, null, null); + } } return super.get(dataProvider, object, member); }