projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add blacklisting functionality.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
SoneAccessor.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index
ebf2f82
..
bb03306
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@
-65,15
+65,19
@@
public class SoneAccessor extends ReflectionAccessor {
Sone sone = (Sone) object;
if (member.equals("niceName")) {
return getNiceName(sone);
Sone sone = (Sone) object;
if (member.equals("niceName")) {
return getNiceName(sone);
+ } else if (member.equals("local")) {
+ return sone.getInsertUri() != null;
} else if (member.equals("friend")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
} else if (member.equals("friend")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return
currentSone.hasFriend(sone) ? true : null
;
+ return
(currentSone != null) && currentSone.hasFriend(sone)
;
} else if (member.equals("current")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
} else if (member.equals("current")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return currentSone.equals(sone);
+ return
(currentSone != null) &&
currentSone.equals(sone);
} else if (member.equals("blocked")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
} else if (member.equals("blocked")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return currentSone.isSoneBlocked(sone.getId());
+ return (currentSone != null) && currentSone.isSoneBlocked(sone.getId());
+ } else if (member.equals("blacklisted")) {
+ return core.isBlacklistedSone(sone);
} else if (member.equals("modified")) {
return sone.getModificationCounter() > 0;
} else if (member.equals("status")) {
} else if (member.equals("modified")) {
return sone.getModificationCounter() > 0;
} else if (member.equals("status")) {