hiro/ement.el
1
0
Fork 0
mirror of https://github.com/vale981/ement.el synced 2025-03-05 17:21:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: Key face, and fix help-echo

Browse source 
Remaining issue is that reactions still insert empty events in the
buffer.
This commit is contained in:
Adam Porter 2021-07-22 10:30:28 -05:00
parent 5f700ccc16
commit 4fdf0ddf37
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ement-room.el
View file

@ -193,7 +193,14 @@ See Info node `(elisp)Specified Space'."
(defface ement-room-reactions (defface ement-room-reactions
'((t (:inherit font-lock-comment-face :height 0.9))) '((t (:inherit font-lock-comment-face :height 0.9)))
"Reactions to messages.") "Reactions to messages (including the user count).")
(defface ement-room-reactions-key
'((t (:inherit ement-room-reactions :height 1.5)))
"Reactions to messages (the key, i.e. the emoji part).
Uses a separate face to allow the key to be shown at a different
size, because in some fonts, emojis are too small relative to
normal text.")
(defface ement-room-timestamp (defface ement-room-timestamp
'((t (:inherit font-lock-comment-face))) '((t (:inherit font-lock-comment-face)))
@ -821,20 +828,31 @@ seconds."
(propertize " " (propertize " "
'display ement-room-event-separator-display-property))) 'display ement-room-event-separator-display-property)))
(defun ement-room--format-reactions (event) (defun ement-room--format-reactions (event)
"Return formatted reactions to EVENT." "Return formatted reactions to EVENT."
;; TODO: Like other events, pop to a buffer showing the raw reaction events when a key is pressed.
(if-let ((reactions (map-elt (ement-event-local event) 'reactions))) (if-let ((reactions (map-elt (ement-event-local event) 'reactions)))
(cl-labels ((format-key-senders (cl-labels ((format-reaction
(ks) (pcase-let ((`(,key . ,senders) ks)) (ks) (pcase-let* ((`(,key . ,senders) ks)
(propertize (format "%s (%s)" key (length senders)) (key (propertize key 'face 'ement-room-reactions-key))
'help-echo (string-join senders ", "))))) (count (propertize (format "(%s)" (length senders))
'face 'ement-room-reactions)))
(propertize (concat key " " count)
'help-echo (lambda (_window buffer _pos)
(senders-names senders (buffer-local-value 'ement-room buffer))))))
(senders-names
(senders room) (cl-loop for sender in senders
collect (ement-room--user-display-name sender room)
into names
finally return (string-join names ", "))))
(cl-loop with keys-senders (cl-loop with keys-senders
for reaction in reactions for reaction in reactions
for key = (map-nested-elt (ement-event-content reaction) '(m.relates_to key)) for key = (map-nested-elt (ement-event-content reaction) '(m.relates_to key))
for sender-name = (ement-room--user-display-name (ement-event-sender reaction) ement-room) for sender = (ement-event-sender reaction)
do (push sender-name (alist-get key keys-senders nil nil #'string=)) do (push sender (alist-get key keys-senders nil nil #'string=))
finally return (propertize (concat "\n " (string-join (mapcar #'format-key-senders keys-senders) " ")) finally return (concat "\n " (string-join (mapcar #'format-reaction keys-senders) " "))))
'face 'ement-room-reactions)))
"")) ""))
(cl-defun ement-room--format-message (event &optional (format ement-room-message-format-spec)) (cl-defun ement-room--format-message (event &optional (format ement-room-message-format-spec))