Skip to content

[FIX] avoid send presence without login #11074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
engelgabriel merged 1 commit into from
Jun 10, 2018
Merged

[FIX] avoid send presence without login #11074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .meteor/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ konecty:change-case@2.3.0
konecty:delayed-task@1.0.0
konecty:mongo-counter@0.0.5_3
konecty:multiple-instances-status@1.1.0
konecty:user-presence@2.0.1
konecty:user-presence@2.1.0
launch-screen@1.1.1
less@2.7.12
livedata@1.0.18
Expand Down
73 changes: 34 additions & 39 deletions client/startup/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,7 @@ if (window.DISABLE_ANIMATION) {
Meteor.startup(function() {
TimeSync.loggingEnabled = false;

const userHasPreferences = (user) => {
if (!user) {
return false;
}

const userHasSettings = user.hasOwnProperty('settings');

if (!userHasSettings) {
return false;
}

return user.settings.hasOwnProperty('preferences');
};

Meteor.subscribe('activeUsers');

Session.setDefault('AvatarRandom', 0);

Expand Down Expand Up @@ -91,41 +77,50 @@ Meteor.startup(function() {
}
};

const defaultIdleTimeLimit = 300;

Meteor.subscribe('userData', function() {
const user = Meteor.user();
const userLanguage = user && user.language ? user.language : window.defaultUserLanguage();
Meteor.subscribe('userData');

if (!userHasPreferences(user)) {
UserPresence.awayTime = defaultIdleTimeLimit * 1000;
UserPresence.start();
} else {
UserPresence.awayTime = (user.settings.preferences.idleTimeLimit || defaultIdleTimeLimit) * 1000;
Tracker.autorun(function(computation) {
if (!Meteor.userId() && !RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
return;
}
Meteor.subscribe('activeUsers');
computation.stop();
});

if (user.settings.preferences.hasOwnProperty('enableAutoAway')) {
user.settings.preferences.enableAutoAway && UserPresence.start();
} else {
UserPresence.start();
let status = undefined;
Tracker.autorun(function() {
if (!Meteor.userId()) {
return;
}
const user = RocketChat.models.Users.findOne(Meteor.userId(), {
fields: {
status: 1,
language: 1,
'settings.idleTimeLimit': 1,
'settings.enableAutoAway': 1
}
});

if (!user) {
return;
}

const userLanguage = user.language ? user.language : window.defaultUserLanguage();
if (localStorage.getItem('userLanguage') !== userLanguage) {
localStorage.setItem('userLanguage', userLanguage);
window.setLanguage(userLanguage);
}

window.setLanguage(userLanguage);
if (RocketChat.getUserPreference(user, 'enableAutoAway')) {
const idleTimeLimit = RocketChat.getUserPreference(user, 'idleTimeLimit') || 300;
UserPresence.awayTime = idleTimeLimit * 1000;
}

let status = undefined;
Tracker.autorun(function() {
if (!Meteor.userId()) {
return;
}
UserPresence.start();

if (user && user.status !== status) {
status = user.status;
fireGlobalEvent('status-changed', status);
}
});
if (user.status !== status) {
status = user.status;
fireGlobalEvent('status-changed', status);
}
});
});