Skip to content

[FIX] Server Errors on new Client Connections #19266

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
sampaiodiego merged 2 commits into from
Oct 23, 2020
Merged

[FIX] Server Errors on new Client Connections #19266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ad7bb
[FIX] Exceptions on server start
pierre-lehnen-rc Oct 15, 2020
334e8f0
Update autotranslate.js
sampaiodiego Oct 23, 2020
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
1 change: 1 addition & 0 deletions app/api/server/v1/autotranslate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ API.v1.addRoute('autotranslate.saveSettings', { authRequired: true }, {
if (!settings.get('AutoTranslate_Enabled')) {
return API.v1.failure('AutoTranslate is disabled.');
}

if (!roomId) {
return API.v1.failure('The bodyParam "roomId" is required.');
}
Expand Down
28 changes: 22 additions & 6 deletions app/autotranslate/client/lib/autotranslate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import mem from 'mem';
import { Subscriptions, Messages } from '../../../models';
import { callbacks } from '../../../callbacks';
import { settings } from '../../../settings';
import { hasAtLeastOnePermission } from '../../../authorization';
import { hasAtLeastOnePermission, hasPermission } from '../../../authorization';
import { CachedCollectionManager } from '../../../ui-cached-collection';

let userLanguage = 'en';
Expand Down Expand Up @@ -60,12 +60,28 @@ export const AutoTranslate = {
},

init() {
Meteor.call('autoTranslate.getSupportedLanguages', 'en', (err, languages) => {
this.supportedLanguages = languages || [];
});
this.supportedLanguages = [];
this.providersMetadata = {};

Tracker.autorun((c) => {
const uid = Meteor.userId();
if (!uid) {
return;
}

Meteor.call('autoTranslate.getProviderUiMetadata', (err, metadata) => {
this.providersMetadata = metadata;
});

if (!hasPermission('auto-translate')) {
return;
}

Meteor.call('autoTranslate.getSupportedLanguages', 'en', (err, languages) => {
this.supportedLanguages = languages || [];
});

Meteor.call('autoTranslate.getProviderUiMetadata', (err, metadata) => {
this.providersMetadata = metadata;
c.stop();
});

Tracker.autorun(() => {
Expand Down
2 changes: 1 addition & 1 deletion app/ui-message/client/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Template.message.helpers({
translationProvider() {
const instance = Template.instance();
const { translationProvider } = instance.data.msg;
return translationProvider && AutoTranslate.providersMetadata[translationProvider].displayName;
return translationProvider && AutoTranslate.providersMetadata[translationProvider]?.displayName;
},
edited() {
const { msg } = this;
Expand Down
5 changes: 5 additions & 0 deletions client/startup/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import toastr from 'toastr';
import hljs from '../../app/markdown/lib/hljs';
import { fireGlobalEvent, alerts } from '../../app/ui-utils';
import { getUserPreference, t } from '../../app/utils';
import { hasPermission } from '../../app/authorization/client';
import 'highlight.js/styles/github.css';
import { syncUserdata } from '../lib/userData';

Expand Down Expand Up @@ -69,6 +70,10 @@ Meteor.startup(function() {
return;
}

if (!hasPermission('manage-cloud')) {
return;
}

Meteor.call('cloud:checkRegisterStatus', (err, data) => {
if (err) {
console.log(err);
Expand Down