From bdb970b8ada0363b9bc01d211f4af794b52c9284 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 28 Nov 2017 20:48:45 +0100
Subject: some bug fixes

---
 src/main/java/de/pixart/messenger/entities/MucOptions.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/entities')

diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java
index 50ea4c2fb..67c02b543 100644
--- a/src/main/java/de/pixart/messenger/entities/MucOptions.java
+++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java
@@ -439,11 +439,13 @@ public class MucOptions {
                         break;
                     }
                 }
+                boolean self = user.realJid != null && user.realJid.equals(account.getJid().toBareJid());
                 if (membersOnly()
                         && nonanonymous()
                         && user.affiliation.ranks(Affiliation.MEMBER)
                         && user.realJid != null
-                        && !realJidInMuc) {
+                        && !realJidInMuc
+                        && !self) {
                     user.role = Role.NONE;
                     user.avatar = null;
                     user.fullJid = null;
@@ -593,6 +595,7 @@ public class MucOptions {
     public List<User> getUsers(int max) {
         ArrayList<User> subset = new ArrayList<>();
         HashSet<Jid> jids = new HashSet<>();
+        jids.add(account.getJid().toBareJid());
         synchronized (users) {
             for(User user : users) {
                 if (user.getRealJid() == null || jids.add(user.getRealJid())) {
-- 
cgit v1.2.3