summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaindropsSys <raindrops@equestria.dev>2024-03-11 23:18:09 +0100
committerRaindropsSys <raindrops@equestria.dev>2024-03-11 23:18:09 +0100
commit769e4a00ec80f5333cfdf063cbc45d09a9c91c1a (patch)
tree752ce81e09ffb2a40f8f78d15b96239bb3f83359
parent419a825a5e8b232d382079f237868fc24d06f7bb (diff)
downloadchatroom-769e4a00ec80f5333cfdf063cbc45d09a9c91c1a.tar.gz
chatroom-769e4a00ec80f5333cfdf063cbc45d09a9c91c1a.tar.bz2
chatroom-769e4a00ec80f5333cfdf063cbc45d09a9c91c1a.zip
Updated 5 files (automated)
-rw-r--r--.idea/discord.xml5
-rwxr-xr-xbuild.js8
-rw-r--r--client/fragments/home.html9
-rw-r--r--client/index.html32
-rwxr-xr-xclient/main.js10
5 files changed, 25 insertions, 39 deletions
diff --git a/.idea/discord.xml b/.idea/discord.xml
index d8e9561..3aef922 100644
--- a/.idea/discord.xml
+++ b/.idea/discord.xml
@@ -3,5 +3,10 @@
<component name="DiscordProjectSettings">
<option name="show" value="PROJECT_FILES" />
<option name="description" value="" />
+ <option name="theme" value="material" />
+ <option name="button1Title" value="" />
+ <option name="button1Url" value="" />
+ <option name="button2Title" value="" />
+ <option name="button2Url" value="" />
</component>
</project> \ No newline at end of file
diff --git a/build.js b/build.js
index 9a3551d..522e3d5 100755
--- a/build.js
+++ b/build.js
@@ -69,12 +69,12 @@ for (let item of list) {
fs.writeFileSync("build/client.lctpk", zlib.brotliCompressSync(JSON.stringify(pack)));
-child_process.execSync("scp build/client.lctpk bridlewood:/opt/localchat/update/client.stable.lctpk", { stdio: "inherit" });
-child_process.execSync("scp build/client.lctpk bridlewood:/opt/localchat/update/client.beta.lctpk", { stdio: "inherit" });
-child_process.execSync("scp build/client.lctpk bridlewood:/opt/localchat/update/client.lctpk", { stdio: "inherit" });
+child_process.execSync("scp build/client.lctpk watson:/opt/localchat/update/client.stable.lctpk", { stdio: "inherit" });
+child_process.execSync("scp build/client.lctpk watson:/opt/localchat/update/client.beta.lctpk", { stdio: "inherit" });
+child_process.execSync("scp build/client.lctpk watson:/opt/localchat/update/client.lctpk", { stdio: "inherit" });
if (process.argv[2] === "launcher") {
child_process.execSync("npx electron-packager . Chatroom --ignore build --ignore scripts --overwrite --icon icon.icns --platform=darwin --arch=arm64 --out=../../build/client", { cwd: "./launcher/client", stdio: "inherit" })
child_process.execSync("npx electron-packager . Chatroom --ignore build --ignore scripts --overwrite --icon icon.icns --platform=win32 --arch=x64 --out=../../build/client", { cwd: "./launcher/client", stdio: "inherit" })
child_process.execSync("npx electron-packager . Chatroom --ignore build --ignore scripts --overwrite --icon icon.png --platform=linux --arch=x64 --out=../../build/client", { cwd: "./launcher/client", stdio: "inherit" })
-} \ No newline at end of file
+}
diff --git a/client/fragments/home.html b/client/fragments/home.html
index 2960104..d1bfb1d 100644
--- a/client/fragments/home.html
+++ b/client/fragments/home.html
@@ -30,6 +30,13 @@
<h3>What's new in Chatroom?</h3>
+ <h5>Chatroom 2.7.1</h5>
+ <ul>
+ <li>On macOS, the "bounce" effect is now working</li>
+ <li>Very early and experimental support for Chrome extensions have been added</li>
+ <li>Autoplay is now disabled by default (as it is in other browsers)</li>
+ <li>Web SQL being deprecated in Chromium, it is now disabled by default in Chatroom</li>
+ </ul>
<h5>Chatroom 2.7.0</h5>
<ul>
@@ -88,4 +95,4 @@
</div>
</main>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/client/index.html b/client/index.html
index b82e89d..e80437c 100644
--- a/client/index.html
+++ b/client/index.html
@@ -472,36 +472,6 @@
tabs[0].fixed = false;
}
- function fancyBits(i) {
- if (i < 1000) {
- return i + " bits";
- } else if (i < 1000000) {
- return (i / 1000).toFixed(1) + " kbits";
- } else if (i < 1000000000) {
- return (i / 1000000).toFixed(1) + " Mbits";
- } else if (i < 1000000000000) {
- return (i / 1000000000).toFixed(1) + " Gbits";
- } else {
- return (i / 1000000000000).toFixed(1) + " Tbits";
- }
- }
-
- function fancyBitBytes(i) {
- i = i / 8;
-
- if (i < 1024) {
- return i + " B";
- } else if (i < 1024**2) {
- return (i / 1024).toFixed(1) + " KiB";
- } else if (i < 1024**3) {
- return (i / 1024**2).toFixed(1) + " MiB";
- } else if (i < 1024**4) {
- return (i / 1024**3).toFixed(1) + " GiB";
- } else {
- return (i / 1024**4).toFixed(1) + " TiB";
- }
- }
-
async function getToken() {
let token;
@@ -516,4 +486,4 @@
}
</script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/client/main.js b/client/main.js
index 0e9f8e3..3b4c8de 100755
--- a/client/main.js
+++ b/client/main.js
@@ -2,7 +2,7 @@
const buildNumber = "main";
// --- >FINAL< @BUILDNUMBER@ >FINAL< --- //
-const version = "2.7.0";
+const version = "2.7.1";
const { protocol, app, BrowserWindow, webContents, globalShortcut, nativeTheme, ipcMain, session, dialog, Menu } = require('electron');
const os = require("os");
@@ -120,7 +120,11 @@ const createWindow = () => {
nodeIntegration: true,
contextIsolation: false,
additionalArguments: "--user-data-dir=\"" + localchatDataRoot + "/client" + "\"",
- webviewTag: true
+ webviewTag: true,
+ plugins: true,
+ scrollBounce: true,
+ autoplayPolicy: "document-user-activation-required",
+ enableWebSQL: false
}
});
@@ -501,4 +505,4 @@ ipcMain.on('menu', (_, params) => {
y: params.y,
sourceType: params.menuSourceType
});
-}); \ No newline at end of file
+});