aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service/avatar_manager.vala
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-05-29 16:53:34 +0200
committerfiaxh <git@lightrise.org>2019-06-01 18:55:04 +0200
commitdd6c860aed79c5adf0db08142bbbf7b8ec3fbe67 (patch)
tree3dc3c3aaf946c35993ac17d90b5211f75bf4d285 /libdino/src/service/avatar_manager.vala
parent5456a85777638d7753ad4377bd01a0c51c3a3f14 (diff)
downloaddino-dd6c860aed79c5adf0db08142bbbf7b8ec3fbe67.tar.gz
dino-dd6c860aed79c5adf0db08142bbbf7b8ec3fbe67.zip
Don't change type of a conversation
Diffstat (limited to 'libdino/src/service/avatar_manager.vala')
-rw-r--r--libdino/src/service/avatar_manager.vala7
1 files changed, 6 insertions, 1 deletions
diff --git a/libdino/src/service/avatar_manager.vala b/libdino/src/service/avatar_manager.vala
index 3e6d4d80..c9c078ab 100644
--- a/libdino/src/service/avatar_manager.vala
+++ b/libdino/src/service/avatar_manager.vala
@@ -71,7 +71,12 @@ public class AvatarManager : StreamInteractionModule, Object {
}
public async Pixbuf? get_avatar(Account account, Jid jid) {
- string? hash = get_avatar_hash(account, jid);
+ Jid jid_ = jid;
+ if (!stream_interactor.get_module(MucManager.IDENTITY).is_groupchat_occupant(jid, account)) {
+ jid_ = jid.bare_jid;
+ }
+
+ string? hash = get_avatar_hash(account, jid_);
if (hash != null) {
return yield get_avatar_by_hash(hash);
}