From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 7 Dec 2011 15:44:50 +0000 (+0100)
Subject: Always show all your own avatars.
X-Git-Tag: 0.7.6^2~1^2
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d37c99d835abafa7c36af3f575dbadaa4b5f76c8;p=Sone.git

Always show all your own avatars.
---

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index f6056fa..97be0cd 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -60,8 +60,9 @@ 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. */
+			Sone remoteSone = profile.getSone();
+			if (core.isLocalSone(remoteSone)) {
+				/* always show your own avatars. */
 				return profile.getAvatar();
 			}
 			ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
@@ -72,7 +73,6 @@ public class ProfileAccessor extends ReflectionAccessor {
 			if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
 				return avatarId;
 			}
-			Sone remoteSone = profile.getSone();
 			if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
 				return avatarId;
 			}