yogsototh/weebullet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Evaluate api_key option to allow storing API key in secure

Browse source
This commit is contained in:
Simmo Saan 2015-12-17 00:16:31 +02:00
parent 5f7f9b19d1
commit 5a840d9a55
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
weebullet.py
View file

@ -131,12 +131,12 @@ def cmd_help(data, buffer, args):
elif(args == "listignores"): elif(args == "listignores"):
w.prnt("", "Ignored channels: %s" % w.config_get_plugin("ignored_channels")) w.prnt("", "Ignored channels: %s" % w.config_get_plugin("ignored_channels"))
elif(args == "listdevices"): elif(args == "listdevices"):
apikey = w.config_get_plugin("api_key") apikey = w.string_eval_expression(w.config_get_plugin("api_key"), {}, {}, {})
apiurl = "https://%s@api.pushbullet.com/v2/devices" % (apikey) apiurl = "https://%s@api.pushbullet.com/v2/devices" % (apikey)
w.hook_process("url:" + apiurl, 20000, "process_devicelist_cb", "") w.hook_process("url:" + apiurl, 20000, "process_devicelist_cb", "")
else: else:
w.prnt("", """ w.prnt("", """
Weebullet requires an API key from your Pushbullet account to work. Set your API key with: Weebullet requires an API key from your Pushbullet account to work. Set your API key with (evaluated):
/set plugins.var.python.weebullet.api_key <KEY> /set plugins.var.python.weebullet.api_key <KEY>
Weebullet will by default only send notifications when you are marked away on IRC. You can change this with: Weebullet will by default only send notifications when you are marked away on IRC. You can change this with:
@ -175,7 +175,7 @@ def process_pushbullet_cb(data, url, status, response, err):
return w.WEECHAT_RC_ERROR return w.WEECHAT_RC_ERROR
if status_code is 401 or status_code is 403: if status_code is 401 or status_code is 403:
w.prnt("", "[weebullet] Invalid API Token: %s" % (w.config_get_plugin("api_key"))) w.prnt("", "[weebullet] Invalid API Token: %s" % (w.string_eval_expression(w.config_get_plugin("api_key"), {}, {}, {})))
return w.WEECHAT_RC_ERROR return w.WEECHAT_RC_ERROR
if status_code is not 200: if status_code is not 200:
w.prnt("", "[weebullet] Error sending to pushbullet: %s - %s - %s" % (url, status_code, body)) w.prnt("", "[weebullet] Error sending to pushbullet: %s - %s - %s" % (url, status_code, body))
@ -219,7 +219,7 @@ def send_push(title, body):
debug("Sending push. Title: [%s], body: [%s]" % (title, body)) debug("Sending push. Title: [%s], body: [%s]" % (title, body))
apikey = w.config_get_plugin("api_key") apikey = w.string_eval_expression(w.config_get_plugin("api_key"), {}, {}, {})
apiurl = "https://%s@api.pushbullet.com/v2/pushes" % (apikey) apiurl = "https://%s@api.pushbullet.com/v2/pushes" % (apikey)
timeout = 20000 # FIXME - actually use config timeout = 20000 # FIXME - actually use config
if len(title) is not 0 or len(body) is not 0: if len(title) is not 0 or len(body) is not 0: