Skip to content

Commit 078362e

Browse files
authored
chore(settings): Move settings client API (#36844)
1 parent 5010b36 commit 078362e

File tree

37 files changed

+187
-279
lines changed

37 files changed

+187
-279
lines changed

apps/meteor/app/autotranslate/client/lib/autotranslate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import mem from 'mem';
1111
import { Meteor } from 'meteor/meteor';
1212
import { Tracker } from 'meteor/tracker';
1313

14+
import { settings } from '../../../../client/lib/settings';
1415
import { Messages, Subscriptions } from '../../../../client/stores';
1516
import {
1617
hasTranslationLanguageInAttachments,
1718
hasTranslationLanguageInMessage,
1819
} from '../../../../client/views/room/MessageList/lib/autoTranslate';
1920
import { hasPermission } from '../../../authorization/client';
20-
import { settings } from '../../../settings/client';
2121
import { sdk } from '../../../utils/client/lib/SDKClient';
2222

2323
let userLanguage = 'en';
@@ -103,7 +103,7 @@ export const AutoTranslate = {
103103

104104
Tracker.autorun(async (c) => {
105105
const uid = Meteor.userId();
106-
if (!settings.get('AutoTranslate_Enabled') || !uid || !hasPermission('auto-translate')) {
106+
if (!settings.watch('AutoTranslate_Enabled') || !uid || !hasPermission('auto-translate')) {
107107
return;
108108
}
109109

apps/meteor/app/lib/client/OAuthProxy.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { OAuth } from 'meteor/oauth';
22

3-
import { settings } from '../../settings/client';
3+
import { settings } from '../../../client/lib/settings';
44

55
OAuth.launchLogin = ((func) =>
66
function (options) {
7-
const proxy = settings.get('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(',');
7+
const proxy = settings.peek('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(',');
88
if (proxy.includes(options.loginService)) {
99
const redirectUri = options.loginUrl.match(/(&redirect_uri=)([^&]+|$)/)?.[2];
1010
options.loginUrl = options.loginUrl.replace(
1111
/(&redirect_uri=)([^&]+|$)/,
12-
`$1${encodeURIComponent(settings.get('Accounts_OAuth_Proxy_host'))}/oauth_redirect`,
12+
`$1${encodeURIComponent(settings.peek('Accounts_OAuth_Proxy_host') ?? '')}/oauth_redirect`,
1313
);
1414
options.loginUrl = options.loginUrl.replace(/(&state=)([^&]+|$)/, `$1${redirectUri}!$2`);
15-
options.loginUrl = `${settings.get('Accounts_OAuth_Proxy_host')}/redirect/${encodeURIComponent(options.loginUrl)}`;
15+
options.loginUrl = `${settings.peek('Accounts_OAuth_Proxy_host')}/redirect/${encodeURIComponent(options.loginUrl)}`;
1616
}
1717

1818
return func(options);

apps/meteor/app/lib/client/methods/sendMessage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
33
import { Meteor } from 'meteor/meteor';
44

55
import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
6+
import { settings } from '../../../../client/lib/settings';
67
import { dispatchToastMessage } from '../../../../client/lib/toast';
78
import { Messages, Rooms } from '../../../../client/stores';
89
import { callbacks } from '../../../../lib/callbacks';
910
import { trim } from '../../../../lib/utils/stringUtils';
10-
import { settings } from '../../../settings/client';
1111
import { t } from '../../../utils/lib/i18n';
1212

1313
Meteor.methods<ServerMethods>({
@@ -31,7 +31,7 @@ Meteor.methods<ServerMethods>({
3131
name: user.name || '',
3232
};
3333
message.temp = true;
34-
if (settings.get('Message_Read_Receipt_Enabled')) {
34+
if (settings.peek('Message_Read_Receipt_Enabled')) {
3535
message.unread = true;
3636
}
3737

apps/meteor/app/livechat/client/lib/stream/queueManager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import type { ILivechatDepartment, ILivechatInquiryRecord, IOmnichannelAgent, Se
33
import { useLivechatInquiryStore } from '../../../../../client/hooks/useLivechatInquiryStore';
44
import { queryClient } from '../../../../../client/lib/queryClient';
55
import { roomsQueryKeys } from '../../../../../client/lib/queryKeys';
6+
import { settings } from '../../../../../client/lib/settings';
67
import { callWithErrorHandling } from '../../../../../client/lib/utils/callWithErrorHandling';
78
import { mapMessageFromApi } from '../../../../../client/lib/utils/mapMessageFromApi';
8-
import { settings } from '../../../../settings/client';
99
import { sdk } from '../../../../utils/client/lib/SDKClient';
1010

1111
const departments = new Set();
@@ -58,7 +58,7 @@ const removeInquiry = async (inquiry: ILivechatInquiryRecord) => {
5858
};
5959

6060
const getInquiriesFromAPI = async () => {
61-
const count = settings.get('Livechat_guest_pool_max_number_incoming_livechats_displayed') ?? 0;
61+
const count = settings.peek('Livechat_guest_pool_max_number_incoming_livechats_displayed') ?? 0;
6262
const { inquiries } = await sdk.rest.get('/v1/livechat/inquiries.queuedForUser', { count });
6363
return inquiries;
6464
};

apps/meteor/app/settings/client/index.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/meteor/app/settings/client/lib/settings.ts

Lines changed: 0 additions & 44 deletions
This file was deleted.

apps/meteor/app/settings/lib/settings.ts

Lines changed: 0 additions & 137 deletions
This file was deleted.

apps/meteor/app/slackbridge/client/slackbridge_import.client.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { settings } from '../../settings/client';
1+
import { settings } from '../../../client/lib/settings';
22
import { slashCommands } from '../../utils/client/slashCommand';
33

4-
settings.onload('SlackBridge_Enabled', (_key, value) => {
4+
settings.observe('SlackBridge_Enabled', (_key, value) => {
55
if (value) {
66
slashCommands.add({
77
command: 'slackbridge-import',

apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { flushSync } from 'react-dom';
55

66
import AddLinkComposerActionModal from './AddLinkComposerActionModal';
77
import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
8-
import { settings } from '../../../settings/client';
8+
import { settings } from '../../../../client/lib/settings';
99

1010
type FormattingButtonDefault = { label: TranslationKey; condition?: () => boolean };
1111

@@ -90,17 +90,17 @@ export const formattingButtons: ReadonlyArray<FormattingButton> = [
9090
label: 'KaTeX' as TranslationKey,
9191
icon: 'katex',
9292
text: () => {
93-
if (!settings.get('Katex_Enabled')) {
93+
if (!settings.peek('Katex_Enabled')) {
9494
return;
9595
}
96-
if (settings.get('Katex_Dollar_Syntax')) {
96+
if (settings.peek('Katex_Dollar_Syntax')) {
9797
return '$$KaTeX$$';
9898
}
99-
if (settings.get('Katex_Parenthesis_Syntax')) {
99+
if (settings.peek('Katex_Parenthesis_Syntax')) {
100100
return '\\[KaTeX\\]';
101101
}
102102
},
103103
link: 'https://khan.github.io/KaTeX/function-support.html',
104-
condition: () => settings.get('Katex_Enabled'),
104+
condition: () => settings.watch('Katex_Enabled') ?? true,
105105
},
106106
] as const;

apps/meteor/app/ui/client/lib/UserAction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { Emitter } from '@rocket.chat/emitter';
33
import { debounce } from 'lodash';
44
import { Meteor } from 'meteor/meteor';
55

6+
import { settings } from '../../../../client/lib/settings';
67
import { Users } from '../../../../client/stores';
7-
import { settings } from '../../../settings/client';
88
import { sdk } from '../../../utils/client/lib/SDKClient';
99

1010
const TIMEOUT = 15000;
@@ -32,7 +32,7 @@ const shownName = function (user: IUser | null | undefined): string | undefined
3232
if (!user) {
3333
return;
3434
}
35-
if (settings.get('UI_Use_Real_Name')) {
35+
if (settings.peek('UI_Use_Real_Name')) {
3636
return user.name;
3737
}
3838
return user.username;

0 commit comments

Comments
 (0)