dani/vroom
1
0
Fork 0
mirror of https://github.com/dani/vroom.git synced 2024-06-01 21:11:41 +02:00
Code Issues Projects Releases Wiki Activity

Sync chat history between peers

Browse Source 
Not completly full proof, but seems to work reasonably well. If we do not have received chatHistory yet, ask for it each time a peer's video is added until we get it. Messages are escaped and formatting is preserved, including peer's color. One problem though: if you refresh the page, you will receive the history, but your own old message will appear on the left, as if it was another who send them. This is because there's no way to recognize it was you (previous session...)
Should fix #4
This commit is contained in:
Daniel Berteaud 2014-05-06 19:24:43 +02:00
parent 9dd070b02a
commit d62c0dc6ec
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
public/js/vroom.js
View File

@ -57,7 +57,9 @@ function initVroom(room) {
color: chooseColor()
}
};
var mainVid = false;
var mainVid = false,
chatHistory = {},
chatIndex = 0;
$('#name_local').css('background-color', peers.local.color);
@ -169,6 +171,10 @@ function initVroom(room) {
peer.sendDirectly('vroom','setDisplayName', $('#displayName').val());
}
peer.send('peer_color', {color: peers.local.color});
// We don't have chat history yet ? Lets ask to this new peer
if(!peers.local.hasHistory){
peer.sendDirectly('vroom', 'getHistory', '');
}
}, 3500);
}
$(div).attr('id', 'peer_' + id);
@ -245,12 +251,33 @@ function initVroom(room) {
}
// Add a new message to the chat history
function newChatMessage(from,message){
function newChatMessage(from,message,time,color){
// displayName has already been escaped
var cl = (from === 'local') ? 'chatMsgSelf':'chatMsgOthers';
var newmsg = $('<div class="chatMsg ' + cl + '">' + getTime() + ' ' + peers[from].displayName + '<p>' + linkify(stringEscape(message)) + '</p></div>').css('background-color', peers[from].color);
if (!time)
time = getTime();
if (peers[from] && peers[from].color){
var color = peers[from].color;
var displayName = peers[from].displayName;
}
// this peer might not be defined if we're importing chat history
// So just use the from as the displayName and the provided color
else{
var color = (color) ? color:chooseColor();
var displayName = from;
}
var newmsg = $('<div class="chatMsg ' + cl + '">' + time + ' ' + displayName + '<p>' + linkify(stringEscape(message)) + '</p></div>').css('background-color', color);
$('<div class="row chatMsgContainer"></div>').append(newmsg).appendTo('#chatHistory');
$('#chatHistory').scrollTop($('#chatHistory').prop('scrollHeight'));
// Record this message in the history object
// so we can send it to other peers asking for it
chatHistory[chatIndex] = {
time: time,
from: displayName,
color: color,
message: message
}
chatIndex++;
}
// Update the displayName of the peer
@ -293,6 +320,18 @@ function initVroom(room) {
else peers[peer.id].hasName = false;
updateDisplayName(peer.id);
}
// This peer asked for our chat history, lets send him
else if (data.type == 'getHistory'){
peer.sendDirectly('vroom', 'chatHistory', JSON.stringify(chatHistory));
}
// This peer is sending our chat history (and we don't have it yet)
else if (data.type == 'chatHistory' && !peers.local.hasHistory){
peers.local.hasHistory = true;
var history = JSON.parse(data.payload);
for (var i = 0; i < Object.keys(history).length; i++){
newChatMessage(history[i].from,history[i].message,history[i].time,history[i].color);
}
}
// One peer just sent a text chat message
else if (data.type == 'textChat') {
if ($('#chatDropdown').hasClass('collapsed')){