X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=ee7d16d25a79ca59631e67992da5d1196f21221a;hb=dd3edaf932d073e2eacb14069a9f6136d516303d;hp=b7e2282c22070e50eae0f250b62d0cfe34f939af;hpb=74334cabafbab7c43cc1fd47cb429f54470d0adb;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 b7e2282..ee7d16d 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -29,11 +29,11 @@ import net.pterodactylus.util.template.ReflectionAccessor;
*
niceName
* Will show a combination of first name, middle name, and last name, if
* available, otherwise the username of the Sone is returned.
- * isFriend
+ * 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}).
- * isCurrent
+ * current
* Will return {@code true} if the sone in question is the currently logged
* in Sone.
*
@@ -49,25 +49,43 @@ public class SoneAccessor extends ReflectionAccessor {
public Object get(DataProvider dataProvider, Object object, String member) {
Sone sone = (Sone) object;
if (member.equals("niceName")) {
- Profile profile = sone.getProfile();
- String firstName = profile.getFirstName();
- String middleName = profile.getMiddleName();
- String lastName = profile.getLastName();
- if (firstName == null) {
- if (lastName == null) {
- return sone.getName();
- }
- return lastName;
- }
- return firstName + ((middleName != null) ? " " + middleName : "") + ((lastName != null) ? " " + lastName : "");
- } else if (member.equals("isFriend")) {
+ return getNiceName(sone);
+ } else if (member.equals("friend")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return currentSone.hasFriendSone(sone) ? true : null;
- } else if (member.equals("isCurrent")) {
+ return currentSone.hasFriend(sone) ? true : null;
+ } else if (member.equals("current")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
return currentSone.equals(sone);
+ } else if (member.equals("blocked")) {
+ Sone currentSone = (Sone) dataProvider.getData("currentSone");
+ return currentSone.isSoneBlocked(sone.getId());
}
return super.get(dataProvider, object, member);
}
+ //
+ // STATIC METHODS
+ //
+
+ /**
+ * Returns the nice name of the given Sone.
+ *
+ * @param sone
+ * The Sone to get the nice name for
+ * @return The nice name of the Sone
+ */
+ public static String getNiceName(Sone sone) {
+ Profile profile = sone.getProfile();
+ String firstName = profile.getFirstName();
+ String middleName = profile.getMiddleName();
+ String lastName = profile.getLastName();
+ if (firstName == null) {
+ if (lastName == null) {
+ return sone.getName();
+ }
+ return lastName;
+ }
+ return firstName + ((middleName != null) ? " " + middleName : "") + ((lastName != null) ? " " + lastName : "");
+ }
+
}