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
246edf8a
Commit
246edf8a
authored
Jan 23, 2017
by
Lauri Niskanen
Committed by
JC Brand
Feb 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow chatting with users not in roster
Resolves #760.
parent
4093064e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
13 deletions
+21
-13
src/converse-api.js
src/converse-api.js
+3
-3
src/converse-core.js
src/converse-core.js
+18
-10
No files found.
src/converse-api.js
View file @
246edf8a
...
@@ -106,20 +106,20 @@
...
@@ -106,20 +106,20 @@
}
}
},
},
'
chats
'
:
{
'
chats
'
:
{
'
open
'
:
function
(
jids
)
{
'
open
'
:
function
(
jids
,
attrs
)
{
var
chatbox
;
var
chatbox
;
if
(
typeof
jids
===
"
undefined
"
)
{
if
(
typeof
jids
===
"
undefined
"
)
{
converse
.
log
(
"
chats.open: You need to provide at least one JID
"
,
"
error
"
);
converse
.
log
(
"
chats.open: You need to provide at least one JID
"
,
"
error
"
);
return
null
;
return
null
;
}
else
if
(
typeof
jids
===
"
string
"
)
{
}
else
if
(
typeof
jids
===
"
string
"
)
{
chatbox
=
converse
.
wrappedChatBox
(
chatbox
=
converse
.
wrappedChatBox
(
converse
.
chatboxes
.
getChatBox
(
jids
,
true
).
trigger
(
'
show
'
)
converse
.
chatboxes
.
getChatBox
(
jids
,
true
,
attrs
).
trigger
(
'
show
'
)
);
);
return
chatbox
;
return
chatbox
;
}
}
return
_
.
map
(
jids
,
function
(
jid
)
{
return
_
.
map
(
jids
,
function
(
jid
)
{
chatbox
=
converse
.
wrappedChatBox
(
chatbox
=
converse
.
wrappedChatBox
(
converse
.
chatboxes
.
getChatBox
(
jid
,
true
).
trigger
(
'
show
'
)
converse
.
chatboxes
.
getChatBox
(
jid
,
true
,
attrs
).
trigger
(
'
show
'
)
);
);
return
chatbox
;
return
chatbox
;
});
});
...
...
src/converse-core.js
View file @
246edf8a
...
@@ -112,6 +112,9 @@
...
@@ -112,6 +112,9 @@
9
:
'
REDIRECT
'
9
:
'
REDIRECT
'
};
};
var
DEFAULT_IMAGE_TYPE
=
'
image/png
'
;
var
DEFAULT_IMAGE
=
"
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
"
;
converse
.
log
=
function
(
txt
,
level
)
{
converse
.
log
=
function
(
txt
,
level
)
{
var
logger
;
var
logger
;
if
(
typeof
console
===
"
undefined
"
||
typeof
console
.
log
===
"
undefined
"
)
{
if
(
typeof
console
===
"
undefined
"
||
typeof
console
.
log
===
"
undefined
"
)
{
...
@@ -757,8 +760,8 @@
...
@@ -757,8 +760,8 @@
'
user_id
'
:
Strophe
.
getNodeFromJid
(
jid
),
'
user_id
'
:
Strophe
.
getNodeFromJid
(
jid
),
'
resources
'
:
resource
?
[
resource
]
:
[],
'
resources
'
:
resource
?
[
resource
]
:
[],
'
groups
'
:
[],
'
groups
'
:
[],
'
image_type
'
:
'
image/png
'
,
'
image_type
'
:
DEFAULT_IMAGE_TYPE
,
'
image
'
:
"
iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAIAAABt+uBvAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwHCy455JBsggAABkJJREFUeNrtnM1PE1sUwHvvTD8otWLHST/Gimi1CEgr6M6FEWuIBo2pujDVsNDEP8GN/4MbN7oxrlipG2OCgZgYlxAbkRYw1KqkIDRCSkM7nXvvW8x7vjyNeQ9m7p1p3z1LQk/v/Dhz7vkEXL161cHl9wI5Ag6IA+KAOCAOiAPigDggLhwQB2S+iNZ+PcYY/SWEEP2HAAAIoSAIoihCCP+ngDDGtVotGAz29/cfOXJEUZSOjg6n06lp2sbGRqlUWlhYyGazS0tLbrdbEASrzgksyeYJId3d3el0uqenRxRFAAAA4KdfIIRgjD9+/Pj8+fOpqSndslofEIQwHA6Pjo4mEon//qmFhYXHjx8vLi4ihBgDEnp7e9l8E0Jo165dQ0NDd+/eDYVC2/qsJElDQ0OEkKWlpa2tLZamxAhQo9EIBoOjo6MXL17csZLe3l5FUT59+lQul5l5JRaAVFWNRqN37tw5ceKEQVWRSOTw4cOFQuHbt2+iKLYCIISQLMu3b99OJpOmKAwEAgcPHszn8+vr6wzsiG6UQQhxuVyXLl0aGBgwUW0sFstkMl6v90fo1KyAMMYDAwPnzp0zXfPg4GAqlWo0Gk0MiBAiy/L58+edTqf5Aa4onj59OhaLYYybFRCEMBaL0fNxBw4cSCQStN0QRUBut3t4eJjq6U+dOiVJElVPRBFQIBDo6+ujCqirqyscDlONGykC2lYyYSR6pBoQQapHZwAoHo/TuARYAOrs7GQASFEUqn6aIiBJkhgA6ujooFpUo6iaTa7koFwnaoWadLNe81tbWwzoaJrWrICWl5cZAFpbW6OabVAEtLi4yABQsVjUNK0pAWWzWQaAcrlcswKanZ1VVZUqHYRQEwOq1Wpv3ryhCmh6erpcLjdrNl+v1ycnJ+l5UELI27dvv3//3qxxEADgy5cvExMT9Mznw4cPtFtAdAPFarU6Pj5eKpVM17yxsfHy5cvV1VXazXu62gVBKBQKT58+rdVqJqrFGL948eLdu3dU8/g/H4FBUaJYLAqC0NPTY9brMD4+PjY25mDSracOCABACJmZmXE6nUePHjWu8NWrV48ePSKEsGlAs7Agfd5nenq6Wq0mk0kjDzY2NvbkyRMIIbP2PLvhBUEQ8vl8NpuNx+M+n29bzhVjvLKycv/+/YmJCcazQuwA6YzW1tYmJyf1SY+2trZ/rRk1Go1SqfT69esHDx4UCgVmNaa/zZ/9ABUhRFXVYDB48uTJeDweiUQkSfL7/T9MA2NcqVTK5fLy8vL8/PzU1FSxWHS5XJaM4wGr9sUwxqqqer3eUCgkSZJuUBBCfTRvc3OzXC6vrKxUKhWn02nhCJ5lM4oQQo/HgxD6+vXr58+fHf8sDOp+HQDg8XgclorFU676dKLlo6yWRdItIBwQB8QBcUCtfosRQjRNQwhhjPUC4w46WXryBSHU1zgEQWBz99EFhDGu1+t+v//48ePxeFxRlD179ng8nh0Efgiher2+vr6ur3HMzMysrq7uTJVdACGEurq6Ll++nEgkPB7Pj9jPoDHqOxyqqubz+WfPnuVyuV9XPeyeagAAAoHArVu3BgcHab8CuVzu4cOHpVKJUnfA5GweY+xyuc6cOXPv3r1IJMLAR8iyPDw8XK/Xi8Wiqqqmm5KZgBBC7e3tN27cuHbtGuPVpf7+/lAoNDs7W61WzfVKpgHSSzw3b95MpVKW3MfRaDQSiczNzVUqFRMZmQOIEOL1eq9fv3727FlL1t50URRFluX5+flqtWpWEGAOIFEUU6nUlStXLKSjy759+xwOx9zcnKZpphzGHMzhcDiTydgk9r1w4YIp7RPTAAmCkMlk2FeLf/tIEKbTab/fbwtAhJBoNGrutpNx6e7uPnTokC1eMU3T0um0DZPMkZER6wERQnw+n/FFSxpy7Nix3bt3WwwIIcRgIWnHkkwmjecfRgGx7DtuV/r6+iwGhDHev3+/bQF1dnYaH6E2CkiWZdsC2rt3r8WAHA5HW1ubbQGZcjajgOwTH/4qNko1Wlg4IA6IA+KAOKBWBUQIsfNojyliKIoRRfH9+/dut9umf3wzpoUNNQ4BAJubmwz+ic+OxefzWWlBhJD29nbug7iT5sIBcUAcEAfEAXFAHBAHxOVn+QMrmWpuPZx12gAAAABJRU5ErkJggg==
"
,
'
image
'
:
DEFAULT_IMAGE
,
'
status
'
:
''
'
status
'
:
''
},
attributes
));
},
attributes
));
...
@@ -1496,19 +1499,24 @@
...
@@ -1496,19 +1499,24 @@
var
bare_jid
=
Strophe
.
getBareJidFromJid
(
jid
);
var
bare_jid
=
Strophe
.
getBareJidFromJid
(
jid
);
var
chatbox
=
this
.
get
(
bare_jid
);
var
chatbox
=
this
.
get
(
bare_jid
);
if
(
!
chatbox
&&
create
)
{
if
(
!
chatbox
&&
create
)
{
var
roster_info
;
var
roster_item
=
converse
.
roster
.
get
(
bare_jid
);
var
roster_item
=
converse
.
roster
.
get
(
bare_jid
);
if
(
roster_item
===
undefined
)
{
if
(
roster_item
!==
undefined
)
{
converse
.
log
(
'
Could not get roster item for JID
'
+
bare_jid
,
'
error
'
);
roster_info
=
{
return
;
'
fullname
'
:
_
.
isEmpty
(
roster_item
.
get
(
'
fullname
'
))?
jid
:
roster_item
.
get
(
'
fullname
'
),
'
image_type
'
:
roster_item
.
get
(
'
image_type
'
),
'
image
'
:
roster_item
.
get
(
'
image
'
),
'
url
'
:
roster_item
.
get
(
'
url
'
),
};
}
}
chatbox
=
this
.
create
(
_
.
extend
({
chatbox
=
this
.
create
(
_
.
extend
({
'
id
'
:
bare_jid
,
'
id
'
:
bare_jid
,
'
jid
'
:
bare_jid
,
'
jid
'
:
bare_jid
,
'
fullname
'
:
_
.
isEmpty
(
roster_item
.
get
(
'
fullname
'
))?
jid
:
roster_item
.
get
(
'
fullname
'
)
,
'
fullname
'
:
jid
,
'
image_type
'
:
roster_item
.
get
(
'
image_type
'
)
,
'
image_type
'
:
DEFAULT_IMAGE_TYPE
,
'
image
'
:
roster_item
.
get
(
'
image
'
)
,
'
image
'
:
DEFAULT_IMAGE
,
'
url
'
:
roster_item
.
get
(
'
url
'
)
'
url
'
:
''
,
},
attrs
||
{}));
},
roster_info
||
{},
attrs
||
{}));
}
}
return
chatbox
;
return
chatbox
;
}
}
...
...
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