more chat related stuff. public user chat and message posting is still missing though

2013-02-03 19:44:35 +01:00
parent a7db7e656a
commit ecfaca7f9b
9 changed files with 681 additions and 91 deletions
--- a/total-conversion-build.user.js
+++ b/total-conversion-build.user.js
@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             ingress-intel-total-conversion@breunigs
 // @name           intel map total conversion
-// @version        0.1-2013-02-03-141935
+// @version        0.1-2013-02-03-194418
 // @namespace      https://github.com/breunigs/ingress-intel-total-conversion
 // @updateURL      https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/total-conversion-build.user.js
 // @downloadURL    https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/total-conversion-build.user.js
@ -52,7 +52,7 @@ document.getElementsByTagName('body')[0].innerHTML = ''
  + '<div id="chat" style="display:none">'
  + '  <div id="chatfaction"></div>'
  + '  <div id="chatpublic"></div>'
-  + '  <div id="chatbot"></div>'
+  + '  <div id="chatautomated"></div>'
  + '</div>'
  + '<form id="chatinput" style="display:none"><time></time><span>tell faction:</span><input type="text"/></form>'
  + '<div id="sidebar" style="display: none">'
@ -85,7 +85,7 @@ var SIDEBAR_WIDTH = 300;
 // chat messages are requested for the visible viewport. On high zoom
 // levels this gets pretty pointless, so request messages in at least a
 // X km radius.
-var CHAT_MIN_RANGE = 15;
+var CHAT_MIN_RANGE = 6;
 // this controls how far data is being drawn outside the viewport. Set
 // it 0 to only draw entities that intersect the current view. A value
 // of one will render an area twice the size of the viewport (or some-
@ -231,7 +231,9 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
        if(selectedPortal == ent[0]) portalUpdateAvailable = true;

        portalsDetail[ent[0]] = ent[2];
-        // immediately render portal details if selected by URL
+        // immediately render portal details if selected by URL.
+        // is also used internally to select a portal that may not have
+        // been loaded yet. See utils_misc#zoomToAndShowPortal.
        if(urlPortal && ent[0] == urlPortal && !selectedPortal) {
          urlPortal = null; // only pre-select it once
          window.renderPortalDetails(ent[0]);
@ -419,8 +421,13 @@ window.requests.abort = function() {
  $.each(window.activeRequests, function(ind, actReq) {
    if(actReq) actReq.abort();
  });
+
  window.activeRequests = [];
  window.failedRequestCount = 0;
+  window.chat._requestOldPublicRunning  = false;
+  window.chat._requestNewPublicRunning  = false;
+  window.chat._requestOldFactionRunning  = false;
+  window.chat._requestNewFactionRunning  = false;

  renderUpdateStatus();
 }
@ -623,6 +630,12 @@ window.scrollBottom = function(elm) {
 }


+window.zoomToAndShowPortal = function(guid, latlng) {
+  renderPortalDetails(guid);
+  map.setView(latlng, 17);
+}
+
+


 // SETUP /////////////////////////////////////////////////////////////
@ -802,30 +815,20 @@ load(JQUERY, LEAFLET).then(LLGMAPS).thenRun(boot);

 window.chat = function() {};

+window.chat._oldFactionTimestamp = -1;
+window.chat._newFactionTimestamp = -1;
+window.chat._oldPublicTimestamp = -1;
+window.chat._newPublicTimestamp = -1;
+
 window.chat.getOldestTimestamp = function(public) {
-  if(chat._needsClearing) return -1;
-  if(public) {
-    var a = $('#chatpublic time:first').data('timestamp');
-    var b = $('#chatbot time:first').data('timestamp');
-    if(a && b) return Math.min(a, b);
-    return a || b || -1;
-  } else {
-    return $('#chatfaction time').first().data('timestamp') || -1;
-  }
+  return chat['_old'+(public ? 'Public' : 'Faction')+'Timestamp'];
 }

 window.chat.getNewestTimestamp = function(public) {
-  if(chat._needsClearing) return -1;
-  if(public) {
-    var a = $('#chatpublic time:last').data('timestamp');
-    var b = $('#chatbot time:last').data('timestamp');
-    if(a && b) return Math.max(a, b);
-    return a || b || -1;
-  } else {
-    return $('#chatfaction time').last().data('timestamp') || -1;
-  }
+  return chat['_new'+(public ? 'Public' : 'Faction')+'Timestamp'];
 }

+
 window.chat._needsClearing = false;
 window.chat._oldBBox = null;
 window.chat.genPostData = function(public, getOlderMsgs) {
@ -842,7 +845,7 @@ window.chat.genPostData = function(public, getOlderMsgs) {
  var ne = b.getNorthEast();
  var sw = b.getSouthWest();
  var data = {
-    desiredNumItems: 10,
+    desiredNumItems: public ? 100 : 50, // public contains so much crap
    minLatE6: Math.round(sw.lat*1E6),
    minLngE6: Math.round(sw.lng*1E6),
    maxLatE6: Math.round(ne.lat*1E6),
@ -938,14 +941,17 @@ window.chat._displayedFactionGuids = [];
 window.chat.handleFaction = function(data, textStatus, jqXHR, isOldMsgs) {
  if(!data || !data.result) {
    window.failedRequestCount++;
-    return console.warn('Couldn’t get chat data. Waiting for next auto-refresh.');
+    return console.warn('faction chat error. Waiting for next auto-refresh.');
  }

+  chat._newFactionTimestamp = data.result[0][1];
+  chat._oldFactionTimestamp = data.result[data.result.length-1][1];
+
  chat.clearIfRequired();

  var msgs = '';
  var prevTime = null;
-  $.each(data.result.reverse(), function(ind, json) {
+  $.each(data.result.reverse(), function(ind, json) { // oldest first!
    // avoid duplicates
    if(window.chat._displayedFactionGuids.indexOf(json[0]) !== -1) return;
    window.chat._displayedFactionGuids.push(json[0]);
@ -969,8 +975,9 @@ window.chat.handleFaction = function(data, textStatus, jqXHR, isOldMsgs) {
  // if there is a change of day between two requests, handle the
  // divider insertion here.
  if(isOldMsgs) {
-    var nextTime = new Date($('#chatfaction time:last').data('timestamp')).toLocaleDateString();
-    if(prevTime && prevTime !== nextTime)
+    var ts = $('#chatfaction time:first').data('timestamp');
+    var nextTime = new Date(ts).toLocaleDateString();
+    if(prevTime && prevTime !== nextTime && ts)
      msgs += chat.renderDivider(nextTime);
  }

@ -981,24 +988,185 @@ window.chat.handleFaction = function(data, textStatus, jqXHR, isOldMsgs) {
  else
    c.append(msgs);

-  // If scrolled down completely, keep it that way so new messages can
-  // be seen easily. If scrolled up, only need to fix scroll position
-  // when old messages are added. New messages added at the bottom don’t
-  // change the view and enabling this would make the chat scroll down
-  // for every added message, even if the user wants to read old stuff.
-  if(scrollBefore === 0 || isOldMsgs) {
-    c.data('ignoreNextScroll', true);
-    c.scrollTop(c.scrollTop() + (scrollBottom(c)-scrollBefore));
-  }
-
+  chat.keepScrollPosition(c, scrollBefore, isOldMsgs);
  chat.needMoreMessages();
 }

+
+//
+// requesting public
+//
+
+window.chat._requestOldPublicRunning = false;
+window.chat.requestOldPublic = function(isRetry) {
+  if(chat._requestOldPublicRunning) return;
+  if(isIdle()) return renderUpdateStatus();
+  chat._requestOldPublicRunning = true;
+
+  var d = chat.genPostData(true, true);
+  var r = window.postAjax(
+    'getPaginatedPlextsV2',
+    d,
+    chat.handleOldPublic,
+    isRetry
+      ? function() { window.chat._requestOldPublicRunning = false; }
+      : function() { window.chat.requestOldPublic(true) }
+  );
+
+  requests.add(r);
+}
+
+window.chat._requestNewPublicRunning = false;
+window.chat.requestNewPublic = function(isRetry) {
+  if(chat._requestNewPublicRunning) return;
+  if(window.isIdle()) return renderUpdateStatus();
+  chat._requestNewPublicRunning = true;
+
+  var d = chat.genPostData(true, false);
+  var r = window.postAjax(
+    'getPaginatedPlextsV2',
+    d,
+    chat.handleNewPublic,
+    isRetry
+      ? function() { window.chat._requestNewPublicRunning = false; }
+      : function() { window.chat.requestNewPublic(true) }
+  );
+
+  requests.add(r);
+}
+
+
+//
+// handle public
+//
+
+
+window.chat.handleOldPublic = function(data, textStatus, jqXHR) {
+  chat._requestOldPublicRunning = false;
+  chat.handlePublic(data, textStatus, jqXHR, true);
+}
+
+window.chat.handleNewPublic = function(data, textStatus, jqXHR) {
+  chat._requestNewPublicRunning = false;
+  chat.handlePublic(data, textStatus, jqXHR, false);
+}
+
+window.chat._displayedPublicGuids = [];
+window.chat._displayedPlayerActionTime = {};
+window.chat.handlePublic = function(data, textStatus, jqXHR, isOldMsgs) {
+  if(!data || !data.result) {
+    window.failedRequestCount++;
+    return console.warn('public chat error. Waiting for next auto-refresh.');
+  }
+
+  chat._newPublicTimestamp = data.result[0][1];
+  chat._oldPublicTimestamp = data.result[data.result.length-1][1];
+
+  chat.clearIfRequired();
+
+  var c = $('#chat > div:visible');
+  var scrollBefore = scrollBottom(c);
+
+  chat.handlePublicAutomated(data);
+  //chat.handlePublicPlayer(data, isOldMsgs);
+
+  chat.keepScrollPosition(c, scrollBefore, isOldMsgs);
+  chat.needMoreMessages();
+}
+
+
+
+
+
+window.chat.handlePublicAutomated = function(data) {
+ $.each(data.result, function(ind, json) { // newest first!
+    var time = json[1];
+
+    // ignore player messages
+    var t = json[2].plext.plextType;
+    if(t !== 'SYSTEM_BROADCAST' && t !== 'SYSTEM_NARROWCAST') return true;
+
+    var tmpmsg = '', nick = null, pguid, team;
+
+    // each automated message is composed of many text chunks. loop
+    // over them to gather all necessary data.
+    $.each(json[2].plext.markup, function(ind, part) {
+      switch(part[0]) {
+        case 'PLAYER':
+          pguid = part[1].guid;
+          var lastAction = window.chat._displayedPlayerActionTime[pguid];
+          // ignore older messages about player
+          if(lastAction && lastAction[0] > time) return false;
+
+          nick = part[1].plain;
+          team = part[1].team === 'ALIENS' ? TEAM_ENL : TEAM_RES;
+          window.setPlayerName(pguid, nick); // free nick name resolves
+          if(ind > 0) tmpmsg += nick; // don’t repeat nick directly
+          break;
+
+        case 'TEXT':
+          tmpmsg += part[1].plain;
+          break;
+
+        case 'PORTAL':
+          var latlng = [part[1].latE6/1E6, part[1].lngE6/1E6];
+          var js = 'window.zoomToAndShowPortal(\''+part[1].guid+'\', ['+latlng[0]+', '+latlng[1]+'])';
+          tmpmsg += '<a onclick="'+js+'" title="'+part[1].address+'">'+part[1].name+'</a>';
+          break;
+      }
+    });
+
+    // nick will only be set if we don’t have any info about that
+    // player yet.
+    if(nick) {
+      tmpmsg = chat.renderMsg(tmpmsg, nick, time, team);
+      window.chat._displayedPlayerActionTime[pguid] = [time, tmpmsg];
+    };
+ });
+
+  if(chat.getActive() === 'automated')
+    window.chat.renderAutomatedMsgsToBox();
+}
+
+window.chat.getActive = function() {
+  return $('#chatcontrols .active').text();
+}
+
+window.chat.renderAutomatedMsgsToBox = function() {
+  var x = window.chat._displayedPlayerActionTime;
+  // we don’t care about the GUIDs anymore
+  var vals = $.map(x, function(v, k) { return [v]; });
+  // sort them old to new
+  vals = vals.sort(function(a, b) { return a[0]-b[0]; });
+
+  var prevTime = null;
+  var msgs = $.map(vals, function(v) {
+    var nowTime = new Date(v[0]).toLocaleDateString();
+    if(prevTime && prevTime !== nowTime)
+      var val = chat.renderDivider(nowTime) + v[1];
+    else
+      var val = v[1];
+
+    prevTime = nowTime;
+    return val;
+  }).join('\n');
+
+  $('#chatautomated').html(msgs);
+}
+
+
+
+
 window.chat.clear = function() {
  console.log('clearing now');
  window.chat._displayedFactionGuids = [];
  window.chat._displayedPublicGuids = [];
-  $('#chatfaction, #chatpublic, #chatbot').data('ignoreNextScroll', true).html('');
+  window.chat._displayedPlayerActionTime = {};
+  window.chat._oldFactionTimestamp = -1;
+  window.chat._newFactionTimestamp = -1;
+  window.chat._oldPublicTimestamp = -1;
+  window.chat._newPublicTimestamp = -1;
+  $('#chatfaction, #chatpublic, #chatautomated').data('ignoreNextScroll', true).html('');
 }

 window.chat.clearIfRequired = function() {
@ -1012,6 +1180,9 @@ window.chat.toggle = function() {
  if(c.hasClass('expand')) {
    $('#chatcontrols a:first').text('expand');
    c.removeClass('expand');
+    var div = $('#chat > div:visible');
+    div.data('ignoreNextScroll', true);
+    div.scrollTop(9999999999999); // scroll to bottom
  } else {
    $('#chatcontrols a:first').text('shrink');
    c.addClass('expand');
@ -1022,7 +1193,7 @@ window.chat.toggle = function() {
 window.chat.request = function() {
  console.log('refreshing chat');
  chat.requestNewFaction();
-  //~ chat.requestNewPublic();
+  chat.requestNewPublic();
 }

 // checks if there are enough messages in the selected chat tab and
@ -1031,7 +1202,7 @@ window.chat.needMoreMessages = function() {
  var activeChat = $('#chat > :visible');
  if(scrollBottom(activeChat) !== 0 || activeChat.scrollTop() !== 0) return;
  console.log('no scrollbar in active chat, requesting more msgs');
-  if($('#chatcontrols a:last.active'))
+  if($('#chatcontrols a:last.active').length)
    chat.requestOldFaction();
  else
    chat.requestOldPublic();
@ -1056,6 +1227,9 @@ window.chat.setup = function() {
  $('#chatcontrols, #chat, #chatinput').show();

  $('#chatcontrols a:first').click(window.chat.toggle);
+  $('#chatcontrols a:not(:first)').click(window.chat.chooser);
+
+
  $('#chatinput').click(function() {
    $('#chatinput input').focus();
  });
@ -1069,16 +1243,19 @@ window.chat.setup = function() {
    if(scrollBottom(t) === 0) chat.requestNewFaction();
  });

-  $('#chatpublic, #chatbot').scroll(function() {
+  $('#chatpublic, #chatautomated').scroll(function() {
    var t = $(this);
    if(t.data('ignoreNextScroll')) return t.data('ignoreNextScroll', false);
    if(t.scrollTop() < 200) chat.requestOldPublic();
    if(scrollBottom(t) === 0) chat.requestNewPublic();
  });

-  chat.requestNewFaction();
+  chat.request();
  window.addResumeFunction(chat.request);
  window.requests.addRefreshFunction(chat.request);
+
+  var cls = PLAYER.team === 'ALIENS' ? 'enl' : 'res';
+  $('#chatinput span').addClass(cls)
 }


@ -1087,6 +1264,7 @@ window.chat.renderMsg = function(msg, nick, time, team) {
  var tb = unixTimeToString(time, true);
  var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>';
  var s = 'style="color:'+COLORS[team]+'"';
+  var title = nick.length >= 8 ? 'title="'+nick+'"' : '';
  return '<p>'+t+'<mark '+s+'>'+nick+'</mark><span>'+msg+'</span></p>';
 }

@ -1094,6 +1272,52 @@ window.chat.renderDivider = function(text) {
  return '<summary>─ '+text+' ────────────────────────────────────────────────────────────────────────────</summary>';
 }

+window.chat.chooser = function(event) {
+  var t = $(event.target);
+  var tt = t.text();
+  var span = $('#chatinput span');
+
+  $('#chatcontrols .active').removeClass('active');
+  t.addClass('active');
+
+  $('#chat > div').hide();
+
+  switch(tt) {
+    case 'faction':
+      span.css('color', '');
+      span.text('tell faction:');
+      $('#chatfaction').show();
+      break;
+
+    case 'public':
+      span.css('cssText', 'color: red !important');
+      span.text('spam public:');
+      $('#chatpublic').show();
+      break;
+
+    case 'automated':
+      span.css('cssText', 'color: #bbb !important');
+      span.text('tell Jarvis:');
+      chat.renderAutomatedMsgsToBox();
+      $('#chatautomated').show();
+      break;
+  }
+}
+
+
+// contains the logic to keep the correct scroll position.
+window.chat.keepScrollPosition = function(box, scrollBefore, isOldMsgs) {
+  // If scrolled down completely, keep it that way so new messages can
+  // be seen easily. If scrolled up, only need to fix scroll position
+  // when old messages are added. New messages added at the bottom don’t
+  // change the view and enabling this would make the chat scroll down
+  // for every added message, even if the user wants to read old stuff.
+  if(scrollBefore === 0 || isOldMsgs) {
+    box.data('ignoreNextScroll', true);
+    box.scrollTop(box.scrollTop() + (scrollBottom(box)-scrollBefore));
+  }
+}
+


 // PORTAL DETAILS DISPLAY ////////////////////////////////////////////
@ -1409,8 +1633,14 @@ window.getPosition = function() {
 // methods that highlight the portal in the map view.

 window.renderPortalDetails = function(guid) {
-  var update = selectPortal(guid);
  var d = portalsDetail[guid];
+  if(!d) {
+    unselectOldPortal();
+    urlPortal = guid;
+    return;
+  }
+
+  var update = selectPortal(guid);

  // collect some random data that’s not worth to put in an own method
  var links = {incoming: 0, outgoing: 0};
@ -1513,6 +1743,15 @@ window.selectPortal = function(guid) {
 }


+window.unselectOldPortal = function() {
+  var oldPortal = portals[selectedPortal];
+  if(oldPortal)
+    oldPortal.setStyle({color: oldPortal.options.fillColor});
+  selectedPortal = null;
+  $('#portaldetails').html('');
+}
+
+


 // REDEEMING /////////////////////////////////////////////////////////