X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=c4eac6c73cae5d43062ecf10ae0651381111ee5e;hb=316b9c2b3d16792975434644ae39a9b1814f32c4;hp=a21794dfe70f62bde4159290419a37c419a03836;hpb=7e85943e2f45b035483f01514a13976ad4607526;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 a21794d..c4eac6c 100644 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@ -69,12 +69,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")) { @@ -85,6 +85,13 @@ 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); + } else if (member.equals("locked")) { + return core.isLocked(sone); + } else if (member.equals("trust")) { + Sone currentSone = (Sone) dataProvider.getData("currentSone"); + return core.getTrust(currentSone, sone); } return super.get(dataProvider, object, member); }