projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.7.6'
[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
97972c7
..
97be0cd
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@
-60,6
+60,11
@@
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;
}
+ Sone remoteSone = profile.getSone();
+ if (core.isLocalSone(remoteSone)) {
+ /* always show your own avatars. */
+ return profile.getAvatar();
+ }
ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
if (showCustomAvatars == ShowCustomAvatars.NEVER) {
return null;
ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
if (showCustomAvatars == ShowCustomAvatars.NEVER) {
return null;
@@
-68,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;
}