Always show all your own avatars.

[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 f6056fa..97be0cd 100644 (file)
--- 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;
                        }
                                /* 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();
                                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;
                        }
                        if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
                                return avatarId;
                        }

-                       Sone remoteSone = profile.getSone();

                        if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
                                return avatarId;
                        }
                        if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
                                return avatarId;
                        }