mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-04-23 06:17:53 +00:00
## Release Notes Thanks to: @angeldeejay, @in-voker, @JHWelch, @khassel, @KristjanESPERANTO, @rejas, @sdetweil > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.34.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.34.0...v2.25.0) > ⚠️ We introduced some internal changes with this release, please read [this forum post](https://forum.magicmirror.builders/topic/20138/upcoming-release-april-1-2026-breaking-changes-some-operational-changes) before upgrading! ### [core] - Prepare Release 2.35.0 (#4071) - docs: add security policy and vulnerability reporting guidelines (#4069) - refactor: simplify internal `require()` calls (#4056) - allow environment variables in cors urls (#4033) - fix cors proxy getting binary data (e.g. png, webp) (#4030) - fix: correct secret redaction and optimize loadConfig (#4031) - change loading config.js, allow variables in config.js and try to protect sensitive data (#4029) - remove kioskmode (#4027) - Add dark theme logo (#4026) - move custom.css from css to config (#4020) - move default modules from /modules/default to /defaultmodules (#4019) - update node versions in workflows (#4018) - [core] refactor: extract and centralize HTTP fetcher (#4016) - fix systeminformation not displaying electron version (#4012) - Update node-ical and support it's rrule-temporal changes (#4010) - Change default start scripts from X11 to Wayland (#4011) - refactor: unify favicon for index.html and Electron (#4006) - [core] run systeminformation in subprocess so the info is always displayed (#4002) - set next release dev number (#4000) ### [dependencies] - update dependencies (#4068) - update dependencies incl. electron to v41 (#4058) - chore: upgrade ESLint to v10 and fix newly surfaced issues (#4057) - chore: update ESLint and plugins, simplify config, apply new rules (#4052) - chore: update dependencies + add exports, files, and sideEffects fields to package.json (#4040) - [core] refactor: enable ESLint rule require-await and handle detected issues (#4038) - Update node-ical and other deps (#4025) - chore: update dependencies (#4021) - chore(eslint): migrate from eslint-plugin-vitest to @vitest/eslint-plugin and run rules only on test files (#4014) - Update deps as requested by dependabot (#4008) - update Collaboration.md and dependencies (#4001) ### [logging] - refactor: further logger clean-up (#4050) - Fix Node.js v25 logging prefix and modernize logger (#4049) ### [modules/calendar] - fix(calendar): make showEnd behavior more consistent across time formats (#4059) - test(calendar): fix hardcoded date in event shape test (#4055) - [calendar] refactor: delegate event expansion to node-ical's expandRecurringEvent (#4047) - calendar.js: remove useless hasCalendarURL function (#4028) - fix(calendar): update to node-ical 0.23.1 and fix full-day recurrence lookup (#4013) - fix(calendar): correct day-of-week for full-day recurring events across all timezones (#4004) ### [modules/newsfeed] - fix(newsfeed): fix full article view and add framing check (#4039) - [newsfeed] refactor: migrate to centralized HTTPFetcher (#4023) ### [modules/weather] - fix(weather): fix openmeteo forecast stuck in the past (#4064) - fix(weather): fix weathergov forecast day labels off by one (#4065) - weather: fixes for templates (#4054) - weather: add possibility to override njk's and css (#4051) - Use getDateString in openmeteo (#4046) - [weather] refactor: migrate to server-side providers with centralized HTTPFetcher (#4032) - [weather] feat: add Weather API Provider (#4036) ### [testing] - chore: remove obsolete Jest config and unit test global setup (#4044) - replace template_spec test with config_variables test (#4034) - refactor(clientonly): modernize code structure and add comprehensive tests (#4022) - Switch to undici Agent for HTTPS requests (#4015) - chore: migrate CI workflows to ubuntu-slim for faster startup times (#4007) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: Marcel <m-idler@users.noreply.github.com> Co-authored-by: Kevin G. <crazylegstoo@gmail.com> Co-authored-by: Jboucly <33218155+jboucly@users.noreply.github.com> Co-authored-by: Jboucly <contact@jboucly.fr> Co-authored-by: Jarno <54169345+jarnoml@users.noreply.github.com> Co-authored-by: Jordan Welch <JordanHWelch@gmail.com> Co-authored-by: Blackspirits <blackspirits@gmail.com> Co-authored-by: Samed Ozdemir <samed@xsor.io> Co-authored-by: in-voker <58696565+in-voker@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
129 lines
4.4 KiB
JavaScript
129 lines
4.4 KiB
JavaScript
const CalendarUtils = {
|
|
|
|
/**
|
|
* Capitalize the first letter of a string
|
|
* @param {string} string The string to capitalize
|
|
* @returns {string} The capitalized string
|
|
*/
|
|
capFirst (string) {
|
|
return string.charAt(0).toUpperCase() + string.slice(1);
|
|
},
|
|
|
|
/**
|
|
* This function accepts a number (either 12 or 24) and returns a moment.js LocaleSpecification with the
|
|
* corresponding time-format to be used in the calendar display. If no number is given (or otherwise invalid input)
|
|
* it will a localeSpecification object with the system locale time format.
|
|
* @param {number} timeFormat Specifies either 12 or 24-hour time format
|
|
* @returns {moment.LocaleSpecification} formatted time
|
|
*/
|
|
getLocaleSpecification (timeFormat) {
|
|
switch (timeFormat) {
|
|
case 12: {
|
|
return { longDateFormat: { LT: "h:mm A" } };
|
|
}
|
|
case 24: {
|
|
return { longDateFormat: { LT: "HH:mm" } };
|
|
}
|
|
default: {
|
|
return { longDateFormat: { LT: moment.localeData().longDateFormat("LT") } };
|
|
}
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Shortens a string if it's longer than maxLength and add an ellipsis to the end
|
|
* @param {string} string Text string to shorten
|
|
* @param {number} maxLength The max length of the string
|
|
* @param {boolean} wrapEvents Wrap the text after the line has reached maxLength
|
|
* @param {number} maxTitleLines The max number of vertical lines before cutting event title
|
|
* @returns {string} The shortened string
|
|
*/
|
|
shorten (string, maxLength, wrapEvents, maxTitleLines) {
|
|
if (typeof string !== "string") {
|
|
return "";
|
|
}
|
|
|
|
if (wrapEvents === true) {
|
|
const words = string.split(" ");
|
|
let temp = "";
|
|
let currentLine = "";
|
|
let line = 0;
|
|
|
|
for (let i = 0; i < words.length; i++) {
|
|
const word = words[i];
|
|
if (currentLine.length + word.length < (typeof maxLength === "number" ? maxLength : 25) - 1) {
|
|
// max - 1 to account for a space
|
|
currentLine += `${word} `;
|
|
} else {
|
|
line++;
|
|
if (line > maxTitleLines - 1) {
|
|
if (i < words.length) {
|
|
currentLine += "…";
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (currentLine.length > 0) {
|
|
temp += `${currentLine}<br>${word} `;
|
|
} else {
|
|
temp += `${word}<br>`;
|
|
}
|
|
currentLine = "";
|
|
}
|
|
}
|
|
|
|
return (temp + currentLine).trim();
|
|
} else {
|
|
if (maxLength && typeof maxLength === "number" && string.length > maxLength) {
|
|
return `${string.trim().slice(0, maxLength)}…`;
|
|
} else {
|
|
return string.trim();
|
|
}
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Transforms the title of an event for usage.
|
|
* Replaces parts of the text as defined in config.titleReplace.
|
|
* @param {string} title The title to transform.
|
|
* @param {object} titleReplace object definition of parts to be replaced in the title
|
|
* object definition:
|
|
* search: {string,required} RegEx in format //x or simple string to be searched. For (birthday) year calculation, the element matching the year must be in a RegEx group
|
|
* replace: {string,required} Replacement string, may contain match group references (latter is required for year calculation)
|
|
* yearmatchgroup: {number,optional} match group for year element
|
|
* @returns {string} The transformed title.
|
|
*/
|
|
titleTransform (title, titleReplace) {
|
|
let transformedTitle = title;
|
|
for (let tr in titleReplace) {
|
|
let transform = titleReplace[tr];
|
|
if (typeof transform === "object") {
|
|
if (typeof transform.search !== "undefined" && transform.search !== "" && typeof transform.replace !== "undefined") {
|
|
let regParts = transform.search.match(/^\/(.+)\/([gim]*)$/);
|
|
let needle = new RegExp(transform.search, "g");
|
|
if (regParts) {
|
|
// the parsed pattern is a regexp with flags.
|
|
needle = new RegExp(regParts[1], regParts[2]);
|
|
}
|
|
|
|
let replacement = transform.replace;
|
|
if (typeof transform.yearmatchgroup !== "undefined" && transform.yearmatchgroup !== "") {
|
|
const yearmatch = [...title.matchAll(needle)];
|
|
if (yearmatch[0].length >= transform.yearmatchgroup + 1 && yearmatch[0][transform.yearmatchgroup] * 1 >= 1900) {
|
|
let calcage = new Date().getFullYear() - yearmatch[0][transform.yearmatchgroup] * 1;
|
|
let searchstr = `$${transform.yearmatchgroup}`;
|
|
replacement = replacement.replace(searchstr, calcage);
|
|
}
|
|
}
|
|
transformedTitle = transformedTitle.replace(needle, replacement);
|
|
}
|
|
}
|
|
}
|
|
return transformedTitle;
|
|
}
|
|
};
|
|
|
|
if (typeof module !== "undefined") {
|
|
module.exports = CalendarUtils;
|
|
}
|