TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Reworked the settings module

master
WolverinDEV 2021-01-10 16:13:15 +01:00 committed by WolverinDEV
parent b3848a8d12
commit 20ea542598
65 changed files with 725 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shared/js/ConnectionHandler.ts
View File

@ -248,13 +248,13 @@ export class ConnectionHandler {
} }
initialize_client_state(source?: ConnectionHandler) { initialize_client_state(source?: ConnectionHandler) {
this.client_status.input_muted = source ? source.client_status.input_muted : settings.global(Settings.KEY_CLIENT_STATE_MICROPHONE_MUTED); this.client_status.input_muted = source ? source.client_status.input_muted : settings.getValue(Settings.KEY_CLIENT_STATE_MICROPHONE_MUTED);
this.client_status.output_muted = source ? source.client_status.output_muted : settings.global(Settings.KEY_CLIENT_STATE_SPEAKER_MUTED); this.client_status.output_muted = source ? source.client_status.output_muted : settings.getValue(Settings.KEY_CLIENT_STATE_SPEAKER_MUTED);
this.update_voice_status(); this.update_voice_status();
this.setSubscribeToAllChannels(source ? source.client_status.channel_subscribe_all : settings.global(Settings.KEY_CLIENT_STATE_SUBSCRIBE_ALL_CHANNELS)); this.setSubscribeToAllChannels(source ? source.client_status.channel_subscribe_all : settings.getValue(Settings.KEY_CLIENT_STATE_SUBSCRIBE_ALL_CHANNELS));
this.doSetAway(source ? source.client_status.away : (settings.global(Settings.KEY_CLIENT_STATE_AWAY) ? settings.global(Settings.KEY_CLIENT_AWAY_MESSAGE) : false), false); this.doSetAway(source ? source.client_status.away : (settings.getValue(Settings.KEY_CLIENT_STATE_AWAY) ? settings.getValue(Settings.KEY_CLIENT_AWAY_MESSAGE) : false), false);
this.setQueriesShown(source ? source.client_status.queries_visible : settings.global(Settings.KEY_CLIENT_STATE_QUERY_SHOWN)); this.setQueriesShown(source ? source.client_status.queries_visible : settings.getValue(Settings.KEY_CLIENT_STATE_QUERY_SHOWN));
} }
events() : Registry<ConnectionEvents> { events() : Registry<ConnectionEvents> {
@ -457,7 +457,7 @@ export class ConnectionHandler {
control_bar.apply_server_voice_state(); control_bar.apply_server_voice_state();
*/ */
if(__build.target === "web" && settings.static_global(Settings.KEY_VOICE_ECHO_TEST_ENABLED)) { if(__build.target === "web" && settings.getValue(Settings.KEY_VOICE_ECHO_TEST_ENABLED)) {
this.serverFeatures.awaitFeatures().then(result => { this.serverFeatures.awaitFeatures().then(result => {
if(!result) { if(!result) {
return; return;

4
shared/js/KeyControl.ts
View File

@ -135,7 +135,7 @@ let config: Config;
export function initialize() { export function initialize() {
let cfg: Config; let cfg: Config;
try { try {
cfg = JSON.parse(settings.global(Settings.KEY_KEYCONTROL_DATA)); cfg = JSON.parse(settings.getValue(Settings.KEY_KEYCONTROL_DATA));
} catch (e) { } catch (e) {
log.error(LogCategory.GENERAL, tr("Failed to parse old key control data.")); log.error(LogCategory.GENERAL, tr("Failed to parse old key control data."));
cfg = {}; cfg = {};
@ -163,7 +163,7 @@ export function initialize() {
} }
function save_config() { function save_config() {
settings.changeGlobal(Settings.KEY_KEYCONTROL_DATA, JSON.stringify(config)); settings.setValue(Settings.KEY_KEYCONTROL_DATA, JSON.stringify(config));
} }
function bind_key(action: string, key: KeyDescriptor) { function bind_key(action: string, key: KeyDescriptor) {

2
shared/js/audio/recorder.ts
View File

@ -175,7 +175,7 @@ loader.register_task(Stage.JAVASCRIPT_INITIALIZING, {
function: async () => { function: async () => {
const backend = getRecorderBackend(); const backend = getRecorderBackend();
if(backend.isRnNoiseSupported()) { if(backend.isRnNoiseSupported()) {
getRecorderBackend().toggleRnNoise(settings.static_global(Settings.KEY_RNNOISE_FILTER)); getRecorderBackend().toggleRnNoise(settings.getValue(Settings.KEY_RNNOISE_FILTER));
settings.globalChangeListener(Settings.KEY_RNNOISE_FILTER, value => getRecorderBackend().toggleRnNoise(value)); settings.globalChangeListener(Settings.KEY_RNNOISE_FILTER, value => getRecorderBackend().toggleRnNoise(value));
} }
} }

2
shared/js/connection/rtc/video/Connection.ts
View File

@ -365,7 +365,7 @@ export class RtpVideoConnection implements VideoConnection {
client.setBroadcastId("camera", undefined); client.setBroadcastId("camera", undefined);
}); });
if(settings.static_global(Settings.KEY_STOP_VIDEO_ON_SWITCH)) { if(settings.getValue(Settings.KEY_STOP_VIDEO_ON_SWITCH)) {
Object.values(this.broadcasts).forEach(broadcast => broadcast.stopBroadcasting()); Object.values(this.broadcasts).forEach(broadcast => broadcast.stopBroadcasting());
} else { } else {
/* The server stops broadcasting by default, we've to reenable it */ /* The server stops broadcasting by default, we've to reenable it */

2
shared/js/connectionlog/DispatcherFocus.ts
View File

@ -15,5 +15,5 @@ export function requestWindowFocus() {
} }
export function isFocusRequestEnabled(type: EventType) { export function isFocusRequestEnabled(type: EventType) {
return settings.global(Settings.FN_EVENTS_FOCUS_ENABLED(type), focusDefaultStatus[type as any] || false); return settings.getValue(Settings.FN_EVENTS_FOCUS_ENABLED(type), focusDefaultStatus[type as any] || false);
} }

2
shared/js/connectionlog/DispatcherNotifications.ts
View File

@ -42,7 +42,7 @@ export function getRegisteredNotificationDispatchers() : TypeInfo[] {
} }
export function isNotificationEnabled(type: EventType) { export function isNotificationEnabled(type: EventType) {
return settings.global(Settings.FN_EVENTS_NOTIFICATION_ENABLED(type), notificationDefaultStatus[type as any] || false); return settings.getValue(Settings.FN_EVENTS_NOTIFICATION_ENABLED(type), notificationDefaultStatus[type as any] || false);
} }
const kDefaultIcon = "img/teaspeak_cup_animated.png"; const kDefaultIcon = "img/teaspeak_cup_animated.png";

2
shared/js/connectionlog/ServerEventLog.tsx
View File

@ -31,7 +31,7 @@ export class ServerEventLog {
uniqueId: "log-" + Date.now() + "-" + (++uniqueLogEventId) uniqueId: "log-" + Date.now() + "-" + (++uniqueLogEventId)
}; };
if(settings.global(Settings.FN_EVENTS_LOG_ENABLED(type), true)) { if(settings.getValue(Settings.FN_EVENTS_LOG_ENABLED(type), true)) {
this.eventLog.push(event); this.eventLog.push(event);
while(this.eventLog.length > this.maxHistoryLength) { while(this.eventLog.length > this.maxHistoryLength) {
this.eventLog.pop_front(); this.eventLog.pop_front();

4
shared/js/conversations/ChannelConversationManager.ts
View File

@ -42,7 +42,7 @@ export class ChannelConversation extends AbstractChat<ChannelConversationEvents>
this.conversationId = id; this.conversationId = id;
this.preventUnreadUpdate = true; this.preventUnreadUpdate = true;
const unreadTimestamp = handle.connection.settings.server(Settings.FN_CHANNEL_CHAT_READ(id), Date.now()); const unreadTimestamp = handle.connection.settings.getValue(Settings.FN_CHANNEL_CHAT_READ(id), Date.now());
this.setUnreadTimestamp(unreadTimestamp); this.setUnreadTimestamp(unreadTimestamp);
this.preventUnreadUpdate = false; this.preventUnreadUpdate = false;
@ -292,7 +292,7 @@ export class ChannelConversation extends AbstractChat<ChannelConversationEvents>
return; return;
} }
this.handle.connection.settings.changeServer(Settings.FN_CHANNEL_CHAT_READ(this.conversationId), timestamp); this.handle.connection.settings.setValue(Settings.FN_CHANNEL_CHAT_READ(this.conversationId), timestamp);
} }
public setConversationMode(mode: ChannelConversationMode, logChange: boolean) { public setConversationMode(mode: ChannelConversationMode, logChange: boolean) {

6
shared/js/file/RemoteAvatars.ts
View File

@ -9,7 +9,7 @@ import {
setGlobalAvatarManagerFactory, uniqueId2AvatarId setGlobalAvatarManagerFactory, uniqueId2AvatarId
} from "../file/Avatars"; } from "../file/Avatars";
import {IPCChannel} from "../ipc/BrowserIPC"; import {IPCChannel} from "../ipc/BrowserIPC";
import {Settings} from "../settings"; import {AppParameters} from "../settings";
import {ChannelMessage} from "../ipc/BrowserIPC"; import {ChannelMessage} from "../ipc/BrowserIPC";
import {guid} from "../crypto/uid"; import {guid} from "../crypto/uid";
import { tr } from "tc-shared/i18n/localize"; import { tr } from "tc-shared/i18n/localize";
@ -159,7 +159,7 @@ class RemoteAvatarManagerFactory extends AbstractAvatarManagerFactory {
constructor() { constructor() {
super(); super();
this.ipcChannel = ipc.getIpcInstance().createChannel(Settings.instance.static(Settings.KEY_IPC_REMOTE_ADDRESS, "invalid"), kIPCAvatarChannel); this.ipcChannel = ipc.getIpcInstance().createChannel(AppParameters.getValue(AppParameters.KEY_IPC_REMOTE_ADDRESS, "invalid"), kIPCAvatarChannel);
this.ipcChannel.messageHandler = this.handleIpcMessage.bind(this); this.ipcChannel.messageHandler = this.handleIpcMessage.bind(this);
} }
@ -187,7 +187,7 @@ class RemoteAvatarManagerFactory extends AbstractAvatarManagerFactory {
return typeof this.manager[handlerId] !== "undefined"; return typeof this.manager[handlerId] !== "undefined";
} }
private handleIpcMessage(remoteId: string, broadcast: boolean, message: ChannelMessage) { private handleIpcMessage(_remoteId: string, broadcast: boolean, message: ChannelMessage) {
if(broadcast) { if(broadcast) {
if(message.type === "notify-handler-destroyed") { if(message.type === "notify-handler-destroyed") {
const manager = this.manager[message.data.handler]; const manager = this.manager[message.data.handler];

4
shared/js/file/RemoteIcons.ts
View File

@ -3,7 +3,7 @@ import * as loader from "tc-loader";
import {Stage} from "tc-loader"; import {Stage} from "tc-loader";
import {ChannelMessage, IPCChannel} from "tc-shared/ipc/BrowserIPC"; import {ChannelMessage, IPCChannel} from "tc-shared/ipc/BrowserIPC";
import * as ipc from "tc-shared/ipc/BrowserIPC"; import * as ipc from "tc-shared/ipc/BrowserIPC";
import {Settings} from "tc-shared/settings"; import {AppParameters} from "tc-shared/settings";
import {LogCategory, logWarn} from "tc-shared/log"; import {LogCategory, logWarn} from "tc-shared/log";
class RemoteRemoteIcon extends RemoteIcon { class RemoteRemoteIcon extends RemoteIcon {
@ -33,7 +33,7 @@ class RemoteIconManager extends AbstractIconManager {
constructor() { constructor() {
super(); super();
this.ipcChannel = ipc.getIpcInstance().createChannel(Settings.instance.static(Settings.KEY_IPC_REMOTE_ADDRESS, "invalid"), kIPCIconChannel); this.ipcChannel = ipc.getIpcInstance().createChannel(AppParameters.getValue(AppParameters.KEY_IPC_REMOTE_ADDRESS, "invalid"), kIPCIconChannel);
this.ipcChannel.messageHandler = this.handleIpcMessage.bind(this); this.ipcChannel.messageHandler = this.handleIpcMessage.bind(this);
} }

6
shared/js/log.ts
View File

@ -100,13 +100,13 @@ const defaultGroupMode: GroupMode = GroupMode.PREFIX;
export function initialize(defaultLogLevel: LogType) { export function initialize(defaultLogLevel: LogType) {
for(const category of Object.keys(LogCategory).map(e => parseInt(e)).filter(e => !isNaN(e))) { for(const category of Object.keys(LogCategory).map(e => parseInt(e)).filter(e => !isNaN(e))) {
const categoryName = LogCategory[category].toLowerCase(); const categoryName = LogCategory[category].toLowerCase();
enabled_mapping.set(category, settings.static_global(Settings.FN_LOG_ENABLED(categoryName), enabled_mapping.get(category))); enabled_mapping.set(category, settings.getValue(Settings.FN_LOG_ENABLED(categoryName), enabled_mapping.get(category)));
} }
const baseLogLevel = settings.static_global(Settings.KEY_LOG_LEVEL, defaultLogLevel); const baseLogLevel = settings.getValue(Settings.KEY_LOG_LEVEL, defaultLogLevel);
for(const level of Object.keys(LogType).map(e => parseInt(e)).filter(e => !isNaN(e))) { for(const level of Object.keys(LogType).map(e => parseInt(e)).filter(e => !isNaN(e))) {
const levelName = LogType[level].toLowerCase(); const levelName = LogType[level].toLowerCase();
level_mapping.set(level, settings.static_global(Settings.FN_LOG_LEVEL_ENABLED(levelName), level >= baseLogLevel)); level_mapping.set(level, settings.getValue(Settings.FN_LOG_LEVEL_ENABLED(levelName), level >= baseLogLevel));
} }
} }

215
shared/js/main.tsx
View File

@ -1,6 +1,6 @@
import * as loader from "tc-loader"; import * as loader from "tc-loader";
import {Stage} from "tc-loader"; import {Stage} from "tc-loader";
import {settings, Settings} from "tc-shared/settings"; import {AppParameters, settings, Settings} from "tc-shared/settings";
import * as log from "tc-shared/log"; import * as log from "tc-shared/log";
import {LogCategory} from "tc-shared/log"; import {LogCategory} from "tc-shared/log";
import * as bipc from "./ipc/BrowserIPC"; import * as bipc from "./ipc/BrowserIPC";
@ -23,7 +23,7 @@ import * as global_ev_handler from "./events/ClientGlobalControlHandler";
import {global_client_actions} from "tc-shared/events/GlobalEvents"; import {global_client_actions} from "tc-shared/events/GlobalEvents";
import {FileTransferState, TransferProvider,} from "tc-shared/file/Transfer"; import {FileTransferState, TransferProvider,} from "tc-shared/file/Transfer";
import {MenuEntryType, spawn_context_menu} from "tc-shared/ui/elements/ContextMenu"; import {MenuEntryType, spawn_context_menu} from "tc-shared/ui/elements/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import {checkForUpdatedApp} from "tc-shared/update"; import {checkForUpdatedApp} from "tc-shared/update";
import {setupJSRender} from "tc-shared/ui/jsrender"; import {setupJSRender} from "tc-shared/ui/jsrender";
import {ConnectRequestData} from "tc-shared/ipc/ConnectHandler"; import {ConnectRequestData} from "tc-shared/ipc/ConnectHandler";
@ -81,12 +81,7 @@ async function initialize_app() {
console.warn(tr("Failed to initialize audio controller!")); console.warn(tr("Failed to initialize audio controller!"));
} }
aplayer.on_ready(() => { aplayer.on_ready(() => aplayer.set_master_volume(settings.getValue(Settings.KEY_SOUND_MASTER) / 100));
if(aplayer.set_master_volume)
aplayer.on_ready(() => aplayer.set_master_volume(settings.global(Settings.KEY_SOUND_MASTER) / 100));
else
log.warn(LogCategory.GENERAL, tr("Client does not support aplayer.set_master_volume()... May client is too old?"));
});
setDefaultRecorder(new RecorderProfile("default")); setDefaultRecorder(new RecorderProfile("default"));
defaultRecorder.initialize().catch(error => { defaultRecorder.initialize().catch(error => {
@ -96,7 +91,7 @@ async function initialize_app() {
sound.initialize().then(() => { sound.initialize().then(() => {
log.info(LogCategory.AUDIO, tr("Sounds initialized")); log.info(LogCategory.AUDIO, tr("Sounds initialized"));
}); });
sound.set_master_volume(settings.global(Settings.KEY_SOUND_MASTER_SOUNDS) / 100); sound.set_master_volume(settings.getValue(Settings.KEY_SOUND_MASTER_SOUNDS) / 100);
try { try {
await ppt.initialize(); await ppt.initialize();
@ -116,7 +111,7 @@ export function handle_connect_request(properties: ConnectRequestData, connectio
const password_hashed = properties.password ? properties.password.hashed : false; const password_hashed = properties.password ? properties.password.hashed : false;
if(profile && profile.valid()) { if(profile && profile.valid()) {
settings.changeGlobal(Settings.KEY_USER_IS_NEW, false); settings.setValue(Settings.KEY_USER_IS_NEW, false);
if(!aplayer.initialized()) { if(!aplayer.initialized()) {
spawnYesNo(tra("Connect to {}", properties.address), tra("Would you like to connect to {}?", properties.address), result => { spawnYesNo(tra("Connect to {}", properties.address), tra("Would you like to connect to {}?", properties.address), result => {
@ -147,7 +142,7 @@ export function handle_connect_request(properties: ConnectRequestData, connectio
function main() { function main() {
/* initialize font */ /* initialize font */
{ {
const font = settings.static_global(Settings.KEY_FONT_SIZE); const font = settings.getValue(Settings.KEY_FONT_SIZE);
$(document.body).css("font-size", font + "px"); $(document.body).css("font-size", font + "px");
settings.globalChangeListener(Settings.KEY_FONT_SIZE, value => { settings.globalChangeListener(Settings.KEY_FONT_SIZE, value => {
$(document.body).css("font-size", value + "px"); $(document.body).css("font-size", value + "px");
@ -165,9 +160,7 @@ function main() {
spawn_context_menu(event.pageX, event.pageY, { spawn_context_menu(event.pageX, event.pageY, {
type: MenuEntryType.ENTRY, type: MenuEntryType.ENTRY,
name: tr("Copy"), name: tr("Copy"),
callback: () => { callback: () => copyToClipboard(event.target.value),
copy_to_clipboard(event.target.value);
},
icon_class: "client-copy", icon_class: "client-copy",
visible: !!event.target.value visible: !!event.target.value
}, { }, {
@ -181,21 +174,20 @@ function main() {
visible: __build.target === "client", visible: __build.target === "client",
}); });
} }
event.preventDefault(); event.preventDefault();
return; return;
} }
if(settings.static_global(Settings.KEY_DISABLE_GLOBAL_CONTEXT_MENU)) { if(settings.getValue(Settings.KEY_DISABLE_GLOBAL_CONTEXT_MENU)) {
event.preventDefault(); event.preventDefault();
} }
}); });
window.removeLoaderContextMenuHook(); window.removeLoaderContextMenuHook();
//top_menu.initialize(); const initialHandler = server_connections.spawn_server_connection();
server_connections.set_active_connection(initialHandler);
const initial_handler = server_connections.spawn_server_connection(); initialHandler.acquireInputHardware().then(() => {});
initial_handler.acquireInputHardware().then(() => {});
server_connections.set_active_connection(initial_handler);
/** Setup the XF forum identity **/ /** Setup the XF forum identity **/
fidentity.update_forum(); fidentity.update_forum();
@ -206,113 +198,17 @@ function main() {
anonymize_ip_addresses: true, anonymize_ip_addresses: true,
volatile_collection_only: false volatile_collection_only: false
}); });
stats.register_user_count_listener(status => { stats.register_user_count_listener(status => {
log.info(LogCategory.STATISTICS, tr("Received user count update: %o"), status); log.info(LogCategory.STATISTICS, tr("Received user count update: %o"), status);
}); });
server_connections.set_active_connection(server_connections.all_connections()[0]);
checkForUpdatedApp(); checkForUpdatedApp();
(window as any).test_download = async () => { if(settings.getValue(Settings.KEY_USER_IS_NEW) && !preventWelcomeUI) {
const connection = server_connections.active_connection();
const download = connection.fileManager.initializeFileDownload({
targetSupplier: async () => await TransferProvider.provider().createDownloadTarget(),
name: "HomeStudent2019Retail.img",
path: "/",
channel: 4
});
console.log("Download stated");
await download.awaitFinished();
console.log("Download finished (%s)", FileTransferState[download.transferState()]);
//console.log(await (download.target as ResponseTransferTarget).getResponse().blob());
console.log("Have buffer");
};
(window as any).test_upload = async () => {
const connection = server_connections.active_connection();
const download = connection.fileManager.initializeFileUpload({
source: async () => await TransferProvider.provider().createTextSource("Hello my lovely world...."),
name: "test-upload.txt",
path: "/",
channel: 4
});
console.log("Download stated");
await download.awaitFinished();
console.log("Download finished (%s)", FileTransferState[download.transferState()]);
//console.log(await (download.target as ResponseTransferTarget).getResponse().blob());
console.log("Have buffer");
};
/* schedule it a bit later then the main because the main function is still within the loader */
setTimeout(() => {
//(window as any).spawnVideo();
/*
Modals.createChannelModal(connection, undefined, undefined, connection.permissions, (cb, perms) => {
});
*/
// Modals.openServerInfo(connection.channelTree.server);
//Modals.createServerModal(connection.channelTree.server, properties => Promise.resolve());
//Modals.openClientInfo(connection.getClient());
//Modals.openServerInfoBandwidth(connection.channelTree.server);
//Modals.openBanList(connection);
/*
Modals.spawnBanClient(connection,[
{name: "WolverinDEV", unique_id: "XXXX"},
{name: "WolverinDEV", unique_id: "XXXX"},
{name: "WolverinDEV", unique_id: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"},
{name: "WolverinDEV", unique_id: "YYY"}
], () => {});
*/
}, 4000);
//spawnSettingsModal("general-keymap");
//Modals.spawnKeySelect(console.log);
//Modals.spawnBookmarkModal();
/*
{
const modal = createModal({
header: tr("Test Net Graph"),
body: () => {
const canvas = $.spawn("canvas")
.css("position", "absolute")
.css({
top: 0,
bottom: 0,
right: 0,
left: 0
});
return $.spawn("div")
.css("height", "5em")
.css("width", "30em")
.css("position", "relative")
.append(canvas);
},
footer: null
});
const graph = new net.graph.Graph(modal.htmlTag.find("canvas")[0] as any);
graph.initialize();
modal.close_listener.push(() => graph.terminate());
modal.open();
}
*/
//setTimeout(() => spawnPermissionEditorModal(server_connections.active_connection()), 3000);
//setTimeout(() => spawnGroupCreate(server_connections.active_connection(), "server"), 3000);
if(settings.static_global(Settings.KEY_USER_IS_NEW) && !preventWelcomeUI) {
const modal = openModalNewcomer(); const modal = openModalNewcomer();
modal.close_listener.push(() => settings.changeGlobal(Settings.KEY_USER_IS_NEW, false)); modal.close_listener.push(() => settings.setValue(Settings.KEY_USER_IS_NEW, false));
} }
//spawnGlobalSettingsEditor();
//spawnVideoPopout(server_connections.active_connection(), "https://www.youtube.com/watch?v=9683D18fyvs");
} }
const task_teaweb_starter: loader.Task = { const task_teaweb_starter: loader.Task = {
@ -325,14 +221,17 @@ const task_teaweb_starter: loader.Task = {
log.info(LogCategory.VOICE, tr("Initialize audio controller later!")); log.info(LogCategory.VOICE, tr("Initialize audio controller later!"));
if(!aplayer.initializeFromGesture) { if(!aplayer.initializeFromGesture) {
console.error(tr("Missing aplayer.initializeFromGesture")); console.error(tr("Missing aplayer.initializeFromGesture"));
} else } else {
$(document).one('click', () => aplayer.initializeFromGesture()); $(document).one('click', () => aplayer.initializeFromGesture());
} }
loader.config.abortAnimationOnFinish = settings.static_global(Settings.KEY_LOADER_ANIMATION_ABORT); }
loader.config.abortAnimationOnFinish = settings.getValue(Settings.KEY_LOADER_ANIMATION_ABORT);
} catch (ex) { } catch (ex) {
console.error(ex.stack); console.error(ex.stack);
if(ex instanceof ReferenceError || ex instanceof TypeError) if(ex instanceof ReferenceError || ex instanceof TypeError) {
ex = ex.name + ": " + ex.message; ex = ex.name + ": " + ex.message;
}
loader.critical_error("Failed to invoke main function:<br>" + ex); loader.critical_error("Failed to invoke main function:<br>" + ex);
} }
}, },
@ -342,24 +241,29 @@ const task_teaweb_starter: loader.Task = {
const task_connect_handler: loader.Task = { const task_connect_handler: loader.Task = {
name: "Connect handler", name: "Connect handler",
function: async () => { function: async () => {
const address = settings.static(Settings.KEY_CONNECT_ADDRESS, ""); const address = AppParameters.getValue(AppParameters.KEY_CONNECT_ADDRESS, undefined);
const chandler = bipc.getInstanceConnectHandler(); if(typeof address === "undefined") {
if(settings.static(Settings.KEY_FLAG_CONNECT_DEFAULT, false) && address) { loader.register_task(loader.Stage.LOADED, task_teaweb_starter);
const connect_data = { return;
}
/* FIXME: All additional parameters! */
const connectData = {
address: address, address: address,
profile: settings.static(Settings.KEY_CONNECT_PROFILE, ""), profile: AppParameters.getValue(AppParameters.KEY_CONNECT_PROFILE, ""),
username: settings.static(Settings.KEY_CONNECT_USERNAME, ""), username: AppParameters.getValue(AppParameters.KEY_CONNECT_NICKNAME, ""),
password: { password: {
value: settings.static(Settings.KEY_CONNECT_PASSWORD, ""), value: AppParameters.getValue(AppParameters.KEY_CONNECT_SERVER_PASSWORD, ""),
hashed: settings.static(Settings.KEY_FLAG_CONNECT_PASSWORD, false) hashed: true
} }
}; };
if(chandler && !settings.static(Settings.KEY_CONNECT_NO_SINGLE_INSTANCE)) { const chandler = bipc.getInstanceConnectHandler();
if(chandler && AppParameters.getValue(AppParameters.KEY_CONNECT_NO_SINGLE_INSTANCE)) {
try { try {
await chandler.post_connect_request(connect_data, () => new Promise<boolean>(resolve => { await chandler.post_connect_request(connectData, () => new Promise<boolean>(resolve => {
spawnYesNo(tr("Another TeaWeb instance is already running"), tra("Another TeaWeb instance is already running.{:br:}Would you like to connect there?"), response => { spawnYesNo(tr("Another TeaWeb instance is already running"), tra("Another TeaWeb instance is already running.{:br:}Would you like to connect there?"), response => {
resolve(response); resolve(response);
}, { }, {
@ -373,7 +277,7 @@ const task_connect_handler: loader.Task = {
"You could now close this page."; "You could now close this page.";
createInfoModal( createInfoModal(
tr("Connecting successfully within other instance"), tr("Connecting successfully within other instance"),
formatMessage(/* @tr-ignore */ tr(message), connect_data.address), formatMessage(/* @tr-ignore */ tr(message), connectData.address),
{ {
closeable: false, closeable: false,
footer: undefined footer: undefined
@ -383,19 +287,11 @@ const task_connect_handler: loader.Task = {
} catch(error) { } catch(error) {
log.info(LogCategory.CLIENT, tr("Failed to execute connect within other TeaWeb instance. Using this one. Error: %o"), error); log.info(LogCategory.CLIENT, tr("Failed to execute connect within other TeaWeb instance. Using this one. Error: %o"), error);
} }
}
preventWelcomeUI = true;
loader.register_task(loader.Stage.LOADED, {
priority: 0,
function: async () => handle_connect_request(connect_data, server_connections.active_connection() || server_connections.spawn_server_connection()),
name: tr("default url connect")
});
}
if(chandler) { if(chandler) {
/* no instance avail, so lets make us avail */ /* no instance avail, so lets make us avail */
chandler.callback_available = data => { chandler.callback_available = () => {
return !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION); return !settings.getValue(Settings.KEY_DISABLE_MULTI_SESSION);
}; };
chandler.callback_execute = data => { chandler.callback_execute = data => {
@ -404,15 +300,15 @@ const task_connect_handler: loader.Task = {
return true; return true;
} }
} }
loader.register_task(loader.Stage.LOADED, task_teaweb_starter); }
},
priority: 10
};
const task_certificate_callback: loader.Task = { preventWelcomeUI = true;
name: "certificate accept tester", loader.register_task(loader.Stage.LOADED, {
function: async () => { priority: 0,
loader.register_task(loader.Stage.LOADED, task_connect_handler); function: async () => handle_connect_request(connectData, server_connections.active_connection() || server_connections.spawn_server_connection()),
name: tr("default url connect")
});
loader.register_task(loader.Stage.LOADED, task_teaweb_starter);
}, },
priority: 10 priority: 10
}; };
@ -439,16 +335,19 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
await initialize(); await initialize();
if(__build.target == "web") { if(__build.target == "web") {
loader.register_task(loader.Stage.LOADED, task_certificate_callback); loader.register_task(loader.Stage.LOADED, task_connect_handler);
} else { } else {
loader.register_task(loader.Stage.LOADED, task_teaweb_starter); loader.register_task(loader.Stage.LOADED, task_teaweb_starter);
} }
} catch (ex) { } catch (ex) {
if(ex instanceof Error || typeof(ex.stack) !== "undefined") if(ex instanceof Error || typeof(ex.stack) !== "undefined") {
console.error((tr || (msg => msg))("Critical error stack trace: %o"), ex.stack); console.error((tr || (msg => msg))("Critical error stack trace: %o"), ex.stack);
}
if(ex instanceof ReferenceError || ex instanceof TypeError) if(ex instanceof ReferenceError || ex instanceof TypeError) {
ex = ex.name + ": " + ex.message; ex = ex.name + ": " + ex.message;
}
loader.critical_error("Failed to boot app function:<br>" + ex); loader.critical_error("Failed to boot app function:<br>" + ex);
} }
}, },
@ -458,12 +357,12 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
loader.register_task(loader.Stage.LOADED, { loader.register_task(loader.Stage.LOADED, {
name: "error task", name: "error task",
function: async () => { function: async () => {
if(Settings.instance.static(Settings.KEY_LOAD_DUMMY_ERROR, false)) { if(AppParameters.getValue(AppParameters.KEY_LOAD_DUMMY_ERROR)) {
loader.critical_error("The tea is cold!", "Argh, this is evil! Cold tea dosn't taste good."); loader.critical_error("The tea is cold!", "Argh, this is evil! Cold tea does not taste good.");
throw "The tea is cold!"; throw "The tea is cold!";
} }
}, },
priority: 20 priority: 2000
}); });
loader.register_task(Stage.JAVASCRIPT_INITIALIZING,{ loader.register_task(Stage.JAVASCRIPT_INITIALIZING,{
@ -471,7 +370,7 @@ loader.register_task(Stage.JAVASCRIPT_INITIALIZING,{
function: async () => { function: async () => {
try { //Initialize main template try { //Initialize main template
const main = $("#tmpl_main").renderTag({ const main = $("#tmpl_main").renderTag({
multi_session: !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION), multi_session: !settings.getValue(Settings.KEY_DISABLE_MULTI_SESSION),
app_version: __build.version app_version: __build.version
}).dividerfy(); }).dividerfy();

2
shared/js/profiles/identities/teaspeak-forum.ts
View File

@ -81,7 +81,7 @@ export namespace gcaptcha {
} }
function api_url() { function api_url() {
return settings.static_global(Settings.KEY_TEAFORO_URL); return settings.getValue(Settings.KEY_TEAFORO_URL);
} }
export class Data { export class Data {

708
shared/js/settings.ts
View File

File diff suppressed because it is too large Load Diff

4
shared/js/sound/Sounds.ts
View File

@ -157,7 +157,7 @@ export function save() {
data.overlap = overlap_sounds; data.overlap = overlap_sounds;
data.ignore_muted = ignore_muted; data.ignore_muted = ignore_muted;
settings.changeGlobal(Settings.KEY_SOUND_VOLUMES, JSON.stringify(data)); settings.setValue(Settings.KEY_SOUND_VOLUMES, JSON.stringify(data));
} }
} }
@ -173,7 +173,7 @@ export function initialize() : Promise<void> {
/* volumes */ /* volumes */
{ {
const data = JSON.parse(settings.static_global(Settings.KEY_SOUND_VOLUMES, "{}")); const data = JSON.parse(settings.getValue(Settings.KEY_SOUND_VOLUMES, "{}"));
for(const sound_key of Object.keys(Sound)) { for(const sound_key of Object.keys(Sound)) {
if(typeof(data[Sound[sound_key]]) !== "undefined") if(typeof(data[Sound[sound_key]]) !== "undefined")
speech_volume[Sound[sound_key]] = data[Sound[sound_key]]; speech_volume[Sound[sound_key]] = data[Sound[sound_key]];

2
shared/js/text/bbcode/emoji.tsx
View File

@ -46,7 +46,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
rendererReact.setTextRenderer(new class extends ElementRenderer<TextElement, React.ReactNode> { rendererReact.setTextRenderer(new class extends ElementRenderer<TextElement, React.ReactNode> {
render(element: TextElement, renderer: ReactRenderer): React.ReactNode { render(element: TextElement, renderer: ReactRenderer): React.ReactNode {
if(!settings.static_global(Settings.KEY_CHAT_COLORED_EMOJIES)) if(!settings.getValue(Settings.KEY_CHAT_COLORED_EMOJIES))
return element.text(); return element.text();
let text = element.text(); let text = element.text();

6
shared/js/text/bbcode/highlight.tsx
View File

@ -6,7 +6,7 @@ import {TagElement} from "vendor/xbbcode/elements";
import * as React from "react"; import * as React from "react";
import {tra} from "tc-shared/i18n/localize"; import {tra} from "tc-shared/i18n/localize";
import * as DOMPurify from "dompurify"; import * as DOMPurify from "dompurify";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import {rendererReact, rendererText} from "tc-shared/text/bbcode/renderer"; import {rendererReact, rendererText} from "tc-shared/text/bbcode/renderer";
import {MenuEntryType, spawn_context_menu} from "tc-shared/ui/elements/ContextMenu"; import {MenuEntryType, spawn_context_menu} from "tc-shared/ui/elements/ContextMenu";
@ -87,7 +87,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
function: async () => { function: async () => {
let reactId = 0; let reactId = 0;
if(!settings.static_global(Settings.KEY_CHAT_HIGHLIGHT_CODE)) { if(!settings.getValue(Settings.KEY_CHAT_HIGHLIGHT_CODE)) {
return; return;
} }
/* override default parser */ /* override default parser */
@ -127,7 +127,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
onContextMenu={event => { onContextMenu={event => {
event.preventDefault(); event.preventDefault();
spawn_context_menu(event.pageX, event.pageY, { spawn_context_menu(event.pageX, event.pageY, {
callback: () => copy_to_clipboard(lines.join("\n")), callback: () => copyToClipboard(lines.join("\n")),
name: tr("Copy code"), name: tr("Copy code"),
type: MenuEntryType.ENTRY, type: MenuEntryType.ENTRY,
icon_class: "client-copy" icon_class: "client-copy"

4
shared/js/text/bbcode/image.tsx
View File

@ -4,7 +4,7 @@ import * as React from "react";
import * as loader from "tc-loader"; import * as loader from "tc-loader";
import {rendererReact, rendererText} from "tc-shared/text/bbcode/renderer"; import {rendererReact, rendererText} from "tc-shared/text/bbcode/renderer";
import * as contextmenu from "tc-shared/ui/elements/ContextMenu"; import * as contextmenu from "tc-shared/ui/elements/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import * as image_preview from "tc-shared/ui/frames/image_preview"; import * as image_preview from "tc-shared/ui/frames/image_preview";
export const regexImage = /^(?:https?):(?:\/{1,3}|\\)[-a-zA-Z0-9:;,@#%&()~_?+=\/\\.]*$/g; export const regexImage = /^(?:https?):(?:\/{1,3}|\\)[-a-zA-Z0-9:;,@#%&()~_?+=\/\\.]*$/g;
@ -43,7 +43,7 @@ function loadImageForElement(element: HTMLImageElement) {
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
icon_class: "client-browse-addon-online" icon_class: "client-browse-addon-online"
}, contextmenu.Entry.HR(), { }, contextmenu.Entry.HR(), {
callback: () => copy_to_clipboard(url), callback: () => copyToClipboard(url),
name: tr("Copy image URL to clipboard"), name: tr("Copy image URL to clipboard"),
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
icon_class: "client-copy" icon_class: "client-copy"

4
shared/js/text/bbcode/url.tsx
View File

@ -1,5 +1,5 @@
import * as contextmenu from "tc-shared/ui/elements/ContextMenu"; import * as contextmenu from "tc-shared/ui/elements/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import * as loader from "tc-loader"; import * as loader from "tc-loader";
import {ElementRenderer} from "vendor/xbbcode/renderer/base"; import {ElementRenderer} from "vendor/xbbcode/renderer/base";
import {TagElement} from "vendor/xbbcode/elements"; import {TagElement} from "vendor/xbbcode/elements";
@ -26,7 +26,7 @@ function spawnUrlContextMenu(pageX: number, pageY: number, target: string) {
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
visible: __build.target === "client" && false // Currently not possible visible: __build.target === "client" && false // Currently not possible
}, contextmenu.Entry.HR(), { }, contextmenu.Entry.HR(), {
callback: () => copy_to_clipboard(target), callback: () => copyToClipboard(target),
name: tr("Copy URL to clipboard"), name: tr("Copy URL to clipboard"),
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
icon_class: "client-copy" icon_class: "client-copy"

4
shared/js/text/bbcode/youtube.tsx
View File

@ -7,7 +7,7 @@ import {BBCodeRenderer} from "tc-shared/text/bbcode";
import {HTMLRenderer} from "tc-shared/ui/react-elements/HTMLRenderer"; import {HTMLRenderer} from "tc-shared/ui/react-elements/HTMLRenderer";
import * as contextmenu from "tc-shared/ui/elements/ContextMenu"; import * as contextmenu from "tc-shared/ui/elements/ContextMenu";
import {spawn_context_menu} from "tc-shared/ui/elements/ContextMenu"; import {spawn_context_menu} from "tc-shared/ui/elements/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import {global_client_actions} from "tc-shared/events/GlobalEvents"; import {global_client_actions} from "tc-shared/events/GlobalEvents";
import {server_connections} from "tc-shared/ConnectionManager"; import {server_connections} from "tc-shared/ConnectionManager";
@ -61,7 +61,7 @@ export const YoutubeRenderer = (props: { children?: React.ReactElement | React.R
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
icon_class: "client-browse-addon-online" icon_class: "client-browse-addon-online"
}, contextmenu.Entry.HR(), { }, contextmenu.Entry.HR(), {
callback: () => copy_to_clipboard(props.url), callback: () => copyToClipboard(props.url),
name: tr("Copy video URL to clipboard"), name: tr("Copy video URL to clipboard"),
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
icon_class: "client-copy" icon_class: "client-copy"

6
shared/js/text/chat.ts
View File

@ -69,8 +69,8 @@ function bbcodeLinkUrls(message: string, ignore: { start: number, end: number }[
} }
export function preprocessChatMessageForSend(message: string) : string { export function preprocessChatMessageForSend(message: string) : string {
const parseMarkdown = settings.static_global(Settings.KEY_CHAT_ENABLE_MARKDOWN); const parseMarkdown = settings.getValue(Settings.KEY_CHAT_ENABLE_MARKDOWN);
const escapeBBCodes = !settings.static_global(Settings.KEY_CHAT_ENABLE_BBCODE); const escapeBBCodes = !settings.getValue(Settings.KEY_CHAT_ENABLE_BBCODE);
if(parseMarkdown) { if(parseMarkdown) {
message = renderMarkdownAsBBCode(message, text => escapeBBCodes ? escapeBBCode(text) : text); message = renderMarkdownAsBBCode(message, text => escapeBBCodes ? escapeBBCode(text) : text);
@ -78,7 +78,7 @@ export function preprocessChatMessageForSend(message: string) : string {
message = escapeBBCode(message); message = escapeBBCode(message);
} }
if(settings.static_global(Settings.KEY_CHAT_TAG_URLS)) { if(settings.getValue(Settings.KEY_CHAT_TAG_URLS)) {
const bbcodeElements = parseBBCode(message, {}); const bbcodeElements = parseBBCode(message, {});
const noParseRanges: { start: number, end: number }[] = []; const noParseRanges: { start: number, end: number }[] = [];

10
shared/js/tree/Channel.ts
View File

@ -222,8 +222,8 @@ export class ChannelEntry extends ChannelTreeEntry<ChannelEvents> {
}); });
}); });
this.collapsed = this.channelTree.client.settings.server(Settings.FN_SERVER_CHANNEL_COLLAPSED(this.channelId)); this.collapsed = this.channelTree.client.settings.getValue(Settings.FN_SERVER_CHANNEL_COLLAPSED(this.channelId));
this.subscriptionMode = this.channelTree.client.settings.server(Settings.FN_SERVER_CHANNEL_SUBSCRIBE_MODE(this.channelId)); this.subscriptionMode = this.channelTree.client.settings.getValue(Settings.FN_SERVER_CHANNEL_SUBSCRIBE_MODE(this.channelId));
this.channelDescriptionCached = false; this.channelDescriptionCached = false;
this.channelDescriptionCallback = []; this.channelDescriptionCallback = [];
@ -452,7 +452,7 @@ export class ChannelEntry extends ChannelTreeEntry<ChannelEvents> {
this.channelTree.client.getChannelConversations().setSelectedConversation(conversation); this.channelTree.client.getChannelConversations().setSelectedConversation(conversation);
this.channelTree.client.getSideBar().showChannel(); this.channelTree.client.getSideBar().showChannel();
}, },
visible: !settings.static_global(Settings.KEY_SWITCH_INSTANT_CHAT) visible: !settings.getValue(Settings.KEY_SWITCH_INSTANT_CHAT)
}, { }, {
type: contextmenu.MenuEntryType.HR, type: contextmenu.MenuEntryType.HR,
name: '' name: ''
@ -776,7 +776,7 @@ export class ChannelEntry extends ChannelTreeEntry<ChannelEvents> {
this.collapsed = flag; this.collapsed = flag;
this.events.fire("notify_collapsed_state_changed", { collapsed: flag }); this.events.fire("notify_collapsed_state_changed", { collapsed: flag });
this.channelTree.client.settings.changeServer(Settings.FN_SERVER_CHANNEL_COLLAPSED(this.channelId), flag); this.channelTree.client.settings.setValue(Settings.FN_SERVER_CHANNEL_COLLAPSED(this.channelId), flag);
} }
isSubscribed() : boolean { isSubscribed() : boolean {
@ -803,7 +803,7 @@ export class ChannelEntry extends ChannelTreeEntry<ChannelEvents> {
} }
this.subscriptionMode = mode; this.subscriptionMode = mode;
this.channelTree.client.settings.changeServer(Settings.FN_SERVER_CHANNEL_SUBSCRIBE_MODE(this.channelId), mode); this.channelTree.client.settings.setValue(Settings.FN_SERVER_CHANNEL_SUBSCRIBE_MODE(this.channelId), mode);
if(!dontSyncSubscribeMode) { if(!dontSyncSubscribeMode) {
this.updateSubscribeMode().then(undefined); this.updateSubscribeMode().then(undefined);
} }

6
shared/js/tree/ChannelTree.tsx
View File

@ -171,7 +171,7 @@ export class ChannelTree {
this.events.fire("notify_selected_entry_changed", { newEntry: entry, oldEntry: oldEntry }); this.events.fire("notify_selected_entry_changed", { newEntry: entry, oldEntry: oldEntry });
if(this.selectedEntry instanceof ClientEntry) { if(this.selectedEntry instanceof ClientEntry) {
if(settings.static_global(Settings.KEY_SWITCH_INSTANT_CLIENT)) { if(settings.getValue(Settings.KEY_SWITCH_INSTANT_CLIENT)) {
if(this.selectedEntry instanceof MusicClientEntry) { if(this.selectedEntry instanceof MusicClientEntry) {
this.client.getSideBar().showMusicPlayer(this.selectedEntry); this.client.getSideBar().showMusicPlayer(this.selectedEntry);
} else { } else {
@ -179,13 +179,13 @@ export class ChannelTree {
} }
} }
} else if(this.selectedEntry instanceof ChannelEntry) { } else if(this.selectedEntry instanceof ChannelEntry) {
if(settings.static_global(Settings.KEY_SWITCH_INSTANT_CHAT)) { if(settings.getValue(Settings.KEY_SWITCH_INSTANT_CHAT)) {
const conversation = this.client.getChannelConversations().findOrCreateConversation(this.selectedEntry.channelId); const conversation = this.client.getChannelConversations().findOrCreateConversation(this.selectedEntry.channelId);
this.client.getChannelConversations().setSelectedConversation(conversation); this.client.getChannelConversations().setSelectedConversation(conversation);
this.client.getSideBar().showChannel(); this.client.getSideBar().showChannel();
} }
} else if(this.selectedEntry instanceof ServerEntry) { } else if(this.selectedEntry instanceof ServerEntry) {
if(settings.static_global(Settings.KEY_SWITCH_INSTANT_CHAT)) { if(settings.getValue(Settings.KEY_SWITCH_INSTANT_CHAT)) {
const conversation = this.client.getChannelConversations().findOrCreateConversation(0); const conversation = this.client.getChannelConversations().findOrCreateConversation(0);
this.client.getChannelConversations().setSelectedConversation(conversation); this.client.getChannelConversations().setSelectedConversation(conversation);
this.client.getSideBar().showServer(); this.client.getSideBar().showServer();

14
shared/js/tree/Client.ts
View File

@ -345,7 +345,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
} }
this.voiceMuted = flagMuted; this.voiceMuted = flagMuted;
this.channelTree.client.settings.changeServer(Settings.FN_CLIENT_MUTED(this.clientUid()), flagMuted); this.channelTree.client.settings.setValue(Settings.FN_CLIENT_MUTED(this.clientUid()), flagMuted);
this.updateVoiceVolume(); this.updateVoiceVolume();
this.events.fire("notify_mute_state_change", { muted: flagMuted }); this.events.fire("notify_mute_state_change", { muted: flagMuted });
@ -366,12 +366,12 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
this.channelTree.client.getSideBar().showClientInfo(this as any); this.channelTree.client.getSideBar().showClientInfo(this as any);
}, },
icon_class: "client-about", icon_class: "client-about",
visible: !settings.static_global(Settings.KEY_SWITCH_INSTANT_CLIENT) visible: !settings.getValue(Settings.KEY_SWITCH_INSTANT_CLIENT)
}, { }, {
callback: () => {}, callback: () => {},
type: contextmenu.MenuEntryType.HR, type: contextmenu.MenuEntryType.HR,
name: "", name: "",
visible: !settings.static_global(Settings.KEY_SWITCH_INSTANT_CLIENT) visible: !settings.getValue(Settings.KEY_SWITCH_INSTANT_CLIENT)
} }
] ]
} }
@ -763,8 +763,8 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
reorder_channel = true; reorder_channel = true;
} }
if(variable.key == "client_unique_identifier") { if(variable.key == "client_unique_identifier") {
this.voiceVolume = this.channelTree.client.settings.server(Settings.FN_CLIENT_VOLUME(this.clientUid()), 1); this.voiceVolume = this.channelTree.client.settings.getValue(Settings.FN_CLIENT_VOLUME(this.clientUid()), 1);
const mute_status = this.channelTree.client.settings.server(Settings.FN_CLIENT_MUTED(this.clientUid()), false); const mute_status = this.channelTree.client.settings.getValue(Settings.FN_CLIENT_MUTED(this.clientUid()), false);
this.setMuted(mute_status, mute_status); /* force only needed when we want to mute the client */ this.setMuted(mute_status, mute_status); /* force only needed when we want to mute the client */
this.updateVoiceVolume(); this.updateVoiceVolume();
log.debug(LogCategory.CLIENT, tr("Loaded client (%s) server specific properties. Volume: %o Muted: %o."), this.clientUid(), this.voiceVolume, this.voiceMuted); log.debug(LogCategory.CLIENT, tr("Loaded client (%s) server specific properties. Volume: %o Muted: %o."), this.clientUid(), this.voiceVolume, this.voiceMuted);
@ -917,7 +917,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
this.voiceVolume = value; this.voiceVolume = value;
this.updateVoiceVolume(); this.updateVoiceVolume();
this.channelTree.client.settings.changeServer(Settings.FN_CLIENT_VOLUME(this.clientUid()), value); this.channelTree.client.settings.setValue(Settings.FN_CLIENT_VOLUME(this.clientUid()), value);
this.events.fire("notify_audio_level_changed", { newValue: value }); this.events.fire("notify_audio_level_changed", { newValue: value });
} }
@ -972,7 +972,7 @@ export class LocalClientEntry extends ClientEntry {
const old_name = this.properties.client_nickname; const old_name = this.properties.client_nickname;
this.updateVariables({ key: "client_nickname", value: new_name }); /* change it locally */ this.updateVariables({ key: "client_nickname", value: new_name }); /* change it locally */
return this.handle.serverConnection.send_command("clientupdate", { client_nickname: new_name }).then(() => { return this.handle.serverConnection.send_command("clientupdate", { client_nickname: new_name }).then(() => {
settings.changeGlobal(Settings.KEY_CONNECT_USERNAME, new_name); settings.setValue(Settings.KEY_CONNECT_USERNAME, new_name);
this.channelTree.client.log.log("client.nickname.changed.own", { this.channelTree.client.log.log("client.nickname.changed.own", {
client: this.log_data(), client: this.log_data(),
old_name: old_name, old_name: old_name,

2
shared/js/tree/Server.ts
View File

@ -221,7 +221,7 @@ export class ServerEntry extends ChannelTreeEntry<ServerEvents> {
this.channelTree.client.getChannelConversations().setSelectedConversation(this.channelTree.client.getChannelConversations().findOrCreateConversation(0)); this.channelTree.client.getChannelConversations().setSelectedConversation(this.channelTree.client.getChannelConversations().findOrCreateConversation(0));
this.channelTree.client.getSideBar().showServer(); this.channelTree.client.getSideBar().showServer();
}, },
visible: !settings.static_global(Settings.KEY_SWITCH_INSTANT_CHAT) visible: !settings.getValue(Settings.KEY_SWITCH_INSTANT_CHAT)
}, { }, {
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
icon_class: "client-virtualserver_edit", icon_class: "client-virtualserver_edit",

4
shared/js/ui/elements/ContextDivider.ts
View File

@ -89,7 +89,7 @@ if(!$.fn.dividerfy) {
apply_view(property, previous_p, next_p); apply_view(property, previous_p, next_p);
if(seperator_id) if(seperator_id)
settings.changeGlobal(Settings.FN_SEPARATOR_STATE(seperator_id), JSON.stringify({ settings.setValue(Settings.FN_SEPARATOR_STATE(seperator_id), JSON.stringify({
previous: previous_p, previous: previous_p,
next: next_p, next: next_p,
property: property property: property
@ -130,7 +130,7 @@ if(!$.fn.dividerfy) {
if(seperator_id) { if(seperator_id) {
try { try {
const config = JSON.parse(settings.global(Settings.FN_SEPARATOR_STATE(seperator_id), undefined)); const config = JSON.parse(settings.getValue(Settings.FN_SEPARATOR_STATE(seperator_id), undefined));
if(config) { if(config) {
log.debug(LogCategory.GENERAL, tr("Applying previous changed sperator settings for %s: %o"), seperator_id, config); log.debug(LogCategory.GENERAL, tr("Applying previous changed sperator settings for %s: %o"), seperator_id, config);
apply_view(config.property, config.previous, config.next); apply_view(config.property, config.previous, config.next);

2
shared/js/ui/frames/chat.ts
View File

@ -324,7 +324,7 @@ export function set_icon_size(size: string) {
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, { loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
name: "icon size init", name: "icon size init",
function: async () => { function: async () => {
set_icon_size((settings.static_global(Settings.KEY_ICON_SIZE) / 100).toFixed(2) + "em"); set_icon_size((settings.getValue(Settings.KEY_ICON_SIZE) / 100).toFixed(2) + "em");
}, },
priority: 10 priority: 10
}); });

16
shared/js/ui/frames/control-bar/Controller.ts
View File

@ -167,7 +167,7 @@ class InfoController {
public sendConnectionState() { public sendConnectionState() {
const globallyConnected = server_connections.all_connections().findIndex(e => e.connected) !== -1; const globallyConnected = server_connections.all_connections().findIndex(e => e.connected) !== -1;
const locallyConnected = this.currentHandler?.connected; const locallyConnected = this.currentHandler?.connected;
const multisession = !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION); const multisession = !settings.getValue(Settings.KEY_DISABLE_MULTI_SESSION);
this.events.fire_react("notify_connection_state", { this.events.fire_react("notify_connection_state", {
state: { state: {
@ -349,8 +349,8 @@ export function initializeControlBarController(events: Registry<ControlBarEvents
(event.globally ? server_connections.all_connections() : [server_connections.active_connection()]).filter(e => !!e).forEach(connection => { (event.globally ? server_connections.all_connections() : [server_connections.active_connection()]).filter(e => !!e).forEach(connection => {
connection.setAway(value); connection.setAway(value);
}); });
settings.changeGlobal(Settings.KEY_CLIENT_STATE_AWAY, true); settings.setValue(Settings.KEY_CLIENT_STATE_AWAY, true);
settings.changeGlobal(Settings.KEY_CLIENT_AWAY_MESSAGE, typeof value === "boolean" ? "" : value); settings.setValue(Settings.KEY_CLIENT_AWAY_MESSAGE, typeof value === "boolean" ? "" : value);
}; };
if(event.promptMessage) { if(event.promptMessage) {
@ -368,13 +368,13 @@ export function initializeControlBarController(events: Registry<ControlBarEvents
connection.setAway(false); connection.setAway(false);
} }
settings.changeGlobal(Settings.KEY_CLIENT_STATE_AWAY, false); settings.setValue(Settings.KEY_CLIENT_STATE_AWAY, false);
} }
}); });
events.on("action_toggle_microphone", event => { events.on("action_toggle_microphone", event => {
/* change the default global setting */ /* change the default global setting */
settings.changeGlobal(Settings.KEY_CLIENT_STATE_MICROPHONE_MUTED, !event.enabled); settings.setValue(Settings.KEY_CLIENT_STATE_MICROPHONE_MUTED, !event.enabled);
const current_connection_handler = infoHandler.getCurrentHandler(); const current_connection_handler = infoHandler.getCurrentHandler();
if(current_connection_handler) { if(current_connection_handler) {
@ -391,19 +391,19 @@ export function initializeControlBarController(events: Registry<ControlBarEvents
events.on("action_toggle_speaker", event => { events.on("action_toggle_speaker", event => {
/* change the default global setting */ /* change the default global setting */
settings.changeGlobal(Settings.KEY_CLIENT_STATE_SPEAKER_MUTED, !event.enabled); settings.setValue(Settings.KEY_CLIENT_STATE_SPEAKER_MUTED, !event.enabled);
infoHandler.getCurrentHandler()?.setSpeakerMuted(!event.enabled); infoHandler.getCurrentHandler()?.setSpeakerMuted(!event.enabled);
}); });
events.on("action_toggle_subscribe", event => { events.on("action_toggle_subscribe", event => {
settings.changeGlobal(Settings.KEY_CLIENT_STATE_SUBSCRIBE_ALL_CHANNELS, event.subscribe); settings.setValue(Settings.KEY_CLIENT_STATE_SUBSCRIBE_ALL_CHANNELS, event.subscribe);
infoHandler.getCurrentHandler()?.setSubscribeToAllChannels(event.subscribe); infoHandler.getCurrentHandler()?.setSubscribeToAllChannels(event.subscribe);
}); });
events.on("action_toggle_query", event => { events.on("action_toggle_query", event => {
settings.changeGlobal(Settings.KEY_CLIENT_STATE_QUERY_SHOWN, event.show); settings.setValue(Settings.KEY_CLIENT_STATE_QUERY_SHOWN, event.show);
infoHandler.getCurrentHandler()?.setQueriesShown(event.show); infoHandler.getCurrentHandler()?.setQueriesShown(event.show);
}); });

2
shared/js/ui/frames/control-bar/Renderer.tsx
View File

@ -279,7 +279,7 @@ const VideoButton = (props: { type: VideoBroadcastType }) => {
let dropdownText = props.type === "camera" ? tr("Start video broadcasting") : tr("Start screen sharing"); let dropdownText = props.type === "camera" ? tr("Start video broadcasting") : tr("Start screen sharing");
return ( return (
<Button switched={true} colorTheme={"red"} autoSwitch={false} iconNormal={icon} <Button switched={true} colorTheme={"red"} autoSwitch={false} iconNormal={icon}
onToggle={() => events.fire("action_toggle_video", {enable: true, broadcastType: props.type, quickStart: settings.static_global(Settings.KEY_VIDEO_QUICK_SETUP)})} onToggle={() => events.fire("action_toggle_video", {enable: true, broadcastType: props.type, quickStart: settings.getValue(Settings.KEY_VIDEO_QUICK_SETUP)})}
tooltip={tooltip} key={"enable"}> tooltip={tooltip} key={"enable"}>
<DropdownEntry icon={icon} text={dropdownText} onClick={() => events.fire("action_toggle_video", {enable: true, broadcastType: props.type})} /> <DropdownEntry icon={icon} text={dropdownText} onClick={() => events.fire("action_toggle_video", {enable: true, broadcastType: props.type})} />
{props.type === "camera" ? <VideoDeviceList key={"list"} /> : null} {props.type === "camera" ? <VideoDeviceList key={"list"} /> : null}

6
shared/js/ui/frames/side/MusicPlaylistRenderer.tsx
View File

@ -12,7 +12,7 @@ import {LoadingDots} from "tc-shared/ui/react-elements/LoadingDots";
import {preview_image} from "tc-shared/ui/frames/image_preview"; import {preview_image} from "tc-shared/ui/frames/image_preview";
import {joinClassList, useTr} from "tc-shared/ui/react-elements/Helper"; import {joinClassList, useTr} from "tc-shared/ui/react-elements/Helper";
import {spawnContextMenu} from "tc-shared/ui/ContextMenu"; import {spawnContextMenu} from "tc-shared/ui/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
const cssStyle = require("./MusicPlaylistRenderer.scss"); const cssStyle = require("./MusicPlaylistRenderer.scss");
@ -141,13 +141,13 @@ const PlaylistEntry = React.memo((props: { serverUniqueId: string, playlistId: n
{ {
type: "normal", type: "normal",
label: tr("Copy URL"), label: tr("Copy URL"),
click: () => { status.type === "song" ? copy_to_clipboard(status.url) : undefined; }, click: () => { status.type === "song" ? copyToClipboard(status.url) : undefined; },
visible: status.type === "song" visible: status.type === "song"
}, },
{ {
type: "normal", type: "normal",
label: tr("Copy description"), label: tr("Copy description"),
click: () => { status.type === "song" ? copy_to_clipboard(status.description) : undefined; }, click: () => { status.type === "song" ? copyToClipboard(status.description) : undefined; },
visible: status.type === "song" && !!status.description visible: status.type === "song" && !!status.description
}, },
{ {

4
shared/js/ui/frames/video/Controller.ts
View File

@ -651,7 +651,7 @@ class ChannelVideoController {
let videoStreamingCount = 0; let videoStreamingCount = 0;
if(this.localVideoController) { if(this.localVideoController) {
const localBroadcasting = this.localVideoController.isBroadcasting(); const localBroadcasting = this.localVideoController.isBroadcasting();
if(localBroadcasting || settings.static_global(Settings.KEY_VIDEO_FORCE_SHOW_OWN_VIDEO)) { if(localBroadcasting || settings.getValue(Settings.KEY_VIDEO_FORCE_SHOW_OWN_VIDEO)) {
videoIds.push(this.localVideoController.videoId); videoIds.push(this.localVideoController.videoId);
if(localBroadcasting) { if(localBroadcasting) {
videoStreamingCount++; videoStreamingCount++;
@ -675,7 +675,7 @@ class ChannelVideoController {
const controller = this.clientVideos[client.clientId()]; const controller = this.clientVideos[client.clientId()];
if(controller.isBroadcasting()) { if(controller.isBroadcasting()) {
videoStreamingCount++; videoStreamingCount++;
} else if(!settings.static_global(Settings.KEY_VIDEO_SHOW_ALL_CLIENTS)) { } else if(!settings.getValue(Settings.KEY_VIDEO_SHOW_ALL_CLIENTS)) {
continue; continue;
} }
videoIds.push(controller.videoId); videoIds.push(controller.videoId);

2
shared/js/ui/modal/ModalBookmarks.ts
View File

@ -291,7 +291,7 @@ export function spawnBookmarkModal() {
button_connect_tab.on('click', () => { button_connect_tab.on('click', () => {
boorkmak_connect(selected_bookmark as Bookmark, true); boorkmak_connect(selected_bookmark as Bookmark, true);
modal.close(); modal.close();
}).toggle(!settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION)); }).toggle(!settings.getValue(Settings.KEY_DISABLE_MULTI_SESSION));
button_connect.on('click', () => { button_connect.on('click', () => {
boorkmak_connect(selected_bookmark as Bookmark, false); boorkmak_connect(selected_bookmark as Bookmark, false);

4
shared/js/ui/modal/ModalChannelInfo.ts
View File

@ -1,6 +1,6 @@
import {createInfoModal, createModal, Modal} from "../../ui/elements/Modal"; import {createInfoModal, createModal, Modal} from "../../ui/elements/Modal";
import {ChannelEntry} from "../../tree/Channel"; import {ChannelEntry} from "../../tree/Channel";
import {copy_to_clipboard} from "../../utils/helpers"; import {copyToClipboard} from "../../utils/helpers";
import * as tooltip from "../../ui/elements/Tooltip"; import * as tooltip from "../../ui/elements/Tooltip";
import {formatMessage} from "../../ui/frames/chat"; import {formatMessage} from "../../ui/frames/chat";
import {renderBBCodeAsJQuery} from "tc-shared/text/bbcode"; import {renderBBCodeAsJQuery} from "tc-shared/text/bbcode";
@ -21,7 +21,7 @@ export function openChannelInfo(channel: ChannelEntry) {
}; };
template.find(".button-copy").on('click', event => { template.find(".button-copy").on('click', event => {
copy_to_clipboard(channel.properties.channel_description); copyToClipboard(channel.properties.channel_description);
createInfoModal(tr("Description copied"), tr("The channel description has been copied to your clipboard!")).open(); createInfoModal(tr("Description copied"), tr("The channel description has been copied to your clipboard!")).open();
}); });

6
shared/js/ui/modal/ModalClientInfo.ts
View File

@ -1,7 +1,7 @@
import {ClientConnectionInfo, ClientEntry} from "../../tree/Client"; import {ClientConnectionInfo, ClientEntry} from "../../tree/Client";
import PermissionType from "../../permission/PermissionType"; import PermissionType from "../../permission/PermissionType";
import {createInfoModal, createModal, Modal} from "../../ui/elements/Modal"; import {createInfoModal, createModal, Modal} from "../../ui/elements/Modal";
import {copy_to_clipboard} from "../../utils/helpers"; import {copyToClipboard} from "../../utils/helpers";
import * as i18nc from "../../i18n/country"; import * as i18nc from "../../i18n/country";
import * as tooltip from "../../ui/elements/Tooltip"; import * as tooltip from "../../ui/elements/Tooltip";
import * as moment from "moment"; import * as moment from "moment";
@ -142,7 +142,7 @@ function apply_basic_info(client: ClientEntry, tag: JQuery, modal: Modal, callba
container.find(".value-dbid").text(client.properties.client_database_id); container.find(".value-dbid").text(client.properties.client_database_id);
container.find(".button-copy").on('click', event => { container.find(".button-copy").on('click', event => {
copy_to_clipboard(client.clientUid()); copyToClipboard(client.clientUid());
createInfoModal(tr("Unique ID copied"), tr("The unique id has been copied to your clipboard!")).open(); createInfoModal(tr("Unique ID copied"), tr("The unique id has been copied to your clipboard!")).open();
}); });
} }
@ -216,7 +216,7 @@ function apply_basic_info(client: ClientEntry, tag: JQuery, modal: Modal, callba
value.text(tr("loading...")); value.text(tr("loading..."));
container.find(".button-copy").on('click', event => { container.find(".button-copy").on('click', event => {
copy_to_clipboard(value.text()); copyToClipboard(value.text());
createInfoModal(tr("Client IP copied"), tr("The client IP has been copied to your clipboard!")).open(); createInfoModal(tr("Client IP copied"), tr("The client IP has been copied to your clipboard!")).open();
}); });

8
shared/js/ui/modal/ModalInvite.ts
View File

@ -186,18 +186,18 @@ export function spawnInviteEditor(connection: ConnectionHandler) {
for (const s of invite_settings) { for (const s of invite_settings) {
s.node.on('change keyup', () => { s.node.on('change keyup', () => {
settings.changeGlobal(Settings.FN_INVITE_LINK_SETTING(s.key), s.value(s.node)); settings.setValue(Settings.FN_INVITE_LINK_SETTING(s.key), s.value(s.node));
update_link() update_link()
}); });
s.set_value(s.node, settings.global(Settings.FN_INVITE_LINK_SETTING(s.key), DefaultGeneratorSettings[s.key])); s.set_value(s.node, settings.getValue(Settings.FN_INVITE_LINK_SETTING(s.key), DefaultGeneratorSettings[s.key]));
} }
input_type.on('change', () => { input_type.on('change', () => {
settings.changeGlobal(Settings.KEY_LAST_INVITE_LINK_TYPE, input_type.val() as string); settings.setValue(Settings.KEY_LAST_INVITE_LINK_TYPE, input_type.val() as string);
update_buttons(); update_buttons();
update_link(); update_link();
}).val(settings.global(Settings.KEY_LAST_INVITE_LINK_TYPE)); }).val(settings.getValue(Settings.KEY_LAST_INVITE_LINK_TYPE));
button_copy.on('click', event => { button_copy.on('click', event => {
label_output.select(); label_output.select();

4
shared/js/ui/modal/ModalQueryManage.ts
View File

@ -160,7 +160,7 @@ export function spawnQueryManage(client: ConnectionHandler) {
import {createErrorModal, createInfoModal, createInputModal, createModal, Modal} from "../../ui/elements/Modal"; import {createErrorModal, createInfoModal, createInputModal, createModal, Modal} from "../../ui/elements/Modal";
import {CommandResult, QueryListEntry} from "../../connection/ServerConnectionDeclaration"; import {CommandResult, QueryListEntry} from "../../connection/ServerConnectionDeclaration";
import {SingleCommandHandler} from "../../connection/ConnectionBase"; import {SingleCommandHandler} from "../../connection/ConnectionBase";
import {copy_to_clipboard} from "../../utils/helpers"; import {copyToClipboard} from "../../utils/helpers";
import {spawnYesNo} from "../../ui/modal/ModalYesNo"; import {spawnYesNo} from "../../ui/modal/ModalYesNo";
import * as log from "../../log"; import * as log from "../../log";
import {LogCategory} from "../../log"; import {LogCategory} from "../../log";
@ -326,7 +326,7 @@ export function spawnQueryManage(client: ConnectionHandler) {
detail_unique_id_copy.on('click', event => { detail_unique_id_copy.on('click', event => {
if (!selected_query) return; if (!selected_query) return;
copy_to_clipboard(selected_query.unique_id); copyToClipboard(selected_query.unique_id);
createInfoModal(tr("Unique ID copied"), tr("The unique id has been successfully copied to your clipboard.")).open(); createInfoModal(tr("Unique ID copied"), tr("The unique id has been successfully copied to your clipboard.")).open();
}); });

54
shared/js/ui/modal/ModalSettings.tsx
View File

@ -92,8 +92,8 @@ function settings_general_application(container: JQuery, modal: Modal) {
{ {
const option = container.find(".option-hostbanner-background") as JQuery<HTMLInputElement>; const option = container.find(".option-hostbanner-background") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_HOSTBANNER_BACKGROUND, option[0].checked); settings.setValue(Settings.KEY_HOSTBANNER_BACKGROUND, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_HOSTBANNER_BACKGROUND)); }).prop("checked", settings.getValue(Settings.KEY_HOSTBANNER_BACKGROUND));
} }
/* font size */ /* font size */
@ -109,7 +109,7 @@ function settings_general_application(container: JQuery, modal: Modal) {
select.on('change', event => { select.on('change', event => {
const value = parseInt(select.val() as string); const value = parseInt(select.val() as string);
settings.changeGlobal(Settings.KEY_FONT_SIZE, value); settings.setValue(Settings.KEY_FONT_SIZE, value);
console.log("Changed font size to %dpx", value); console.log("Changed font size to %dpx", value);
}); });
} }
@ -118,8 +118,8 @@ function settings_general_application(container: JQuery, modal: Modal) {
{ {
const option = container.find(".option-all-permissions") as JQuery<HTMLInputElement>; const option = container.find(".option-all-permissions") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_HOSTBANNER_BACKGROUND, option[0].checked); settings.setValue(Settings.KEY_HOSTBANNER_BACKGROUND, option[0].checked);
}).prop("checked", settings.global(Settings.KEY_PERMISSIONS_SHOW_ALL)); }).prop("checked", settings.getValue(Settings.KEY_PERMISSIONS_SHOW_ALL));
} }
} }
@ -359,58 +359,58 @@ function settings_general_chat(container: JQuery, modal: Modal) {
const option_colloquial = container.find(".option-colloquial-timestamps") as JQuery<HTMLInputElement>; const option_colloquial = container.find(".option-colloquial-timestamps") as JQuery<HTMLInputElement>;
option_colloquial.on('change', event => { option_colloquial.on('change', event => {
settings.changeGlobal(Settings.KEY_CHAT_COLLOQUIAL_TIMESTAMPS, option_colloquial[0].checked); settings.setValue(Settings.KEY_CHAT_COLLOQUIAL_TIMESTAMPS, option_colloquial[0].checked);
}); });
option_fixed.on('change', event => { option_fixed.on('change', event => {
settings.changeGlobal(Settings.KEY_CHAT_FIXED_TIMESTAMPS, option_fixed[0].checked); settings.setValue(Settings.KEY_CHAT_FIXED_TIMESTAMPS, option_fixed[0].checked);
option_colloquial option_colloquial
.prop("disabled", option_fixed[0].checked) .prop("disabled", option_fixed[0].checked)
.parents("label").toggleClass("disabled", option_fixed[0].checked); .parents("label").toggleClass("disabled", option_fixed[0].checked);
if (option_fixed[0].checked) { if (option_fixed[0].checked) {
option_colloquial.prop("checked", false); option_colloquial.prop("checked", false);
} else { } else {
option_colloquial.prop("checked", settings.static_global(Settings.KEY_CHAT_COLLOQUIAL_TIMESTAMPS)); option_colloquial.prop("checked", settings.getValue(Settings.KEY_CHAT_COLLOQUIAL_TIMESTAMPS));
} }
}).prop("checked", settings.static_global(Settings.KEY_CHAT_FIXED_TIMESTAMPS)).trigger('change'); }).prop("checked", settings.getValue(Settings.KEY_CHAT_FIXED_TIMESTAMPS)).trigger('change');
} }
{ {
const option = container.find(".option-instant-channel-switch") as JQuery<HTMLInputElement>; const option = container.find(".option-instant-channel-switch") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_SWITCH_INSTANT_CHAT, option[0].checked); settings.setValue(Settings.KEY_SWITCH_INSTANT_CHAT, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_SWITCH_INSTANT_CHAT)); }).prop("checked", settings.getValue(Settings.KEY_SWITCH_INSTANT_CHAT));
} }
{ {
const option = container.find(".option-instant-client-switch") as JQuery<HTMLInputElement>; const option = container.find(".option-instant-client-switch") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_SWITCH_INSTANT_CLIENT, option[0].checked); settings.setValue(Settings.KEY_SWITCH_INSTANT_CLIENT, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_SWITCH_INSTANT_CLIENT)); }).prop("checked", settings.getValue(Settings.KEY_SWITCH_INSTANT_CLIENT));
} }
{ {
const option = container.find(".option-colored-emojies") as JQuery<HTMLInputElement>; const option = container.find(".option-colored-emojies") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_CHAT_COLORED_EMOJIES, option[0].checked); settings.setValue(Settings.KEY_CHAT_COLORED_EMOJIES, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_CHAT_COLORED_EMOJIES)); }).prop("checked", settings.getValue(Settings.KEY_CHAT_COLORED_EMOJIES));
} }
{ {
const option = container.find(".option-support-markdown") as JQuery<HTMLInputElement>; const option = container.find(".option-support-markdown") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_CHAT_ENABLE_MARKDOWN, option[0].checked); settings.setValue(Settings.KEY_CHAT_ENABLE_MARKDOWN, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_CHAT_ENABLE_MARKDOWN)); }).prop("checked", settings.getValue(Settings.KEY_CHAT_ENABLE_MARKDOWN));
} }
{ {
const option = container.find(".option-support-bbcode") as JQuery<HTMLInputElement>; const option = container.find(".option-support-bbcode") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_CHAT_ENABLE_BBCODE, option[0].checked); settings.setValue(Settings.KEY_CHAT_ENABLE_BBCODE, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_CHAT_ENABLE_BBCODE)); }).prop("checked", settings.getValue(Settings.KEY_CHAT_ENABLE_BBCODE));
} }
{ {
const option = container.find(".option-url-tagging") as JQuery<HTMLInputElement>; const option = container.find(".option-url-tagging") as JQuery<HTMLInputElement>;
option.on('change', event => { option.on('change', event => {
settings.changeGlobal(Settings.KEY_CHAT_TAG_URLS, option[0].checked); settings.setValue(Settings.KEY_CHAT_TAG_URLS, option[0].checked);
}).prop("checked", settings.static_global(Settings.KEY_CHAT_TAG_URLS)); }).prop("checked", settings.getValue(Settings.KEY_CHAT_TAG_URLS));
} }
/* Icon size */ /* Icon size */
{ {
@ -422,13 +422,13 @@ function settings_general_chat(container: JQuery, modal: Modal) {
min_value: 25, min_value: 25,
max_value: 300, max_value: 300,
step: 5, step: 5,
initial_value: settings.static_global(Settings.KEY_ICON_SIZE), initial_value: settings.getValue(Settings.KEY_ICON_SIZE),
value_field: container_value value_field: container_value
}); });
container_slider.on('change', event => { container_slider.on('change', event => {
const value = parseInt(container_slider.attr("value") as string); const value = parseInt(container_slider.attr("value") as string);
settings.changeGlobal(Settings.KEY_ICON_SIZE, value); settings.setValue(Settings.KEY_ICON_SIZE, value);
console.log("Changed icon size to %sem", (value / 100).toFixed(2)); console.log("Changed icon size to %sem", (value / 100).toFixed(2));
set_icon_size((value / 100).toFixed(2) + "em"); set_icon_size((value / 100).toFixed(2) + "em");
@ -549,7 +549,7 @@ function settings_audio_speaker(container: JQuery, modal: Modal) {
min_value: 0, min_value: 0,
max_value: 100, max_value: 100,
step: 1, step: 1,
initial_value: settings.static_global(Settings.KEY_SOUND_MASTER, 100), initial_value: settings.getValue(Settings.KEY_SOUND_MASTER, 100),
value_field: [container_master.find(".container-value")] value_field: [container_master.find(".container-value")]
}); });
slider.on('change', event => { slider.on('change', event => {
@ -557,7 +557,7 @@ function settings_audio_speaker(container: JQuery, modal: Modal) {
if (aplayer.set_master_volume) if (aplayer.set_master_volume)
aplayer.set_master_volume(volume / 100); aplayer.set_master_volume(volume / 100);
settings.changeGlobal(Settings.KEY_SOUND_MASTER, volume); settings.setValue(Settings.KEY_SOUND_MASTER, volume);
}); });
} }
@ -568,13 +568,13 @@ function settings_audio_speaker(container: JQuery, modal: Modal) {
min_value: 0, min_value: 0,
max_value: 100, max_value: 100,
step: 1, step: 1,
initial_value: settings.static_global(Settings.KEY_SOUND_MASTER_SOUNDS, 100), initial_value: settings.getValue(Settings.KEY_SOUND_MASTER_SOUNDS, 100),
value_field: [container_soundpack.find(".container-value")] value_field: [container_soundpack.find(".container-value")]
}); });
slider.on('change', event => { slider.on('change', event => {
const volume = parseInt(slider.attr('value')); const volume = parseInt(slider.attr('value'));
set_master_volume(volume / 100); set_master_volume(volume / 100);
settings.changeGlobal(Settings.KEY_SOUND_MASTER_SOUNDS, volume); settings.setValue(Settings.KEY_SOUND_MASTER_SOUNDS, volume);
}); });
} }
} }

6
shared/js/ui/modal/channel-edit/Renderer.tsx
View File

@ -1089,7 +1089,7 @@ const ContainerSimpleSettings = React.memo(() => {
}); });
const SettingsContainer = React.memo(() => { const SettingsContainer = React.memo(() => {
const [ advancedEnabled, setAdvancedEnabled ] = useState(settings.static_global(Settings.KEY_CHANNEL_EDIT_ADVANCED)); const [ advancedEnabled, setAdvancedEnabled ] = useState(settings.getValue(Settings.KEY_CHANNEL_EDIT_ADVANCED));
useEffect(() => settings.globalChangeListener(Settings.KEY_CHANNEL_EDIT_ADVANCED, newValue => setAdvancedEnabled(newValue))); useEffect(() => settings.globalChangeListener(Settings.KEY_CHANNEL_EDIT_ADVANCED, newValue => setAdvancedEnabled(newValue)));
return ( return (
@ -1105,7 +1105,7 @@ const SettingsContainer = React.memo(() => {
}); });
const ButtonToggleAdvanced = React.memo(() => { const ButtonToggleAdvanced = React.memo(() => {
const [ advancedEnabled, setAdvancedEnabled ] = useState(settings.static_global(Settings.KEY_CHANNEL_EDIT_ADVANCED)); const [ advancedEnabled, setAdvancedEnabled ] = useState(settings.getValue(Settings.KEY_CHANNEL_EDIT_ADVANCED));
settings.globalChangeListener(Settings.KEY_CHANNEL_EDIT_ADVANCED, newValue => setAdvancedEnabled(newValue)); settings.globalChangeListener(Settings.KEY_CHANNEL_EDIT_ADVANCED, newValue => setAdvancedEnabled(newValue));
@ -1114,7 +1114,7 @@ const ButtonToggleAdvanced = React.memo(() => {
className={cssStyle.advancedSwitch} className={cssStyle.advancedSwitch}
value={advancedEnabled} value={advancedEnabled}
label={<Translatable>Advanced mode</Translatable>} label={<Translatable>Advanced mode</Translatable>}
onChange={newState => settings.changeGlobal(Settings.KEY_CHANNEL_EDIT_ADVANCED, newState)} onChange={newState => settings.setValue(Settings.KEY_CHANNEL_EDIT_ADVANCED, newState)}
/> />
) )
}); });

16
shared/js/ui/modal/connect/Controller.ts
View File

@ -86,11 +86,11 @@ class ConnectController {
this.history = undefined; this.history = undefined;
this.defaultAddress = "ts.teaspeak.de"; this.defaultAddress = "ts.teaspeak.de";
this.historyShown = settings.static_global(Settings.KEY_CONNECT_SHOW_HISTORY); this.historyShown = settings.getValue(Settings.KEY_CONNECT_SHOW_HISTORY);
this.currentAddress = settings.static_global(Settings.KEY_CONNECT_ADDRESS); this.currentAddress = settings.getValue(Settings.KEY_CONNECT_ADDRESS);
this.currentProfile = findConnectProfile(settings.static_global(Settings.KEY_CONNECT_PROFILE)) || defaultConnectProfile(); this.currentProfile = findConnectProfile(settings.getValue(Settings.KEY_CONNECT_PROFILE)) || defaultConnectProfile();
this.currentNickname = settings.static_global(Settings.KEY_CONNECT_USERNAME); this.currentNickname = settings.getValue(Settings.KEY_CONNECT_USERNAME);
this.addressChanged = false; this.addressChanged = false;
this.nicknameChanged = false; this.nicknameChanged = false;
@ -178,7 +178,7 @@ class ConnectController {
this.historyShown = event.enabled; this.historyShown = event.enabled;
this.sendProperty("historyShown").then(undefined); this.sendProperty("historyShown").then(undefined);
settings.changeGlobal(Settings.KEY_CONNECT_SHOW_HISTORY, event.enabled); settings.setValue(Settings.KEY_CONNECT_SHOW_HISTORY, event.enabled);
}); });
@ -214,7 +214,7 @@ class ConnectController {
this.uiEvents.on("action_set_nickname", event => { this.uiEvents.on("action_set_nickname", event => {
if(this.currentNickname !== event.nickname) { if(this.currentNickname !== event.nickname) {
this.currentNickname = event.nickname; this.currentNickname = event.nickname;
settings.changeGlobal(Settings.KEY_CONNECT_USERNAME, event.nickname); settings.setValue(Settings.KEY_CONNECT_USERNAME, event.nickname);
if(event.updateUi) { if(event.updateUi) {
this.sendProperty("nickname").then(undefined); this.sendProperty("nickname").then(undefined);
@ -297,7 +297,7 @@ class ConnectController {
setSelectedAddress(address: string | undefined, validate: boolean, updateUi: boolean) { setSelectedAddress(address: string | undefined, validate: boolean, updateUi: boolean) {
if(this.currentAddress !== address) { if(this.currentAddress !== address) {
this.currentAddress = address; this.currentAddress = address;
settings.changeGlobal(Settings.KEY_CONNECT_ADDRESS, address); settings.setValue(Settings.KEY_CONNECT_ADDRESS, address);
this.setSelectedHistoryId(-1); this.setSelectedHistoryId(-1);
if(updateUi) { if(updateUi) {
@ -316,7 +316,7 @@ class ConnectController {
this.currentProfile = profile; this.currentProfile = profile;
this.sendProperty("profiles").then(undefined); this.sendProperty("profiles").then(undefined);
settings.changeGlobal(Settings.KEY_CONNECT_PROFILE, profile.id); settings.setValue(Settings.KEY_CONNECT_PROFILE, profile.id);
/* Clear out the nickname on profile switch and use the default nickname */ /* Clear out the nickname on profile switch and use the default nickname */
this.uiEvents.fire("action_set_nickname", { nickname: undefined, validate: true, updateUi: true }); this.uiEvents.fire("action_set_nickname", { nickname: undefined, validate: true, updateUi: true });

4
shared/js/ui/modal/echo-test/Controller.tsx
View File

@ -57,11 +57,11 @@ function initializeController(connection: ConnectionHandler, events: Registry<Ec
}); });
events.on("action_toggle_tests", event => { events.on("action_toggle_tests", event => {
settings.changeGlobal(Settings.KEY_VOICE_ECHO_TEST_ENABLED, event.enabled); settings.setValue(Settings.KEY_VOICE_ECHO_TEST_ENABLED, event.enabled);
}); });
events.on("query_test_state", () => { events.on("query_test_state", () => {
events.fire_react("notify_tests_toggle", {enabled: settings.global(Settings.KEY_VOICE_ECHO_TEST_ENABLED)}); events.fire_react("notify_tests_toggle", {enabled: settings.getValue(Settings.KEY_VOICE_ECHO_TEST_ENABLED)});
}); });
events.on("notify_destroy", settings.globalChangeListener(Settings.KEY_VOICE_ECHO_TEST_ENABLED, value => { events.on("notify_destroy", settings.globalChangeListener(Settings.KEY_VOICE_ECHO_TEST_ENABLED, value => {

12
shared/js/ui/modal/global-settings-editor/Controller.tsx
View File

@ -2,7 +2,7 @@ import {spawnReactModal} from "tc-shared/ui/react-elements/Modal";
import {ModalGlobalSettingsEditor} from "tc-shared/ui/modal/global-settings-editor/Renderer"; import {ModalGlobalSettingsEditor} from "tc-shared/ui/modal/global-settings-editor/Renderer";
import {Registry} from "tc-shared/events"; import {Registry} from "tc-shared/events";
import {ModalGlobalSettingsEditorEvents, Setting} from "tc-shared/ui/modal/global-settings-editor/Definitions"; import {ModalGlobalSettingsEditorEvents, Setting} from "tc-shared/ui/modal/global-settings-editor/Definitions";
import {ConfigValueTypes, settings, Settings, SettingsKey} from "tc-shared/settings"; import {RegistryValueType, settings, Settings, RegistryKey} from "tc-shared/settings";
export function spawnGlobalSettingsEditor() { export function spawnGlobalSettingsEditor() {
const events = new Registry<ModalGlobalSettingsEditorEvents>(); const events = new Registry<ModalGlobalSettingsEditorEvents>();
@ -21,7 +21,7 @@ function initializeController(events: Registry<ModalGlobalSettingsEditorEvents>)
const settingsList: Setting[] = []; const settingsList: Setting[] = [];
for(const key of Settings.KEYS) { for(const key of Settings.KEYS) {
const setting = Settings[key] as SettingsKey<ConfigValueTypes>; const setting = Settings[key] as RegistryKey<RegistryValueType>;
settingsList.push({ settingsList.push({
key: setting.key, key: setting.key,
description: setting.description, description: setting.description,
@ -38,7 +38,7 @@ function initializeController(events: Registry<ModalGlobalSettingsEditorEvents>)
}); });
events.on("query_setting", event => { events.on("query_setting", event => {
const setting = Settings.KEYS.map(setting => Settings[setting] as SettingsKey<ConfigValueTypes>).find(e => e.key === event.setting); const setting = Settings.KEYS.map(setting => Settings[setting] as RegistryKey<RegistryValueType>).find(e => e.key === event.setting);
if(typeof setting === "undefined") { if(typeof setting === "undefined") {
events.fire("notify_setting", { events.fire("notify_setting", {
setting: event.setting, setting: event.setting,
@ -56,18 +56,18 @@ function initializeController(events: Registry<ModalGlobalSettingsEditorEvents>)
type: setting.valueType, type: setting.valueType,
defaultValue: setting.defaultValue defaultValue: setting.defaultValue
}, },
value: settings.global(setting, undefined) value: settings.getValue(setting, undefined)
}); });
}); });
events.on("action_set_value", event => { events.on("action_set_value", event => {
const setting = Settings.KEYS.map(setting => Settings[setting] as SettingsKey<ConfigValueTypes>).find(e => e.key === event.setting); const setting = Settings.KEYS.map(setting => Settings[setting] as RegistryKey<RegistryValueType>).find(e => e.key === event.setting);
if(typeof setting === "undefined") { if(typeof setting === "undefined") {
return; return;
} }
/* the change will may already trigger a notify_setting_value, but just to ensure we're fiering it later as well */ /* the change will may already trigger a notify_setting_value, but just to ensure we're fiering it later as well */
settings.changeGlobal(setting, event.value); settings.setValue(setting, event.value);
events.fire_react("notify_setting_value", { setting: event.setting, value: event.value }); events.fire_react("notify_setting_value", { setting: event.setting, value: event.value });
}); });

4
shared/js/ui/modal/global-settings-editor/Definitions.ts
View File

@ -1,9 +1,9 @@
import {ConfigValueTypeNames} from "tc-shared/settings"; import {RegistryValueTypeNames} from "tc-shared/settings";
export interface Setting { export interface Setting {
key: string; key: string;
type: ConfigValueTypeNames; type: RegistryValueTypeNames;
description: string | undefined; description: string | undefined;
defaultValue: any | undefined; defaultValue: any | undefined;

2
shared/js/ui/modal/permission/ModalPermissionEditor.tsx
View File

@ -889,7 +889,7 @@ function initializePermissionEditor(connection: ConnectionHandler, modalEvents:
}; };
events.fire_react("query_permission_list_result", { events.fire_react("query_permission_list_result", {
hideSenselessPermissions: !settings.static_global(Settings.KEY_PERMISSIONS_SHOW_ALL), hideSenselessPermissions: !settings.getValue(Settings.KEY_PERMISSIONS_SHOW_ALL),
permissions: (groups || []).map(visitGroup) permissions: (groups || []).map(visitGroup)
}); });
}); });

4
shared/js/ui/modal/permission/PermissionEditor.tsx
View File

@ -14,7 +14,7 @@ import {Button} from "tc-shared/ui/react-elements/Button";
import {IconRenderer, RemoteIconRenderer} from "tc-shared/ui/react-elements/Icon"; import {IconRenderer, RemoteIconRenderer} from "tc-shared/ui/react-elements/Icon";
import {ConnectionHandler} from "tc-shared/ConnectionHandler"; import {ConnectionHandler} from "tc-shared/ConnectionHandler";
import * as contextmenu from "tc-shared/ui/elements/ContextMenu"; import * as contextmenu from "tc-shared/ui/elements/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import {createInfoModal} from "tc-shared/ui/elements/Modal"; import {createInfoModal} from "tc-shared/ui/elements/Modal";
import {getIconManager} from "tc-shared/file/Icons"; import {getIconManager} from "tc-shared/file/Icons";
@ -661,7 +661,7 @@ const PermissionEntryRow = (props: {
entries.push({ entries.push({
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
name: tr("Copy permission name"), name: tr("Copy permission name"),
callback: () => copy_to_clipboard(props.permission) callback: () => copyToClipboard(props.permission)
}); });
contextmenu.spawn_context_menu(e.pageX, e.pageY, ...entries); contextmenu.spawn_context_menu(e.pageX, e.pageY, ...entries);

4
shared/js/ui/modal/permission/TabHandler.tsx
View File

@ -10,7 +10,7 @@ import {Translatable} from "tc-shared/ui/react-elements/i18n";
import {LoadingDots} from "tc-shared/ui/react-elements/LoadingDots"; import {LoadingDots} from "tc-shared/ui/react-elements/LoadingDots";
import * as contextmenu from "tc-shared/ui/elements/ContextMenu"; import * as contextmenu from "tc-shared/ui/elements/ContextMenu";
import {MenuEntryType, spawn_context_menu} from "tc-shared/ui/elements/ContextMenu"; import {MenuEntryType, spawn_context_menu} from "tc-shared/ui/elements/ContextMenu";
import {copy_to_clipboard} from "tc-shared/utils/helpers"; import {copyToClipboard} from "tc-shared/utils/helpers";
import {FlatInputField} from "tc-shared/ui/react-elements/InputField"; import {FlatInputField} from "tc-shared/ui/react-elements/InputField";
import {arrayBufferBase64} from "tc-shared/utils/buffers"; import {arrayBufferBase64} from "tc-shared/utils/buffers";
import {tra} from "tc-shared/i18n/localize"; import {tra} from "tc-shared/i18n/localize";
@ -513,7 +513,7 @@ class ServerClientList extends React.Component<{ connection: ConnectionHandler,
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
name: tr("Copy unique id"), name: tr("Copy unique id"),
icon_class: 'client-copy', icon_class: 'client-copy',
callback: () => copy_to_clipboard(client.uniqueId) callback: () => copyToClipboard(client.uniqueId)
}, contextmenu.Entry.HR(), { }, contextmenu.Entry.HR(), {
type: contextmenu.MenuEntryType.ENTRY, type: contextmenu.MenuEntryType.ENTRY,
name: tr("Refresh"), name: tr("Refresh"),

4
shared/js/ui/modal/settings/Microphone.tsx
View File

@ -253,7 +253,7 @@ export function initialize_audio_microphone_controller(events: Registry<Micropho
break; break;
case "rnnoise": case "rnnoise":
value = settings.static_global(Settings.KEY_RNNOISE_FILTER); value = settings.getValue(Settings.KEY_RNNOISE_FILTER);
break; break;
default: default:
@ -312,7 +312,7 @@ export function initialize_audio_microphone_controller(events: Registry<Micropho
case "rnnoise": case "rnnoise":
if (!ensure_type("boolean")) return; if (!ensure_type("boolean")) return;
settings.changeGlobal(Settings.KEY_RNNOISE_FILTER, event.value); settings.setValue(Settings.KEY_RNNOISE_FILTER, event.value);
break; break;
default: default:

8
shared/js/ui/modal/settings/Notifications.tsx
View File

@ -446,7 +446,7 @@ function initializeController(events: Registry<NotificationSettingsEvents>) {
events.fire_react("notify_event_info", { events.fire_react("notify_event_info", {
key: event.key, key: event.key,
name: groupNames[event.key] || event.key, name: groupNames[event.key] || event.key,
log: settings.global(Settings.FN_EVENTS_LOG_ENABLED(event.key), true) ? "enabled" : "disabled", log: settings.getValue(Settings.FN_EVENTS_LOG_ENABLED(event.key), true) ? "enabled" : "disabled",
notification: getRegisteredNotificationDispatchers().findIndex(e => e as any === event.key) === -1 ? "unavailable" : isNotificationEnabled(event.key as any) ? "enabled" : "disabled", notification: getRegisteredNotificationDispatchers().findIndex(e => e as any === event.key) === -1 ? "unavailable" : isNotificationEnabled(event.key as any) ? "enabled" : "disabled",
focus: isFocusRequestEnabled(event.key as any) ? "enabled" : "disabled" focus: isFocusRequestEnabled(event.key as any) ? "enabled" : "disabled"
}); });
@ -455,15 +455,15 @@ function initializeController(events: Registry<NotificationSettingsEvents>) {
events.on("action_set_state", event => { events.on("action_set_state", event => {
switch (event.state) { switch (event.state) {
case "log": case "log":
settings.changeGlobal(Settings.FN_EVENTS_LOG_ENABLED(event.key), event.value === "enabled"); settings.setValue(Settings.FN_EVENTS_LOG_ENABLED(event.key), event.value === "enabled");
break; break;
case "notification": case "notification":
settings.changeGlobal(Settings.FN_EVENTS_NOTIFICATION_ENABLED(event.key), event.value === "enabled"); settings.setValue(Settings.FN_EVENTS_NOTIFICATION_ENABLED(event.key), event.value === "enabled");
break; break;
case "focus": case "focus":
settings.changeGlobal(Settings.FN_EVENTS_FOCUS_ENABLED(event.key), event.value === "enabled"); settings.setValue(Settings.FN_EVENTS_FOCUS_ENABLED(event.key), event.value === "enabled");
break; break;
} }

4
shared/js/ui/modal/transfer/FileTransferInfoController.ts
View File

@ -62,7 +62,7 @@ export const initializeTransferInfoController = (connection: ConnectionHandler,
}; };
events.on("action_toggle_finished_transfers", event => { events.on("action_toggle_finished_transfers", event => {
settings.changeGlobal(Settings.KEY_TRANSFERS_SHOW_FINISHED, event.visible); settings.setValue(Settings.KEY_TRANSFERS_SHOW_FINISHED, event.visible);
}); });
events.on("action_remove_finished", () => { events.on("action_remove_finished", () => {
@ -93,7 +93,7 @@ export const initializeTransferInfoController = (connection: ConnectionHandler,
events.fire_react("query_transfer_result", { events.fire_react("query_transfer_result", {
status: "success", status: "success",
transfers: transfers, transfers: transfers,
showFinished: settings.global(Settings.KEY_TRANSFERS_SHOW_FINISHED) showFinished: settings.getValue(Settings.KEY_TRANSFERS_SHOW_FINISHED)
}); });
}); });

8
shared/js/ui/modal/video-source/Controller.tsx
View File

@ -119,8 +119,8 @@ function updateBroadcastConfigFromSource(source: VideoSource, constraints: Video
async function generateAndApplyDefaultConfig(source: VideoSource) : Promise<VideoBroadcastConfig> { async function generateAndApplyDefaultConfig(source: VideoSource) : Promise<VideoBroadcastConfig> {
const videoTrack = source.getStream().getVideoTracks()[0]; const videoTrack = source.getStream().getVideoTracks()[0];
let maxHeight = settings.static_global(Settings.KEY_VIDEO_DEFAULT_MAX_HEIGHT); let maxHeight = settings.getValue(Settings.KEY_VIDEO_DEFAULT_MAX_HEIGHT);
let maxWidth = settings.static_global(Settings.KEY_VIDEO_DEFAULT_MAX_WIDTH); let maxWidth = settings.getValue(Settings.KEY_VIDEO_DEFAULT_MAX_WIDTH);
const trackSettings = videoTrack.getSettings(); const trackSettings = videoTrack.getSettings();
const capabilities = source.getCapabilities(); const capabilities = source.getCapabilities();
@ -154,8 +154,8 @@ async function generateAndApplyDefaultConfig(source: VideoSource) : Promise<Vide
} }
} }
broadcastConstraints.dynamicQuality = settings.static_global(Settings.KEY_VIDEO_DYNAMIC_QUALITY); broadcastConstraints.dynamicQuality = settings.getValue(Settings.KEY_VIDEO_DYNAMIC_QUALITY);
broadcastConstraints.dynamicFrameRate = settings.static_global(Settings.KEY_VIDEO_DYNAMIC_FRAME_RATE); broadcastConstraints.dynamicFrameRate = settings.getValue(Settings.KEY_VIDEO_DYNAMIC_FRAME_RATE);
try { try {
await applyBroadcastConfig(source, broadcastConstraints); await applyBroadcastConfig(source, broadcastConstraints);

8
shared/js/ui/react-elements/ChatBox.tsx
View File

@ -96,7 +96,7 @@ const nodeToText = (element: Node) => {
const content = [...element.childNodes].map(nodeToText).join(""); const content = [...element.childNodes].map(nodeToText).join("");
if(element.href) { if(element.href) {
if(settings.static_global(Settings.KEY_CHAT_ENABLE_MARKDOWN)) { if(settings.getValue(Settings.KEY_CHAT_ENABLE_MARKDOWN)) {
if(content && element.title) { if(content && element.title) {
return `[${content}](${element.href} "${element.title}")`; return `[${content}](${element.href} "${element.title}")`;
} else if(content) { } else if(content) {
@ -104,7 +104,7 @@ const nodeToText = (element: Node) => {
} else { } else {
return `[${element.href}](${element.href})`; return `[${element.href}](${element.href})`;
} }
} else if(settings.static_global(Settings.KEY_CHAT_ENABLE_BBCODE)) { } else if(settings.getValue(Settings.KEY_CHAT_ENABLE_BBCODE)) {
if(content) { if(content) {
return `[url=${element.href}]${content}"[/url]`; return `[url=${element.href}]${content}"[/url]`;
} else { } else {
@ -308,14 +308,14 @@ export interface ChatBoxState {
} }
const MarkdownFormatHelper = () => { const MarkdownFormatHelper = () => {
const [ visible, setVisible ] = useState(settings.global(Settings.KEY_CHAT_ENABLE_MARKDOWN)); const [ visible, setVisible ] = useState(settings.getValue(Settings.KEY_CHAT_ENABLE_MARKDOWN));
settings.events.reactUse("notify_setting_changed", event => { settings.events.reactUse("notify_setting_changed", event => {
if(event.setting !== Settings.KEY_CHAT_ENABLE_MARKDOWN.key) { if(event.setting !== Settings.KEY_CHAT_ENABLE_MARKDOWN.key) {
return; return;
} }
setVisible(settings.global(Settings.KEY_CHAT_ENABLE_MARKDOWN)); setVisible(settings.getValue(Settings.KEY_CHAT_ENABLE_MARKDOWN));
}); });
if(visible) { if(visible) {

4
shared/js/ui/react-elements/ContextDivider.tsx
View File

@ -34,7 +34,7 @@ export class ContextDivider extends React.Component<ContextDividerProperties, Co
this.value = this.props.defaultValue; this.value = this.props.defaultValue;
try { try {
const config = JSON.parse(settings.global(Settings.FN_SEPARATOR_STATE(this.props.id), undefined)); const config = JSON.parse(settings.getValue(Settings.FN_SEPARATOR_STATE(this.props.id), undefined));
if(typeof config.value !== "number") if(typeof config.value !== "number")
throw "Invalid value"; throw "Invalid value";
@ -150,7 +150,7 @@ export class ContextDivider extends React.Component<ContextDividerProperties, Co
document.removeEventListener('touchcancel', this.listenerUp); document.removeEventListener('touchcancel', this.listenerUp);
document.documentElement.classList.remove(cssStyle.documentActiveClass); document.documentElement.classList.remove(cssStyle.documentActiveClass);
settings.changeGlobal(Settings.FN_SEPARATOR_STATE(this.props.id), JSON.stringify({ settings.setValue(Settings.FN_SEPARATOR_STATE(this.props.id), JSON.stringify({
value: this.value value: this.value
})); }));
} }

10
shared/js/ui/react-elements/Helper.ts
View File

@ -1,5 +1,5 @@
import {Dispatch, SetStateAction, useEffect, useMemo, useState} from "react"; import {Dispatch, SetStateAction, useEffect, useMemo, useState} from "react";
import {ConfigValueTypes, settings, SettingsKey, ValuedSettingsKey} from "tc-shared/settings"; import {RegistryValueType, settings, RegistryKey, ValuedRegistryKey} from "tc-shared/settings";
export function useDependentState<S>( export function useDependentState<S>(
factory: (prevState?: S) => S, factory: (prevState?: S) => S,
@ -34,10 +34,10 @@ export function joinClassList(...classes: any[]) : string {
return classes.filter(value => typeof value === "string" && value.length > 0).join(" "); return classes.filter(value => typeof value === "string" && value.length > 0).join(" ");
} }
export function useGlobalSetting<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV; export function useGlobalSetting<V extends RegistryValueType, DV>(key: RegistryKey<V>, defaultValue: DV) : V | DV;
export function useGlobalSetting<V extends ConfigValueTypes>(key: ValuedSettingsKey<V>, defaultValue?: V) : V; export function useGlobalSetting<V extends RegistryValueType>(key: ValuedRegistryKey<V>, defaultValue?: V) : V;
export function useGlobalSetting<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV { export function useGlobalSetting<V extends RegistryValueType, DV>(key: RegistryKey<V>, defaultValue: DV) : V | DV {
const [ value, setValue ] = useState(settings.global(key, defaultValue)); const [ value, setValue ] = useState(settings.getValue(key, defaultValue));
useEffect(() => settings.globalChangeListener(key, value => setValue(value)), []); useEffect(() => settings.globalChangeListener(key, value => setValue(value)), []);
return value; return value;

11
shared/js/ui/react-elements/external-modal/PopoutController.ts
View File

@ -1,16 +1,11 @@
import {getIpcInstance as getIPCInstance} from "../../../ipc/BrowserIPC"; import {getIpcInstance as getIPCInstance} from "../../../ipc/BrowserIPC";
import {Settings, SettingsKey} from "../../../settings"; import {AppParameters} from "../../../settings";
import { import {
Controller2PopoutMessages, EventControllerBase, Controller2PopoutMessages, EventControllerBase,
PopoutIPCMessage PopoutIPCMessage
} from "../../../ui/react-elements/external-modal/IPCMessage"; } from "../../../ui/react-elements/external-modal/IPCMessage";
import {Registry, RegistryMap} from "../../../events"; import {Registry, RegistryMap} from "../../../events";
const kSettingIPCChannel: SettingsKey<string> = {
key: "ipc-channel",
valueType: "string"
};
let controller: PopoutController; let controller: PopoutController;
export function getPopoutController() { export function getPopoutController() {
if(!controller) if(!controller)
@ -25,9 +20,9 @@ class PopoutController extends EventControllerBase<"popout"> {
constructor() { constructor() {
super(); super();
this.ipcRemoteId = Settings.instance.static(Settings.KEY_IPC_REMOTE_ADDRESS, "invalid"); this.ipcRemoteId = AppParameters.getValue(AppParameters.KEY_IPC_REMOTE_ADDRESS, "invalid");
this.ipcChannel = getIPCInstance().createChannel(this.ipcRemoteId, Settings.instance.static(kSettingIPCChannel, "invalid")); this.ipcChannel = getIPCInstance().createChannel(this.ipcRemoteId, AppParameters.getValue(AppParameters.KEY_IPC_REMOTE_ADDRESS, "invalid"));
this.ipcChannel.messageHandler = this.handleIPCMessage.bind(this); this.ipcChannel.messageHandler = this.handleIPCMessage.bind(this);
} }

9
shared/js/ui/react-elements/external-modal/PopoutEntrypoint.ts
View File

@ -4,7 +4,7 @@ import * as i18n from "../../../i18n/localize";
import {Stage} from "tc-loader"; import {Stage} from "tc-loader";
import {AbstractModal, ModalRenderer} from "../../../ui/react-elements/ModalDefinitions"; import {AbstractModal, ModalRenderer} from "../../../ui/react-elements/ModalDefinitions";
import {Settings, SettingsKey} from "../../../settings"; import {AppParameters} from "../../../settings";
import {getPopoutController} from "./PopoutController"; import {getPopoutController} from "./PopoutController";
import {findPopoutHandler} from "../../../ui/react-elements/external-modal/PopoutRegistry"; import {findPopoutHandler} from "../../../ui/react-elements/external-modal/PopoutRegistry";
import {RegistryMap} from "../../../events"; import {RegistryMap} from "../../../events";
@ -23,11 +23,6 @@ let modalRenderer: ModalRenderer;
let modalInstance: AbstractModal; let modalInstance: AbstractModal;
let modalClass: new (events: RegistryMap, userData: any) => AbstractModal; let modalClass: new (events: RegistryMap, userData: any) => AbstractModal;
const kSettingModalTarget: SettingsKey<string> = {
key: "modal-target",
valueType: "string"
};
loader.register_task(Stage.JAVASCRIPT_INITIALIZING, { loader.register_task(Stage.JAVASCRIPT_INITIALIZING, {
name: "setup", name: "setup",
priority: 110, priority: 110,
@ -73,7 +68,7 @@ loader.register_task(Stage.JAVASCRIPT_INITIALIZING, {
name: "modal class loader", name: "modal class loader",
priority: 10, priority: 10,
function: async () => { function: async () => {
const modalTarget = Settings.instance.static(kSettingModalTarget, "unknown"); const modalTarget = AppParameters.getValue(AppParameters.KEY_MODAL_TARGET, "unknown");
console.error("Loading modal class %s", modalTarget); console.error("Loading modal class %s", modalTarget);
try { try {
const handler = findPopoutHandler(modalTarget); const handler = findPopoutHandler(modalTarget);

4
shared/js/ui/tree/EntryTags.tsx
View File

@ -2,7 +2,7 @@ import * as React from "react";
import * as loader from "tc-loader"; import * as loader from "tc-loader";
import {Stage} from "tc-loader"; import {Stage} from "tc-loader";
import {getIpcInstance, IPCChannel} from "tc-shared/ipc/BrowserIPC"; import {getIpcInstance, IPCChannel} from "tc-shared/ipc/BrowserIPC";
import {Settings} from "tc-shared/settings"; import {AppParameters} from "tc-shared/settings";
import {generateDragElement, setupDragData} from "tc-shared/ui/tree/DragHelper"; import {generateDragElement, setupDragData} from "tc-shared/ui/tree/DragHelper";
import {ClientIcon} from "svg-sprites/client-icons"; import {ClientIcon} from "svg-sprites/client-icons";
@ -85,6 +85,6 @@ loader.register_task(Stage.JAVASCRIPT_INITIALIZING, {
priority: 10, priority: 10,
function: async () => { function: async () => {
const ipc = getIpcInstance(); const ipc = getIpcInstance();
ipcChannel = ipc.createChannel(Settings.instance.static(Settings.KEY_IPC_REMOTE_ADDRESS, ipc.getLocalAddress()), kIpcChannel); ipcChannel = ipc.createChannel(AppParameters.getValue(AppParameters.KEY_IPC_REMOTE_ADDRESS, ipc.getLocalAddress()), kIpcChannel);
} }
}); });

2
shared/js/ui/tree/RendererChannel.tsx
View File

@ -145,7 +145,7 @@ export class RendererChannel extends React.Component<{ channel: RDPChannel }, {}
}} }}
onDoubleClick={() => events.fire("action_channel_join", { treeEntryId: entryId })} onDoubleClick={() => events.fire("action_channel_join", { treeEntryId: entryId })}
onContextMenu={event => { onContextMenu={event => {
if (settings.static(Settings.KEY_DISABLE_CONTEXT_MENU)) { if (settings.getValue(Settings.KEY_DISABLE_CONTEXT_MENU)) {
return; return;
} }

2
shared/js/ui/tree/RendererClient.tsx
View File

@ -179,7 +179,7 @@ export class RendererClient extends React.Component<{ client: RDPClient }, {}> {
<div className={clientStyle.clientEntry + " " + viewStyle.treeEntry + " " + (selected ? viewStyle.selected : "")} <div className={clientStyle.clientEntry + " " + viewStyle.treeEntry + " " + (selected ? viewStyle.selected : "")}
style={{ top: (client.offsetTop * ChannelTreeView.EntryHeightEm) + "em" }} style={{ top: (client.offsetTop * ChannelTreeView.EntryHeightEm) + "em" }}
onContextMenu={event => { onContextMenu={event => {
if (settings.static(Settings.KEY_DISABLE_CONTEXT_MENU)) { if (settings.getValue(Settings.KEY_DISABLE_CONTEXT_MENU)) {
return; return;
} }

2
shared/js/ui/tree/RendererServer.tsx
View File

@ -49,7 +49,7 @@ export class ServerRenderer extends React.Component<{ server: RDPServer }, {}> {
this.props.server.select("auto"); this.props.server.select("auto");
}} }}
onContextMenu={event => { onContextMenu={event => {
if (settings.static(Settings.KEY_DISABLE_CONTEXT_MENU)) { if (settings.getValue(Settings.KEY_DISABLE_CONTEXT_MENU)) {
return; return;
} }

4
shared/js/utils/DateUtils.ts
View File

@ -25,7 +25,7 @@ export function same_day(a: number | Date, b: number | Date) {
} }
export function date_format(date: Date, now: Date, ignore_settings?: boolean) : ColloquialFormat { export function date_format(date: Date, now: Date, ignore_settings?: boolean) : ColloquialFormat {
if(!ignore_settings && !settings.static_global(Settings.KEY_CHAT_COLLOQUIAL_TIMESTAMPS)) if(!ignore_settings && !settings.getValue(Settings.KEY_CHAT_COLLOQUIAL_TIMESTAMPS))
return ColloquialFormat.GENERAL; return ColloquialFormat.GENERAL;
if(dateEqual(date, now)) if(dateEqual(date, now))
@ -87,7 +87,7 @@ export function format_chat_time(date: Date) : {
next_update: 0 next_update: 0
}; };
if(settings.static_global(Settings.KEY_CHAT_FIXED_TIMESTAMPS)) { if(settings.getValue(Settings.KEY_CHAT_FIXED_TIMESTAMPS)) {
const format = format_date_colloquial(date, current_timestamp); const format = format_date_colloquial(date, current_timestamp);
result.result = format.result; result.result = format.result;
result.next_update = 0; /* TODO: Update on day change? */ result.next_update = 0; /* TODO: Update on day change? */

27
shared/js/utils/helpers.ts
View File

@ -9,21 +9,22 @@ export function hashPassword(password: string) : Promise<string> {
}); });
} }
export const copy_to_clipboard = str => { export const copyToClipboard = str => {
console.log(tr("Copy text to clipboard: %s"), str); console.log(tr("Copy text to clipboard: %s"), str);
const el = document.createElement('textarea');
el.value = str; const element = document.createElement('textarea');
el.setAttribute('readonly', ''); element.value = str;
el.style.position = 'absolute'; element.setAttribute('readonly', '');
el.style.left = '-9999px'; element.style.position = 'absolute';
document.body.appendChild(el); element.style.left = '-9999px';
const selected = document.body.appendChild(element);
document.getSelection().rangeCount > 0
? document.getSelection().getRangeAt(0) const selected = document.getSelection().rangeCount > 0 ? document.getSelection().getRangeAt(0) : false;
: false;
el.select(); element.select();
document.execCommand('copy'); document.execCommand('copy');
document.body.removeChild(el);
document.body.removeChild(element);
if (selected) { if (selected) {
document.getSelection().removeAllRanges(); document.getSelection().removeAllRanges();
document.getSelection().addRange(selected); document.getSelection().addRange(selected);

2
shared/js/video-viewer/Controller.ts
View File

@ -299,7 +299,7 @@ class VideoViewer {
@EventHandler<VideoViewerEvents>("action_toggle_side_bar") @EventHandler<VideoViewerEvents>("action_toggle_side_bar")
private handleActionToggleSidebar(event: VideoViewerEvents["action_toggle_side_bar"]) { private handleActionToggleSidebar(event: VideoViewerEvents["action_toggle_side_bar"]) {
settings.changeGlobal(Settings.KEY_W2G_SIDEBAR_COLLAPSED, !event.shown); settings.setValue(Settings.KEY_W2G_SIDEBAR_COLLAPSED, !event.shown);
} }
@EventHandler<VideoViewerEvents>("notify_video") @EventHandler<VideoViewerEvents>("notify_video")

4
shared/js/video-viewer/Renderer.tsx
View File

@ -247,7 +247,7 @@ const WatcherList = (props: { events: Registry<VideoViewerEvents>, handlerId: st
}; };
const ToggleSidebarButton = (props: { events: Registry<VideoViewerEvents> }) => { const ToggleSidebarButton = (props: { events: Registry<VideoViewerEvents> }) => {
const [ visible, setVisible ] = useState(settings.global(Settings.KEY_W2G_SIDEBAR_COLLAPSED)); const [ visible, setVisible ] = useState(settings.getValue(Settings.KEY_W2G_SIDEBAR_COLLAPSED));
props.events.reactUse("action_toggle_side_bar", event => setVisible(!event.shown)); props.events.reactUse("action_toggle_side_bar", event => setVisible(!event.shown));
@ -272,7 +272,7 @@ const ButtonUnfollow = (props: { events: Registry<VideoViewerEvents> }) => {
}; };
const Sidebar = (props: { events: Registry<VideoViewerEvents>, handlerId: string }) => { const Sidebar = (props: { events: Registry<VideoViewerEvents>, handlerId: string }) => {
const [ visible, setVisible ] = useState(!settings.global(Settings.KEY_W2G_SIDEBAR_COLLAPSED)); const [ visible, setVisible ] = useState(!settings.getValue(Settings.KEY_W2G_SIDEBAR_COLLAPSED));
props.events.reactUse("action_toggle_side_bar", event => setVisible(event.shown)); props.events.reactUse("action_toggle_side_bar", event => setVisible(event.shown));

4
shared/js/voice/RecorderProfile.ts
View File

@ -101,7 +101,7 @@ export class RecorderProfile {
{ {
let config = {}; let config = {};
try { try {
config = settings.static_global(Settings.FN_PROFILE_RECORD(this.name), {}) as RecorderProfileConfig; config = settings.getValue(Settings.FN_PROFILE_RECORD(this.name), {}) as RecorderProfileConfig;
} catch (error) { } catch (error) {
logWarn(LogCategory.AUDIO, tr("Failed to load old recorder profile config for %s"), this.name); logWarn(LogCategory.AUDIO, tr("Failed to load old recorder profile config for %s"), this.name);
} }
@ -175,7 +175,7 @@ export class RecorderProfile {
private save() { private save() {
if(!this.volatile) { if(!this.volatile) {
settings.changeGlobal(Settings.FN_PROFILE_RECORD(this.name), this.config); settings.setValue(Settings.FN_PROFILE_RECORD(this.name), this.config);
} }
} }

3
web/app/UnloadHandler.ts
View File

@ -2,8 +2,9 @@ import {Settings, settings} from "tc-shared/settings";
import {server_connections} from "tc-shared/ConnectionManager"; import {server_connections} from "tc-shared/ConnectionManager";
window.addEventListener("beforeunload", event => { window.addEventListener("beforeunload", event => {
if(settings.static(Settings.KEY_DISABLE_UNLOAD_DIALOG)) if(settings.getValue(Settings.KEY_DISABLE_UNLOAD_DIALOG)) {
return; return;
}
const active_connections = server_connections.all_connections().filter(e => e.connected); const active_connections = server_connections.all_connections().filter(e => e.connected);
if(active_connections.length == 0) return; if(active_connections.length == 0) return;

2
web/app/connection/ServerConnection.ts
View File

@ -148,7 +148,7 @@ export class ServerConnection extends AbstractServerConnection {
let availableSockets: WrappedWebSocket[] = []; let availableSockets: WrappedWebSocket[] = [];
proxySocket: proxySocket:
if(!settings.static_global(Settings.KEY_CONNECT_NO_DNSPROXY)) { if(!settings.getValue(Settings.KEY_CONNECT_NO_DNSPROXY)) {
let host; let host;
if(Regex.IP_V4.test(address.host)) { if(Regex.IP_V4.test(address.host)) {
host = address.host.replace(/\./g, "-") + ".con-gate.work"; host = address.host.replace(/\./g, "-") + ".con-gate.work";