Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
85463308
Commit
85463308
authored
Jun 10, 2016
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add config setting to disable MUC direct invites.
parent
6258cfa0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
13 deletions
+35
-13
docs/CHANGES.md
docs/CHANGES.md
+2
-0
docs/source/configuration.rst
docs/source/configuration.rst
+9
-0
src/converse-muc.js
src/converse-muc.js
+22
-13
src/templates/chatroom_sidebar.html
src/templates/chatroom_sidebar.html
+2
-0
No files found.
docs/CHANGES.md
View file @
85463308
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
## 1.0.3 (Unreleased)
## 1.0.3 (Unreleased)
-
Update the plugin architecture to allow plugins to have optional dependencies [jcbrand]
-
Bugfix. Login form doesn't render after logging out, when
`auto_reconnect = false`
[jcbrand]
-
Bugfix. Login form doesn't render after logging out, when
`auto_reconnect = false`
[jcbrand]
-
Also indicate new day for the first day's messages. [jcbrand]
-
Also indicate new day for the first day's messages. [jcbrand]
-
Chat bot messages don't appear when they have the same ids as their commands. [jcbrand]
-
Chat bot messages don't appear when they have the same ids as their commands. [jcbrand]
...
@@ -11,6 +12,7 @@
...
@@ -11,6 +12,7 @@
-
Don't use sound and desktop notifications for OTR messages (when setting up the session) [jcbrand]
-
Don't use sound and desktop notifications for OTR messages (when setting up the session) [jcbrand]
-
New config option
[
default_state
](
https://conversejs.org/docs/html/configuration.html#default_state
)
[
jcbrand
]
-
New config option
[
default_state
](
https://conversejs.org/docs/html/configuration.html#default_state
)
[
jcbrand
]
-
New API method
`converse.rooms.close()`
-
New API method
`converse.rooms.close()`
-
New configuration setting
[
allow_muc_invites
](
https://conversejs.org/docs/html/configuration.html#allow-muc-invites
)
[
jcbrand
]
-
#553 Add processing hints to OTR messages [jcbrand]
-
#553 Add processing hints to OTR messages [jcbrand]
-
#650 Don't ignore incoming messages with same JID as current user (might be MAM archived) [jcbrand]
-
#650 Don't ignore incoming messages with same JID as current user (might be MAM archived) [jcbrand]
...
...
docs/source/configuration.rst
View file @
85463308
...
@@ -141,6 +141,15 @@ allow_muc
...
@@ -141,6 +141,15 @@ allow_muc
Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove
Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove
the ``Chatrooms`` tab from the control box.
the ``Chatrooms`` tab from the control box.
allow_muc_invitations
---------------------
* Default: ``true``
Allows users to be invited to join MUC chat rooms. An "Invite" widget will
appear in the sidebar of the chat room where you can type in the JID of a user
to invite into the chat room.
allow_otr
allow_otr
---------
---------
...
...
src/converse-muc.js
View file @
85463308
...
@@ -74,9 +74,11 @@
...
@@ -74,9 +74,11 @@
Features
:
{
Features
:
{
addClientFeatures
:
function
()
{
addClientFeatures
:
function
()
{
this
.
_super
.
addClientFeatures
.
apply
(
this
,
arguments
);
this
.
_super
.
addClientFeatures
.
apply
(
this
,
arguments
);
if
(
converse
.
allow_muc_invitations
)
{
converse
.
connection
.
disco
.
addFeature
(
'
jabber:x:conference
'
);
// Invites
converse
.
connection
.
disco
.
addFeature
(
'
jabber:x:conference
'
);
// Invites
if
(
this
.
allow_muc
)
{
}
this
.
connection
.
disco
.
addFeature
(
Strophe
.
NS
.
MUC
);
if
(
converse
.
allow_muc
)
{
converse
.
connection
.
disco
.
addFeature
(
Strophe
.
NS
.
MUC
);
}
}
}
}
},
},
...
@@ -155,6 +157,7 @@
...
@@ -155,6 +157,7 @@
var
converse
=
this
.
converse
;
var
converse
=
this
.
converse
;
// Configuration values for this plugin
// Configuration values for this plugin
this
.
updateSettings
({
this
.
updateSettings
({
allow_muc_invitations
:
true
,
allow_muc
:
true
,
allow_muc
:
true
,
auto_join_on_invite
:
false
,
// Auto-join chatroom on invite
auto_join_on_invite
:
false
,
// Auto-join chatroom on invite
auto_join_rooms
:
[],
// List of maps {'jid': 'room@example.org', 'nick': 'WizardKing69' },
auto_join_rooms
:
[],
// List of maps {'jid': 'room@example.org', 'nick': 'WizardKing69' },
...
@@ -966,11 +969,15 @@
...
@@ -966,11 +969,15 @@
render
:
function
()
{
render
:
function
()
{
this
.
$el
.
html
(
this
.
$el
.
html
(
converse
.
templates
.
chatroom_sidebar
({
converse
.
templates
.
chatroom_sidebar
({
'
allow_muc_invitations
'
:
converse
.
allow_muc_invitations
,
'
label_invitation
'
:
__
(
'
Invite
'
),
'
label_invitation
'
:
__
(
'
Invite
'
),
'
label_occupants
'
:
__
(
'
Occupants
'
)
'
label_occupants
'
:
__
(
'
Occupants
'
)
})
})
);
);
if
(
converse
.
allow_muc_invitations
)
{
return
this
.
initInviteWidget
();
return
this
.
initInviteWidget
();
}
return
this
;
},
},
onOccupantAdded
:
function
(
item
)
{
onOccupantAdded
:
function
(
item
)
{
...
@@ -1362,6 +1369,7 @@
...
@@ -1362,6 +1369,7 @@
};
};
converse
.
on
(
'
chatBoxesFetched
'
,
autoJoinRooms
);
converse
.
on
(
'
chatBoxesFetched
'
,
autoJoinRooms
);
if
(
converse
.
allow_muc_invitations
)
{
var
onConnected
=
function
()
{
var
onConnected
=
function
()
{
converse
.
connection
.
addHandler
(
converse
.
connection
.
addHandler
(
function
(
message
)
{
function
(
message
)
{
...
@@ -1371,6 +1379,7 @@
...
@@ -1371,6 +1379,7 @@
};
};
converse
.
on
(
'
connected
'
,
onConnected
);
converse
.
on
(
'
connected
'
,
onConnected
);
converse
.
on
(
'
reconnected
'
,
onConnected
);
converse
.
on
(
'
reconnected
'
,
onConnected
);
}
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
...
...
src/templates/chatroom_sidebar.html
View file @
85463308
<!-- <div class="occupants"> -->
<!-- <div class="occupants"> -->
{[ if (allow_muc_invitations) { ]}
<form
class=
"pure-form room-invite"
>
<form
class=
"pure-form room-invite"
>
<input
class=
"invited-contact"
placeholder=
"{{label_invitation}}"
type=
"text"
/>
<input
class=
"invited-contact"
placeholder=
"{{label_invitation}}"
type=
"text"
/>
</form>
</form>
{[ } ]}
<p
class=
"occupants-heading"
>
{{label_occupants}}:
</p>
<p
class=
"occupants-heading"
>
{{label_occupants}}:
</p>
<ul
class=
"occupant-list"
></ul>
<ul
class=
"occupant-list"
></ul>
<!-- </div> -->
<!-- </div> -->
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment