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

Fix: (ement-room--add-reply) Only use join events

Browse source 
Thanks to @treed for reporting and testing.
This commit is contained in:
Adam Porter 2021-07-27 20:52:42 -05:00
parent 0aa366a85c
commit 04774c617a
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ement-room.el
View file

@ -676,21 +676,22 @@ data slot."
(if-let ((cached-name (gethash room (ement-user-room-display-names user))))
cached-name
;; Put timeline events before state events, because IIUC they should be more recent.
(if-let* ((displayname (or (cl-loop for event in (ement-room-timeline room)
when (and (equal "m.room.member" (ement-event-type event))
(equal user (ement-event-sender event))
(alist-get 'displayname (ement-event-content event)))
return (alist-get 'displayname (ement-event-content event)))
(cl-loop for event in (ement-room-state room)
when (and (equal "m.room.member" (ement-event-type event))
(equal user (ement-event-sender event))
(alist-get 'displayname (ement-event-content event)))
return (alist-get 'displayname (ement-event-content event)))))
(calculated-name displayname))
(puthash room calculated-name (ement-user-room-display-names user))
;; No membership state event: use pre-calculated displayname or ID.
(or (ement-user-displayname user)
(ement-user-id user)))))
(cl-labels ((join-displayname-event-p
(event) (and (equal "m.room.member" (ement-event-type event))
(equal "join" (alist-get 'membership (ement-event-content event)))
(equal user (ement-event-sender event))
(alist-get 'displayname (ement-event-content event)))))
(if-let* ((displayname (or (cl-loop for event in (ement-room-timeline room)
when (join-displayname-event-p event)
return (alist-get 'displayname (ement-event-content event)))
(cl-loop for event in (ement-room-state room)
when (join-displayname-event-p event)
return (alist-get 'displayname (ement-event-content event)))))
(calculated-name displayname))
(puthash room calculated-name (ement-user-room-display-names user))
;; No membership state event: use pre-calculated displayname or ID.
(or (ement-user-displayname user)
(ement-user-id user))))))
(defun ement-room--event-data (id)
"Return event struct for event ID in current buffer."