verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Server Version (#1392)

This commit is contained in:
Djorkaeff Alexandre 2019-11-18 14:50:00 -03:00 committed by Diego Mello
parent b7ebd3bc07
commit 5ff07a65fe
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/methods/getCustomEmojis.js
View File

@ -91,7 +91,7 @@ export function getCustomEmojis() {
const updatedSince = await getUpdatedSince(allRecords); const updatedSince = await getUpdatedSince(allRecords);
// if server version is lower than 0.75.0, fetches from old api // if server version is lower than 0.75.0, fetches from old api
if (semver.lt(serverVersion, '0.75.0')) { if (serverVersion && semver.lt(serverVersion, '0.75.0')) {
// RC 0.61.0 // RC 0.61.0
const result = await this.sdk.get('emoji-custom'); const result = await this.sdk.get('emoji-custom');

2
app/lib/methods/getPermissions.js
View File

@ -79,7 +79,7 @@ export default function() {
const allRecords = await permissionsCollection.query().fetch(); const allRecords = await permissionsCollection.query().fetch();
// if server version is lower than 0.73.0, fetches from old api // if server version is lower than 0.73.0, fetches from old api
if (semver.lt(serverVersion, '0.73.0')) { if (serverVersion && semver.lt(serverVersion, '0.73.0')) {
// RC 0.66.0 // RC 0.66.0
const result = await this.sdk.get('permissions.list'); const result = await this.sdk.get('permissions.list');
if (!result.success) { if (!result.success) {

2
app/lib/rocketchat.js
View File

@ -1031,7 +1031,7 @@ const RocketChat = {
const serverVersion = reduxStore.getState().server.version; const serverVersion = reduxStore.getState().server.version;
// if server is lower than 1.1.0 // if server is lower than 1.1.0
if (semver.lt(semver.coerce(serverVersion), '1.1.0')) { if (serverVersion && semver.lt(semver.coerce(serverVersion), '1.1.0')) {
if (this.activeUsersSubTimeout) { if (this.activeUsersSubTimeout) {
clearTimeout(this.activeUsersSubTimeout); clearTimeout(this.activeUsersSubTimeout);
this.activeUsersSubTimeout = false; this.activeUsersSubTimeout = false;

2
app/sagas/selectServer.js
View File

@ -22,7 +22,7 @@ import { SERVERS, TOKEN, SERVER_URL } from '../constants/userDefaults';
const getServerInfo = function* getServerInfo({ server, raiseError = true }) { const getServerInfo = function* getServerInfo({ server, raiseError = true }) {
try { try {
const serverInfo = yield RocketChat.getServerInfo(server); const serverInfo = yield RocketChat.getServerInfo(server);
let websocketInfo = true; let websocketInfo = { success: true };
if (raiseError) { if (raiseError) {
websocketInfo = yield RocketChat.getWebsocketInfo({ server }); websocketInfo = yield RocketChat.getWebsocketInfo({ server });
} }