X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=9b0a7fc66f15371e481401d84e97bbea0c11272c;hb=953c41bc82b474680d84266fd7227ce08480883c;hp=d215c82cc23cd3aef649a72d49c108e123cd4564;hpb=cb7aebca2a351028dd4fdd00dcd637c6aafac79b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index d215c82..9b0a7fc 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -66,6 +66,9 @@ public class ProfileAccessor extends ReflectionAccessor {
 				/* avatar ID but no matching image? show nothing. */
 				return null;
 			}
+			if (!avatarImageBelongsToTheSameSoneAsTheProfile(profile, avatarId)) {
+				return null;
+			}
 			Sone remoteSone = profile.getSone();
 			if (remoteSone.isLocal()) {
 				/* always show your own avatars. */
@@ -96,4 +99,8 @@ public class ProfileAccessor extends ReflectionAccessor {
 		return super.get(templateContext, object, member);
 	}
 
+	private boolean avatarImageBelongsToTheSameSoneAsTheProfile(Profile profile, String avatarId) {
+		return core.getImage(avatarId).get().getSone().equals(profile.getSone());
+	}
+
 }