Compare commits
13 Commits
main
...
localemoji
| Author | SHA1 | Date |
|---|---|---|
 gapodo
|
28cdfeb205 | |
|
gapodo
|
cbb340aa8d | |
|
gapodo
|
4c5e744f62 | |
|
gapodo
|
86351e336c | |
|
gapodo
|
24c6a1e22e | |
|
gapodo
|
2a1fd11e2d | |
|
gapodo
|
063fdae679 | |
|
gapodo
|
e5551cea09 | |
|
gapodo
|
3ec3db37e0 | |
|
gapodo
|
feb564d4a0 | |
|
gapodo
|
bde4bbf5ad | |
|
gapodo
|
ef0813dd84 | |
|
gapodo
|
5b8b4d07c3 |
|
|
@ -25,7 +25,7 @@ steps:
|
|||
build-npm:
|
||||
image: *node_image
|
||||
commands:
|
||||
- bash ./scripts/build.sh web dev
|
||||
- bash ./scripts/build.sh web rel
|
||||
|
||||
build-docker-next:
|
||||
image: *buildx_image
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
#My local environment to deploy the files directly
|
||||
environment/
|
||||
|
|
@ -0,0 +1,314 @@
|
|||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: WolverinDEV
|
||||
* Date: 04.10.18
|
||||
* Time: 16:42
|
||||
*/
|
||||
|
||||
$UI_BASE_PATH = "ui-files/";
|
||||
$CLIENT_BASE_PATH = "files/";
|
||||
|
||||
function errorExit($message) {
|
||||
http_response_code(400);
|
||||
die(json_encode([
|
||||
"success" => false,
|
||||
"msg" => $message
|
||||
]));
|
||||
}
|
||||
|
||||
function verifyPostSecret() {
|
||||
if(!isset($_POST["secret"])) {
|
||||
errorExit("Missing required information!");
|
||||
}
|
||||
|
||||
$require_secret = file_get_contents(".deploy_secret");
|
||||
if($require_secret === false || strlen($require_secret) == 0) {
|
||||
errorExit("Server missing secret!");
|
||||
}
|
||||
|
||||
if(!is_string($_POST["secret"])) {
|
||||
errorExit("Invalid secret!");
|
||||
}
|
||||
|
||||
if(strcmp(trim($require_secret), trim($_POST["secret"])) !== 0) {
|
||||
errorExit("Secret does not match!");
|
||||
}
|
||||
}
|
||||
|
||||
function handleRequest() {
|
||||
if(isset($_GET) && isset($_GET["type"])) {
|
||||
if ($_GET["type"] == "update-info") {
|
||||
global $CLIENT_BASE_PATH;
|
||||
$raw_versions = file_get_contents($CLIENT_BASE_PATH . "/version.json");
|
||||
if($raw_versions === false) {
|
||||
errorExit("Missing file!");
|
||||
}
|
||||
|
||||
$versions = json_decode($raw_versions, true);
|
||||
$versions["success"] = true;
|
||||
|
||||
die(json_encode($versions));
|
||||
}
|
||||
else if ($_GET["type"] == "update-download") {
|
||||
global $CLIENT_BASE_PATH;
|
||||
|
||||
$path = $CLIENT_BASE_PATH . $_GET["channel"] . DIRECTORY_SEPARATOR . $_GET["version"] . DIRECTORY_SEPARATOR;
|
||||
$raw_release_info = file_get_contents($path . "info.json");
|
||||
if($raw_release_info === false) {
|
||||
errorExit("missing info file (version and/or channel missing. Path was " . $path . ")");
|
||||
}
|
||||
$release_info = json_decode($raw_release_info);
|
||||
|
||||
foreach($release_info as $platform) {
|
||||
if($platform->platform != $_GET["platform"]) continue;
|
||||
if($platform->arch != $_GET["arch"]) continue;
|
||||
|
||||
http_response_code(200);
|
||||
header("Cache-Control: public"); // needed for internet explorer
|
||||
header("Content-Type: application/binary");
|
||||
header("Content-Transfer-Encoding: Binary");
|
||||
header("Content-Length:".filesize($path . $platform->update));
|
||||
header("Content-Disposition: attachment; filename=update.tar.gz");
|
||||
header("info-version: 1");
|
||||
readfile($path . $platform->update);
|
||||
die();
|
||||
}
|
||||
errorExit("Missing platform, arch or file");
|
||||
}
|
||||
else if ($_GET["type"] == "ui-info") {
|
||||
global $UI_BASE_PATH;
|
||||
|
||||
$version_info = file_get_contents($UI_BASE_PATH . "info.json");
|
||||
if($version_info === false) $version_info = array();
|
||||
else $version_info = json_decode($version_info, true);
|
||||
|
||||
$info = array();
|
||||
$info["success"] = true;
|
||||
$info["versions"] = array();
|
||||
|
||||
foreach($version_info as $channel => $data) {
|
||||
if(!isset($data["latest"])) continue;
|
||||
|
||||
$channel_info = [
|
||||
"timestamp" => $data["latest"]["timestamp"],
|
||||
"version" => $data["latest"]["version"],
|
||||
"git-ref" => $data["latest"]["git-ref"],
|
||||
"channel" => $channel,
|
||||
"required_client" => $data["latest"]["required_client"]
|
||||
];
|
||||
array_push($info["versions"], $channel_info);
|
||||
}
|
||||
|
||||
die(json_encode($info));
|
||||
} else if ($_GET["type"] == "ui-download") {
|
||||
global $UI_BASE_PATH;
|
||||
|
||||
if(!isset($_GET["channel"]) || !isset($_GET["version"]))
|
||||
errorExit("missing required parameters");
|
||||
|
||||
if($_GET["version"] !== "latest" && !isset($_GET["git-ref"]))
|
||||
errorExit("missing required parameters");
|
||||
|
||||
$version_info = file_get_contents($UI_BASE_PATH . "info.json");
|
||||
if($version_info === false) $version_info = array();
|
||||
else $version_info = json_decode($version_info, true);
|
||||
|
||||
$channel_data = $version_info[$_GET["channel"]];
|
||||
if(!isset($channel_data))
|
||||
errorExit("channel unknown");
|
||||
|
||||
$ui_pack = false;
|
||||
if($_GET["version"] === "latest") {
|
||||
$ui_pack = $channel_data["latest"];
|
||||
} else {
|
||||
foreach ($channel_data["history"] as $entry) {
|
||||
if($entry["version"] == $_GET["version"] && $entry["git-ref"] == $_GET["git-ref"]) {
|
||||
$ui_pack = $entry;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($ui_pack === false)
|
||||
errorExit("missing version");
|
||||
|
||||
|
||||
header("Cache-Control: public"); // needed for internet explorer
|
||||
header("Content-Type: application/binary");
|
||||
header("Content-Transfer-Encoding: Binary");
|
||||
header("Content-Disposition: attachment; filename=ui.tar.gz");
|
||||
header("info-version: 1");
|
||||
|
||||
header("x-ui-timestamp: " . $ui_pack["timestamp"]);
|
||||
header("x-ui-version: " . $ui_pack["version"]);
|
||||
header("x-ui-git-ref: " . $ui_pack["git-ref"]);
|
||||
header("x-ui-required_client: " . $ui_pack["required_client"]);
|
||||
|
||||
$read = readfile($ui_pack["file"]);
|
||||
header("Content-Length:" . $read);
|
||||
|
||||
if($read === false) errorExit("internal error: Failed to read file!");
|
||||
die();
|
||||
}
|
||||
}
|
||||
else if($_POST["type"] == "deploy-build") {
|
||||
global $CLIENT_BASE_PATH;
|
||||
|
||||
if(!isset($_POST["version"]) || !isset($_POST["platform"]) || !isset($_POST["arch"]) || !isset($_POST["update_suffix"]) || !isset($_POST["installer_suffix"])) {
|
||||
errorExit("Missing required information!");
|
||||
}
|
||||
|
||||
verifyPostSecret();
|
||||
|
||||
if(!isset($_FILES["update"])) {
|
||||
errorExit("Missing update file");
|
||||
}
|
||||
|
||||
if($_FILES["update"]["error"] !== UPLOAD_ERR_OK) {
|
||||
errorExit("Upload for update failed!");
|
||||
}
|
||||
|
||||
if(!isset($_FILES["installer"])) {
|
||||
errorExit("Missing installer file");
|
||||
}
|
||||
|
||||
if($_FILES["installer"]["error"] !== UPLOAD_ERR_OK) {
|
||||
errorExit("Upload for installer failed!");
|
||||
}
|
||||
|
||||
$json_version = json_decode($_POST["version"], true);
|
||||
$version = $json_version["major"] . "." . $json_version["minor"] . "." . $json_version["patch"] . ($json_version["build"] > 0 ? "-" . $json_version["build"] : "");
|
||||
$path = $CLIENT_BASE_PATH . DIRECTORY_SEPARATOR . $_POST["channel"] . DIRECTORY_SEPARATOR . $version . DIRECTORY_SEPARATOR;
|
||||
exec("mkdir -p " . $path);
|
||||
//mkdir($path, 777, true);
|
||||
|
||||
|
||||
$filename_update = "TeaClient-" . $_POST["platform"] . "_" . $_POST["arch"] . "." . $_POST["update_suffix"];
|
||||
$filename_install = "TeaClient-" . $_POST["platform"] . "_" . $_POST["arch"] . "." . $_POST["installer_suffix"];
|
||||
|
||||
{
|
||||
$version_info = file_get_contents($path . "info.json");
|
||||
if($version_info === false) {
|
||||
$version_info = array();
|
||||
} else {
|
||||
$version_info = json_decode($version_info, true);
|
||||
if($version_info === false) {
|
||||
errorExit("Failed to decode old versions info file");
|
||||
}
|
||||
}
|
||||
|
||||
for($index = 0; $index < count($version_info); $index++) {
|
||||
if($version_info[$index]["platform"] == $_POST["platform"] && $version_info[$index]["arch"] == $_POST["arch"]) {
|
||||
array_splice($version_info, $index, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$info = array();
|
||||
$info["platform"] = $_POST["platform"];
|
||||
$info["arch"] = $_POST["arch"];
|
||||
$info["update"] = $filename_update;
|
||||
$info["install"] = $filename_install;
|
||||
array_push($version_info, $info);
|
||||
file_put_contents($path . "info.json", json_encode($version_info));
|
||||
}
|
||||
|
||||
{
|
||||
$filename = $CLIENT_BASE_PATH . DIRECTORY_SEPARATOR . "version.json";
|
||||
$indexes = file_get_contents($filename);
|
||||
if($indexes === false) {
|
||||
$indexes = array();
|
||||
} else {
|
||||
$indexes = json_decode($indexes, true);
|
||||
if($indexes === false) {
|
||||
errorExit("Failed to decode old latest versions info file");
|
||||
}
|
||||
}
|
||||
|
||||
$index = &$indexes[$_POST["channel"]];
|
||||
if(!isset($index)) {
|
||||
$index = array();
|
||||
}
|
||||
|
||||
for($idx = 0; $idx < count($index); $idx++) {
|
||||
if($index[$idx]["platform"] == $_POST["platform"] && $index[$idx]["arch"] == $_POST["arch"]) {
|
||||
array_splice($index, $idx, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$info = array();
|
||||
$info["platform"] = $_POST["platform"];
|
||||
$info["arch"] = $_POST["arch"];
|
||||
$info["version"] = $json_version;
|
||||
array_push($index, $info);
|
||||
|
||||
file_put_contents($filename, json_encode($indexes));
|
||||
}
|
||||
|
||||
move_uploaded_file($_FILES["installer"]["tmp_name"],$path . $filename_install);
|
||||
move_uploaded_file($_FILES["update"]["tmp_name"],$path . $filename_update);
|
||||
|
||||
die(json_encode([
|
||||
"success" => true
|
||||
]));
|
||||
}
|
||||
else if($_POST["type"] == "deploy-ui-build") {
|
||||
global $UI_BASE_PATH;
|
||||
|
||||
if(!isset($_POST["channel"]) || !isset($_POST["version"]) || !isset($_POST["git_ref"]) || !isset($_POST["required_client"])) {
|
||||
errorExit("Missing required information!");
|
||||
}
|
||||
|
||||
verifyPostSecret();
|
||||
|
||||
$path = $UI_BASE_PATH . DIRECTORY_SEPARATOR;
|
||||
$channeled_path = $UI_BASE_PATH . DIRECTORY_SEPARATOR . $_POST["channel"];
|
||||
$filename = "TeaClientUI-" . $_POST["version"] . "_" . $_POST["git_ref"] . ".tar.gz";
|
||||
exec("mkdir -p " . $path);
|
||||
exec("mkdir -p " . $channeled_path);
|
||||
|
||||
{
|
||||
$info = file_get_contents($path . "info.json");
|
||||
if($info === false) {
|
||||
$info = array();
|
||||
} else {
|
||||
$info = json_decode($info, true);
|
||||
if($info === false) {
|
||||
errorExit("failed to decode old info file");
|
||||
}
|
||||
}
|
||||
|
||||
$channel_info = &$info[$_POST["channel"]];
|
||||
if(!$channel_info) {
|
||||
$channel_info = array();
|
||||
}
|
||||
|
||||
$entry = [
|
||||
"timestamp" => time(),
|
||||
"file" => $channeled_path . DIRECTORY_SEPARATOR . $filename,
|
||||
"version" => $_POST["version"],
|
||||
"git-ref" => $_POST["git_ref"],
|
||||
"required_client" => $_POST["required_client"]
|
||||
];
|
||||
|
||||
$channel_info["latest"] = $entry;
|
||||
if(!$channel_info["history"]) $channel_info["history"] = array();
|
||||
array_push($channel_info["history"], $entry);
|
||||
|
||||
file_put_contents($path . "info.json", json_encode($info));
|
||||
}
|
||||
|
||||
|
||||
move_uploaded_file($_FILES["file"]["tmp_name"],$channeled_path . DIRECTORY_SEPARATOR . $filename);
|
||||
die(json_encode([
|
||||
"success" => true
|
||||
]));
|
||||
}
|
||||
else die(json_encode([
|
||||
"success" => false,
|
||||
"error" => "invalid action!"
|
||||
]));
|
||||
}
|
||||
|
||||
handleRequest();
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
app/**/*.css
|
||||
app/**/*.css.map
|
||||
|
||||
app/**/*.js
|
||||
app/**/*.js.map
|
||||
|
||||
declarations/
|
||||
generated/
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
:global {
|
||||
html, body {
|
||||
border: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.app-container {
|
||||
right: 0;
|
||||
left: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
display: flex;
|
||||
justify-content: stretch;
|
||||
|
||||
.app {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
|
||||
display: flex; flex-direction: column; resize: both;
|
||||
}
|
||||
}
|
||||
|
||||
footer {
|
||||
display: none!important;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
window.__native_client_init_shared(__webpack_require__);
|
||||
|
||||
import "../AppMain.scss";
|
||||
import "tc-shared/entry-points/MainApp";
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
window.__native_client_init_shared(__webpack_require__);
|
||||
import "tc-shared/entry-points/ModalWindow";
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
interface Window {
|
||||
__native_client_init_hook: () => void;
|
||||
__native_client_init_shared: (webpackRequire: any) => void;
|
||||
}
|
||||
|
||||
declare const __teaclient_preview_notice: any;
|
||||
declare const __teaclient_preview_error: any;
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
html, body {
|
||||
border: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.app-container {
|
||||
right: 0;
|
||||
left: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
display: flex;
|
||||
justify-content: stretch;
|
||||
}
|
||||
.app-container .app {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
resize: both;
|
||||
}
|
||||
|
||||
footer {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/*# sourceMappingURL=main.css.map */
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"version":3,"sourceRoot":"","sources":["main.scss"],"names":[],"mappings":"AAAA;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EAEA;EAAe;EAAwB;;;AAIzC;EACC","file":"main.css"}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
cd "$BASEDIR"
|
||||
source ../scripts/resolve_commands.sh
|
||||
|
||||
if [[ ! -e declarations/imports_shared.d.ts ]]; then
|
||||
echo "generate the declarations first!"
|
||||
echo "Execute: /scripts/build_declarations.sh"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -e ../shared/generated/shared.js ]]; then
|
||||
echo "generate the shared packed file first!"
|
||||
echo "Execute: /shared/generate_packed.sh"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
execute_tsc -p tsconfig/tsconfig_packed.json
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to build file"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"source_files": [
|
||||
"../js/**/*.ts"
|
||||
],
|
||||
"target_file": "../declarations/exports.d.ts"
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
/* general web project config */
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "es6",
|
||||
"module": "commonjs",
|
||||
"sourceMap": true
|
||||
},
|
||||
"include": [
|
||||
"../declarations/imports_*.d.ts",
|
||||
"../js/**/*.ts"
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
/* packed web project config */
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"module": "none",
|
||||
"outFile": "../generated/client.js",
|
||||
"allowJs": true
|
||||
},
|
||||
"include": [
|
||||
"../declarations/imports_*.d.ts",
|
||||
"../js/**/*.ts",
|
||||
"../../shared/generated/shared.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,2 +1,19 @@
|
|||
FROM reg.c1.datenclown.at/teaspeak/web-base:latest
|
||||
FROM nginx:mainline-alpine
|
||||
|
||||
COPY ./docker/default.conf /etc/nginx/conf.d/default.conf
|
||||
COPY ./docker/nginx.conf /etc/nginx/nginx.conf
|
||||
COPY ./docker/entrypoint.sh /
|
||||
|
||||
RUN apk update --no-cache && apk upgrade --no-cache \
|
||||
&& apk add --no-cache openssl tzdata \
|
||||
&& mkdir -p /var/www/TeaWeb /etc/ssl/certs \
|
||||
&& chmod +x /entrypoint.sh
|
||||
|
||||
ENV TZ="Europe/Berlin"
|
||||
|
||||
EXPOSE 80 443
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
COPY ./dist/ /var/www/TeaWeb/
|
||||
|
|
|
|||
|
|
@ -51,6 +51,18 @@ loader.register_task(loader.Stage.SETUP, {
|
|||
priority: 10
|
||||
});
|
||||
|
||||
/* test if we're getting loaded within a TeaClient preview window */
|
||||
loader.register_task(loader.Stage.SETUP, {
|
||||
name: "TeaClient tester",
|
||||
function: async () => {
|
||||
if(typeof __teaclient_preview_notice !== "undefined" && typeof __teaclient_preview_error !== "undefined") {
|
||||
loader.critical_error("Why you're opening TeaWeb within the TeaSpeak client?!");
|
||||
throw "we're already a TeaClient!";
|
||||
}
|
||||
},
|
||||
priority: 100
|
||||
});
|
||||
|
||||
export default class implements ApplicationLoader {
|
||||
execute() {
|
||||
loader.execute_managed(true);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,27 @@ import * as loader from "../loader/loader";
|
|||
import {Stage} from "../loader/loader";
|
||||
import {detect as detectBrowser} from "detect-browser";
|
||||
|
||||
loader.register_task(Stage.SETUP, {
|
||||
name: "app init",
|
||||
function: async () => {
|
||||
/* TeaClient */
|
||||
if(window.require || window.__native_client_init_hook) {
|
||||
if(__build.target !== "client") {
|
||||
loader.critical_error("App seems not to be compiled for the client.", "This app has been compiled for " + __build.target);
|
||||
return;
|
||||
}
|
||||
|
||||
window.__native_client_init_hook();
|
||||
} else {
|
||||
if(__build.target !== "web") {
|
||||
loader.critical_error("App seems not to be compiled for the web.", "This app has been compiled for " + __build.target);
|
||||
return;
|
||||
}
|
||||
}
|
||||
},
|
||||
priority: 1000
|
||||
});
|
||||
|
||||
loader.register_task(Stage.SETUP, {
|
||||
name: __build.target === "web" ? "outdated browser checker" : "outdated renderer tester",
|
||||
function: async () => {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
|
||||
<meta name="og:description" content="The TeaSpeak Web client is a in the browser running client for the VoIP communication software TeaSpeak." />
|
||||
<meta name="og:url" content="https://web.teaspeak.de/">
|
||||
<% /* TODO: Put in an appropriate image <meta name="og:image" content="https://www.whatsapp.com/img/whatsapp-promo.png"> */ %>
|
||||
|
||||
<% /* Using an absolute path here since the manifest.json works only with such. */ %>
|
||||
<% /* <link rel="manifest" href="/manifest.json"> */ %>
|
||||
|
|
@ -26,6 +27,19 @@
|
|||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
|
||||
<!-- Global site tag (gtag.js) - Google Analytics -->
|
||||
<script defer async src="https://www.googletagmanager.com/gtag/js?id=UA-113151733-4"></script>
|
||||
<script>
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
|
||||
function gtag() {
|
||||
dataLayer.push(arguments);
|
||||
}
|
||||
|
||||
gtag('js', new Date());
|
||||
gtag('config', 'UA-113151733-4');
|
||||
</script>
|
||||
|
||||
<link rel="preload" as="image" href="<%= require("./images/initial-sequence.gif") %>">
|
||||
<link rel="preload" as="image" href="<%= require("./images/bowl.png") %>">
|
||||
<% /* We don't preload the bowl since it's only a div background */ %>
|
||||
|
|
|
|||
|
|
@ -11,17 +11,20 @@ if [[ ! -d "${NPM_DIR}" ]]; then
|
|||
fi
|
||||
|
||||
if [[ "${BUILDINDOCKER:-}" != "yes" ]]; then
|
||||
if docker -v | grep -qi "podman"; then
|
||||
is_podman='yes'
|
||||
fi
|
||||
docker run --rm --workdir "/work" -v "${BASEPATH}:/work" -e is_podman="${is_podman:-no}" -e BUILDINDOCKER=yes -e npm_config_cache=/work/.npm node:14-bullseye /bin/bash -c 'chmod +x /work/scripts/build_in_docker.sh && /work/scripts/build_in_docker.sh'
|
||||
docker run --rm --workdir "/work" -v "${NPM_DIR}:/home/" -v "${BASEPATH}:/work" -e BUILDINDOCKER=yes node:14-bullseye /bin/bash -c 'chmod +x /work/scripts/build_in_docker.sh && /work/scripts/build_in_docker.sh'
|
||||
exit
|
||||
fi
|
||||
|
||||
## in docker
|
||||
|
||||
echo "adding npmrc"
|
||||
cat >>"${HOME}/.npmrc" <<'EOF'
|
||||
cache=/work/.npm
|
||||
fund=false
|
||||
EOF
|
||||
|
||||
echo "adding secure git dir"
|
||||
git config --global --add safe.directory '*'
|
||||
git config --global --add safe.directory /work
|
||||
|
||||
echo "running chmods"
|
||||
find "${BASEPATH}" -iname "*.sh" -exec chmod +x {} +
|
||||
|
|
@ -38,9 +41,5 @@ npx browserslist@latest --update-db || exit 1
|
|||
echo "running build"
|
||||
"${BASEPATH}/scripts/build.sh" web rel
|
||||
|
||||
if [[ "${is_podman}" != 'yes' ]]; then
|
||||
echo "fixing perms"
|
||||
chown -R 1000:1000 /work
|
||||
else
|
||||
echo "in podman, not fixing perms"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -0,0 +1,73 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Example usage: ./scripts/deploy_ui_files.sh http://dev.clientapi.teaspeak.de/api.php test 1.1.0
|
||||
|
||||
cd "$(dirname "$0")" || { echo "failed to enter base directory"; exit 1; }
|
||||
source "./helper.sh"
|
||||
|
||||
if [[ "$#" -ne 3 ]]; then
|
||||
echo "Illegal number of parameters (url | channel | required version)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
if [[ "${teaclient_deploy_secret}" == "" ]]; then
|
||||
echo "Missing deploy secret!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
package_file=$(find_release_package "client" "release")
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "$package_file"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# We require a .tar.gz file and not a zip file.
|
||||
# So we're extracting the contents and tar.gz ing them
|
||||
temp_dir=$(mktemp -d)
|
||||
unzip "$package_file" -d "$temp_dir/raw/"
|
||||
if [[ $? -ne 0 ]]; then
|
||||
rm -r "$temp_dir" &>/dev/null
|
||||
echo "Failed to unpack package."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Generating .tar.gz file from $package_file"
|
||||
package_file="$temp_dir/$(basename -s ".zip" "$package_file").tar.gz"
|
||||
tar --use-compress-program="gzip -9" -C "$temp_dir/raw/" -c . -cf "$package_file";
|
||||
if [[ $? -ne 0 ]]; then
|
||||
rm -r "$temp_dir"
|
||||
echo "Failed to package package."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git_hash=$(git_version "short-tag")
|
||||
application_version=$(project_version)
|
||||
echo "Deploying $package_file."
|
||||
echo "Hash: ${git_hash}, Version: ${application_version}, Target channel: $2."
|
||||
|
||||
upload_result=$(curl \
|
||||
-k \
|
||||
-X POST \
|
||||
-F "required_client=$3" \
|
||||
-F "type=deploy-ui-build" \
|
||||
-F "channel=$2" \
|
||||
-F "version=$application_version" \
|
||||
-F "git_ref=$git_hash" \
|
||||
-F "secret=${teaclient_deploy_secret}" \
|
||||
-F "file=@$package_file" \
|
||||
"$1"
|
||||
)
|
||||
|
||||
rm -r "$temp_dir"
|
||||
echo "Server upload result: $upload_result"
|
||||
success=$(echo "${upload_result}" | python -c "import sys, json; print(json.load(sys.stdin)['success'])")
|
||||
|
||||
if [[ ! "${success}" == "True" ]]; then
|
||||
error_message=$(echo "${upload_result}" | python -c "import sys, json; print(json.load(sys.stdin)['msg'])" 2>/dev/null);
|
||||
echo "Failed to deploy build: ${error_message}"
|
||||
exit 1
|
||||
else
|
||||
echo "Build successfully deployed!"
|
||||
exit 0
|
||||
fi
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
SCRIPT=$(realpath "$0")
|
||||
SCRIPTPATH=$(dirname "$SCRIPT")
|
||||
BASEPATH="$(realpath "${SCRIPTPATH}/../")"
|
||||
|
||||
echo "adding secure git dir"
|
||||
git config --global --add safe.directory '*'
|
||||
|
||||
echo "running chmods"
|
||||
find "${BASEPATH}" -iname "*.sh" -exec chmod +x {} +
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
install_sys_deps() {
|
||||
# shellcheck disable=SC2207
|
||||
curl_version=($(curl --version 2>/dev/null))
|
||||
|
||||
# shellcheck disable=SC2181
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "> Missing curl. Please install it."
|
||||
exit 1
|
||||
fi
|
||||
echo "> Found curl ${curl_version[1]}"
|
||||
}
|
||||
|
||||
install_node() {
|
||||
node_version=$(node --version 2>/dev/null)
|
||||
# shellcheck disable=SC2181
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "> Missing node. We can't currently install it automatically."
|
||||
echo "> Please download the latest version here: https://nodejs.org/en/download/"
|
||||
exit 1
|
||||
else
|
||||
echo "> Found node $node_version"
|
||||
fi
|
||||
|
||||
npm_version=$(npm --version 2>/dev/null)
|
||||
# shellcheck disable=SC2181
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "> Missing npm. Please ensure you've correctly installed node."
|
||||
echo "> You may need to add npm manually to your PATH variable."
|
||||
exit 1
|
||||
else
|
||||
echo "> Found npm $npm_version"
|
||||
fi
|
||||
}
|
||||
|
||||
install_sys_deps
|
||||
install_node
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
SCRIPT=$(realpath "$0")
|
||||
SCRIPTPATH=$(dirname "$SCRIPT")
|
||||
BASEPATH="$(realpath "${SCRIPTPATH}/../")"
|
||||
|
||||
NPM_DIR="${BASEPATH}/.npm"
|
||||
|
||||
if [[ ! -d "${NPM_DIR}" ]]; then
|
||||
mkdir "${NPM_DIR}" || exit 1
|
||||
fi
|
||||
|
||||
if docker -v | grep -qi "podman"; then
|
||||
is_podman='yes'
|
||||
fi
|
||||
|
||||
function run() {
|
||||
docker run --rm --workdir "/work" -v "${BASEPATH}:/work" -e is_podman="${is_podman:-no}" -e BUILDINDOCKER=yes -e npm_config_cache=/work/.npm ${opts:-} node:14-bullseye ${@}
|
||||
}
|
||||
|
||||
opts="-it" run /bin/bash -c 'bash /work/scripts/in_docker_prep.sh && bash'
|
||||
|
||||
if [[ "${is_podman}" != 'yes' ]]; then
|
||||
echo "fixing perms"
|
||||
run /bin/bash -c 'chown -R 1000:1000 /work'
|
||||
else
|
||||
echo "in podman, not fixing perms"
|
||||
fi
|
||||
|
|
@ -0,0 +1,177 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd "$(dirname "$0")/../../" || { echo "Failed to enter base dir"; exit 1; }
|
||||
source ./scripts/travis/properties.sh
|
||||
|
||||
build_verbose=0
|
||||
build_release=1
|
||||
build_debug=0
|
||||
|
||||
function print_help() {
|
||||
echo "Possible arguments:"
|
||||
echo " --verbose=[yes|no] | Enable verbose build output (Default: $build_verbose)"
|
||||
echo " --enable-release=[yes|no] | Enable release build (Default: $build_release)"
|
||||
echo " --enable-debug=[yes|no] | Enable debug build (Default: $build_debug)"
|
||||
}
|
||||
|
||||
function parse_arguments() {
|
||||
# Preprocess the help parameter
|
||||
for argument in "$@"; do
|
||||
if [[ "$argument" = "--help" ]] || [[ "$argument" = "-h" ]]; then
|
||||
print_help
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
shopt -s nocasematch
|
||||
for argument in "$@"; do
|
||||
echo "Argument: $argument"
|
||||
if [[ "$argument" =~ ^--verbose(=(y|1)?[[:alnum:]]*$)?$ ]]; then
|
||||
build_verbose=0
|
||||
if [[ -z "${BASH_REMATCH[1]}" ]] || [[ -n "${BASH_REMATCH[2]}" ]]; then
|
||||
build_verbose=1
|
||||
fi
|
||||
|
||||
if [[ ${build_verbose} ]]; then
|
||||
echo "Enabled verbose output"
|
||||
fi
|
||||
elif [[ "$argument" =~ ^--enable-release(=(y|1)?[[:alnum:]]*$)?$ ]]; then
|
||||
build_release=0
|
||||
if [[ -z "${BASH_REMATCH[1]}" ]] || [[ -n "${BASH_REMATCH[2]}" ]]; then
|
||||
build_release=1
|
||||
fi
|
||||
|
||||
if [[ ${build_release} ]]; then
|
||||
echo "Enabled release build!"
|
||||
fi
|
||||
elif [[ "$argument" =~ ^--enable-debug(=(y|1)?[[:alnum:]]*$)?$ ]]; then
|
||||
build_debug=0
|
||||
if [[ -z "${BASH_REMATCH[1]}" ]] || [[ -n "${BASH_REMATCH[2]}" ]]; then
|
||||
build_debug=1
|
||||
fi
|
||||
|
||||
if [[ ${build_debug} ]]; then
|
||||
echo "Enabled debug build!"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
function execute() {
|
||||
time_begin=$(date +%s%N)
|
||||
|
||||
echo "> Executing step: $1" >> "${LOG_FILE}"
|
||||
echo -e "\e[32m> Executing step: $1\e[0m"
|
||||
#Execute the command
|
||||
for command in "${@:3}"; do
|
||||
echo "$> $command" >> "${LOG_FILE}"
|
||||
if [[ ${build_verbose} -gt 0 ]]; then
|
||||
echo "$> $command"
|
||||
fi
|
||||
|
||||
error=""
|
||||
if [[ ${build_verbose} -gt 0 ]]; then
|
||||
if [[ -f ${LOG_FILE}.tmp ]]; then
|
||||
rm "${LOG_FILE}.tmp"
|
||||
fi
|
||||
${command} |& tee "${LOG_FILE}.tmp" | grep -E '^[^(/\S*/libstdc++.so\S*: no version information available)].*'
|
||||
|
||||
error_code=${PIPESTATUS[0]}
|
||||
error=$(cat "${LOG_FILE}.tmp")
|
||||
cat "${LOG_FILE}.tmp" >> "${LOG_FILE}"
|
||||
rm "${LOG_FILE}.tmp"
|
||||
else
|
||||
error=$(${command} 2>&1)
|
||||
error_code=$?
|
||||
echo "$error" >> "${LOG_FILE}"
|
||||
fi
|
||||
|
||||
|
||||
if [[ ${error_code} -ne 0 ]]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
#Log the result
|
||||
time_end=$(date +%s%N)
|
||||
time_needed=$((time_end - time_begin))
|
||||
time_needed_ms=$((time_needed / 1000000))
|
||||
step_color="\e[32m"
|
||||
[[ ${error_code} -ne 0 ]] && step_color="\e[31m"
|
||||
echo "$step_color> Step took ${time_needed_ms}ms" >> ${LOG_FILE}
|
||||
echo -e "$step_color> Step took ${time_needed_ms}ms\e[0m"
|
||||
|
||||
if [[ ${error_code} -ne 0 ]]; then
|
||||
handle_failure ${error_code} "$2"
|
||||
fi
|
||||
|
||||
error=""
|
||||
}
|
||||
|
||||
function handle_failure() {
|
||||
# We cut of the nasty "node: /usr/lib/libstdc++.so.6: no version information available (required by node)" message
|
||||
echo "--------------------------- [ERROR] ---------------------------"
|
||||
echo "We've encountered an fatal error, which isn't recoverable!"
|
||||
echo " Aborting build process!"
|
||||
echo ""
|
||||
echo "Exit code : $1"
|
||||
echo "Error message: ${*:2}"
|
||||
if [[ ${build_verbose} -eq 0 ]] && [[ "$error" != "" ]]; then
|
||||
echo "Command log : (lookup \"${LOG_FILE}\" for detailed output!)"
|
||||
echo "$error"
|
||||
fi
|
||||
echo "--------------------------- [ERROR] ---------------------------"
|
||||
exit 1
|
||||
}
|
||||
|
||||
cd "$(dirname "$0")/../../" || { echo "Failed to enter base dir"; exit 1; }
|
||||
error=""
|
||||
|
||||
LOG_FILE="$(pwd)/$LOG_FILE"
|
||||
if [[ ! -d $(dirname "${LOG_FILE}") ]]; then
|
||||
mkdir -p "$(dirname "${LOG_FILE}")"
|
||||
fi
|
||||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "Executing build scripts with no arguments"
|
||||
else
|
||||
echo "Executing build scripts with arguments: $* ($#)"
|
||||
fi
|
||||
if [[ "$1" == "bash" ]]; then
|
||||
bash
|
||||
exit 0
|
||||
fi
|
||||
|
||||
parse_arguments "${@:1}"
|
||||
|
||||
if [[ -e "$LOG_FILE" ]]; then
|
||||
rm "$LOG_FILE"
|
||||
fi
|
||||
|
||||
echo "---------- Setup ----------"
|
||||
chmod +x ./scripts/install_dependencies.sh
|
||||
source ./scripts/install_dependencies.sh
|
||||
|
||||
echo "---------- Web client ----------"
|
||||
|
||||
function execute_build_release() {
|
||||
execute \
|
||||
"Building release package" \
|
||||
"Failed to build release" \
|
||||
"./scripts/build.sh web release"
|
||||
}
|
||||
function execute_build_debug() {
|
||||
execute \
|
||||
"Building debug package" \
|
||||
"Failed to build debug" \
|
||||
"./scripts/build.sh web dev"
|
||||
}
|
||||
|
||||
chmod +x ./scripts/build.sh
|
||||
if [[ ${build_release} ]]; then
|
||||
execute_build_release
|
||||
fi
|
||||
if [[ ${build_debug} ]]; then
|
||||
execute_build_debug
|
||||
fi
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
cd "$(dirname "$0")/../../" || { echo "Failed to enter base dir"; exit 1; }
|
||||
source ./scripts/travis/properties.sh
|
||||
source ./scripts/helper.sh
|
||||
|
||||
git_rev=$(git_version "short-tag")
|
||||
if [[ "$1" == "release" ]]; then
|
||||
echo "Releasing $git_rev as release"
|
||||
rolling_tag="latest"
|
||||
elif [[ "$1" == "development" ]]; then
|
||||
echo "Releasing $git_rev as beta release"
|
||||
rolling_tag="beta"
|
||||
else
|
||||
echo "Invalid release mode"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# FIXME: This dosn't work anymore
|
||||
zip_file=$(find "$PACKAGES_DIRECTORY" -maxdepth 1 -name "TeaWeb-release*.zip" -print)
|
||||
[[ $(echo "$zip_file" | wc -l) -ne 1 ]] && {
|
||||
echo "Invalid .zip file count (Expected 1 but got $(echo "$zip_file" | wc -l)): ${zip_file[*]}"
|
||||
exit 1
|
||||
}
|
||||
[[ ! -e "$zip_file" ]] && {
|
||||
echo "File ($zip_file) does not exists"
|
||||
exit 1
|
||||
}
|
||||
|
||||
git clone https://github.com/TeaSpeak/TeaDocker.git auto-build/teadocker || {
|
||||
echo "Failed to clone the TeaDocker project"
|
||||
exit 1
|
||||
}
|
||||
|
||||
cp "$zip_file" auto-build/teadocker/web/TeaWeb-release.zip || {
|
||||
echo "Failed to copy Docker webclient files to the docker files build context"
|
||||
exit 1
|
||||
}
|
||||
|
||||
docker build -f auto-build/teadocker/web/travis.Dockerfile --build-arg WEB_VERSION="$git_rev" --build-arg WEB_ZIP=TeaWeb-release.zip -t teaspeak/web:"$rolling_tag" auto-build/teadocker/web || {
|
||||
echo "Failed to build dockerfile"
|
||||
exit 1
|
||||
}
|
||||
|
||||
docker tag teaspeak/web:"$rolling_tag" teaspeak/web:"$git_rev" || {
|
||||
echo "Failed to tag docker release"
|
||||
exit 1
|
||||
}
|
||||
|
||||
docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" || {
|
||||
echo "Failed to login to docker hub"
|
||||
exit 1
|
||||
}
|
||||
|
||||
docker push teaspeak/web || {
|
||||
echo "Failed to push new teaspeak/web tags"
|
||||
exit 1
|
||||
}
|
||||
docker logout # &> /dev/null
|
||||
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
cd "$(dirname "$0")/../../" || {
|
||||
echo "Failed to enter base dir"
|
||||
exit 1
|
||||
}
|
||||
source ./scripts/travis/properties.sh
|
||||
source ./scripts/helper.sh
|
||||
|
||||
if [[ -z "${GIT_AUTHTOKEN}" ]]; then
|
||||
echo "GIT_AUTHTOKEN isn't set. Don't deploying build!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git_release_executable="/tmp/git-release"
|
||||
install_git_release() {
|
||||
if [[ -x "${git_release_executable}" ]]; then
|
||||
# File already available. No need to install it.
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ ! -f ${git_release_executable} ]]; then
|
||||
echo "Downloading github-release-linux (1.2.4)"
|
||||
|
||||
if [[ -f /tmp/git-release.gz ]]; then
|
||||
rm /tmp/git-release.gz
|
||||
fi
|
||||
wget https://github.com/tfausak/github-release/releases/download/1.2.4/github-release-linux.gz -O /tmp/git-release.gz -q
|
||||
[[ $? -eq 0 ]] || {
|
||||
echo "Failed to download github-release-linux"
|
||||
exit 1
|
||||
}
|
||||
|
||||
gunzip /tmp/git-release.gz
|
||||
_exit_code=$?
|
||||
[[ $_exit_code -eq 0 ]] || {
|
||||
echo "Failed to unzip github-release-linux"
|
||||
exit 1
|
||||
}
|
||||
chmod +x /tmp/git-release
|
||||
|
||||
echo "Download of github-release-linux (1.2.4) finished"
|
||||
else
|
||||
chmod +x ${git_release_executable}
|
||||
fi
|
||||
|
||||
if [[ ! -x ${git_release_executable} ]]; then
|
||||
echo "git-release isn't executable"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
install_git_release
|
||||
|
||||
git_versions_tag=$(git_version "short-tag")
|
||||
echo "Deploying $git_versions_tag ($(git_version "long-tag")) to GitHub."
|
||||
|
||||
echo "Generating release tag"
|
||||
${git_release_executable} release \
|
||||
--repo "TeaWeb" \
|
||||
--owner "TeaSpeak" \
|
||||
--token "${GIT_AUTHTOKEN}" \
|
||||
--title "Travis auto build $git_versions_tag" \
|
||||
--tag "$git_versions_tag" \
|
||||
--description "This is a auto build release from travis"
|
||||
|
||||
[[ $? -eq 0 ]] || {
|
||||
echo "Failed to generate git release"
|
||||
exit 1
|
||||
}
|
||||
|
||||
upload_package() {
|
||||
local package_file
|
||||
package_file=$(find_release_package "web" "$1")
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo "Uploading $1 package ($package_file)"
|
||||
${git_release_executable} upload \
|
||||
--repo "TeaWeb" \
|
||||
--owner "TeaSpeak" \
|
||||
--token "${GIT_AUTHTOKEN}" \
|
||||
--tag "$git_versions_tag" \
|
||||
--file "$package_file" \
|
||||
--name "$(basename "$package_file")"
|
||||
|
||||
echo "Successfully uploaded $1 package"
|
||||
else
|
||||
echo "Skipping $1 package upload: $package_file"
|
||||
fi
|
||||
}
|
||||
|
||||
upload_package "development"
|
||||
upload_package "release"
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if [[ -z "$1" ]]; then
|
||||
echo "Missing deploy channel"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$(dirname "$0")/../../" || {
|
||||
echo "Failed to enter base dir"
|
||||
exit 1
|
||||
}
|
||||
source ./scripts/travis/properties.sh
|
||||
source ./scripts/helper.sh
|
||||
|
||||
if [[ -z "${SSH_KEY}" ]]; then
|
||||
echo "Missing environment variable SSH_KEY. Please set it before using this script!"
|
||||
exit 1
|
||||
fi
|
||||
echo "${SSH_KEY}" | base64 --decode > /tmp/sftp_key
|
||||
chmod 600 /tmp/sftp_key
|
||||
|
||||
[[ $? -ne 0 ]] && {
|
||||
echo "Failed to write SSH key"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
package_file=$(find_release_package "web" "release")
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "$package_file"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
upload_name=$(basename "$package_file")
|
||||
ssh -oStrictHostKeyChecking=no -oIdentitiesOnly=yes -i /tmp/sftp_key TeaSpeak-Travis-Web@web.teaspeak.dev rm "tmp-upload/*.zip" # Cleanup the old files
|
||||
_exit_code=$?
|
||||
[[ $_exit_code -ne 0 ]] && {
|
||||
echo "Failed to delete the old .zip files ($_exit_code)"
|
||||
}
|
||||
|
||||
sftp -oStrictHostKeyChecking=no -oIdentitiesOnly=yes -i /tmp/sftp_key TeaSpeak-Travis-Web@web.teaspeak.dev << EOF
|
||||
put $package_file tmp-upload/$upload_name
|
||||
EOF
|
||||
_exit_code=$?
|
||||
[[ $_exit_code -ne 0 ]] && {
|
||||
echo "Failed to upload the .zip file ($_exit_code)"
|
||||
exit 1
|
||||
}
|
||||
|
||||
ssh -oStrictHostKeyChecking=no -oIdentitiesOnly=yes -i /tmp/sftp_key TeaSpeak-Travis-Web@web.teaspeak.dev "./unpack.sh $1 tmp-upload/$upload_name"
|
||||
exit $?
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
LOG_FILE="auto-build/logs/build.log"
|
||||
PACKAGES_DIRECTORY="auto-build/packages/"
|
||||
|
|
@ -10,7 +10,8 @@
|
|||
justify-content: stretch !important;
|
||||
|
||||
@include user-select(none);
|
||||
width: 10000em; /* allocate some space */
|
||||
width: 10000em;
|
||||
/* allocate some space */
|
||||
|
||||
.inner-container {
|
||||
flex-grow: 1;
|
||||
|
|
@ -23,7 +24,8 @@
|
|||
flex-direction: row !important;
|
||||
justify-content: stretch;
|
||||
|
||||
> .left, > .right {
|
||||
>.left,
|
||||
>.right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
|
@ -113,7 +115,9 @@
|
|||
|
||||
@include chat-scrollbar-horizontal();
|
||||
|
||||
&.general-chat, &.general-application, &.audio-sounds {
|
||||
&.general-chat,
|
||||
&.general-application,
|
||||
&.audio-sounds {
|
||||
label {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
@ -168,7 +172,8 @@
|
|||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
|
||||
a, div {
|
||||
a,
|
||||
div {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
|
@ -333,15 +338,21 @@
|
|||
}
|
||||
}
|
||||
|
||||
&.audio-speaker, &.audio-sounds, &.identity-forum {
|
||||
&.audio-speaker,
|
||||
&.audio-sounds,
|
||||
&.identity-forum {
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.left, .right, .fill {
|
||||
.left,
|
||||
.right,
|
||||
.fill {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: calc(50% - .5em); /* the .5em for the padding/margin */
|
||||
width: calc(50% - .5em);
|
||||
|
||||
/* the .5em for the padding/margin */
|
||||
&.fill {
|
||||
width: calc(100% - 1em);
|
||||
}
|
||||
|
|
@ -410,7 +421,8 @@
|
|||
|
||||
background-color: $color_list_background;
|
||||
|
||||
&.container-devices, .container-devices {
|
||||
&.container-devices,
|
||||
.container-devices {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
|
|
@ -540,7 +552,9 @@
|
|||
border-bottom: 1px solid #242527;
|
||||
border-top: 1px solid #242527;
|
||||
}
|
||||
.container-name, .container-activity {
|
||||
|
||||
.container-name,
|
||||
.container-activity {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
|
||||
|
|
@ -588,8 +602,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.right, .fill {
|
||||
padding-right: .5em; /* for the sliders etc*/
|
||||
.right,
|
||||
.fill {
|
||||
padding-right: .5em;
|
||||
/* for the sliders etc*/
|
||||
justify-content: flex-start;
|
||||
|
||||
.body {
|
||||
|
|
@ -711,6 +727,7 @@
|
|||
|
||||
.thumb {
|
||||
background-color: #4d4d4d !important;
|
||||
|
||||
.tooltip {
|
||||
opacity: 0 !important;
|
||||
}
|
||||
|
|
@ -1082,11 +1099,13 @@
|
|||
|
||||
position: relative;
|
||||
|
||||
.left, .right {
|
||||
.left,
|
||||
.right {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: calc(50% - .5em); /* the .5em for the padding/margin */
|
||||
width: calc(50% - .5em);
|
||||
/* the .5em for the padding/margin */
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
|
@ -1167,7 +1186,8 @@
|
|||
}
|
||||
|
||||
&[value] {
|
||||
overflow: visible; /* for the thumb */
|
||||
overflow: visible;
|
||||
/* for the thumb */
|
||||
|
||||
border-bottom-left-radius: $border_radius_large;
|
||||
border-top-left-radius: $border_radius_large;
|
||||
|
|
@ -1217,11 +1237,16 @@
|
|||
box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, 0.25);
|
||||
|
||||
/* Permalink - use to edit and share this gradient: https://colorzilla.com/gradient-editor/#70407e+0,45407e+100 */
|
||||
background: rgb(112,64,126); /* Old browsers */
|
||||
background: -moz-linear-gradient(left, rgba(112,64,126,1) 0%, rgba(69,64,126,1) 100%); /* FF3.6-15 */
|
||||
background: -webkit-linear-gradient(left, rgba(112,64,126,1) 0%,rgba(69,64,126,1) 100%); /* Chrome10-25,Safari5.1-6 */
|
||||
background: linear-gradient(to right, rgba(112,64,126,1) 0%,rgba(69,64,126,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#70407e', endColorstr='#45407e',GradientType=1 ); /* IE6-9 */
|
||||
background: rgb(112, 64, 126);
|
||||
/* Old browsers */
|
||||
background: -moz-linear-gradient(left, rgba(112, 64, 126, 1) 0%, rgba(69, 64, 126, 1) 100%);
|
||||
/* FF3.6-15 */
|
||||
background: -webkit-linear-gradient(left, rgba(112, 64, 126, 1) 0%, rgba(69, 64, 126, 1) 100%);
|
||||
/* Chrome10-25,Safari5.1-6 */
|
||||
background: linear-gradient(to right, rgba(112, 64, 126, 1) 0%, rgba(69, 64, 126, 1) 100%);
|
||||
/* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#70407e', endColorstr='#45407e', GradientType=1);
|
||||
/* IE6-9 */
|
||||
}
|
||||
|
||||
.left {
|
||||
|
|
@ -1245,7 +1270,8 @@
|
|||
|
||||
background-color: $color_list_background;
|
||||
|
||||
&.container-devices, .container-devices {
|
||||
&.container-devices,
|
||||
.container-devices {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
|
|
@ -1402,7 +1428,9 @@
|
|||
border-bottom: 1px solid #242527;
|
||||
border-top: 1px solid #242527;
|
||||
}
|
||||
.container-name, .container-activity {
|
||||
|
||||
.container-name,
|
||||
.container-activity {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
|
||||
|
|
@ -1480,7 +1508,8 @@
|
|||
}
|
||||
|
||||
.right {
|
||||
padding-right: .5em; /* for the sliders etc*/
|
||||
padding-right: .5em;
|
||||
/* for the sliders etc*/
|
||||
justify-content: flex-start;
|
||||
|
||||
.body {
|
||||
|
|
@ -1602,6 +1631,7 @@
|
|||
|
||||
.thumb {
|
||||
background-color: #4d4d4d !important;
|
||||
|
||||
.tooltip {
|
||||
opacity: 0 !important;
|
||||
}
|
||||
|
|
@ -1731,7 +1761,8 @@
|
|||
|
||||
position: relative;
|
||||
|
||||
.left, .right {
|
||||
.left,
|
||||
.right {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
|
|
@ -1905,8 +1936,10 @@
|
|||
>*:not(:first-of-type) {
|
||||
margin-left: .25em;
|
||||
}
|
||||
|
||||
.icon-status {
|
||||
margin-bottom: .2em; /* push it a bit higher than the center */
|
||||
margin-bottom: .2em;
|
||||
/* push it a bit higher than the center */
|
||||
}
|
||||
|
||||
div {
|
||||
|
|
@ -1934,7 +1967,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
.buttons, .buttons-small {
|
||||
.buttons,
|
||||
.buttons-small {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
|
|
@ -1977,7 +2011,8 @@
|
|||
}
|
||||
|
||||
.right {
|
||||
padding-right: .5em; /* for the sliders etc*/
|
||||
padding-right: .5em;
|
||||
/* for the sliders etc*/
|
||||
justify-content: flex-start;
|
||||
|
||||
.body {
|
||||
|
|
@ -1997,6 +2032,7 @@
|
|||
padding: 1em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.container-valid {
|
||||
.container-level {
|
||||
display: flex;
|
||||
|
|
@ -2042,17 +2078,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.container-teaforo {
|
||||
.container-valid, .container-invalid {
|
||||
padding: 1em;
|
||||
text-align: center;
|
||||
|
||||
button {
|
||||
margin-top: .5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-highlight-dummy {
|
||||
margin-top: 1em;
|
||||
margin-bottom: .5em;
|
||||
|
|
@ -2065,9 +2090,11 @@
|
|||
}
|
||||
|
||||
/* the highlight stuff for the newcommer modal */
|
||||
.container-settings-identity-profile, .container-settings-audio-microphone {
|
||||
.container-settings-identity-profile,
|
||||
.container-settings-audio-microphone {
|
||||
$highlight-time: .5s;
|
||||
$backdrop-color: rgba(0, 0, 0, .9);
|
||||
|
||||
.help-background {
|
||||
position: absolute;
|
||||
|
||||
|
|
@ -2164,7 +2191,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
.container-teamspeak, .container-teaforo, .container-nickname {
|
||||
.container-teamspeak,
|
||||
.container-nickname {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
@ -2206,6 +2234,21 @@
|
|||
}
|
||||
|
||||
|
||||
@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
|
||||
@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
|
||||
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
|
||||
@-moz-keyframes spin {
|
||||
100% {
|
||||
-moz-transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@-webkit-keyframes spin {
|
||||
100% {
|
||||
-webkit-transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
100% {
|
||||
-webkit-transform: rotate(360deg);
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,11 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>TeaSpeak-Web client templates</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="template-group-modals">
|
||||
<script class="jsrender-template" id="tmpl_modal" type="text/html">
|
||||
|
|
@ -103,7 +105,6 @@
|
|||
|
||||
<div class="entry group">{{tr "Identity" /}}</div>
|
||||
<div class="entry" container="identity-profiles">{{tr "Profiles" /}}</div>
|
||||
<div class="entry" container="identity-forum">{{tr "TeaForo connection" /}}</div>
|
||||
</div>
|
||||
<div class="container-seperator vertical" seperator-id="seperator-settings"></div>
|
||||
<div class="right">
|
||||
|
|
@ -417,7 +418,6 @@
|
|||
<select class="form-control profile-identity-type">
|
||||
<option value="error" style="display: none">error: error</option>
|
||||
<option value="unset" style="display: none">{{tr "Unset" /}}</option>
|
||||
<option value="teaforo">{{tr "Forum Account" /}}</option>
|
||||
<option value="teamspeak">{{tr "TeamSpeak Identity" /}}</option>
|
||||
<option value="nickname">{{tr "Nickname (Debug only!)" /}}</option>
|
||||
</select>
|
||||
|
|
@ -453,16 +453,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-teaforo">
|
||||
<div class="container-valid">
|
||||
{{tr "You're using your forum account as identification" /}}
|
||||
</div>
|
||||
<div class="container-invalid">
|
||||
<a>{{tr "You cant use your TeaSpeak forum account. You're not connected with your forum Account!" /}}</a>
|
||||
<button class="btn btn-success button-setup">{{tr "Setup your connection" /}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-nickname">
|
||||
<div class="form-group">
|
||||
<label>{{tr "Nickname" /}}</label>
|
||||
|
|
@ -1970,14 +1960,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="property property-teaforo">
|
||||
<div class="title">
|
||||
<a>{{tr "TeaForo Connection" /}}</a>
|
||||
</div>
|
||||
<div class="value">
|
||||
<a>This will be a really long string...</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="property property-version">
|
||||
<div class="title">
|
||||
<a>{{tr "Version" /}}</a>
|
||||
|
|
@ -2170,4 +2152,5 @@
|
|||
</div>
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
|
|
@ -107,12 +107,12 @@ export class BookmarkManager {
|
|||
connectOnStartup: false,
|
||||
connectProfile: "default",
|
||||
|
||||
displayName: "Our LanPart<",
|
||||
displayName: "Official TeaSpeak - Test server",
|
||||
|
||||
parentEntry: undefined,
|
||||
previousEntry: undefined,
|
||||
|
||||
serverAddress: "tea.lp.kle.li",
|
||||
serverAddress: "ts.teaspeak.de",
|
||||
serverPasswordHash: undefined,
|
||||
|
||||
defaultChannel: undefined,
|
||||
|
|
|
|||
|
|
@ -166,11 +166,6 @@ export class SelectedClientInfo {
|
|||
};
|
||||
this.events.fire("notify_cache_changed", { category: "version" });
|
||||
}
|
||||
|
||||
if('client_teaforo_flags' in event.updated_properties || 'client_teaforo_name' in event.updated_properties || 'client_teaforo_id' in event.updated_properties) {
|
||||
this.updateForumAccount(client);
|
||||
this.events.fire("notify_cache_changed", { category: "forum-account" });
|
||||
}
|
||||
}));
|
||||
|
||||
events.push(client.events.on("notify_audio_level_changed", () => {
|
||||
|
|
@ -209,17 +204,6 @@ export class SelectedClientInfo {
|
|||
}
|
||||
}
|
||||
|
||||
private updateForumAccount(client: ClientEntry) {
|
||||
if(client.properties.client_teaforo_id) {
|
||||
this.currentClientStatus.forumAccount = {
|
||||
flags: client.properties.client_teaforo_flags,
|
||||
nickname: client.properties.client_teaforo_name,
|
||||
userId: client.properties.client_teaforo_id
|
||||
};
|
||||
} else {
|
||||
this.currentClientStatus.forumAccount = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private updateChannelGroup(client: ClientEntry) {
|
||||
this.currentClientStatus.channelGroup = client.properties.client_channel_group_id;
|
||||
|
|
@ -259,6 +243,5 @@ export class SelectedClientInfo {
|
|||
this.updateCachedClientStatus(client);
|
||||
this.updateCachedCountry(client);
|
||||
this.updateCachedVolume(client);
|
||||
this.updateForumAccount(client);
|
||||
}
|
||||
}
|
||||
|
|
@ -895,7 +895,7 @@ export class RTCConnection {
|
|||
this.peer = new RTCPeerConnection({
|
||||
bundlePolicy: "max-bundle",
|
||||
rtcpMuxPolicy: "require",
|
||||
iceServers: [{ urls: ["stun:turn.lp.kle.li:3478"] }]
|
||||
iceServers: [{ urls: ["stun:turn.lp.kle.li:3478", "stuns:turn.kle.li:5349"] }]
|
||||
});
|
||||
|
||||
if (this.audioSupport) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import * as loader from "tc-loader";
|
||||
import { initializeI18N, tra } from "./i18n/localize";
|
||||
import * as fidentity from "./profiles/identities/TeaForumIdentity";
|
||||
import * as global_ev_handler from "./events/ClientGlobalControlHandler";
|
||||
import { AppParameters, settings, Settings, UrlParameterBuilder, UrlParameterParser } from "tc-shared/settings";
|
||||
import { LogCategory, logDebug, logError, logInfo, logWarn } from "tc-shared/log";
|
||||
|
|
@ -387,8 +386,6 @@ function main() {
|
|||
server_connections.setActiveConnectionHandler(initialHandler);
|
||||
initialHandler.acquireInputHardware().then(() => { });
|
||||
|
||||
/** Setup the XF forum identity **/
|
||||
fidentity.update_forum();
|
||||
initializeKeyControl();
|
||||
|
||||
checkForUpdatedApp();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import { decode_identity, IdentitifyType, Identity } from "../profiles/Identity";
|
||||
import { guid } from "../crypto/uid";
|
||||
import {TeaForumIdentity} from "../profiles/identities/TeaForumIdentity";
|
||||
import { TeaSpeakIdentity } from "../profiles/identities/TeamSpeakIdentity";
|
||||
import { AbstractServerConnection } from "../connection/ConnectionBase";
|
||||
import { HandshakeIdentityHandler } from "../connection/HandshakeHandler";
|
||||
|
|
@ -52,9 +51,7 @@ export class ConnectionProfile {
|
|||
if (current_type === undefined)
|
||||
return undefined;
|
||||
|
||||
if (current_type == IdentitifyType.TEAFORO) {
|
||||
return TeaForumIdentity.identity();
|
||||
} else if (current_type == IdentitifyType.TEAMSPEAK || current_type == IdentitifyType.NICKNAME) {
|
||||
if (current_type == IdentitifyType.TEAMSPEAK || current_type == IdentitifyType.NICKNAME) {
|
||||
return this.identities[IdentitifyType[current_type].toLowerCase()];
|
||||
}
|
||||
|
||||
|
|
@ -170,7 +167,7 @@ async function loadConnectProfiles() {
|
|||
}
|
||||
|
||||
const defaultProfile = findConnectProfile("default");
|
||||
if (!defaultProfile) { //Create a default profile and teaforo profile
|
||||
if (!defaultProfile) { //Create a default profile
|
||||
{
|
||||
const profile = createConnectProfile(tr("Default Profile"), "default");
|
||||
profile.defaultPassword = "";
|
||||
|
|
@ -194,15 +191,6 @@ async function loadConnectProfiles() {
|
|||
}
|
||||
}
|
||||
|
||||
{ /* forum identity (works only when connected to the forum) */
|
||||
const profile = createConnectProfile(tr("TeaSpeak Forum Profile"), "teaforo");
|
||||
profile.defaultPassword = "";
|
||||
profile.defaultUsername = "";
|
||||
|
||||
profile.setIdentity(IdentitifyType.TEAFORO, TeaForumIdentity.identity());
|
||||
profile.selectedIdentityType = IdentitifyType[IdentitifyType.TEAFORO];
|
||||
}
|
||||
|
||||
save();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import {LogCategory, logError, logWarn} from "tc-shared/log";
|
|||
import { tr } from "tc-shared/i18n/localize";
|
||||
|
||||
export enum IdentitifyType {
|
||||
TEAFORO,
|
||||
TEAMSPEAK,
|
||||
NICKNAME
|
||||
}
|
||||
|
|
@ -31,10 +30,6 @@ export async function decode_identity(type: IdentitifyType, data: string) : Prom
|
|||
const nidentity = require("tc-shared/profiles/identities/NameIdentity");
|
||||
identity = new nidentity.NameIdentity();
|
||||
break;
|
||||
case IdentitifyType.TEAFORO:
|
||||
const fidentity = require("tc-shared/profiles/identities/TeaForumIdentity");
|
||||
identity = new fidentity.TeaForumIdentity(undefined);
|
||||
break;
|
||||
case IdentitifyType.TEAMSPEAK:
|
||||
const tidentity = require("tc-shared/profiles/identities/TeamSpeakIdentity");
|
||||
identity = new tidentity.TeaSpeakIdentity(undefined, undefined);
|
||||
|
|
@ -60,10 +55,6 @@ export function create_identity(type: IdentitifyType) {
|
|||
const nidentity = require("tc-shared/profiles/identities/NameIdentity");
|
||||
identity = new nidentity.NameIdentity();
|
||||
break;
|
||||
case IdentitifyType.TEAFORO:
|
||||
const fidentity = require("tc-shared/profiles/identities/TeaForumIdentity");
|
||||
identity = new fidentity.TeaForumIdentity(undefined);
|
||||
break;
|
||||
case IdentitifyType.TEAMSPEAK:
|
||||
const tidentity = require("tc-shared/profiles/identities/TeamSpeakIdentity");
|
||||
identity = new tidentity.TeaSpeakIdentity(undefined, undefined);
|
||||
|
|
|
|||
|
|
@ -1,135 +0,0 @@
|
|||
import {
|
||||
AbstractHandshakeIdentityHandler,
|
||||
HandshakeCommandHandler,
|
||||
IdentitifyType,
|
||||
Identity
|
||||
} from "../../profiles/Identity";
|
||||
import {LogCategory, logError} from "../../log";
|
||||
import {CommandResult} from "../../connection/ServerConnectionDeclaration";
|
||||
import {AbstractServerConnection} from "../../connection/ConnectionBase";
|
||||
import {HandshakeIdentityHandler} from "../../connection/HandshakeHandler";
|
||||
import * as forum from "./teaspeak-forum";
|
||||
import { tr } from "tc-shared/i18n/localize";
|
||||
|
||||
class TeaForumHandshakeHandler extends AbstractHandshakeIdentityHandler {
|
||||
readonly identity: TeaForumIdentity;
|
||||
handler: HandshakeCommandHandler<TeaForumHandshakeHandler>;
|
||||
|
||||
constructor(connection: AbstractServerConnection, identity: TeaForumIdentity) {
|
||||
super(connection);
|
||||
this.identity = identity;
|
||||
this.handler = new HandshakeCommandHandler(connection, this);
|
||||
this.handler["handshakeidentityproof"] = this.handle_proof.bind(this);
|
||||
}
|
||||
|
||||
executeHandshake() {
|
||||
this.connection.getCommandHandler().registerHandler(this.handler);
|
||||
this.connection.send_command("handshakebegin", {
|
||||
intention: 0,
|
||||
authentication_method: this.identity.type(),
|
||||
data: this.identity.data().data_json()
|
||||
}).catch(error => {
|
||||
logError(LogCategory.IDENTITIES, tr("Failed to initialize TeaForum based handshake. Error: %o"), error);
|
||||
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
this.trigger_fail("failed to execute begin (" + error + ")");
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private handle_proof(json) {
|
||||
this.connection.send_command("handshakeindentityproof", {
|
||||
proof: this.identity.data().data_sign()
|
||||
}).catch(error => {
|
||||
logError(LogCategory.IDENTITIES, tr("Failed to proof the identity. Error: %o"), error);
|
||||
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
this.trigger_fail("failed to execute proof (" + error + ")");
|
||||
}).then(() => this.trigger_success());
|
||||
}
|
||||
|
||||
protected trigger_fail(message: string) {
|
||||
this.connection.getCommandHandler().unregisterHandler(this.handler);
|
||||
super.trigger_fail(message);
|
||||
}
|
||||
|
||||
protected trigger_success() {
|
||||
this.connection.getCommandHandler().unregisterHandler(this.handler);
|
||||
super.trigger_success();
|
||||
}
|
||||
}
|
||||
|
||||
export class TeaForumIdentity implements Identity {
|
||||
private readonly identity_data: forum.Data;
|
||||
|
||||
valid() : boolean {
|
||||
return !!this.identity_data && !this.identity_data.is_expired();
|
||||
}
|
||||
|
||||
constructor(data: forum.Data) {
|
||||
this.identity_data = data;
|
||||
}
|
||||
|
||||
data() {
|
||||
return this.identity_data;
|
||||
}
|
||||
|
||||
decode(data) : Promise<void> {
|
||||
data = JSON.parse(data);
|
||||
if(data.version !== 1)
|
||||
throw "invalid version";
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
encode() : string {
|
||||
return JSON.stringify({
|
||||
version: 1
|
||||
});
|
||||
}
|
||||
|
||||
spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler {
|
||||
return new TeaForumHandshakeHandler(connection, this);
|
||||
}
|
||||
|
||||
fallback_name(): string | undefined {
|
||||
return this.identity_data ? this.identity_data.name() : undefined;
|
||||
}
|
||||
|
||||
type(): IdentitifyType {
|
||||
return IdentitifyType.TEAFORO;
|
||||
}
|
||||
|
||||
uid(): string {
|
||||
//FIXME: Real UID!
|
||||
return "TeaForo#" + ((this.identity_data ? this.identity_data.name() : "Another TeaSpeak user"));
|
||||
}
|
||||
|
||||
public static identity() {
|
||||
return static_identity;
|
||||
}
|
||||
}
|
||||
|
||||
let static_identity: TeaForumIdentity;
|
||||
|
||||
export function set_static_identity(identity: TeaForumIdentity) {
|
||||
static_identity = identity;
|
||||
}
|
||||
|
||||
export function update_forum() {
|
||||
if(forum.logged_in() && (!static_identity || static_identity.data() !== forum.data())) {
|
||||
static_identity = new TeaForumIdentity(forum.data());
|
||||
} else {
|
||||
static_identity = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
export function valid_static_forum_identity() : boolean {
|
||||
return static_identity && static_identity.valid();
|
||||
}
|
||||
|
||||
export function static_forum_identity() : TeaForumIdentity | undefined {
|
||||
return static_identity;
|
||||
}
|
||||
|
|
@ -1,399 +0,0 @@
|
|||
import {settings, Settings} from "../../settings";
|
||||
import * as loader from "tc-loader";
|
||||
import * as fidentity from "./TeaForumIdentity";
|
||||
import {LogCategory, logDebug, logError, logInfo, logWarn} from "../../log";
|
||||
import {tr} from "tc-shared/i18n/localize";
|
||||
import {getStorageAdapter} from "tc-shared/StorageAdapter";
|
||||
|
||||
/* TODO: Properly redesign this whole system! */
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
grecaptcha: GReCaptcha;
|
||||
}
|
||||
}
|
||||
|
||||
interface GReCaptcha {
|
||||
render(container: string | HTMLElement, parameters: {
|
||||
sitekey: string;
|
||||
theme?: "dark" | "light";
|
||||
size?: "compact" | "normal";
|
||||
|
||||
tabindex?: number;
|
||||
|
||||
callback?: (token: string) => any;
|
||||
"expired-callback"?: () => any;
|
||||
"error-callback"?: (error: any) => any;
|
||||
}) : string; /* widget_id */
|
||||
|
||||
reset(widget_id?: string);
|
||||
}
|
||||
|
||||
export namespace gcaptcha {
|
||||
export async function initialize() {
|
||||
if(typeof(window.grecaptcha) === "undefined") {
|
||||
let script = document.createElement("script");
|
||||
script.async = true;
|
||||
|
||||
let timeout;
|
||||
const callback_name = "captcha_callback_" + Math.random().toString().replace(".", "");
|
||||
try {
|
||||
await new Promise((resolve, reject) => {
|
||||
script.onerror = reject;
|
||||
window[callback_name] = resolve;
|
||||
script.src = "https://www.google.com/recaptcha/api.js?onload=" + encodeURIComponent(callback_name) + "&render=explicit";
|
||||
|
||||
document.body.append(script);
|
||||
timeout = setTimeout(() => reject("timeout"), 15000);
|
||||
});
|
||||
} catch(error) {
|
||||
script.remove();
|
||||
script = undefined;
|
||||
|
||||
logError(LogCategory.GENERAL, tr("Failed to fetch recaptcha javascript source: %o"), error);
|
||||
throw tr("failed to download source");
|
||||
} finally {
|
||||
if(script)
|
||||
script.onerror = undefined;
|
||||
delete window[callback_name];
|
||||
timeout && clearTimeout(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
if(typeof(window.grecaptcha) === "undefined") {
|
||||
throw tr("failed to load recaptcha");
|
||||
}
|
||||
}
|
||||
|
||||
export async function spawn(container: JQuery, key: string, callback_data: (token: string) => any) {
|
||||
try {
|
||||
await initialize();
|
||||
} catch(error) {
|
||||
logError(LogCategory.GENERAL, tr("Failed to initialize G-Recaptcha. Error: %o"), error);
|
||||
throw tr("initialisation failed");
|
||||
}
|
||||
if(container.attr("captcha-uuid"))
|
||||
window.grecaptcha.reset(container.attr("captcha-uuid"));
|
||||
else {
|
||||
container.attr("captcha-uuid", window.grecaptcha.render(container[0], {
|
||||
"sitekey": key,
|
||||
callback: callback_data
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getForumApiURL() {
|
||||
return settings.getValue(Settings.KEY_TEAFORO_URL);
|
||||
}
|
||||
|
||||
export class Data {
|
||||
readonly auth_key: string;
|
||||
readonly raw: string;
|
||||
readonly sign: string;
|
||||
|
||||
parsed: {
|
||||
user_id: number;
|
||||
user_name: string;
|
||||
|
||||
data_age: number;
|
||||
|
||||
user_group_id: number;
|
||||
|
||||
is_staff: boolean;
|
||||
user_groups: number[];
|
||||
};
|
||||
|
||||
constructor(auth: string, raw: string, sign: string) {
|
||||
this.auth_key = auth;
|
||||
this.raw = raw;
|
||||
this.sign = sign;
|
||||
|
||||
this.parsed = JSON.parse(raw);
|
||||
}
|
||||
|
||||
|
||||
data_json() : string { return this.raw; }
|
||||
data_sign() : string { return this.sign; }
|
||||
|
||||
name() : string { return this.parsed.user_name; }
|
||||
|
||||
user_id() { return this.parsed.user_id; }
|
||||
user_group() { return this.parsed.user_group_id; }
|
||||
|
||||
is_stuff() : boolean { return this.parsed.is_staff; }
|
||||
is_premium() : boolean { return this.parsed.user_groups.indexOf(5) != -1; }
|
||||
|
||||
data_age() : Date { return new Date(this.parsed.data_age); }
|
||||
|
||||
is_expired() : boolean { return this.parsed.data_age + 48 * 60 * 60 * 1000 < Date.now(); }
|
||||
should_renew() : boolean { return this.parsed.data_age + 24 * 60 * 60 * 1000 < Date.now(); } /* renew data all 24hrs */
|
||||
}
|
||||
let forumData: Data | undefined;
|
||||
|
||||
export function logged_in() : boolean {
|
||||
return !!forumData && !forumData.is_expired();
|
||||
}
|
||||
|
||||
export function data() : Data { return forumData; }
|
||||
|
||||
export interface LoginResult {
|
||||
status: "success" | "captcha" | "error";
|
||||
|
||||
error_message?: string;
|
||||
captcha?: {
|
||||
type: "gre-captcha" | "unknown";
|
||||
data: any; /* in case of gre-captcha it would be the side key */
|
||||
};
|
||||
}
|
||||
|
||||
export async function login(username: string, password: string, captcha?: any) : Promise<LoginResult> {
|
||||
let response;
|
||||
try {
|
||||
response = await new Promise<any>((resolve, reject) => {
|
||||
$.ajax({
|
||||
url: getForumApiURL() + "?web-api/v1/login",
|
||||
type: "POST",
|
||||
cache: false,
|
||||
data: {
|
||||
username: username,
|
||||
password: password,
|
||||
remember: true,
|
||||
"g-recaptcha-response": captcha
|
||||
},
|
||||
|
||||
crossDomain: true,
|
||||
|
||||
success: resolve,
|
||||
error: (xhr, status, error) => {
|
||||
logDebug(LogCategory.GENERAL, tr("Login request failed %o: %o"), status, error);
|
||||
reject(tr("request failed"));
|
||||
}
|
||||
})
|
||||
});
|
||||
} catch(error) {
|
||||
return {
|
||||
status: "error",
|
||||
error_message: tr("failed to send login request")
|
||||
};
|
||||
}
|
||||
|
||||
if(response["status"] !== "ok") {
|
||||
logError(LogCategory.GENERAL, tr("Response status not okey. Error happend: %o"), response);
|
||||
return {
|
||||
status: "error",
|
||||
error_message: (response["errors"] || [])[0] || tr("Unknown error")
|
||||
};
|
||||
}
|
||||
|
||||
if(!response["success"]) {
|
||||
logError(LogCategory.GENERAL, tr("Login failed. Response %o"), response);
|
||||
|
||||
let message = tr("failed to login");
|
||||
let captcha;
|
||||
/* user/password wrong | and maybe captcha required */
|
||||
if(response["code"] == 1 || response["code"] == 3)
|
||||
message = tr("Invalid username or password");
|
||||
if(response["code"] == 2 || response["code"] == 3) {
|
||||
captcha = {
|
||||
type: response["captcha"]["type"],
|
||||
data: response["captcha"]["siteKey"] //TODO: Why so static here?
|
||||
};
|
||||
if(response["code"] == 2)
|
||||
message = tr("captcha required");
|
||||
}
|
||||
|
||||
return {
|
||||
status: typeof(captcha) !== "undefined" ? "captcha" : "error",
|
||||
error_message: message,
|
||||
captcha: captcha
|
||||
};
|
||||
}
|
||||
//document.cookie = "user_data=" + response["data"] + ";path=/";
|
||||
//document.cookie = "user_sign=" + response["sign"] + ";path=/";
|
||||
|
||||
try {
|
||||
forumData = new Data(response["auth-key"], response["data"], response["sign"]);
|
||||
const adapter = getStorageAdapter();
|
||||
await adapter.set("teaspeak-forum-data", response["data"]);
|
||||
await adapter.set("teaspeak-forum-sign", response["sign"]);
|
||||
await adapter.set("teaspeak-forum-auth", response["auth-key"]);
|
||||
fidentity.update_forum();
|
||||
} catch(error) {
|
||||
logError(LogCategory.GENERAL, tr("Failed to parse forum given data: %o"), error);
|
||||
return {
|
||||
status: "error",
|
||||
error_message: tr("Failed to parse response data")
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
status: "success"
|
||||
};
|
||||
}
|
||||
|
||||
async function resetForumLocalData() {
|
||||
const adapter = getStorageAdapter();
|
||||
await adapter.delete("teaspeak-forum-data");
|
||||
await adapter.delete("teaspeak-forum-sign");
|
||||
await adapter.delete("teaspeak-forum-auth");
|
||||
}
|
||||
|
||||
export async function renew_data() : Promise<"success" | "login-required"> {
|
||||
let response;
|
||||
try {
|
||||
response = await new Promise<any>((resolve, reject) => {
|
||||
$.ajax({
|
||||
url: getForumApiURL() + "?web-api/v1/renew-data",
|
||||
type: "GET",
|
||||
cache: false,
|
||||
|
||||
crossDomain: true,
|
||||
|
||||
data: {
|
||||
"auth-key": forumData.auth_key
|
||||
},
|
||||
|
||||
success: resolve,
|
||||
error: (xhr, status, error) => {
|
||||
logError(LogCategory.GENERAL, tr("Renew request failed %o: %o"), status, error);
|
||||
reject(tr("request failed"));
|
||||
}
|
||||
})
|
||||
});
|
||||
} catch(error) {
|
||||
throw tr("failed to send renew request");
|
||||
}
|
||||
|
||||
if(response["status"] !== "ok") {
|
||||
logError(LogCategory.GENERAL, tr("Response status not okey. Error happend: %o"), response);
|
||||
throw (response["errors"] || [])[0] || tr("Unknown error");
|
||||
}
|
||||
|
||||
if(!response["success"]) {
|
||||
if(response["code"] == 1) {
|
||||
return "login-required";
|
||||
}
|
||||
throw "invalid error code (" + response["code"] + ")";
|
||||
}
|
||||
if(!response["data"] || !response["sign"])
|
||||
throw tr("response missing data");
|
||||
|
||||
logDebug(LogCategory.GENERAL, tr("Renew succeeded. Parsing data."));
|
||||
|
||||
try {
|
||||
forumData = new Data(forumData.auth_key, response["data"], response["sign"]);
|
||||
await getStorageAdapter().set("teaspeak-forum-data", response["data"]);
|
||||
await getStorageAdapter().set("teaspeak-forum-sign", response["sign"]);
|
||||
fidentity.update_forum();
|
||||
} catch(error) {
|
||||
logError(LogCategory.GENERAL, tr("Failed to parse forum given data: %o"), error);
|
||||
throw tr("failed to parse data");
|
||||
}
|
||||
|
||||
return "success";
|
||||
}
|
||||
|
||||
export async function logout() : Promise<void> {
|
||||
if(!logged_in()) {
|
||||
return;
|
||||
}
|
||||
|
||||
let response;
|
||||
try {
|
||||
response = await new Promise<any>((resolve, reject) => {
|
||||
$.ajax({
|
||||
url: getForumApiURL() + "?web-api/v1/logout",
|
||||
type: "GET",
|
||||
cache: false,
|
||||
|
||||
crossDomain: true,
|
||||
|
||||
data: {
|
||||
"auth-key": forumData.auth_key
|
||||
},
|
||||
|
||||
success: resolve,
|
||||
error: (xhr, status, error) => {
|
||||
logInfo(LogCategory.GENERAL, tr("Logout request failed %o: %o"), status, error);
|
||||
reject(tr("request failed"));
|
||||
}
|
||||
})
|
||||
});
|
||||
} catch(error) {
|
||||
throw tr("failed to send logout request");
|
||||
}
|
||||
|
||||
if(response["status"] !== "ok") {
|
||||
logError(LogCategory.GENERAL, tr("Response status not ok. Error happened: %o"), response);
|
||||
throw (response["errors"] || [])[0] || tr("Unknown error");
|
||||
}
|
||||
|
||||
if(!response["success"]) {
|
||||
/* code 1 means not logged in, its an success */
|
||||
if(response["code"] != 1) {
|
||||
throw "invalid error code (" + response["code"] + ")";
|
||||
}
|
||||
}
|
||||
|
||||
forumData = undefined;
|
||||
await resetForumLocalData();
|
||||
fidentity.update_forum();
|
||||
}
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
||||
name: "TeaForo initialize",
|
||||
priority: 10,
|
||||
function: async () => {
|
||||
const rawData = await getStorageAdapter().get("teaspeak-forum-data");
|
||||
const rawSign = await getStorageAdapter().get("teaspeak-forum-sign");
|
||||
const rawForumAuth = await getStorageAdapter().get("teaspeak-forum-auth");
|
||||
if(!rawData || !rawSign || !rawForumAuth) {
|
||||
logInfo(LogCategory.GENERAL, tr("No TeaForo authentication found. TeaForo connection status: unconnected"));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
forumData = new Data(rawForumAuth, rawData, rawSign);
|
||||
} catch(error) {
|
||||
logError(LogCategory.GENERAL, tr("Failed to initialize TeaForo connection from local data. Error: %o"), error);
|
||||
return;
|
||||
}
|
||||
if(forumData.should_renew()) {
|
||||
logInfo(LogCategory.GENERAL, tr("TeaForo data should be renewed. Executing renew."));
|
||||
renew_data().then(async status => {
|
||||
if(status === "success") {
|
||||
logInfo(LogCategory.GENERAL, tr("TeaForo data has been successfully renewed."));
|
||||
} else {
|
||||
logWarn(LogCategory.GENERAL, tr("Failed to renew TeaForo data. New login required."));
|
||||
await resetForumLocalData();
|
||||
}
|
||||
}).catch(error => {
|
||||
logWarn(LogCategory.GENERAL, tr("Failed to renew TeaForo data. An error occurred: %o"), error);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if(forumData && forumData.is_expired()) {
|
||||
logError(LogCategory.GENERAL, tr("TeaForo data is expired. TeaForo connection isn't available!"));
|
||||
}
|
||||
|
||||
|
||||
setInterval(() => {
|
||||
/* if we don't have any _data object set we could not renew anything */
|
||||
if(forumData) {
|
||||
logInfo(LogCategory.IDENTITIES, tr("Renewing TeaForo data."));
|
||||
renew_data().then(async status => {
|
||||
if(status === "success") {
|
||||
logInfo(LogCategory.IDENTITIES,tr("TeaForo data has been successfully renewed."));
|
||||
} else {
|
||||
logWarn(LogCategory.IDENTITIES,tr("Failed to renew TeaForo data. New login required."));
|
||||
await resetForumLocalData();
|
||||
}
|
||||
}).catch(error => {
|
||||
logWarn(LogCategory.GENERAL, tr("Failed to renew TeaForo data. An error occurred: %o"), error);
|
||||
});
|
||||
}
|
||||
}, 24 * 60 * 60 * 1000);
|
||||
}
|
||||
});
|
||||
|
|
@ -364,7 +364,7 @@ export class Settings {
|
|||
static readonly KEY_I18N_DEFAULT_REPOSITORY: ValuedRegistryKey<string> = {
|
||||
key: "i18n.default_repository",
|
||||
valueType: "string",
|
||||
defaultValue: "i18n/"
|
||||
defaultValue: "https://web.teaspeak.de/i18n/"
|
||||
};
|
||||
|
||||
/* Default client states */
|
||||
|
|
@ -572,12 +572,6 @@ export class Settings {
|
|||
valueType: "boolean",
|
||||
};
|
||||
|
||||
static readonly KEY_TEAFORO_URL: ValuedRegistryKey<string> = {
|
||||
key: "teaforo_url",
|
||||
defaultValue: "https://forum.teaspeak.de/",
|
||||
valueType: "string",
|
||||
};
|
||||
|
||||
static readonly KEY_FONT_SIZE: ValuedRegistryKey<number> = {
|
||||
key: "font_size",
|
||||
valueType: "number",
|
||||
|
|
|
|||
|
|
@ -74,10 +74,6 @@ export class ClientProperties {
|
|||
client_output_muted: boolean = false;
|
||||
client_is_channel_commander: boolean = false;
|
||||
|
||||
client_teaforo_id: number = 0;
|
||||
client_teaforo_name: string = "";
|
||||
client_teaforo_flags: number = 0; /* 0x01 := Banned | 0x02 := Stuff | 0x04 := Premium */
|
||||
|
||||
|
||||
/* not updated in view! */
|
||||
client_month_bytes_uploaded: number = 0;
|
||||
|
|
|
|||
|
|
@ -83,9 +83,11 @@ $bot_thumbnail_height: 9em;
|
|||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
@include transition(opacity $button_hover_animation_time ease-in-out);
|
||||
|
||||
&:before, &:after {
|
||||
&:before,
|
||||
&:after {
|
||||
position: absolute;
|
||||
left: .25em;
|
||||
content: ' ';
|
||||
|
|
@ -126,6 +128,7 @@ $bot_thumbnail_height: 9em;
|
|||
&:hover {
|
||||
background-color: #393939;
|
||||
}
|
||||
|
||||
@include transition($button_hover_animation_time ease-in-out);
|
||||
}
|
||||
}
|
||||
|
|
@ -301,7 +304,8 @@ $bot_thumbnail_height: 9em;
|
|||
|
||||
&.list {
|
||||
>.icon_em {
|
||||
margin-top: 0; /* for lists the .1em patting on the top looks odd */
|
||||
margin-top: 0;
|
||||
/* for lists the .1em patting on the top looks odd */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -311,13 +315,15 @@ $bot_thumbnail_height: 9em;
|
|||
flex-shrink: 1;
|
||||
flex-grow: 1;
|
||||
|
||||
min-width: 4em; /* 2em for the icon the last 4 for the text */
|
||||
min-width: 4em;
|
||||
/* 2em for the icon the last 4 for the text */
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
|
||||
.title, .value {
|
||||
.title,
|
||||
.value {
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
|
|
@ -340,10 +346,12 @@ $bot_thumbnail_height: 9em;
|
|||
align-self: center;
|
||||
}
|
||||
|
||||
&.status, &.groups {
|
||||
&.status,
|
||||
&.groups {
|
||||
flex-direction: column;
|
||||
|
||||
.statusEntry, .groupEntry {
|
||||
.statusEntry,
|
||||
.groupEntry {
|
||||
.icon {
|
||||
vertical-align: text-top;
|
||||
}
|
||||
|
|
@ -366,12 +374,6 @@ $bot_thumbnail_height: 9em;
|
|||
justify-content: flex-end;
|
||||
}
|
||||
}
|
||||
|
||||
&.clientTeaforoAccount {
|
||||
a, a:visited {
|
||||
color: #d9d9d9;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -248,44 +248,6 @@ const ClientVolume = React.memo(() => {
|
|||
);
|
||||
});
|
||||
|
||||
const ClientForumAccount = React.memo(() => {
|
||||
const events = useContext(EventsContext);
|
||||
const client = useContext(ClientContext);
|
||||
const [ forum, setForum ] = useDependentState<ClientForumInfo>(() => {
|
||||
if(client.type !== "none") {
|
||||
events.fire("query_forum");
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}, [ client.contextHash ]);
|
||||
|
||||
events.reactUse("notify_forum", event => setForum(event.forum), undefined, []);
|
||||
|
||||
if(!forum) {
|
||||
return null;
|
||||
}
|
||||
|
||||
let text = forum.nickname;
|
||||
if((forum.flags & 0x01) > 0) {
|
||||
text += " (" + tr("Banned") + ")";
|
||||
}
|
||||
|
||||
if((forum.flags & 0x02) > 0) {
|
||||
text += " (" + tr("Stuff") + ")";
|
||||
}
|
||||
|
||||
if((forum.flags & 0x04) > 0) {
|
||||
text += " (" + tr("Premium") + ")";
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<InfoBlock clientIcon={ClientIcon.ClientInfoForumAccount} valueClass={cssStyle.clientTeaforoAccount}>
|
||||
<Translatable>TeaSpeak Forum account</Translatable>
|
||||
<a href={"https://forum.teaspeak.de/index.php?members/" + forum.userId} target={"_blank"}>{text}</a>
|
||||
</InfoBlock>
|
||||
);
|
||||
});
|
||||
|
||||
const ClientVersion = React.memo(() => {
|
||||
const events = useContext(EventsContext);
|
||||
|
|
@ -494,7 +456,6 @@ const ConnectedClientInfoBlock = () => {
|
|||
<React.Fragment key={"info"}>
|
||||
<ClientOnlineSince />
|
||||
<ClientCountry />
|
||||
<ClientForumAccount />
|
||||
<ClientVolume />
|
||||
<ClientVersion />
|
||||
<ClientStatus />
|
||||
|
|
|
|||
|
|
@ -147,31 +147,6 @@ function apply_basic_info(client: ClientEntry, tag: JQuery, modal: Modal, callba
|
|||
});
|
||||
}
|
||||
|
||||
/* TeaForo */
|
||||
{
|
||||
const container = tag.find(".property-teaforo .value").empty();
|
||||
|
||||
if (client.properties.client_teaforo_id) {
|
||||
container.children().remove();
|
||||
|
||||
let text = client.properties.client_teaforo_name;
|
||||
if ((client.properties.client_teaforo_flags & 0x01) > 0)
|
||||
text += " (" + tr("Banned") + ")";
|
||||
if ((client.properties.client_teaforo_flags & 0x02) > 0)
|
||||
text += " (" + tr("Stuff") + ")";
|
||||
if ((client.properties.client_teaforo_flags & 0x04) > 0)
|
||||
text += " (" + tr("Premium") + ")";
|
||||
|
||||
$.spawn("a")
|
||||
.attr("href", "https://forum.teaspeak.de/index.php?members/" + client.properties.client_teaforo_id)
|
||||
.attr("target", "_blank")
|
||||
.text(text)
|
||||
.appendTo(container);
|
||||
} else {
|
||||
container.append($.spawn("a").text(tr("Not connected")));
|
||||
}
|
||||
}
|
||||
|
||||
/* Version */
|
||||
{
|
||||
const container = tag.find(".property-version");
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import {manager, setSoundMasterVolume, Sound} from "tc-shared/audio/Sounds";
|
|||
import * as profiles from "tc-shared/profiles/ConnectionProfile";
|
||||
import { ConnectionProfile } from "tc-shared/profiles/ConnectionProfile";
|
||||
import { IdentitifyType } from "tc-shared/profiles/Identity";
|
||||
import {TeaForumIdentity} from "tc-shared/profiles/identities/TeaForumIdentity";
|
||||
import { TeaSpeakIdentity } from "tc-shared/profiles/identities/TeamSpeakIdentity";
|
||||
import { NameIdentity } from "tc-shared/profiles/identities/NameIdentity";
|
||||
import { LogCategory, logDebug, logError, logTrace, logWarn } from "tc-shared/log";
|
||||
|
|
@ -14,7 +13,6 @@ import * as i18n from "tc-shared/i18n/localize";
|
|||
import { RepositoryTranslation, TranslationRepository } from "tc-shared/i18n/localize";
|
||||
import { Registry } from "tc-shared/events";
|
||||
import * as i18nc from "../../i18n/CountryFlag";
|
||||
import * as forum from "tc-shared/profiles/identities/teaspeak-forum";
|
||||
import { formatMessage, set_icon_size } from "tc-shared/ui/frames/chat";
|
||||
import { spawnTeamSpeakIdentityImport, spawnTeamSpeakIdentityImprove } from "tc-shared/ui/modal/ModalIdentity";
|
||||
import { getAudioBackend, OutputDevice } from "tc-shared/audio/Player";
|
||||
|
|
@ -32,7 +30,7 @@ type ProfileInfoEvent = {
|
|||
id: string,
|
||||
name: string,
|
||||
nickname: string,
|
||||
identity_type: "teaforo" | "teamspeak" | "nickname",
|
||||
identity_type: "teamspeak" | "nickname",
|
||||
|
||||
identity_forum?: {
|
||||
valid: boolean,
|
||||
|
|
@ -71,7 +69,7 @@ export interface SettingProfileEvents {
|
|||
|
||||
"select-identity-type": {
|
||||
profile_id: string,
|
||||
identity_type: "teamspeak" | "teaforo" | "nickname" | "unset"
|
||||
identity_type: "teamspeak" | "nickname" | "unset"
|
||||
},
|
||||
|
||||
"query-profile-validity": { profile_id: string },
|
||||
|
|
@ -232,7 +230,6 @@ export function spawnSettingsModal(default_page?: string): Modal {
|
|||
settings_audio_speaker(modal.htmlTag.find(".right .container.audio-speaker"), modal);
|
||||
settings_audio_sounds(modal.htmlTag.find(".right .container.audio-sounds"), modal);
|
||||
const update_profiles = settings_identity_profiles(modal.htmlTag.find(".right .container.identity-profiles"), modal);
|
||||
settings_identity_forum(modal.htmlTag.find(".right .container.identity-forum"), modal, update_profiles as any);
|
||||
|
||||
modal.close_listener.push(() => {
|
||||
if (profiles.requires_save())
|
||||
|
|
@ -880,7 +877,6 @@ export namespace modal_settings {
|
|||
});
|
||||
|
||||
const build_profile_info = (profile: ConnectionProfile) => {
|
||||
const forum_data = profile.selectedIdentity(IdentitifyType.TEAFORO) as TeaForumIdentity;
|
||||
const teamspeak_data = profile.selectedIdentity(IdentitifyType.TEAMSPEAK) as TeaSpeakIdentity;
|
||||
const nickname_data = profile.selectedIdentity(IdentitifyType.NICKNAME) as NameIdentity;
|
||||
|
||||
|
|
@ -889,10 +885,6 @@ export namespace modal_settings {
|
|||
name: profile.profileName,
|
||||
nickname: profile.defaultUsername,
|
||||
identity_type: profile.selectedIdentityType as any,
|
||||
identity_forum: !forum_data ? undefined : {
|
||||
valid: forum_data.valid(),
|
||||
fallback_name: forum_data.fallback_name()
|
||||
},
|
||||
identity_nickname: !nickname_data ? undefined : {
|
||||
name: nickname_data.name(),
|
||||
fallback_name: nickname_data.fallback_name()
|
||||
|
|
@ -1465,7 +1457,6 @@ export namespace modal_settings {
|
|||
if (event.status === "success") {
|
||||
current_identity_type = event.info.identity_type;
|
||||
fallback_names["nickname"] = event.info.identity_nickname ? event.info.identity_nickname.fallback_name : undefined;
|
||||
fallback_names["teaforo"] = event.info.identity_forum ? event.info.identity_forum.fallback_name : undefined;
|
||||
fallback_names["teamspeak"] = event.info.identity_teamspeak ? event.info.identity_teamspeak.fallback_name : undefined;
|
||||
|
||||
last_name = event.info.nickname;
|
||||
|
|
@ -1722,37 +1713,6 @@ export namespace modal_settings {
|
|||
button_improve.on('click', event => event_registry.fire("improve-identity-teamspeak-level", { profile_id: current_profile }));
|
||||
}
|
||||
|
||||
/* special info TeaSpeak - Forum */
|
||||
{
|
||||
const container_settings = container.find(".container-teaforo");
|
||||
const container_valid = container_settings.find(".container-valid");
|
||||
const container_invalid = container_settings.find(".container-invalid");
|
||||
|
||||
const button_setup = container_settings.find(".button-setup");
|
||||
|
||||
event_registry.on("select-identity-type", event => {
|
||||
if (event.profile_id !== current_profile) return;
|
||||
|
||||
container_settings.toggle(event.identity_type === "teaforo");
|
||||
});
|
||||
|
||||
event_registry.on("query-profile", event => {
|
||||
container_valid.toggle(false);
|
||||
container_invalid.toggle(false);
|
||||
});
|
||||
|
||||
event_registry.on("query-profile-result", event => {
|
||||
if (event.profile_id !== current_profile) return;
|
||||
|
||||
const valid = event.status === "success" && event.info.identity_forum && event.info.identity_forum.valid;
|
||||
container_valid.toggle(!!valid);
|
||||
container_invalid.toggle(!valid);
|
||||
});
|
||||
|
||||
button_setup.on('click', event => event_registry.fire_react("setup-forum-connection"));
|
||||
button_setup.toggle(settings.forum_setuppable);
|
||||
}
|
||||
|
||||
/* special info nickname */
|
||||
{
|
||||
const container_settings = container.find(".container-nickname");
|
||||
|
|
@ -1927,117 +1887,3 @@ export namespace modal_settings {
|
|||
event_registry.fire("select-identity-type", { profile_id: "default", identity_type: undefined });
|
||||
}
|
||||
}
|
||||
|
||||
function settings_identity_forum(container: JQuery, modal: Modal, update_profiles: () => any) {
|
||||
const containers_connected = container.find(".show-connected");
|
||||
const containers_disconnected = container.find(".show-disconnected");
|
||||
|
||||
const update_state = () => {
|
||||
const logged_in = forum.logged_in();
|
||||
containers_connected.toggle(logged_in);
|
||||
containers_disconnected.toggle(!logged_in);
|
||||
|
||||
if (logged_in) {
|
||||
container.find(".forum-username").text(forum.data().name());
|
||||
container.find(".forum-premium").text(forum.data().is_premium() ? tr("Yes") : tr("No"));
|
||||
}
|
||||
};
|
||||
|
||||
/* login */
|
||||
{
|
||||
const button_login = container.find(".button-login");
|
||||
const input_username = container.find(".input-username");
|
||||
const input_password = container.find(".input-password");
|
||||
const container_error = container.find(".container-login .container-error");
|
||||
|
||||
const container_captcha_g = container.find(".g-recaptcha");
|
||||
let captcha: boolean | string = false;
|
||||
|
||||
const update_button_state = () => {
|
||||
let enabled = true;
|
||||
enabled = enabled && !!input_password.val();
|
||||
enabled = enabled && !!input_username.val();
|
||||
enabled = enabled && (typeof (captcha) === "boolean" ? !captcha : !!captcha);
|
||||
button_login.prop("disabled", !enabled);
|
||||
};
|
||||
|
||||
/* username */
|
||||
input_username.on('change keyup', update_button_state);
|
||||
|
||||
/* password */
|
||||
input_password.on('change keyup', update_button_state);
|
||||
|
||||
button_login.on('click', event => {
|
||||
input_username.prop("disabled", true);
|
||||
input_password.prop("disabled", true);
|
||||
button_login.prop("disabled", true);
|
||||
container_error.removeClass("shown");
|
||||
|
||||
forum.login(input_username.val() as string, input_password.val() as string, typeof (captcha) === "string" ? captcha : undefined).then(state => {
|
||||
captcha = false;
|
||||
|
||||
logTrace(LogCategory.GENERAL, tr("Forum login result: %o"), state);
|
||||
if (state.status === "success") {
|
||||
update_state();
|
||||
update_profiles();
|
||||
return;
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
if (!!state.error_message) /* clear password if we have an error */
|
||||
input_password.val("");
|
||||
input_password.focus();
|
||||
update_button_state();
|
||||
}, 0);
|
||||
if (state.status === "captcha") {
|
||||
//TODO Works currently only with localhost!
|
||||
button_login.hide();
|
||||
container_error.text(state.error_message || tr("Captcha required")).addClass("shown");
|
||||
|
||||
captcha = "";
|
||||
|
||||
logDebug(LogCategory.GENERAL, tr("Showing captcha for site-key: %o"), state.captcha.data);
|
||||
forum.gcaptcha.spawn(container_captcha_g, state.captcha.data, token => {
|
||||
captcha = token;
|
||||
logTrace(LogCategory.GENERAL, tr("Got captcha token: %o"), token);
|
||||
container_captcha_g.hide();
|
||||
button_login.show();
|
||||
update_button_state();
|
||||
}).catch(error => {
|
||||
logError(LogCategory.GENERAL, tr("Failed to initialize forum captcha: %o"), error);
|
||||
container_error.text("Failed to initialize GReCaptcha! No authentication possible.").addClass("shown");
|
||||
container_captcha_g.hide();
|
||||
button_login.hide();
|
||||
});
|
||||
container_captcha_g.show();
|
||||
} else {
|
||||
container_error.text(state.error_message || tr("Unknown error")).addClass("shown");
|
||||
}
|
||||
}).catch(error => {
|
||||
logError(LogCategory.GENERAL, tr("Failed to login within the forum. Error: %o"), error);
|
||||
createErrorModal(tr("Forum login failed."), tr("Forum login failed. Lookup the console for more information")).open();
|
||||
}).then(() => {
|
||||
input_username.prop("disabled", false);
|
||||
input_password.prop("disabled", false);
|
||||
update_button_state();
|
||||
});
|
||||
});
|
||||
update_button_state();
|
||||
}
|
||||
|
||||
/* logout */
|
||||
{
|
||||
container.find(".button-logout").on('click', event => {
|
||||
forum.logout().catch(error => {
|
||||
logError(LogCategory.IDENTITIES, tr("Failed to logout from forum: %o"), error);
|
||||
createErrorModal(tr("Forum logout failed"), formatMessage(tr("Failed to logout from forum account.{:br:}Error: {}"), error)).open();
|
||||
}).then(() => {
|
||||
if (modal.shown)
|
||||
update_state();
|
||||
update_profiles();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
update_state();
|
||||
}
|
||||
|
|
@ -61,8 +61,7 @@ class ConnectController {
|
|||
private validateNickname: boolean;
|
||||
private validateAddress: boolean;
|
||||
|
||||
constructor(uiVariables: UiVariableProvider<ConnectUiVariables>) {
|
||||
7
|
||||
constructor(uiVariables: UiVariableProvider<ConnectUiVariables>) {7
|
||||
this.uiEvents = new Registry<ConnectUiEvents>();
|
||||
this.uiEvents.enableDebug("modal-connect");
|
||||
|
||||
|
|
@ -72,7 +71,7 @@ class ConnectController {
|
|||
this.validateNickname = false;
|
||||
this.validateAddress = false;
|
||||
|
||||
this.defaultAddress = "tea.lp.kle.li";
|
||||
this.defaultAddress = "ts.teaspeak.de";
|
||||
this.historyShown = settings.getValue(Settings.KEY_CONNECT_SHOW_HISTORY);
|
||||
|
||||
this.currentAddress = settings.getValue(Settings.KEY_CONNECT_ADDRESS);
|
||||
|
|
|
|||
|
|
@ -2,8 +2,11 @@ import * as React from "react";
|
|||
import { useEffect, useRef, useState } from "react";
|
||||
import { Registry } from "tc-shared/events";
|
||||
|
||||
//import '!style-loader!css-loader!emoji-mart/css/emoji-mart.css'
|
||||
import { settings, Settings } from "tc-shared/settings";
|
||||
import { Translatable } from "tc-shared/ui/react-elements/i18n";
|
||||
import { getTwenmojiHashFromNativeEmoji } from "tc-shared/text/bbcode/EmojiUtil";
|
||||
import { useGlobalSetting } from "tc-shared/ui/react-elements/Helper";
|
||||
|
||||
import Picker from '@emoji-mart/react'
|
||||
import data from '@emoji-mart/data'
|
||||
|
|
@ -30,7 +33,19 @@ interface ChatBoxEvents {
|
|||
}
|
||||
|
||||
const LastUsedEmoji = () => {
|
||||
return <img key={"fallback"} alt={""} src={"img/smiley.png"} />;
|
||||
// const settingValue = useGlobalSetting(Settings.KEY_CHAT_LAST_USED_EMOJI);
|
||||
|
||||
// const lastEmoji: BaseEmoji = (emojiIndex.emojis[settingValue] || emojiIndex.emojis["joy"]) as any;
|
||||
// if (!lastEmoji?.native) {
|
||||
// return <img key={"fallback"} alt={""} src={"img/smiley-smile.svg"} />;
|
||||
// }
|
||||
|
||||
const le: Emoji = new Emoji({ id: 'smiley', set: 'native' })
|
||||
return le.component
|
||||
|
||||
// return (
|
||||
// <img draggable={false} src={"https://twemoji.maxcdn.com/v/12.1.2/72x72/" + getTwenmojiHashFromNativeEmoji(lastEmoji.native) + ".png"} alt={lastEmoji.native} className={cssStyle.emoji} />
|
||||
// )
|
||||
}
|
||||
|
||||
const EmojiButton = (props: { events: Registry<ChatBoxEvents> }) => {
|
||||
|
|
@ -62,6 +77,7 @@ const EmojiButton = (props: { events: Registry<ChatBoxEvents> }) => {
|
|||
props.events.reactUse("action_set_enabled", event => setEnabled(event.enabled));
|
||||
props.events.reactUse("action_submit_message", () => setShown(false));
|
||||
|
||||
|
||||
return (
|
||||
<div className={cssStyle.containerEmojis} ref={refContainer}>
|
||||
<div className={cssStyle.button} onClick={() => enabled && setShown(true)}>
|
||||
|
|
@ -69,6 +85,23 @@ const EmojiButton = (props: { events: Registry<ChatBoxEvents> }) => {
|
|||
</div>
|
||||
<div className={cssStyle.picker} style={{ display: shown ? undefined : "none" }}>
|
||||
{!shown ? undefined :
|
||||
// <Picker
|
||||
// key={"picker"}
|
||||
// set={"twitter"}
|
||||
// theme={"light"}
|
||||
// showPreview={true}
|
||||
// title={""}
|
||||
// showSkinTones={true}
|
||||
// useButton={false}
|
||||
// native={false}
|
||||
|
||||
// onSelect={(emoji: any) => {
|
||||
// if (enabled) {
|
||||
// settings.setValue(Settings.KEY_CHAT_LAST_USED_EMOJI, emoji.id as string);
|
||||
// props.events.fire("action_insert_text", { text: emoji.native, focus: true });
|
||||
// }
|
||||
// }}
|
||||
// />
|
||||
<Picker
|
||||
data={data}
|
||||
key={"picker"}
|
||||
|
|
@ -80,11 +113,11 @@ const EmojiButton = (props: { events: Registry<ChatBoxEvents> }) => {
|
|||
|
||||
onEmojiSelect={(emoji: any) => {
|
||||
if (enabled) {
|
||||
//settings.setValue(Settings.KEY_CHAT_LAST_USED_EMOJI, emoji.id as string);
|
||||
props.events.fire("action_insert_text", { text: emoji.native, focus: true });
|
||||
}
|
||||
}}
|
||||
/>
|
||||
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
},
|
||||
"include": [
|
||||
"webpack.config.ts",
|
||||
"webpack-client.config.ts",
|
||||
"webpack-web.config.ts",
|
||||
"webpack/build-definitions.d.ts",
|
||||
"webpack/HtmlWebpackInlineSource.ts",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
import * as path from "path";
|
||||
import * as config_base from "./webpack.config";
|
||||
|
||||
export = env => config_base.config(env, "client").then(config => {
|
||||
Object.assign(config.entry, {
|
||||
"main-app": ["./client/app/entry-points/AppMain.ts"],
|
||||
"modal-external": ["./client/app/entry-points/ModalWindow.ts"]
|
||||
});
|
||||
|
||||
Object.assign(config.resolve.alias, {
|
||||
"tc-shared": path.resolve(__dirname, "shared/js"),
|
||||
});
|
||||
|
||||
if(!Array.isArray(config.externals)) {
|
||||
throw "invalid config";
|
||||
}
|
||||
|
||||
config.externals.push(({ context, request }, callback) => {
|
||||
if (request.startsWith("tc-backend/")) {
|
||||
return callback(null, `window["backend-loader"].require("${request}")`);
|
||||
}
|
||||
|
||||
callback(undefined, undefined);
|
||||
});
|
||||
|
||||
return Promise.resolve(config);
|
||||
});
|
||||
Loading…
Reference in New Issue