X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=762bc1480997ae3671e59c7d6f302093c77d7b58;hp=f6056fadb0f197b7b48a8da984d3354bed4e0443;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=0e3f55050a9a077723d0a355764bd7cf6ffa1860

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index f6056fa..762bc14 100644
--- 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–2013 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
@@ -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.freenet.wot.OwnIdentity;
 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;
 			}
-			if (profile.getSone().equals(currentSone)) {
-				/* always show your own avatar. */
-				return profile.getAvatar();
+			String avatarId = profile.getAvatar();
+			if (avatarId == null) {
+				return null;
 			}
-			ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
-			if (showCustomAvatars == ShowCustomAvatars.NEVER) {
+			if (core.getImage(avatarId, false) == null) {
+				/* avatar ID but no matching image? show nothing. */
 				return null;
 			}
-			String avatarId = profile.getAvatar();
-			if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
+			Sone remoteSone = profile.getSone();
+			if (remoteSone.isLocal()) {
+				/* always show your own avatars. */
 				return avatarId;
 			}
-			Sone remoteSone = profile.getSone();
-			if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
+			ShowCustomAvatars showCustomAvatars = currentSone.getOptions().getShowCustomAvatars();
+			if (showCustomAvatars == ShowCustomAvatars.NEVER) {
+				return null;
+			}
+			if (showCustomAvatars == ShowCustomAvatars.ALWAYS) {
 				return avatarId;
 			}
-			Trust trust = core.getTrust(currentSone, remoteSone);
+			if (showCustomAvatars == ShowCustomAvatars.FOLLOWED) {
+				return currentSone.hasFriend(remoteSone.getId()) ? avatarId : null;
+			}
+			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 ((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;