Skip to content

Commit 599fa26

Browse files
committed
Merge branch 'main' into develop
2 parents 657e167 + f09f542 commit 599fa26

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
days-before-issue-close: 7
2525
days-before-pr-close: 7
2626
stale-issue-label: 'stale'
27-
exempt-issue-labels: 'working,help wanted'
27+
exempt-issue-labels: 'working,help wanted,PR Welcome!'
2828
stale-pr-label: 'stale'
2929
exempt-pr-labels: 'working,help wanted'
3030
exempt-all-milestones: true

API/api.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,10 @@ module.exports = {
261261
})
262262
.post((req, res) => {
263263
if(!this.apiKey && this.secureEndpoints) return res.status(403).json({ success: false, message: "Forbidden: API Key Not Provided in Config! Use secureEndpoints to bypass this message" });
264+
req.params = {
265+
... req.params,
266+
... req.body
267+
}
264268
this.answerNotifyApi(req, res);
265269
});
266270

@@ -269,6 +273,10 @@ module.exports = {
269273
this.answerModuleApi(req, res);
270274
})
271275
.post((req, res) => {
276+
req.params = {
277+
... req.params,
278+
... req.body
279+
}
272280
this.answerModuleApi(req, res);
273281
});
274282

@@ -344,16 +352,16 @@ module.exports = {
344352
return;
345353
}
346354

347-
var modData = [];
355+
let modData = [];
348356
if(req.params.moduleName !== 'all') {
349-
let i = dataMerged.find(m => {
357+
modData = dataMerged.filter(m => {
350358
return (req.params.moduleName.includes(m.identifier));
351359
});
352-
if (!i) {
360+
if (!modData) {
353361
modData = dataMerged.filter(m => {
354362
return (req.params.moduleName.includes(m.name));
355363
});
356-
} else modData.push(i)
364+
}
357365
} else {
358366
modData = dataMerged;
359367
}
@@ -364,7 +372,7 @@ module.exports = {
364372
}
365373

366374
if (!req.params.action) {
367-
res.json({ success: true, data: dataMerged.filter(m => req.params.moduleName.includes(m.name)) });
375+
res.json({ success: true, data: modData });
368376
return;
369377
}
370378

remote.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ a {
125125
.text {
126126
flex: 1 1 auto;
127127
margin-left: 0.2em;
128+
white-space: nowrap;
129+
overflow: hidden;
130+
text-overflow: ellipsis;
131+
min-width: 0;
128132
}
129133

130134
.fa-angle-right {

remote.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,10 @@ var Remote = {
647647

648648
var text = document.createElement("span");
649649
text.className = "text";
650-
text.innerHTML = " " + self.formatName(moduleData[i].name) + (moduleData[i].header?`, ${moduleData[i].header}`:'');
650+
text.innerHTML = " " + self.formatName(moduleData[i].name);
651+
if ("header" in moduleData[i]) {
652+
text.innerHTML += ` (${moduleData[i].header})`;
653+
}
651654
moduleBox.appendChild(text);
652655

653656
parent.appendChild(moduleBox);

0 commit comments

Comments
 (0)