Classify different kinds of messages

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index f3abaf3faadee799136099b6eaf9b685695db784..e23286e1fcd2acadd016ef198d264d6a5656d270 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -56,6 +56,13 @@
                padding: 0px 5px 55px 5px;
                vertical-align: bottom
        }
                padding: 0px 5px 55px 5px;
                vertical-align: bottom
        }

+       .servercount {
+               margin-right: 0.5em;
+               font-size: 70%;
+       }
+       .timestamp {
+               margin-right: 0.8em;
+       }

        img { width: 1px; height: 1px; }
        iframe { display: none }
        #status span { margin-right: 10px; }
        img { width: 1px; height: 1px; }
        iframe { display: none }
        #status span { margin-right: 10px; }


@@ -82,6 +89,7 @@
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
        var seen = {};     // seen_key -> message
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
        var seen = {};     // seen_key -> message

+       var history = [];  // List of messages sorted by Time

        // Messages have these fields:
        //   Time: The timestamp.  Median of ServerTimes
        //   ID: Some unique string for deduping
        // Messages have these fields:
        //   Time: The timestamp.  Median of ServerTimes
        //   ID: Some unique string for deduping


@@ -132,12 +140,64 @@
                return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
        }
 
                return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
        }
 

-       function rcaddmessagetohistory(message) {
+       function rcmakemessageUI(message) {

                message.UI = document.createElement("div");
                message.UI = document.createElement("div");

-               var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
-               message.UI.appendChild(document.createTextNode(text));
+
+               // Server count
+               var servercount = document.createElement("span");
+               servercount.setAttribute("class", "servercount");
+               servercount.appendChild(document.createTextNode(Object.keys(message.ServerTimes).length));
+               message.UI.appendChild(servercount);
+
+               // Timestamp
+               var timestamp_text = message.Time ? rcformattime(message.Time) : "";
+               var timestamp = document.createElement("span");
+               timestamp.setAttribute("class", "timestamp");
+               timestamp.appendChild(document.createTextNode(timestamp_text));
+               message.UI.appendChild(timestamp);
+
+               // Classify different message types
+               var text_span = document.createElement("span");
+               var type;
+               if (/^\*\*\* /.test(message.Text)) {
+                       type = "status";
+               } else if (/^\* /.test(message.Text)) {
+                       type = "me";
+               } else {
+                       type = "text";
+               }
+               if (Object.keys(message.ServerTimes).length == 0) {
+                       type += " self";
+               }
+               text_span.setAttribute("class", type);
+               text_span.appendChild(document.createTextNode(message.Text));
+               message.UI.appendChild(text_span);
+       }
+
+       function rcaddmessagetohistory(message) {
+               var message_i;
+               if (message.Time) {
+                       for (var i = history.length - 1; ; i--) {
+                               if (i < 0 || (history[i].Time && message.Time >= history[i].Time)) {
+                                       message_i = i+1;
+                                       history.splice(message_i, 0, message);
+                                       break;
+                               }
+                       }
+               } else {
+                       history.push(message);
+                       message_i = history.length-1;
+               }
+
+               if (!message.UI) {
+                       rcmakemessageUI(message);
+               }

                var h = document.getElementById("history");
                var h = document.getElementById("history");

-               h.appendChild(message.UI);
+               if (message_i + 1 < history.length) {
+                       h.insertBefore(message.UI, history[message_i + 1].UI);
+               } else {
+                       h.appendChild(message.UI);
+               }

                window.scrollTo(0, document.body.scrollHeight);
        }
 
                window.scrollTo(0, document.body.scrollHeight);
        }
 


@@ -152,13 +212,34 @@
                        times.push(message.ServerTimes[i]);
                }
                times.sort();
                        times.push(message.ServerTimes[i]);
                }
                times.sort();

-               var middle = times.length/2;

                if (times.length % 2) {
                if (times.length % 2) {

-                       message.Time = times[middle];
+                       message.Time = times[(times.length-1)/2];

                } else {
                } else {

+                       var middle = times.length/2;

                        var difference = times[middle].getTime() - times[middle-1].getTime();
                        message.Time = new Date(times[middle-1].getTime() + difference/2);
                }
                        var difference = times[middle].getTime() - times[middle-1].getTime();
                        message.Time = new Date(times[middle-1].getTime() + difference/2);
                }

+
+               // This may have broken history's in-sorted-order invariant
+               var hi = history.indexOf(message);
+               if ((history[hi-1] && history[hi-1].Time > message.Time) ||
+                   (history[hi+1] && history[hi+1].Time < message.Time)) {
+                       history.splice(hi,1);
+                       rcaddmessagetohistory(message);
+               }
+
+               // Update the UI
+               var spans = message.UI.getElementsByTagName("span");
+               for (var i in spans) {
+                       if (spans[i].getAttribute) {
+                               var type = spans[i].getAttribute("class");
+                               if (type == "servercount") {
+                                       spans[i].firstChild.data = Object.keys(message.ServerTimes).length;
+                               } else if (type == "timestamp") {
+                                       spans[i].firstChild.data = rcformattime(message.Time);
+                               }
+                       }
+               }

        }
 
        function rcreceivemessages(server, messages) {
        }
 
        function rcreceivemessages(server, messages) {


@@ -223,11 +304,11 @@
        }
 
        function rcsend(d, message) {
        }
 
        function rcsend(d, message) {

-               var id = new Date().getTime() + "-" + session + "-" + Math.random();
-               seen[make_seen_key(id, message)] = message;
+               message.ID = new Date().getTime() + "-" + session + "-" + Math.random();
+               seen[make_seen_key(message.ID, message.Text)] = message;

                var path = "/speak" +
                var path = "/speak" +

-                       "?id=" + encodeURIComponent(id) +
-                       "&text=" + encodeURIComponent(message);
+                       "?id=" + encodeURIComponent(message.ID) +
+                       "&text=" + encodeURIComponent(message.Text);

                for (var i in servers) {
                        var uri = rcserverbase(servers[i]) + path;
                        var img = document.createElement("img");
                for (var i in servers) {
                        var uri = rcserverbase(servers[i]) + path;
                        var img = document.createElement("img");


@@ -249,7 +330,7 @@
                        message = "<" + rcnick() + "> " + input;
                }
 
                        message = "<" + rcnick() + "> " + input;
                }
 

-               var m = {'Text': message};
+               var m = {'Text': message, 'ServerTimes': {}};

                rcaddmessagetohistory(m);
                rcsend(m.UI, m);
        }
                rcaddmessagetohistory(m);
                rcsend(m.UI, m);
        }