projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into new-database-38
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
ProfileAccessor.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index
97be0cd
..
19177c3
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - ProfileAccessor.java - Copyright © 2011 David Roden
+ * Sone - ProfileAccessor.java - Copyright © 2011
–2012
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-21,6
+21,7
@@
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
+import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.util.template.Accessor;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.util.template.Accessor;
import net.pterodactylus.util.template.ReflectionAccessor;
@@
-60,30
+61,37
@@
public class ProfileAccessor extends ReflectionAccessor {
/* not logged in? don’t show custom avatars, then. */
return null;
}
/* not logged in? don’t show custom avatars, then. */
return null;
}
+ String avatarId = profile.getAvatar();
+ if (avatarId == null) {
+ return null;
+ }
+ if (core.getImage(avatarId, false) == null) {
+ /* avatar ID but no matching image? show nothing. */
+ return null;
+ }
Sone remoteSone = profile.getSone();
Sone remoteSone = profile.getSone();
- if (
core.isLocalSone(remoteSone
)) {
+ if (
remoteSone.isLocal(
)) {
/* always show your own avatars. */
/* always show your own avatars. */
- return
profile.getAvatar()
;
+ return
avatarId
;
}
ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
if (showCustomAvatars == ShowCustomAvatars.NEVER) {
return null;
}
}
ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
if (showCustomAvatars == ShowCustomAvatars.NEVER) {
return null;
}
- String avatarId = profile.getAvatar();
- if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
+ if (showCustomAvatars == ShowCustomAvatars.ALWAYS) {
return avatarId;
}
return avatarId;
}
- if (
(showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())
) {
- return
avatarId
;
+ if (
showCustomAvatars == ShowCustomAvatars.FOLLOWED
) {
+ return
currentSone.hasFriend(remoteSone.getId()) ? avatarId : null
;
}
}
- Trust trust =
core.getTrust(currentSone, remoteSone
);
+ Trust trust =
remoteSone.getIdentity().getTrust((OwnIdentity) currentSone.getIdentity()
);
if (trust == null) {
return null;
}
if ((showCustomAvatars == ShowCustomAvatars.MANUALLY_TRUSTED) && (trust.getExplicit() != null) && (trust.getExplicit() > 0)) {
return avatarId;
}
if (trust == null) {
return null;
}
if ((showCustomAvatars == ShowCustomAvatars.MANUALLY_TRUSTED) && (trust.getExplicit() != null) && (trust.getExplicit() > 0)) {
return avatarId;
}
- if ((showCustomAvatars == ShowCustomAvatars.TRUSTED) && ((
trust.getExplicit() != null) && (trust.getExplicit() > 0)) || ((trust.getImplicit() != null) && (trust.getImplicit() > 0
))) {
+ if ((showCustomAvatars == ShowCustomAvatars.TRUSTED) && ((
(trust.getExplicit() != null) && (trust.getExplicit() > 0)) || ((trust.getImplicit() != null) && (trust.getImplicit() > 0)
))) {
return avatarId;
}
return null;
return avatarId;
}
return null;