X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=c4eac6c73cae5d43062ecf10ae0651381111ee5e;hb=4d9ef6eb7811d637b7c04694bf0c5f16e9b5e2f6;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..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")) { @@ -87,6 +87,11 @@ 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"); + return core.getTrust(currentSone, sone); } return super.get(dataProvider, object, member); }