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
c9b54028
Commit
c9b54028
authored
Nov 09, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use async/await
parent
267d91a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
750 additions
and
789 deletions
+750
-789
spec/chatroom.js
spec/chatroom.js
+728
-763
tests/utils.js
tests/utils.js
+22
-26
No files found.
spec/chatroom.js
View file @
c9b54028
This source diff could not be displayed because it is too large. You can
view the blob
instead.
tests/utils.js
View file @
c9b54028
...
@@ -15,34 +15,30 @@
...
@@ -15,34 +15,30 @@
}
}
utils
.
waitUntil
=
waitUntilPromise
.
default
;
utils
.
waitUntil
=
waitUntilPromise
.
default
;
utils
.
waitUntilDiscoConfirmed
=
function
(
_converse
,
entity_jid
,
identities
,
features
,
items
,
type
)
{
utils
.
waitUntilDiscoConfirmed
=
async
function
(
_converse
,
entity_jid
,
identities
,
features
,
items
,
type
=
'
info
'
)
{
if
(
_
.
isNil
(
type
))
{
const
iq
=
await
utils
.
waitUntil
(()
=>
{
type
=
'
info
'
;
}
return
utils
.
waitUntil
(()
=>
{
return
_
.
filter
(
return
_
.
filter
(
_converse
.
connection
.
IQ_stanzas
,
_converse
.
connection
.
IQ_stanzas
,
(
iq
)
=>
sizzle
(
`iq[to="
${
entity_jid
}
"] query[xmlns="http://jabber.org/protocol/disco#
${
type
}
"]`
,
iq
.
nodeTree
).
length
(
iq
)
=>
sizzle
(
`iq[to="
${
entity_jid
}
"] query[xmlns="http://jabber.org/protocol/disco#
${
type
}
"]`
,
iq
.
nodeTree
).
length
).
pop
();
).
pop
();
},
300
)
.
then
(
iq
=>
{
},
300
)
;
const
stanza
=
$iq
({
const
stanza
=
$iq
({
'
type
'
:
'
result
'
,
'
type
'
:
'
result
'
,
'
from
'
:
entity_jid
,
'
from
'
:
entity_jid
,
'
to
'
:
'
dummy@localhost/resource
'
,
'
to
'
:
'
dummy@localhost/resource
'
,
'
id
'
:
iq
.
nodeTree
.
getAttribute
(
'
id
'
),
'
id
'
:
iq
.
nodeTree
.
getAttribute
(
'
id
'
),
}).
c
(
'
query
'
,
{
'
xmlns
'
:
'
http://jabber.org/protocol/disco#
'
+
type
});
}).
c
(
'
query
'
,
{
'
xmlns
'
:
'
http://jabber.org/protocol/disco#
'
+
type
});
_
.
forEach
(
identities
,
function
(
identity
)
{
_
.
forEach
(
identities
,
function
(
identity
)
{
stanza
.
c
(
'
identity
'
,
{
'
category
'
:
identity
.
category
,
'
type
'
:
identity
.
type
}).
up
()
stanza
.
c
(
'
identity
'
,
{
'
category
'
:
identity
.
category
,
'
type
'
:
identity
.
type
}).
up
()
});
});
_
.
forEach
(
features
,
function
(
feature
)
{
_
.
forEach
(
features
,
function
(
feature
)
{
stanza
.
c
(
'
feature
'
,
{
'
var
'
:
feature
}).
up
();
stanza
.
c
(
'
feature
'
,
{
'
var
'
:
feature
}).
up
();
});
});
_
.
forEach
(
items
,
function
(
item
)
{
_
.
forEach
(
items
,
function
(
item
)
{
stanza
.
c
(
'
item
'
,
{
'
jid
'
:
item
}).
up
();
stanza
.
c
(
'
item
'
,
{
'
jid
'
:
item
}).
up
();
});
});
_converse
.
connection
.
_dataRecv
(
utils
.
createRequest
(
stanza
));
_converse
.
connection
.
_dataRecv
(
utils
.
createRequest
(
stanza
));
}).
catch
(
_
.
partial
(
console
.
error
,
_
));
}
}
utils
.
createRequest
=
function
(
iq
)
{
utils
.
createRequest
=
function
(
iq
)
{
...
@@ -123,7 +119,7 @@
...
@@ -123,7 +119,7 @@
utils
.
openAndEnterChatRoom
=
function
(
_converse
,
room
,
server
,
nick
)
{
utils
.
openAndEnterChatRoom
=
function
(
_converse
,
room
,
server
,
nick
)
{
let
view
;
let
view
;
const
room_jid
=
`
${
room
}
@
${
server
}
`
.
toLowerCase
();
const
room_jid
=
`
${
room
}
@
${
server
}
`
.
toLowerCase
();
const
stanzas
=
_converse
.
connection
.
IQ_stanzas
;
const
stanzas
=
_converse
.
connection
.
IQ_stanzas
;
return
_converse
.
api
.
rooms
.
open
(
room_jid
).
then
(()
=>
{
return
_converse
.
api
.
rooms
.
open
(
room_jid
).
then
(()
=>
{
view
=
_converse
.
chatboxviews
.
get
(
room_jid
);
view
=
_converse
.
chatboxviews
.
get
(
room_jid
);
...
@@ -175,7 +171,7 @@
...
@@ -175,7 +171,7 @@
'
type
'
:
'
result
'
,
'
type
'
:
'
result
'
,
'
id
'
:
IQ_id
,
'
id
'
:
IQ_id
,
'
from
'
:
view
.
model
.
get
(
'
jid
'
),
'
from
'
:
view
.
model
.
get
(
'
jid
'
),
'
to
'
:
_converse
.
connection
.
jid
'
to
'
:
_converse
.
connection
.
jid
}).
c
(
'
query
'
,
{
'
xmlns
'
:
'
http://jabber.org/protocol/disco#info
'
,
'
node
'
:
'
x-roomuser-item
'
})
}).
c
(
'
query
'
,
{
'
xmlns
'
:
'
http://jabber.org/protocol/disco#info
'
,
'
node
'
:
'
x-roomuser-item
'
})
.
c
(
'
identity
'
,
{
'
category
'
:
'
conference
'
,
'
name
'
:
nick
,
'
type
'
:
'
text
'
});
.
c
(
'
identity
'
,
{
'
category
'
:
'
conference
'
,
'
name
'
:
nick
,
'
type
'
:
'
text
'
});
_converse
.
connection
.
_dataRecv
(
utils
.
createRequest
(
stanza
));
_converse
.
connection
.
_dataRecv
(
utils
.
createRequest
(
stanza
));
...
@@ -256,7 +252,7 @@
...
@@ -256,7 +252,7 @@
converse
.
roster
.
create
({
converse
.
roster
.
create
({
'
ask
'
:
ask
,
'
ask
'
:
ask
,
'
fullname
'
:
names
[
i
],
'
fullname
'
:
names
[
i
],
'
jid
'
:
jid
,
'
jid
'
:
jid
,
'
requesting
'
:
requesting
,
'
requesting
'
:
requesting
,
'
subscription
'
:
subscription
'
subscription
'
:
subscription
});
});
...
...
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