Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 90f0a62

Browse files
committedMar 23, 2020
[FIX] Server version cached
1 parent b6b936f commit 90f0a62

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed
 

‎app/lib/methods/getUsersPresence.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ export default async function getUsersPresence() {
2929
const { user: loggedUser } = reduxStore.getState().login;
3030

3131
// if server is greather than or equal 1.1.0
32-
if (serverVersion && !semver.lt(serverVersion, '1.1.0')) {
32+
if (serverVersion && semver.gte(serverVersion, '1.1.0')) {
3333
let params = {};
3434

3535
// if server is greather than or equal 3.0.0
36-
if (serverVersion && !semver.lt(serverVersion, '3.0.0')) {
36+
if (serverVersion && semver.gte(serverVersion, '3.0.0')) {
3737
// if not have any id
3838
if (!ids.length) {
3939
return;

‎app/sagas/selectServer.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,23 @@ const getServerInfo = function* getServerInfo({ server, raiseError = true }) {
3737
return;
3838
}
3939

40-
const { version: validVersion } = semver.coerce(serverInfo.version);
40+
let serverVersion = semver.valid(serverInfo.version);
41+
if (serverVersion) {
42+
({ version: serverVersion } = semver.coerce(serverInfo.version));
43+
}
4144

4245
const serversDB = database.servers;
4346
const serversCollection = serversDB.collections.get('servers');
4447
yield serversDB.action(async() => {
4548
try {
4649
const serverRecord = await serversCollection.find(server);
4750
await serverRecord.update((record) => {
48-
record.version = validVersion;
51+
record.version = serverVersion;
4952
});
5053
} catch (e) {
5154
await serversCollection.create((record) => {
5255
record._raw = sanitizedRaw({ id: server }, serversCollection.schema);
53-
record.version = validVersion;
56+
record.version = serverVersion;
5457
});
5558
}
5659
});

0 commit comments

Comments
 (0)
Please sign in to comment.