Skip to content

Commit 6d83055

Browse files
su-exsu-ex
committed
Merge tag 'v1.11.17' into sc
* This allows the update server to be entirely static, such as a CDN or object store, as defined at https ([\element-hq#461](element-hq#461)). * Enable threads by default ([\#9736](matrix-org/matrix-react-sdk#9736)). Fixes element-hq/element-web#19270 element-hq/element-web#21910 and element-hq/element-web#23946. * Add inline code formatting to rich text editor ([\#9720](matrix-org/matrix-react-sdk#9720)). * Add emoji handling for plain text mode of the new rich text editor ([\#9727](matrix-org/matrix-react-sdk#9727)). * Overlay virtual room call events into main timeline ([\#9626](matrix-org/matrix-react-sdk#9626)). Fixes element-hq/element-web#22929. * Adds a new section under "Room Settings" > "Roles & Permissions" which adds the possibility to multiselect users from this room and grant them more permissions. ([\#9596](matrix-org/matrix-react-sdk#9596)). Contributed by @GoodGuyMarco. * Add emoji handling for rich text mode ([\#9661](matrix-org/matrix-react-sdk#9661)). * Add setting to hide bold notifications ([\#9705](matrix-org/matrix-react-sdk#9705)). * Further password reset flow enhancements ([\#9662](matrix-org/matrix-react-sdk#9662)). * Snooze the bulk unverified sessions reminder on dismiss ([\#9706](matrix-org/matrix-react-sdk#9706)). * Honor advanced audio processing settings when recording voice messages ([\#9610](matrix-org/matrix-react-sdk#9610)). Contributed by @MrAnno. * Improve the visual balance of bubble layout ([\#9704](matrix-org/matrix-react-sdk#9704)). * Add config setting to disable bulk unverified sessions nag ([\#9657](matrix-org/matrix-react-sdk#9657)). * Only display bulk unverified sessions nag when current sessions is verified ([\#9656](matrix-org/matrix-react-sdk#9656)). * Separate labs and betas more clearly ([\#8969](matrix-org/matrix-react-sdk#8969)). Fixes element-hq/element-web#22706. * Show user an error if we fail to create a DM for verification. ([\#9624](matrix-org/matrix-react-sdk#9624)). * Prevent unnecessary m.direct updates ([\#9805](matrix-org/matrix-react-sdk#9805)). Fixes element-hq/element-web#24059. * Fix checkForPreJoinUISI for thread roots ([\#9803](matrix-org/matrix-react-sdk#9803)). Fixes element-hq/element-web#24054. * Load RTE components only when RTE labs is enabled ([\#9804](matrix-org/matrix-react-sdk#9804)). * Fix issue where thread panel did not update correctly ([\#9746](matrix-org/matrix-react-sdk#9746)). Fixes element-hq/element-web#23971. * Remove async call to get virtual room from room load ([\#9743](matrix-org/matrix-react-sdk#9743)). Fixes element-hq/element-web#23968. * Check each thread for unread messages. ([\#9723](matrix-org/matrix-react-sdk#9723)). * Device manage - handle sessions that don't support encryption ([\#9717](matrix-org/matrix-react-sdk#9717)). Fixes element-hq/element-web#23722. * Fix hover state for formatting buttons (Rich text editor) (fix element-hq/element-web/issues/23832) ([\#9715](matrix-org/matrix-react-sdk#9715)). * Don't allow group calls to be unterminated ([\#9710](matrix-org/matrix-react-sdk#9710)). * Fix replies to emotes not showing as inline ([\#9707](matrix-org/matrix-react-sdk#9707)). Fixes element-hq/element-web#23903. * Update copy of 'Change layout' button to match Element Call ([\#9703](matrix-org/matrix-react-sdk#9703)). * Fix call splitbrains when switching between rooms ([\#9692](matrix-org/matrix-react-sdk#9692)). * bugfix: fix an issue where the Notifier would incorrectly fire for non-timeline events ([\#9664](matrix-org/matrix-react-sdk#9664)). Fixes element-hq/element-web#17263. * Fix power selector being wrongly disabled for admins themselves ([\#9681](matrix-org/matrix-react-sdk#9681)). Fixes element-hq/element-web#23882. * Show day counts in call durations ([\#9641](matrix-org/matrix-react-sdk#9641)).
2 parents 971a97b + 723ea9d commit 6d83055

36 files changed

+2052
-1980
lines changed

‎.github/workflows/build_linux.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This workflow relies on actions/cache to store the hak dependency artifacts as they take a long time to build
2+
# Due to this extra care must be taken to only ever run all build_* scripts against the same branch to ensure
3+
# the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
14
on:
25
workflow_call:
36
inputs:
@@ -16,19 +19,21 @@ jobs:
1619
name: webapp
1720

1821
- name: Cache .hak
22+
id: cache
1923
uses: actions/cache@v3
2024
with:
21-
key: ${{ hashFiles('./yarn.lock') }}
25+
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
2226
path: |
2327
./.hak
2428
2529
- name: Install Rust
30+
if: steps.cache.outputs.cache-hit != 'true'
2631
uses: actions-rs/toolchain@v1
2732
with:
2833
toolchain: stable
2934

3035
- name: Install libsqlcipher-dev
31-
if: inputs.sqlcipher == 'system'
36+
if: steps.cache.outputs.cache-hit != 'true' && inputs.sqlcipher == 'system'
3237
run: sudo apt-get install -y libsqlcipher-dev
3338

3439
- uses: actions/setup-node@v3
@@ -40,6 +45,7 @@ jobs:
4045
run: "yarn install --pure-lockfile"
4146

4247
- name: Build Natives
48+
if: steps.cache.outputs.cache-hit != 'true'
4349
run: "yarn build:native"
4450
env:
4551
SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}

‎.github/workflows/build_macos.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This workflow relies on actions/cache to store the hak dependency artifacts as they take a long time to build
2+
# Due to this extra care must be taken to only ever run all build_* scripts against the same branch to ensure
3+
# the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
14
on:
25
workflow_call:
36
jobs:
@@ -11,13 +14,15 @@ jobs:
1114
name: webapp
1215

1316
- name: Cache .hak
17+
id: cache
1418
uses: actions/cache@v3
1519
with:
16-
key: ${{ hashFiles('./yarn.lock') }}
20+
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
1721
path: |
1822
./.hak
1923
2024
- name: Install Rust
25+
if: steps.cache.outputs.cache-hit != 'true'
2126
uses: actions-rs/toolchain@v1
2227
with:
2328
toolchain: stable
@@ -32,6 +37,7 @@ jobs:
3237
run: "yarn install --pure-lockfile"
3338

3439
- name: Build Natives
40+
if: steps.cache.outputs.cache-hit != 'true'
3541
run: "yarn build:native:universal"
3642

3743
- name: Build App

‎.github/workflows/build_prepare.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,18 @@ jobs:
2626
- name: Fetch Element Web
2727
run: yarn run fetch --noverify -d ${{ inputs.config }} ${{ inputs.version }}
2828

29+
# We split this out to save the build_* scripts having to do it to make use of `hashFiles` in the cache action
30+
- name: Generate cache hash files
31+
run: |
32+
yarn run --silent electron --version > electronVersion
33+
cat package.json | jq -c .hakDependencies > hakDependencies.json
34+
2935
- uses: actions/upload-artifact@v3
3036
with:
3137
name: webapp
3238
retention-days: 1
3339
path: |
3440
webapp.asar
3541
package.json
42+
electronVersion
43+
hakDependencies.json

‎.github/workflows/build_windows.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This workflow relies on actions/cache to store the hak dependency artifacts as they take a long time to build
2+
# Due to this extra care must be taken to only ever run all build_* scripts against the same branch to ensure
3+
# the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
14
on:
25
workflow_call:
36
inputs:
@@ -32,9 +35,10 @@ jobs:
3235
name: webapp
3336

3437
- name: Cache .hak
38+
id: cache
3539
uses: actions/cache@v3
3640
with:
37-
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
41+
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
3842
path: |
3943
./.hak
4044
@@ -58,6 +62,7 @@ jobs:
5862
echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
5963
6064
- name: Install Rust
65+
if: steps.cache.outputs.cache-hit != 'true'
6166
uses: actions-rs/toolchain@v1
6267
with:
6368
toolchain: stable
@@ -72,6 +77,7 @@ jobs:
7277
run: "yarn install --pure-lockfile"
7378

7479
- name: Build Natives
80+
if: steps.cache.outputs.cache-hit != 'true'
7581
run: |
7682
refreshenv
7783
yarn build:native --target ${{ steps.config.outputs.target }}

‎.github/workflows/static_analysis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: "Typescript Syntax Check"
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212

1313
- uses: actions/setup-node@v3
1414
with:
@@ -29,7 +29,7 @@ jobs:
2929
name: "ESLint"
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v3
3333

3434
- uses: actions/setup-node@v3
3535
with:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ node_modules/
1515
.DS_Store
1616
/test_artifacts/
1717
/coverage/
18+
yarn-error.log

‎CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
Changes in [1.11.17](https://github.com/vector-im/element-desktop/releases/tag/v1.11.17) (2022-12-21)
2+
=====================================================================================================
3+
4+
## 🚨 BREAKING CHANGES
5+
* This allows the update server to be entirely static, such as a CDN or object store, as defined at https ([\#461](https://github.com/vector-im/element-desktop/pull/461)).
6+
7+
## ✨ Features
8+
* Enable threads by default ([\#9736](https://github.com/matrix-org/matrix-react-sdk/pull/9736)). Fixes vector-im/element-web#19270 vector-im/element-web#21910 and vector-im/element-web#23946.
9+
* Add inline code formatting to rich text editor ([\#9720](https://github.com/matrix-org/matrix-react-sdk/pull/9720)).
10+
* Add emoji handling for plain text mode of the new rich text editor ([\#9727](https://github.com/matrix-org/matrix-react-sdk/pull/9727)).
11+
* Overlay virtual room call events into main timeline ([\#9626](https://github.com/matrix-org/matrix-react-sdk/pull/9626)). Fixes vector-im/element-web#22929.
12+
* Adds a new section under "Room Settings" > "Roles & Permissions" which adds the possibility to multiselect users from this room and grant them more permissions. ([\#9596](https://github.com/matrix-org/matrix-react-sdk/pull/9596)). Contributed by @GoodGuyMarco.
13+
* Add emoji handling for rich text mode ([\#9661](https://github.com/matrix-org/matrix-react-sdk/pull/9661)).
14+
* Add setting to hide bold notifications ([\#9705](https://github.com/matrix-org/matrix-react-sdk/pull/9705)).
15+
* Further password reset flow enhancements ([\#9662](https://github.com/matrix-org/matrix-react-sdk/pull/9662)).
16+
* Snooze the bulk unverified sessions reminder on dismiss ([\#9706](https://github.com/matrix-org/matrix-react-sdk/pull/9706)).
17+
* Honor advanced audio processing settings when recording voice messages ([\#9610](https://github.com/matrix-org/matrix-react-sdk/pull/9610)). Contributed by @MrAnno.
18+
* Improve the visual balance of bubble layout ([\#9704](https://github.com/matrix-org/matrix-react-sdk/pull/9704)).
19+
* Add config setting to disable bulk unverified sessions nag ([\#9657](https://github.com/matrix-org/matrix-react-sdk/pull/9657)).
20+
* Only display bulk unverified sessions nag when current sessions is verified ([\#9656](https://github.com/matrix-org/matrix-react-sdk/pull/9656)).
21+
* Separate labs and betas more clearly ([\#8969](https://github.com/matrix-org/matrix-react-sdk/pull/8969)). Fixes vector-im/element-web#22706.
22+
* Show user an error if we fail to create a DM for verification. ([\#9624](https://github.com/matrix-org/matrix-react-sdk/pull/9624)).
23+
24+
## 🐛 Bug Fixes
25+
* Prevent unnecessary m.direct updates ([\#9805](https://github.com/matrix-org/matrix-react-sdk/pull/9805)). Fixes vector-im/element-web#24059.
26+
* Fix checkForPreJoinUISI for thread roots ([\#9803](https://github.com/matrix-org/matrix-react-sdk/pull/9803)). Fixes vector-im/element-web#24054.
27+
* Load RTE components only when RTE labs is enabled ([\#9804](https://github.com/matrix-org/matrix-react-sdk/pull/9804)).
28+
* Fix issue where thread panel did not update correctly ([\#9746](https://github.com/matrix-org/matrix-react-sdk/pull/9746)). Fixes vector-im/element-web#23971.
29+
* Remove async call to get virtual room from room load ([\#9743](https://github.com/matrix-org/matrix-react-sdk/pull/9743)). Fixes vector-im/element-web#23968.
30+
* Check each thread for unread messages. ([\#9723](https://github.com/matrix-org/matrix-react-sdk/pull/9723)).
31+
* Device manage - handle sessions that don't support encryption ([\#9717](https://github.com/matrix-org/matrix-react-sdk/pull/9717)). Fixes vector-im/element-web#23722.
32+
* Fix hover state for formatting buttons (Rich text editor) (fix vector-im/element-web/issues/23832) ([\#9715](https://github.com/matrix-org/matrix-react-sdk/pull/9715)).
33+
* Don't allow group calls to be unterminated ([\#9710](https://github.com/matrix-org/matrix-react-sdk/pull/9710)).
34+
* Fix replies to emotes not showing as inline ([\#9707](https://github.com/matrix-org/matrix-react-sdk/pull/9707)). Fixes vector-im/element-web#23903.
35+
* Update copy of 'Change layout' button to match Element Call ([\#9703](https://github.com/matrix-org/matrix-react-sdk/pull/9703)).
36+
* Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
37+
* bugfix: fix an issue where the Notifier would incorrectly fire for non-timeline events ([\#9664](https://github.com/matrix-org/matrix-react-sdk/pull/9664)). Fixes vector-im/element-web#17263.
38+
* Fix power selector being wrongly disabled for admins themselves ([\#9681](https://github.com/matrix-org/matrix-react-sdk/pull/9681)). Fixes vector-im/element-web#23882.
39+
* Show day counts in call durations ([\#9641](https://github.com/matrix-org/matrix-react-sdk/pull/9641)).
40+
141
Changes in [1.11.16](https://github.com/vector-im/element-desktop/releases/tag/v1.11.16) (2022-12-06)
242
=====================================================================================================
343

‎docs/updates.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
The Desktop app is capable of self-updating on macOS and Windows.
2+
The update server base url is configurable as `update_base_url` in config.json and can be served by a static file host,
3+
CDN or object storage.
4+
5+
Currently all packaging & deployment is handled by https://github.com/vector-im/element-builder/
6+
7+
# Windows
8+
9+
On Windows the update mechanism used is [Squirrel.Windows](https://github.com/Squirrel/Squirrel.Windows)
10+
and can be served by any compatible Squirrel server, such as https://github.com/Tiliq/squirrel-server
11+
12+
# macOS
13+
14+
On macOS the update mechanism used is [Squirrel.Mac](https://github.com/Squirrel/Squirrel.Mac)
15+
using the newer JSON format as documented [here](https://github.com/Squirrel/Squirrel.Mac#update-file-json-format).
16+

‎element.io/nightly/control.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Vendor: [email protected]
44
Architecture: amd64
55
Maintainer: [email protected]
66
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
7-
Recommends: libappindicator3-1, libsqlcipher0
7+
Recommends: libsqlcipher0
88
Section: net
99
Priority: extra
1010
Homepage: https://element.io/

‎element.io/release/control.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Vendor: [email protected]
44
Architecture: amd64
55
Maintainer: [email protected]
66
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
7-
Recommends: libappindicator3-1, libsqlcipher0
7+
Recommends: libsqlcipher0
88
Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
99
Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
1010
Section: net

‎hak/matrix-seshat/build.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promi
3232
await buildMatrixSeshat(hakEnv, moduleInfo);
3333
}
3434

35-
async function buildOpenSslWin(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
35+
async function buildOpenSslWin(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
3636
const version = moduleInfo.cfg.dependencies.openssl;
3737
const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
3838

@@ -134,7 +134,7 @@ async function buildOpenSslWin(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
134134
});
135135
}
136136

137-
async function buildSqlCipherWin(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
137+
async function buildSqlCipherWin(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
138138
const version = moduleInfo.cfg.dependencies.sqlcipher;
139139
const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
140140
const buildDir = path.join(sqlCipherDir, 'bld');
@@ -171,9 +171,9 @@ async function buildSqlCipherWin(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
171171
);
172172
}
173173

174-
async function buildSqlCipherUnix(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
175-
//const version = moduleInfo.cfg.dependencies.sqlcipher;
176-
//const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
174+
async function buildSqlCipherUnix(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
175+
// const version = moduleInfo.cfg.dependencies.sqlcipher;
176+
// const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
177177
// FIXME: revert
178178
const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-sc`);
179179

@@ -270,7 +270,7 @@ async function buildSqlCipherUnix(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
270270
});
271271
}
272272

273-
async function buildMatrixSeshat(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
273+
async function buildMatrixSeshat(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
274274
// seshat now uses n-api so we shouldn't need to specify a node version to
275275
// build against, but it does seems to still need something in here, so leaving
276276
// it for now: we should confirm how much of this it still actually needs.

‎hak/matrix-seshat/fetchDeps.ts

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,20 @@ import path from 'path';
1818
import childProcess from 'child_process';
1919
import fs from 'fs';
2020
import fsProm from 'fs/promises';
21-
import needle from 'needle';
2221
import tar from 'tar';
22+
import fetch from 'node-fetch';
23+
import { promises as stream } from "stream";
2324

2425
import HakEnv from '../../scripts/hak/hakEnv';
2526
import { DependencyInfo } from '../../scripts/hak/dep';
2627

28+
async function download(url: string, filename: string): Promise<void> {
29+
const resp = await fetch(url);
30+
if (!resp.ok) throw new Error(`unexpected response ${resp.statusText}`);
31+
if (!resp.body) throw new Error(`unexpected response has no body ${resp.statusText}`);
32+
await stream.pipeline(resp.body, fs.createWriteStream(filename));
33+
}
34+
2735
export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
2836
if (hakEnv.wantsStaticSqlCipher()) {
2937
await getSqlCipher(hakEnv, moduleInfo);
@@ -57,16 +65,9 @@ async function getSqlCipher(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise
5765
haveSqlcipherTar = false;
5866
}
5967
if (!haveSqlcipherTar) {
60-
/*const bob = needle('get', `https://github.com/sqlcipher/sqlcipher/archive/v${version}.tar.gz`, {
61-
follow: 10,
62-
output: sqlCipherTarball,
63-
});*/
68+
// await download(`https://github.com/sqlcipher/sqlcipher/archive/v${version}.tar.gz`, sqlCipherTarball);
6469
// FIXME: revert
65-
const bob = needle('get', 'https://github.com/SchildiChat/sqlcipher/archive/refs/heads/sc.tar.gz', {
66-
follow: 10,
67-
output: sqlCipherTarball,
68-
});
69-
await bob;
70+
await download(`https://github.com/SchildiChat/sqlcipher/archive/refs/heads/sc.tar.gz`, sqlCipherTarball);
7071
}
7172

7273
// Extract the tarball to per-target directories, then we avoid cross-contaiminating archs
@@ -123,10 +124,7 @@ async function getOpenSsl(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<v
123124
haveOpenSslTar = false;
124125
}
125126
if (!haveOpenSslTar) {
126-
await needle('get', `https://www.openssl.org/source/openssl-${version}.tar.gz`, {
127-
follow: 10,
128-
output: openSslTarball,
129-
});
127+
await download(`https://www.openssl.org/source/openssl-${version}.tar.gz`, openSslTarball);
130128
}
131129

132130
console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleTargetDotHakDir);

0 commit comments

Comments
 (0)