From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 9 Dec 2011 06:40:54 +0000 (+0100)
Subject: Return default avatar ID (null) when ID points to invalid image.
X-Git-Tag: 0.8^2~42
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=87b2b8dc5a94c2af3cee7a91c122a7240044cddf

Return default avatar ID (null) when ID points to invalid image.

This can happen after you delete your avatar image.
---

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index 97be0cd..8c7d1e4 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -60,16 +60,22 @@ public class ProfileAccessor extends ReflectionAccessor {
 				/* not logged in? don’t show custom avatars, then. */
 				return null;
 			}
+			String avatarId = profile.getAvatar();
+			if (avatarId != 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)) {
 				return avatarId;
 			}