New release v1.7.16

Close #24

.gitignore

@@ -1 +1,2 @@
 release.mk
+/release

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "matrix-js-sdk"]
 	path = matrix-js-sdk
-	url = https://github.com/SpiritCroc/matrix-js-sdk.git
+	url = https://github.com/SchildiChat/matrix-js-sdk.git
 [submodule "matrix-react-sdk"]
 	path = matrix-react-sdk
-	url = https://github.com/SpiritCroc/matrix-react-sdk.git
+	url = https://github.com/SchildiChat/matrix-react-sdk.git
 [submodule "element-web"]
 	path = element-web
-	url = https://github.com/SpiritCroc/element-web.git
+	url = https://github.com/SchildiChat/element-web.git
 [submodule "element-desktop"]
 	path = element-desktop
-	url = https://github.com/SpiritCroc/element-desktop.git
+	url = https://github.com/SchildiChat/element-desktop.git

Makefile

@@ -1,18 +1,47 @@
-.PHONY: all web desktop desktop-common linux windows clean
+.PHONY: all setup web desktop desktop-common linux windows windows-portable
+.PHONY: web-release debian-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release release
+.PHONY: clean
 
 CFGDIR ?= configs/sc
 
-all: desktop
+all: release
 
 YARN ?= yarnpkg
 
+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|')
+DESKTOP_APP_NAME :=  $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
+PRODUCT_NAME :=  $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
+
+WEB_OUT := element-web/dist
+WEB_OUT_DIST_VERSION := $(VERSION)
+OUT_WEB := $(WEB_OUT)/$(WEB_APP_NAME)-$(WEB_OUT_DIST_VERSION).tar.gz
+
+DESKTOP_OUT := element-desktop/dist
+OUT_DEB64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)_$(VERSION)_amd64.deb
+OUT_PAC64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).pacman
+OUT_APPIMAGE64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION).AppImage
+OUT_TARXZ64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).tar.xz
+OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe
+OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe
+OUT_WIN64_BETTER_NAME := $(PRODUCT_NAME)_Setup_v$(VERSION).exe
+OUT_WIN64_UNPACKED_BETTER_NAME := $(PRODUCT_NAME)_win-unpacked_v$(VERSION).zip
+OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
+
+RELEASE_DIR := release
+CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
+
 
 -include release.mk
 
-
-web:
+setup:
+	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
 	cp $(CFGDIR)/config.json element-web/
+
+web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
+web: setup
 	$(YARN) --cwd element-web dist
+	echo "$(VERSION)" > element-web/webapp/version
 
 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
@@ -29,11 +58,50 @@ debian: desktop-common
 pacman: desktop-common
 	$(YARN) --cwd element-desktop run build64pacman
 
+appimage: desktop-common
+	$(YARN) --cwd element-desktop run build64appimage
+
 windows: desktop-common
 	$(YARN) --cwd element-desktop run build64windows
 
+windows-portable: desktop-common
+	$(YARN) --cwd element-desktop run build64windows-portable
+
+web-release: web
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)
+
+debian-release: debian
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_DEB64) $(CURRENT_RELEASE_DIR)
+
+pacman-release: pacman
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_PAC64) $(CURRENT_RELEASE_DIR)
+
+appimage-release: appimage
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_APPIMAGE64) $(CURRENT_RELEASE_DIR)
+
+windows-setup-release: windows
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_WIN64) $(CURRENT_RELEASE_DIR)/$(OUT_WIN64_BETTER_NAME)
+
+windows-unpacked-release: windows
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cd element-desktop/dist/win-unpacked && zip -r ../../../$(CURRENT_RELEASE_DIR)/$(OUT_WIN64_UNPACKED_BETTER_NAME) *
+
+windows-portable-release: windows-portable
+	./windowsportable.sh $(OUT_WIN64_PORTABLE) $(OUT_WIN64_PORTABLE_BETTER_NAME) $(CURRENT_RELEASE_DIR) $(VERSION)
+
+windows-release: windows-setup-release windows-unpacked-release windows-portable-release
+
+release: web-release debian-release pacman-release windows-release
+
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
 	$(YARN) --cwd matrix-react-sdk clean
 	$(YARN) --cwd element-web clean
 	$(YARN) --cwd element-desktop clean
+	rm -f element-desktop/webapp
+	rm -rf element-web/dist

README.md

@@ -1,9 +1,31 @@
-# SchildiChat-Desktop
+# SchildiChat Web/Desktop
 
-Wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop.
+SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop).
+
+The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
+- A unifed chat list for both direct and group chats
+- Message bubbles
+- Bigger items in the room list
+- … and more!
+
+Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)  
+Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/)
+
+Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).
+
+<img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
 
-# Debian compilation dependencies
+## Building SchildiChat Web/Desktop
+
+This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk in order to build SchildiChat Web **and** Desktop.
+
+
+### Debian build dependencies
+
+Since Debian is usually slow to update packages on its stable releases,
+some dependencies might not be recent enough to build SchildiChat.  
+The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10:
 
 ```
 # apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
@@ -21,18 +43,43 @@ $ echo 'export PATH="$PATH:$HOME/.cargo/bin"' >> .bashrc
 $ source .bashrc
 ```
 
-# Initial setup
+### Initial setup
 
 ```
-git clone --recurse-submodules https://github.com/SpiritCroc/schildichat-desktop.git
+git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
 cd schildichat-desktop
-./setup.sh
+make setup # optional step if using the other make targets
 ```
 
-# Build
+### Create release builds
 
-`make`
+Those are the builds distributed via GitHub releases.
 
-# Install
+```
+# The single make targets are explained below
+make [{web|debian|windows-setup|windows-portable}-release]
+```
 
-Installable packages should appear in element-desktop/dist/.
+After that these packages which belong to to their respective make target should appear in release/\<version\>/:
+- `web`: _schildichat-web-\<version\>.tar.gz_: archive that can be unpacked and served by a **web** server (copy `config.sample.json` to `config.json` and adjust the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) to your likings)
+- `debian`: file ready for installation on a **Debian Linux** (based) system via `dpkg -i schildichat-desktop_<version>_amd64.deb`
+- `windows-setup`: _SchildiChat_Setup_v\<version\>.exe_: file ready for **installation** on a **Windows** system
+- `windows-portable`: _SchildiChat_win-portable_v\<version\>.zip_: **portable** version for a **Windows** system – take SchildiChat together with your login data around with you (the archive contains a readme with **instructions** and **notes**)
+
+#### Additional make targets not used for GitHub releases
+- `pacman`: file ready for installation on an **Arch Linux** (based) system via `pacman -U schildichat-desktop-<version>.pacman`
+- `windows-unpacked`: _SchildiChat_win-unpacked_v\<version\>.zip_: **unpacked** archive for a **Windows** system
+
+### Build SchildiChat Web and deploy it directly to your web server
+
+Put the `config.json` with the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) you want for your hosted instance in a subfolder of the `configs` folder.  
+Then create a file named `release.mk` and and fill it similar to that:
+```
+.PHONY: your-deploy-web
+
+YOUR_CFGDIR := configs/your_subfolder
+your-deploy-%: CFGDIR := $(YOUR_CFGDIR)
+
+your-deploy-web: web
+	rsync --info=progress2 -rup --del element-web/webapp/ you@yourwebserver:/the/folder/served/for/schildi/
+```

alternative_package.sh

@@ -50,22 +50,31 @@ logo_alternative() {
 # Analog to SchildiChat-Android's alternative_package.sh
 case "$package_add" in
 "a")
-    # cyan
-    logo_alternative "#00ACC1" "#006064" "#B2EBF2"
+    # blue
+    logo_alternative "#2196F3" "#0D47A1" "#BBDEFB"
     ;;
 "b")
     # orange: 900 color recuded in value
     logo_alternative "#FB8C00" "#7f2c00" "#FFE0B2"
     ;;
 "c")
-    # purple
-    logo_alternative "#5E35B1" "#311B92" "#D1C4E9"
-    ;;
-"d")
     # red: 900 color reduced in value
     logo_alternative "#E53935" "#4c0b0b" "#FFCDD2"
     ;;
+"d")
+    # purple
+    logo_alternative "#5E35B1" "#311B92" "#D1C4E9"
+    ;;
+"e")
+    # pink
+    logo_alternative "#D81B60" "#880E4F" "#F8BBD0"
+    ;;
 "x")
+    # cyan
+    logo_alternative "#00ACC1" "#006064" "#B2EBF2"
+    ;;
+"z")
+    # white
     logo_alternative "#ffffff" "#000000" "#eeeeee"
     ;;
 esac

configs/sc/config.json

@@ -11,30 +11,19 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "roomDirectory": {
         "servers": [
             "matrix.org"
         ]
     },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://element.io/cookie-policy"
-    },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
     "terms_and_conditions_links": [
         {
-            "url": "https://element.io/privacy",
+            "url": "https://schildi.chat/desktop/privacy",
             "text": "Privacy Policy"
-        },
-        {
-            "url": "https://element.io/cookie-policy",
-            "text": "Cookie Policy"
         }
     ]
 }

deploy/.gitignore

@@ -0,0 +1 @@
+repos/*

deploy/update_aur-bin.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+debpath="$2"
+
+repopath="$DEPLOY_ROOT/repos/aur-bin"
+repourl="ssh://aur@aur.archlinux.org/schildichat-desktop-bin.git"
+
+sha256sum=($(sha256sum $debpath))
+
+[ -d "$repopath" ] || git clone $repourl $repopath
+
+pushd "$repopath" > /dev/null
+
+git fetch
+git reset --hard origin/master
+
+sed -i "s|^pkgver=.*$|pkgver=$version|" PKGBUILD
+sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
+
+makepkg --printsrcinfo > .SRCINFO
+
+git add .SRCINFO PKGBUILD
+git commit -m "Bump version to v$version"
+
+#git push
+
+popd > /dev/null

deploy/update_flathub.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e
+set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+debpath="$2"
+
+repopath="$DEPLOY_ROOT/repos/flathub"
+repourl="git@github.com:flathub/chat.schildi.desktop.git"
+
+downloadurl="https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/schildichat-desktop_${version}_amd64.deb"
+sha256sum=($(sha256sum $debpath))
+debsize=($(wc -c $debpath))
+debdate=$(date +%Y-%m-%d -r $debpath)
+
+[ -d "$repopath" ] || git clone $repourl $repopath
+
+pushd "$repopath" > /dev/null
+
+git fetch
+git reset --hard origin/master
+
+jsonFile="chat.schildi.desktop.json"
+jsonString=$(jq -r "." $jsonFile)
+
+xmlFile="chat.schildi.desktop.appdata.xml"
+
+jsonString=$(echo $jsonString | jq -r ".modules[]? |= ((select(.name?==\"schildichat\") | .sources[0].url = \"${downloadurl}\") // .)")
+jsonString=$(echo $jsonString | jq -r ".modules[]? |= ((select(.name?==\"schildichat\") | .sources[0].sha256 = \"${sha256sum}\") // .)")
+jsonString=$(echo $jsonString | jq -r ".modules[]? |= ((select(.name?==\"schildichat\") | .sources[0].size = ${debsize}) // .)")
+
+echo $jsonString | jq --indent 4 "." > $jsonFile
+
+sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=\"$debdate\"/>'|" $xmlFile
+
+git add $jsonFile $xmlFile
+git commit -m "Bump version to v$version"
+
+#git push
+
+popd > /dev/null

deploy/upload-github-release-asset.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+#
+# Author: Stefan Buck
+# License: MIT
+# https://gist.github.com/stefanbuck/ce788fee19ab6eb0b4447a85fc99f447
+#
+#
+# This script accepts the following parameters:
+#
+# * owner
+# * repo
+# * tag
+# * filename
+# * github_api_token
+#
+# Script to upload a release asset using the GitHub API v3.
+#
+# Example:
+#
+# upload-github-release-asset.sh github_api_token=TOKEN owner=stefanbuck repo=playground tag=v0.1.0 filename=./build.zip
+#
+
+# Check dependencies.
+set -e
+xargs=$(which gxargs || which xargs)
+
+# Validate settings.
+[ "$TRACE" ] && set -x
+
+CONFIG=$@
+
+for line in $CONFIG; do
+  eval "$line"
+done
+
+# Define variables.
+GH_API="https://api.github.com"
+GH_REPO="$GH_API/repos/$owner/$repo"
+GH_TAGS="$GH_REPO/releases/tags/$tag"
+AUTH="Authorization: token $github_api_token"
+WGET_ARGS="--content-disposition --auth-no-challenge --no-cookie"
+CURL_ARGS="-LJO#"
+
+if [[ "$tag" == 'LATEST' ]]; then
+  GH_TAGS="$GH_REPO/releases/latest"
+fi
+
+# Validate token.
+curl -o /dev/null -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!";  exit 1; }
+
+# Read asset tags.
+response=$(curl -sH "$AUTH" $GH_TAGS)
+
+# Get ID of the asset based on given filename.
+eval $(echo "$response" | grep -m 1 "id.:" | grep -w id | tr : = | tr -cd '[[:alnum:]]=')
+[ "$id" ] || { echo "Error: Failed to get release id for tag: $tag"; echo "$response" | awk 'length($0)<100' >&2; exit 1; }
+
+# Upload asset
+echo "Uploading asset... "
+
+# Construct url
+GH_ASSET="https://uploads.github.com/repos/$owner/$repo/releases/$id/assets?name=$(basename $filename)"
+
+curl "$GITHUB_OAUTH_BASIC" --data-binary @"$filename" -H "Authorization: token $github_api_token" -H "Content-Type: application/octet-stream" $GH_ASSET

deploy/upload_github.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+releasepath="$2"
+
+find "$releasepath" -type f | while read p; do
+    echo "Uploading $p ..."
+    $DEPLOY_ROOT/upload-github-release-asset.sh github_api_token=$GITHUB_TOKEN owner=SchildiChat repo=schildichat-desktop tag=v$version filename=$p
+done

merge_helpers.sh

@@ -10,10 +10,10 @@ add_upstream() {
     local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')"
     if echo "$sc_remote" | grep -q matrix; then
         # matrix.org repo
-        local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|matrix-org|')"
+        local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')"
     elif echo "$sc_remote" | grep -q element; then
         # vector-im repo
-        local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|vector-im|')"
+        local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|vector-im|')"
     else
         echo "Don't know upstream repo for $sc_remote"
         return 1
@@ -37,3 +37,18 @@ forall_repos() {
     "$@"
     popd
 }
+
+ensure_yes() {
+    read -e -p "$1 [y/N] " choice
+    
+    if [[ "$choice" != [Yy]* ]]; then
+        exit 1
+    fi
+}
+
+check_branch() {
+    if [[ $(git branch --show-current) != "$1" ]]; then
+        repo_name=$(basename `git rev-parse --show-toplevel`)
+        ensure_yes "$repo_name not in branch $1. Continue?"
+    fi
+}

merge_upstream.sh

@@ -3,13 +3,25 @@
 set -e
 
 mydir="$(dirname "$(realpath "$0")")"
+branch=${BRANCH:-"sc"}
 
 pushd "$mydir" > /dev/null
 
 source ./merge_helpers.sh
 
+check_branch $branch
+forall_repos check_branch $branch
 
 forall_repos git fetch upstream
 forall_repos git merge upstream/master
 
+# Automatic theme update
+pushd "matrix-react-sdk" > /dev/null
+./theme.sh
+popd > /dev/null
+
+# Refresh environment
+make clean
+make setup
+
 popd > /dev/null

setup.sh

@@ -5,12 +5,14 @@ set -e
 yarn=yarnpkg
 
 pushd matrix-js-sdk
+$yarn unlink &>/dev/null || true
 $yarn link
 $yarn install
 popd
 
 pushd matrix-react-sdk
 $yarn link matrix-js-sdk
+$yarn unlink &>/dev/null || true
 $yarn link
 $yarn install
 popd
@@ -18,14 +20,10 @@ popd
 pushd element-web
 $yarn link matrix-js-sdk
 $yarn link matrix-react-sdk
-$yarn link
 $yarn install
 popd
 
 pushd element-desktop
-#$yarn link matrix-js-sdk
-#$yarn link matrix-react-sdk
-#$yarn link riot-web
 $yarn install
 ln -s ../element-web/webapp ./ || true
 popd

windowsportable.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+set -e
+
+portable_exe=$1
+dest_name=$2
+release_dir=$3
+version=$4
+
+dest_path=$release_dir/$dest_name/SchildiChat
+
+mkdir -p $dest_path/app
+cp "$portable_exe" $dest_path/app/dontclick.exe
+
+cat >$dest_path/SchildiChat_Portable.bat <<EOL
+REM -- Adapted from: https://superuser.com/a/1226026
+
+REM -- Path to the directory of this script (make sure to remove ending slash)
+set CURRENT_DIR=%~dp0
+REM -- Great example from Strawberry Perl's portable shell launcher:
+if not "" == "%CURRENT_DIR%" if #%CURRENT_DIR:~-1%# == #\# set CURRENT_DIR=%CURRENT_DIR:~0,-1%
+
+REM -- Path to data directory
+set DATA_DIR=%CURRENT_DIR%\data
+
+REM -- Ensure directories exists
+if not exist %DATA_DIR%\AppData\Roaming mkdir %DATA_DIR%\AppData\Roaming
+
+REM -- OVERRIDE the user environment variable to point to a portable directory
+set USERPROFILE=%DATA_DIR%
+
+REM -- (Optional) Some programs do not use these environment variables
+set APPDATA=%DATA_DIR%\AppData\Roaming>nul
+set ALLUSERSPROFILE=%DATA_DIR%\AppData\Roaming>nul
+set PROGRAMDATA=%DATA_DIR%\AppData\Roaming>nul
+
+REM -- Start the application
+start "" /D"%CURRENT_DIR%\app" "dontclick.exe"
+EOL
+
+cat >$dest_path/README.txt <<EOL
+Just extract this zip file to a folder of your choice (e.g. on a USB-Stick).
+The .\app\dontclick.exe file is the real portable executable.
+SchildiChat_Portable.bat is a batch script to run this executable but with the data in the .\data folder instead of the system's %APPDATA%.
+Thus you can move your data along with this portable app.
+To update just extract the new zip file to the same folder as the previous version whilst merging folders and overwriting files.
+EOL
+
+# if $version looks like semver with leading v, strip it before writing to file
+if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
+    echo ${version:1} > $dest_path/app/version
+else
+    echo ${version} > $dest_path/app/version
+fi
+
+pushd $dest_path/..
+zip -r ../$dest_name.zip *
+popd
+
+rm -r $release_dir/$dest_name
+
+echo
+echo "Packaged $release_dir/$dest_name.zip"