X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=366e071fde61c4143452351574b918035957638e;hp=97be0cd84512dcad02b533701ac5f8a1d2aee2ab;hb=577c7b884783c1c055a4da3663d1f55a2109b442;hpb=0206f400c986a38cd91978059e98838c02af0b99

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index 97be0cd..366e071 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -60,21 +60,28 @@ public class ProfileAccessor extends ReflectionAccessor {
 				/* 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();
 			if (core.isLocalSone(remoteSone)) {
 				/* always show your own avatars. */
-				return profile.getAvatar();
+				return avatarId;
 			}
 			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;
 			}
-			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);
 			if (trust == null) {
@@ -83,7 +90,7 @@ public class ProfileAccessor extends ReflectionAccessor {
 			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;