Skip to content

Commit 4b5042b

Browse files
committed
Merge tag 'v1.10.14' into sc
* Make Lao translation available ([\element-hq#22358](element-hq#22358)). Fixes element-hq#22327. * Option to disable hardware acceleration on Element Desktop ([\element-hq#22295](element-hq#22295)). Contributed by @novocaine. * Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\element-hq#7790](matrix-org/matrix-react-sdk#7790)). Contributed by @johannes-krude. * Live location sharing - open location in OpenStreetMap ([\element-hq#8695](matrix-org/matrix-react-sdk#8695)). Contributed by @kerryarchibald. * Show a dialog when Jitsi encounters an error ([\element-hq#8701](matrix-org/matrix-react-sdk#8701)). Fixes element-hq#22284. * Add support for setting the `avatar_url` of widgets by integration managers. ([\element-hq#8550](matrix-org/matrix-react-sdk#8550)). Contributed by @Fox32. * Add an option to ignore (block) a user when reporting their events ([\element-hq#8471](matrix-org/matrix-react-sdk#8471)). * Add the option to disable hardware acceleration ([\element-hq#8655](matrix-org/matrix-react-sdk#8655)). Contributed by @novocaine. * Slightly better presentation of read receipts to screen reader users ([\element-hq#8662](matrix-org/matrix-react-sdk#8662)). Fixes element-hq#22293. Contributed by @pvagner. * Add jump to related event context menu item ([\element-hq#6775](matrix-org/matrix-react-sdk#6775)). Fixes element-hq#19883. * Add public room directory hook ([\element-hq#8626](matrix-org/matrix-react-sdk#8626)). * Stop Jitsi if we time out while connecting to a video room ([\element-hq#22301](element-hq#22301)). Fixes element-hq#22283. * Remove inline margin from UTD error message inside a reply tile on ThreadView ([\element-hq#8708](matrix-org/matrix-react-sdk#8708)). Fixes element-hq#22376. Contributed by @luixxiul. * Move unread notification dots of the threads list to the expected position ([\element-hq#8700](matrix-org/matrix-react-sdk#8700)). Fixes element-hq#22350. Contributed by @luixxiul. * Prevent overflow of grid items on a bubble with UTD generally ([\element-hq#8697](matrix-org/matrix-react-sdk#8697)). Contributed by @luixxiul. * Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\element-hq#8704](matrix-org/matrix-react-sdk#8704)). Fixes element-hq#22365. Contributed by @luixxiul. * Fix - AccessibleButton does not set disabled attribute ([\element-hq#8682](matrix-org/matrix-react-sdk#8682)). Contributed by @kerryarchibald. * Fix font not resetting when logging out ([\element-hq#8670](matrix-org/matrix-react-sdk#8670)). Fixes element-hq#17228. * Fix local aliases section of room settings not working for some homeservers (ie ([\element-hq#8698](matrix-org/matrix-react-sdk#8698)). Fixes element-hq#22337. * Align EventTile_line with display name on message bubble ([\element-hq#8692](matrix-org/matrix-react-sdk#8692)). Fixes element-hq#22343. Contributed by @luixxiul. * Convert references to direct chat -> direct message ([\element-hq#8694](matrix-org/matrix-react-sdk#8694)). Contributed by @novocaine. * Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\element-hq#8687](matrix-org/matrix-react-sdk#8687)). * Make the empty thread panel fill BaseCard ([\element-hq#8690](matrix-org/matrix-react-sdk#8690)). Fixes element-hq#22338. Contributed by @luixxiul. * Fix edge case around composer handling gendered facepalm emoji ([\element-hq#8686](matrix-org/matrix-react-sdk#8686)). * Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\element-hq#8688](matrix-org/matrix-react-sdk#8688)). Fixes element-hq#21914. Contributed by @luixxiul. * Apply the same max-width to image tile on the thread timeline as message bubble ([\element-hq#8669](matrix-org/matrix-react-sdk#8669)). Fixes element-hq#22313. Contributed by @luixxiul. * Fix dropdown button size for picture-in-picture CallView ([\element-hq#8680](matrix-org/matrix-react-sdk#8680)). Fixes element-hq#22316. Contributed by @luixxiul. * Live location sharing - fix square border for image-less avatar (PSF-1052) ([\element-hq#8679](matrix-org/matrix-react-sdk#8679)). Contributed by @kerryarchibald. * Stop connecting to a video room if the widget messaging disappears ([\element-hq#8660](matrix-org/matrix-react-sdk#8660)). * Fix file button and audio player overflowing from message bubble ([\element-hq#8666](matrix-org/matrix-react-sdk#8666)). Fixes element-hq#22308. Contributed by @luixxiul. * Don't show broken composer format bar when selection is whitespace ([\element-hq#8673](matrix-org/matrix-react-sdk#8673)). Fixes element-hq#10788. * Fix media upload http 413 handling ([\element-hq#8674](matrix-org/matrix-react-sdk#8674)). * Fix emoji picker for editing thread responses ([\element-hq#8671](matrix-org/matrix-react-sdk#8671)). Fixes matrix-org/element-web-rageshakes#13129. * Map attribution while sharing live location is now visible ([\element-hq#8621](matrix-org/matrix-react-sdk#8621)). Fixes element-hq#22236. Contributed by @weeman1337. * Fix info tile overlapping the time stamp on TimelineCard ([\element-hq#8639](matrix-org/matrix-react-sdk#8639)). Fixes element-hq#22256. Contributed by @luixxiul. * Fix position of wide images on IRC / modern layout ([\element-hq#8667](matrix-org/matrix-react-sdk#8667)). Fixes element-hq#22309. Contributed by @luixxiul. * Fix other user's displayName being wrapped on the bubble message layout ([\element-hq#8456](matrix-org/matrix-react-sdk#8456)). Fixes element-hq#22004. Contributed by @luixxiul. * Set spacing declarations to elements in mx_EventTile_mediaLine ([\element-hq#8665](matrix-org/matrix-react-sdk#8665)). Fixes element-hq#22307. Contributed by @luixxiul. * Fix wide image overflowing from the thumbnail container ([\element-hq#8663](matrix-org/matrix-react-sdk#8663)). Fixes element-hq#22303. Contributed by @luixxiul. * Fix styles of "Show all" link button on ReactionsRow ([\element-hq#8658](matrix-org/matrix-react-sdk#8658)). Fixes element-hq#22300. Contributed by @luixxiul. * Automatically log in after registration ([\element-hq#8654](matrix-org/matrix-react-sdk#8654)). Fixes element-hq#19305. Contributed by @justjanne. * Fix offline status in window title not working reliably ([\element-hq#8656](matrix-org/matrix-react-sdk#8656)). * Align input area with event body's first letter in a thread on IRC/modern layout ([\element-hq#8636](matrix-org/matrix-react-sdk#8636)). Fixes element-hq#22252. Contributed by @luixxiul. * Fix crash on null idp for SSO buttons ([\element-hq#8650](matrix-org/matrix-react-sdk#8650)). Contributed by @hughns. * Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\element-hq#8648](matrix-org/matrix-react-sdk#8648)). Fixes element-hq#22279. * Show notifications even when Element is focused ([\element-hq#8590](matrix-org/matrix-react-sdk#8590)). Contributed by @sumnerevans. * Remove padding from the buttons on edit message composer of a event tile on a thread ([\element-hq#8632](matrix-org/matrix-react-sdk#8632)). Contributed by @luixxiul. * ensure metaspace changes correctly notify listeners ([\element-hq#8611](matrix-org/matrix-react-sdk#8611)). Fixes element-hq#21006. Contributed by @justjanne. * Hide image banner on stickers, they have a tooltip already ([\element-hq#8641](matrix-org/matrix-react-sdk#8641)). Fixes element-hq#22244. * Adjust EditMessageComposer style declarations ([\element-hq#8631](matrix-org/matrix-react-sdk#8631)). Fixes element-hq#22231. Contributed by @luixxiul.
2 parents 2d9b672 + b7b5408 commit 4b5042b

File tree

16 files changed

+1003
-648
lines changed

16 files changed

+1003
-648
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ module.exports = {
3030

3131
// We disable this while we're transitioning
3232
"@typescript-eslint/no-explicit-any": "off",
33+
// We're okay with assertion errors when we ask for them
34+
"@typescript-eslint/no-non-null-assertion": "off",
3335

3436
// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
3537
"no-restricted-imports": ["error", {

.github/workflows/pull_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Pull Request
22
on:
33
pull_request_target:
44
types: [ opened, edited, labeled, unlabeled, synchronize ]
5+
concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
56
jobs:
67
changelog:
78
name: Preview Changelog

.github/workflows/sonarqube.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types:
66
- completed
77
concurrency:
8-
group: ${{ github.workflow }}-${{ github.ref }}
8+
group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
99
cancel-in-progress: true
1010
jobs:
1111
prdetails:

.github/workflows/static_analysis.yaml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,39 +28,7 @@ jobs:
2828

2929
i18n_lint:
3030
name: "i18n Check"
31-
runs-on: ubuntu-latest
32-
permissions:
33-
pull-requests: read
34-
steps:
35-
- uses: actions/checkout@v2
36-
37-
- name: "Get modified files"
38-
id: changed_files
39-
if: github.event_name == 'pull_request'
40-
uses: tj-actions/changed-files@v19
41-
with:
42-
files: |
43-
src/i18n/strings/*
44-
files_ignore: |
45-
src/i18n/strings/en_EN.json
46-
- name: "Assert only en_EN was modified"
47-
if: |
48-
github.event_name == 'pull_request' &&
49-
github.actor != 'RiotTranslateBot' &&
50-
steps.changed_files.outputs.any_modified == 'true'
51-
run: |
52-
echo "You can only modify en_EN.json, do not touch any of the other i18n files as Weblate will be confused"
53-
exit 1
54-
- uses: actions/setup-node@v3
55-
with:
56-
cache: 'yarn'
57-
58-
# Does not need branch matching as only analyses this layer
59-
- name: Install Deps
60-
run: "yarn install --pure-lockfile"
61-
62-
- name: i18n Check
63-
run: "yarn run diff-i18n"
31+
uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
6432

6533
js_lint:
6634
name: "ESLint"

.github/workflows/triage-labelled.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Move labelled issues to correct projects
22

33
on:
44
issues:
5-
types: [ labeled ]
5+
types: [labeled]
66

77
jobs:
88
apply_Z-Labs_label:
@@ -100,9 +100,6 @@ jobs:
100100
runs-on: ubuntu-latest
101101
if: >
102102
contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') ||
103-
contains(github.event.issue.labels.*.name, 'A-Spaces') ||
104-
contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
105-
contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
106103
contains(github.event.issue.labels.*.name, 'Team: Delight') ||
107104
contains(github.event.issue.labels.*.name, 'Z-IA') ||
108105
contains(github.event.issue.labels.*.name, 'Z-NewUserJourney')

.github/workflows/triage-priority-bugs.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,9 @@ name: Move P1 bugs to boards
22

33
on:
44
issues:
5-
types: [ labeled, unlabeled ]
5+
types: [labeled, unlabeled]
66

77
jobs:
8-
p1_issues_to_team_workboard:
9-
runs-on: ubuntu-latest
10-
if: >
11-
(!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
12-
!contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
13-
!contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
14-
!contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
15-
!contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
16-
!contains(github.event.issue.labels.*.name, 'A-Spaces') &&
17-
!contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
18-
!contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
19-
(contains(github.event.issue.labels.*.name, 'T-Defect') &&
20-
contains(github.event.issue.labels.*.name, 'S-Critical') &&
21-
(contains(github.event.issue.labels.*.name, 'O-Frequent') ||
22-
contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
23-
contains(github.event.issue.labels.*.name, 'S-Major') &&
24-
contains(github.event.issue.labels.*.name, 'O-Frequent') ||
25-
contains(github.event.issue.labels.*.name, 'A11y') &&
26-
contains(github.event.issue.labels.*.name, 'O-Frequent'))
27-
steps:
28-
- uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
29-
with:
30-
project: Web App Team
31-
column: P1
32-
repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
33-
348
P1_issues_to_crypto_team_workboard:
359
runs-on: ubuntu-latest
3610
if: >

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ electron/pub
2424
.vscode
2525
.vscode/
2626
.env
27+
/coverage

CHANGELOG.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,60 @@
1+
Changes in [1.10.14](https://github.com/vector-im/element-web/releases/tag/v1.10.14) (2022-06-07)
2+
=================================================================================================
3+
4+
## ✨ Features
5+
* Make Lao translation available ([\#22358](https://github.com/vector-im/element-web/pull/22358)). Fixes #22327.
6+
* Option to disable hardware acceleration on Element Desktop ([\#22295](https://github.com/vector-im/element-web/pull/22295)). Contributed by @novocaine.
7+
* Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\#7790](https://github.com/matrix-org/matrix-react-sdk/pull/7790)). Contributed by @johannes-krude.
8+
* Live location sharing - open location in OpenStreetMap ([\#8695](https://github.com/matrix-org/matrix-react-sdk/pull/8695)). Contributed by @kerryarchibald.
9+
* Show a dialog when Jitsi encounters an error ([\#8701](https://github.com/matrix-org/matrix-react-sdk/pull/8701)). Fixes #22284.
10+
* Add support for setting the `avatar_url` of widgets by integration managers. ([\#8550](https://github.com/matrix-org/matrix-react-sdk/pull/8550)). Contributed by @Fox32.
11+
* Add an option to ignore (block) a user when reporting their events ([\#8471](https://github.com/matrix-org/matrix-react-sdk/pull/8471)).
12+
* Add the option to disable hardware acceleration ([\#8655](https://github.com/matrix-org/matrix-react-sdk/pull/8655)). Contributed by @novocaine.
13+
* Slightly better presentation of read receipts to screen reader users ([\#8662](https://github.com/matrix-org/matrix-react-sdk/pull/8662)). Fixes #22293. Contributed by @pvagner.
14+
* Add jump to related event context menu item ([\#6775](https://github.com/matrix-org/matrix-react-sdk/pull/6775)). Fixes #19883.
15+
* Add public room directory hook ([\#8626](https://github.com/matrix-org/matrix-react-sdk/pull/8626)).
16+
17+
## 🐛 Bug Fixes
18+
* Stop Jitsi if we time out while connecting to a video room ([\#22301](https://github.com/vector-im/element-web/pull/22301)). Fixes #22283.
19+
* Remove inline margin from UTD error message inside a reply tile on ThreadView ([\#8708](https://github.com/matrix-org/matrix-react-sdk/pull/8708)). Fixes #22376. Contributed by @luixxiul.
20+
* Move unread notification dots of the threads list to the expected position ([\#8700](https://github.com/matrix-org/matrix-react-sdk/pull/8700)). Fixes #22350. Contributed by @luixxiul.
21+
* Prevent overflow of grid items on a bubble with UTD generally ([\#8697](https://github.com/matrix-org/matrix-react-sdk/pull/8697)). Contributed by @luixxiul.
22+
* Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\#8704](https://github.com/matrix-org/matrix-react-sdk/pull/8704)). Fixes #22365. Contributed by @luixxiul.
23+
* Fix - AccessibleButton does not set disabled attribute ([\#8682](https://github.com/matrix-org/matrix-react-sdk/pull/8682)). Contributed by @kerryarchibald.
24+
* Fix font not resetting when logging out ([\#8670](https://github.com/matrix-org/matrix-react-sdk/pull/8670)). Fixes #17228.
25+
* Fix local aliases section of room settings not working for some homeservers (ie ([\#8698](https://github.com/matrix-org/matrix-react-sdk/pull/8698)). Fixes #22337.
26+
* Align EventTile_line with display name on message bubble ([\#8692](https://github.com/matrix-org/matrix-react-sdk/pull/8692)). Fixes #22343. Contributed by @luixxiul.
27+
* Convert references to direct chat -> direct message ([\#8694](https://github.com/matrix-org/matrix-react-sdk/pull/8694)). Contributed by @novocaine.
28+
* Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\#8687](https://github.com/matrix-org/matrix-react-sdk/pull/8687)).
29+
* Make the empty thread panel fill BaseCard ([\#8690](https://github.com/matrix-org/matrix-react-sdk/pull/8690)). Fixes #22338. Contributed by @luixxiul.
30+
* Fix edge case around composer handling gendered facepalm emoji ([\#8686](https://github.com/matrix-org/matrix-react-sdk/pull/8686)).
31+
* Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\#8688](https://github.com/matrix-org/matrix-react-sdk/pull/8688)). Fixes #21914. Contributed by @luixxiul.
32+
* Apply the same max-width to image tile on the thread timeline as message bubble ([\#8669](https://github.com/matrix-org/matrix-react-sdk/pull/8669)). Fixes #22313. Contributed by @luixxiul.
33+
* Fix dropdown button size for picture-in-picture CallView ([\#8680](https://github.com/matrix-org/matrix-react-sdk/pull/8680)). Fixes #22316. Contributed by @luixxiul.
34+
* Live location sharing - fix square border for image-less avatar (PSF-1052) ([\#8679](https://github.com/matrix-org/matrix-react-sdk/pull/8679)). Contributed by @kerryarchibald.
35+
* Stop connecting to a video room if the widget messaging disappears ([\#8660](https://github.com/matrix-org/matrix-react-sdk/pull/8660)).
36+
* Fix file button and audio player overflowing from message bubble ([\#8666](https://github.com/matrix-org/matrix-react-sdk/pull/8666)). Fixes #22308. Contributed by @luixxiul.
37+
* Don't show broken composer format bar when selection is whitespace ([\#8673](https://github.com/matrix-org/matrix-react-sdk/pull/8673)). Fixes #10788.
38+
* Fix media upload http 413 handling ([\#8674](https://github.com/matrix-org/matrix-react-sdk/pull/8674)).
39+
* Fix emoji picker for editing thread responses ([\#8671](https://github.com/matrix-org/matrix-react-sdk/pull/8671)). Fixes matrix-org/element-web-rageshakes#13129.
40+
* Map attribution while sharing live location is now visible ([\#8621](https://github.com/matrix-org/matrix-react-sdk/pull/8621)). Fixes #22236. Contributed by @weeman1337.
41+
* Fix info tile overlapping the time stamp on TimelineCard ([\#8639](https://github.com/matrix-org/matrix-react-sdk/pull/8639)). Fixes #22256. Contributed by @luixxiul.
42+
* Fix position of wide images on IRC / modern layout ([\#8667](https://github.com/matrix-org/matrix-react-sdk/pull/8667)). Fixes #22309. Contributed by @luixxiul.
43+
* Fix other user's displayName being wrapped on the bubble message layout ([\#8456](https://github.com/matrix-org/matrix-react-sdk/pull/8456)). Fixes #22004. Contributed by @luixxiul.
44+
* Set spacing declarations to elements in mx_EventTile_mediaLine ([\#8665](https://github.com/matrix-org/matrix-react-sdk/pull/8665)). Fixes #22307. Contributed by @luixxiul.
45+
* Fix wide image overflowing from the thumbnail container ([\#8663](https://github.com/matrix-org/matrix-react-sdk/pull/8663)). Fixes #22303. Contributed by @luixxiul.
46+
* Fix styles of "Show all" link button on ReactionsRow ([\#8658](https://github.com/matrix-org/matrix-react-sdk/pull/8658)). Fixes #22300. Contributed by @luixxiul.
47+
* Automatically log in after registration ([\#8654](https://github.com/matrix-org/matrix-react-sdk/pull/8654)). Fixes #19305. Contributed by @justjanne.
48+
* Fix offline status in window title not working reliably ([\#8656](https://github.com/matrix-org/matrix-react-sdk/pull/8656)).
49+
* Align input area with event body's first letter in a thread on IRC/modern layout ([\#8636](https://github.com/matrix-org/matrix-react-sdk/pull/8636)). Fixes #22252. Contributed by @luixxiul.
50+
* Fix crash on null idp for SSO buttons ([\#8650](https://github.com/matrix-org/matrix-react-sdk/pull/8650)). Contributed by @hughns.
51+
* Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\#8648](https://github.com/matrix-org/matrix-react-sdk/pull/8648)). Fixes #22279.
52+
* Show notifications even when Element is focused ([\#8590](https://github.com/matrix-org/matrix-react-sdk/pull/8590)). Contributed by @sumnerevans.
53+
* Remove padding from the buttons on edit message composer of a event tile on a thread ([\#8632](https://github.com/matrix-org/matrix-react-sdk/pull/8632)). Contributed by @luixxiul.
54+
* ensure metaspace changes correctly notify listeners ([\#8611](https://github.com/matrix-org/matrix-react-sdk/pull/8611)). Fixes #21006. Contributed by @justjanne.
55+
* Hide image banner on stickers, they have a tooltip already ([\#8641](https://github.com/matrix-org/matrix-react-sdk/pull/8641)). Fixes #22244.
56+
* Adjust EditMessageComposer style declarations ([\#8631](https://github.com/matrix-org/matrix-react-sdk/pull/8631)). Fixes #22231. Contributed by @luixxiul.
57+
158
Changes in [1.10.13](https://github.com/vector-im/element-web/releases/tag/v1.10.13) (2022-05-24)
259
=================================================================================================
360

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.10.13",
3+
"version": "1.10.14",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -58,8 +58,8 @@
5858
"gfm.css": "^1.1.2",
5959
"jsrsasign": "^10.2.0",
6060
"katex": "^0.12.0",
61-
"matrix-js-sdk": "18.0.0",
62-
"matrix-react-sdk": "3.45.0",
61+
"matrix-js-sdk": "18.1.0",
62+
"matrix-react-sdk": "3.46.0",
6363
"matrix-widget-api": "^0.1.0-beta.18",
6464
"prop-types": "^15.7.2",
6565
"react": "17.0.2",
@@ -123,7 +123,7 @@
123123
"jest-sonar-reporter": "^2.0.0",
124124
"json-loader": "^0.5.7",
125125
"loader-utils": "^1.4.0",
126-
"matrix-mock-request": "^1.2.3",
126+
"matrix-mock-request": "^2.0.0",
127127
"matrix-react-test-utils": "^0.2.3",
128128
"matrix-web-i18n": "^1.2.0",
129129
"mini-css-extract-plugin": "^0.12.0",

release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ do
4343
fi
4444
done
4545

46-
./node_modules/matrix-js-sdk/release.sh -n -z "$orig_args"
46+
./node_modules/matrix-js-sdk/release.sh -n "$orig_args"
4747

4848
release="${1#v}"
4949
tag="v${release}"

scripts/copy-res.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const INCLUDE_LANGS = [
3535
{'value': 'ja', 'label': '日本語'},
3636
{'value': 'kab', 'label': 'Taqbaylit'},
3737
{'value': 'ko', 'label': '한국어'},
38+
{'value': 'lo', 'label': 'ລາວ'},
3839
{'value': 'lt', 'label': 'Lietuvių'},
3940
{'value': 'lv', 'label': 'Latviešu'},
4041
{'value': 'nb_NO', 'label': 'Norwegian Bokmål'},

src/vector/jitsi/index.ts

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ const ack = (ev: CustomEvent<IWidgetApiRequest>) => widgetApi.transport.reply(ev
156156
ack(ev);
157157
},
158158
);
159+
widgetApi.on(`action:${ElementWidgetActions.ForceHangupCall}`,
160+
(ev: CustomEvent<IWidgetApiRequest>) => {
161+
meetApi?.dispose();
162+
notifyHangup();
163+
meetApi = null;
164+
closeConference();
165+
ack(ev);
166+
},
167+
);
159168
widgetApi.on(`action:${ElementWidgetActions.MuteAudio}`,
160169
async (ev: CustomEvent<IWidgetApiRequest>) => {
161170
ack(ev);
@@ -291,12 +300,12 @@ function createJWTToken() {
291300
);
292301
}
293302

294-
async function notifyHangup() {
303+
async function notifyHangup(errorMessage?: string) {
295304
if (widgetApi) {
296305
// We send the hangup event before setAlwaysOnScreen, because the latter
297306
// can cause the receiving side to instantly stop listening.
298307
try {
299-
await widgetApi.transport.send(ElementWidgetActions.HangupCall, {});
308+
await widgetApi.transport.send(ElementWidgetActions.HangupCall, { errorMessage });
300309
} finally {
301310
await widgetApi.setAlwaysOnScreen(false);
302311
}
@@ -357,6 +366,12 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
357366
startAudioOnly,
358367
startWithAudioMuted: audioDevice == null,
359368
startWithVideoMuted: videoDevice == null,
369+
// Request some log levels for inclusion in rageshakes
370+
// Ideally we would capture all possible log levels, but this can
371+
// cause Jitsi Meet to try to post various circular data structures
372+
// back over the iframe API, and therefore end up crashing
373+
// https://github.com/jitsi/jitsi-meet/issues/11585
374+
apiLogLevels: ["warn", "error"],
360375
} as any,
361376
jwt: jwt,
362377
};
@@ -403,15 +418,15 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
403418
if (error.isFatal) {
404419
// We got disconnected. Since Jitsi Meet might send us back to the
405420
// prejoin screen, we're forced to act as if we hung up entirely.
406-
notifyHangup();
421+
notifyHangup(error.message);
407422
meetApi = null;
408423
closeConference();
409424
}
410425
});
411426

412427
meetApi.on("audioMuteStatusChanged", ({ muted }) => {
413428
const action = muted ? ElementWidgetActions.MuteAudio : ElementWidgetActions.UnmuteAudio;
414-
widgetApi.transport.send(action, {});
429+
widgetApi?.transport.send(action, {});
415430
});
416431

417432
meetApi.on("videoMuteStatusChanged", ({ muted }) => {
@@ -421,10 +436,10 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
421436
// otherwise the React SDK will mistakenly think the user turned off
422437
// their video by hand
423438
setTimeout(() => {
424-
if (meetApi) widgetApi.transport.send(ElementWidgetActions.MuteVideo, {});
439+
if (meetApi) widgetApi?.transport.send(ElementWidgetActions.MuteVideo, {});
425440
}, 200);
426441
} else {
427-
widgetApi.transport.send(ElementWidgetActions.UnmuteVideo, {});
442+
widgetApi?.transport.send(ElementWidgetActions.UnmuteVideo, {});
428443
}
429444
});
430445

@@ -435,4 +450,9 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
435450
});
436451
});
437452
});
453+
454+
// Patch logs into rageshakes
455+
meetApi.on("log", ({ logLevel, args }) =>
456+
(parent as unknown as typeof global).mx_rage_logger?.log(logLevel, ...args),
457+
);
438458
}

src/vector/platform/ElectronPlatform.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,18 @@ export default class ElectronPlatform extends VectorBasePlatform {
414414
return this.ipcCall('setMinimizeToTrayEnabled', enabled);
415415
}
416416

417+
public supportsTogglingHardwareAcceleration(): boolean {
418+
return true;
419+
}
420+
421+
public async getHardwareAccelerationEnabled(): Promise<boolean> {
422+
return this.ipcCall('getHardwareAccelerationEnabled');
423+
}
424+
425+
public async setHardwareAccelerationEnabled(enabled: boolean): Promise<void> {
426+
return this.ipcCall('setHardwareAccelerationEnabled', enabled);
427+
}
428+
417429
async canSelfUpdate(): Promise<boolean> {
418430
const feedUrl = await this.ipcCall('getUpdateFeedUrl');
419431
return Boolean(feedUrl);

0 commit comments

Comments
 (0)