From dae84028c2537b4f4c4bb8db0b29cbbdc873eaac Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 15 Feb 2023 14:43:56 +0100
Subject: [PATCH] Fixes #1851: Sort open groupchats alphabetically

---
 CHANGES.md                                   | 1 +
 src/plugins/roomslist/templates/roomslist.js | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d0b35818f..3188147df 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## 10.1.1 (Unreleased)
 
+- #1851: Sort open groupchats alphabetically
 - #2240: Ad-Hoc command result form not shown
 - #3128: Second bookmarked room shows info of the first one
 - Bugfix. Uyghur translations weren't loading
diff --git a/src/plugins/roomslist/templates/roomslist.js b/src/plugins/roomslist/templates/roomslist.js
index ae6baca12..2834b21a9 100644
--- a/src/plugins/roomslist/templates/roomslist.js
+++ b/src/plugins/roomslist/templates/roomslist.js
@@ -68,14 +68,16 @@ function tplRoomItem (el, room) {
 }
 
 export default (el) => {
-    const rooms = _converse.chatboxes.filter(m => m.get('type') === _converse.CHATROOMS_TYPE);
+    const { chatboxes, CHATROOMS_TYPE, CLOSED } = _converse;
+    const rooms = chatboxes.filter(m => m.get('type') === CHATROOMS_TYPE);
+    rooms.sort((a, b) => (a.getDisplayName().toLowerCase() <= b.getDisplayName().toLowerCase() ? -1 : 1));
 
     const i18n_desc_rooms = __('Click to toggle the list of open groupchats');
     const i18n_heading_chatrooms = __('Groupchats');
     const i18n_title_list_rooms = __('Query for groupchats');
     const i18n_title_new_room = __('Add a new groupchat');
     const i18n_show_bookmarks = __('Show bookmarked groupchats');
-    const is_closed = el.model.get('toggle_state') === _converse.CLOSED;
+    const is_closed = el.model.get('toggle_state') === CLOSED;
     return html`
         <div class="d-flex controlbox-padded">
             <span class="w-100 controlbox-heading controlbox-heading--groupchats">