Tidy: (ement-room--format-member-event)

This commit is contained in:
Adam Porter 2021-08-24 00:37:34 -05:00
parent bac2a306fd
commit 4c609c2ef3

View file

@ -2680,103 +2680,89 @@ a copy of the local keymap, and sets `header-line-format'."
('displayname prev-displayname)))))) ('displayname prev-displayname))))))
event) event)
(sender-name (ement-room--user-display-name sender ement-room))) (sender-name (ement-room--user-display-name sender ement-room)))
(pcase-exhaustive new-membership (cl-macrolet ((sender-name-id-string
("invite" () `(propertize sender-name
(pcase prev-membership 'help-echo (ement-user-id sender)))
((or "leave" 'nil) (new-displayname-state-key-string
(format "%s invited %s" () `(propertize (or new-displayname state-key)
(propertize sender-name 'help-echo state-key))
'help-echo (ement-user-id sender)) (sender-name-state-key-string
(propertize (or new-displayname state-key) () `(propertize sender-name
'help-echo state-key))) 'help-echo state-key))
(_ (format "%s sent unrecognized invite event for %s" (prev-displayname-id-string
(propertize sender-name () `(propertize (or prev-displayname sender-name)
'help-echo (ement-user-id sender)) 'help-echo (ement-user-id sender))))
(propertize (or new-displayname state-key) (pcase-exhaustive new-membership
'help-echo state-key))))) ("invite"
("join" (pcase prev-membership
(pcase prev-membership ((or "leave" 'nil)
("invite" (format "%s invited %s"
(format "%s accepted invitation to join" (sender-name-id-string)
(propertize sender-name (new-displayname-state-key-string)))
'help-echo state-key))) (_ (format "%s sent unrecognized invite event for %s"
("join" (sender-name-id-string)
(format "%s changed name/avatar" (new-displayname-state-key-string)))))
(propertize sender-name ("join"
'help-echo state-key))) (pcase prev-membership
("leave" ("invite"
(format "%s rejoined" (format "%s accepted invitation to join"
(propertize sender-name (sender-name-state-key-string)))
'help-echo state-key))) ("join"
('nil (format "%s changed name/avatar"
(format "%s joined" (sender-name-state-key-string)))
(propertize sender-name ("leave"
'help-echo state-key))) (format "%s rejoined"
(_ (format "%s sent unrecognized join event for %s" (sender-name-state-key-string)))
(propertize sender-name ('nil
'help-echo (ement-user-id sender)) (format "%s joined"
(propertize (or new-displayname state-key) (sender-name-state-key-string)))
'help-echo state-key))))) (_ (format "%s sent unrecognized join event for %s"
("leave" (sender-name-id-string)
(pcase prev-membership (new-displayname-state-key-string)))))
("invite" ("leave"
(pcase state-key (pcase prev-membership
((pred (equal (ement-user-id sender))) ("invite"
(format "%s rejected invitation" (pcase state-key
(propertize sender-name ((pred (equal (ement-user-id sender)))
'help-echo (ement-user-id sender)))) (format "%s rejected invitation"
(_ (format "%s revoked %s's invitation" (sender-name-id-string)))
(propertize sender-name (_ (format "%s revoked %s's invitation"
'help-echo (ement-user-id sender)) (sender-name-id-string)
(propertize (or new-displayname state-key) (new-displayname-state-key-string)))))
'help-echo state-key))))) ("join"
("join" (pcase state-key
(pcase state-key ((pred (equal (ement-user-id sender)))
((pred (equal (ement-user-id sender))) (format "%s left%s"
(format "%s left%s" (prev-displayname-id-string)
(propertize (or prev-displayname sender-name)
'help-echo (ement-user-id sender))
(if reason
(format " (%s)" reason)
"")))
(_ (format "%s kicked %s%s"
(propertize sender-name
'help-echo (ement-user-id sender))
(propertize (or new-displayname state-key)
'help-echo state-key)
(if reason (if reason
(format " (%s)" reason) (format " (%s)" reason)
""))))) "")))
("ban" (_ (format "%s kicked %s%s"
(format "%s unbanned %s" (sender-name-id-string)
(propertize sender-name (new-displayname-state-key-string)
'help-echo (ement-user-id sender)) (if reason
(propertize (or new-displayname state-key) (format " (%s)" reason)
'help-echo state-key))) "")))))
(_ (format "%s sent unrecognized leave event for %s" ("ban"
(propertize sender-name (format "%s unbanned %s"
'help-echo (ement-user-id sender)) (sender-name-id-string)
(propertize (or new-displayname state-key) (new-displayname-state-key-string)))
'help-echo state-key))))) (_ (format "%s sent unrecognized leave event for %s"
("ban" (sender-name-id-string)
(pcase prev-membership (new-displayname-state-key-string)))))
((or "invite" "leave") ("ban"
(format "%s banned %s" (pcase prev-membership
(propertize sender-name ((or "invite" "leave")
'help-echo (ement-user-id sender)) (format "%s banned %s"
(propertize (or new-displayname state-key) (sender-name-id-string)
'help-echo state-key))) (new-displayname-state-key-string)))
("join" ("join"
(format "%s kicked and banned %s" (format "%s kicked and banned %s"
(propertize sender-name (sender-name-id-string)
'help-echo (ement-user-id sender)) (new-displayname-state-key-string)))
(propertize (or new-displayname state-key) (_ (format "%s sent unrecognized ban event for %s"
'help-echo state-key))) (sender-name-id-string)
(_ (format "%s sent unrecognized ban event for %s" (new-displayname-state-key-string)))))))))
(propertize sender-name
'help-echo (ement-user-id sender))
(propertize (or new-displayname state-key)
'help-echo state-key))))))))
;;;;; Images ;;;;; Images