misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

more sensible variable names

Browse source 
thanks Hazelnoot
This commit is contained in:
dakkar 2025-08-03 13:33:27 +01:00
parent 9b164003d4
commit b1021b3518
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/core/UtilityService.ts
View file

@ -223,8 +223,8 @@ export class UtilityService {
@bindThis
public isDeliverSuspendedSoftware(software: Pick<MiInstance, 'softwareName' | 'softwareVersion'>): SoftwareSuspension | undefined {
// a missing name or version is treated as the empty string
const instanceName = software.softwareName ?? '';
const instanceVersion = software.softwareVersion ?? '';
const softwareName = software.softwareName ?? '';
const softwareVersion = software.softwareVersion ?? '';
function maybeRegexpMatch(test: string, target: string): boolean {
const regexpStrPair = test.trim().match(/^\/(.+)\/(.*)$/);
@ -244,12 +244,12 @@ export class UtilityService {
x => (
(
x.software.trim() === '*' ||
x.software === instanceName ||
maybeRegexpMatch(x.software, instanceName)
x.software === softwareName ||
maybeRegexpMatch(x.software, softwareName)
) && (
x.versionRange.trim() === '*' ||
semver.satisfies(instanceVersion, x.versionRange, { includePrerelease: true }) ||
maybeRegexpMatch(x.versionRange, instanceVersion)
semver.satisfies(softwareVersion, x.versionRange, { includePrerelease: true }) ||
maybeRegexpMatch(x.versionRange, softwareVersion)
)
)
);