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

Add protocol code for sending and receiving invites. updates #215

Browse Source
This commit is contained in:
JC Brand 2014-08-30 16:00:52 +02:00
parent 0a7d05c0e5
commit bea7687bac
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
converse.js
View File

@ -2010,7 +2010,7 @@
} }
}, },
initTypeAheadInviteWidget: function () { initInviteWidget: function () {
var $el = this.$('input.invited-contact'); var $el = this.$('input.invited-contact');
$el.typeahead({ $el.typeahead({
minLength: 1, minLength: 1,
@ -2028,16 +2028,17 @@
suggestion: _.template('<p data-jid="{{jid}}">{{value}}</p>') suggestion: _.template('<p data-jid="{{jid}}">{{value}}</p>')
} }
}); });
$el.on('typeahead:selected', $.proxy(function (ev, suggestion, dname) {
$el.on('typeahead:selected', function (ev, suggestion, dname) { var result = confirm(
var result = confirm(__("Do you want to invite "+ suggestion.value +" to this chat room?")); __(___('Do you want to invite %1$s to the chat room "%2$s"?'), suggestion.value, this.model.get('id'))
);
if (result === true) { if (result === true) {
alert(suggestion.jid); var reason = prompt(__("You may optionally include a message, explaining the reason for the invitation."));
} else { // TODO: add support for including password for protected rooms.
$(this).val(''); converse.connection.muc.directInvite(this.model.get('id'), suggestion.jid, reason);
} }
}); $(ev.target).val('');
}, this));
return this; return this;
}, },
@ -2049,7 +2050,7 @@
'label_message': __('Message') 'label_message': __('Message')
}) })
); );
this.initTypeAheadInviteWidget().renderToolbar(); this.initInviteWidget().renderToolbar();
} }
return this; return this;
}, },
@ -2337,6 +2338,8 @@
} else if ($error.find('not-acceptable').length) { } else if ($error.find('not-acceptable').length) {
this.showDisconnectMessage(__("Your nickname doesn't conform to this room's policies")); this.showDisconnectMessage(__("Your nickname doesn't conform to this room's policies"));
} else if ($error.find('conflict').length) { } else if ($error.find('conflict').length) {
// TODO: give user the option of choosing a different
// nickname
this.showDisconnectMessage(__("Your nickname is already taken")); this.showDisconnectMessage(__("Your nickname is already taken"));
} else if ($error.find('item-not-found').length) { } else if ($error.find('item-not-found').length) {
this.showDisconnectMessage(__("This room does not (yet) exist")); this.showDisconnectMessage(__("This room does not (yet) exist"));
@ -2469,6 +2472,12 @@
this.onMessage(message); this.onMessage(message);
return true; return true;
}, this), null, 'message', 'chat'); }, this), null, 'message', 'chat');
converse.connection.addHandler(
$.proxy(function (message) {
this.onInvite(message);
return true;
}, this), 'jabber:x:conference', 'message');
}, },
onConnected: function () { onConnected: function () {
@ -2522,20 +2531,46 @@
); );
}, },
onInvite: function (message) {
var $message = $(message),
$x = $message.children('x[xmlns="jabber:x:conference"]'),
from = Strophe.getBareJidFromJid($message.attr('from')),
room_jid = $x.attr('jid'),
contact = converse.roster.get(from),
result = confirm(
__(___("%1$s has invited you to join a chat room: %2$s"), contact.get('fullname'), room_jid)
);
if (result === true) {
// TODO: Give user option to choose nickname?
var chatroom = converse.chatboxviews.showChat({
'id': room_jid,
'jid': room_jid,
'name': Strophe.unescapeNode(Strophe.getNodeFromJid(room_jid)),
'nick': Strophe.unescapeNode(Strophe.getNodeFromJid(converse.connection.jid)),
'chatroom': true,
'box_id' : b64_sha1(room_jid)
});
if (!chatroom.get('connected')) {
converse.chatboxviews.get(jid).connect(null);
}
}
},
onMessage: function (message) { onMessage: function (message) {
var buddy_jid, $message = $(message), var $message = $(message);
var buddy_jid, $forwarded, $received,
message_from = $message.attr('from'); message_from = $message.attr('from');
if (message_from === converse.connection.jid) { if (message_from === converse.connection.jid) {
// FIXME: Forwarded messages should be sent to specific resources, // FIXME: Forwarded messages should be sent to specific resources,
// not broadcasted // not broadcasted
return true; return true;
} }
var $forwarded = $message.children('forwarded'); $forwarded = $message.children('forwarded');
var $received = $message.children('received'); $received = $message.children('received[xmlns="urn:xmpp:carbons:2"]');
if ($forwarded.length) { if ($forwarded.length) {
$message = $forwarded.children('message'); $message = $forwarded.children('message');
} else if ($received.length && $received.attr('xmlns') === 'urn:xmpp:carbons:2') { } else if ($received.length) {
$message = $message.children('received').children('forwarded').children('message'); $message = $received.children('forwarded').children('message');
message_from = $message.attr('from'); message_from = $message.attr('from');
} }
var from = Strophe.getBareJidFromJid(message_from), var from = Strophe.getBareJidFromJid(message_from),