Chapril/xmpp.chapril.org-conversejs
Chapril
/
xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Don't prompt for reason if auto_join_on_invite

This commit is contained in:
Christoph Scholz 2019-03-18 18:53:38 +01:00 committed by JC Brand
parent ce539ac685
commit 0957b7086f
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -21,6 +21,7 @@
- #1457: Wrong tooltip shown for "unbookmark" icon
- #1479: Allow file upload by drag & drop also in MUCs
- #1487: New config option [muc_respect_autojoin](https://conversejs.org/docs/html/configuration.html#muc-respect-autojoin)
- #1501: Don't prompt for a reason if [auto_join_on_invite](https://conversejs.org/docs/html/configuration.html#auto-join-on-invite) is `true`

6
dist/converse.js vendored
View File

@ -55708,7 +55708,11 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins
},
promptForInvite(suggestion) {
const reason = prompt(__('You are about to invite %1$s to the groupchat "%2$s". ' + 'You may optionally include a message, explaining the reason for the invitation.', suggestion.text.label, this.model.get('id')));
let reason = '';
if (!_converse.auto_join_on_invite) {
reason = prompt(__('You are about to invite %1$s to the groupchat "%2$s". ' + 'You may optionally include a message, explaining the reason for the invitation.', suggestion.text.label, this.model.get('id')));
}
if (reason !== null) {
this.chatroomview.model.directInvite(suggestion.text.value, reason);

1
docs/source/configuration.rst
View File

@ -363,6 +363,7 @@ auto_join_on_invite
* Default: ``false``
If true, the user will automatically join a chatroom on invite without any confirm.
Also inviting users won't be prompted for a reason.
auto_join_private_chats

13
src/converse-muc-views.js
View File

@ -1948,11 +1948,14 @@ converse.plugins.add('converse-muc-views', {
promptForInvite (suggestion) {
const reason = prompt(
__('You are about to invite %1$s to the groupchat "%2$s". '+
'You may optionally include a message, explaining the reason for the invitation.',
suggestion.text.label, this.model.get('id'))
);
let reason = '';
if (!_converse.auto_join_on_invite) {
reason = prompt(
__('You are about to invite %1$s to the groupchat "%2$s". '+
'You may optionally include a message, explaining the reason for the invitation.',
suggestion.text.label, this.model.get('id'))
);
}
if (reason !== null) {
this.chatroomview.model.directInvite(suggestion.text.value, reason);
}