Merge branch 'master' into PortalInfo

__init__.py

@@ -102,7 +102,7 @@ def _screencap(url, args_filepath, filepath, filename, bot, event, arguments):
         if status:
             try:
                 image_id = yield from bot._client.upload_image(image_data, filename=filename)
-                yield from bot._client.sendchatmessage(event.conv.id_, None, image_id=image_id)
+                yield from bot.coro_send_message(event.conv.id_, None, image_id=image_id)
                 os.unlink(filepath)
                 os.unlink(args_filepath)
             except Exception as e:

screencap.js

@@ -453,7 +453,7 @@ function setupIITC(){
   loadIitcPlugin('https://static.iitc.me/build/release/plugins/canvas-render.user.js');
   page.evaluate(function(maptype) {
     localStorage['ingress.intelmap.layergroupdisplayed'] = JSON.stringify({
-      "Unclaimed Portals": false,
+      "Unclaimed/Placeholder Portals": false,
       "Level 1 Portals": true,
       "Level 2 Portals": true,
       "Level 3 Portals": true,