.containerignore

@@ -1 +0,0 @@
-release/

.github/workflows/stale.yml

@@ -1,17 +0,0 @@
-name: 'Close stale issues'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v6
-        with:
-          stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
-          days-before-issue-stale: 150
-          days-before-issue-close: 14
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure'

Containerfile.debian

@@ -1,30 +0,0 @@
-ARG NODE_VERSION
-FROM node:${NODE_VERSION}
-
-RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
-    curl \
-    g++ \
-    gcc \
-    git \
-    jq \
-    libarchive-tools \
-    libsecret-1-dev \
-    libsqlcipher-dev \
-    libssl-dev \
-    make \
-    openssl \
-    pkg-config \
-    python \
-    tcl \
-    vim
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
-
-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup

Containerfile.fedora

@@ -1,20 +0,0 @@
-FROM fedora:latest
-
-RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
-
-# node setup
-ARG NODE_VERSION
-RUN mkdir -p /usr/local/n
-RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
-RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
-RUN bash n ${NODE_VERSION}
-RUN npm install -g n
-RUN npm install -g yarn
-RUN npm install -g node-gyp
-RUN gem install --ignore-dependencies --no-user-install --no-document fpm
-
-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup

Makefile

@@ -1,8 +1,6 @@
 .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
-.PHONY: container-build-debian container-build-fedora
-.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
 .PHONY: clean undo_setup fixup
 
 CFGDIR ?= configs/sc
@@ -10,8 +8,6 @@ CFGDIR ?= configs/sc
 all: web
 
 YARN ?= yarnpkg
-CONTAINER_ENGINE ?= podman
-NODE_VERSION ?= 16
 
 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
 WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
@@ -36,9 +32,6 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
 OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
 OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
 
-CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
-CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
-
 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
 
@@ -160,24 +153,6 @@ macos-mas-release: macos-mas
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
 
-container-build-debian:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-build-fedora:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-web-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
-
-container-debian-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
-
-container-rpm-release: container-build-fedora
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
-
-container-appimage-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
-
 bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
 	./build-bom.sh
 bom: bom.lock

configs/sc/config.json

@@ -1,11 +1,6 @@
 {
     "update_base_url": null,
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "https://matrix-client.matrix.org",
-            "server_name": "matrix.org"
-        }
-    },
+    "default_server_name": "matrix.org",
     "brand": "SchildiChat",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -16,13 +11,10 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "show_labs_settings": true,
-    "room_directory": {
+    "showLabsSettings": true,
+    "roomDirectory": {
         "servers": [
-            "matrix.org",
-            "gitter.im",
-            "libera.chat",
-            "schildi.chat"
+            "matrix.org"
         ]
     },
     "enable_presence_by_hs_url": {

deploy/update-flathub.sh

@@ -20,11 +20,8 @@ debdate=$(date +%Y-%m-%d -r $debpath)
 pushd "$repopath" > /dev/null
 
 git fetch
-git checkout master
 git reset --hard origin/master
 
-git checkout -B "release-v$version"
-
 yamlFile="chat.schildi.desktop.yaml"
 xmlFile="chat.schildi.desktop.metainfo.xml"
 
@@ -36,8 +33,8 @@ sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=
 git add $yamlFile $xmlFile
 git commit -m "Bump version to v$version"
 
-git push -f --set-upstream origin "release-v$version"
+git push
 
 popd > /dev/null
 
-echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
+echo "Release v$version published on flathub!"

element-desktop

@@ -1 +1 @@
-Subproject commit a8168fb79b04960843f66d4b1975229b693ce9e3
+Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461

element-web

@@ -1 +1 @@
-Subproject commit 14243333d9796685680117cd7f9e569af07941a7
+Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca

i18n-overlays/element-desktop/ja.json

@@ -1 +0,0 @@
-{}

i18n-overlays/element-web/ja.json

@@ -1 +0,0 @@
-{}

i18n-overlays/matrix-react-sdk/ja.json

@@ -1,3 +0,0 @@
-{
-    "Normal priority": "常優先度"
-}

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 7158a99a1caf5cf9d780b19f1829a1257c8a5df3
+Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit a29fbec8465ed803e44c386395bf81945b417175
+Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b