From 205de7233ee5e15f6eed6f4e691cc3f9676d3485 Mon Sep 17 00:00:00 2001 From: "ndo@ndo3" Date: Thu, 14 May 2020 14:56:38 +0200 Subject: [PATCH 1/2] add: advice api to compliments module --- CHANGELOG.md | 1 + modules/default/compliments/compliments.js | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50ddd64b..46f1e2b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). *This release is scheduled to be released on 2020-07-01.* ### Added +- Compliments Module - Add Advice API (https://api.adviceslip.com/) Option ### Updated - Cleaned up alert module code diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js index ff245eef..f40216b6 100644 --- a/modules/default/compliments/compliments.js +++ b/modules/default/compliments/compliments.js @@ -39,7 +39,8 @@ Module.register("compliments", { afternoonStartTime: 12, afternoonEndTime: 17, random: true, - mockDate: null + mockDate: null, + advice: false }, lastIndexUsed:-1, // Set currentweather from module @@ -62,7 +63,19 @@ Module.register("compliments", { self.config.compliments = JSON.parse(response); self.updateDom(); }); - } + } else if (this.config.advice) { + var xobj = new XMLHttpRequest(); + xobj.overrideMimeType("application/json"); + xobj.open("GET", "https://api.adviceslip.com/advice", true); + xobj.onreadystatechange = function() { + if (xobj.readyState === 4 && xobj.status === 200) { + const adviceResp = JSON.parse(xobj.responseText); + self.config.compliments = adviceResp.slip.advice + self.updateDom(); + } + }; + xobj.send(null); + } // Schedule update timer. setInterval(function() { From a35e8f331540479b4eca04f886bebc73d192d27d Mon Sep 17 00:00:00 2001 From: "ndo@ndo3" Date: Thu, 14 May 2020 15:00:09 +0200 Subject: [PATCH 2/2] update: spaces -> tabs --- modules/default/compliments/compliments.js | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js index f40216b6..aa43c0fc 100644 --- a/modules/default/compliments/compliments.js +++ b/modules/default/compliments/compliments.js @@ -40,7 +40,7 @@ Module.register("compliments", { afternoonEndTime: 17, random: true, mockDate: null, - advice: false + advice: false }, lastIndexUsed:-1, // Set currentweather from module @@ -64,18 +64,18 @@ Module.register("compliments", { self.updateDom(); }); } else if (this.config.advice) { - var xobj = new XMLHttpRequest(); + var xobj = new XMLHttpRequest(); xobj.overrideMimeType("application/json"); - xobj.open("GET", "https://api.adviceslip.com/advice", true); - xobj.onreadystatechange = function() { - if (xobj.readyState === 4 && xobj.status === 200) { - const adviceResp = JSON.parse(xobj.responseText); - self.config.compliments = adviceResp.slip.advice - self.updateDom(); - } - }; - xobj.send(null); - } + xobj.open("GET", "https://api.adviceslip.com/advice", true); + xobj.onreadystatechange = function() { + if (xobj.readyState === 4 && xobj.status === 200) { + const adviceResp = JSON.parse(xobj.responseText); + self.config.compliments = adviceResp.slip.advice + self.updateDom(); + } + }; + xobj.send(null); + } // Schedule update timer. setInterval(function() {