branch: externals/ement
commit 30bd78b2f4ef054b768f8de91d306752865d85a3
Author: Adam Porter <a...@alphapapa.net>
Commit: Adam Porter <a...@alphapapa.net>
Fix: (ement-directory-define-column "Name") Direct rooms
---
README.org | 4 +++-
ement-directory.el | 12 +++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/README.org b/README.org
index da7bab9fff..3a9368c874 100644
--- a/README.org
+++ b/README.org
@@ -294,7 +294,9 @@ Ement.el doesn't support encrypted rooms natively, but it
can be used transparen
** 0.13-pre
-Nothing new yet.
+*Fixes*
+
++ Name for direct rooms in directory buffers.
** 0.12
diff --git a/ement-directory.el b/ement-directory.el
index 2e189aa5bd..d5802179b8 100644
--- a/ement-directory.el
+++ b/ement-directory.el
@@ -116,11 +116,17 @@
" ")))
(ement-directory-define-column "Name" (:max-width 25)
- (pcase-let* (((map name ('room_type type)) item)
+ (pcase-let* (((map name ('room_id id) ('room_type type)) item)
+ ((map session) ement-directory-etc)
+ (room)
(face (pcase type
("m.space" 'ement-room-list-space)
- (_ 'ement-room-list-name))))
- (propertize (or name "[unnamed]")
+ (_ (if (and (setf room (cl-find id (ement-session-rooms
session)
+ :key #'ement-room-id
:test #'equal))
+ (ement--room-direct-p room session))
+ 'ement-room-list-direct
+ 'ement-room-list-name)))))
+ (propertize (or name (ement--room-display-name room))
'face face)))
(ement-directory-define-column "Alias" (:max-width 25)
