mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
## [2.22.0] - 2023-01-01 Thanks to: @angeldeejay, @buxxi, @dariom, @dWoolridge, @KristjanESPERANTO, @MagMar94, @naveensrinivasan, @retroflex, @SkySails and @Tom. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you! ### Added - Added test for remoteFile option in compliments module - Added hourlyWeather functionality to Weather.gov weather provider - Removed weatherEndpoint definition from weathergov.js (not used) - Added css class names "today" and "tomorrow" for default calendar - Added Collaboration.md - Added new github action for dependency review (#2862) - Added a WeatherProvider for Open-Meteo - Added Yr as a weather provider - Added config options "ignoreXOriginHeader" and "ignoreContentSecurityPolicy" ### Removed - Removed usage of internal fetch function of node until it is more stable ### Updated - Cleaned up test directory (#2937) and jest config (#2959) - Wait for all modules to start before declaring the system ready (#2487) - Updated e2e tests (moved `done()` in helper functions) and use es6 syntax in all tests - Updated da translation - Rework weather module - Make sure smhi provider api only gets a maximum of 6 digits coordinates (#2955) - Use fetch instead of XMLHttpRequest in weatherprovider (#2935) - Reworked how weatherproviders handle units (#2849) - Use unix() method for parsing times, fix suntimes on the way (#2950) - Refactor conversion functions into utils class (#2958) - The `cors`-method in `server.js` now supports sending and recieving HTTP headers - Replace `…` by `…` - Cleanup compliments module - Updated dependencies including electron to v22 (#2903) ### Fixed - Correctly show apparent temperature in SMHI weather provider - Ensure updatenotification module isn't shown when local is _ahead_ of remote - Handle node_helper errors during startup (#2944) - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840) - Tests not waiting for the application to start and stop before starting the next test - Fix electron tests failing sometimes in github workflow - Fixed gap in clock module when displayed on the left side with displayType=digital - Fixed playwright issue by upgrading to v1.29.1 (#2969) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
187 lines
5.3 KiB
JavaScript
187 lines
5.3 KiB
JavaScript
/* MagicMirror²
|
|
* Module: Compliments
|
|
*
|
|
* By Michael Teeuw https://michaelteeuw.nl
|
|
* MIT Licensed.
|
|
*/
|
|
Module.register("compliments", {
|
|
// Module config defaults.
|
|
defaults: {
|
|
compliments: {
|
|
anytime: ["Hey there sexy!"],
|
|
morning: ["Good morning, handsome!", "Enjoy your day!", "How was your sleep?"],
|
|
afternoon: ["Hello, beauty!", "You look sexy!", "Looking good today!"],
|
|
evening: ["Wow, you look hot!", "You look nice!", "Hi, sexy!"],
|
|
"....-01-01": ["Happy new year!"]
|
|
},
|
|
updateInterval: 30000,
|
|
remoteFile: null,
|
|
fadeSpeed: 4000,
|
|
morningStartTime: 3,
|
|
morningEndTime: 12,
|
|
afternoonStartTime: 12,
|
|
afternoonEndTime: 17,
|
|
random: true
|
|
},
|
|
lastIndexUsed: -1,
|
|
// Set currentweather from module
|
|
currentWeatherType: "",
|
|
|
|
// Define required scripts.
|
|
getScripts: function () {
|
|
return ["moment.js"];
|
|
},
|
|
|
|
// Define start sequence.
|
|
start: function () {
|
|
Log.info("Starting module: " + this.name);
|
|
|
|
this.lastComplimentIndex = -1;
|
|
|
|
if (this.config.remoteFile !== null) {
|
|
this.loadComplimentFile().then((response) => {
|
|
this.config.compliments = JSON.parse(response);
|
|
this.updateDom();
|
|
});
|
|
}
|
|
|
|
// Schedule update timer.
|
|
setInterval(() => {
|
|
this.updateDom(this.config.fadeSpeed);
|
|
}, this.config.updateInterval);
|
|
},
|
|
|
|
/**
|
|
* Generate a random index for a list of compliments.
|
|
*
|
|
* @param {string[]} compliments Array with compliments.
|
|
* @returns {number} a random index of given array
|
|
*/
|
|
randomIndex: function (compliments) {
|
|
if (compliments.length === 1) {
|
|
return 0;
|
|
}
|
|
|
|
const generate = function () {
|
|
return Math.floor(Math.random() * compliments.length);
|
|
};
|
|
|
|
let complimentIndex = generate();
|
|
|
|
while (complimentIndex === this.lastComplimentIndex) {
|
|
complimentIndex = generate();
|
|
}
|
|
|
|
this.lastComplimentIndex = complimentIndex;
|
|
|
|
return complimentIndex;
|
|
},
|
|
|
|
/**
|
|
* Retrieve an array of compliments for the time of the day.
|
|
*
|
|
* @returns {string[]} array with compliments for the time of the day.
|
|
*/
|
|
complimentArray: function () {
|
|
const hour = moment().hour();
|
|
const date = moment().format("YYYY-MM-DD");
|
|
let compliments = [];
|
|
|
|
// Add time of day compliments
|
|
if (hour >= this.config.morningStartTime && hour < this.config.morningEndTime && this.config.compliments.hasOwnProperty("morning")) {
|
|
compliments = [...this.config.compliments.morning];
|
|
} else if (hour >= this.config.afternoonStartTime && hour < this.config.afternoonEndTime && this.config.compliments.hasOwnProperty("afternoon")) {
|
|
compliments = [...this.config.compliments.afternoon];
|
|
} else if (this.config.compliments.hasOwnProperty("evening")) {
|
|
compliments = [...this.config.compliments.evening];
|
|
}
|
|
|
|
// Add compliments based on weather
|
|
if (this.currentWeatherType in this.config.compliments) {
|
|
Array.prototype.push.apply(compliments, this.config.compliments[this.currentWeatherType]);
|
|
}
|
|
|
|
// Add compliments for anytime
|
|
Array.prototype.push.apply(compliments, this.config.compliments.anytime);
|
|
|
|
// Add compliments for special days
|
|
for (let entry in this.config.compliments) {
|
|
if (new RegExp(entry).test(date)) {
|
|
Array.prototype.push.apply(compliments, this.config.compliments[entry]);
|
|
}
|
|
}
|
|
|
|
return compliments;
|
|
},
|
|
|
|
/**
|
|
* Retrieve a file from the local filesystem
|
|
*
|
|
* @returns {Promise} Resolved when the file is loaded
|
|
*/
|
|
loadComplimentFile: async function () {
|
|
const isRemote = this.config.remoteFile.indexOf("http://") === 0 || this.config.remoteFile.indexOf("https://") === 0,
|
|
url = isRemote ? this.config.remoteFile : this.file(this.config.remoteFile);
|
|
const response = await fetch(url);
|
|
return await response.text();
|
|
},
|
|
|
|
/**
|
|
* Retrieve a random compliment.
|
|
*
|
|
* @returns {string} a compliment
|
|
*/
|
|
getRandomCompliment: function () {
|
|
// get the current time of day compliments list
|
|
const compliments = this.complimentArray();
|
|
// variable for index to next message to display
|
|
let index;
|
|
// are we randomizing
|
|
if (this.config.random) {
|
|
// yes
|
|
index = this.randomIndex(compliments);
|
|
} else {
|
|
// no, sequential
|
|
// if doing sequential, don't fall off the end
|
|
index = this.lastIndexUsed >= compliments.length - 1 ? 0 : ++this.lastIndexUsed;
|
|
}
|
|
|
|
return compliments[index] || "";
|
|
},
|
|
|
|
// Override dom generator.
|
|
getDom: function () {
|
|
const wrapper = document.createElement("div");
|
|
wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright pre-line";
|
|
// get the compliment text
|
|
const complimentText = this.getRandomCompliment();
|
|
// split it into parts on newline text
|
|
const parts = complimentText.split("\n");
|
|
// create a span to hold the compliment
|
|
const compliment = document.createElement("span");
|
|
// process all the parts of the compliment text
|
|
for (const part of parts) {
|
|
if (part !== "") {
|
|
// create a text element for each part
|
|
compliment.appendChild(document.createTextNode(part));
|
|
// add a break
|
|
compliment.appendChild(document.createElement("BR"));
|
|
}
|
|
}
|
|
// only add compliment to wrapper if there is actual text in there
|
|
if (compliment.children.length > 0) {
|
|
// remove the last break
|
|
compliment.lastElementChild.remove();
|
|
wrapper.appendChild(compliment);
|
|
}
|
|
return wrapper;
|
|
},
|
|
|
|
// Override notification handler.
|
|
notificationReceived: function (notification, payload, sender) {
|
|
if (notification === "CURRENTWEATHER_TYPE") {
|
|
this.currentWeatherType = payload.type;
|
|
}
|
|
}
|
|
});
|