commit 350af0e144aeb34c18219935bbae6872f33465dc
parent 0f2e841110adf1faca157cd16193a1cf9119155b
Author: Marcel <MTRNord@users.noreply.github.com>
Date: Mon, 6 Mar 2017 19:54:07 +0100
Merge branch 'master' into PortalInfo
Diffstat:
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/__init__.py b/__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:
diff --git a/screencap.js b/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,