Skip to content

Commit 431a256

Browse files
committed
fixed wrong calculation of newer version available check #208
1 parent 38ad384 commit 431a256

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

ui/App/views/Mods/components/Mod.jsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import modsResource from "../../../../api/resources/mods";
1212
import React, {useEffect, useState} from "react";
1313
import {coerce, gt, satisfies} from "semver";
1414

15-
const Mod = ({ mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatableMod}) => {
15+
const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatableMod}) => {
1616

1717
const [newVersion, setNewVersion] = useState(null)
1818
const [icon, setIcon] = useState(faArrowCircleUp)
@@ -25,9 +25,15 @@ const Mod = ({ mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatab
2525
let newestRelease;
2626
data.releases.forEach(release => {
2727
if (
28-
gt(coerce(release.version).version, coerce(mod.version).version) && (
29-
satisfies(factorioVersion, coerce(release.info_json.factorio_version).version) ||
30-
(satisfies(factorioVersion, "1.0.0") && satisfies(coerce(release.info_json.factorio_version).version, "0.18.x"))
28+
gt(
29+
coerce(release.version),
30+
coerce(mod.version)
31+
) && (
32+
satisfies(factorioVersion, "~"+coerce(release.info_json.factorio_version).version) ||
33+
(
34+
satisfies(factorioVersion, "1.0.0") &&
35+
satisfies(coerce(release.info_json.factorio_version), "0.18.x")
36+
)
3137
)
3238
) {
3339
if (!newestRelease) {

ui/App/views/Mods/components/ModList.jsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,17 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
1717
</tr>
1818
</thead>
1919
<tbody>
20-
{factorioVersion !== null && mods.map((mod, i) => <Mod mod={mod} key={i}
21-
updateMod={updateMod}
22-
toggleMod={toggleMod}
23-
deleteMod={deleteMod}
24-
addUpdatableMod={addUpdatableMod}
25-
factorioVersion={factorioVersion}/>)}
20+
{
21+
factorioVersion !== null && mods.map(
22+
(mod, i) =>
23+
<Mod mod={mod} key={i}
24+
updateMod={updateMod}
25+
toggleMod={toggleMod}
26+
deleteMod={deleteMod}
27+
addUpdatableMod={addUpdatableMod}
28+
factorioVersion={factorioVersion}/>
29+
)
30+
}
2631
</tbody>
2732
</table>
2833
)

0 commit comments

Comments
 (0)