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
f60ee4d6
Commit
f60ee4d6
authored
Oct 13, 2016
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor rooms to have separate handlers for presence and message stanzas
parent
43ae702c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
35 deletions
+41
-35
spec/chatroom.js
spec/chatroom.js
+2
-10
src/converse-muc.js
src/converse-muc.js
+39
-25
No files found.
spec/chatroom.js
View file @
f60ee4d6
...
@@ -173,9 +173,8 @@
...
@@ -173,9 +173,8 @@
it
(
"
shows users currently present in the room
"
,
function
()
{
it
(
"
shows users currently present in the room
"
,
function
()
{
test_utils
.
openAndEnterChatRoom
(
'
lounge
'
,
'
localhost
'
,
'
dummy
'
);
test_utils
.
openAndEnterChatRoom
(
'
lounge
'
,
'
localhost
'
,
'
dummy
'
);
var
name
;
var
name
;
var
view
=
this
.
chatboxviews
.
get
(
'
lounge@localhost
'
),
var
view
=
converse
.
chatboxviews
.
get
(
'
lounge@localhost
'
),
$occupants
=
view
.
$
(
'
.occupant-list
'
);
$occupants
=
view
.
$
(
'
.occupant-list
'
);
spyOn
(
view
,
'
onChatRoomPresence
'
).
andCallThrough
();
var
presence
,
role
;
var
presence
,
role
;
for
(
var
i
=
0
;
i
<
mock
.
chatroom_names
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
mock
.
chatroom_names
.
length
;
i
++
)
{
name
=
mock
.
chatroom_names
[
i
];
name
=
mock
.
chatroom_names
[
i
];
...
@@ -191,9 +190,7 @@
...
@@ -191,9 +190,7 @@
role
:
role
role
:
role
}).
up
()
}).
up
()
.
c
(
'
status
'
).
attrs
({
code
:
'
110
'
}).
nodeTree
;
.
c
(
'
status
'
).
attrs
({
code
:
'
110
'
}).
nodeTree
;
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
expect
(
view
.
onChatRoomPresence
).
toHaveBeenCalled
();
expect
(
$occupants
.
find
(
'
li
'
).
length
).
toBe
(
2
+
i
);
expect
(
$occupants
.
find
(
'
li
'
).
length
).
toBe
(
2
+
i
);
expect
(
$
(
$occupants
.
find
(
'
li
'
)[
i
+
1
]).
text
()).
toBe
(
mock
.
chatroom_names
[
i
]);
expect
(
$
(
$occupants
.
find
(
'
li
'
)[
i
+
1
]).
text
()).
toBe
(
mock
.
chatroom_names
[
i
]);
expect
(
$
(
$occupants
.
find
(
'
li
'
)[
i
+
1
]).
hasClass
(
'
moderator
'
)).
toBe
(
role
===
"
moderator
"
);
expect
(
$
(
$occupants
.
find
(
'
li
'
)[
i
+
1
]).
hasClass
(
'
moderator
'
)).
toBe
(
role
===
"
moderator
"
);
...
@@ -216,10 +213,9 @@
...
@@ -216,10 +213,9 @@
role
:
'
none
'
role
:
'
none
'
}).
nodeTree
;
}).
nodeTree
;
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
expect
(
view
.
onChatRoomPresence
).
toHaveBeenCalled
();
expect
(
$occupants
.
find
(
'
li
'
).
length
).
toBe
(
i
+
1
);
expect
(
$occupants
.
find
(
'
li
'
).
length
).
toBe
(
i
+
1
);
}
}
}
.
bind
(
converse
)
);
});
it
(
"
indicates moderators by means of a special css class and tooltip
"
,
function
()
{
it
(
"
indicates moderators by means of a special css class and tooltip
"
,
function
()
{
test_utils
.
openAndEnterChatRoom
(
'
lounge
'
,
'
localhost
'
,
'
dummy
'
);
test_utils
.
openAndEnterChatRoom
(
'
lounge
'
,
'
localhost
'
,
'
dummy
'
);
...
@@ -524,7 +520,6 @@
...
@@ -524,7 +520,6 @@
test_utils
.
openAndEnterChatRoom
(
'
lounge
'
,
'
localhost
'
,
'
oldnick
'
);
test_utils
.
openAndEnterChatRoom
(
'
lounge
'
,
'
localhost
'
,
'
oldnick
'
);
var
view
=
converse
.
chatboxviews
.
get
(
'
lounge@localhost
'
);
var
view
=
converse
.
chatboxviews
.
get
(
'
lounge@localhost
'
);
var
$chat_content
=
view
.
$el
.
find
(
'
.chat-content
'
);
var
$chat_content
=
view
.
$el
.
find
(
'
.chat-content
'
);
spyOn
(
view
,
'
onChatRoomPresence
'
).
andCallThrough
();
// The user has just entered the room and receives their own
// The user has just entered the room and receives their own
// presence from the server.
// presence from the server.
...
@@ -544,7 +539,6 @@
...
@@ -544,7 +539,6 @@
.
c
(
'
status
'
).
attrs
({
code
:
'
210
'
}).
nodeTree
;
.
c
(
'
status
'
).
attrs
({
code
:
'
210
'
}).
nodeTree
;
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
expect
(
view
.
onChatRoomPresence
).
toHaveBeenCalled
();
var
$occupants
=
view
.
$
(
'
.occupant-list
'
);
var
$occupants
=
view
.
$
(
'
.occupant-list
'
);
expect
(
$occupants
.
children
().
length
).
toBe
(
1
);
expect
(
$occupants
.
children
().
length
).
toBe
(
1
);
expect
(
$occupants
.
children
().
first
(
0
).
text
()).
toBe
(
"
oldnick
"
);
expect
(
$occupants
.
children
().
first
(
0
).
text
()).
toBe
(
"
oldnick
"
);
...
@@ -569,7 +563,6 @@
...
@@ -569,7 +563,6 @@
.
c
(
'
status
'
).
attrs
({
code
:
'
110
'
}).
nodeTree
;
.
c
(
'
status
'
).
attrs
({
code
:
'
110
'
}).
nodeTree
;
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
expect
(
view
.
onChatRoomPresence
).
toHaveBeenCalled
();
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
length
).
toBe
(
2
);
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
length
).
toBe
(
2
);
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
last
().
html
()).
toBe
(
__
(
view
.
newNicknameMessages
[
"
303
"
],
"
newnick
"
));
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
last
().
html
()).
toBe
(
__
(
view
.
newNicknameMessages
[
"
303
"
],
"
newnick
"
));
...
@@ -590,7 +583,6 @@
...
@@ -590,7 +583,6 @@
.
c
(
'
status
'
).
attrs
({
code
:
'
110
'
}).
nodeTree
;
.
c
(
'
status
'
).
attrs
({
code
:
'
110
'
}).
nodeTree
;
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
expect
(
view
.
onChatRoomPresence
).
toHaveBeenCalled
();
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
length
).
toBe
(
2
);
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
length
).
toBe
(
2
);
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
last
().
html
()).
toBe
(
__
(
view
.
newNicknameMessages
[
"
303
"
],
"
newnick
"
));
expect
(
$chat_content
.
find
(
'
div.chat-info
'
).
last
().
html
()).
toBe
(
__
(
view
.
newNicknameMessages
[
"
303
"
],
"
newnick
"
));
$occupants
=
view
.
$
(
'
.occupant-list
'
);
$occupants
=
view
.
$
(
'
.occupant-list
'
);
...
...
src/converse-muc.js
View file @
f60ee4d6
...
@@ -306,7 +306,6 @@
...
@@ -306,7 +306,6 @@
},
},
close
:
function
(
ev
)
{
close
:
function
(
ev
)
{
converse
.
connection
.
deleteHandler
(
this
.
handler
);
this
.
leave
();
this
.
leave
();
converse
.
ChatBoxView
.
prototype
.
close
.
apply
(
this
,
arguments
);
converse
.
ChatBoxView
.
prototype
.
close
.
apply
(
this
,
arguments
);
},
},
...
@@ -586,27 +585,12 @@
...
@@ -586,27 +585,12 @@
}
}
},
},
handleMUCStanza
:
function
(
stanza
)
{
handleMUCMessage
:
function
(
stanza
)
{
var
xmlns
,
xquery
,
i
;
var
from
=
stanza
.
getAttribute
(
'
from
'
);
var
is_mam
=
$
(
stanza
).
find
(
'
[xmlns="
'
+
Strophe
.
NS
.
MAM
+
'
"]
'
).
length
>
0
;
var
is_mam
=
$
(
stanza
).
find
(
'
[xmlns="
'
+
Strophe
.
NS
.
MAM
+
'
"]
'
).
length
>
0
;
if
(
!
from
||
(
this
.
model
.
get
(
'
id
'
)
!==
from
.
split
(
"
/
"
)[
0
])
||
is_mam
)
{
if
(
is_mam
)
{
return
true
;
return
true
;
}
}
if
(
stanza
.
nodeName
===
"
message
"
)
{
_
.
compose
(
this
.
onChatRoomMessage
.
bind
(
this
),
this
.
showStatusMessages
.
bind
(
this
))(
stanza
);
_
.
compose
(
this
.
onChatRoomMessage
.
bind
(
this
),
this
.
showStatusMessages
.
bind
(
this
))(
stanza
);
}
else
if
(
stanza
.
nodeName
===
"
presence
"
)
{
xquery
=
stanza
.
getElementsByTagName
(
"
x
"
);
if
(
xquery
.
length
>
0
)
{
for
(
i
=
0
;
i
<
xquery
.
length
;
i
++
)
{
xmlns
=
xquery
[
i
].
getAttribute
(
"
xmlns
"
);
if
(
xmlns
&&
xmlns
.
match
(
Strophe
.
NS
.
MUC
))
{
this
.
onChatRoomPresence
(
stanza
);
break
;
}
}
}
}
return
true
;
return
true
;
},
},
...
@@ -622,7 +606,35 @@
...
@@ -622,7 +606,35 @@
return
node
+
"
@
"
+
domain
+
(
nick
!==
null
?
"
/
"
+
nick
:
""
);
return
node
+
"
@
"
+
domain
+
(
nick
!==
null
?
"
/
"
+
nick
:
""
);
},
},
registerHandlers
:
function
()
{
var
room_jid
=
this
.
model
.
get
(
'
jid
'
);
this
.
removeHandlers
();
this
.
presence_handler
=
converse
.
connection
.
addHandler
(
this
.
onChatRoomPresence
.
bind
(
this
),
Strophe
.
NS
.
MUC
,
'
presence
'
,
null
,
null
,
room_jid
,
{
'
ignoreNamespaceFragment
'
:
true
,
'
matchBareFromJid
'
:
true
}
);
this
.
message_handler
=
converse
.
connection
.
addHandler
(
this
.
handleMUCMessage
.
bind
(
this
),
null
,
'
message
'
,
null
,
null
,
room_jid
,
{
'
matchBareFromJid
'
:
true
}
);
},
removeHandlers
:
function
()
{
if
(
this
.
message_handler
)
{
converse
.
connection
.
deleteHandler
(
this
.
message_handler
);
delete
this
.
message_handler
;
}
if
(
this
.
presence_handler
)
{
converse
.
connection
.
deleteHandler
(
this
.
presence_handler
);
delete
this
.
presence_handler
;
}
return
this
;
},
join
:
function
(
nick
,
password
)
{
join
:
function
(
nick
,
password
)
{
this
.
registerHandlers
();
var
stanza
=
$pres
({
var
stanza
=
$pres
({
'
from
'
:
converse
.
connection
.
jid
,
'
from
'
:
converse
.
connection
.
jid
,
'
to
'
:
this
.
getRoomJIDAndNick
(
nick
)
'
to
'
:
this
.
getRoomJIDAndNick
(
nick
)
...
@@ -631,9 +643,6 @@
...
@@ -631,9 +643,6 @@
if
(
password
)
{
if
(
password
)
{
stanza
.
cnode
(
Strophe
.
xmlElement
(
"
password
"
,
[],
password
));
stanza
.
cnode
(
Strophe
.
xmlElement
(
"
password
"
,
[],
password
));
}
}
if
(
!
this
.
handler
)
{
this
.
handler
=
converse
.
connection
.
addHandler
(
this
.
handleMUCStanza
.
bind
(
this
));
}
this
.
model
.
set
(
'
connection_status
'
,
Strophe
.
Status
.
CONNECTING
);
this
.
model
.
set
(
'
connection_status
'
,
Strophe
.
Status
.
CONNECTING
);
return
converse
.
connection
.
send
(
stanza
);
return
converse
.
connection
.
send
(
stanza
);
},
},
...
@@ -649,11 +658,12 @@
...
@@ -649,11 +658,12 @@
if
(
exit_msg
!==
null
)
{
if
(
exit_msg
!==
null
)
{
presence
.
c
(
"
status
"
,
exit_msg
);
presence
.
c
(
"
status
"
,
exit_msg
);
}
}
var
that
=
this
;
converse
.
connection
.
addHandler
(
converse
.
connection
.
addHandler
(
function
()
{
function
()
{
th
is
.
model
.
set
(
'
connection_status
'
,
Strophe
.
Status
.
DISCONNECTED
);
th
at
.
model
.
set
(
'
connection_status
'
,
Strophe
.
Status
.
DISCONNECTED
);
}.
bind
(
this
),
that
.
removeHandlers
();
null
,
"
presence
"
,
null
,
presenceid
);
},
null
,
"
presence
"
,
null
,
presenceid
);
converse
.
connection
.
send
(
presence
);
converse
.
connection
.
send
(
presence
);
},
},
...
@@ -1092,6 +1102,7 @@
...
@@ -1092,6 +1102,7 @@
}
}
}
}
this
.
occupantsview
.
updateOccupantsOnPresence
(
pres
);
this
.
occupantsview
.
updateOccupantsOnPresence
(
pres
);
return
true
;
},
},
setChatRoomSubject
:
function
(
sender
,
subject
)
{
setChatRoomSubject
:
function
(
sender
,
subject
)
{
...
@@ -1687,6 +1698,9 @@
...
@@ -1687,6 +1698,9 @@
attrs
=
{};
attrs
=
{};
}
}
var
fetcher
=
converse
.
chatboxviews
.
showChat
.
bind
(
converse
.
chatboxviews
);
var
fetcher
=
converse
.
chatboxviews
.
showChat
.
bind
(
converse
.
chatboxviews
);
if
(
!
attrs
.
nick
)
{
attrs
.
nick
=
Strophe
.
getNodeFromJid
(
converse
.
bare_jid
);
}
if
(
typeof
jids
===
"
undefined
"
)
{
if
(
typeof
jids
===
"
undefined
"
)
{
throw
new
TypeError
(
'
rooms.open: You need to provide at least one JID
'
);
throw
new
TypeError
(
'
rooms.open: You need to provide at least one JID
'
);
}
else
if
(
typeof
jids
===
"
string
"
)
{
}
else
if
(
typeof
jids
===
"
string
"
)
{
...
...
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