Improved settings type safety
This commit is contained in:
WolverinDEV
parent
64cefce509
commit
cc3e9134ef
16 changed files with 401 additions and 891 deletions
|
|
@ -86,12 +86,11 @@ export class HandshakeHandler {
|
|||
return;
|
||||
}
|
||||
|
||||
const git_version = settings.static_global("version", "unknown");
|
||||
const browser_name = (navigator.browserSpecs || {})["name"] || " ";
|
||||
let data = {
|
||||
client_nickname: this.parameters.nickname || "Another TeaSpeak user",
|
||||
client_platform: (browser_name ? browser_name + " " : "") + navigator.platform,
|
||||
client_version: "TeaWeb " + git_version + " (" + navigator.userAgent + ")",
|
||||
client_version: "TeaWeb " + __build.version + " (" + navigator.userAgent + ")",
|
||||
client_version_sign: undefined,
|
||||
|
||||
client_default_channel: (this.parameters.channel || {} as any).target,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import * as log from "tc-shared/log";
|
||||
import {LogCategory} from "tc-shared/log";
|
||||
import {guid} from "tc-shared/crypto/uid";
|
||||
import {StaticSettings} from "tc-shared/settings";
|
||||
import {Settings, StaticSettings} from "tc-shared/settings";
|
||||
import {createErrorModal} from "tc-shared/ui/elements/Modal";
|
||||
import * as loader from "tc-loader";
|
||||
import {formatMessage, formatMessageString} from "tc-shared/ui/frames/chat";
|
||||
|
|
@ -207,7 +207,7 @@ export namespace config {
|
|||
|
||||
if(config.repositories.length == 0) {
|
||||
//Add the default TeaSpeak repository
|
||||
load_repository(StaticSettings.instance.static("i18n.default_repository", "https://web.teaspeak.de/i18n/")).then(repo => {
|
||||
load_repository(StaticSettings.instance.static(Settings.KEY_I18N_DEFAULT_REPOSITORY)).then(repo => {
|
||||
log.info(LogCategory.I18N, tr("Successfully added default repository from \"%s\"."), repo.url);
|
||||
register_repository(repo);
|
||||
}).catch(error => {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import {settings} from "tc-shared/settings";
|
||||
import {Settings, settings} from "tc-shared/settings";
|
||||
import * as loader from "tc-loader";
|
||||
|
||||
export enum LogCategory {
|
||||
|
|
@ -88,19 +88,16 @@ const group_mode: GroupMode = GroupMode.PREFIX;
|
|||
//Level Example A: <url>?log.level.trace.enabled=0
|
||||
//Level Example B: <url>?log.level=0
|
||||
export function initialize(default_level: LogType) {
|
||||
for(const category of Object.keys(LogCategory).map(e => parseInt(e))) {
|
||||
if(isNaN(category)) continue;
|
||||
const category_name = LogCategory[category].toLowerCase();
|
||||
enabled_mapping.set(category, settings.static_global<boolean>("log." + category_name.toLowerCase() + ".enabled", enabled_mapping.get(category)));
|
||||
for(const category of Object.keys(LogCategory).map(parseInt).filter(e => !isNaN(e))) {
|
||||
const categoryName = LogCategory[category].toLowerCase();
|
||||
enabled_mapping.set(category, settings.static_global(Settings.FN_LOG_ENABLED(categoryName), enabled_mapping.get(category)));
|
||||
}
|
||||
|
||||
const base_level = settings.static_global<number>("log.level", default_level);
|
||||
const base_level = settings.static_global(Settings.KEY_LOG_LEVEL, default_level);
|
||||
|
||||
for(const level of Object.keys(LogType).map(e => parseInt(e))) {
|
||||
if(isNaN(level)) continue;
|
||||
|
||||
const level_name = LogType[level].toLowerCase();
|
||||
level_mapping.set(level, settings.static_global<boolean>("log." + level_name + ".enabled", level >= base_level));
|
||||
for(const level of Object.keys(LogType).map(parseInt).filter(e => !isNaN(e))) {
|
||||
const levelName = LogType[level].toLowerCase();
|
||||
level_mapping.set(level, settings.static_global(Settings.FN_LOG_LEVEL_ENABLED(levelName), level >= base_level));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,13 +36,12 @@ import {copy_to_clipboard} from "tc-shared/utils/helpers";
|
|||
import ContextMenuEvent = JQuery.ContextMenuEvent;
|
||||
|
||||
/* required import for init */
|
||||
require("./proto").initialize();
|
||||
require("./ui/elements/ContextDivider").initialize();
|
||||
require("./ui/elements/Tab");
|
||||
require("./connection/CommandHandler"); /* else it might not get bundled because only the backends are accessing it */
|
||||
import "./proto";
|
||||
import "./ui/elements/ContextDivider";
|
||||
import "./ui/elements/Tab";
|
||||
import "./connection/CommandHandler"; /* else it might not get bundled because only the backends are accessing it */
|
||||
|
||||
const js_render = window.jsrender || $;
|
||||
const native_client = window.require !== undefined;
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
|
|
@ -59,7 +58,7 @@ function setup_close() {
|
|||
const active_connections = server_connections.all_connections().filter(e => e.connected);
|
||||
if(active_connections.length == 0) return;
|
||||
|
||||
if(!native_client) {
|
||||
if(__build.target === "web") {
|
||||
event.returnValue = "Are you really sure?<br>You're still connected!";
|
||||
} else {
|
||||
const do_exit = () => {
|
||||
|
|
|
|||
|
|
@ -27,11 +27,6 @@ declare global {
|
|||
visible_height() : number;
|
||||
visible_width() : number;
|
||||
|
||||
/* bootstrap */
|
||||
alert() : JQuery<TElement>;
|
||||
modal(properties: any) : this;
|
||||
bootstrapMaterialDesign() : this;
|
||||
|
||||
/* first element which matches the selector, could be the element itself or a parent */
|
||||
firstParent(selector: string) : JQuery;
|
||||
}
|
||||
|
|
@ -41,29 +36,6 @@ declare global {
|
|||
views: any;
|
||||
}
|
||||
|
||||
interface String {
|
||||
format(...fmt): string;
|
||||
format(arguments: string[]): string;
|
||||
}
|
||||
|
||||
interface HighlightJS {
|
||||
listLanguages() : string[];
|
||||
getLanguage(name: string) : any | undefined;
|
||||
|
||||
highlight(language: string, text: string, ignore_illegals?: boolean) : HighlightJSResult;
|
||||
highlightAuto(text: string) : HighlightJSResult;
|
||||
}
|
||||
|
||||
interface HighlightJSResult {
|
||||
language: string;
|
||||
relevance: number;
|
||||
|
||||
value: string;
|
||||
second_best?: any;
|
||||
}
|
||||
|
||||
let remarkable: typeof window.remarkable;
|
||||
|
||||
interface Window {
|
||||
readonly webkitAudioContext: typeof AudioContext;
|
||||
readonly AudioContext: typeof OfflineAudioContext;
|
||||
|
|
@ -73,10 +45,6 @@ declare global {
|
|||
readonly Pointer_stringify: any;
|
||||
readonly jsrender: any;
|
||||
|
||||
cdhljs: HighlightJS;
|
||||
remarkable: any;
|
||||
|
||||
|
||||
readonly require: typeof require;
|
||||
}
|
||||
const __non_webpack_require__: typeof require;
|
||||
|
|
@ -92,20 +60,19 @@ declare global {
|
|||
}
|
||||
}
|
||||
|
||||
export function initialize() { }
|
||||
|
||||
if(!JSON.map_to) {
|
||||
JSON.map_to = function <T>(object: T, json: any, variables?: string | string[], validator?: (map_field: string, map_value: string) => boolean, variable_direction?: number): number {
|
||||
if (!validator) validator = (a, b) => true;
|
||||
if (!validator)
|
||||
validator = () => true;
|
||||
|
||||
if (!variables) {
|
||||
variables = [];
|
||||
|
||||
if (!variable_direction || variable_direction == 0) {
|
||||
for (let field in json)
|
||||
for (let field of Object.keys(json))
|
||||
variables.push(field);
|
||||
} else if (variable_direction == 1) {
|
||||
for (let field in object)
|
||||
for (let field of Object.keys(json))
|
||||
variables.push(field);
|
||||
}
|
||||
} else if (!Array.isArray(variables)) {
|
||||
|
|
@ -274,42 +241,7 @@ if(typeof ($) !== "undefined") {
|
|||
}
|
||||
}
|
||||
|
||||
if (!String.prototype.format) {
|
||||
String.prototype.format = function() {
|
||||
const args = arguments;
|
||||
let array = args.length == 1 && $.isArray(args[0]);
|
||||
return this.replace(/\{\{|\}\}|\{(\d+)\}/g, function (m, n) {
|
||||
if (m == "{{") { return "{"; }
|
||||
if (m == "}}") { return "}"; }
|
||||
return array ? args[0][n] : args[n];
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
if(!Object.values)
|
||||
Object.values = object => Object.keys(object).map(e => object[e]);
|
||||
|
||||
function concatenate(resultConstructor, ...arrays) {
|
||||
let totalLength = 0;
|
||||
for (const arr of arrays) {
|
||||
totalLength += arr.length;
|
||||
}
|
||||
const result = new resultConstructor(totalLength);
|
||||
let offset = 0;
|
||||
for (const arr of arrays) {
|
||||
result.set(arr, offset);
|
||||
offset += arr.length;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function calculate_width(text: string) : number {
|
||||
let element = $.spawn("div");
|
||||
element.text(text)
|
||||
.css("display", "none")
|
||||
.css("margin", 0);
|
||||
$("body").append(element);
|
||||
let size = element.width();
|
||||
element.detach();
|
||||
return size;
|
||||
}
|
||||
export = {};
|
||||
|
|
@ -3,6 +3,7 @@ import {LogCategory} from "tc-shared/log";
|
|||
import * as loader from "tc-loader";
|
||||
import * as log from "tc-shared/log";
|
||||
import {Registry} from "tc-shared/events";
|
||||
import category from "emoji-mart/dist-es/components/category";
|
||||
|
||||
if(typeof(customElements) !== "undefined") {
|
||||
try {
|
||||
|
|
@ -16,67 +17,94 @@ if(typeof(customElements) !== "undefined") {
|
|||
}
|
||||
}
|
||||
|
||||
/* T = value type */
|
||||
export interface SettingsKey<T> {
|
||||
type ConfigValueTypes = boolean | number | string;
|
||||
type ConfigValueTypeNames = "boolean" | "number" | "string";
|
||||
|
||||
export interface SettingsKey<ValueType extends ConfigValueTypes> {
|
||||
key: string;
|
||||
valueType: ConfigValueTypeNames;
|
||||
|
||||
defaultValue?: ValueType;
|
||||
|
||||
fallbackKeys?: string | string[];
|
||||
fallbackImports?: {[key: string]:(value: string) => ValueType};
|
||||
|
||||
fallback_keys?: string | string[];
|
||||
fallback_imports?: {[key: string]:(value: string) => T};
|
||||
description?: string;
|
||||
default_value?: T;
|
||||
|
||||
require_restart?: boolean;
|
||||
requireRestart?: boolean;
|
||||
}
|
||||
|
||||
export interface ValuedSettingsKey<ValueType extends ConfigValueTypes> extends SettingsKey<ValueType> {
|
||||
defaultValue: ValueType;
|
||||
}
|
||||
|
||||
const kNoValuePresent = "--- no value present ---";
|
||||
|
||||
export class SettingsBase {
|
||||
protected static readonly UPDATE_DIRECT: boolean = true;
|
||||
|
||||
protected static transformStO?<T>(input?: string, _default?: T, default_type?: string) : T {
|
||||
default_type = default_type || typeof _default;
|
||||
protected static decodeValueFromString<T extends ConfigValueTypes, DT>(input: string | undefined, type: ConfigValueTypeNames, defaultValue: DT) : T | DT {
|
||||
if(input === undefined || input === null)
|
||||
return defaultValue;
|
||||
|
||||
if (typeof input === "undefined") return _default;
|
||||
if (default_type === "string") return input as any;
|
||||
else if (default_type === "number") return parseInt(input) as any;
|
||||
else if (default_type === "boolean") return (input == "1" || input == "true") as any;
|
||||
else if (default_type === "undefined") return input as any;
|
||||
return JSON.parse(input) as any;
|
||||
switch (type) {
|
||||
case "string":
|
||||
return input as any;
|
||||
|
||||
case "boolean":
|
||||
return (input === "1" || input === "true") as any;
|
||||
|
||||
case "number":
|
||||
return parseFloat(input) as any;
|
||||
|
||||
default:
|
||||
return defaultValue;
|
||||
}
|
||||
}
|
||||
protected static encodeValueToString<T extends ConfigValueTypes>(input: T | undefined) : string | undefined {
|
||||
if(input === undefined || input === null)
|
||||
return undefined;
|
||||
|
||||
switch (typeof input) {
|
||||
case "string":
|
||||
return input;
|
||||
|
||||
case "boolean":
|
||||
return input ? "1" : "0";
|
||||
|
||||
case "number":
|
||||
return input.toString();
|
||||
|
||||
default:
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
protected static transformOtS?<T>(input: T) : string {
|
||||
if (typeof input === "string") return input as string;
|
||||
else if (typeof input === "number") return input.toString();
|
||||
else if (typeof input === "boolean") return input ? "1" : "0";
|
||||
else if (typeof input === "undefined") return undefined;
|
||||
return JSON.stringify(input);
|
||||
}
|
||||
|
||||
protected static resolveKey<T>(key: SettingsKey<T>, _default: T, resolver: (key: string) => string | boolean, default_type?: string) : T {
|
||||
protected static resolveKey<ValueType extends ConfigValueTypes,
|
||||
DefaultType>(key: SettingsKey<ValueType>,
|
||||
resolver: (key: string) => string | undefined,
|
||||
defaultValueType: ConfigValueTypeNames,
|
||||
defaultValue: DefaultType) : ValueType | DefaultType {
|
||||
let value = resolver(key.key);
|
||||
if(!value) {
|
||||
/* trying fallbacks */
|
||||
for(const fallback of key.fallback_keys || []) {
|
||||
if(value === undefined && key.fallbackKeys) {
|
||||
/* trying fallback values */
|
||||
for(const fallback of key.fallbackKeys) {
|
||||
value = resolver(fallback);
|
||||
if(typeof(value) === "string") {
|
||||
/* fallback key succeeded */
|
||||
const importer = (key.fallback_imports || {})[fallback];
|
||||
if(importer)
|
||||
return importer(value);
|
||||
if(value === undefined)
|
||||
continue;
|
||||
|
||||
if(!key.fallbackImports)
|
||||
break;
|
||||
}
|
||||
|
||||
/* fallback key succeeded */
|
||||
const fallbackValueImporter = key.fallbackImports[fallback];
|
||||
if(fallbackValueImporter)
|
||||
return fallbackValueImporter(value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(typeof(value) !== 'string')
|
||||
return _default;
|
||||
|
||||
return SettingsBase.transformStO(value as string, _default, default_type);
|
||||
}
|
||||
|
||||
protected static keyify<T>(key: string | SettingsKey<T>) : SettingsKey<T> {
|
||||
if(typeof(key) === "string")
|
||||
return {key: key};
|
||||
if(typeof(key) === "object" && key.key)
|
||||
return key;
|
||||
throw "key is not a key";
|
||||
return this.decodeValueFromString(value, defaultValueType, defaultValue) as any;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -118,27 +146,20 @@ export class StaticSettings extends SettingsBase {
|
|||
});
|
||||
}
|
||||
|
||||
static?<T>(key: string | SettingsKey<T>, _default?: T, default_type?: string) : T {
|
||||
if(this._handle) return this._handle.static<T>(key, _default, default_type);
|
||||
static<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV;
|
||||
static<V extends ConfigValueTypes>(key: ValuedSettingsKey<V>, defaultValue?: V) : V;
|
||||
|
||||
key = StaticSettings.keyify(key);
|
||||
return StaticSettings.resolveKey(key, _default, key => {
|
||||
static<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV {
|
||||
if(this._handle) {
|
||||
return this._handle.static<V, DV>(key, defaultValue);
|
||||
}
|
||||
|
||||
return StaticSettings.resolveKey(key, key => {
|
||||
let result = this._staticPropsTag.find("[key='" + key + "']");
|
||||
if(result.length > 0)
|
||||
return decodeURIComponent(result.last().attr('value'));
|
||||
return false;
|
||||
}, default_type);
|
||||
}
|
||||
|
||||
deleteStatic<T>(key: string | SettingsKey<T>) {
|
||||
if(this._handle) {
|
||||
this._handle.deleteStatic<T>(key);
|
||||
return;
|
||||
}
|
||||
|
||||
key = StaticSettings.keyify(key);
|
||||
let result = this._staticPropsTag.find("[key='" + key.key + "']");
|
||||
if(result.length != 0) result.detach();
|
||||
return undefined;
|
||||
}, key.valueType, arguments.length > 1 ? defaultValue : key.defaultValue);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -153,271 +174,391 @@ export interface SettingsEvents {
|
|||
}
|
||||
|
||||
export class Settings extends StaticSettings {
|
||||
static readonly KEY_USER_IS_NEW: SettingsKey<boolean> = {
|
||||
static readonly KEY_USER_IS_NEW: ValuedSettingsKey<boolean> = {
|
||||
key: 'user_is_new_user',
|
||||
default_value: true
|
||||
valueType: "boolean",
|
||||
defaultValue: true
|
||||
};
|
||||
|
||||
static readonly KEY_DISABLE_COSMETIC_SLOWDOWN: SettingsKey<boolean> = {
|
||||
static readonly KEY_LOG_LEVEL: SettingsKey<number> = {
|
||||
key: 'log.level',
|
||||
valueType: "number"
|
||||
};
|
||||
|
||||
static readonly KEY_DISABLE_COSMETIC_SLOWDOWN: ValuedSettingsKey<boolean> = {
|
||||
key: 'disable_cosmetic_slowdown',
|
||||
description: 'Disable the cosmetic slowdows in some processes, like icon upload.'
|
||||
description: 'Disable the cosmetic slowdows in some processes, like icon upload.',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
|
||||
static readonly KEY_DISABLE_CONTEXT_MENU: SettingsKey<boolean> = {
|
||||
static readonly KEY_DISABLE_CONTEXT_MENU: ValuedSettingsKey<boolean> = {
|
||||
key: 'disableContextMenu',
|
||||
description: 'Disable the context menu for the channel tree which allows to debug the DOM easier',
|
||||
default_value: false
|
||||
defaultValue: false,
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_DISABLE_GLOBAL_CONTEXT_MENU: SettingsKey<boolean> = {
|
||||
static readonly KEY_DISABLE_GLOBAL_CONTEXT_MENU: ValuedSettingsKey<boolean> = {
|
||||
key: 'disableGlobalContextMenu',
|
||||
description: 'Disable the general context menu prevention',
|
||||
default_value: false
|
||||
defaultValue: false,
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_DISABLE_UNLOAD_DIALOG: SettingsKey<boolean> = {
|
||||
static readonly KEY_DISABLE_UNLOAD_DIALOG: ValuedSettingsKey<boolean> = {
|
||||
key: 'disableUnloadDialog',
|
||||
description: 'Disables the unload popup on side closing'
|
||||
description: 'Disables the unload popup on side closing',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
static readonly KEY_DISABLE_VOICE: SettingsKey<boolean> = {
|
||||
static readonly KEY_DISABLE_VOICE: ValuedSettingsKey<boolean> = {
|
||||
key: 'disableVoice',
|
||||
description: 'Disables the voice bridge. If disabled, the audio and codec workers aren\'t required anymore'
|
||||
description: 'Disables the voice bridge. If disabled, the audio and codec workers aren\'t required anymore',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
static readonly KEY_DISABLE_MULTI_SESSION: SettingsKey<boolean> = {
|
||||
static readonly KEY_DISABLE_MULTI_SESSION: ValuedSettingsKey<boolean> = {
|
||||
key: 'disableMultiSession',
|
||||
default_value: false,
|
||||
require_restart: true
|
||||
defaultValue: false,
|
||||
requireRestart: true,
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_LOAD_DUMMY_ERROR: SettingsKey<boolean> = {
|
||||
static readonly KEY_LOAD_DUMMY_ERROR: ValuedSettingsKey<boolean> = {
|
||||
key: 'dummy_load_error',
|
||||
description: 'Triggers a loading error at the end of the loading process.'
|
||||
description: 'Triggers a loading error at the end of the loading process.',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
|
||||
static readonly KEY_I18N_DEFAULT_REPOSITORY: ValuedSettingsKey<string> = {
|
||||
key: 'i18n.default_repository',
|
||||
valueType: "string",
|
||||
defaultValue: "https://web.teaspeak.de/i18n/"
|
||||
};
|
||||
|
||||
/* Default client states */
|
||||
static readonly KEY_CLIENT_STATE_MICROPHONE_MUTED: SettingsKey<boolean> = {
|
||||
static readonly KEY_CLIENT_STATE_MICROPHONE_MUTED: ValuedSettingsKey<boolean> = {
|
||||
key: 'client_state_microphone_muted',
|
||||
default_value: false,
|
||||
fallback_keys: ["mute_input"]
|
||||
defaultValue: false,
|
||||
fallbackKeys: ["mute_input"],
|
||||
valueType: "boolean",
|
||||
};
|
||||
static readonly KEY_CLIENT_STATE_SPEAKER_MUTED: SettingsKey<boolean> = {
|
||||
|
||||
static readonly KEY_CLIENT_STATE_SPEAKER_MUTED: ValuedSettingsKey<boolean> = {
|
||||
key: 'client_state_speaker_muted',
|
||||
default_value: false,
|
||||
fallback_keys: ["mute_output"]
|
||||
defaultValue: false,
|
||||
fallbackKeys: ["mute_output"],
|
||||
valueType: "boolean",
|
||||
};
|
||||
static readonly KEY_CLIENT_STATE_QUERY_SHOWN: SettingsKey<boolean> = {
|
||||
static readonly KEY_CLIENT_STATE_QUERY_SHOWN: ValuedSettingsKey<boolean> = {
|
||||
key: 'client_state_query_shown',
|
||||
default_value: false,
|
||||
fallback_keys: ["show_server_queries"]
|
||||
defaultValue: false,
|
||||
fallbackKeys: ["show_server_queries"],
|
||||
valueType: "boolean",
|
||||
};
|
||||
static readonly KEY_CLIENT_STATE_SUBSCRIBE_ALL_CHANNELS: SettingsKey<boolean> = {
|
||||
static readonly KEY_CLIENT_STATE_SUBSCRIBE_ALL_CHANNELS: ValuedSettingsKey<boolean> = {
|
||||
key: 'client_state_subscribe_all_channels',
|
||||
default_value: true,
|
||||
fallback_keys: ["channel_subscribe_all"]
|
||||
defaultValue: true,
|
||||
fallbackKeys: ["channel_subscribe_all"],
|
||||
valueType: "boolean",
|
||||
};
|
||||
static readonly KEY_CLIENT_STATE_AWAY: SettingsKey<boolean> = {
|
||||
static readonly KEY_CLIENT_STATE_AWAY: ValuedSettingsKey<boolean> = {
|
||||
key: 'client_state_away',
|
||||
default_value: false
|
||||
defaultValue: false,
|
||||
valueType: "boolean",
|
||||
};
|
||||
static readonly KEY_CLIENT_AWAY_MESSAGE: SettingsKey<string> = {
|
||||
static readonly KEY_CLIENT_AWAY_MESSAGE: ValuedSettingsKey<string> = {
|
||||
key: 'client_away_message',
|
||||
default_value: ""
|
||||
defaultValue: "",
|
||||
valueType: "string"
|
||||
};
|
||||
|
||||
/* Connect parameters */
|
||||
static readonly KEY_FLAG_CONNECT_DEFAULT: SettingsKey<boolean> = {
|
||||
key: 'connect_default'
|
||||
static readonly KEY_FLAG_CONNECT_DEFAULT: ValuedSettingsKey<boolean> = {
|
||||
key: 'connect_default',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
static readonly KEY_CONNECT_ADDRESS: SettingsKey<string> = {
|
||||
key: 'connect_address'
|
||||
static readonly KEY_CONNECT_ADDRESS: ValuedSettingsKey<string> = {
|
||||
key: 'connect_address',
|
||||
valueType: "string",
|
||||
defaultValue: undefined
|
||||
};
|
||||
static readonly KEY_CONNECT_PROFILE: SettingsKey<string> = {
|
||||
static readonly KEY_CONNECT_PROFILE: ValuedSettingsKey<string> = {
|
||||
key: 'connect_profile',
|
||||
default_value: 'default'
|
||||
defaultValue: 'default',
|
||||
valueType: "string",
|
||||
};
|
||||
static readonly KEY_CONNECT_USERNAME: SettingsKey<string> = {
|
||||
key: 'connect_username'
|
||||
static readonly KEY_CONNECT_USERNAME: ValuedSettingsKey<string> = {
|
||||
key: 'connect_username',
|
||||
valueType: "string",
|
||||
defaultValue: undefined
|
||||
};
|
||||
static readonly KEY_CONNECT_PASSWORD: SettingsKey<string> = {
|
||||
key: 'connect_password'
|
||||
static readonly KEY_CONNECT_PASSWORD: ValuedSettingsKey<string> = {
|
||||
key: 'connect_password',
|
||||
valueType: "string",
|
||||
defaultValue: undefined
|
||||
};
|
||||
static readonly KEY_FLAG_CONNECT_PASSWORD: SettingsKey<boolean> = {
|
||||
key: 'connect_password_hashed'
|
||||
static readonly KEY_FLAG_CONNECT_PASSWORD: ValuedSettingsKey<boolean> = {
|
||||
key: 'connect_password_hashed',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
static readonly KEY_CONNECT_HISTORY: SettingsKey<string> = {
|
||||
key: 'connect_history'
|
||||
static readonly KEY_CONNECT_HISTORY: ValuedSettingsKey<string> = {
|
||||
key: 'connect_history',
|
||||
valueType: "string",
|
||||
defaultValue: ""
|
||||
};
|
||||
static readonly KEY_CONNECT_NO_SINGLE_INSTANCE: SettingsKey<boolean> = {
|
||||
static readonly KEY_CONNECT_SHOW_HISTORY: ValuedSettingsKey<boolean> = {
|
||||
key: 'connect_show_last_servers',
|
||||
valueType: "boolean",
|
||||
defaultValue: false
|
||||
};
|
||||
static readonly KEY_CONNECT_NO_SINGLE_INSTANCE: ValuedSettingsKey<boolean> = {
|
||||
key: 'connect_no_single_instance',
|
||||
default_value: false
|
||||
defaultValue: false,
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CONNECT_NO_DNSPROXY: SettingsKey<boolean> = {
|
||||
static readonly KEY_CONNECT_NO_DNSPROXY: ValuedSettingsKey<boolean> = {
|
||||
key: 'connect_no_dnsproxy',
|
||||
default_value: false
|
||||
defaultValue: false,
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CERTIFICATE_CALLBACK: SettingsKey<string> = {
|
||||
key: 'certificate_callback'
|
||||
static readonly KEY_CERTIFICATE_CALLBACK: ValuedSettingsKey<string> = {
|
||||
key: 'certificate_callback',
|
||||
valueType: "string",
|
||||
defaultValue: undefined
|
||||
};
|
||||
|
||||
/* sounds */
|
||||
static readonly KEY_SOUND_MASTER: SettingsKey<number> = {
|
||||
static readonly KEY_SOUND_MASTER: ValuedSettingsKey<number> = {
|
||||
key: 'audio_master_volume',
|
||||
default_value: 100
|
||||
defaultValue: 100,
|
||||
valueType: "number",
|
||||
};
|
||||
|
||||
static readonly KEY_SOUND_MASTER_SOUNDS: SettingsKey<number> = {
|
||||
static readonly KEY_SOUND_MASTER_SOUNDS: ValuedSettingsKey<number> = {
|
||||
key: 'audio_master_volume_sounds',
|
||||
default_value: 100
|
||||
defaultValue: 100,
|
||||
valueType: "number",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_FIXED_TIMESTAMPS: SettingsKey<boolean> = {
|
||||
static readonly KEY_SOUND_VOLUMES: SettingsKey<string> = {
|
||||
key: 'sound_volume',
|
||||
valueType: "string",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_FIXED_TIMESTAMPS: ValuedSettingsKey<boolean> = {
|
||||
key: 'chat_fixed_timestamps',
|
||||
default_value: false,
|
||||
description: 'Enables fixed timestamps for chat messages and disabled the updating once (2 seconds ago... etc)'
|
||||
defaultValue: false,
|
||||
description: 'Enables fixed timestamps for chat messages and disabled the updating once (2 seconds ago... etc)',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_COLLOQUIAL_TIMESTAMPS: SettingsKey<boolean> = {
|
||||
static readonly KEY_CHAT_COLLOQUIAL_TIMESTAMPS: ValuedSettingsKey<boolean> = {
|
||||
key: 'chat_colloquial_timestamps',
|
||||
default_value: true,
|
||||
description: 'Enabled colloquial timestamp formatting like "Yesterday at ..." or "Today at ..."'
|
||||
defaultValue: true,
|
||||
description: 'Enabled colloquial timestamp formatting like "Yesterday at ..." or "Today at ..."',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_COLORED_EMOJIES: SettingsKey<boolean> = {
|
||||
static readonly KEY_CHAT_COLORED_EMOJIES: ValuedSettingsKey<boolean> = {
|
||||
key: 'chat_colored_emojies',
|
||||
default_value: true,
|
||||
description: 'Enables colored emojies powered by Twemoji'
|
||||
defaultValue: true,
|
||||
description: 'Enables colored emojies powered by Twemoji',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_TAG_URLS: SettingsKey<boolean> = {
|
||||
static readonly KEY_CHAT_TAG_URLS: ValuedSettingsKey<boolean> = {
|
||||
key: 'chat_tag_urls',
|
||||
default_value: true,
|
||||
description: 'Automatically link urls with [url]'
|
||||
defaultValue: true,
|
||||
description: 'Automatically link urls with [url]',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_ENABLE_MARKDOWN: SettingsKey<boolean> = {
|
||||
static readonly KEY_CHAT_ENABLE_MARKDOWN: ValuedSettingsKey<boolean> = {
|
||||
key: 'chat_enable_markdown',
|
||||
default_value: true,
|
||||
description: 'Enabled markdown chat support.'
|
||||
defaultValue: true,
|
||||
description: 'Enabled markdown chat support.',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_ENABLE_BBCODE: SettingsKey<boolean> = {
|
||||
static readonly KEY_CHAT_ENABLE_BBCODE: ValuedSettingsKey<boolean> = {
|
||||
key: 'chat_enable_bbcode',
|
||||
default_value: false,
|
||||
description: 'Enabled bbcode support in chat.'
|
||||
defaultValue: false,
|
||||
description: 'Enabled bbcode support in chat.',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHAT_IMAGE_WHITELIST_REGEX: SettingsKey<string> = {
|
||||
static readonly KEY_CHAT_IMAGE_WHITELIST_REGEX: ValuedSettingsKey<string> = {
|
||||
key: 'chat_image_whitelist_regex',
|
||||
default_value: JSON.stringify([])
|
||||
defaultValue: JSON.stringify([]),
|
||||
valueType: "string",
|
||||
};
|
||||
|
||||
static readonly KEY_SWITCH_INSTANT_CHAT: SettingsKey<boolean> = {
|
||||
static readonly KEY_SWITCH_INSTANT_CHAT: ValuedSettingsKey<boolean> = {
|
||||
key: 'switch_instant_chat',
|
||||
default_value: true,
|
||||
description: 'Directly switch to channel chat on channel select'
|
||||
defaultValue: true,
|
||||
description: 'Directly switch to channel chat on channel select',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_SWITCH_INSTANT_CLIENT: SettingsKey<boolean> = {
|
||||
static readonly KEY_SWITCH_INSTANT_CLIENT: ValuedSettingsKey<boolean> = {
|
||||
key: 'switch_instant_client',
|
||||
default_value: true,
|
||||
description: 'Directly switch to client info on client select'
|
||||
defaultValue: true,
|
||||
description: 'Directly switch to client info on client select',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_HOSTBANNER_BACKGROUND: SettingsKey<boolean> = {
|
||||
static readonly KEY_HOSTBANNER_BACKGROUND: ValuedSettingsKey<boolean> = {
|
||||
key: 'hostbanner_background',
|
||||
default_value: false,
|
||||
description: 'Enables a default background begind the hostbanner'
|
||||
defaultValue: false,
|
||||
description: 'Enables a default background begind the hostbanner',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_CHANNEL_EDIT_ADVANCED: SettingsKey<boolean> = {
|
||||
static readonly KEY_CHANNEL_EDIT_ADVANCED: ValuedSettingsKey<boolean> = {
|
||||
key: 'channel_edit_advanced',
|
||||
default_value: false,
|
||||
description: 'Edit channels in advanced mode with a lot more settings'
|
||||
defaultValue: false,
|
||||
description: 'Edit channels in advanced mode with a lot more settings',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_PERMISSIONS_SHOW_ALL: SettingsKey<boolean> = {
|
||||
static readonly KEY_PERMISSIONS_SHOW_ALL: ValuedSettingsKey<boolean> = {
|
||||
key: 'permissions_show_all',
|
||||
default_value: false,
|
||||
description: 'Show all permissions even thou they dont make sense for the server/channel group'
|
||||
defaultValue: false,
|
||||
description: 'Show all permissions even thou they dont make sense for the server/channel group',
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_TEAFORO_URL: SettingsKey<string> = {
|
||||
static readonly KEY_TEAFORO_URL: ValuedSettingsKey<string> = {
|
||||
key: "teaforo_url",
|
||||
default_value: "https://forum.teaspeak.de/"
|
||||
defaultValue: "https://forum.teaspeak.de/",
|
||||
valueType: "string",
|
||||
};
|
||||
|
||||
static readonly KEY_FONT_SIZE: SettingsKey<number> = {
|
||||
key: "font_size"
|
||||
static readonly KEY_FONT_SIZE: ValuedSettingsKey<number> = {
|
||||
key: "font_size",
|
||||
valueType: "number",
|
||||
defaultValue: 14
|
||||
};
|
||||
|
||||
static readonly KEY_ICON_SIZE: SettingsKey<number> = {
|
||||
static readonly KEY_ICON_SIZE: ValuedSettingsKey<number> = {
|
||||
key: "icon_size",
|
||||
default_value: 100
|
||||
defaultValue: 100,
|
||||
valueType: "number",
|
||||
};
|
||||
|
||||
static readonly KEY_KEYCONTROL_DATA: SettingsKey<string> = {
|
||||
static readonly KEY_KEYCONTROL_DATA: ValuedSettingsKey<string> = {
|
||||
key: "keycontrol_data",
|
||||
default_value: "{}"
|
||||
defaultValue: "{}",
|
||||
valueType: "string",
|
||||
};
|
||||
|
||||
static readonly KEY_LAST_INVITE_LINK_TYPE: SettingsKey<string> = {
|
||||
static readonly KEY_LAST_INVITE_LINK_TYPE: ValuedSettingsKey<string> = {
|
||||
key: "last_invite_link_type",
|
||||
default_value: "tea-web"
|
||||
defaultValue: "tea-web",
|
||||
valueType: "string",
|
||||
};
|
||||
|
||||
static readonly KEY_TRANSFERS_SHOW_FINISHED: SettingsKey<boolean> = {
|
||||
static readonly KEY_TRANSFERS_SHOW_FINISHED: ValuedSettingsKey<boolean> = {
|
||||
key: 'transfers_show_finished',
|
||||
default_value: true,
|
||||
description: "Show finished file transfers in the file transfer list"
|
||||
defaultValue: true,
|
||||
description: "Show finished file transfers in the file transfer list",
|
||||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_TRANSFER_DOWNLOAD_FOLDER: SettingsKey<string> = {
|
||||
key: "transfer_download_folder",
|
||||
description: "The download folder for the file transfer downloads",
|
||||
/* default_value: <users download directory> */
|
||||
valueType: "string",
|
||||
/* defaultValue: <users download directory> */
|
||||
};
|
||||
|
||||
static readonly FN_LOG_ENABLED: (category: string) => SettingsKey<boolean> = category => {
|
||||
return {
|
||||
key: "log." + category.toLowerCase() + ".enabled",
|
||||
valueType: "boolean",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_SEPARATOR_STATE: (separator: string) => SettingsKey<string> = separator => {
|
||||
return {
|
||||
key: "separator-settings-" + separator,
|
||||
valueType: "string",
|
||||
fallbackKeys: ["seperator-settings-" + separator]
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_LOG_LEVEL_ENABLED: (category: string) => SettingsKey<boolean> = category => {
|
||||
return {
|
||||
key: "log.level." + category.toLowerCase() + ".enabled",
|
||||
valueType: "boolean",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_INVITE_LINK_SETTING: (name: string) => SettingsKey<string> = name => {
|
||||
return {
|
||||
key: 'invite_link_setting_' + name
|
||||
key: 'invite_link_setting_' + name,
|
||||
valueType: "string",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_SERVER_CHANNEL_SUBSCRIBE_MODE: (channel_id: number) => SettingsKey<number> = channel => {
|
||||
return {
|
||||
key: 'channel_subscribe_mode_' + channel
|
||||
key: 'channel_subscribe_mode_' + channel,
|
||||
valueType: "number",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_SERVER_CHANNEL_COLLAPSED: (channel_id: number) => SettingsKey<boolean> = channel => {
|
||||
static readonly FN_SERVER_CHANNEL_COLLAPSED: (channel_id: number) => ValuedSettingsKey<boolean> = channel => {
|
||||
return {
|
||||
key: 'channel_collapsed_' + channel,
|
||||
default_value: false
|
||||
defaultValue: false,
|
||||
valueType: "boolean",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_PROFILE_RECORD: (name: string) => SettingsKey<any> = name => {
|
||||
return {
|
||||
key: 'profile_record' + name
|
||||
key: 'profile_record' + name,
|
||||
valueType: "string",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_CHANNEL_CHAT_READ: (id: number) => SettingsKey<number> = id => {
|
||||
return {
|
||||
key: 'channel_chat_read_' + id
|
||||
key: 'channel_chat_read_' + id,
|
||||
valueType: "number",
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_CLIENT_MUTED: (clientUniqueId: string) => SettingsKey<boolean> = clientUniqueId => {
|
||||
return {
|
||||
key: "client_" + clientUniqueId + "_muted",
|
||||
valueType: "boolean",
|
||||
fallbackKeys: ["mute_client_" + clientUniqueId]
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_CLIENT_VOLUME: (clientUniqueId: string) => SettingsKey<number> = clientUniqueId => {
|
||||
return {
|
||||
key: "client_" + clientUniqueId + "_volume",
|
||||
valueType: "number",
|
||||
fallbackKeys: ["volume_client_" + clientUniqueId]
|
||||
}
|
||||
};
|
||||
|
||||
static readonly KEYS = (() => {
|
||||
const result = [];
|
||||
|
||||
for(const key in Settings) {
|
||||
for(const key of Object.keys(Settings)) {
|
||||
if(!key.toUpperCase().startsWith("KEY_"))
|
||||
continue;
|
||||
if(key.toUpperCase() == "KEYS")
|
||||
continue;
|
||||
|
||||
result.push(key);
|
||||
}
|
||||
|
|
@ -465,27 +606,31 @@ export class Settings extends StaticSettings {
|
|||
}, 5 * 1000);
|
||||
}
|
||||
|
||||
static_global?<T>(key: string | SettingsKey<T>, _default?: T) : T {
|
||||
const actual_default = typeof(_default) === "undefined" && typeof(key) === "object" && 'default_value' in key ? key.default_value : _default;
|
||||
static_global<V extends ConfigValueTypes>(key: ValuedSettingsKey<V>, defaultValue?: V) : V;
|
||||
static_global<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV;
|
||||
static_global<V extends ConfigValueTypes, DV>(key: SettingsKey<V> | ValuedSettingsKey<V>, defaultValue: DV) : V | DV {
|
||||
const staticValue = this.static(key, kNoValuePresent);
|
||||
if(staticValue !== kNoValuePresent)
|
||||
return staticValue;
|
||||
|
||||
const default_object = { seed: Math.random() } as any;
|
||||
let _static = this.static(key, default_object, typeof _default);
|
||||
if(_static !== default_object) return StaticSettings.transformStO(_static, actual_default);
|
||||
return this.global<T>(key, actual_default);
|
||||
if(arguments.length > 1)
|
||||
return this.global(key, defaultValue);
|
||||
return this.global(key as ValuedSettingsKey<V>);
|
||||
}
|
||||
|
||||
global?<T>(key: string | SettingsKey<T>, _default?: T) : T {
|
||||
const actual_default = typeof(_default) === "undefined" && typeof(key) === "object" && 'default_value' in key ? key.default_value : _default;
|
||||
return StaticSettings.resolveKey(Settings.keyify(key), actual_default, key => this.cacheGlobal[key]);
|
||||
global<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV;
|
||||
global<V extends ConfigValueTypes>(key: ValuedSettingsKey<V>, defaultValue?: V) : V;
|
||||
global<V extends ConfigValueTypes, DV>(key: SettingsKey<V>, defaultValue: DV) : V | DV {
|
||||
return StaticSettings.resolveKey(key, key => this.cacheGlobal[key], key.valueType, arguments.length > 1 ? defaultValue : key.defaultValue);
|
||||
}
|
||||
|
||||
changeGlobal<T>(key: string | SettingsKey<T>, value?: T){
|
||||
key = Settings.keyify(key);
|
||||
if(this.cacheGlobal[key.key] === value) return;
|
||||
changeGlobal<T extends ConfigValueTypes>(key: SettingsKey<T>, value?: T){
|
||||
if(this.cacheGlobal[key.key] === value)
|
||||
return;
|
||||
|
||||
this.updated = true;
|
||||
const oldValue = this.cacheGlobal[key.key];
|
||||
this.cacheGlobal[key.key] = StaticSettings.transformOtS(value);
|
||||
this.cacheGlobal[key.key] = StaticSettings.encodeValueToString(value);
|
||||
this.events.fire("notify_setting_changed", {
|
||||
mode: "global",
|
||||
newValue: this.cacheGlobal[key.key],
|
||||
|
|
@ -530,20 +675,21 @@ export class ServerSettings extends SettingsBase {
|
|||
this._server_save_worker = undefined;
|
||||
}
|
||||
|
||||
server?<T>(key: string | SettingsKey<T>, _default?: T) : T {
|
||||
if(this._destroyed) throw "destroyed";
|
||||
const kkey = Settings.keyify(key);
|
||||
return StaticSettings.resolveKey(kkey, typeof _default === "undefined" ? kkey.default_value : _default, key => this.cacheServer[key]);
|
||||
server<V extends ConfigValueTypes, DV extends V | undefined = undefined>(key: SettingsKey<V>, defaultValue?: DV) : V | DV {
|
||||
if(this._destroyed)
|
||||
throw "destroyed";
|
||||
|
||||
return StaticSettings.resolveKey(key, key => this.cacheServer[key], key.valueType, arguments.length > 1 ? defaultValue : key.defaultValue);
|
||||
}
|
||||
|
||||
changeServer<T>(key: string | SettingsKey<T>, value?: T) {
|
||||
changeServer<T extends ConfigValueTypes>(key: SettingsKey<T>, value?: T) {
|
||||
if(this._destroyed) throw "destroyed";
|
||||
key = Settings.keyify(key);
|
||||
|
||||
if(this.cacheServer[key.key] === value) return;
|
||||
if(this.cacheServer[key.key] === value)
|
||||
return;
|
||||
|
||||
this._server_settings_updated = true;
|
||||
this.cacheServer[key.key] = StaticSettings.transformOtS(value);
|
||||
this.cacheServer[key.key] = StaticSettings.encodeValueToString(value);
|
||||
|
||||
if(Settings.UPDATE_DIRECT)
|
||||
this.save();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import * as log from "tc-shared/log";
|
||||
import {LogCategory} from "tc-shared/log";
|
||||
import {settings} from "tc-shared/settings";
|
||||
import {Settings, settings} from "tc-shared/settings";
|
||||
import {ConnectionHandler} from "tc-shared/ConnectionHandler";
|
||||
import * as sbackend from "tc-backend/audio/sounds";
|
||||
|
||||
|
|
@ -156,7 +156,7 @@ export function save() {
|
|||
data.overlap = overlap_sounds;
|
||||
data.ignore_muted = ignore_muted;
|
||||
|
||||
settings.changeGlobal("sound_volume", JSON.stringify(data));
|
||||
settings.changeGlobal(Settings.KEY_SOUND_VOLUMES, JSON.stringify(data));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ export function initialize() : Promise<void> {
|
|||
|
||||
/* volumes */
|
||||
{
|
||||
const data = JSON.parse(settings.static_global("sound_volume", "{}"));
|
||||
const data = JSON.parse(settings.static_global(Settings.KEY_SOUND_VOLUMES, "{}"));
|
||||
for(const sound_key of Object.keys(Sound)) {
|
||||
if(typeof(data[Sound[sound_key]]) !== "undefined")
|
||||
speech_volume[Sound[sound_key]] = data[Sound[sound_key]];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import * as hljs from "highlight.js/lib/core";
|
||||
|
||||
import * as loader from "tc-loader";
|
||||
import {ElementRenderer} from "vendor/xbbcode/renderer/base";
|
||||
import {TagElement} from "vendor/xbbcode/elements";
|
||||
|
|
@ -67,6 +68,17 @@ registerLanguage("x86asm", import("highlight.js/lib/languages/x86asm"));
|
|||
registerLanguage("xml", import("highlight.js/lib/languages/xml"));
|
||||
registerLanguage("yaml", import("highlight.js/lib/languages/yaml"));
|
||||
|
||||
interface HighlightResult {
|
||||
relevance : number
|
||||
value : string
|
||||
language? : string
|
||||
illegal : boolean
|
||||
sofar? : string
|
||||
errorRaised? : Error
|
||||
|
||||
second_best? : Omit<HighlightResult, 'second_best'>
|
||||
}
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
||||
name: "XBBCode highlight init",
|
||||
function: async () => {
|
||||
|
|
@ -91,8 +103,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
|||
lines = lines.slice(0, lines.length - 1);
|
||||
}
|
||||
|
||||
let result: HighlightJSResult;
|
||||
|
||||
let result: HighlightResult;
|
||||
const detectedLanguage = hljs.getLanguage(language);
|
||||
if(detectedLanguage)
|
||||
result = hljs.highlight(detectedLanguage.name, lines.join("\n"), true);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import {createServerGroupAssignmentModal} from "tc-shared/ui/modal/ModalGroupAss
|
|||
import {openClientInfo} from "tc-shared/ui/modal/ModalClientInfo";
|
||||
import {spawnBanClient} from "tc-shared/ui/modal/ModalBanClient";
|
||||
import {spawnChangeLatency} from "tc-shared/ui/modal/ModalChangeLatency";
|
||||
import {spawnPlaylistEdit} from "tc-shared/ui/modal/ModalPlaylistEdit";
|
||||
import {formatMessage} from "tc-shared/ui/frames/chat";
|
||||
import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo";
|
||||
import * as hex from "tc-shared/crypto/hex";
|
||||
|
|
@ -286,7 +285,7 @@ export class ClientEntry extends ChannelTreeEntry<ClientEvents> {
|
|||
}
|
||||
this._audio_muted = flag;
|
||||
|
||||
this.channelTree.client.settings.changeServer("mute_client_" + this.clientUid(), flag);
|
||||
this.channelTree.client.settings.changeServer(Settings.FN_CLIENT_MUTED(this.clientUid()), flag);
|
||||
if(this._audio_handle) {
|
||||
if(flag) {
|
||||
this._audio_handle.set_volume(0);
|
||||
|
|
@ -755,8 +754,8 @@ export class ClientEntry extends ChannelTreeEntry<ClientEvents> {
|
|||
reorder_channel = true;
|
||||
}
|
||||
if(variable.key == "client_unique_identifier") {
|
||||
this._audio_volume = parseFloat(this.channelTree.client.settings.server("volume_client_" + this.clientUid(), "1"));
|
||||
const mute_status = this.channelTree.client.settings.server("mute_client_" + this.clientUid(), false);
|
||||
this._audio_volume = this.channelTree.client.settings.server(Settings.FN_CLIENT_VOLUME(this.clientUid()), 1);
|
||||
const mute_status = this.channelTree.client.settings.server(Settings.FN_CLIENT_MUTED(this.clientUid()), false);
|
||||
this.set_muted(mute_status, mute_status); /* force only needed when we want to mute the client */
|
||||
|
||||
if(this._audio_handle)
|
||||
|
|
@ -917,7 +916,7 @@ export class ClientEntry extends ChannelTreeEntry<ClientEvents> {
|
|||
this._audio_volume = value;
|
||||
|
||||
this.get_audio_handle()?.set_volume(value);
|
||||
this.channelTree.client.settings.changeServer("volume_client_" + this.clientUid(), value);
|
||||
this.channelTree.client.settings.changeServer(Settings.FN_CLIENT_VOLUME(this.clientUid()), value);
|
||||
|
||||
this.events.fire("notify_audio_level_changed", { newValue: value });
|
||||
}
|
||||
|
|
@ -1140,25 +1139,6 @@ export class MusicClientEntry extends ClientEntry {
|
|||
type: MenuEntryType.ENTRY
|
||||
},
|
||||
*/
|
||||
{
|
||||
name: tr("Open bot's playlist"),
|
||||
icon_class: "client-edit",
|
||||
disabled: false,
|
||||
callback: () => {
|
||||
this.channelTree.client.serverConnection.command_helper.request_playlist_list().then(lists => {
|
||||
for(const entry of lists) {
|
||||
if(entry.playlist_id == this.properties.client_playlist_id) {
|
||||
spawnPlaylistEdit(this.channelTree.client, entry);
|
||||
return;
|
||||
}
|
||||
}
|
||||
createErrorModal(tr("Invalid permissions"), tr("You dont have to see the bots playlist.")).open();
|
||||
}).catch(error => {
|
||||
createErrorModal(tr("Failed to query playlist."), tr("Failed to query playlist info.")).open();
|
||||
});
|
||||
},
|
||||
type: contextmenu.MenuEntryType.ENTRY
|
||||
},
|
||||
{
|
||||
name: tr("Quick url replay"),
|
||||
icon_class: "client-edit",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import {settings} from "tc-shared/settings";
|
||||
import {Settings, settings} from "tc-shared/settings";
|
||||
import {LogCategory} from "tc-shared/log";
|
||||
import * as log from "tc-shared/log";
|
||||
|
||||
|
|
@ -8,10 +8,6 @@ declare global {
|
|||
}
|
||||
}
|
||||
|
||||
export function initialize() {
|
||||
|
||||
}
|
||||
|
||||
if(!$.fn.dividerfy) {
|
||||
$.fn.dividerfy = function<T extends HTMLElement>(this: JQuery<T>) : JQuery<T> {
|
||||
this.find(".container-seperator").each(function (this: T) {
|
||||
|
|
@ -92,7 +88,7 @@ if(!$.fn.dividerfy) {
|
|||
apply_view(property, previous_p, next_p);
|
||||
|
||||
if(seperator_id)
|
||||
settings.changeGlobal("seperator-settings-" + seperator_id, JSON.stringify({
|
||||
settings.changeGlobal(Settings.FN_SEPARATOR_STATE(seperator_id), JSON.stringify({
|
||||
previous: previous_p,
|
||||
next: next_p,
|
||||
property: property
|
||||
|
|
@ -133,7 +129,7 @@ if(!$.fn.dividerfy) {
|
|||
|
||||
if(seperator_id) {
|
||||
try {
|
||||
const config = JSON.parse(settings.global("seperator-settings-" + seperator_id));
|
||||
const config = JSON.parse(settings.global(Settings.FN_SEPARATOR_STATE(seperator_id), undefined));
|
||||
if(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);
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ export function spawnConnectModal(options: {
|
|||
header: tr("Connect to a server"),
|
||||
body: $("#tmpl_connect").renderTag({
|
||||
client: native_client,
|
||||
forum_path: settings.static("forum_path"),
|
||||
forum_path: "https://forum.teaspeak.de/",
|
||||
password_id: random_id,
|
||||
multi_tab: !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION),
|
||||
default_connect_new_tab: typeof(options.default_connect_new_tab) === "boolean" && options.default_connect_new_tab
|
||||
|
|
@ -139,12 +139,12 @@ export function spawnConnectModal(options: {
|
|||
const set_show = shown => {
|
||||
container_last_servers.toggleClass('shown', shown);
|
||||
button.find(".arrow").toggleClass('down', shown).toggleClass('up', !shown);
|
||||
settings.changeGlobal("connect_show_last_servers", shown);
|
||||
settings.changeGlobal(Settings.KEY_CONNECT_SHOW_HISTORY, shown);
|
||||
};
|
||||
button.on('click', event => {
|
||||
set_show(!container_last_servers.hasClass("shown"));
|
||||
});
|
||||
set_show(settings.static_global("connect_show_last_servers", false));
|
||||
set_show(settings.static_global(Settings.KEY_CONNECT_SHOW_HISTORY));
|
||||
}
|
||||
|
||||
const apply = (header, body, footer) => {
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ export function spawnInviteEditor(connection: ConnectionHandler) {
|
|||
}
|
||||
|
||||
input_type.on('change', () => {
|
||||
settings.changeGlobal(Settings.KEY_LAST_INVITE_LINK_TYPE, input_type.val());
|
||||
settings.changeGlobal(Settings.KEY_LAST_INVITE_LINK_TYPE, input_type.val() as string);
|
||||
update_buttons();
|
||||
update_link();
|
||||
}).val(settings.global(Settings.KEY_LAST_INVITE_LINK_TYPE));
|
||||
|
|
|
|||
|
|
@ -1,360 +0,0 @@
|
|||
import {CommandResult, Playlist, PlaylistSong} from "tc-shared/connection/ServerConnectionDeclaration";
|
||||
import {createErrorModal, createModal, Modal} from "tc-shared/ui/elements/Modal";
|
||||
import {ConnectionHandler} from "tc-shared/ConnectionHandler";
|
||||
import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo";
|
||||
import PermissionType from "tc-shared/permission/PermissionType";
|
||||
|
||||
export function spawnPlaylistSongInfo(song: PlaylistSong) {
|
||||
let modal: Modal;
|
||||
|
||||
modal = createModal({
|
||||
header: tr("Song info"),
|
||||
body: () => {
|
||||
try {
|
||||
(<any>song).metadata = JSON.parse(song.song_metadata);
|
||||
} catch(e) {}
|
||||
|
||||
let template = $("#tmpl_playlist_edit-song_info").renderTag(song);
|
||||
template = $.spawn("div").append(template);
|
||||
const text_area = template.find(".property-metadata-raw textarea");
|
||||
|
||||
template.find(".toggle-metadata").on('click', event => {
|
||||
if(text_area.is(":visible")) {
|
||||
template.find(".toggle-metadata").text("show");
|
||||
} else {
|
||||
template.find(".toggle-metadata").text("hide");
|
||||
}
|
||||
text_area.slideToggle({duration: 250});
|
||||
});
|
||||
text_area.hide();
|
||||
|
||||
return template;
|
||||
},
|
||||
footer: undefined,
|
||||
width: 750
|
||||
});
|
||||
|
||||
modal.open();
|
||||
}
|
||||
|
||||
export function spawnSongAdd(playlist: Playlist, callback_add: (url: string, loader: string) => any) {
|
||||
let modal: Modal;
|
||||
|
||||
modal = createModal({
|
||||
header: tr("Add a song"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_playlist_edit-song_add").renderTag();
|
||||
template = $.spawn("div").append(template);
|
||||
|
||||
const url = template.find(".property-url .value");
|
||||
const url_loader = template.find(".property-loader .value");
|
||||
const button_add = template.find(".container-buttons .button-add");
|
||||
const button_cancel = template.find(".container-buttons .button-cancel");
|
||||
|
||||
url.on('change keyup', event => {
|
||||
button_add.prop("disabled", url.val().toString().length == 0);
|
||||
}).trigger('change');
|
||||
|
||||
button_cancel.on('click', event => modal.close());
|
||||
button_add.on('click', event => {
|
||||
callback_add(url.val() as string, url_loader.val() as string);
|
||||
modal.close();
|
||||
});
|
||||
return template;
|
||||
},
|
||||
footer: undefined,
|
||||
width: 750
|
||||
});
|
||||
|
||||
modal.open();
|
||||
}
|
||||
|
||||
export function spawnPlaylistEdit(client: ConnectionHandler, playlist: Playlist) {
|
||||
{
|
||||
createErrorModal(tr("Not implemented"), tr("Playlist editing hasn't yet been implemented")).open();
|
||||
return;
|
||||
}
|
||||
|
||||
let modal: Modal;
|
||||
let changed_properties = {};
|
||||
let changed_permissions = {};
|
||||
let callback_permission_update: () => any;
|
||||
|
||||
const update_save = () => {
|
||||
const save_button = modal.htmlTag.find(".buttons .button-save");
|
||||
save_button.prop("disabled", (Object.keys(changed_properties).length + Object.keys(changed_permissions).length) == 0);
|
||||
};
|
||||
|
||||
modal = createModal({
|
||||
header: tr("Edit playlist"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_playlist_edit").renderTag().tabify();
|
||||
|
||||
callback_permission_update = apply_permissions(template, client, playlist, (key, value) => {
|
||||
console.log("Change permission %o => %o", key, value);
|
||||
changed_permissions[key] = value;
|
||||
update_save();
|
||||
});
|
||||
const callback_song_id = apply_songs(template, client, playlist);
|
||||
apply_properties(template, client, playlist, (key, value) => {
|
||||
console.log("Change property %o => %o", key, value);
|
||||
changed_properties[key] = value;
|
||||
update_save();
|
||||
}, callback_song_id);
|
||||
|
||||
template.find(".buttons .button-save").on('click', event => {
|
||||
if(Object.keys(changed_properties).length != 0) {
|
||||
changed_properties["playlist_id"] = playlist.playlist_id;
|
||||
client.serverConnection.send_command("playlistedit", changed_properties).then(() => {
|
||||
changed_properties = {};
|
||||
update_save();
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Failed to change properties."), tr("Failed to change playlist properties.<br>Error: ") + error).open();
|
||||
});
|
||||
}
|
||||
if(Object.keys(changed_permissions).length != 0) {
|
||||
const array: any[] = [];
|
||||
|
||||
for(const permission_key of Object.keys(changed_permissions)) {
|
||||
array.push({
|
||||
permvalue: changed_permissions[permission_key],
|
||||
permnegated: false,
|
||||
permskip: false,
|
||||
permsid: permission_key
|
||||
});
|
||||
}
|
||||
|
||||
array[0]["playlist_id"] = playlist.playlist_id;
|
||||
client.serverConnection.send_command("playlistaddperm", array).then(() => {
|
||||
changed_permissions = {};
|
||||
update_save();
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Failed to change permission."), tr("Failed to change playlist permissions.<br>Error: ") + error).open();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
template.find(".buttons .button-close").on('click', event => {
|
||||
if((Object.keys(changed_properties).length + Object.keys(changed_permissions).length) != 0) {
|
||||
spawnYesNo(tr("Are you sure?"), tr("Do you really want to discard all your changes?"), result => {
|
||||
if(result)
|
||||
modal.close();
|
||||
});
|
||||
return;
|
||||
}
|
||||
modal.close();
|
||||
});
|
||||
return template;
|
||||
},
|
||||
footer: undefined,
|
||||
width: 750
|
||||
});
|
||||
update_save();
|
||||
|
||||
modal.open();
|
||||
return modal;
|
||||
}
|
||||
|
||||
function apply_songs(tag: JQuery, client: ConnectionHandler, playlist: Playlist) {
|
||||
const owns_playlist = playlist.playlist_owner_dbid == client.getClient().properties.client_database_id;
|
||||
const song_tag = tag.find(".container-songs");
|
||||
|
||||
let replaying_song_id: number = 0;
|
||||
let selected_song: PlaylistSong;
|
||||
|
||||
const set_song_info = (text: string) => {
|
||||
const tag = song_tag.find(".info-message");
|
||||
if(text && text.length > 0) {
|
||||
tag.text(text).show();
|
||||
} else
|
||||
tag.hide();
|
||||
};
|
||||
|
||||
const set_current_song = (id: number) => {
|
||||
/* this method shall enforce an update */
|
||||
replaying_song_id = id;
|
||||
update_songs();
|
||||
};
|
||||
|
||||
const update_songs = () => {
|
||||
set_song_info(tr("loading song list"));
|
||||
client.serverConnection.command_helper.request_playlist_songs(playlist.playlist_id).then(result => {
|
||||
const entries_tag = song_tag.find(".song-list-entries");
|
||||
const entry_template = $("#tmpl_playlist_edit-song_entry");
|
||||
entries_tag.empty();
|
||||
|
||||
for(const song of result) {
|
||||
const rendered = entry_template.renderTag(song);
|
||||
|
||||
rendered.find(".button-info").on('click', event => {
|
||||
spawnPlaylistSongInfo(song);
|
||||
});
|
||||
|
||||
const button_delete = rendered.find(".button-delete");
|
||||
if(!owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_SONG_REMOVE_POWER).granted(playlist.needed_power_song_remove))
|
||||
button_delete.detach();
|
||||
else
|
||||
button_delete.on('click', event => {
|
||||
client.serverConnection.send_command("playlistsongremove", {
|
||||
playlist_id: playlist.playlist_id,
|
||||
song_id: song.song_id
|
||||
}).then(() => {
|
||||
rendered.slideToggle({duration: 250, done(animation: JQuery.Promise<any>, jumpedToEnd: boolean): void {
|
||||
rendered.detach();
|
||||
}});
|
||||
rendered.hide(250);
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Failed to remove song."), tr("Failed to remove song/url from the playlist.<br>Error: ") + error).open();
|
||||
});
|
||||
});
|
||||
|
||||
if(song.song_id == replaying_song_id)
|
||||
rendered.addClass("playing");
|
||||
|
||||
rendered.on('click', event => {
|
||||
selected_song = song;
|
||||
entries_tag.find(".selected").removeClass("selected");
|
||||
rendered.addClass("selected");
|
||||
});
|
||||
|
||||
entries_tag.append(rendered);
|
||||
}
|
||||
|
||||
const entry_container = song_tag.find(".song-list-entries-container");
|
||||
if(entry_container.hasScrollBar())
|
||||
entry_container.addClass("scrollbar");
|
||||
|
||||
set_song_info("displaying " + result.length + " songs");
|
||||
}).catch(error => {
|
||||
console.error(error);
|
||||
set_song_info(tr("failed to load song list"));
|
||||
//TODO improve error handling!
|
||||
});
|
||||
};
|
||||
|
||||
song_tag.find(".button-refresh").on('click', event => update_songs());
|
||||
song_tag.find(".button-song-add").on('click', event => {
|
||||
spawnSongAdd(playlist, (url, loader) => {
|
||||
//playlist_id invoker previous url
|
||||
client.serverConnection.send_command("playlistsongadd", {
|
||||
playlist_id: playlist.playlist_id,
|
||||
invoker: loader,
|
||||
url: url
|
||||
}).then(() => {
|
||||
update_songs();
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Failed to add song."), tr("Failed to add song/url to the playlist.<br>Error: ") + error).open();
|
||||
});
|
||||
});
|
||||
}).prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_SONG_ADD_POWER).granted(playlist.needed_power_song_add));
|
||||
/* setTimeout(update_songs, 100); */ /* We dont have to call that here because it will get called over set_current_song when we received the current song id */
|
||||
|
||||
return set_current_song;
|
||||
}
|
||||
|
||||
function apply_permissions(tag: JQuery, client: ConnectionHandler, playlist: Playlist, change_permission: (key: string, value: number) => any) {
|
||||
const owns_playlist = playlist.playlist_owner_dbid == client.getClient().properties.client_database_id;
|
||||
const permission_tag = tag.find(".container-permissions");
|
||||
const nopermission_tag = tag.find(".container-no-permissions");
|
||||
|
||||
const update_permissions = () => {
|
||||
if(!client.permissions.neededPermission(PermissionType.B_VIRTUALSERVER_PLAYLIST_PERMISSION_LIST).granted(1)) {
|
||||
nopermission_tag.show();
|
||||
permission_tag.hide();
|
||||
} else {
|
||||
nopermission_tag.hide();
|
||||
permission_tag.show();
|
||||
|
||||
permission_tag.find(".permission input").prop("disabled", true);
|
||||
client.permissions.requestPlaylistPermissions(playlist.playlist_id).then(permissions => {
|
||||
permission_tag.find(".permission input")
|
||||
.val(0)
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_PERMISSION_MODIFY_POWER).granted(playlist.needed_power_permission_modify));
|
||||
|
||||
for(const permission of permissions) {
|
||||
const tag = permission_tag.find(".permission[permission='" + permission.type.name + "']");
|
||||
if(permission.value != -2)
|
||||
tag.find("input").val(permission.value);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
permission_tag.find(".permission").each((index, _element) => {
|
||||
const element = $(_element);
|
||||
element.find("input").on('change', event => {
|
||||
console.log(element.find("input").val());
|
||||
change_permission(element.attr("permission"), parseInt(element.find("input").val().toString()));
|
||||
});
|
||||
});
|
||||
|
||||
update_permissions();
|
||||
return update_permissions;
|
||||
}
|
||||
|
||||
function apply_properties(tag: JQuery, client: ConnectionHandler, playlist: Playlist, change_property: (key: string, value: string) => any, callback_current_song: (id: number) => any) {
|
||||
const owns_playlist = playlist.playlist_owner_dbid == client.getClient().properties.client_database_id;
|
||||
|
||||
client.serverConnection.command_helper.request_playlist_info(playlist.playlist_id).then(info => {
|
||||
tag.find(".property-owner input")
|
||||
.val(info.playlist_owner_name + " (" + info.playlist_owner_dbid + ")");
|
||||
|
||||
tag.find(".property-title input")
|
||||
.val(info.playlist_title)
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_MODIFY_POWER).granted(playlist.needed_power_modify))
|
||||
.on('change', event => {
|
||||
change_property("playlist_title", (<HTMLInputElement>event.target).value);
|
||||
});
|
||||
|
||||
tag.find(".property-description textarea")
|
||||
.val(info.playlist_description)
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_MODIFY_POWER).granted(playlist.needed_power_modify))
|
||||
.on('change', event => {
|
||||
change_property("playlist_description", (<HTMLInputElement>event.target).value);
|
||||
});
|
||||
|
||||
tag.find(".property-type select")
|
||||
.val(info.playlist_type.toString())
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_MODIFY_POWER).granted(playlist.needed_power_modify))
|
||||
.on('change', event => {
|
||||
change_property("playlist_description", (<HTMLSelectElement>event.target).selectedIndex.toString());
|
||||
});
|
||||
|
||||
tag.find(".property-replay-mode select")
|
||||
.val(info.playlist_replay_mode.toString())
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_MODIFY_POWER).granted(playlist.needed_power_modify))
|
||||
.on('change', event => {
|
||||
change_property("playlist_replay_mode", (<HTMLSelectElement>event.target).selectedIndex.toString());
|
||||
});
|
||||
|
||||
tag.find(".property-flag-delete-played input")
|
||||
.prop("checked", info.playlist_flag_delete_played)
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_MODIFY_POWER).granted(playlist.needed_power_modify))
|
||||
.on('change', event => {
|
||||
change_property("playlist_flag_delete_played", (<HTMLInputElement>event.target).checked ? "1" : "0");
|
||||
});
|
||||
|
||||
tag.find(".property-current-song input")
|
||||
.val(info.playlist_current_song_id);
|
||||
callback_current_song(info.playlist_current_song_id);
|
||||
|
||||
tag.find(".property-flag-finished input")
|
||||
.prop("checked", info.playlist_flag_finished)
|
||||
.prop("disabled", !owns_playlist && !client.permissions.neededPermission(PermissionType.I_PLAYLIST_MODIFY_POWER).granted(playlist.needed_power_modify))
|
||||
.on('change', event => {
|
||||
change_property("playlist_flag_finished", (<HTMLInputElement>event.target).checked ? "1" : "0");
|
||||
});
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Failed to query playlist info"), tr("Failed to query playlist info.<br>Error:") + error).open();
|
||||
});
|
||||
}
|
||||
|
|
@ -1,196 +0,0 @@
|
|||
import {settings} from "tc-shared/settings";
|
||||
import {createErrorModal, createInfoModal, createModal, Modal} from "tc-shared/ui/elements/Modal";
|
||||
import {CommandResult, Playlist} from "tc-shared/connection/ServerConnectionDeclaration";
|
||||
import {ConnectionHandler} from "tc-shared/ConnectionHandler";
|
||||
import PermissionType from "tc-shared/permission/PermissionType";
|
||||
import {SingleCommandHandler} from "tc-shared/connection/ConnectionBase";
|
||||
import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo";
|
||||
import {spawnPlaylistEdit} from "tc-shared/ui/modal/ModalPlaylistEdit";
|
||||
|
||||
export function spawnPlaylistManage(client: ConnectionHandler) {
|
||||
{
|
||||
createErrorModal(tr("Not implemented"), tr("Playlist management hasn't yet been implemented")).open();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
let modal: Modal;
|
||||
let selected_playlist: Playlist;
|
||||
let available_playlists: Playlist[];
|
||||
let highlight_own = settings.global("playlist-list-highlight-own", true);
|
||||
|
||||
const update_selected = () => {
|
||||
const buttons = modal.htmlTag.find(".header .buttons");
|
||||
|
||||
buttons.find(".button-playlist-edit").prop(
|
||||
"disabled",
|
||||
!selected_playlist
|
||||
);
|
||||
buttons.find(".button-playlist-delete").prop(
|
||||
"disabled",
|
||||
!selected_playlist || !( /* not owner or permission */
|
||||
client.permissions.neededPermission(PermissionType.I_PLAYLIST_DELETE_POWER).granted(selected_playlist.needed_power_delete) || /* client has permissions */
|
||||
client.getClient().properties.client_database_id == selected_playlist.playlist_owner_dbid /* client is playlist owner */
|
||||
)
|
||||
);
|
||||
buttons.find(".button-playlist-create").prop(
|
||||
"disabled",
|
||||
!client.permissions.neededPermission(PermissionType.B_PLAYLIST_CREATE).granted(1)
|
||||
);
|
||||
if(selected_playlist) {
|
||||
buttons.find(".button-playlist-edit").prop(
|
||||
"disabled",
|
||||
false
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const update_list = async () => {
|
||||
const info_tag = modal.htmlTag.find(".footer .info a");
|
||||
info_tag.text("loading...");
|
||||
|
||||
selected_playlist = undefined;
|
||||
update_selected();
|
||||
|
||||
try {
|
||||
available_playlists = await client.serverConnection.command_helper.request_playlist_list();
|
||||
} catch(error) {
|
||||
info_tag.text("failed to query playlist list.");
|
||||
//FIXME error handling?
|
||||
return;
|
||||
}
|
||||
|
||||
const entries_tag = modal.htmlTag.find(".playlist-list-entries");
|
||||
const entry_template = $("#tmpl_playlist_list-list_entry");
|
||||
entries_tag.empty();
|
||||
|
||||
const owndbid = client.getClient().properties.client_database_id;
|
||||
for(const query of available_playlists) {
|
||||
const tag = entry_template.renderTag(query).on('click', event => {
|
||||
entries_tag.find(".entry.selected").removeClass("selected");
|
||||
$(event.target).parent(".entry").addClass("selected");
|
||||
selected_playlist = query;
|
||||
update_selected();
|
||||
});
|
||||
|
||||
if(highlight_own && query.playlist_owner_dbid == owndbid)
|
||||
tag.addClass("highlighted");
|
||||
|
||||
entries_tag.append(tag);
|
||||
}
|
||||
|
||||
const entry_container = modal.htmlTag.find(".playlist-list-entries-container");
|
||||
if(entry_container.hasScrollBar())
|
||||
entry_container.addClass("scrollbar");
|
||||
|
||||
info_tag.text("Showing " + available_playlists.length + " entries");
|
||||
update_selected();
|
||||
};
|
||||
|
||||
modal = createModal({
|
||||
header: tr("Manage playlists"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_playlist_list").renderTag();
|
||||
|
||||
/* first open the modal */
|
||||
setTimeout(() => {
|
||||
const entry_container = template.find(".playlist-list-entries-container");
|
||||
if(entry_container.hasScrollBar())
|
||||
entry_container.addClass("scrollbar");
|
||||
}, 100);
|
||||
|
||||
template.find(".footer .buttons .button-refresh").on('click', update_list);
|
||||
|
||||
template.find(".button-playlist-create").on('click', event => {
|
||||
const single_handler: SingleCommandHandler = {
|
||||
function: command => {
|
||||
const json = command.arguments;
|
||||
update_list().then(() => {
|
||||
spawnYesNo(tr("Playlist created successful"), tr("The playlist has been successfully created.<br>Should we open the editor?"), result => {
|
||||
if(result) {
|
||||
for(const playlist of available_playlists) {
|
||||
if(playlist.playlist_id == json[0]["playlist_id"]) {
|
||||
spawnPlaylistEdit(client, playlist).close_listener.push(update_list);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
return true;
|
||||
},
|
||||
command: "notifyplaylistcreated"
|
||||
};
|
||||
client.serverConnection.command_handler_boss().register_single_handler(single_handler);
|
||||
client.serverConnection.send_command("playlistcreate").catch(error => {
|
||||
client.serverConnection.command_handler_boss().remove_single_handler(single_handler);
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Unable to create playlist"), tr("Failed to create playlist<br>Message: ") + error).open();
|
||||
});
|
||||
});
|
||||
|
||||
template.find(".button-playlist-edit").on('click', event => {
|
||||
if(!selected_playlist) return;
|
||||
spawnPlaylistEdit(client, selected_playlist).close_listener.push(update_list);
|
||||
});
|
||||
|
||||
template.find(".button-playlist-delete").on('click', () => {
|
||||
if(!selected_playlist) return;
|
||||
|
||||
spawnYesNo(tr("Are you sure?"), tr("Do you really want to delete this playlist?"), result => {
|
||||
if(result) {
|
||||
client.serverConnection.send_command("playlistdelete", {playlist_id: selected_playlist.playlist_id}).then(() => {
|
||||
createInfoModal(tr("Playlist deleted successful"), tr("This playlist has been deleted successfully.")).open();
|
||||
update_list();
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult) {
|
||||
/* TODO extra handling here */
|
||||
//if(error.id == ErrorID.PLAYLIST_IS_IN_USE) { }
|
||||
error = error.extra_message || error.message;
|
||||
}
|
||||
createErrorModal(tr("Unable to delete playlist"), tr("Failed to delete playlist<br>Message: ") + error).open();
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
template.find(".input-search").on('change keyup', () => {
|
||||
const text = (template.find(".input-search").val() as string || "").toLowerCase();
|
||||
if(text.length == 0) {
|
||||
template.find(".playlist-list-entries .entry").show();
|
||||
} else {
|
||||
template.find(".playlist-list-entries .entry").each((_, e) => {
|
||||
const element = $(e);
|
||||
if(element.text().toLowerCase().indexOf(text) == -1)
|
||||
element.hide();
|
||||
else
|
||||
element.show();
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
template.find(".button-highlight-own").on('change', event => {
|
||||
const flag = (<HTMLInputElement>event.target).checked;
|
||||
settings.changeGlobal("playlist-list-highlight-own", flag);
|
||||
if(flag) {
|
||||
const owndbid = client.getClient().properties.client_database_id;
|
||||
template.find(".playlist-list-entries .entry").each((index, _element) => {
|
||||
const element = $(_element);
|
||||
if(parseInt(element.attr("playlist-owner-dbid")) == owndbid)
|
||||
element.addClass("highlighted");
|
||||
})
|
||||
} else {
|
||||
template.find(".playlist-list-entries .highlighted").removeClass("highlighted");
|
||||
}
|
||||
}).prop("checked", highlight_own);
|
||||
return template;
|
||||
},
|
||||
footer: undefined,
|
||||
width: 750
|
||||
});
|
||||
|
||||
update_list();
|
||||
modal.open();
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import * as React from "react";
|
||||
import {settings} from "tc-shared/settings";
|
||||
import {Settings, settings} from "tc-shared/settings";
|
||||
const cssStyle = require("./ContextDivider.scss");
|
||||
|
||||
export interface ContextDividerProperties {
|
||||
|
|
@ -34,7 +34,7 @@ export class ContextDivider extends React.Component<ContextDividerProperties, Co
|
|||
|
||||
this.value = this.props.defaultValue;
|
||||
try {
|
||||
const config = JSON.parse(settings.global("separator-settings-" + this.props.id));
|
||||
const config = JSON.parse(settings.global(Settings.FN_SEPARATOR_STATE(this.props.id), undefined));
|
||||
if(typeof config.value !== "number")
|
||||
throw "Invalid value";
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ export class ContextDivider extends React.Component<ContextDividerProperties, Co
|
|||
this.value = 100;
|
||||
}
|
||||
|
||||
settings.changeGlobal("separator-settings-" + this.props.id, JSON.stringify({
|
||||
settings.changeGlobal(Settings.FN_SEPARATOR_STATE(this.props.id), JSON.stringify({
|
||||
value: this.value
|
||||
}));
|
||||
this.applySeparator(separator.previousSibling as HTMLElement, separator.nextSibling as HTMLElement);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import {ServerConnection} from "../connection/ServerConnection";
|
|||
import {voice} from "tc-shared/connection/ConnectionBase";
|
||||
import {RecorderProfile} from "tc-shared/voice/RecorderProfile";
|
||||
import {VoiceClientController} from "./VoiceClient";
|
||||
import {settings} from "tc-shared/settings";
|
||||
import {settings, ValuedSettingsKey} from "tc-shared/settings";
|
||||
import {CallbackInputConsumer, InputConsumerType, NodeInputConsumer} from "tc-shared/voice/RecorderBase";
|
||||
import AbstractVoiceConnection = voice.AbstractVoiceConnection;
|
||||
import VoiceClient = voice.VoiceClient;
|
||||
|
|
@ -130,6 +130,12 @@ export enum VoiceEncodeType {
|
|||
NATIVE_ENCODE
|
||||
}
|
||||
|
||||
const KEY_VOICE_CONNECTION_TYPE: ValuedSettingsKey<number> = {
|
||||
key: "voice_connection_type",
|
||||
valueType: "number",
|
||||
defaultValue: VoiceEncodeType.NATIVE_ENCODE
|
||||
};
|
||||
|
||||
export class VoiceConnection extends AbstractVoiceConnection {
|
||||
readonly connection: ServerConnection;
|
||||
|
||||
|
|
@ -165,7 +171,7 @@ export class VoiceConnection extends AbstractVoiceConnection {
|
|||
super(connection);
|
||||
this.connection = connection;
|
||||
|
||||
this._type = settings.static_global("voice_connection_type", this._type);
|
||||
this._type = settings.static_global(KEY_VOICE_CONNECTION_TYPE, this._type);
|
||||
}
|
||||
|
||||
destroy() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue