-
-
Notifications
You must be signed in to change notification settings - Fork 776
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improvements to rendering MUC MAM logs before joining
- Add config variable `muc_show_logs_before_join` - Restore nickname form for the original use-case (when not showing MAM logs before joining). - Render nickname form in the `.muc-bottom-panel` when showing MAM logs (instead of in a modal) - Show a message when there aren't any archived messages to show - Fix converse-mam so that chat logs are properly fetched before entering a MUC closes #1266
- Loading branch information
Showing
13 changed files
with
204 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1547,7 +1547,7 @@ | |
expect(presencebroadcast.length).toBe(1); | ||
presencebroadcast[0].value = ['moderator']; | ||
|
||
view.el.querySelector('input[type="submit"]').click(); | ||
view.el.querySelector('.chatroom-form input[type="submit"]').click(); | ||
|
||
const sent_stanza = sent_IQ.nodeTree; | ||
expect(sent_stanza.querySelector('field[var="muc#roomconfig_membersonly"] value').textContent.trim()).toBe('1'); | ||
|
@@ -2578,7 +2578,7 @@ | |
expect(el.textContent.trim()).toBe("Configuration for [email protected]"); | ||
sizzle('[name="muc#roomconfig_membersonly"]', chatroomview.el).pop().click(); | ||
sizzle('[name="muc#roomconfig_roomname"]', chatroomview.el).pop().value = "New room name" | ||
chatroomview.el.querySelector('.btn-primary').click(); | ||
chatroomview.el.querySelector('.chatroom-form input[type="submit"]').click(); | ||
|
||
iq = await u.waitUntil(() => _.filter(IQs, iq => u.matchesSelector(iq, `iq[to="${jid}"][type="set"]`)).pop()); | ||
const result = $iq({ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -979,7 +979,7 @@ | |
await u.waitUntil(() => view.el.querySelector('.chat-msg__text').textContent === | ||
'hello z3r0 gibson sw0rdf1sh, how are you?', 500); | ||
|
||
const correction = _converse.connection.send.calls.all()[2].args[0]; | ||
const correction = _converse.connection.send.calls.all()[3].args[0]; | ||
expect(correction.toLocaleString()) | ||
.toBe(`<message from="[email protected]/orchard" id="${correction.nodeTree.getAttribute("id")}" `+ | ||
`to="[email protected]" type="groupchat" `+ | ||
|
Oops, something went wrong.