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

Change: Use ement-room--handle-event

Browse source 
Don't call ement-room--insert-event directly anymore.
This commit is contained in:
Adam Porter 2021-08-10 01:16:43 -05:00
parent 001923c3b4
commit 6616880562
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ement-room.el
View file

@ -911,8 +911,7 @@ Interactively, send reaction to event at point."
(when buffer
;; Insert events into the room's buffer.
(with-current-buffer buffer
;; FIXME: Unify insert/process-events.
(ement-room--insert-events chunk 'retro)
;; FIXME: Use retro-loading in event handlers, or in --handle-events, anyway.
(ement-room--handle-events chunk)
(setf (ement-room-prev-batch room) end
ement-room-retro-loading nil))))
@ -943,16 +942,7 @@ the previously oldest event."
(when buffer-window
(select-window buffer-window))
(cl-loop for event being the elements of events
;; TODO: This should be done in a unified interface.
;; HACK: Only insert certain types of events.
;; FIXME: Remove this when the transition to defevent-based handlers is done.
when (pcase (ement-event-type event)
("m.reaction" nil)
("m.room.member"
;; Membership events now handled with defevent-based handler.
nil)
(_ t))
do (ement-room--insert-event event)
do (ement-room--handle-event event)
do (ement-progress-update)))
;; Since events can be received in any order, we have to check the whole buffer
;; for where to insert new timestamp headers. (Avoiding that would require
@ -1097,8 +1087,6 @@ data slot."
;; We don't use `ement-room--insert-events' to avoid extra
;; calls to `ement-room--insert-ts-headers'.
(ement-room--handle-events (ement-room-state room))
;; TODO: Move event insertion to defevent handlers.
(mapc #'ement-room--insert-event (ement-room-timeline room))
(ement-room--handle-events (ement-room-timeline room))
(ement-room--insert-ts-headers))
;; Return the buffer!

3
ement.el
View file

@ -437,9 +437,6 @@ To be called in `ement-sync-callback-hook'."
(ement-room--handle-events (ement-room-ephemeral ement-room))
(setf (ement-room-ephemeral ement-room) nil))
(when-let ((new-events (alist-get 'new-events (ement-room-local ement-room))))
(ement-room--insert-events new-events)
;; For now, we also call `--process-events' for ones that are defined with `ement-room-defevent'.
;; FIXME: Unify this.
;; HACK: Process these events in reverse order, so that later events (like reactions)
;; which refer to earlier events can find them. (Not sure if still necessary.)
(ement-room--handle-events (reverse new-events))