From f240e52a7abde0be1cc8538e1aa4a7a3b58a36cd Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 9 Sep 2025 10:02:25 -0500
Subject: [PATCH] Show self in participants

---
 src/main/java/eu/siacs/conversations/entities/MucOptions.java   | 2 ++
 .../eu/siacs/conversations/ui/ConferenceDetailsActivity.java    | 1 +
 src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index f1166ad253dcd76c68f5dc398fd3e0e21fefe998..ea61ec9756dc5c39bde11bf46ac4a388e21f9e97 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -568,6 +568,8 @@ public class MucOptions {
     }
 
     public static List<User> sub(final List<User> users, final int max) {
+        if (users.size() < max) return users;
+
         final var subset = new ArrayList<User>();
         final var addresses = new HashSet<Jid>();
         for (final var user : users) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index cdf9c675dbb64087b8d6461acb3c30a9ac66cabb..26a79446d385a0c979517fd1855a93b527193030 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -802,6 +802,7 @@ public class ConferenceDetailsActivity extends XmppActivity
                     R.drawable.ic_notifications_none_24dp);
         }
         final List<User> users = mucOptions.getUsers();
+        users.add(mucOptions.getSelf());
         Collections.sort(
                 users,
                 (a, b) -> {
diff --git a/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java
index e2bc3b7af06f2b7896d19f1c73a7a34c4ece6a1f..ee62bdace59f57d36f79639ffe483d531459b7bc 100644
--- a/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java
@@ -62,6 +62,7 @@ public class MucUsersActivity extends XmppActivity implements XmppConnectionServ
     private void loadAndSubmitUsers() {
         if (mConversation != null) {
             allUsers = mConversation.getMucOptions().getUsers(true, mConversation.getMucOptions().getSelf().ranks(Affiliation.ADMIN));
+            allUsers.add(mConversation.getMucOptions().getSelf());
             submitFilteredList(mSearchEditText != null ? mSearchEditText.getText().toString() : null);
         }
     }