From 5c5d94b5f6f7a5daa665cef2cafae5764e32ddae Mon Sep 17 00:00:00 2001 From: MrLetsplay2003 Date: Fri, 17 Jan 2025 12:59:35 +0100 Subject: [PATCH] Add cringe config, Updte Dockerfile + dependencies --- cringeconf/config.json | 55 ++++++++++++++++++++++++++++++++++++++++++ dockerbuild/Dockerfile | 6 +++-- package.json | 3 +++ yarn.lock | 23 ++++++++++++++++++ 4 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 cringeconf/config.json diff --git a/cringeconf/config.json b/cringeconf/config.json new file mode 100644 index 0000000..b571ffc --- /dev/null +++ b/cringeconf/config.json @@ -0,0 +1,55 @@ +{ + "default_server_config": { + "m.homeserver": { + "base_url": "https://cringe-studios.com:8448", + "server_name": "cringe-studios.com" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, + "disable_custom_urls": false, + "disable_guests": false, + "disable_login_language_selector": false, + "disable_3pid_login": false, + "brand": "Cringe Studios Sekur Chat", + "integrations_ui_url": "https://scalar.vector.im/", + "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", + "https://scalar-staging.riot.im/scalar/api" + ], + "bug_report_endpoint_url": "https://element.io/bugreports/submit", + "uisi_autorageshake_app": "element-auto-uisi", + "default_country_code": "GB", + "show_labs_settings": true, + "features": { + "feature_pinning": true, + "feature_element_call_video_rooms": true, + "feature_video_rooms": true + }, + "default_federate": true, + "default_theme": "light", + "room_directory": { + "servers": ["cringe-studios.com"] + }, + "enable_presence_by_hs_url": { + }, + "setting_defaults": { + "breadcrumbs": true + }, + "jitsi": { + "preferred_domain": "meet.element.io" + }, + "element_call": { + "url": "https://call.cringe-studios.com", + "participant_limit": 8, + "brand": "Cringe Studios Sekur Call", + "use_exclusively": true + }, + "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx", + "default_theme": "dark" +} diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile index 398c148..6960742 100644 --- a/dockerbuild/Dockerfile +++ b/dockerbuild/Dockerfile @@ -12,16 +12,18 @@ RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \ # libsecret-1-dev is required even for prebuild keytar libsecret-1-dev \ # Used by seshat (when not SQLCIPHER_STATIC) \ - libsqlcipher-dev && \ + libsqlcipher-dev \ + rpm flatpak flatpak-builder && \ apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/* RUN ln -s /usr/bin/python3 /usr/bin/python & ln -s /usr/bin/pip3 /usr/bin/pip ENV DEBUG_COLORS true ENV FORCE_COLOR true +ENV SQLCIPHER_BUNDLED 1 WORKDIR /project -ENV NODE_VERSION 20.15.1 +ENV NODE_VERSION 22.9.0 ARG TARGETOS ARG TARGETARCH COPY setup.sh /setup.sh diff --git a/package.json b/package.json index d06bd5a..53e9860 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,13 @@ "@sentry/electron": "^5.0.0", "auto-launch": "^5.0.5", "counterpart": "^0.18.6", + "electron-build-env": "^0.2.0", "electron-clear-data": "^1.0.5", "electron-store": "^10.0.0", "electron-window-state": "^5.0.3", + "matrix-seshat": "^4.0.0", "minimist": "^1.2.6", + "neon": "^2.0.0", "png-to-ico": "^2.1.1", "uuid": "^11.0.0" }, diff --git a/yarn.lock b/yarn.lock index 3696774..e077aa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3216,6 +3216,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^2.9.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" @@ -3572,6 +3577,14 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" +electron-build-env@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/electron-build-env/-/electron-build-env-0.2.0.tgz#5649ee3e5fd006e267086caa945b77a1fa220b92" + integrity sha512-L431TbXtXe6iw3ko7ITr/qCu+jumVKLAhCDyhqfab6421LGlawVcT88Ws/DHR57+1lkLN1POQqwNOkjPwQJQmQ== + dependencies: + commander "^2.9.0" + mkdirp "^0.5.1" + electron-builder-squirrel-windows@25.1.8: version "25.1.8" resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-25.1.8.tgz#bc42f8da3aaa79007f9aec38d08798e1e83366fe" @@ -5468,6 +5481,11 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" +matrix-seshat@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/matrix-seshat/-/matrix-seshat-4.0.0.tgz#8a11186ccaaa6c58b44f8e761cc0c29728a980c3" + integrity sha512-iZ2ST+9NyAgWFV46OgBse+SlTtQsIlLuDjJcJxI88RhJr4zCzXXXcddGa4S59LDozTDwsGcQjXhSj1ktFc0g3Q== + matrix-web-i18n@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.3.0.tgz#a9f9d87d18ef96f75171883abbf201952cbfbe22" @@ -5725,6 +5743,11 @@ negotiator@^1.0.0: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== +neon@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/neon/-/neon-2.0.0.tgz#eb70092c57fb03e2201c3682aed5b54ab9ed1316" + integrity sha512-maODYM+0IkYDPOD0VAuptjrAXowLAPLpRuBdTroj29ZpQWwtwehXAI6nQvb4+10qipE0ZwweVv2F0tuQvpIVFA== + node-abi@^3.45.0: version "3.71.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038"