From 2d7a4b591c26251700bf02a3f336f522840cb880 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Mon, 14 Nov 2022 20:31:41 +0000 Subject: [PATCH 01/18] bump version --- .corenode | 2 +- package.json | 2 +- packages/app/package.json | 2 +- packages/server/package.json | 2 +- packages/wrapper/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.corenode b/.corenode index e6a93254..d2a426b7 100755 --- a/.corenode +++ b/.corenode @@ -1,3 +1,3 @@ { - "version": "0.29.2" + "version": "0.29.3" } diff --git a/package.json b/package.json index 61fef71b..399afb15 100755 --- a/package.json +++ b/package.json @@ -22,5 +22,5 @@ "devDependencies": { "concurrently": "^7.5.0" }, - "version": "0.29.2" + "version": "0.29.3" } diff --git a/packages/app/package.json b/packages/app/package.json index 01ab7c49..c52c70ab 100755 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "comty", - "version": "0.29.2", + "version": "0.29.3", "license": "LGPL-2.1", "main": "electron/main", "author": "RageStudio", diff --git a/packages/server/package.json b/packages/server/package.json index c96d8ad7..f93c3869 100755 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@comty/server", - "version": "0.29.2", + "version": "0.29.3", "main": "dist/index.js", "scripts": { "build": "corenode-cli build", diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json index aab034b6..d6ed6e95 100755 --- a/packages/wrapper/package.json +++ b/packages/wrapper/package.json @@ -1,6 +1,6 @@ { "name": "wrapper", - "version": "0.29.2", + "version": "0.29.3", "main": "./src/index.js", "license": "MIT", "scripts": { From d18a9b3762c15f604be50d8d3d91ce4f796217bb Mon Sep 17 00:00:00 2001 From: srgooglo Date: Tue, 15 Nov 2022 15:58:33 +0000 Subject: [PATCH 02/18] use workers for transmuxing flv --- packages/app/src/pages/live/[key].jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/app/src/pages/live/[key].jsx b/packages/app/src/pages/live/[key].jsx index 5541cb75..59dfc801 100755 --- a/packages/app/src/pages/live/[key].jsx +++ b/packages/app/src/pages/live/[key].jsx @@ -45,6 +45,7 @@ export default class StreamViewer extends React.Component { const decoderInstance = mpegts.createPlayer({ type: "flv", isLive: true, + enableWorker: true, url: source }) From 88d515dd768763625c6faa73a710a7fb67de7cfe Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 18 Nov 2022 18:44:42 +0000 Subject: [PATCH 03/18] install some packages to improve docker building --- packages/server/Dockerfile | 3 +++ packages/wrapper/Dockerfile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index 5933f785..e38b7bf5 100755 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -1,5 +1,7 @@ FROM node:16-bullseye +RUN apt update +RUN apt install python -y RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app WORKDIR /home/node/app @@ -13,5 +15,6 @@ COPY --chown=node:node . . RUN chmod -R 777 /home/node/app RUN npm install RUN npm run build +RUN npm rebuild @tensorflow/tfjs-node --build-from-source CMD ["node", "/home/node/app/dist/index.js"] \ No newline at end of file diff --git a/packages/wrapper/Dockerfile b/packages/wrapper/Dockerfile index 4f219075..daade6d9 100755 --- a/packages/wrapper/Dockerfile +++ b/packages/wrapper/Dockerfile @@ -1,5 +1,8 @@ FROM node:16-bullseye-slim +RUN apt update +RUN apt install build-essential -y +RUN apt install python3 -y RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app WORKDIR /home/node/app From d6e19410d023b1bf30babe52fdcd65d0729c1ddf Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:56:13 +0000 Subject: [PATCH 04/18] added `sidebar.floating` setting --- packages/app/constants/defaultSettings.json | 1 + packages/app/constants/settings/apparence/index.jsx | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/packages/app/constants/defaultSettings.json b/packages/app/constants/defaultSettings.json index 01c80cd2..291e27d4 100755 --- a/packages/app/constants/defaultSettings.json +++ b/packages/app/constants/defaultSettings.json @@ -15,6 +15,7 @@ "postCard_expansible_actions": true, "feed_max_fetch": 20, "style.compactMode": false, + "sidebar.floating": false, "language": "en", "sidebarKeys": [ "home", diff --git a/packages/app/constants/settings/apparence/index.jsx b/packages/app/constants/settings/apparence/index.jsx index 1930e996..a9b50ff1 100755 --- a/packages/app/constants/settings/apparence/index.jsx +++ b/packages/app/constants/settings/apparence/index.jsx @@ -16,6 +16,16 @@ export default [ "experimental": true, "storaged": true }, + { + "id": "sidebar.floating", + "title": "Floating Sidebar", + "description": "Make the sidebar floats over layout content.", + "component": "Switch", + "icon": "MdOutlineLastPage", + "group": "layout", + "emitEvent": "layout.forceUpdate", + "storaged": true + }, { "id": "reduceAnimations", "storaged": true, From f38aa4530d82e45f265b78954dfa3ecbab8d9fb2 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:56:24 +0000 Subject: [PATCH 05/18] fix font-size --- .../app/src/components/PostCard/components/header/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/app/src/components/PostCard/components/header/index.less b/packages/app/src/components/PostCard/components/header/index.less index f6ea2969..b95e579c 100755 --- a/packages/app/src/components/PostCard/components/header/index.less +++ b/packages/app/src/components/PostCard/components/header/index.less @@ -49,6 +49,7 @@ margin: 0; font-family: "DM Mono", monospace; align-self: start; + font-size: 1rem; cursor: pointer; } From 46f0fc058cc781161b9f67570363f9c44d15b136 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:56:42 +0000 Subject: [PATCH 06/18] added `layout.forceUpdate` event --- packages/app/src/layout.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/app/src/layout.jsx b/packages/app/src/layout.jsx index b43ba3f6..952b977a 100755 --- a/packages/app/src/layout.jsx +++ b/packages/app/src/layout.jsx @@ -25,6 +25,9 @@ export default class Layout extends React.PureComponent { "app.initialization.finish": () => { app.eventBus.emit("layout.render.unlock") }, + "layout.forceUpdate": () => { + this.forceUpdate() + }, "layout.render.lock": () => { this.setState({ renderLock: true, From d793df1d40eaa4b052b80b18ad439a64a4dad05a Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:56:56 +0000 Subject: [PATCH 07/18] added `floating` mode --- packages/app/src/components/Layout/sidebar/index.jsx | 1 + packages/app/src/components/Layout/sidebar/index.less | 4 ++++ packages/app/src/components/Layout/sidedrawer/index.jsx | 7 ++++++- packages/app/src/components/Layout/sidedrawer/index.less | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/app/src/components/Layout/sidebar/index.jsx b/packages/app/src/components/Layout/sidebar/index.jsx index 21a73d15..449cf49c 100755 --- a/packages/app/src/components/Layout/sidebar/index.jsx +++ b/packages/app/src/components/Layout/sidebar/index.jsx @@ -227,6 +227,7 @@ export default class Sidebar extends React.Component { classnames( "app_sidebar", { + ["floating"]: window.app?.settings.get("sidebar.floating"), ["collapsed"]: this.state.visible && this.state.collapsed, ["elevated"]: this.state.visible && this.state.elevated, ["hidden"]: !this.state.visible, diff --git a/packages/app/src/components/Layout/sidebar/index.less b/packages/app/src/components/Layout/sidebar/index.less index 05a4518e..b81306b2 100755 --- a/packages/app/src/components/Layout/sidebar/index.less +++ b/packages/app/src/components/Layout/sidebar/index.less @@ -25,6 +25,10 @@ border-radius: 0 @app_sidebar_borderRadius @app_sidebar_borderRadius 0; border: 1px solid var(--sidebar-background-color); + &.floating { + position: absolute; + } + &.collapsed { width: 80px; min-width: 80px; diff --git a/packages/app/src/components/Layout/sidedrawer/index.jsx b/packages/app/src/components/Layout/sidedrawer/index.jsx index 1285ac7c..da85c3d5 100755 --- a/packages/app/src/components/Layout/sidedrawer/index.jsx +++ b/packages/app/src/components/Layout/sidedrawer/index.jsx @@ -224,7 +224,12 @@ export default class SidedrawerController extends React.Component { render() { return
{this.state.drawers}
diff --git a/packages/app/src/components/Layout/sidedrawer/index.less b/packages/app/src/components/Layout/sidedrawer/index.less index 88528d52..fe5c5153 100755 --- a/packages/app/src/components/Layout/sidedrawer/index.less +++ b/packages/app/src/components/Layout/sidedrawer/index.less @@ -3,6 +3,12 @@ .sidedrawers-wrapper { display: flex; flex-direction: row; + + &.floating-sidebar { + z-index: 950; + position: absolute; + margin-left: @app_sidebar_collapsed_width; + } .sidedrawer { position: relative; From 89996f155ea847ab005f6cd1a577764722b71c8c Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:57:21 +0000 Subject: [PATCH 08/18] implement `sidebar.floating` --- packages/app/src/layouts/default/index.jsx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/app/src/layouts/default/index.jsx b/packages/app/src/layouts/default/index.jsx index 0bf7866d..b562a4be 100755 --- a/packages/app/src/layouts/default/index.jsx +++ b/packages/app/src/layouts/default/index.jsx @@ -12,13 +12,18 @@ export default (props) => { - - -
- {React.cloneElement(props.children, props)} -
- - + +
+ {React.cloneElement(props.children, props)} +
+ -} +} \ No newline at end of file From 85a2c6738824e3eb5efc59313a10d091b6e1fbdb Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:57:25 +0000 Subject: [PATCH 09/18] update theme --- packages/app/src/theme/index.less | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/app/src/theme/index.less b/packages/app/src/theme/index.less index e917bed7..45f4aacd 100755 --- a/packages/app/src/theme/index.less +++ b/packages/app/src/theme/index.less @@ -160,30 +160,29 @@ html { } } -.ant-layout, .content_layout { - width: 100%; - height: 100%; - max-height: 100vh; - - background-color: transparent; -} - -.layout_page { position: relative; -webkit-overflow-scrolling: touch; - + height: 100%; + width: 100%; + max-height: 100vh; padding: 10px; - + overflow-x: hidden; overflow-y: overlay; - + transition: all 150ms ease-in-out; margin: var(--layoutMargin); padding: var(--layoutPadding); + + background-color: transparent; + + &.floating-sidebar { + margin-left: @app_sidebar_collapsed_width; + } } .app_background_decorator { From ba364c717eff95e3c6aec06c5aa870288811b36a Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 04:58:47 +0000 Subject: [PATCH 10/18] added `app.reload` event --- packages/app/src/App.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx index e1424da1..106c9b41 100755 --- a/packages/app/src/App.jsx +++ b/packages/app/src/App.jsx @@ -123,6 +123,9 @@ class App extends React.Component { window.electron.ipcRenderer.invoke("app.minimize") } }, + "app.reload": () => { + window.location.reload() + }, "app.openSearcher": () => { App.publicMethods.openSearcher() }, From 7abe3049bd5cb0f81f988a93836fe8679747bc3e Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 05:05:11 +0000 Subject: [PATCH 11/18] added `app.softReload` event --- packages/app/src/App.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx index 106c9b41..2ee176f9 100755 --- a/packages/app/src/App.jsx +++ b/packages/app/src/App.jsx @@ -126,6 +126,12 @@ class App extends React.Component { "app.reload": () => { window.location.reload() }, + "app.softReload": () => { + this.forceUpdate() + + app.eventBus.emit("layout.forceUpdate") + app.eventBus.emit("router.forceUpdate") + }, "app.openSearcher": () => { App.publicMethods.openSearcher() }, From c789dfdda9d0f122d589d0dbf387178ad9982eb5 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 05:05:34 +0000 Subject: [PATCH 12/18] emit `app.softReload` on `sidebar.floating` change --- packages/app/constants/settings/apparence/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/constants/settings/apparence/index.jsx b/packages/app/constants/settings/apparence/index.jsx index a9b50ff1..e9a67dd0 100755 --- a/packages/app/constants/settings/apparence/index.jsx +++ b/packages/app/constants/settings/apparence/index.jsx @@ -23,7 +23,7 @@ export default [ "component": "Switch", "icon": "MdOutlineLastPage", "group": "layout", - "emitEvent": "layout.forceUpdate", + "emitEvent": "app.softReload", "storaged": true }, { From a051f41f286449fb7996115578fa79d03c52c735 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 05:05:51 +0000 Subject: [PATCH 13/18] fix `dispatchUpdate` event emitter behavior --- packages/app/src/components/Settings/index.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app/src/components/Settings/index.jsx b/packages/app/src/components/Settings/index.jsx index a14c7f41..63ff4c49 100755 --- a/packages/app/src/components/Settings/index.jsx +++ b/packages/app/src/components/Settings/index.jsx @@ -91,6 +91,10 @@ const SettingItem = (props) => { } } + if (item.storaged) { + await window.app.settings.set(item.id, updateValue) + } + if (typeof item.emitEvent === "string") { let emissionPayload = updateValue @@ -105,10 +109,6 @@ const SettingItem = (props) => { return false } - if (item.storaged) { - await window.app.settings.set(item.id, updateValue) - } - if (item.debounced) { setDelayedValue(null) } From 429584a322866f295f9ebc782eea295b1288586a Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 19 Nov 2022 05:09:49 +0000 Subject: [PATCH 14/18] bump version --- .corenode | 2 +- package.json | 2 +- packages/app/package.json | 2 +- packages/server/package.json | 2 +- packages/wrapper/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.corenode b/.corenode index d2a426b7..f4701ce0 100755 --- a/.corenode +++ b/.corenode @@ -1,3 +1,3 @@ { - "version": "0.29.3" + "version": "0.30.0" } diff --git a/package.json b/package.json index 399afb15..14a568dc 100755 --- a/package.json +++ b/package.json @@ -22,5 +22,5 @@ "devDependencies": { "concurrently": "^7.5.0" }, - "version": "0.29.3" + "version": "0.30.0" } diff --git a/packages/app/package.json b/packages/app/package.json index c52c70ab..ee004cd4 100755 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "comty", - "version": "0.29.3", + "version": "0.30.0", "license": "LGPL-2.1", "main": "electron/main", "author": "RageStudio", diff --git a/packages/server/package.json b/packages/server/package.json index f93c3869..2621241b 100755 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@comty/server", - "version": "0.29.3", + "version": "0.30.0", "main": "dist/index.js", "scripts": { "build": "corenode-cli build", diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json index d6ed6e95..57444e55 100755 --- a/packages/wrapper/package.json +++ b/packages/wrapper/package.json @@ -1,6 +1,6 @@ { "name": "wrapper", - "version": "0.29.3", + "version": "0.30.0", "main": "./src/index.js", "license": "MIT", "scripts": { From 53b5b37a268da86840730403959e7235079dec55 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Mon, 21 Nov 2022 12:00:41 +0000 Subject: [PATCH 15/18] added `deleteInternalStorage` util --- .../app/src/utils/deleteInternalStorage/index.js | 15 +++++++++++++++ packages/app/src/utils/index.js | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/app/src/utils/deleteInternalStorage/index.js diff --git a/packages/app/src/utils/deleteInternalStorage/index.js b/packages/app/src/utils/deleteInternalStorage/index.js new file mode 100644 index 00000000..51f4c4f6 --- /dev/null +++ b/packages/app/src/utils/deleteInternalStorage/index.js @@ -0,0 +1,15 @@ +import cookies from "js-cookie" + +export default () => { + window.localStorage.clear() + window.sessionStorage.clear() + + // delete all cookies + const allCookies = cookies.get() + + for (const cookieName in allCookies) { + cookies.remove(cookieName) + } + + location.reload() +} \ No newline at end of file diff --git a/packages/app/src/utils/index.js b/packages/app/src/utils/index.js index 9516229b..1d545630 100755 --- a/packages/app/src/utils/index.js +++ b/packages/app/src/utils/index.js @@ -3,4 +3,5 @@ export { default as findChildById } from "./findChildById" export { default as cursorPosition } from "./cursorPosition" export { default as getBase64 } from "./getBase64" export { default as Haptics } from "./haptics" -export { default as processString } from "./processString" \ No newline at end of file +export { default as processString } from "./processString" +export { default as deleteInternalStorage } from "./deleteInternalStorage" \ No newline at end of file From 096237a9ada2786f81c54c5593293c778d74ab79 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Mon, 21 Nov 2022 12:01:46 +0000 Subject: [PATCH 16/18] added `app.clearInternalStorage` event --- packages/app/src/App.jsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx index 2ee176f9..ebb3059b 100755 --- a/packages/app/src/App.jsx +++ b/packages/app/src/App.jsx @@ -58,6 +58,7 @@ import { Translation } from "react-i18next" import { Session, User } from "models" import config from "config" +import * as Utils from "./utils" import { NotFound, RenderError, Crash, Settings, Navigation, Login, UserRegister, Creator, Searcher, NotificationsCenter } from "components" import { DOMWindow } from "components/RenderWindow" @@ -165,6 +166,15 @@ class App extends React.Component { }) } }, + "app.clearInternalStorage": async () => { + antd.Modal.confirm({ + title: "Clear internal storage", + content: "Are you sure you want to clear all internal storage? This will remove all your data from the app, including your session.", + onOk: async () => { + Utils.deleteInternalStorage() + } + }) + }, "session.logout": async () => { await this.sessionController.logout() }, From 1ec929d38798eeea20daa2de63909a6c98154733 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Mon, 21 Nov 2022 12:01:59 +0000 Subject: [PATCH 17/18] added `clear_internal_storage` setting --- packages/app/constants/settings/app/index.jsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/app/constants/settings/app/index.jsx b/packages/app/constants/settings/app/index.jsx index 8297f059..abf36375 100755 --- a/packages/app/constants/settings/app/index.jsx +++ b/packages/app/constants/settings/app/index.jsx @@ -58,6 +58,16 @@ export default [ } } }, + { + "id": "clear_internal_storage", + "storaged": false, + "group": "general", + "component": "Button", + "icon": "MdDelete", + "title": "Clear internal storage", + "description": "Clear all the data stored in the internal storage, including your current session. It will not affect the data stored in the cloud.", + "emitEvent": "app.clearInternalStorage" + }, { "id": "notifications_sound", "storaged": true, From 698635404fc217d1dd5a18e532a907897272db9e Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Mon, 21 Nov 2022 13:33:53 +0000 Subject: [PATCH 18/18] fix fullpost width --- packages/app/src/pages/post/index.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/app/src/pages/post/index.less b/packages/app/src/pages/post/index.less index 4d3a6f76..513ca02d 100755 --- a/packages/app/src/pages/post/index.less +++ b/packages/app/src/pages/post/index.less @@ -10,18 +10,18 @@ .postWrapper { margin: 0 10px; - width: 100%; height: 100%; + width: 70vw; + min-width: 70vw; max-width: 70vw; } .commentsWrapper { - max-width: 400px; - min-width: 300px; - - width: 100%; height: 100vh; + width: 100%; + + min-width: 300px; overflow: scroll;