Skip to content

Commit

Permalink
Merge pull request #319 from Jopyth/develop
Browse files Browse the repository at this point in the history
Release 2.5.3
  • Loading branch information
KristjanESPERANTO authored Jan 20, 2025
2 parents 510919b + 13d1cb4 commit 5c39b06
Show file tree
Hide file tree
Showing 16 changed files with 7,697 additions and 2,407 deletions.
1 change: 1 addition & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ We ask you to keep contributing, and feel free to open as many issues and PR as

## Developer commands

- `npm run download_modules` - Download module list manually.
- `npm run lint` - Run linting checks.
- `npm run lint:fix` - Fix linting issues.
- `npm run test` - Run linting and formatter checks + Run spelling check.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body:
Also, you accept that, if this issue it's invalid in any way, will be discarded without receiving any response about it.
If you're not sure if it's a bug, please [ask here](https://github.com/Jopyth/MMM-Remote-Control/discussions).
Thanks for taking the time to help Remote Control get better every day!
- type: input
attributes:
Expand All @@ -26,7 +26,7 @@ body:
description: |
example:
- NodeJS: 14.17.5
placeholder: '14.17.5'
placeholder: "14.17.5"
validations:
required: true
- type: input
Expand All @@ -35,7 +35,7 @@ body:
description: |
example:
- MM: 2.16.0
placeholder: '2.16.0'
placeholder: "2.16.0"
validations:
required: true
- type: input
Expand All @@ -44,15 +44,15 @@ body:
description: |
example:
- Remote Control: 2.3.6
placeholder: '2.3.6'
placeholder: "2.3.6"
validations:
required: true
- type: checkboxes
attributes:
label: Did you try using just Remote Control alone with MM?
options:
- label: I have and the error still happening
required: true
- label: I have and the error still happening
required: true
- type: textarea
attributes:
label: Description
Expand Down Expand Up @@ -115,4 +115,4 @@ body:
label: Additional info
description: Everything else that you think could be useful for us. ;D
validations:
required: false
required: false
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ body:
label: Additional info
description: Everything else that you think could be useful for us. ;D
validations:
required: false
required: false
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ blank_issues_enabled: false
contact_links:
- name: Discussions
url: https://github.com/Jopyth/MMM-Remote-Control/discussions
about: Don't know how to do it? Ask the community!
about: Don't know how to do it? Ask the community!
8 changes: 4 additions & 4 deletions .github/workflows/automated-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ permissions:
contents: read

jobs:
run-lint:
code-quality:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 10
steps:
- run: echo "Starting automated tests for ${{ github.repository }} on ${{ github.ref }}"
- run: "echo '🚀 Starting code quality checks for ${{ github.repository }} (ref: ${{ github.ref }})'"
- name: Check out repository code
uses: actions/checkout@v4
- name: Use Node.js
Expand All @@ -27,4 +27,4 @@ jobs:
run: npm run test:spelling
- name: Check linting
run: npm run lint
- run: echo "Test job status is ${{ job.status }}."
- run: "echo '✨ Code quality checks completed with status: ${{ job.status }}.'"
14 changes: 7 additions & 7 deletions .github/workflows/stale.yml → .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 'Close stale issues and PRs'
name: "Close stale issues and PRs"
on:
schedule: [{cron: "0 12 * * *"},{cron: "0 0 * * *"}]
schedule: [{ cron: "0 12 * * *" }, { cron: "0 0 * * *" }]

jobs:
stale:
Expand All @@ -9,7 +9,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v4
- uses: actions/stale@v9
with:
stale-issue-message: |
This issue has been automatically marked as stale because it has not had
Expand All @@ -23,8 +23,8 @@ jobs:
days-before-pr-stale: 30
days-before-issue-close: 7
days-before-pr-close: 7
stale-issue-label: 'stale'
exempt-issue-labels: 'working,help wanted,PR Welcome!'
stale-pr-label: 'stale'
exempt-pr-labels: 'working,help wanted'
stale-issue-label: "stale"
exempt-issue-labels: "working,help wanted,PR Welcome!"
stale-pr-label: "stale"
exempt-pr-labels: "working,help wanted"
exempt-all-milestones: true
6 changes: 2 additions & 4 deletions API/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

const path = require("path");
const url = require("url");
const fs = require("fs");
const os = require("os");
const uuid = require("uuid/v4");
const { v4: uuid } = require('uuid');
const bodyParser = require("body-parser");
const express = require("express");

Expand All @@ -20,7 +18,7 @@ module.exports = {
*/
getApiKey() {
let thisConfig = this.configOnHd.modules.find(x => x.module === "MMM-Remote-Control");
if (typeof "thisConfig" !== "undefined" &&
if (typeof thisConfig !== "undefined" &&
"config" in thisConfig){
if ("apiKey" in thisConfig.config &&
thisConfig.config.apiKey !== '') {
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/)
and this project adheres to [Semantic Versioning](https://semver.org/).

## [2.5.3] - 2025-01-20

### Fixed

- Fix `download_modules.js` script to automatically download the modules list from the MagicMirror² wiki. This will fix #301.

### Changed

- Replace `node-fetch` by internal fetch API
- Replace old python 2 script `download_modules.py` by JavaScript script, you can run it with `npm run download_modules` to download the modules list from the MagicMirror² wiki.
- Update `uuid`. This will fix #318.

## [2.5.2] - 2025-01-18

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ fi

# Get an UUID to use as an API key
NODE_BIN=$(which node)
APIKEY=$($NODE_BIN -e 'console.log(require("uuid/v4")().replace(/-/g, ""));');
APIKEY=$($NODE_BIN -e 'console.log(require("uuid").v4().replace(/-/g, ""));');

echo ""
if check_no "Do you want to view instructions on how to configure the module?"; then
Expand Down
Loading

0 comments on commit 5c39b06

Please sign in to comment.