X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/65fb54a3b32ff688adfa7c9e45ee1105e7ab658e..5419ea4ca0d267481834102fe51f8ca0c706486b:/webclient/rc.html diff --git a/webclient/rc.html b/webclient/rc.html index 5d09dba..8094f41 100644 --- a/webclient/rc.html +++ b/webclient/rc.html @@ -79,9 +79,14 @@ <script type="text/javascript"><!--//--><![CDATA[//><!-- var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com']; - var session = Math.random(); - var since = {}; - var seen = {}; + var session = Math.random(); // For outgoing message IDs + var since = {}; // server -> time: For fetch?since= + var seen = {}; // seen_key -> message + // Messages have these fields: + // Time: The server timestamp of the first copy to arrive + // ID: Some unique string for deduping + // Text: The text of the message + // UI: The DOM node for this message in the UI function rcnick() { var nick = localStorage.getItem("nick"); @@ -114,13 +119,25 @@ } } + function rcformattime(t) { + var d = t.getDay(); + d = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][d]; + var h = t.getHours(); + var m = t.getMinutes(); + var s = t.getSeconds(); + function pad(x) { + return (x < 10 ? "0" : "") + x; + } + return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s); + } + function rcaddmessagetohistory(message) { - var d = document.createElement("div"); - d.appendChild(document.createTextNode(message)); + message.UI = document.createElement("div"); + var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text; + message.UI.appendChild(document.createTextNode(text)); var h = document.getElementById("history"); - h.appendChild(d); + h.appendChild(message.UI); window.scrollTo(0, document.body.scrollHeight); - return d; } function make_seen_key(id, text) { @@ -129,10 +146,12 @@ function rcreceivemessages(server, messages) { for (var i in messages) { - var seen_key = make_seen_key(messages[i]['ID'], messages[i]['Text']); + var m = messages[i]; + m.Time = new Date(m.Time); + var seen_key = make_seen_key(m.ID, m.Text); if (!(seen_key in seen)) { - seen[seen_key] = true; - rcaddmessagetohistory(messages[i]['Text']); + seen[seen_key] = m; + rcaddmessagetohistory(m); for (var i in servers) { rcchangeserverstatus(servers[i], "sad"); } @@ -151,11 +170,11 @@ if (rtxt != null) { var messages = JSON.parse(rtxt); if (messages != null) { - rcreceivemessages(server, messages); delay = 40; if (messages.length >= 1 && "Time" in messages[messages.length-1]) { - since[server] = messages[messages.length-1]["Time"]; + since[server] = messages[messages.length-1].Time; } + rcreceivemessages(server, messages); } } } @@ -179,14 +198,11 @@ status_indicator.setAttribute("class", "sad"); document.getElementById("status").appendChild(status_indicator); } - if (rcnick() == 'anonymous') { - rcaddmessagetohistory("-!- Set your nick with /nick"); - } } function rcsend(d, message) { var id = new Date().getTime() + "-" + session + "-" + Math.random(); - seen[make_seen_key(id, message)] = true; + seen[make_seen_key(id, message)] = message; var path = "/speak" + "?id=" + encodeURIComponent(id) + "&text=" + encodeURIComponent(message); @@ -198,41 +214,29 @@ } } + function rcinput(input) { + var message; + var re = /^\/([a-z]+) (.*)/ + var match = re.exec(input); + if (match && match[1] == 'me') { + message = "* " + rcnick() + " " + match[2]; + } else if (match && match[1] == 'nick') { + message = "*** " + rcnick() + " is now known as " + match[2]; + rcsetnick(match[2]); + } else { + message = "<" + rcnick() + "> " + input; + } + + var m = {'Text': message}; + rcaddmessagetohistory(m); + rcsend(m.UI, m); + } + function rckeydown(event) { if (event.keyCode == 13) { - var input = document.input.say.value; + rcinput(document.input.say.value); document.input.say.value = ""; - // Check nick change - var message; - var re = /^\/nick (.*)/; - var match = re.exec(input); - if (match) { - message = "*** " + rcnick() + " is now known as " + match[1]; - rcsetnick(match[1]); - } else { - message = "<" + rcnick() + "> " + input; - } - - // /me support - var message; - var re = /^\/me (.*)/; - var match = re.exec(input); - var inputme = input.substring(4); - if (match) { - message = "* " + rcnick() + " " + inputme; - } else { - message = "<" + rcnick() + "> " + input; - } - - // Say the message - var d = rcaddmessagetohistory(message); - rcsend(d, message); - - // Remind people to set their nick - if (rcnick() == 'anonymous') { - rcaddmessagetohistory("-!- Set your nick with /nick"); - } } } //--><!]]></script>