diff --git a/.eslintrc.js b/.eslintrc.js
index 827b373949..9d68942228 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -63,6 +63,11 @@ module.exports = {
"@typescript-eslint/ban-ts-comment": "off",
},
}],
+ settings: {
+ react: {
+ version: "detect",
+ }
+ }
};
function buildRestrictedPropertiesOptions(properties, message) {
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 0ae59da09a..4f9826391a 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -10,6 +10,8 @@ on:
jobs:
end-to-end:
runs-on: ubuntu-latest
+ env:
+ PR_NUMBER: ${{github.event.number}}
container: vectorim/element-web-ci-e2etests-env:latest
steps:
- name: Checkout code
diff --git a/.github/workflows/typecheck.yaml b/.github/workflows/typecheck.yaml
new file mode 100644
index 0000000000..2e08418cf6
--- /dev/null
+++ b/.github/workflows/typecheck.yaml
@@ -0,0 +1,24 @@
+name: Type Check
+on:
+ pull_request:
+ branches: [develop]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: c-hive/gha-yarn-cache@v2
+ - name: Install Deps
+ run: "./scripts/ci/install-deps.sh --ignore-scripts"
+ - name: Typecheck
+ run: "yarn run lint:types"
+ - name: Switch js-sdk to release mode
+ run: |
+ scripts/ci/js-sdk-to-release.js
+ cd node_modules/matrix-js-sdk
+ yarn install
+ yarn run build:compile
+ yarn run build:types
+ - name: Typecheck (release mode)
+ run: "yarn run lint:types"
+
diff --git a/.stylelintrc.js b/.stylelintrc.js
index 0e6de7000f..c044b19a63 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -17,6 +17,7 @@ module.exports = {
"selector-list-comma-newline-after": null,
"at-rule-no-unknown": null,
"no-descending-specificity": null,
+ "no-empty-first-line": true,
"scss/at-rule-no-unknown": [true, {
// https://github.com/vector-im/element-web/issues/10544
"ignoreAtRules": ["define-mixin"],
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f71c1414c..9a445a4041 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,114 @@
+Changes in [3.30.0](https://github.com/vector-im/element-desktop/releases/tag/v3.30.0) (2021-09-14)
+===================================================================================================
+
+## ✨ Features
+ * Add bubble highlight styling ([\#6582](https://github.com/matrix-org/matrix-react-sdk/pull/6582)). Fixes vector-im/element-web#18295 and vector-im/element-web#18295. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * [Release] Add config option to turn on in-room event sending timing metrics ([\#6773](https://github.com/matrix-org/matrix-react-sdk/pull/6773)).
+ * Create narrow mode for Composer ([\#6682](https://github.com/matrix-org/matrix-react-sdk/pull/6682)). Fixes vector-im/element-web#18533 and vector-im/element-web#18533.
+ * Prefer matrix.to alias links over room id in spaces & share ([\#6745](https://github.com/matrix-org/matrix-react-sdk/pull/6745)). Fixes vector-im/element-web#18796 and vector-im/element-web#18796.
+ * Stop automatic playback of voice messages if a non-voice message is encountered ([\#6728](https://github.com/matrix-org/matrix-react-sdk/pull/6728)). Fixes vector-im/element-web#18850 and vector-im/element-web#18850.
+ * Show call length during a call ([\#6700](https://github.com/matrix-org/matrix-react-sdk/pull/6700)). Fixes vector-im/element-web#18566 and vector-im/element-web#18566. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Serialize and retry mass-leave when leaving space ([\#6737](https://github.com/matrix-org/matrix-react-sdk/pull/6737)). Fixes vector-im/element-web#18789 and vector-im/element-web#18789.
+ * Improve form handling in and around space creation ([\#6739](https://github.com/matrix-org/matrix-react-sdk/pull/6739)). Fixes vector-im/element-web#18775 and vector-im/element-web#18775.
+ * Split autoplay GIFs and videos into different settings ([\#6726](https://github.com/matrix-org/matrix-react-sdk/pull/6726)). Fixes vector-im/element-web#5771 and vector-im/element-web#5771. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Add autoplay for voice messages ([\#6710](https://github.com/matrix-org/matrix-react-sdk/pull/6710)). Fixes vector-im/element-web#18804, vector-im/element-web#18715, vector-im/element-web#18714 vector-im/element-web#17961 and vector-im/element-web#18804.
+ * Allow to use basic html to format invite messages ([\#6703](https://github.com/matrix-org/matrix-react-sdk/pull/6703)). Fixes vector-im/element-web#15738 and vector-im/element-web#15738. Contributed by [skolmer](https://github.com/skolmer).
+ * Allow widgets, when eligible, to interact with more rooms as per MSC2762 ([\#6684](https://github.com/matrix-org/matrix-react-sdk/pull/6684)).
+ * Remove arbitrary limits from send/receive events for widgets ([\#6719](https://github.com/matrix-org/matrix-react-sdk/pull/6719)). Fixes vector-im/element-web#17994 and vector-im/element-web#17994.
+ * Reload suggested rooms if we see the state change down /sync ([\#6715](https://github.com/matrix-org/matrix-react-sdk/pull/6715)). Fixes vector-im/element-web#18761 and vector-im/element-web#18761.
+ * When creating private spaces, make the initial rooms restricted if supported ([\#6721](https://github.com/matrix-org/matrix-react-sdk/pull/6721)). Fixes vector-im/element-web#18722 and vector-im/element-web#18722.
+ * Threading exploration work ([\#6658](https://github.com/matrix-org/matrix-react-sdk/pull/6658)). Fixes vector-im/element-web#18532 and vector-im/element-web#18532.
+ * Default to `Don't leave any` when leaving a space ([\#6697](https://github.com/matrix-org/matrix-react-sdk/pull/6697)). Fixes vector-im/element-web#18592 and vector-im/element-web#18592. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Special case redaction event sending from widgets per MSC2762 ([\#6686](https://github.com/matrix-org/matrix-react-sdk/pull/6686)). Fixes vector-im/element-web#18573 and vector-im/element-web#18573.
+ * Add active speaker indicators ([\#6639](https://github.com/matrix-org/matrix-react-sdk/pull/6639)). Fixes vector-im/element-web#17627 and vector-im/element-web#17627. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Increase general app performance by optimizing layers ([\#6644](https://github.com/matrix-org/matrix-react-sdk/pull/6644)). Fixes vector-im/element-web#18730 and vector-im/element-web#18730. Contributed by [Palid](https://github.com/Palid).
+
+## 🐛 Bug Fixes
+ * Fix autocomplete not having y-scroll ([\#6802](https://github.com/matrix-org/matrix-react-sdk/pull/6802)).
+ * Fix emoji picker and stickerpicker not appearing correctly when opened ([\#6801](https://github.com/matrix-org/matrix-react-sdk/pull/6801)).
+ * Debounce read marker update on scroll ([\#6774](https://github.com/matrix-org/matrix-react-sdk/pull/6774)).
+ * Fix Space creation wizard go to my first room button behaviour ([\#6748](https://github.com/matrix-org/matrix-react-sdk/pull/6748)). Fixes vector-im/element-web#18764 and vector-im/element-web#18764.
+ * Fix scroll being stuck at bottom ([\#6751](https://github.com/matrix-org/matrix-react-sdk/pull/6751)). Fixes vector-im/element-web#18903 and vector-im/element-web#18903.
+ * Fix widgets not remembering identity verification when asked to. ([\#6742](https://github.com/matrix-org/matrix-react-sdk/pull/6742)). Fixes vector-im/element-web#15631 and vector-im/element-web#15631.
+ * Add missing pluralisation i18n strings for Spaces ([\#6738](https://github.com/matrix-org/matrix-react-sdk/pull/6738)). Fixes vector-im/element-web#18780 and vector-im/element-web#18780.
+ * Make ForgotPassword UX slightly more user friendly ([\#6636](https://github.com/matrix-org/matrix-react-sdk/pull/6636)). Fixes vector-im/element-web#11531 and vector-im/element-web#11531. Contributed by [Palid](https://github.com/Palid).
+ * Don't context switch room on SpaceStore ready as it can break permalinks ([\#6730](https://github.com/matrix-org/matrix-react-sdk/pull/6730)). Fixes vector-im/element-web#17974 and vector-im/element-web#17974.
+ * Fix explore rooms button not working during space creation wizard ([\#6729](https://github.com/matrix-org/matrix-react-sdk/pull/6729)). Fixes vector-im/element-web#18762 and vector-im/element-web#18762.
+ * Fix bug where one party's media would sometimes not be shown ([\#6731](https://github.com/matrix-org/matrix-react-sdk/pull/6731)).
+ * Only make the initial space rooms suggested by default ([\#6714](https://github.com/matrix-org/matrix-react-sdk/pull/6714)). Fixes vector-im/element-web#18760 and vector-im/element-web#18760.
+ * Replace fake username in EventTilePreview with a proper loading state ([\#6702](https://github.com/matrix-org/matrix-react-sdk/pull/6702)). Fixes vector-im/element-web#15897 and vector-im/element-web#15897. Contributed by [skolmer](https://github.com/skolmer).
+ * Don't send prehistorical events to widgets during decryption at startup ([\#6695](https://github.com/matrix-org/matrix-react-sdk/pull/6695)). Fixes vector-im/element-web#18060 and vector-im/element-web#18060.
+ * When creating subspaces properly set restricted join rule ([\#6725](https://github.com/matrix-org/matrix-react-sdk/pull/6725)). Fixes vector-im/element-web#18797 and vector-im/element-web#18797.
+ * Fix the Image View not openning for some pinned messages ([\#6723](https://github.com/matrix-org/matrix-react-sdk/pull/6723)). Fixes vector-im/element-web#18422 and vector-im/element-web#18422. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show autocomplete sections vertically ([\#6722](https://github.com/matrix-org/matrix-react-sdk/pull/6722)). Fixes vector-im/element-web#18860 and vector-im/element-web#18860. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix EmojiPicker filtering to lower case emojibase data strings ([\#6717](https://github.com/matrix-org/matrix-react-sdk/pull/6717)). Fixes vector-im/element-web#18686 and vector-im/element-web#18686.
+ * Clear currentRoomId when viewing home page, fixing document title ([\#6716](https://github.com/matrix-org/matrix-react-sdk/pull/6716)). Fixes vector-im/element-web#18668 and vector-im/element-web#18668.
+ * Fix membership updates to Spaces not applying in real-time ([\#6713](https://github.com/matrix-org/matrix-react-sdk/pull/6713)). Fixes vector-im/element-web#18737 and vector-im/element-web#18737.
+ * Don't show a double stacked invite modals when inviting to Spaces ([\#6698](https://github.com/matrix-org/matrix-react-sdk/pull/6698)). Fixes vector-im/element-web#18745 and vector-im/element-web#18745. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remove non-functional DuckDuckGo Autocomplete Provider ([\#6712](https://github.com/matrix-org/matrix-react-sdk/pull/6712)). Fixes vector-im/element-web#18778 and vector-im/element-web#18778.
+ * Filter members on `MemberList` load ([\#6708](https://github.com/matrix-org/matrix-react-sdk/pull/6708)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix improper voice messages being produced in Firefox and sometimes other browsers. ([\#6696](https://github.com/matrix-org/matrix-react-sdk/pull/6696)). Fixes vector-im/element-web#18587 and vector-im/element-web#18587.
+ * Fix client forgetting which capabilities a widget was approved for ([\#6685](https://github.com/matrix-org/matrix-react-sdk/pull/6685)). Fixes vector-im/element-web#18786 and vector-im/element-web#18786.
+ * Fix left panel widgets not remembering collapsed state ([\#6687](https://github.com/matrix-org/matrix-react-sdk/pull/6687)). Fixes vector-im/element-web#17803 and vector-im/element-web#17803.
+ * Fix changelog link colour back to blue ([\#6692](https://github.com/matrix-org/matrix-react-sdk/pull/6692)). Fixes vector-im/element-web#18726 and vector-im/element-web#18726.
+ * Soften codeblock border color ([\#6564](https://github.com/matrix-org/matrix-react-sdk/pull/6564)). Fixes vector-im/element-web#18367 and vector-im/element-web#18367. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Pause ringing more aggressively ([\#6691](https://github.com/matrix-org/matrix-react-sdk/pull/6691)). Fixes vector-im/element-web#18588 and vector-im/element-web#18588. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix command autocomplete ([\#6680](https://github.com/matrix-org/matrix-react-sdk/pull/6680)). Fixes vector-im/element-web#18670 and vector-im/element-web#18670. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Don't re-sort the room-list based on profile/status changes ([\#6595](https://github.com/matrix-org/matrix-react-sdk/pull/6595)). Fixes vector-im/element-web#110 and vector-im/element-web#110. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix codeblock formatting with syntax highlighting on ([\#6681](https://github.com/matrix-org/matrix-react-sdk/pull/6681)). Fixes vector-im/element-web#18739 vector-im/element-web#18365 and vector-im/element-web#18739. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Add padding to the Add button in the notification settings ([\#6665](https://github.com/matrix-org/matrix-react-sdk/pull/6665)). Fixes vector-im/element-web#18706 and vector-im/element-web#18706. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
+Changes in [3.29.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.29.1) (2021-09-13)
+===================================================================================================
+
+## 🔒 SECURITY FIXES
+ * Fix a security issue with message key sharing. See https://matrix.org/blog/2021/09/13/vulnerability-disclosure-key-sharing
+ for details.
+
+Changes in [3.29.0](https://github.com/vector-im/element-desktop/releases/tag/v3.29.0) (2021-08-31)
+===================================================================================================
+
+## ✨ Features
+ * [Release]Increase general app performance by optimizing layers ([\#6672](https://github.com/matrix-org/matrix-react-sdk/pull/6672)). Fixes vector-im/element-web#18730 and vector-im/element-web#18730. Contributed by [Palid](https://github.com/Palid).
+ * Add a warning on E2EE rooms if you try to make them public ([\#5698](https://github.com/matrix-org/matrix-react-sdk/pull/5698)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow pagination of the space hierarchy and use new APIs ([\#6507](https://github.com/matrix-org/matrix-react-sdk/pull/6507)). Fixes vector-im/element-web#18089 and vector-im/element-web#18427.
+ * Improve emoji in composer ([\#6650](https://github.com/matrix-org/matrix-react-sdk/pull/6650)). Fixes vector-im/element-web#18593 and vector-im/element-web#18593. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow playback of replied-to voice message ([\#6629](https://github.com/matrix-org/matrix-react-sdk/pull/6629)). Fixes vector-im/element-web#18599 and vector-im/element-web#18599. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Format autocomplete suggestions vertically ([\#6620](https://github.com/matrix-org/matrix-react-sdk/pull/6620)). Fixes vector-im/element-web#17574 and vector-im/element-web#17574. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remember last `MemberList` search query per-room ([\#6640](https://github.com/matrix-org/matrix-react-sdk/pull/6640)). Fixes vector-im/element-web#18613 and vector-im/element-web#18613. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Sentry rageshakes ([\#6597](https://github.com/matrix-org/matrix-react-sdk/pull/6597)). Fixes vector-im/element-web#11111 and vector-im/element-web#11111. Contributed by [novocaine](https://github.com/novocaine).
+ * Autocomplete has been updated to match modern accessibility standards. Navigate via up/down arrows rather than Tab. Enter or Tab to confirm a suggestion. This should be familiar to Slack & Discord users. You can now use Tab to navigate around the application and do more without touching your mouse. No more accidentally sending half of people's names because the completion didn't fire on Enter! ([\#5659](https://github.com/matrix-org/matrix-react-sdk/pull/5659)). Fixes vector-im/element-web#4872, vector-im/element-web#11071, vector-im/element-web#17171, vector-im/element-web#15646 vector-im/element-web#4872 and vector-im/element-web#4872.
+ * Add new call tile states ([\#6610](https://github.com/matrix-org/matrix-react-sdk/pull/6610)). Fixes vector-im/element-web#18521 and vector-im/element-web#18521. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Left align call tiles ([\#6609](https://github.com/matrix-org/matrix-react-sdk/pull/6609)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Make loading encrypted images look snappier ([\#6590](https://github.com/matrix-org/matrix-react-sdk/pull/6590)). Fixes vector-im/element-web#17878 and vector-im/element-web#17862. Contributed by [Palid](https://github.com/Palid).
+ * Offer a way to create a space based on existing community ([\#6543](https://github.com/matrix-org/matrix-react-sdk/pull/6543)). Fixes vector-im/element-web#18092.
+ * Accessibility improvements in and around Spaces ([\#6569](https://github.com/matrix-org/matrix-react-sdk/pull/6569)). Fixes vector-im/element-web#18094 and vector-im/element-web#18094.
+
+## 🐛 Bug Fixes
+ * [Release] Fix commit edit history ([\#6690](https://github.com/matrix-org/matrix-react-sdk/pull/6690)). Fixes vector-im/element-web#18742 and vector-im/element-web#18742. Contributed by [Palid](https://github.com/Palid).
+ * Fix images not rendering when sent from other clients. ([\#6661](https://github.com/matrix-org/matrix-react-sdk/pull/6661)). Fixes vector-im/element-web#18702 and vector-im/element-web#18702.
+ * Fix autocomplete scrollbar and make the autocomplete a little smaller ([\#6655](https://github.com/matrix-org/matrix-react-sdk/pull/6655)). Fixes vector-im/element-web#18682 and vector-im/element-web#18682. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix replies on the bubble layout ([\#6451](https://github.com/matrix-org/matrix-react-sdk/pull/6451)). Fixes vector-im/element-web#18184. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show "Enable encryption in settings" only when the user can do that ([\#6646](https://github.com/matrix-org/matrix-react-sdk/pull/6646)). Fixes vector-im/element-web#18646 and vector-im/element-web#18646. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix cross signing setup from settings screen ([\#6633](https://github.com/matrix-org/matrix-react-sdk/pull/6633)). Fixes vector-im/element-web#17761 and vector-im/element-web#17761.
+ * Fix call tiles on the bubble layout ([\#6647](https://github.com/matrix-org/matrix-react-sdk/pull/6647)). Fixes vector-im/element-web#18648 and vector-im/element-web#18648. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix error on accessing encrypted media without encryption keys ([\#6625](https://github.com/matrix-org/matrix-react-sdk/pull/6625)). Contributed by [Palid](https://github.com/Palid).
+ * Fix jitsi widget sometimes being permanently stuck in the bottom-right corner ([\#6632](https://github.com/matrix-org/matrix-react-sdk/pull/6632)). Fixes vector-im/element-web#17226 and vector-im/element-web#17226. Contributed by [Palid](https://github.com/Palid).
+ * Fix FilePanel pagination in E2EE rooms ([\#6630](https://github.com/matrix-org/matrix-react-sdk/pull/6630)). Fixes vector-im/element-web#18415 and vector-im/element-web#18415. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix call tile buttons ([\#6624](https://github.com/matrix-org/matrix-react-sdk/pull/6624)). Fixes vector-im/element-web#18565 and vector-im/element-web#18565. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix vertical call tile spacing issues ([\#6621](https://github.com/matrix-org/matrix-react-sdk/pull/6621)). Fixes vector-im/element-web#18558 and vector-im/element-web#18558. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix long display names in call tiles ([\#6618](https://github.com/matrix-org/matrix-react-sdk/pull/6618)). Fixes vector-im/element-web#18562 and vector-im/element-web#18562. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Avoid access token overflow ([\#6616](https://github.com/matrix-org/matrix-react-sdk/pull/6616)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Properly handle media errors ([\#6615](https://github.com/matrix-org/matrix-react-sdk/pull/6615)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix glare related regressions ([\#6614](https://github.com/matrix-org/matrix-react-sdk/pull/6614)). Fixes vector-im/element-web#18538 and vector-im/element-web#18538. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix long display names in call toasts ([\#6617](https://github.com/matrix-org/matrix-react-sdk/pull/6617)). Fixes vector-im/element-web#18557 and vector-im/element-web#18557. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix PiP of held calls ([\#6611](https://github.com/matrix-org/matrix-react-sdk/pull/6611)). Fixes vector-im/element-web#18539 and vector-im/element-web#18539. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix call tile behaviour on narrow layouts ([\#6556](https://github.com/matrix-org/matrix-react-sdk/pull/6556)). Fixes vector-im/element-web#18398. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix video call persisting when widget removed ([\#6608](https://github.com/matrix-org/matrix-react-sdk/pull/6608)). Fixes vector-im/element-web#15703 and vector-im/element-web#15703.
+ * Fix toast colors ([\#6606](https://github.com/matrix-org/matrix-react-sdk/pull/6606)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remove tiny scrollbar dot from code blocks ([\#6596](https://github.com/matrix-org/matrix-react-sdk/pull/6596)). Fixes vector-im/element-web#18474. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve handling of pills in the composer ([\#6353](https://github.com/matrix-org/matrix-react-sdk/pull/6353)). Fixes vector-im/element-web#10134 vector-im/element-web#10896 and vector-im/element-web#15037. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
Changes in [3.28.1](https://github.com/vector-im/element-desktop/releases/tag/v3.28.1) (2021-08-17)
===================================================================================================
diff --git a/package.json b/package.json
index e0883f5556..532e4218d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
- "version": "3.28.1",
+ "version": "3.30.0",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
@@ -83,7 +83,7 @@
"linkifyjs": "^2.1.9",
"lodash": "^4.17.20",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
- "matrix-widget-api": "^0.1.0-beta.15",
+ "matrix-widget-api": "^0.1.0-beta.16",
"minimist": "^1.2.5",
"opus-recorder": "^8.0.3",
"pako": "^2.0.3",
@@ -151,7 +151,7 @@
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
- "allchange": "^1.0.0",
+ "allchange": "^1.0.3",
"babel-jest": "^26.6.3",
"chokidar": "^3.5.1",
"concurrently": "^5.3.0",
diff --git a/res/css/_common.scss b/res/css/_common.scss
index fa925eba5b..a16e7d4d8f 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -53,8 +53,8 @@ html {
body {
font-family: $font-family;
font-size: $font-15px;
- background-color: $primary-bg-color;
- color: $primary-fg-color;
+ background-color: $background;
+ color: $primary-content;
border: 0px;
margin: 0px;
@@ -89,7 +89,7 @@ b {
}
h2 {
- color: $primary-fg-color;
+ color: $primary-content;
font-weight: 400;
font-size: $font-18px;
margin-top: 16px;
@@ -142,12 +142,12 @@ textarea::placeholder {
input[type=text], input[type=password], textarea {
background-color: transparent;
- color: $primary-fg-color;
+ color: $primary-content;
}
/* Required by Firefox */
textarea {
- color: $primary-fg-color;
+ color: $primary-content;
}
input[type=text]:focus, input[type=password]:focus, textarea:focus {
@@ -168,12 +168,12 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
// it has the appearance of a text box so the controls
// appear to be part of the input
-.mx_Dialog, .mx_MatrixChat {
+.mx_Dialog, .mx_MatrixChat_wrapper {
.mx_textinput > input[type=text],
.mx_textinput > input[type=search] {
border: none;
flex: 1;
- color: $primary-fg-color;
+ color: $primary-content;
}
:not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=text],
@@ -184,7 +184,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
background-color: transparent;
color: $input-darker-fg-color;
border-radius: 4px;
- border: 1px solid rgba($primary-fg-color, .1);
+ border: 1px solid rgba($primary-content, .1);
// these things should probably not be defined globally
margin: 9px;
}
@@ -209,7 +209,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
:not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=search],
.mx_textinput {
color: $input-darker-fg-color;
- background-color: $primary-bg-color;
+ background-color: $background;
border: none;
}
}
@@ -271,7 +271,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
}
.mx_Dialog {
- background-color: $primary-bg-color;
+ background-color: $background;
color: $light-fg-color;
z-index: 4012;
font-weight: 300;
@@ -379,7 +379,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_Dialog_content {
margin: 24px 0 68px;
font-size: $font-14px;
- color: $primary-fg-color;
+ color: $primary-content;
word-wrap: break-word;
}
@@ -488,8 +488,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
border-radius: 3px;
border: 1px solid $input-border-color;
padding: 9px;
- color: $primary-fg-color;
- background-color: $primary-bg-color;
+ color: $primary-content;
+ background-color: $background;
}
.mx_textButton {
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 035caec36a..ffaec43b68 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -17,6 +17,7 @@
@import "./structures/_LeftPanelWidget.scss";
@import "./structures/_MainSplit.scss";
@import "./structures/_MatrixChat.scss";
+@import "./structures/_BackdropPanel.scss";
@import "./structures/_MyGroups.scss";
@import "./structures/_NonUrgentToastContainer.scss";
@import "./structures/_NotificationPanel.scss";
@@ -27,8 +28,8 @@
@import "./structures/_RoomView.scss";
@import "./structures/_ScrollPanel.scss";
@import "./structures/_SearchBox.scss";
+@import "./structures/_SpaceHierarchy.scss";
@import "./structures/_SpacePanel.scss";
-@import "./structures/_SpaceRoomDirectory.scss";
@import "./structures/_SpaceRoomView.scss";
@import "./structures/_TabbedView.scss";
@import "./structures/_ToastContainer.scss";
@@ -131,6 +132,7 @@
@import "./views/elements/_EditableItemList.scss";
@import "./views/elements/_ErrorBoundary.scss";
@import "./views/elements/_EventListSummary.scss";
+@import "./views/elements/_EventTilePreview.scss";
@import "./views/elements/_FacePile.scss";
@import "./views/elements/_Field.scss";
@import "./views/elements/_ImageView.scss";
diff --git a/res/css/structures/_BackdropPanel.scss b/res/css/structures/_BackdropPanel.scss
new file mode 100644
index 0000000000..482507cb15
--- /dev/null
+++ b/res/css/structures/_BackdropPanel.scss
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_BackdropPanel {
+ position: absolute;
+ left: 0;
+ top: 0;
+ height: 100vh;
+ width: 100%;
+ overflow: hidden;
+ filter: blur(var(--lp-background-blur));
+ // Force a new layer for the backdropPanel so it's better hardware supported
+ transform: translateZ(0);
+}
+
+.mx_BackdropPanel--image {
+ position: absolute;
+ top: 0;
+ left: 0;
+ min-height: 100%;
+ z-index: 0;
+ pointer-events: none;
+ overflow: hidden;
+}
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index d7f2cb76e8..9f2b9e24b8 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -34,7 +34,7 @@ limitations under the License.
border-radius: 8px;
box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
background-color: $menu-bg-color;
- color: $primary-fg-color;
+ color: $primary-content;
position: absolute;
font-size: $font-14px;
z-index: 5001;
diff --git a/res/css/structures/_CreateRoom.scss b/res/css/structures/_CreateRoom.scss
index e859beb20e..3d23ccc4b2 100644
--- a/res/css/structures/_CreateRoom.scss
+++ b/res/css/structures/_CreateRoom.scss
@@ -18,7 +18,7 @@ limitations under the License.
width: 960px;
margin-left: auto;
margin-right: auto;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_CreateRoom input,
diff --git a/res/css/structures/_GroupFilterPanel.scss b/res/css/structures/_GroupFilterPanel.scss
index 444435dd57..cc0e760031 100644
--- a/res/css/structures/_GroupFilterPanel.scss
+++ b/res/css/structures/_GroupFilterPanel.scss
@@ -14,10 +14,27 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
+
+.mx_GroupFilterPanelContainer {
+ flex-grow: 0;
+ flex-shrink: 0;
+ width: $groupFilterPanelWidth;
+ height: 100%;
+
+ // Create another flexbox so the GroupFilterPanel fills the container
+ display: flex;
+ flex-direction: column;
+
+ // GroupFilterPanel handles its own CSS
+}
+
.mx_GroupFilterPanel {
- flex: 1;
+ z-index: 1;
background-color: $groupFilterPanel-bg-color;
+ flex: 1;
cursor: pointer;
+ position: relative;
display: flex;
flex-direction: column;
@@ -75,13 +92,13 @@ limitations under the License.
}
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected_prototype {
- background-color: $primary-bg-color;
+ background-color: $background;
border-radius: 6px;
}
.mx_TagTile_selected_prototype {
.mx_TagTile_homeIcon::before {
- background-color: $primary-fg-color; // dark-on-light
+ background-color: $primary-content; // dark-on-light
}
}
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index fb660f4194..5e224b1f38 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -132,7 +132,7 @@ limitations under the License.
width: 100%;
height: 31px;
overflow: hidden;
- color: $primary-fg-color;
+ color: $primary-content;
font-weight: bold;
font-size: $font-22px;
padding-left: 19px;
@@ -397,7 +397,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
.mx_AccessibleButton_kind_link {
@@ -422,7 +422,7 @@ limitations under the License.
mask-position: center;
mask-size: 8px;
mask-image: url('$(res)/img/image-view/close.svg');
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
}
}
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index f254ca3226..5ddea244f3 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -14,31 +14,47 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
$roomListCollapsedWidth: 68px;
+.mx_MatrixChat--with-avatar {
+ .mx_LeftPanel,
+ .mx_LeftPanel .mx_LeftPanel_roomListContainer {
+ background-color: transparent;
+ }
+}
+
+.mx_LeftPanel_wrapper {
+ display: flex;
+ max-width: 50%;
+ position: relative;
+
+ // Contain the amount of layers rendered by constraining what actually needs re-layering via css
+ contain: layout paint;
+
+ .mx_LeftPanel_wrapper--user {
+ background-color: $roomlist-bg-color;
+ display: flex;
+ overflow: hidden;
+ position: relative;
+
+ &[data-collapsed] {
+ max-width: $roomListCollapsedWidth;
+ }
+ }
+}
+
+
+
.mx_LeftPanel {
background-color: $roomlist-bg-color;
// TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
- min-width: 206px;
- max-width: 50%;
// Create a row-based flexbox for the GroupFilterPanel and the room list
display: flex;
contain: content;
-
- .mx_LeftPanel_GroupFilterPanelContainer {
- flex-grow: 0;
- flex-shrink: 0;
- flex-basis: $groupFilterPanelWidth;
- height: 100%;
-
- // Create another flexbox so the GroupFilterPanel fills the container
- display: flex;
- flex-direction: column;
-
- // GroupFilterPanel handles its own CSS
- }
+ position: relative;
+ flex-grow: 1;
+ overflow: hidden;
// Note: The 'room list' in this context is actually everything that isn't the tag
// panel, such as the menu options, breadcrumbs, filtering, etc
@@ -130,7 +146,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $secondary-fg-color;
+ background: $secondary-content;
}
}
@@ -153,7 +169,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $secondary-fg-color;
+ background: $secondary-content;
}
&.mx_LeftPanel_exploreButton_space::before {
@@ -171,6 +187,8 @@ $roomListCollapsedWidth: 68px;
}
.mx_LeftPanel_roomListWrapper {
+ // Make the y-scrollbar more responsive
+ padding-right: 2px;
overflow: hidden;
margin-top: 10px; // so we're not up against the search/filter
flex: 1 0 0; // needed in Safari to properly set flex-basis
@@ -192,6 +210,7 @@ $roomListCollapsedWidth: 68px;
// These styles override the defaults for the minimized (66px) layout
&.mx_LeftPanel_minimized {
+ flex-grow: 0;
min-width: unset;
width: unset !important;
diff --git a/res/css/structures/_LeftPanelWidget.scss b/res/css/structures/_LeftPanelWidget.scss
index 6e2d99bb37..93c2898395 100644
--- a/res/css/structures/_LeftPanelWidget.scss
+++ b/res/css/structures/_LeftPanelWidget.scss
@@ -113,7 +113,7 @@ limitations under the License.
&:hover .mx_LeftPanelWidget_resizerHandle {
opacity: 0.8;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_LeftPanelWidget_maximizeButton {
diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 8199121420..407a1c270c 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -38,7 +38,7 @@ limitations under the License.
width: 4px !important;
border-radius: 4px !important;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
opacity: 0.8;
}
}
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index a220c5d505..fdf5cb1a03 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -29,8 +29,6 @@ limitations under the License.
.mx_MatrixChat_wrapper {
display: flex;
- flex-direction: column;
-
width: 100%;
height: 100%;
}
@@ -42,13 +40,12 @@ limitations under the License.
}
.mx_MatrixChat {
+ position: relative;
width: 100%;
height: 100%;
display: flex;
- order: 2;
-
flex: 1;
min-height: 0;
}
@@ -66,8 +63,8 @@ limitations under the License.
}
/* not the left panel, and not the resize handle, so the roomview/groupview/... */
-.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle) {
- background-color: $primary-bg-color;
+.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
+ background-color: $background;
flex: 1 1 0;
min-width: 0;
@@ -94,7 +91,7 @@ limitations under the License.
content: ' ';
- background-color: $primary-fg-color;
+ background-color: $primary-content;
opacity: 0.8;
}
}
diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss
index d271cd2bcc..68e1dd6a9a 100644
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -49,7 +49,7 @@ limitations under the License.
bottom: 0;
left: 0;
right: 0;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
height: 1px;
opacity: 0.4;
content: '';
@@ -70,7 +70,7 @@ limitations under the License.
}
.mx_NotificationPanel .mx_EventTile_roomName a {
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_NotificationPanel .mx_EventTile_avatar {
@@ -79,7 +79,7 @@ limitations under the License.
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-12px;
display: inline;
}
@@ -118,7 +118,7 @@ limitations under the License.
}
.mx_NotificationPanel .mx_EventTile:hover .mx_EventTile_line {
- background-color: $primary-bg-color;
+ background-color: $background;
}
.mx_NotificationPanel .mx_EventTile_content {
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 3222fe936c..5316cba61d 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -43,7 +43,7 @@ limitations under the License.
.mx_RightPanel_headerButtonGroup {
height: 100%;
display: flex;
- background-color: $primary-bg-color;
+ background-color: $background;
padding: 0 9px;
align-items: center;
}
diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index ec07500af5..fb0f7d10e1 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -28,7 +28,7 @@ limitations under the License.
.mx_RoomDirectory {
margin-bottom: 12px;
- color: $primary-fg-color;
+ color: $primary-content;
word-break: break-word;
display: flex;
flex-direction: column;
@@ -71,14 +71,14 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
- color: $primary-fg-color;
+ color: $primary-content;
}
> p {
margin: 40px auto 60px;
font-size: $font-14px;
line-height: $font-20px;
- color: $secondary-fg-color;
+ color: $secondary-content;
max-width: 464px; // easier reading
}
@@ -97,7 +97,7 @@ limitations under the License.
}
.mx_RoomDirectory_table {
- color: $primary-fg-color;
+ color: $primary-content;
display: grid;
font-size: $font-12px;
grid-template-columns: max-content auto max-content max-content max-content;
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
index 7fdafab5a6..bbd60a5ff3 100644
--- a/res/css/structures/_RoomSearch.scss
+++ b/res/css/structures/_RoomSearch.scss
@@ -33,14 +33,14 @@ limitations under the License.
height: 16px;
mask: url('$(res)/img/element-icons/roomlist/search.svg');
mask-repeat: no-repeat;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
margin-left: 7px;
}
.mx_RoomSearch_input {
border: none !important; // !important to override default app-wide styles
flex: 1 !important; // !important to override default app-wide styles
- color: $primary-fg-color !important; // !important to override default app-wide styles
+ color: $primary-content !important; // !important to override default app-wide styles
padding: 0;
height: 100%;
width: 100%;
@@ -48,12 +48,12 @@ limitations under the License.
line-height: $font-16px;
&:not(.mx_RoomSearch_inputExpanded)::placeholder {
- color: $tertiary-fg-color !important; // !important to override default app-wide styles
+ color: $tertiary-content !important; // !important to override default app-wide styles
}
}
&.mx_RoomSearch_hasQuery {
- border-color: $secondary-fg-color;
+ border-color: $secondary-content;
}
&.mx_RoomSearch_focused {
@@ -62,7 +62,7 @@ limitations under the License.
}
&.mx_RoomSearch_focused, &.mx_RoomSearch_hasQuery {
- background-color: $roomlist-filter-active-bg-color;
+ background-color: $background;
.mx_RoomSearch_clearButton {
width: 16px;
@@ -71,7 +71,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
margin-right: 8px;
}
}
diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index de9e049165..bdfbca1afa 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -27,7 +27,7 @@ limitations under the License.
.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_image {
margin-right: -12px;
- border: 1px solid $primary-bg-color;
+ border: 1px solid $background;
}
.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_initial {
@@ -39,7 +39,7 @@ limitations under the License.
display: inline-block;
color: #acacac;
background-color: #ddd;
- border: 1px solid $primary-bg-color;
+ border: 1px solid $background;
border-radius: 40px;
width: 24px;
height: 24px;
@@ -171,14 +171,14 @@ limitations under the License.
}
.mx_RoomStatusBar_connectionLostBar_desc {
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-13px;
opacity: 0.5;
padding-bottom: 20px;
}
.mx_RoomStatusBar_resend_link {
- color: $primary-fg-color !important;
+ color: $primary-content !important;
text-decoration: underline !important;
cursor: pointer;
}
@@ -187,7 +187,7 @@ limitations under the License.
height: 50px;
line-height: $font-50px;
- color: $primary-fg-color;
+ color: $primary-content;
opacity: 0.5;
overflow-y: hidden;
display: block;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 831f186ed4..86c2efeb4a 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -14,10 +14,22 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+.mx_RoomView_wrapper {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ position: relative;
+ justify-content: center;
+ // Contain the amount of layers rendered by constraining what actually needs re-layering via css
+ contain: strict;
+}
+
.mx_RoomView {
word-wrap: break-word;
display: flex;
flex-direction: column;
+ flex: 1;
+ position: relative;
}
@@ -40,7 +52,7 @@ limitations under the License.
pointer-events: none;
- background-color: $primary-bg-color;
+ background-color: $background;
opacity: 0.95;
position: absolute;
@@ -87,7 +99,7 @@ limitations under the License.
left: 0;
right: 0;
z-index: 3000;
- background-color: $primary-bg-color;
+ background-color: $background;
}
.mx_RoomView_auxPanel_hiddenHighlights {
@@ -153,7 +165,6 @@ limitations under the License.
flex: 1;
display: flex;
flex-direction: column;
- contain: content;
}
.mx_RoomView_statusArea {
@@ -161,7 +172,7 @@ limitations under the License.
flex: 0 0 auto;
max-height: 0px;
- background-color: $primary-bg-color;
+ background-color: $background;
z-index: 1000;
overflow: hidden;
@@ -246,7 +257,7 @@ hr.mx_RoomView_myReadMarker {
}
.mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
- background-color: $primary-bg-color;
+ background-color: $background;
}
.mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {
diff --git a/res/css/structures/_ScrollPanel.scss b/res/css/structures/_ScrollPanel.scss
index 7b75c69e86..a668594bba 100644
--- a/res/css/structures/_ScrollPanel.scss
+++ b/res/css/structures/_ScrollPanel.scss
@@ -15,7 +15,6 @@ limitations under the License.
*/
.mx_ScrollPanel {
-
.mx_RoomView_MessageList {
position: relative;
display: flex;
diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceHierarchy.scss
similarity index 80%
rename from res/css/structures/_SpaceRoomDirectory.scss
rename to res/css/structures/_SpaceHierarchy.scss
index 88e6a3f494..a5d589f9c2 100644
--- a/res/css/structures/_SpaceRoomDirectory.scss
+++ b/res/css/structures/_SpaceHierarchy.scss
@@ -14,21 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-.mx_SpaceRoomDirectory_dialogWrapper > .mx_Dialog {
- max-width: 960px;
- height: 100%;
-}
-
-.mx_SpaceRoomDirectory {
- height: 100%;
- margin-bottom: 12px;
- color: $primary-fg-color;
- word-break: break-word;
- display: flex;
- flex-direction: column;
-}
-
-.mx_SpaceRoomDirectory,
.mx_SpaceRoomView_landing {
.mx_Dialog_title {
display: flex;
@@ -52,7 +37,7 @@ limitations under the License.
> div {
font-weight: 400;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
}
@@ -68,23 +53,29 @@ limitations under the License.
margin: 24px 0 16px;
}
- .mx_SpaceRoomDirectory_noResults {
+ .mx_SpaceHierarchy_noResults {
text-align: center;
> div {
font-size: $font-15px;
line-height: $font-24px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
- .mx_SpaceRoomDirectory_listHeader {
+ .mx_SpaceHierarchy_listHeader {
display: flex;
min-height: 32px;
align-items: center;
font-size: $font-15px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
+ margin-bottom: 12px;
+
+ > h4 {
+ font-weight: $font-semi-bold;
+ margin: 0;
+ }
.mx_AccessibleButton {
padding: 4px 12px;
@@ -105,7 +96,7 @@ limitations under the License.
}
}
- .mx_SpaceRoomDirectory_error {
+ .mx_SpaceHierarchy_error {
position: relative;
font-weight: $font-semi-bold;
color: $notice-primary-color;
@@ -124,43 +115,44 @@ limitations under the License.
background-image: url("$(res)/img/element-icons/warning-badge.svg");
}
}
-}
-.mx_SpaceRoomDirectory_list {
- margin-top: 16px;
- padding-bottom: 40px;
+ .mx_SpaceHierarchy_list {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ }
- .mx_SpaceRoomDirectory_roomCount {
+ .mx_SpaceHierarchy_roomCount {
> h3 {
display: inline;
font-weight: $font-semi-bold;
font-size: $font-18px;
line-height: $font-22px;
- color: $primary-fg-color;
+ color: $primary-content;
}
> span {
margin-left: 8px;
font-size: $font-15px;
line-height: $font-24px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
- .mx_SpaceRoomDirectory_subspace {
+ .mx_SpaceHierarchy_subspace {
.mx_BaseAvatar_image {
border-radius: 8px;
}
}
- .mx_SpaceRoomDirectory_subspace_toggle {
+ .mx_SpaceHierarchy_subspace_toggle {
position: absolute;
left: -1px;
top: 10px;
height: 16px;
width: 16px;
border-radius: 4px;
- background-color: $primary-bg-color;
+ background-color: $background;
&::before {
content: '';
@@ -171,23 +163,23 @@ limitations under the License.
width: 16px;
mask-repeat: no-repeat;
mask-position: center;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
mask-size: 16px;
transform: rotate(270deg);
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
}
- &.mx_SpaceRoomDirectory_subspace_toggle_shown::before {
+ &.mx_SpaceHierarchy_subspace_toggle_shown::before {
transform: rotate(0deg);
}
}
- .mx_SpaceRoomDirectory_subspace_children {
+ .mx_SpaceHierarchy_subspace_children {
position: relative;
padding-left: 12px;
}
- .mx_SpaceRoomDirectory_roomTile {
+ .mx_SpaceHierarchy_roomTile {
position: relative;
padding: 8px 16px;
border-radius: 8px;
@@ -204,7 +196,7 @@ limitations under the License.
grid-column: 1;
}
- .mx_SpaceRoomDirectory_roomTile_name {
+ .mx_SpaceHierarchy_roomTile_name {
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
@@ -214,7 +206,7 @@ limitations under the License.
.mx_InfoTooltip {
display: inline;
margin-left: 12px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
font-size: $font-12px;
line-height: $font-15px;
@@ -232,10 +224,10 @@ limitations under the License.
}
}
- .mx_SpaceRoomDirectory_roomTile_info {
+ .mx_SpaceHierarchy_roomTile_info {
font-size: $font-14px;
line-height: $font-18px;
- color: $secondary-fg-color;
+ color: $secondary-content;
grid-row: 2;
grid-column: 1/3;
display: -webkit-box;
@@ -244,7 +236,7 @@ limitations under the License.
overflow: hidden;
}
- .mx_SpaceRoomDirectory_actions {
+ .mx_SpaceHierarchy_actions {
text-align: right;
margin-left: 20px;
grid-column: 3;
@@ -278,12 +270,12 @@ limitations under the License.
}
}
- li.mx_SpaceRoomDirectory_roomTileWrapper {
+ li.mx_SpaceHierarchy_roomTileWrapper {
list-style: none;
}
- .mx_SpaceRoomDirectory_roomTile,
- .mx_SpaceRoomDirectory_subspace_children {
+ .mx_SpaceHierarchy_roomTile,
+ .mx_SpaceHierarchy_subspace_children {
&::before {
content: "";
position: absolute;
@@ -295,12 +287,12 @@ limitations under the License.
}
}
- .mx_SpaceRoomDirectory_actions {
- .mx_SpaceRoomDirectory_actionsText {
+ .mx_SpaceHierarchy_actions {
+ .mx_SpaceHierarchy_actionsText {
font-weight: normal;
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
@@ -311,7 +303,7 @@ limitations under the License.
margin: 20px 0;
}
- .mx_SpaceRoomDirectory_createRoom {
+ .mx_SpaceHierarchy_createRoom {
display: block;
margin: 16px auto 0;
width: max-content;
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 1dea6332f5..29c8c0c36d 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -20,13 +20,16 @@ $gutterSize: 16px;
$activeBorderTransparentGap: 1px;
$activeBackgroundColor: $roomtile-selected-bg-color;
-$activeBorderColor: $secondary-fg-color;
+$activeBorderColor: $secondary-content;
.mx_SpacePanel {
- flex: 0 0 auto;
background-color: $groupFilterPanel-bg-color;
+ flex: 0 0 auto;
padding: 0;
margin: 0;
+ position: relative;
+ // Fix for the blurred avatar-background
+ z-index: 1;
// Create another flexbox so the Panel fills the container
display: flex;
@@ -111,6 +114,7 @@ $activeBorderColor: $secondary-fg-color;
align-items: center;
padding: 4px 4px 4px 0;
width: 100%;
+ cursor: pointer;
&.mx_SpaceButton_active {
&:not(.mx_SpaceButton_narrow) .mx_SpaceButton_selectionWrapper {
@@ -135,7 +139,6 @@ $activeBorderColor: $secondary-fg-color;
&:not(.mx_SpaceButton_narrow) {
.mx_SpaceButton_selectionWrapper {
width: 100%;
- padding-right: 16px;
overflow: hidden;
}
}
@@ -147,7 +150,6 @@ $activeBorderColor: $secondary-fg-color;
display: block;
text-overflow: ellipsis;
overflow: hidden;
- padding-right: 8px;
font-size: $font-14px;
line-height: $font-18px;
}
@@ -221,8 +223,7 @@ $activeBorderColor: $secondary-fg-color;
margin-top: auto;
margin-bottom: auto;
display: none;
- position: absolute;
- right: 4px;
+ position: relative;
&::before {
top: 2px;
@@ -235,14 +236,12 @@ $activeBorderColor: $secondary-fg-color;
mask-size: contain;
mask-repeat: no-repeat;
mask-image: url('$(res)/img/element-icons/context-menu.svg');
- background: $primary-fg-color;
+ background: $primary-content;
}
}
}
.mx_SpacePanel_badgeContainer {
- position: absolute;
-
// Create a flexbox to make aligning dot badges easier
display: flex;
align-items: center;
@@ -260,6 +259,7 @@ $activeBorderColor: $secondary-fg-color;
&.collapsed {
.mx_SpaceButton {
.mx_SpacePanel_badgeContainer {
+ position: absolute;
right: 0;
top: 0;
@@ -289,19 +289,12 @@ $activeBorderColor: $secondary-fg-color;
}
&:not(.collapsed) {
- .mx_SpacePanel_badgeContainer {
- position: absolute;
- right: 4px;
- }
-
.mx_SpaceButton:hover,
.mx_SpaceButton:focus-within,
.mx_SpaceButton_hasMenuOpen {
&:not(.mx_SpaceButton_invite) {
// Hide the badge container on hover because it'll be a menu button
.mx_SpacePanel_badgeContainer {
- width: 0;
- height: 0;
display: none;
}
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 945de01eba..39eabe2e07 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -32,7 +32,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
- color: $secondary-fg-color;
+ color: $secondary-content;
}
&::before {
@@ -45,7 +45,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center;
mask-repeat: no-repeat;
mask-size: 24px;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
}
&:hover {
@@ -56,12 +56,15 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
- color: $primary-fg-color;
+ color: $primary-content;
}
}
}
.mx_SpaceRoomView {
+ overflow-y: auto;
+ flex: 1;
+
.mx_MainSplit > div:first-child {
padding: 80px 60px;
flex-grow: 1;
@@ -72,13 +75,13 @@ $SpaceRoomViewInnerWidth: 428px;
margin: 0;
font-size: $font-24px;
font-weight: $font-semi-bold;
- color: $primary-fg-color;
+ color: $primary-content;
width: max-content;
}
.mx_SpaceRoomView_description {
font-size: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-top: 12px;
margin-bottom: 24px;
max-width: $SpaceRoomViewInnerWidth;
@@ -154,7 +157,7 @@ $SpaceRoomViewInnerWidth: 428px;
font-weight: $font-semi-bold;
font-size: $font-14px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
margin-top: 24px;
position: relative;
padding-left: 24px;
@@ -176,7 +179,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
}
@@ -207,7 +210,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_inviter_mxid {
line-height: $font-24px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
}
@@ -224,7 +227,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_topic {
font-size: $font-14px;
line-height: $font-22px;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin: 20px 0;
max-height: 160px;
overflow-y: auto;
@@ -248,6 +251,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_landing {
display: flex;
flex-direction: column;
+ min-width: 0;
> .mx_BaseAvatar_image,
> .mx_BaseAvatar > .mx_BaseAvatar_image {
@@ -257,7 +261,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_landing_name {
margin: 24px 0 16px;
font-size: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
> span {
display: inline-block;
@@ -330,7 +334,7 @@ $SpaceRoomViewInnerWidth: 428px;
top: 0;
height: 24px;
width: 24px;
- background: $tertiary-fg-color;
+ background: $tertiary-content;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
@@ -354,16 +358,11 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceFeedbackPrompt {
padding: 7px; // 8px - 1px border
- border: 1px solid rgba($primary-fg-color, .1);
+ border: 1px solid rgba($primary-content, .1);
border-radius: 8px;
width: max-content;
margin: 0 0 -40px auto; // collapse its own height to not push other components down
}
-
- .mx_SpaceRoomDirectory_list {
- // we don't want this container to get forced into the flexbox layout
- display: contents;
- }
}
.mx_SpaceRoomView_privateScope {
@@ -388,7 +387,7 @@ $SpaceRoomViewInnerWidth: 428px;
width: 432px;
border-radius: 8px;
background-color: $info-plinth-bg-color;
- color: $secondary-fg-color;
+ color: $secondary-content;
box-sizing: border-box;
> h3 {
@@ -415,7 +414,7 @@ $SpaceRoomViewInnerWidth: 428px;
position: absolute;
top: 14px;
left: 14px;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
}
@@ -438,7 +437,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_inviteTeammates_buttons {
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-top: 28px;
.mx_AccessibleButton {
@@ -454,7 +453,7 @@ $SpaceRoomViewInnerWidth: 428px;
width: 24px;
top: 0;
left: 0;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
@@ -473,7 +472,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_info {
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
margin: 20px 0;
@@ -492,7 +491,7 @@ $SpaceRoomViewInnerWidth: 428px;
left: -2px;
mask-position: center;
mask-repeat: no-repeat;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
}
}
diff --git a/res/css/structures/_TabbedView.scss b/res/css/structures/_TabbedView.scss
index 833450a25b..e185197f25 100644
--- a/res/css/structures/_TabbedView.scss
+++ b/res/css/structures/_TabbedView.scss
@@ -80,7 +80,7 @@ limitations under the License.
.mx_TabbedView_tabLabel_text {
font-size: 15px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
}
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 5cd938f1ce..6024df5dc0 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -36,8 +36,8 @@ limitations under the License.
.mx_Toast_toast {
grid-row: 1 / 3;
grid-column: 1;
- color: $primary-fg-color;
background-color: $system;
+ color: $primary-content;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
border-radius: 8px;
overflow: hidden;
@@ -63,7 +63,7 @@ limitations under the License.
&.mx_Toast_icon_verification::after {
mask-image: url("$(res)/img/e2e/normal.svg");
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
&.mx_Toast_icon_verification_warning {
@@ -82,7 +82,7 @@ limitations under the License.
&.mx_Toast_icon_secure_backup::after {
mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_Toast_title, .mx_Toast_body {
@@ -163,7 +163,7 @@ limitations under the License.
}
.mx_Toast_detail {
- color: $secondary-fg-color;
+ color: $secondary-content;
}
.mx_Toast_deviceID {
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index 17e6ad75df..c10e7f60df 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -35,7 +35,7 @@ limitations under the License.
// we cheat opacity on the theme colour with an after selector here
&::after {
content: '';
- border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
+ border-bottom: 1px solid $primary-content;
opacity: 0.2;
display: block;
padding-top: 8px;
@@ -58,7 +58,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $tertiary-fg-color;
+ background: $tertiary-content;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
}
}
@@ -176,7 +176,7 @@ limitations under the License.
width: 85%;
opacity: 0.2;
border: none;
- border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
+ border-bottom: 1px solid $primary-content;
}
&.mx_IconizedContextMenu {
@@ -292,7 +292,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $primary-fg-color;
+ background: $primary-content;
}
}
diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index 248eab5d88..e3d6135ef3 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -24,7 +24,7 @@ limitations under the License.
.mx_ViewSource_heading {
font-size: $font-17px;
font-weight: 400;
- color: $primary-fg-color;
+ color: $primary-content;
margin-top: 0.7em;
}
diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 9c98ca3a1c..c4aaaca1d0 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -96,3 +96,10 @@ div.mx_AccessibleButton_kind_link.mx_Login_forgot {
cursor: not-allowed;
}
}
+.mx_Login_spinner {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ align-content: center;
+ padding: 14px;
+}
diff --git a/res/css/views/audio_messages/_AudioPlayer.scss b/res/css/views/audio_messages/_AudioPlayer.scss
index 77dcebbb9a..3c2551e36a 100644
--- a/res/css/views/audio_messages/_AudioPlayer.scss
+++ b/res/css/views/audio_messages/_AudioPlayer.scss
@@ -33,7 +33,7 @@ limitations under the License.
}
.mx_AudioPlayer_mediaName {
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-15px;
line-height: $font-15px;
text-overflow: ellipsis;
diff --git a/res/css/views/audio_messages/_SeekBar.scss b/res/css/views/audio_messages/_SeekBar.scss
index d13fe4ac6a..03449d009b 100644
--- a/res/css/views/audio_messages/_SeekBar.scss
+++ b/res/css/views/audio_messages/_SeekBar.scss
@@ -27,7 +27,7 @@ limitations under the License.
width: 100%;
height: 1px;
- background: $quaternary-fg-color;
+ background: $quaternary-content;
outline: none; // remove blue selection border
position: relative; // for before+after pseudo elements later on
@@ -42,7 +42,7 @@ limitations under the License.
width: 8px;
height: 8px;
border-radius: 8px;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
cursor: pointer;
}
@@ -50,7 +50,7 @@ limitations under the License.
width: 8px;
height: 8px;
border-radius: 8px;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
cursor: pointer;
// Firefox adds a border on the thumb
@@ -63,7 +63,7 @@ limitations under the License.
// in firefox, so it's just wasted CPU/GPU time.
&::before { // ::before to ensure it ends up under the thumb
content: '';
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
// Absolute positioning to ensure it overlaps with the existing bar
position: absolute;
@@ -81,7 +81,7 @@ limitations under the License.
// This is firefox's built-in support for the above, with 100% less hacks.
&::-moz-range-progress {
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
height: 1px;
}
diff --git a/res/css/views/auth/_AuthButtons.scss b/res/css/views/auth/_AuthButtons.scss
index 8deb0f80ac..3a2ad2adf8 100644
--- a/res/css/views/auth/_AuthButtons.scss
+++ b/res/css/views/auth/_AuthButtons.scss
@@ -39,7 +39,7 @@ limitations under the License.
min-width: 80px;
background-color: $accent-color;
- color: $primary-bg-color;
+ color: $background;
cursor: pointer;
diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
index 257b512579..4922068462 100644
--- a/res/css/views/avatars/_DecoratedRoomAvatar.scss
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -47,7 +47,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $secondary-fg-color;
+ background: $secondary-content;
mask-image: url('$(res)/img/globe.svg');
}
diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss
index 2af4e79ecd..ff6910852c 100644
--- a/res/css/views/beta/_BetaCard.scss
+++ b/res/css/views/beta/_BetaCard.scss
@@ -29,7 +29,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-18px;
line-height: $font-22px;
- color: $primary-fg-color;
+ color: $primary-content;
margin: 4px 0 14px;
.mx_BetaCard_betaPill {
@@ -40,7 +40,7 @@ limitations under the License.
.mx_BetaCard_caption {
font-size: $font-15px;
line-height: $font-20px;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-bottom: 20px;
}
@@ -54,7 +54,7 @@ limitations under the License.
.mx_BetaCard_disclaimer {
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-top: 20px;
}
}
@@ -72,13 +72,13 @@ limitations under the License.
margin: 16px 0 0;
font-size: $font-15px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
.mx_SettingsFlag_microcopy {
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
}
diff --git a/res/css/views/context_menus/_IconizedContextMenu.scss b/res/css/views/context_menus/_IconizedContextMenu.scss
index ff176eef7e..ca40f18cd4 100644
--- a/res/css/views/context_menus/_IconizedContextMenu.scss
+++ b/res/css/views/context_menus/_IconizedContextMenu.scss
@@ -36,7 +36,7 @@ limitations under the License.
//
// Therefore, we just hack in a line and border the thing ourselves
&::before {
- border-top: 1px solid $primary-fg-color;
+ border-top: 1px solid $primary-content;
opacity: 0.1;
content: '';
@@ -63,7 +63,7 @@ limitations under the License.
padding-top: 12px;
padding-bottom: 12px;
text-decoration: none;
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-15px;
line-height: $font-24px;
@@ -119,7 +119,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $primary-fg-color;
+ background: $primary-content;
}
}
diff --git a/res/css/views/context_menus/_MessageContextMenu.scss b/res/css/views/context_menus/_MessageContextMenu.scss
index 338841cce4..5af748e28d 100644
--- a/res/css/views/context_menus/_MessageContextMenu.scss
+++ b/res/css/views/context_menus/_MessageContextMenu.scss
@@ -30,7 +30,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $primary-fg-color;
+ background: $primary-content;
}
}
diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss
index fceb7fba34..1a97fb56c7 100644
--- a/res/css/views/context_menus/_StatusMessageContextMenu.scss
+++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss
@@ -27,7 +27,7 @@ input.mx_StatusMessageContextMenu_message {
border-radius: 4px;
border: 1px solid $input-border-color;
padding: 6.5px 11px;
- background-color: $primary-bg-color;
+ background-color: $background;
font-weight: normal;
margin: 0 0 10px;
}
diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
index 42e17c8d98..444b29c9bf 100644
--- a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
@@ -44,7 +44,7 @@ limitations under the License.
> h3 {
margin: 0;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-12px;
font-weight: $font-semi-bold;
line-height: $font-15px;
@@ -66,7 +66,7 @@ limitations under the License.
flex-grow: 1;
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
.mx_ProgressBar {
height: 8px;
@@ -79,7 +79,7 @@ limitations under the License.
margin-top: 8px;
font-size: $font-15px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
}
> * {
@@ -105,7 +105,7 @@ limitations under the License.
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
- color: $primary-fg-color;
+ color: $primary-content;
}
}
@@ -126,7 +126,7 @@ limitations under the License.
&::before {
content: '';
position: absolute;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
@@ -145,7 +145,7 @@ limitations under the License.
.mx_AddExistingToSpaceDialog {
width: 480px;
- color: $primary-fg-color;
+ color: $primary-content;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
@@ -188,7 +188,7 @@ limitations under the License.
padding-left: 0;
flex: unset;
height: unset;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
@@ -221,7 +221,7 @@ limitations under the License.
}
.mx_SubspaceSelector_onlySpace {
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
}
diff --git a/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss b/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
index beae03f00f..5d6c817b14 100644
--- a/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
+++ b/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
@@ -65,7 +65,7 @@ limitations under the License.
.mx_CommunityPrototypeInviteDialog_personName {
font-weight: 600;
font-size: $font-14px;
- color: $primary-fg-color;
+ color: $primary-content;
margin-left: 7px;
}
diff --git a/res/css/views/dialogs/_ConfirmUserActionDialog.scss b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
index 284c171f4e..5ac0f07b14 100644
--- a/res/css/views/dialogs/_ConfirmUserActionDialog.scss
+++ b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
@@ -35,8 +35,8 @@ limitations under the License.
.mx_ConfirmUserActionDialog_reasonField {
font-size: $font-14px;
- color: $primary-fg-color;
- background-color: $primary-bg-color;
+ color: $primary-content;
+ background-color: $background;
border-radius: 3px;
border: solid 1px $input-border-color;
diff --git a/res/css/views/dialogs/_CreateGroupDialog.scss b/res/css/views/dialogs/_CreateGroupDialog.scss
index f7bfc61a98..ef9c2b73d4 100644
--- a/res/css/views/dialogs/_CreateGroupDialog.scss
+++ b/res/css/views/dialogs/_CreateGroupDialog.scss
@@ -29,8 +29,8 @@ limitations under the License.
border-radius: 3px;
border: 1px solid $input-border-color;
padding: 9px;
- color: $primary-fg-color;
- background-color: $primary-bg-color;
+ color: $primary-content;
+ background-color: $background;
}
.mx_CreateGroupDialog_input_hasPrefixAndSuffix {
diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index e7cfbf6050..9cfa8ce25a 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -55,8 +55,8 @@ limitations under the License.
border-radius: 3px;
border: 1px solid $input-border-color;
padding: 9px;
- color: $primary-fg-color;
- background-color: $primary-bg-color;
+ color: $primary-content;
+ background-color: $background;
width: 100%;
}
diff --git a/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss b/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
index afa722e05e..6ff328f6ab 100644
--- a/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
+++ b/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
@@ -23,7 +23,7 @@ limitations under the License.
.mx_CreateSpaceFromCommunityDialog {
width: 480px;
- color: $primary-fg-color;
+ color: $primary-content;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
@@ -73,7 +73,7 @@ limitations under the License.
flex-grow: 1;
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
.mx_ProgressBar {
height: 8px;
@@ -86,7 +86,7 @@ limitations under the License.
margin-top: 8px;
font-size: $font-15px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
}
> * {
@@ -112,7 +112,7 @@ limitations under the License.
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
- color: $primary-fg-color;
+ color: $primary-content;
}
}
@@ -138,7 +138,7 @@ limitations under the License.
&::before {
content: '';
position: absolute;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
diff --git a/res/css/views/dialogs/_CreateSubspaceDialog.scss b/res/css/views/dialogs/_CreateSubspaceDialog.scss
index 1ec4731ae6..1ed10df35c 100644
--- a/res/css/views/dialogs/_CreateSubspaceDialog.scss
+++ b/res/css/views/dialogs/_CreateSubspaceDialog.scss
@@ -23,7 +23,7 @@ limitations under the License.
.mx_CreateSubspaceDialog {
width: 480px;
- color: $primary-fg-color;
+ color: $primary-content;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
@@ -57,7 +57,7 @@ limitations under the License.
flex-grow: 1;
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
> * {
vertical-align: middle;
diff --git a/res/css/views/dialogs/_FeedbackDialog.scss b/res/css/views/dialogs/_FeedbackDialog.scss
index fd225dd882..74733f7220 100644
--- a/res/css/views/dialogs/_FeedbackDialog.scss
+++ b/res/css/views/dialogs/_FeedbackDialog.scss
@@ -33,7 +33,7 @@ limitations under the License.
padding-left: 52px;
> p {
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
.mx_AccessibleButton_kind_link {
diff --git a/res/css/views/dialogs/_ForwardDialog.scss b/res/css/views/dialogs/_ForwardDialog.scss
index e018f60172..da8ce3de5b 100644
--- a/res/css/views/dialogs/_ForwardDialog.scss
+++ b/res/css/views/dialogs/_ForwardDialog.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_ForwardDialog {
width: 520px;
- color: $primary-fg-color;
+ color: $primary-content;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
@@ -25,7 +25,7 @@ limitations under the License.
> h3 {
margin: 0 0 6px;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-12px;
font-weight: $font-semi-bold;
line-height: $font-15px;
diff --git a/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
index f83eed9c53..ab7496249d 100644
--- a/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
+++ b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_GenericFeatureFeedbackDialog {
.mx_GenericFeatureFeedbackDialog_subheading {
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-14px;
line-height: $font-20px;
margin-bottom: 24px;
diff --git a/res/css/views/dialogs/_HostSignupDialog.scss b/res/css/views/dialogs/_HostSignupDialog.scss
index ac4bc41951..d8a6652a39 100644
--- a/res/css/views/dialogs/_HostSignupDialog.scss
+++ b/res/css/views/dialogs/_HostSignupDialog.scss
@@ -70,11 +70,11 @@ limitations under the License.
}
.mx_HostSignupDialog_text_dark {
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_HostSignupDialog_text_light {
- color: $secondary-fg-color;
+ color: $secondary-content;
}
.mx_HostSignup_maximize_button {
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 9fc4b7a15c..3a2918f9ec 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -56,7 +56,7 @@ limitations under the License.
box-sizing: border-box;
min-width: 40%;
flex: 1 !important;
- color: $primary-fg-color !important;
+ color: $primary-content !important;
}
}
@@ -94,7 +94,7 @@ limitations under the License.
}
> span {
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_InviteDialog_subname {
@@ -110,7 +110,7 @@ limitations under the License.
font-size: $font-14px;
> span {
- color: $primary-fg-color;
+ color: $primary-content;
font-weight: 600;
}
@@ -220,7 +220,7 @@ limitations under the License.
.mx_InviteDialog_roomTile_name {
font-weight: 600;
font-size: $font-14px;
- color: $primary-fg-color;
+ color: $primary-content;
margin-left: 7px;
}
@@ -352,7 +352,7 @@ limitations under the License.
border-right: 0;
border-radius: 0;
margin-top: 0;
- border-color: $quaternary-fg-color;
+ border-color: $quaternary-content;
input {
font-size: 18px;
@@ -418,7 +418,7 @@ limitations under the License.
> h4 {
font-size: $font-15px;
line-height: $font-24px;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-weight: normal;
}
@@ -432,14 +432,14 @@ limitations under the License.
font-size: $font-15px;
line-height: $font-24px;
font-weight: $font-semi-bold;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_InviteDialog_multiInviterError_entry_userId {
margin-left: 6px;
font-size: $font-12px;
line-height: $font-15px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
}
diff --git a/res/css/views/dialogs/_JoinRuleDropdown.scss b/res/css/views/dialogs/_JoinRuleDropdown.scss
index c48a79af3c..91691cf53b 100644
--- a/res/css/views/dialogs/_JoinRuleDropdown.scss
+++ b/res/css/views/dialogs/_JoinRuleDropdown.scss
@@ -19,7 +19,7 @@ limitations under the License.
font-weight: normal;
font-family: $font-family;
font-size: $font-14px;
- color: $primary-fg-color;
+ color: $primary-content;
.mx_Dropdown_input {
border: 1px solid $input-border-color;
@@ -44,7 +44,7 @@ limitations under the License.
top: 8px;
mask-repeat: no-repeat;
mask-position: center;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
}
}
diff --git a/res/css/views/dialogs/_LeaveSpaceDialog.scss b/res/css/views/dialogs/_LeaveSpaceDialog.scss
index c982f50e52..0d85a87faf 100644
--- a/res/css/views/dialogs/_LeaveSpaceDialog.scss
+++ b/res/css/views/dialogs/_LeaveSpaceDialog.scss
@@ -63,7 +63,7 @@ limitations under the License.
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
&::before {
content: '';
@@ -72,7 +72,7 @@ limitations under the License.
top: calc(50% - 8px); // vertical centering
height: 16px;
width: 16px;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
@@ -81,7 +81,7 @@ limitations under the License.
}
> p {
- color: $primary-fg-color;
+ color: $primary-content;
}
}
diff --git a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss
index 91df76675a..9a05e7f20a 100644
--- a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss
+++ b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss
@@ -23,7 +23,7 @@ limitations under the License.
.mx_ManageRestrictedJoinRuleDialog {
width: 480px;
- color: $primary-fg-color;
+ color: $primary-content;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
@@ -52,7 +52,7 @@ limitations under the License.
> h3 {
margin: 0;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-12px;
font-weight: $font-semi-bold;
line-height: $font-15px;
@@ -85,7 +85,7 @@ limitations under the License.
margin-top: 8px;
font-size: $font-12px;
line-height: $font-15px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
.mx_Checkbox {
@@ -113,7 +113,7 @@ limitations under the License.
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
&::before {
content: '';
@@ -122,7 +122,7 @@ limitations under the License.
top: calc(50% - 8px); // vertical centering
height: 16px;
width: 16px;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.scss b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
index e9d777effd..4574344a28 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.scss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
@@ -37,7 +37,7 @@ limitations under the License.
list-style-type: none;
font-size: $font-14px;
padding: 0;
- color: $primary-fg-color;
+ color: $primary-content;
span.mx_EditHistoryMessage_deletion, span.mx_EditHistoryMessage_insertion {
padding: 0px 2px;
diff --git a/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss b/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
index 31fc6d7a04..02c89e2e42 100644
--- a/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
+++ b/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
@@ -19,7 +19,7 @@ limitations under the License.
.mx_Dialog_content {
margin-bottom: 24px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
.mx_Dialog_primary {
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index c97a3b69b7..f18b4917cf 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -72,7 +72,7 @@ limitations under the License.
margin-top: 0px;
margin-bottom: 0px;
font-size: 16pt;
- color: $primary-fg-color;
+ color: $primary-content;
}
> * {
@@ -81,7 +81,7 @@ limitations under the License.
}
.workspace-channel-details {
- color: $primary-fg-color;
+ color: $primary-content;
font-weight: 600;
.channel {
diff --git a/res/css/views/dialogs/_ServerOfflineDialog.scss b/res/css/views/dialogs/_ServerOfflineDialog.scss
index ae4b70beb3..7a1b0bbcab 100644
--- a/res/css/views/dialogs/_ServerOfflineDialog.scss
+++ b/res/css/views/dialogs/_ServerOfflineDialog.scss
@@ -17,10 +17,10 @@ limitations under the License.
.mx_ServerOfflineDialog {
.mx_ServerOfflineDialog_content {
padding-right: 85px;
- color: $primary-fg-color;
+ color: $primary-content;
hr {
- border-color: $primary-fg-color;
+ border-color: $primary-content;
opacity: 0.1;
border-bottom: none;
}
diff --git a/res/css/views/dialogs/_ServerPickerDialog.scss b/res/css/views/dialogs/_ServerPickerDialog.scss
index b01b49d7af..9a05751f91 100644
--- a/res/css/views/dialogs/_ServerPickerDialog.scss
+++ b/res/css/views/dialogs/_ServerPickerDialog.scss
@@ -22,7 +22,7 @@ limitations under the License.
margin-bottom: 0;
> p {
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-14px;
margin: 16px 0;
@@ -38,7 +38,7 @@ limitations under the License.
> h4 {
font-size: $font-15px;
font-weight: $font-semi-bold;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-left: 8px;
}
diff --git a/res/css/views/dialogs/_SetEmailDialog.scss b/res/css/views/dialogs/_SetEmailDialog.scss
index 37bee7a9ff..a39d51dfce 100644
--- a/res/css/views/dialogs/_SetEmailDialog.scss
+++ b/res/css/views/dialogs/_SetEmailDialog.scss
@@ -19,7 +19,7 @@ limitations under the License.
border: 1px solid $input-border-color;
padding: 9px;
color: $input-fg-color;
- background-color: $primary-bg-color;
+ background-color: $background;
font-size: $font-15px;
width: 100%;
max-width: 280px;
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss
index fa074fdbe8..a1fa9d52a8 100644
--- a/res/css/views/dialogs/_SpaceSettingsDialog.scss
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss
@@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_SpaceSettingsDialog {
- color: $primary-fg-color;
+ color: $primary-content;
.mx_SpaceSettings_errorText {
font-weight: $font-semi-bold;
@@ -50,13 +50,13 @@ limitations under the License.
.mx_RadioButton_content {
font-weight: $font-semi-bold;
line-height: $font-18px;
- color: $primary-fg-color;
+ color: $primary-content;
}
& + span {
font-size: $font-15px;
line-height: $font-18px;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-left: 26px;
}
}
diff --git a/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss b/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
index ec3bea0ef7..98edbf8ad8 100644
--- a/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
+++ b/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
@@ -44,7 +44,7 @@ limitations under the License.
margin-right: 8px;
position: relative;
top: 5px;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_AccessSecretStorageDialog_resetBadge::before {
diff --git a/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
index d30803b1f0..b14206ff6d 100644
--- a/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
@@ -56,7 +56,7 @@ limitations under the License.
margin-right: 8px;
position: relative;
top: 5px;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_CreateSecretStorageDialog_secureBackupTitle::before {
@@ -101,7 +101,7 @@ limitations under the License.
margin-right: 8px;
position: relative;
top: 5px;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_CreateSecretStorageDialog_optionIcon_securePhrase {
diff --git a/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss b/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
index 05ce158413..4a48012672 100644
--- a/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
+++ b/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
@@ -26,7 +26,7 @@ limitations under the License.
&::before {
mask: url("$(res)/img/e2e/lock-warning-filled.svg");
mask-repeat: no-repeat;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
content: "";
position: absolute;
top: -6px;
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index ae0927386a..93cecd8676 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -34,7 +34,7 @@ limitations under the License.
box-sizing: border-box;
border-radius: 4px;
border: 1px solid $dialog-close-fg-color;
- background-color: $primary-bg-color;
+ background-color: $background;
max-height: calc(100vh - 20px); // allow 10px padding on both top and bottom
overflow-y: auto;
}
@@ -153,7 +153,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_NetworkDropdown_handle_server {
diff --git a/res/css/views/elements/_AddressSelector.scss b/res/css/views/elements/_AddressSelector.scss
index 087504390c..a7d463353b 100644
--- a/res/css/views/elements/_AddressSelector.scss
+++ b/res/css/views/elements/_AddressSelector.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_AddressSelector {
position: absolute;
- background-color: $primary-bg-color;
+ background-color: $background;
width: 485px;
max-height: 116px;
overflow-y: auto;
@@ -31,8 +31,8 @@ limitations under the License.
}
.mx_AddressSelector_addressListElement .mx_AddressTile {
- background-color: $primary-bg-color;
- border: solid 1px $primary-bg-color;
+ background-color: $background;
+ border: solid 1px $background;
}
.mx_AddressSelector_addressListElement.mx_AddressSelector_selected {
diff --git a/res/css/views/elements/_AddressTile.scss b/res/css/views/elements/_AddressTile.scss
index c42f52f8f4..90c40842f7 100644
--- a/res/css/views/elements/_AddressTile.scss
+++ b/res/css/views/elements/_AddressTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
background-color: rgba(74, 73, 74, 0.1);
border: solid 1px $input-border-color;
line-height: $font-26px;
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-14px;
font-weight: normal;
margin-right: 4px;
diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 3b67e0191e..1acac70e42 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_Dropdown {
position: relative;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_Dropdown_disabled {
@@ -52,7 +52,7 @@ limitations under the License.
padding-right: 9px;
mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
mask-repeat: no-repeat;
- background: $primary-fg-color;
+ background: $primary-content;
}
.mx_Dropdown_option {
@@ -111,7 +111,7 @@ input.mx_Dropdown_option:focus {
padding: 0px;
border-radius: 4px;
border: 1px solid $input-focused-border-color;
- background-color: $primary-bg-color;
+ background-color: $background;
max-height: 200px;
overflow-y: auto;
}
diff --git a/res/css/views/elements/_EventTilePreview.scss b/res/css/views/elements/_EventTilePreview.scss
new file mode 100644
index 0000000000..6bb726168f
--- /dev/null
+++ b/res/css/views/elements/_EventTilePreview.scss
@@ -0,0 +1,22 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_EventTilePreview_loader {
+ &.mx_IRCLayout,
+ &.mx_GroupLayout {
+ padding: 9px 0;
+ }
+}
diff --git a/res/css/views/elements/_FacePile.scss b/res/css/views/elements/_FacePile.scss
index c691baffb5..875e0e34d5 100644
--- a/res/css/views/elements/_FacePile.scss
+++ b/res/css/views/elements/_FacePile.scss
@@ -25,7 +25,7 @@ limitations under the License.
}
.mx_BaseAvatar_image {
- border: 1px solid $primary-bg-color;
+ border: 1px solid $background;
}
.mx_BaseAvatar_initial {
@@ -47,7 +47,7 @@ limitations under the License.
left: 0;
height: inherit;
width: inherit;
- background: $tertiary-fg-color;
+ background: $tertiary-content;
mask-position: center;
mask-size: 20px;
mask-repeat: no-repeat;
@@ -60,6 +60,6 @@ limitations under the License.
margin-left: 12px;
font-size: $font-14px;
line-height: $font-24px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
}
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index 50cd14c4da..71d37a015d 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -46,8 +46,8 @@ limitations under the License.
// corners on the field above.
border-radius: 4px;
padding: 8px 9px;
- color: $primary-fg-color;
- background-color: $primary-bg-color;
+ color: $primary-content;
+ background-color: $background;
flex: 1;
min-width: 0;
}
@@ -67,7 +67,7 @@ limitations under the License.
height: 6px;
mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
mask-repeat: no-repeat;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
z-index: 1;
pointer-events: none;
}
@@ -98,14 +98,14 @@ limitations under the License.
transition:
font-size 0.25s ease-out 0.1s,
color 0.25s ease-out 0.1s,
- top 0.25s ease-out 0.1s,
+ transform 0.25s ease-out 0.1s,
background-color 0.25s ease-out 0.1s;
- color: $primary-fg-color;
+ color: $primary-content;
background-color: transparent;
font-size: $font-14px;
+ transform: translateY(0);
position: absolute;
left: 0px;
- top: 0px;
margin: 7px 8px;
padding: 2px;
pointer-events: none; // Allow clicks to fall through to the input
@@ -124,10 +124,10 @@ limitations under the License.
transition:
font-size 0.25s ease-out 0s,
color 0.25s ease-out 0s,
- top 0.25s ease-out 0s,
+ transform 0.25s ease-out 0s,
background-color 0.25s ease-out 0s;
font-size: $font-10px;
- top: -13px;
+ transform: translateY(-13px);
padding: 0 2px;
background-color: $field-focused-label-bg-color;
pointer-events: initial;
diff --git a/res/css/views/elements/_InviteReason.scss b/res/css/views/elements/_InviteReason.scss
index 2c2e5687e6..8024ed59a3 100644
--- a/res/css/views/elements/_InviteReason.scss
+++ b/res/css/views/elements/_InviteReason.scss
@@ -32,12 +32,12 @@ limitations under the License.
justify-content: center;
align-items: center;
cursor: pointer;
- color: $secondary-fg-color;
+ color: $secondary-content;
&::before {
content: "";
margin-right: 8px;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-image: url('$(res)/img/feather-customised/eye.svg');
display: inline-block;
width: 18px;
diff --git a/res/css/views/elements/_MiniAvatarUploader.scss b/res/css/views/elements/_MiniAvatarUploader.scss
index df4676ab56..46ffd9a01c 100644
--- a/res/css/views/elements/_MiniAvatarUploader.scss
+++ b/res/css/views/elements/_MiniAvatarUploader.scss
@@ -37,7 +37,7 @@ limitations under the License.
right: -6px;
bottom: -6px;
- background-color: $primary-bg-color;
+ background-color: $background;
border-radius: 50%;
z-index: 1;
@@ -45,7 +45,7 @@ limitations under the License.
height: 100%;
width: 100%;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-position: center;
mask-repeat: no-repeat;
mask-image: url('$(res)/img/element-icons/camera.svg');
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index d60282695c..b9d845ea7a 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -43,7 +43,7 @@ a.mx_Pill {
/* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_UserPill,
.mx_UserPill {
- color: $primary-fg-color;
+ color: $primary-content;
background-color: $other-user-pill-bg-color;
}
diff --git a/res/css/views/elements/_SSOButtons.scss b/res/css/views/elements/_SSOButtons.scss
index e02816780f..a98e7b4024 100644
--- a/res/css/views/elements/_SSOButtons.scss
+++ b/res/css/views/elements/_SSOButtons.scss
@@ -35,7 +35,7 @@ limitations under the License.
font-size: $font-14px;
font-weight: $font-semi-bold;
border: 1px solid $input-border-color;
- color: $primary-fg-color;
+ color: $primary-content;
> img {
object-fit: contain;
diff --git a/res/css/views/elements/_ServerPicker.scss b/res/css/views/elements/_ServerPicker.scss
index 188eb5d655..d828d7cb88 100644
--- a/res/css/views/elements/_ServerPicker.scss
+++ b/res/css/views/elements/_ServerPicker.scss
@@ -74,7 +74,7 @@ limitations under the License.
.mx_ServerPicker_desc {
margin-top: -12px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
grid-column: 1 / 2;
grid-row: 3;
margin-bottom: 16px;
diff --git a/res/css/views/elements/_Spinner.scss b/res/css/views/elements/_Spinner.scss
index 93d5e2d96c..2df46687af 100644
--- a/res/css/views/elements/_Spinner.scss
+++ b/res/css/views/elements/_Spinner.scss
@@ -37,7 +37,7 @@ limitations under the License.
}
.mx_Spinner_icon {
- background-color: $primary-fg-color;
+ background-color: $primary-content;
mask: url('$(res)/img/spinner.svg');
mask-size: contain;
animation: 1.1s steps(12, end) infinite spin;
diff --git a/res/css/views/elements/_TagComposer.scss b/res/css/views/elements/_TagComposer.scss
index 2ffd601765..f5bdb8d2d5 100644
--- a/res/css/views/elements/_TagComposer.scss
+++ b/res/css/views/elements/_TagComposer.scss
@@ -25,7 +25,7 @@ limitations under the License.
.mx_AccessibleButton {
min-width: 70px;
- padding: 0; // override from button styles
+ padding: 0 8px; // override from button styles
margin-left: 16px; // distance from <Field>
}
@@ -50,7 +50,7 @@ limitations under the License.
&::before {
content: '';
border-radius: 20px;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
opacity: 0.15;
position: absolute;
top: 0;
diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index d90c818f94..6c5a7da55a 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -84,7 +84,7 @@ limitations under the License.
// These tooltips use an older style with a chevron
.mx_Field_tooltip {
background-color: $menu-bg-color;
- color: $primary-fg-color;
+ color: $primary-content;
border: 1px solid $menu-border-color;
text-align: unset;
diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss
index 400e40e233..91c68158c9 100644
--- a/res/css/views/emojipicker/_EmojiPicker.scss
+++ b/res/css/views/emojipicker/_EmojiPicker.scss
@@ -57,7 +57,7 @@ limitations under the License.
}
.mx_EmojiPicker_anchor::before {
- background-color: $primary-fg-color;
+ background-color: $primary-content;
content: '';
display: inline-block;
mask-size: 100%;
@@ -89,7 +89,7 @@ limitations under the License.
margin: 8px;
border-radius: 4px;
border: 1px solid $input-border-color;
- background-color: $primary-bg-color;
+ background-color: $background;
display: flex;
input {
@@ -126,7 +126,7 @@ limitations under the License.
.mx_EmojiPicker_search_icon::after {
mask: url('$(res)/img/emojipicker/search.svg') no-repeat;
mask-size: 100%;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
content: '';
display: inline-block;
width: 100%;
diff --git a/res/css/views/groups/_GroupRoomList.scss b/res/css/views/groups/_GroupRoomList.scss
index fefd17849c..2f6559f7c4 100644
--- a/res/css/views/groups/_GroupRoomList.scss
+++ b/res/css/views/groups/_GroupRoomList.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_GroupRoomTile {
position: relative;
- color: $primary-fg-color;
+ color: $primary-content;
cursor: pointer;
display: flex;
align-items: center;
diff --git a/res/css/views/messages/_CallEvent.scss b/res/css/views/messages/_CallEvent.scss
index 58d2e2fc32..7934f8f3c2 100644
--- a/res/css/views/messages/_CallEvent.scss
+++ b/res/css/views/messages/_CallEvent.scss
@@ -41,7 +41,7 @@ limitations under the License.
height: 16px;
width: 16px;
- background-color: $tertiary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
@@ -116,7 +116,7 @@ limitations under the License.
.mx_CallEvent_type {
font-weight: 400;
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: 1.2rem;
line-height: $font-13px;
display: flex;
@@ -132,7 +132,7 @@ limitations under the License.
position: absolute;
height: 13px;
width: 13px;
- background-color: $tertiary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
}
@@ -145,7 +145,7 @@ limitations under the License.
display: flex;
flex-direction: row;
align-items: center;
- color: $secondary-fg-color;
+ color: $secondary-content;
margin-right: 16px;
gap: 8px;
min-width: max-content;
diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 765c74a36d..920c3011f5 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -36,6 +36,10 @@ $timelineImageBorderRadius: 4px;
animation: mx--anim-pulse 1.75s infinite cubic-bezier(.4, 0, .6, 1);
border-radius: $timelineImageBorderRadius;
}
+
+ .mx_no-image-placeholder {
+ background-color: $primary-content;
+ }
}
.mx_MImageBody_thumbnail_container {
@@ -96,5 +100,5 @@ $timelineImageBorderRadius: 4px;
}
.mx_EventTile:hover .mx_HiddenImagePlaceholder {
- background-color: $primary-bg-color;
+ background-color: $background;
}
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index 69f3c672b7..6805036e3d 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -23,7 +23,7 @@ limitations under the License.
height: 32px;
line-height: $font-24px;
border-radius: 8px;
- background: $primary-bg-color;
+ background: $background;
border: 1px solid $input-border-color;
top: -32px;
right: 8px;
@@ -77,11 +77,11 @@ limitations under the License.
mask-size: 18px;
mask-repeat: no-repeat;
mask-position: center;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
.mx_MessageActionBar_maskButton:hover::after {
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
.mx_MessageActionBar_reactButton::after {
@@ -92,6 +92,10 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/room/message-bar/reply.svg');
}
+.mx_MessageActionBar_threadButton::after {
+ mask-image: url('$(res)/img/element-icons/message/thread.svg');
+}
+
.mx_MessageActionBar_editButton::after {
mask-image: url('$(res)/img/element-icons/room/message-bar/edit.svg');
}
diff --git a/res/css/views/messages/_ReactionsRow.scss b/res/css/views/messages/_ReactionsRow.scss
index b2bca6dfb3..1b0b847932 100644
--- a/res/css/views/messages/_ReactionsRow.scss
+++ b/res/css/views/messages/_ReactionsRow.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_ReactionsRow {
margin: 6px 0;
- color: $primary-fg-color;
+ color: $primary-content;
.mx_ReactionsRow_addReactionButton {
position: relative;
@@ -36,7 +36,7 @@ limitations under the License.
mask-size: 16px;
mask-repeat: no-repeat;
mask-position: center;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
}
@@ -46,7 +46,7 @@ limitations under the License.
&:hover, &.mx_ReactionsRow_addReactionButton_active {
&::before {
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
}
}
@@ -64,10 +64,10 @@ limitations under the License.
vertical-align: middle;
&:link, &:visited {
- color: $tertiary-fg-color;
+ color: $tertiary-content;
}
&:hover {
- color: $primary-fg-color;
+ color: $primary-content;
}
}
diff --git a/res/css/views/right_panel/_BaseCard.scss b/res/css/views/right_panel/_BaseCard.scss
index 9a5a59bda8..8c1a55fe05 100644
--- a/res/css/views/right_panel/_BaseCard.scss
+++ b/res/css/views/right_panel/_BaseCard.scss
@@ -93,7 +93,7 @@ limitations under the License.
}
> h1 {
- color: $tertiary-fg-color;
+ color: $tertiary-content;
font-size: $font-12px;
font-weight: 500;
}
@@ -145,7 +145,7 @@ limitations under the License.
justify-content: space-around;
.mx_AccessibleButton_kind_secondary {
- color: $secondary-fg-color;
+ color: $secondary-content;
background-color: rgba(141, 151, 165, 0.2);
font-weight: $font-semi-bold;
font-size: $font-14px;
diff --git a/res/css/views/right_panel/_PinnedMessagesCard.scss b/res/css/views/right_panel/_PinnedMessagesCard.scss
index 785aee09ca..f3861a3dec 100644
--- a/res/css/views/right_panel/_PinnedMessagesCard.scss
+++ b/res/css/views/right_panel/_PinnedMessagesCard.scss
@@ -48,7 +48,7 @@ limitations under the License.
height: 32px;
line-height: $font-24px;
border-radius: 8px;
- background: $primary-bg-color;
+ background: $background;
border: 1px solid $input-border-color;
padding: 1px;
width: max-content;
@@ -66,7 +66,7 @@ limitations under the License.
z-index: 1;
&::after {
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
}
}
@@ -75,7 +75,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
margin-top: 24px;
margin-bottom: 20px;
}
@@ -83,7 +83,7 @@ limitations under the License.
> span {
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
}
diff --git a/res/css/views/right_panel/_RoomSummaryCard.scss b/res/css/views/right_panel/_RoomSummaryCard.scss
index dc7804d072..7ac4787111 100644
--- a/res/css/views/right_panel/_RoomSummaryCard.scss
+++ b/res/css/views/right_panel/_RoomSummaryCard.scss
@@ -27,7 +27,7 @@ limitations under the License.
.mx_RoomSummaryCard_alias {
font-size: $font-13px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
h2, .mx_RoomSummaryCard_alias {
@@ -115,7 +115,7 @@ limitations under the License.
// as we will be applying it in its children
padding: 0;
height: auto;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
.mx_RoomSummaryCard_icon_app {
padding: 10px 48px 10px 12px; // based on typical mx_RoomSummaryCard_Button padding
@@ -128,7 +128,7 @@ limitations under the License.
}
span {
- color: $primary-fg-color;
+ color: $primary-content;
}
}
@@ -232,6 +232,10 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/room/files.svg');
}
+.mx_RoomSummaryCard_icon_threads::before {
+ mask-image: url('$(res)/img/element-icons/message/thread.svg');
+}
+
.mx_RoomSummaryCard_icon_share::before {
mask-image: url('$(res)/img/element-icons/room/share.svg');
}
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 6632ccddf9..edc82cfdbf 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -55,7 +55,7 @@ limitations under the License.
}
.mx_UserInfo_separator {
- border-bottom: 1px solid rgba($primary-fg-color, .1);
+ border-bottom: 1px solid rgba($primary-content, .1);
}
.mx_UserInfo_memberDetailsContainer {
diff --git a/res/css/views/right_panel/_WidgetCard.scss b/res/css/views/right_panel/_WidgetCard.scss
index a90e744a5a..824f1fcb2f 100644
--- a/res/css/views/right_panel/_WidgetCard.scss
+++ b/res/css/views/right_panel/_WidgetCard.scss
@@ -51,7 +51,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
}
}
}
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index fd80836237..cfcb0c48a2 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -64,7 +64,7 @@ $MiniAppTileHeight: 200px;
&:hover {
.mx_AppsContainer_resizerHandle::after {
opacity: 0.8;
- background: $primary-fg-color;
+ background: $primary-content;
}
.mx_ResizeHandle_horizontal::before {
@@ -79,7 +79,7 @@ $MiniAppTileHeight: 200px;
content: '';
- background-color: $primary-fg-color;
+ background-color: $primary-content;
opacity: 0.8;
}
}
diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index f8e0a382b1..fcdab37f5a 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -4,27 +4,29 @@
z-index: 1001;
width: 100%;
border: 1px solid $primary-hairline-color;
- background: $primary-bg-color;
+ background: $background;
border-bottom: none;
border-radius: 8px 8px 0 0;
- max-height: 50vh;
- overflow: auto;
+ overflow: clip;
+ display: flex;
+ flex-direction: column;
box-shadow: 0px -16px 32px $composer-shadow-color;
}
.mx_Autocomplete_ProviderSection {
border-bottom: 1px solid $primary-hairline-color;
+ width: 100%;
}
/* a "block" completion takes up a whole line */
.mx_Autocomplete_Completion_block {
- height: 34px;
+ min-height: 34px;
display: flex;
padding: 0 12px;
user-select: none;
cursor: pointer;
align-items: center;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_Autocomplete_Completion_block * {
@@ -40,7 +42,7 @@
user-select: none;
cursor: pointer;
align-items: center;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_Autocomplete_Completion_pill > * {
@@ -59,8 +61,9 @@
.mx_Autocomplete_Completion_container_pill {
margin: 12px;
- display: flex;
- flex-flow: wrap;
+ height: 100%;
+ overflow-y: scroll;
+ max-height: 35vh;
}
.mx_Autocomplete_Completion_container_truncate {
@@ -68,7 +71,6 @@
.mx_Autocomplete_Completion_subtitle,
.mx_Autocomplete_Completion_description {
/* Ellipsis for long names/subtitles/descriptions */
- max-width: 150px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -83,7 +85,7 @@
.mx_Autocomplete_provider_name {
margin: 12px;
- color: $primary-fg-color;
+ color: $primary-content;
font-weight: 400;
opacity: 0.4;
}
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index 544a96daba..752d3b0a54 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -31,7 +31,7 @@ limitations under the License.
@keyframes visualbell {
from { background-color: $visual-bell-bg-color; }
- to { background-color: $primary-bg-color; }
+ to { background-color: $background; }
}
&.mx_BasicMessageComposer_input_error {
diff --git a/res/css/views/rooms/_EditMessageComposer.scss b/res/css/views/rooms/_EditMessageComposer.scss
index 214bfc4a1a..bf3c7c9b42 100644
--- a/res/css/views/rooms/_EditMessageComposer.scss
+++ b/res/css/views/rooms/_EditMessageComposer.scss
@@ -28,7 +28,7 @@ limitations under the License.
.mx_BasicMessageComposer_input {
border-radius: 4px;
border: solid 1px $primary-hairline-color;
- background-color: $primary-bg-color;
+ background-color: $background;
max-height: 200px;
padding: 3px 6px;
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 27a4e67089..a2ebd6c11b 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -18,7 +18,7 @@ limitations under the License.
.mx_EntityTile {
display: flex;
align-items: center;
- color: $primary-fg-color;
+ color: $primary-content;
cursor: pointer;
.mx_E2EIcon {
@@ -86,12 +86,12 @@ limitations under the License.
.mx_EntityTile_ellipsis .mx_EntityTile_name {
font-style: italic;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_EntityTile_invitePlaceholder .mx_EntityTile_name {
font-style: italic;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_EntityTile_unavailable .mx_EntityTile_avatar,
diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index c6170bf7c0..389a5c9706 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -23,16 +23,24 @@ limitations under the License.
}
.mx_EventTile[data-layout=bubble] {
-
position: relative;
margin-top: var(--gutterSize);
- margin-left: 50px;
+ margin-left: 49px;
margin-right: 100px;
+ font-size: $font-14px;
&.mx_EventTile_continuation {
margin-top: 2px;
}
+ &.mx_EventTile_highlight {
+ &::before {
+ background-color: $event-highlight-bg-color;
+ }
+
+ color: $event-highlight-fg-color;
+ }
+
/* For replies */
.mx_EventTile {
padding-top: 0;
@@ -69,10 +77,11 @@ limitations under the License.
max-width: 70%;
}
- .mx_SenderProfile {
+ > .mx_SenderProfile {
position: relative;
top: -2px;
left: 2px;
+ font-size: $font-15px;
}
&[data-self=false] {
@@ -188,8 +197,6 @@ limitations under the License.
}
.mx_ReplyThread {
- margin: 0 calc(-1 * var(--gutterSize));
-
.mx_EventTile_reply {
max-width: 90%;
padding: 0;
@@ -223,11 +230,6 @@ limitations under the License.
margin-left: -9px;
}
- .mx_ReplyThread {
- border-left-width: 2px;
- border-left-color: $eventbubble-reply-color;
- }
-
/* Special layout scenario for "Unable To Decrypt (UTD)" events */
&.mx_EventTile_bad > .mx_EventTile_line {
display: grid;
@@ -264,6 +266,7 @@ limitations under the License.
}
.mx_EventTile.mx_EventTile_bubbleContainer[data-layout=bubble],
+.mx_EventTile.mx_EventTile_leftAlignedBubble[data-layout=bubble],
.mx_EventTile.mx_EventTile_info[data-layout=bubble],
.mx_EventListSummary[data-layout=bubble][data-expanded=false] {
--backgroundColor: transparent;
@@ -283,6 +286,8 @@ limitations under the License.
.mx_EventTile_line,
.mx_EventTile_info {
min-width: 100%;
+ // Preserve alignment with left edge of text in bubbles
+ margin: 0;
}
.mx_EventTile_e2eIcon {
@@ -290,9 +295,10 @@ limitations under the License.
}
.mx_EventTile_line > a {
+ // Align timestamps with those of normal bubble tiles
right: auto;
- top: -15px;
- left: -68px;
+ top: -11px;
+ left: -95px;
}
}
@@ -322,11 +328,10 @@ limitations under the License.
}
.mx_EventTile_line {
- margin: 0 5px;
+ margin: 0;
> a {
- left: auto;
- right: 0;
- transform: translateX(calc(100% + 5px));
+ // Align timestamps with those of normal bubble tiles
+ left: -76px;
}
}
@@ -336,7 +341,8 @@ limitations under the License.
}
.mx_EventListSummary[data-expanded=false][data-layout=bubble] {
- padding: 0 34px;
+ // Align with left edge of bubble tiles
+ padding: 0 49px;
}
/* events that do not require bubble layout */
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 56cede0895..4495ec4f29 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -55,7 +55,7 @@ $hover-select-border: 4px;
}
.mx_SenderProfile {
- color: $primary-fg-color;
+ color: $primary-content;
font-size: $font-14px;
display: inline-block; /* anti-zalgo, with overflow hidden */
overflow: hidden;
@@ -161,7 +161,7 @@ $hover-select-border: 4px;
// up with the other read receipts
&::before {
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: 14px;
@@ -480,7 +480,7 @@ $hover-select-border: 4px;
}
pre code > * {
- display: inline-block;
+ display: inline;
}
pre {
@@ -514,7 +514,7 @@ $hover-select-border: 4px;
.mx_EventTile:hover .mx_EventTile_body pre,
.mx_EventTile.focus-visible:focus-within .mx_EventTile_body pre {
- border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
+ border: 1px solid $tertiary-content;
}
.mx_EventTile_pre_container {
@@ -618,7 +618,7 @@ $hover-select-border: 4px;
}
.mx_EventTile_keyRequestInfo_text a {
- color: $primary-fg-color;
+ color: $primary-content;
text-decoration: underline;
cursor: pointer;
}
@@ -643,6 +643,7 @@ $hover-select-border: 4px;
// Remove some of the default tile padding so that the error is centered
margin-right: 0;
+
.mx_EventTile_line {
padding-left: 0;
margin-right: 0;
@@ -674,3 +675,66 @@ $hover-select-border: 4px;
margin-right: 0;
}
}
+
+.mx_ThreadInfo:hover {
+ cursor: pointer;
+}
+
+.mx_ThreadView {
+ display: flex;
+ flex-direction: column;
+
+ .mx_ScrollPanel {
+ margin-top: 20px;
+
+ .mx_RoomView_MessageList {
+ padding: 0;
+ }
+ }
+
+ .mx_EventTile_senderDetails {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ margin-bottom: 6px;
+
+ a {
+ flex: 1;
+ min-width: none;
+ max-width: 100%;
+ display: flex;
+ align-items: center;
+
+ .mx_SenderProfile {
+ flex: 1;
+ }
+ }
+ }
+
+ .mx_ThreadView_List {
+ flex: 1;
+ overflow: scroll;
+ }
+
+ .mx_EventTile_roomName {
+ display: none;
+ }
+
+ .mx_EventTile_line {
+ padding-left: 0 !important;
+ order: 10 !important;
+ }
+
+ .mx_EventTile {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ margin-top: 0;
+ padding-bottom: 5px;
+ margin-bottom: 5px;
+ }
+
+ .mx_MessageComposer_sendMessage {
+ margin-right: 0;
+ }
+}
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index a8dc2ce11c..2b38b509de 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -56,7 +56,7 @@ limitations under the License.
height: 38px;
border-radius: 19px;
box-sizing: border-box;
- background: $primary-bg-color;
+ background: $background;
border: 1.3px solid $muted-fg-color;
cursor: pointer;
}
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index 3f7f83d334..4abd9c7c30 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -111,7 +111,7 @@ limitations under the License.
.mx_MemberInfo_field {
cursor: pointer;
font-size: $font-15px;
- color: $primary-fg-color;
+ color: $primary-content;
margin-left: 8px;
line-height: $font-23px;
}
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 5e2eff4047..9ba966c083 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -130,7 +130,7 @@ limitations under the License.
@keyframes visualbell {
from { background-color: $visual-bell-bg-color; }
- to { background-color: $primary-bg-color; }
+ to { background-color: $background; }
}
.mx_MessageComposer_input_error {
@@ -160,8 +160,8 @@ limitations under the License.
resize: none;
outline: none;
box-shadow: none;
- color: $primary-fg-color;
- background-color: $primary-bg-color;
+ color: $primary-content;
+ background-color: $background;
font-size: $font-14px;
max-height: 120px;
overflow: auto;
@@ -186,11 +186,14 @@ limitations under the License.
}
.mx_MessageComposer_button {
+ --size: 26px;
position: relative;
margin-right: 6px;
cursor: pointer;
- height: 26px;
- width: 26px;
+ height: var(--size);
+ line-height: var(--size);
+ width: auto;
+ padding-left: calc(var(--size) + 5px);
border-radius: 100%;
&::before {
@@ -207,8 +210,22 @@ limitations under the License.
mask-position: center;
}
- &:hover {
- background: rgba($accent-color, 0.1);
+ &::after {
+ content: '';
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 0;
+ width: var(--size);
+ height: var(--size);
+ border-radius: 50%;
+ }
+
+ &:hover,
+ &.mx_MessageComposer_closeButtonMenu {
+ &::after {
+ background: rgba($accent-color, 0.1);
+ }
&::before {
background-color: $accent-color;
@@ -237,10 +254,18 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/room/composer/sticker.svg');
}
+.mx_MessageComposer_buttonMenu::before {
+ mask-image: url('$(res)/img/image-view/more.svg');
+}
+
+.mx_MessageComposer_closeButtonMenu::before {
+ transform: rotate(90deg);
+ transform-origin: center;
+}
+
.mx_MessageComposer_sendMessage {
cursor: pointer;
position: relative;
- margin-right: 6px;
width: 32px;
height: 32px;
border-radius: 100%;
@@ -340,3 +365,28 @@ limitations under the License.
height: 50px;
}
}
+
+/**
+ * Unstable compact mode
+ */
+
+.mx_MessageComposer.mx_MessageComposer--compact {
+ margin-right: 0;
+
+ .mx_MessageComposer_wrapper {
+ padding: 0 0 0 25px;
+ }
+
+ .mx_MessageComposer_button:last-child {
+ margin-right: 0;
+ }
+
+ .mx_MessageComposer_e2eIcon {
+ left: 0;
+ }
+}
+
+.mx_MessageComposer_Menu .mx_CallContextMenu_item {
+ display: flex;
+ align-items: center;
+}
diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
index e0cccfa885..f0e471d384 100644
--- a/res/css/views/rooms/_NewRoomIntro.scss
+++ b/res/css/views/rooms/_NewRoomIntro.scss
@@ -67,6 +67,6 @@ limitations under the License.
> p {
margin: 0;
font-size: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
}
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
index 64b2623238..670e057cfa 100644
--- a/res/css/views/rooms/_NotificationBadge.scss
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -42,7 +42,7 @@ limitations under the License.
// These are the 3 background types
&.mx_NotificationBadge_dot {
- background-color: $primary-fg-color; // increased visibility
+ background-color: $primary-content; // increased visibility
width: 6px;
height: 6px;
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index 15b3c16faa..07978a8f65 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -67,7 +67,7 @@ limitations under the License.
//left: 0;
height: inherit;
width: inherit;
- background: $secondary-fg-color;
+ background: $secondary-content;
mask-position: center;
mask-size: 8px;
mask-repeat: no-repeat;
@@ -87,7 +87,7 @@ limitations under the License.
.mx_PinnedEventTile_timestamp {
font-size: inherit;
line-height: inherit;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
.mx_AccessibleButton_kind_link {
diff --git a/res/css/views/rooms/_ReplyPreview.scss b/res/css/views/rooms/_ReplyPreview.scss
index 60feb39d11..70a820e412 100644
--- a/res/css/views/rooms/_ReplyPreview.scss
+++ b/res/css/views/rooms/_ReplyPreview.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_ReplyPreview {
border: 1px solid $primary-hairline-color;
- background: $primary-bg-color;
+ background: $background;
border-bottom: none;
border-radius: 8px 8px 0 0;
max-height: 50vh;
@@ -28,7 +28,7 @@ limitations under the License.
.mx_ReplyPreview_header {
margin: 8px;
- color: $primary-fg-color;
+ color: $primary-content;
font-weight: 400;
opacity: 0.4;
}
diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss
index fd21e5f348..3ef6491ec9 100644
--- a/res/css/views/rooms/_ReplyTile.scss
+++ b/res/css/views/rooms/_ReplyTile.scss
@@ -42,7 +42,7 @@ limitations under the License.
display: flex;
flex-direction: column;
text-decoration: none;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_RedactedBody {
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 4142b0a2ef..81dfa90c96 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -17,7 +17,7 @@ limitations under the License.
.mx_RoomHeader {
flex: 0 0 50px;
border-bottom: 1px solid $primary-hairline-color;
- background-color: $roomheader-bg-color;
+ background-color: $background;
.mx_RoomHeader_e2eIcon {
height: 12px;
@@ -74,7 +74,7 @@ limitations under the License.
.mx_RoomHeader_buttons {
display: flex;
- background-color: $primary-bg-color;
+ background-color: $background;
}
.mx_RoomHeader_info {
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 8eda25d0c9..7d967661a6 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -43,11 +43,11 @@ limitations under the License.
div:first-child {
font-weight: $font-semi-bold;
line-height: $font-18px;
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_AccessibleButton {
- color: $primary-fg-color;
+ color: $primary-content;
position: relative;
padding: 8px 8px 8px 32px;
font-size: inherit;
@@ -64,7 +64,7 @@ limitations under the License.
position: absolute;
top: 8px;
left: 8px;
- background: $secondary-fg-color;
+ background: $secondary-content;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
index 146b3edf71..6db2185dd5 100644
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -172,14 +172,12 @@ limitations under the License.
}
}
- // In the general case, we leave height of headers alone even if sticky, so
- // that the sublists below them do not jump. However, that leaves a gap
- // when scrolled to the top above the first sublist (whose header can only
- // ever stick to top), so we force height to 0 for only that first header.
- // See also https://github.com/vector-im/element-web/issues/14429.
- &:first-child .mx_RoomSublist_headerContainer {
- height: 0;
- padding-bottom: 4px;
+ // In the general case, we reserve space for each sublist header to prevent
+ // scroll jumps when they become sticky. However, that leaves a gap when
+ // scrolled to the top above the first sublist (whose header can only ever
+ // stick to top), so we make sure to exclude the first visible sublist.
+ &:not(.mx_RoomSublist_hidden) ~ .mx_RoomSublist .mx_RoomSublist_headerContainer {
+ height: 24px;
}
.mx_RoomSublist_resizeBox {
@@ -233,7 +231,7 @@ limitations under the License.
&:hover, &.mx_RoomSublist_hasMenuOpen {
.mx_RoomSublist_resizerHandle {
opacity: 0.8;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
}
}
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index b8f4aeb6e7..0c04f27115 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -124,7 +124,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
- background: $primary-fg-color;
+ background: $primary-content;
}
}
diff --git a/res/css/views/rooms/_SearchBar.scss b/res/css/views/rooms/_SearchBar.scss
index d9f730a8b6..e08168a122 100644
--- a/res/css/views/rooms/_SearchBar.scss
+++ b/res/css/views/rooms/_SearchBar.scss
@@ -47,7 +47,7 @@ limitations under the License.
padding: 5px;
font-size: $font-15px;
cursor: pointer;
- color: $primary-fg-color;
+ color: $primary-content;
border-bottom: 2px solid $accent-color;
font-weight: 600;
}
diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 8841b042a0..7c7d96e713 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -41,7 +41,7 @@ limitations under the License.
height: 38px;
border-radius: 19px;
box-sizing: border-box;
- background: $primary-bg-color;
+ background: $background;
border: 1.3px solid $muted-fg-color;
cursor: pointer;
}
@@ -62,7 +62,7 @@ limitations under the License.
display: block;
width: 18px;
height: 18px;
- background: $primary-bg-color;
+ background: $background;
border: 1.3px solid $muted-fg-color;
border-radius: 10px;
margin: 5px auto;
diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.scss b/res/css/views/rooms/_VoiceRecordComposerTile.scss
index 8196d5c67a..69fe292c0a 100644
--- a/res/css/views/rooms/_VoiceRecordComposerTile.scss
+++ b/res/css/views/rooms/_VoiceRecordComposerTile.scss
@@ -48,7 +48,7 @@ limitations under the License.
.mx_VoiceRecordComposerTile_uploadingState {
margin-right: 10px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
.mx_VoiceRecordComposerTile_failedState {
diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index 1c0dabbeb5..49655742bb 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -36,7 +36,7 @@ limitations under the License.
}
.mx_WhoIsTypingTile_avatars .mx_BaseAvatar {
- border: 1px solid $primary-bg-color;
+ border: 1px solid $background;
border-radius: 40px;
}
@@ -45,7 +45,7 @@ limitations under the License.
display: inline-block;
color: #acacac;
background-color: #ddd;
- border: 1px solid $primary-bg-color;
+ border: 1px solid $background;
border-radius: 40px;
width: 24px;
height: 24px;
diff --git a/res/css/views/settings/_LayoutSwitcher.scss b/res/css/views/settings/_LayoutSwitcher.scss
index 924fe5ae1b..00fb8aba56 100644
--- a/res/css/views/settings/_LayoutSwitcher.scss
+++ b/res/css/views/settings/_LayoutSwitcher.scss
@@ -21,7 +21,7 @@ limitations under the License.
flex-direction: row;
gap: 24px;
- color: $primary-fg-color;
+ color: $primary-content;
> .mx_LayoutSwitcher_RadioButton {
flex-grow: 0;
diff --git a/res/css/views/settings/_Notifications.scss b/res/css/views/settings/_Notifications.scss
index f93e0a53a8..a0e46c0071 100644
--- a/res/css/views/settings/_Notifications.scss
+++ b/res/css/views/settings/_Notifications.scss
@@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_UserNotifSettings {
- color: $primary-fg-color; // override from default settings page styles
+ color: $primary-content; // override from default settings page styles
.mx_UserNotifSettings_pushRulesTable {
width: calc(100% + 12px); // +12px to line up center of 'Noisy' column with toggle switches
@@ -34,7 +34,7 @@ limitations under the License.
}
tr > th:nth-child(n + 2) {
- color: $secondary-fg-color;
+ color: $secondary-content;
font-size: $font-12px;
vertical-align: middle;
width: 66px;
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 3290a998ab..5aa9db7e86 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -25,7 +25,7 @@ limitations under the License.
.mx_SettingsTab_heading {
font-size: $font-20px;
font-weight: 600;
- color: $primary-fg-color;
+ color: $primary-content;
margin-bottom: 10px;
}
@@ -37,7 +37,7 @@ limitations under the License.
font-size: $font-16px;
display: block;
font-weight: 600;
- color: $primary-fg-color;
+ color: $primary-content;
margin-bottom: 10px;
margin-top: 12px;
}
@@ -72,7 +72,7 @@ limitations under the License.
vertical-align: middle;
display: inline-block;
font-size: $font-14px;
- color: $primary-fg-color;
+ color: $primary-content;
max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch
box-sizing: border-box;
padding-right: 10px;
@@ -82,7 +82,7 @@ limitations under the License.
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
.mx_SettingsTab_section .mx_SettingsFlag .mx_ToggleSwitch {
diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index 2aab201352..8fd0f14418 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -22,7 +22,7 @@ limitations under the License.
.mx_SecurityRoomSettingsTab_spacesWithAccess {
> h4 {
- color: $secondary-fg-color;
+ color: $secondary-content;
font-weight: $font-semi-bold;
font-size: $font-12px;
line-height: $font-15px;
@@ -33,7 +33,7 @@ limitations under the License.
font-weight: 500;
font-size: $font-14px;
line-height: 32px; // matches height of avatar for v-align
- color: $secondary-fg-color;
+ color: $secondary-content;
display: inline-block;
img.mx_RoomAvatar_isSpaceRoom,
@@ -89,7 +89,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-24px;
- color: $primary-fg-color;
+ color: $primary-content;
display: block;
}
}
@@ -100,7 +100,7 @@ limitations under the License.
margin-bottom: 16px;
font-size: $font-15px;
line-height: $font-24px;
- color: $secondary-fg-color;
+ color: $secondary-content;
& + .mx_RadioButton {
border-top: 1px solid $menu-border-color;
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index d8e617a40d..57c6e9b865 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -24,7 +24,7 @@ limitations under the License.
}
.mx_AppearanceUserSettingsTab_fontScaling {
- color: $primary-fg-color;
+ color: $primary-content;
}
.mx_AppearanceUserSettingsTab_fontSlider {
@@ -81,7 +81,7 @@ limitations under the License.
.mx_AppearanceUserSettingsTab_themeSection {
$radio-bg-color: $input-darker-bg-color;
- color: $primary-fg-color;
+ color: $primary-content;
> .mx_ThemeSelectors {
display: flex;
@@ -156,7 +156,7 @@ limitations under the License.
}
.mx_AppearanceUserSettingsTab_Advanced {
- color: $primary-fg-color;
+ color: $primary-content;
> * {
margin-bottom: 16px;
diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index 4cdfa0b40f..d1076205ad 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -30,7 +30,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
- color: $primary-fg-color;
+ color: $primary-content;
margin: 16px 0;
.mx_BaseAvatar {
diff --git a/res/css/views/spaces/_SpaceBasicSettings.scss b/res/css/views/spaces/_SpaceBasicSettings.scss
index c73e0715dd..bff574ded3 100644
--- a/res/css/views/spaces/_SpaceBasicSettings.scss
+++ b/res/css/views/spaces/_SpaceBasicSettings.scss
@@ -27,7 +27,7 @@ limitations under the License.
position: relative;
height: 80px;
width: 80px;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
border-radius: 16px;
}
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
index 41536bc8b1..3f526a6bba 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.scss
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -28,7 +28,7 @@ $spacePanelWidth: 71px;
padding: 24px;
width: 480px;
box-sizing: border-box;
- background-color: $primary-bg-color;
+ background-color: $background;
position: relative;
> div {
@@ -40,7 +40,7 @@ $spacePanelWidth: 71px;
> p {
font-size: $font-15px;
- color: $secondary-fg-color;
+ color: $secondary-content;
}
.mx_SpaceFeedbackPrompt {
@@ -76,7 +76,7 @@ $spacePanelWidth: 71px;
width: 28px;
top: 0;
left: 0;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
transform: rotate(90deg);
mask-repeat: no-repeat;
mask-position: 2px 3px;
@@ -108,7 +108,7 @@ $spacePanelWidth: 71px;
line-height: $font-24px;
> span {
- color: $secondary-fg-color;
+ color: $secondary-content;
position: relative;
font-size: inherit;
line-height: inherit;
diff --git a/res/css/views/toasts/_IncomingCallToast.scss b/res/css/views/toasts/_IncomingCallToast.scss
index eb80f2d5cf..cb05b1a977 100644
--- a/res/css/views/toasts/_IncomingCallToast.scss
+++ b/res/css/views/toasts/_IncomingCallToast.scss
@@ -43,7 +43,7 @@ limitations under the License.
.mx_CallEvent_type {
font-size: $font-12px;
line-height: $font-15px;
- color: $tertiary-fg-color;
+ color: $tertiary-content;
margin-top: 4px;
margin-bottom: 6px;
@@ -62,7 +62,7 @@ limitations under the License.
position: absolute;
height: inherit;
width: inherit;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
mask-repeat: no-repeat;
mask-size: contain;
}
@@ -139,7 +139,7 @@ limitations under the License.
height: inherit;
width: inherit;
- background-color: $tertiary-fg-color;
+ background-color: $tertiary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
diff --git a/res/css/views/voip/_CallContainer.scss b/res/css/views/voip/_CallContainer.scss
index d11ab9bf9f..a0137b18e8 100644
--- a/res/css/views/voip/_CallContainer.scss
+++ b/res/css/views/voip/_CallContainer.scss
@@ -26,19 +26,6 @@ limitations under the License.
// different level.
pointer-events: none;
- .mx_CallPreview {
- pointer-events: initial; // restore pointer events so the user can leave/interact
-
- .mx_VideoFeed_remote.mx_VideoFeed_voice {
- min-height: 150px;
- }
-
- .mx_VideoFeed_local {
- border-radius: 8px;
- overflow: hidden;
- }
- }
-
.mx_AppTile_persistedWrapper div {
min-width: 350px;
}
diff --git a/res/css/views/voip/_CallPreview.scss b/res/css/views/voip/_CallPreview.scss
index 92348fb465..0fd97d4676 100644
--- a/res/css/views/voip/_CallPreview.scss
+++ b/res/css/views/voip/_CallPreview.scss
@@ -18,4 +18,15 @@ limitations under the License.
position: fixed;
left: 0;
top: 0;
+
+ pointer-events: initial; // restore pointer events so the user can leave/interact
+
+ .mx_VideoFeed_remote.mx_VideoFeed_voice {
+ min-height: 150px;
+ }
+
+ .mx_VideoFeed_local {
+ border-radius: 8px;
+ overflow: hidden;
+ }
}
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index 63ca91267f..aa0aa4e2a6 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -74,9 +74,9 @@ limitations under the License.
> .mx_VideoFeed {
width: 100%;
height: 100%;
+ border-width: 0 !important; // Override mx_VideoFeed_speaking
&.mx_VideoFeed_voice {
- background-color: $inverted-bg-color;
display: flex;
justify-content: center;
align-items: center;
diff --git a/res/css/views/voip/_CallViewForRoom.scss b/res/css/views/voip/_CallViewForRoom.scss
index 769e00338e..d23fcc18bc 100644
--- a/res/css/views/voip/_CallViewForRoom.scss
+++ b/res/css/views/voip/_CallViewForRoom.scss
@@ -39,7 +39,7 @@ limitations under the License.
width: 100%;
max-width: 64px;
- background-color: $primary-fg-color;
+ background-color: $primary-content;
}
}
}
diff --git a/res/css/views/voip/_CallViewHeader.scss b/res/css/views/voip/_CallViewHeader.scss
index 014cfce478..0575f4f535 100644
--- a/res/css/views/voip/_CallViewHeader.scss
+++ b/res/css/views/voip/_CallViewHeader.scss
@@ -53,7 +53,7 @@ limitations under the License.
height: 20px;
width: 20px;
vertical-align: middle;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
@@ -90,7 +90,7 @@ limitations under the License.
.mx_CallViewHeader_callTypeSmall {
font-size: 12px;
- color: $secondary-fg-color;
+ color: $secondary-content;
line-height: initial;
height: 15px;
overflow: hidden;
@@ -113,7 +113,7 @@ limitations under the License.
height: 16px;
width: 16px;
- background-color: $secondary-fg-color;
+ background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
diff --git a/res/css/views/voip/_CallViewSidebar.scss b/res/css/views/voip/_CallViewSidebar.scss
index dbadc22028..fd9c76defc 100644
--- a/res/css/views/voip/_CallViewSidebar.scss
+++ b/res/css/views/voip/_CallViewSidebar.scss
@@ -33,10 +33,9 @@ limitations under the License.
> .mx_VideoFeed {
width: 100%;
+ border-radius: 4px;
&.mx_VideoFeed_voice {
- border-radius: 4px;
-
display: flex;
align-items: center;
justify-content: center;
diff --git a/res/css/views/voip/_DialPad.scss b/res/css/views/voip/_DialPad.scss
index eefd2e9ba5..288f1f5d31 100644
--- a/res/css/views/voip/_DialPad.scss
+++ b/res/css/views/voip/_DialPad.scss
@@ -33,7 +33,7 @@ limitations under the License.
width: 40px;
height: 40px;
- background-color: $dialpad-button-bg-color;
+ background-color: $quinary-content;
border-radius: 40px;
font-size: 18px;
font-weight: 600;
diff --git a/res/css/views/voip/_DialPadContextMenu.scss b/res/css/views/voip/_DialPadContextMenu.scss
index 527d223ffc..d2014241e9 100644
--- a/res/css/views/voip/_DialPadContextMenu.scss
+++ b/res/css/views/voip/_DialPadContextMenu.scss
@@ -30,7 +30,7 @@ limitations under the License.
margin-right: 20px;
/* a separator between the input line and the dial buttons */
- border-bottom: 1px solid $quaternary-fg-color;
+ border-bottom: 1px solid $quaternary-content;
transition: border-bottom 0.25s;
}
diff --git a/res/css/views/voip/_DialPadModal.scss b/res/css/views/voip/_DialPadModal.scss
index b8042f77ae..f378507f90 100644
--- a/res/css/views/voip/_DialPadModal.scss
+++ b/res/css/views/voip/_DialPadModal.scss
@@ -30,7 +30,7 @@ limitations under the License.
margin-right: 40px;
/* a separator between the input line and the dial buttons */
- border-bottom: 1px solid $quaternary-fg-color;
+ border-bottom: 1px solid $quaternary-content;
transition: border-bottom 0.25s;
}
diff --git a/res/css/views/voip/_VideoFeed.scss b/res/css/views/voip/_VideoFeed.scss
index 7a8d39dfe3..1f17a54692 100644
--- a/res/css/views/voip/_VideoFeed.scss
+++ b/res/css/views/voip/_VideoFeed.scss
@@ -17,12 +17,23 @@ limitations under the License.
.mx_VideoFeed {
overflow: hidden;
position: relative;
+ box-sizing: border-box;
+ border: transparent 2px solid;
+ display: flex;
&.mx_VideoFeed_voice {
background-color: $inverted-bg-color;
aspect-ratio: 16 / 9;
}
+ &.mx_VideoFeed_speaking {
+ border: $accent-color 2px solid;
+
+ .mx_VideoFeed_video {
+ border-radius: 0;
+ }
+ }
+
.mx_VideoFeed_video {
width: 100%;
background-color: transparent;
diff --git a/res/img/element-icons/message/thread.svg b/res/img/element-icons/message/thread.svg
new file mode 100644
index 0000000000..b4a7cc0066
--- /dev/null
+++ b/res/img/element-icons/message/thread.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 8V8C1.89543 8 1 7.10457 1 6V3C1 1.89543 1.89543 1 3 1H15C16.1046 1 17 1.89484 17 2.9994C17 3.88147 17 4.95392 17 6.00008C17 7.10465 16.1046 8 15 8H10.5" stroke="#737D8C" stroke-width="1.5" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2011 16.7176C12.9087 17.011 12.9088 17.4866 13.2012 17.78C13.4936 18.0734 13.9677 18.0733 14.2601 17.78C14.9484 17.0894 15.6519 16.3829 16.1834 15.8491L16.8282 15.2014L17.0099 15.0188L17.0579 14.9706L17.0702 14.9582L17.0733 14.955L17.0741 14.9542L17.0743 14.954L17.0743 14.954L16.5444 14.4233L17.0744 14.954C17.3663 14.6606 17.3661 14.1855 17.0741 13.8922L14.2539 11.061C13.9616 10.7675 13.4875 10.7674 13.195 11.0606C12.9024 11.3539 12.9023 11.8295 13.1946 12.123L14.7442 13.6787L10.1137 13.6787C8.69795 13.6787 7.49996 12.4759 7.49996 10.9288L7.49996 7.00002C7.49996 6.58581 7.16417 6.25002 6.74996 6.25002C6.33574 6.25002 5.99996 6.58581 5.99996 7.00002L5.99996 10.9288C5.99996 13.2476 7.81395 15.1787 10.1137 15.1787H14.7341C14.2713 15.6436 13.7316 16.1854 13.2011 16.7176Z" fill="#737D8C"/>
+</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 8c305b9828..0bc61d438d 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -20,29 +20,18 @@ $space-nav: rgba($panel-base, 0.1);
// unified palette
// try to use these colors when possible
-$bg-color: $background;
-$base-color: $bg-color;
-$base-text-color: $primary-content;
$header-panel-bg-color: #20252B;
$header-panel-border-color: #000000;
$header-panel-text-primary-color: #B9BEC6;
$header-panel-text-secondary-color: #c8c8cd;
-$text-primary-color: $primary-content;
$text-secondary-color: #B9BEC6;
-$quaternary-fg-color: $quaternary-content;
$search-bg-color: #181b21;
$search-placeholder-color: #61708b;
$room-highlight-color: #343a46;
// typical text (dark-on-white in light skin)
-$primary-fg-color: $text-primary-color;
-$primary-bg-color: $bg-color;
$muted-fg-color: $header-panel-text-primary-color;
-// additional text colors
-$secondary-fg-color: $secondary-content;
-$tertiary-fg-color: $tertiary-content;
-
// used for dialog box text
$light-fg-color: $header-panel-text-secondary-color;
@@ -61,7 +50,7 @@ $info-plinth-fg-color: #888;
$preview-bar-bg-color: $header-panel-bg-color;
$groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
-$inverted-bg-color: $base-color;
+$inverted-bg-color: $background;
// used by AddressSelector
$selected-color: $room-highlight-color;
@@ -82,7 +71,7 @@ $input-focused-border-color: #238cf5;
$input-valid-border-color: $accent-color;
$input-invalid-border-color: $warning-color;
-$field-focused-label-bg-color: $bg-color;
+$field-focused-label-bg-color: $background;
$resend-button-divider-color: #b9bec64a; // muted-text with a 4A opacity.
@@ -93,15 +82,15 @@ $scrollbar-track-color: transparent;
// context menus
$menu-border-color: $header-panel-border-color;
$menu-bg-color: $header-panel-bg-color;
-$menu-box-shadow-color: $bg-color;
+$menu-box-shadow-color: $background;
$menu-selected-color: $room-highlight-color;
$avatar-initial-color: #ffffff;
-$avatar-bg-color: $bg-color;
+$avatar-bg-color: $background;
-$h3-color: $primary-fg-color;
+$h3-color: $primary-content;
-$dialog-title-fg-color: $base-text-color;
+$dialog-title-fg-color: $primary-content;
$dialog-backdrop-color: #000;
$dialog-shadow-color: rgba(0, 0, 0, 0.48);
$dialog-close-fg-color: #9fa9ba;
@@ -117,11 +106,10 @@ $settings-profile-button-bg-color: #e7e7e7;
$settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
$settings-subsection-fg-color: $text-secondary-color;
-$topleftmenu-color: $text-primary-color;
-$roomheader-color: $text-primary-color;
-$roomheader-bg-color: $bg-color;
+$topleftmenu-color: $primary-content;
+$roomheader-color: $primary-content;
$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
-$roomheader-addroom-fg-color: $text-primary-color;
+$roomheader-addroom-fg-color: $primary-content;
$groupFilterPanel-button-color: $header-panel-text-primary-color;
$groupheader-button-color: $header-panel-text-primary-color;
$rightpanel-button-color: $header-panel-text-primary-color;
@@ -135,18 +123,16 @@ $composer-e2e-icon-color: $header-panel-text-primary-color;
// ********************
$theme-button-bg-color: #e3e8f0;
-$dialpad-button-bg-color: $quinary-content;
$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
-$roomlist-filter-active-bg-color: $bg-color;
$roomlist-bg-color: rgba(33, 38, 44, 0.90);
-$roomlist-header-color: $tertiary-fg-color;
-$roomsublist-divider-color: $primary-fg-color;
+$roomlist-header-color: $tertiary-content;
+$roomsublist-divider-color: $primary-content;
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
$groupFilterPanel-divider-color: $roomlist-header-color;
-$roomtile-preview-color: $secondary-fg-color;
+$roomtile-preview-color: $secondary-content;
$roomtile-default-badge-bg-color: #61708b;
$roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
@@ -170,12 +156,12 @@ $event-highlight-bg-color: #25271F;
$event-timestamp-color: $text-secondary-color;
// Tabbed views
-$tab-label-fg-color: $text-primary-color;
-$tab-label-active-fg-color: $text-primary-color;
+$tab-label-fg-color: $primary-content;
+$tab-label-active-fg-color: $primary-content;
$tab-label-bg-color: transparent;
$tab-label-active-bg-color: $accent-color;
-$tab-label-icon-bg-color: $text-primary-color;
-$tab-label-active-icon-bg-color: $text-primary-color;
+$tab-label-icon-bg-color: $primary-content;
+$tab-label-active-icon-bg-color: $primary-content;
// Buttons
$button-primary-fg-color: $primary-content;
@@ -198,6 +184,9 @@ $visual-bell-bg-color: #800;
$room-warning-bg-color: $header-panel-bg-color;
+$authpage-body-bg-color: $background;
+$authpage-primary-color: $primary-content;
+
$dark-panel-bg-color: $header-panel-bg-color;
$panel-gradient: rgba(34, 38, 46, 0), rgba(34, 38, 46, 1);
@@ -217,30 +206,31 @@ $kbd-border-color: #000000;
$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
$tooltip-timeline-fg-color: $primary-content;
-$interactive-tooltip-bg-color: $base-color;
+$interactive-tooltip-bg-color: $background;
$interactive-tooltip-fg-color: $primary-content;
$breadcrumb-placeholder-bg-color: #272c35;
$user-tile-hover-bg-color: $header-panel-bg-color;
-$message-body-panel-fg-color: $secondary-fg-color;
+$message-body-panel-fg-color: $secondary-content;
$message-body-panel-bg-color: $quinary-content;
-$message-body-panel-icon-fg-color: $secondary-fg-color;
-$message-body-panel-icon-bg-color: $system; // "System Dark"
+$message-body-panel-icon-bg-color: $system;
+$message-body-panel-icon-fg-color: $secondary-content;
-$voice-record-stop-border-color: $quaternary-fg-color;
-$voice-record-waveform-incomplete-fg-color: $quaternary-fg-color;
-$voice-record-icon-color: $quaternary-fg-color;
+$voice-record-stop-border-color: $quaternary-content;
+$voice-record-waveform-incomplete-fg-color: $quaternary-content;
+$voice-record-icon-color: $quaternary-content;
$voice-playback-button-bg-color: $message-body-panel-icon-bg-color;
$voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
// Appearance tab colors
$appearance-tab-border-color: $room-highlight-color;
-// blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 60px;
-$groupFilterPanel-background-blur-amount: 30px;
+// blur amounts for left left panel (only for element theme)
+:root {
+ --lp-background-blur: 45px;
+}
$composer-shadow-color: rgba(0, 0, 0, 0.28);
@@ -248,7 +238,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
$eventbubble-self-bg: #14322E;
$eventbubble-others-bg: $event-selected-color;
$eventbubble-bg-hover: #1C2026;
-$eventbubble-avatar-outline: $bg-color;
+$eventbubble-avatar-outline: $background;
$eventbubble-reply-color: #C1C6CD;
// ***** Mixins! *****
diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index 600cfd528a..df83d6db88 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -2,10 +2,6 @@
@import "../../light/css/_paths.scss";
@import "../../light/css/_fonts.scss";
@import "../../light/css/_light.scss";
-// important this goes before _mods,
-// as $groupFilterPanel-background-blur-amount and
-// $roomlist-background-blur-amount
-// are overridden in _dark.scss
@import "_dark.scss";
@import "../../light/css/_mods.scss";
@import "../../../../res/css/_components.scss";
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 3e3412c6c1..d5bc5e6dd7 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -24,7 +24,12 @@ $primary-bg-color: $bg-color;
$muted-fg-color: $header-panel-text-primary-color;
// Legacy theme backports
-$quaternary-fg-color: #6F7882;
+$primary-content: $primary-fg-color;
+$secondary-content: $secondary-fg-color;
+$tertiary-content: $tertiary-fg-color;
+$quaternary-content: #6F7882;
+$quinary-content: $quaternary-content;
+$background: $primary-bg-color;
// used for dialog box text
$light-fg-color: $header-panel-text-secondary-color;
@@ -117,7 +122,6 @@ $composer-e2e-icon-color: $header-panel-text-primary-color;
// ********************
$theme-button-bg-color: #e3e8f0;
-$dialpad-button-bg-color: #6F7882;
$roomlist-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 3f722bcb30..47247e5e23 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -32,7 +32,12 @@ $primary-bg-color: #ffffff;
$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
// Legacy theme backports
-$quaternary-fg-color: #C1C6CD;
+$primary-content: $primary-fg-color;
+$secondary-content: $secondary-fg-color;
+$tertiary-content: $tertiary-fg-color;
+$quaternary-content: #C1C6CD;
+$quinary-content: #e3e8f0;
+$background: $primary-bg-color;
// used for dialog box text
$light-fg-color: #747474;
@@ -186,8 +191,6 @@ $voipcall-plinth-color: $system;
// ********************
$theme-button-bg-color: #e3e8f0;
-$dialpad-button-bg-color: #e3e8f0;
-
$roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
$roomlist-filter-active-bg-color: $roomlist-button-bg-color;
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 6c37351414..455798a556 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -38,7 +38,7 @@ $lightbox-border-color: var(--timeline-background-color);
$menu-bg-color: var(--timeline-background-color);
$avatar-bg-color: var(--timeline-background-color);
$message-action-bar-bg-color: var(--timeline-background-color);
-$primary-bg-color: var(--timeline-background-color);
+$background: var(--timeline-background-color);
$togglesw-ball-color: var(--timeline-background-color);
$droptarget-bg-color: var(--timeline-background-color-50pct); //still needs alpha at .5
$authpage-modal-bg-color: var(--timeline-background-color-50pct); //still needs alpha at .59
@@ -69,7 +69,7 @@ $roomlist-bg-color: var(--roomlist-background-color);
//
// --timeline-text-color
$message-action-bar-fg-color: var(--timeline-text-color);
-$primary-fg-color: var(--timeline-text-color);
+$primary-content: var(--timeline-text-color);
$settings-profile-overlay-placeholder-fg-color: var(--timeline-text-color);
$roomtopic-color: var(--timeline-text-color-50pct);
$tab-label-fg-color: var(--timeline-text-color);
@@ -82,6 +82,8 @@ $tab-label-fg-color: var(--timeline-text-color);
// was #4e5054
$authpage-lang-color: var(--timeline-text-color);
$roomheader-color: var(--timeline-text-color);
+// was #232f32
+$authpage-primary-color: var(--timeline-text-color);
// --roomlist-text-secondary-color
$roomtile-preview-color: var(--roomlist-text-secondary-color);
$roomlist-header-color: var(--roomlist-text-secondary-color);
@@ -139,7 +141,7 @@ $event-selected-color: var(--timeline-highlights-color);
$event-highlight-bg-color: var(--timeline-highlights-color);
//
// redirect some variables away from their hardcoded values in the light theme
-$settings-grey-fg-color: $primary-fg-color;
+$settings-grey-fg-color: $primary-content;
// --eventbubble colors
$eventbubble-self-bg: var(--eventbubble-self-bg, $eventbubble-self-bg);
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index e64fe12d3b..96e5fd7155 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -37,14 +37,9 @@ $accent-color: $accent;
$accent-bg-color: rgba(3, 179, 129, 0.16);
$notice-primary-color: #ff4b55;
$notice-primary-bg-color: rgba(255, 75, 85, 0.16);
-$primary-fg-color: #2e2f32;
-$secondary-fg-color: $secondary-content;
-$tertiary-fg-color: #8D99A5;
-$quaternary-fg-color: $quaternary-content;
$header-panel-bg-color: #f3f8fd;
// typical text (dark-on-white in light skin)
-$primary-bg-color: $background;
$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
// used for dialog box text
@@ -59,7 +54,7 @@ $accent-color-50pct: rgba($accent-color, 0.5);
$accent-color-darker: #92caad;
$accent-color-alt: #238CF5;
-$selection-fg-color: $primary-bg-color;
+$selection-fg-color: $background;
$focus-brightness: 105%;
@@ -173,7 +168,6 @@ $rte-group-pill-color: #aaa;
$topleftmenu-color: #212121;
$roomheader-color: #45474a;
-$roomheader-bg-color: $primary-bg-color;
$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.2);
$roomheader-addroom-fg-color: #5c6470;
$groupFilterPanel-button-color: #91A1C0;
@@ -191,19 +185,16 @@ $voipcall-plinth-color: $system;
// ********************
$theme-button-bg-color: $quinary-content;
-$dialpad-button-bg-color: $quinary-content;
-
$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
-$roomlist-filter-active-bg-color: $background;
$roomlist-bg-color: rgba(245, 245, 245, 0.90);
-$roomlist-header-color: $tertiary-fg-color;
-$roomsublist-divider-color: $primary-fg-color;
+$roomlist-header-color: $tertiary-content;
+$roomsublist-divider-color: $primary-content;
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
$groupFilterPanel-divider-color: $roomlist-header-color;
-$roomtile-preview-color: $secondary-fg-color;
+$roomtile-preview-color: $secondary-content;
$roomtile-default-badge-bg-color: #61708b;
$roomtile-selected-bg-color: #FFF;
@@ -318,8 +309,8 @@ $authpage-secondary-color: #61708b;
$dark-panel-bg-color: $secondary-accent-color;
$panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1);
-$message-action-bar-bg-color: $primary-bg-color;
-$message-action-bar-fg-color: $primary-fg-color;
+$message-action-bar-bg-color: $background;
+$message-action-bar-fg-color: $primary-content;
$message-action-bar-border-color: #e9edf1;
$message-action-bar-hover-border-color: $focus-bg-color;
@@ -342,10 +333,10 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
$user-tile-hover-bg-color: $header-panel-bg-color;
-$message-body-panel-fg-color: $secondary-fg-color;
+$message-body-panel-fg-color: $secondary-content;
$message-body-panel-bg-color: $quinary-content;
-$message-body-panel-icon-fg-color: $secondary-fg-color;
$message-body-panel-icon-bg-color: $system;
+$message-body-panel-icon-fg-color: $secondary-content;
// These two don't change between themes. They are the $warning-color, but we don't
// want custom themes to affect them by accident.
@@ -353,25 +344,25 @@ $voice-record-stop-symbol-color: #ff4b55;
$voice-record-live-circle-color: #ff4b55;
$voice-record-stop-border-color: $quinary-content;
-$voice-record-waveform-incomplete-fg-color: $quaternary-fg-color;
-$voice-record-icon-color: $tertiary-fg-color;
+$voice-record-waveform-incomplete-fg-color: $quaternary-content;
+$voice-record-icon-color: $tertiary-content;
$voice-playback-button-bg-color: $message-body-panel-icon-bg-color;
$voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
// FontSlider colors
$appearance-tab-border-color: $input-darker-bg-color;
-// blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 40px;
-$groupFilterPanel-background-blur-amount: 20px;
-
+// blur amounts for left left panel (only for element theme)
+:root {
+ --lp-background-blur: 40px;
+}
$composer-shadow-color: rgba(0, 0, 0, 0.04);
// Bubble tiles
$eventbubble-self-bg: #F0FBF8;
$eventbubble-others-bg: $system;
$eventbubble-bg-hover: #FAFBFD;
-$eventbubble-avatar-outline: $primary-bg-color;
+$eventbubble-avatar-outline: $background;
$eventbubble-reply-color: $quaternary-content;
// ***** Mixins! *****
diff --git a/res/themes/light/css/_mods.scss b/res/themes/light/css/_mods.scss
index fbca58dfb1..15f6d4b0fe 100644
--- a/res/themes/light/css/_mods.scss
+++ b/res/themes/light/css/_mods.scss
@@ -4,27 +4,6 @@
// set the user avatar (if any) as a background so
// it can be blurred by the tag panel and room list
-@supports (backdrop-filter: none) {
- .mx_LeftPanel {
- background-image: var(--avatar-url, unset);
- background-repeat: no-repeat;
- background-size: cover;
- background-position: left top;
- }
-
- .mx_GroupFilterPanel {
- backdrop-filter: blur($groupFilterPanel-background-blur-amount);
- }
-
- .mx_SpacePanel {
- backdrop-filter: blur($groupFilterPanel-background-blur-amount);
- }
-
- .mx_LeftPanel .mx_LeftPanel_roomListContainer {
- backdrop-filter: blur($roomlist-background-blur-amount);
- }
-}
-
.mx_RoomSublist_showNButton {
background-color: transparent !important;
}
diff --git a/scripts/ci/js-sdk-to-release.js b/scripts/ci/js-sdk-to-release.js
new file mode 100755
index 0000000000..e1fecfde03
--- /dev/null
+++ b/scripts/ci/js-sdk-to-release.js
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+const fsProm = require('fs/promises');
+
+const PKGJSON = 'node_modules/matrix-js-sdk/package.json';
+
+async function main() {
+ const pkgJson = JSON.parse(await fsProm.readFile(PKGJSON, 'utf8'));
+ for (const field of ['main', 'typings']) {
+ if (pkgJson["matrix_lib_"+field] !== undefined) {
+ pkgJson[field] = pkgJson["matrix_lib_"+field];
+ }
+ }
+ await fsProm.writeFile(PKGJSON, JSON.stringify(pkgJson, null, 2));
+}
+
+main();
diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index 0990af70ce..ec021236d9 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -10,6 +10,7 @@ defbranch="$3"
rm -r "$defrepo" || true
+# A function that clones a branch of a repo based on the org, repo and branch
clone() {
org=$1
repo=$2
@@ -21,45 +22,38 @@ clone() {
fi
}
-# Try the PR author's branch in case it exists on the deps as well.
-# First we check if GITHUB_HEAD_REF is defined,
-# Then we check if BUILDKITE_BRANCH is defined,
-# if they aren't we can assume this is a Netlify build
-if [ -n "$GITHUB_HEAD_REF" ]; then
- head=$GITHUB_HEAD_REF
-elif [ -n "$BUILDKITE_BRANCH" ]; then
- head=$BUILDKITE_BRANCH
-else
- # Netlify doesn't give us info about the fork so we have to get it from GitHub API
- apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/"
- apiEndpoint+=$REVIEW_ID
- head=$(curl $apiEndpoint | jq -r '.head.label')
-fi
+# A function that gets info about a PR from the GitHub API based on its number
+getPRInfo() {
+ number=$1
+ if [ -n "$number" ]; then
+ echo "Getting info about a PR with number $number"
-# If head is set, it will contain on Buildkite either:
-# * "branch" when the author's branch and target branch are in the same repo
-# * "fork:branch" when the author's branch is in their fork or if this is a Netlify build
-# We can split on `:` into an array to check.
-# For GitHub Actions we need to inspect GITHUB_REPOSITORY and GITHUB_ACTOR
-# to determine whether the branch is from a fork or not
-BRANCH_ARRAY=(${head//:/ })
-if [[ "${#BRANCH_ARRAY[@]}" == "1" ]]; then
+ apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/"
+ apiEndpoint+=$number
- if [ -n "$GITHUB_HEAD_REF" ]; then
- if [[ "$GITHUB_REPOSITORY" == "$deforg"* ]]; then
- clone $deforg $defrepo $GITHUB_HEAD_REF
- else
- REPO_ARRAY=(${GITHUB_REPOSITORY//\// })
- clone $REPO_ARRAY[0] $defrepo $GITHUB_HEAD_REF
- fi
- else
- clone $deforg $defrepo $BUILDKITE_BRANCH
+ head=$(curl $apiEndpoint | jq -r '.head.label')
fi
+}
-elif [[ "${#BRANCH_ARRAY[@]}" == "2" ]]; then
- clone ${BRANCH_ARRAY[0]} $defrepo ${BRANCH_ARRAY[1]}
+# Some CIs don't give us enough info, so we just get the PR number and ask the
+# GH API for more info - "fork:branch". Some give us this directly.
+if [ -n "$BUILDKITE_BRANCH" ]; then
+ # BuildKite
+ head=$BUILDKITE_BRANCH
+elif [ -n "$PR_NUMBER" ]; then
+ # GitHub
+ getPRInfo $PR_NUMBER
+elif [ -n "$REVIEW_ID" ]; then
+ # Netlify
+ getPRInfo $REVIEW_ID
fi
+# $head will always be in the format "fork:branch", so we split it by ":" into
+# an array. The first element will then be the fork and the second the branch.
+# Based on that we clone
+BRANCH_ARRAY=(${head//:/ })
+clone ${BRANCH_ARRAY[0]} $defrepo ${BRANCH_ARRAY[1]}
+
# Try the target branch of the push or PR.
if [ -n $GITHUB_BASE_REF ]; then
clone $deforg $defrepo $GITHUB_BASE_REF
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 9d6bc2c6fb..8ad93fa960 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -93,6 +93,26 @@ declare global {
mxSetupEncryptionStore?: SetupEncryptionStore;
mxRoomScrollStateStore?: RoomScrollStateStore;
mxOnRecaptchaLoaded?: () => void;
+ electron?: Electron;
+ }
+
+ interface DesktopCapturerSource {
+ id: string;
+ name: string;
+ thumbnailURL: string;
+ }
+
+ interface GetSourcesOptions {
+ types: Array<string>;
+ thumbnailSize?: {
+ height: number;
+ width: number;
+ };
+ fetchWindowIcons?: boolean;
+ }
+
+ interface Electron {
+ getDesktopCapturerSources(options: GetSourcesOptions): Promise<Array<DesktopCapturerSource>>;
}
interface Document {
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index f2142f56f4..fe938c9929 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -250,7 +250,15 @@ export default class CallHandler extends EventEmitter {
* @returns {boolean}
*/
private areAnyCallsUnsilenced(): boolean {
- return this.calls.size > this.silencedCalls.size;
+ for (const call of this.calls.values()) {
+ if (
+ call.state === CallState.Ringing &&
+ !this.isCallSilenced(call.callId)
+ ) {
+ return true;
+ }
+ }
+ return false;
}
private async checkProtocols(maxTries) {
@@ -464,85 +472,7 @@ export default class CallHandler extends EventEmitter {
this.removeCallForRoom(mappedRoomId);
});
call.on(CallEvent.State, (newState: CallState, oldState: CallState) => {
- if (!this.matchesCallForThisRoom(call)) return;
-
- this.setCallState(call, newState);
-
- switch (oldState) {
- case CallState.Ringing:
- this.pause(AudioID.Ring);
- break;
- case CallState.InviteSent:
- this.pause(AudioID.Ringback);
- break;
- }
-
- if (newState !== CallState.Ringing) {
- this.silencedCalls.delete(call.callId);
- }
-
- switch (newState) {
- case CallState.Ringing: {
- const incomingCallPushRule = (
- new PushProcessor(MatrixClientPeg.get()).getPushRuleById(RuleId.IncomingCall)
- );
- const pushRuleEnabled = incomingCallPushRule?.enabled;
- const tweakSetToRing = incomingCallPushRule?.actions.some((action: Tweaks) => (
- action.set_tweak === TweakName.Sound &&
- action.value === "ring"
- ));
-
- if (pushRuleEnabled && tweakSetToRing) {
- this.play(AudioID.Ring);
- } else {
- this.silenceCall(call.callId);
- }
- break;
- }
- case CallState.InviteSent: {
- this.play(AudioID.Ringback);
- break;
- }
- case CallState.Ended: {
- const hangupReason = call.hangupReason;
- Analytics.trackEvent('voip', 'callEnded', 'hangupReason', hangupReason);
- this.removeCallForRoom(mappedRoomId);
- if (oldState === CallState.InviteSent && call.hangupParty === CallParty.Remote) {
- this.play(AudioID.Busy);
-
- // Don't show a modal when we got rejected/the call was hung up
- if (!hangupReason || [CallErrorCode.UserHangup, "user hangup"].includes(hangupReason)) break;
-
- let title;
- let description;
- // TODO: We should either do away with these or figure out a copy for each code (expect user_hangup...)
- if (call.hangupReason === CallErrorCode.UserBusy) {
- title = _t("User Busy");
- description = _t("The user you called is busy.");
- } else {
- title = _t("Call Failed");
- description = _t("The call could not be established");
- }
-
- Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
- title, description,
- });
- } else if (
- hangupReason === CallErrorCode.AnsweredElsewhere && oldState === CallState.Connecting
- ) {
- Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
- title: _t("Answered Elsewhere"),
- description: _t("The call was answered on another device."),
- });
- } else if (oldState !== CallState.Fledgling && oldState !== CallState.Ringing) {
- // don't play the end-call sound for calls that never got off the ground
- this.play(AudioID.CallEnd);
- }
-
- this.logCallStats(call, mappedRoomId);
- break;
- }
- }
+ this.onCallStateChanged(newState, oldState, call);
});
call.on(CallEvent.Replaced, (newCall: MatrixCall) => {
if (!this.matchesCallForThisRoom(call)) return;
@@ -555,8 +485,8 @@ export default class CallHandler extends EventEmitter {
this.pause(AudioID.Ringback);
}
- this.calls.set(mappedRoomId, newCall);
- this.emit(CallHandlerEvent.CallsChanged, this.calls);
+ this.removeCallForRoom(mappedRoomId);
+ this.addCallForRoom(mappedRoomId, newCall);
this.setCallListeners(newCall);
this.setCallState(newCall, newCall.state);
});
@@ -591,13 +521,95 @@ export default class CallHandler extends EventEmitter {
this.removeCallForRoom(mappedRoomId);
mappedRoomId = newMappedRoomId;
console.log("Moving call to room " + mappedRoomId);
- this.calls.set(mappedRoomId, call);
- this.emit(CallHandlerEvent.CallChangeRoom, call);
+ this.addCallForRoom(mappedRoomId, call, true);
}
}
});
}
+ private onCallStateChanged = (newState: CallState, oldState: CallState, call: MatrixCall): void => {
+ if (!this.matchesCallForThisRoom(call)) return;
+
+ const mappedRoomId = this.roomIdForCall(call);
+ this.setCallState(call, newState);
+
+ switch (oldState) {
+ case CallState.Ringing:
+ this.pause(AudioID.Ring);
+ break;
+ case CallState.InviteSent:
+ this.pause(AudioID.Ringback);
+ break;
+ }
+
+ if (newState !== CallState.Ringing) {
+ this.silencedCalls.delete(call.callId);
+ }
+
+ switch (newState) {
+ case CallState.Ringing: {
+ const incomingCallPushRule = (
+ new PushProcessor(MatrixClientPeg.get()).getPushRuleById(RuleId.IncomingCall)
+ );
+ const pushRuleEnabled = incomingCallPushRule?.enabled;
+ const tweakSetToRing = incomingCallPushRule?.actions.some((action: Tweaks) => (
+ action.set_tweak === TweakName.Sound &&
+ action.value === "ring"
+ ));
+
+ if (pushRuleEnabled && tweakSetToRing) {
+ this.play(AudioID.Ring);
+ } else {
+ this.silenceCall(call.callId);
+ }
+ break;
+ }
+ case CallState.InviteSent: {
+ this.play(AudioID.Ringback);
+ break;
+ }
+ case CallState.Ended: {
+ const hangupReason = call.hangupReason;
+ Analytics.trackEvent('voip', 'callEnded', 'hangupReason', hangupReason);
+ this.removeCallForRoom(mappedRoomId);
+ if (oldState === CallState.InviteSent && call.hangupParty === CallParty.Remote) {
+ this.play(AudioID.Busy);
+
+ // Don't show a modal when we got rejected/the call was hung up
+ if (!hangupReason || [CallErrorCode.UserHangup, "user hangup"].includes(hangupReason)) break;
+
+ let title;
+ let description;
+ // TODO: We should either do away with these or figure out a copy for each code (expect user_hangup...)
+ if (call.hangupReason === CallErrorCode.UserBusy) {
+ title = _t("User Busy");
+ description = _t("The user you called is busy.");
+ } else {
+ title = _t("Call Failed");
+ description = _t("The call could not be established");
+ }
+
+ Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
+ title, description,
+ });
+ } else if (
+ hangupReason === CallErrorCode.AnsweredElsewhere && oldState === CallState.Connecting
+ ) {
+ Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
+ title: _t("Answered Elsewhere"),
+ description: _t("The call was answered on another device."),
+ });
+ } else if (oldState !== CallState.Fledgling && oldState !== CallState.Ringing) {
+ // don't play the end-call sound for calls that never got off the ground
+ this.play(AudioID.CallEnd);
+ }
+
+ this.logCallStats(call, mappedRoomId);
+ break;
+ }
+ }
+ };
+
private async logCallStats(call: MatrixCall, mappedRoomId: string) {
const stats = await call.getCurrentCallStats();
logger.debug(
@@ -743,9 +755,15 @@ export default class CallHandler extends EventEmitter {
console.log("Current turn creds expire in " + timeUntilTurnCresExpire + " ms");
const call = MatrixClientPeg.get().createCall(mappedRoomId);
- console.log("Adding call for room ", roomId);
- this.calls.set(roomId, call);
- this.emit(CallHandlerEvent.CallsChanged, this.calls);
+ try {
+ this.addCallForRoom(roomId, call);
+ } catch (e) {
+ Modal.createTrackedDialog('Call Handler', 'Existing Call with user', ErrorDialog, {
+ title: _t('Already in call'),
+ description: _t("You're already in a call with this person."),
+ });
+ return;
+ }
if (transferee) {
this.transferees[call.callId] = transferee;
}
@@ -797,13 +815,8 @@ export default class CallHandler extends EventEmitter {
return;
}
- if (this.getCallForRoom(room.roomId)) {
- Modal.createTrackedDialog('Call Handler', 'Existing Call with user', ErrorDialog, {
- title: _t('Already in call'),
- description: _t("You're already in a call with this person."),
- });
- return;
- }
+ // We leave the check for whether there's already a call in this room until later,
+ // otherwise it can race.
const members = room.getJoinedMembers();
if (members.length <= 1) {
@@ -857,10 +870,11 @@ export default class CallHandler extends EventEmitter {
}
Analytics.trackEvent('voip', 'receiveCall', 'type', call.type);
- console.log("Adding call for room ", mappedRoomId);
- this.calls.set(mappedRoomId, call);
- this.emit(CallHandlerEvent.CallsChanged, this.calls);
+
+ this.addCallForRoom(mappedRoomId, call);
this.setCallListeners(call);
+ // Explicitly handle first state change
+ this.onCallStateChanged(call.state, null, call);
// get ready to send encrypted events in the room, so if the user does answer
// the call, we'll be ready to send. NB. This is the protocol-level room ID not
@@ -871,6 +885,8 @@ export default class CallHandler extends EventEmitter {
break;
case 'hangup':
case 'reject':
+ this.stopRingingIfPossible(this.calls.get(payload.room_id).callId);
+
if (!this.calls.get(payload.room_id)) {
return; // no call to hangup
}
@@ -883,11 +899,15 @@ export default class CallHandler extends EventEmitter {
// the hangup event away)
break;
case 'hangup_all':
+ this.stopRingingIfPossible(this.calls.get(payload.room_id).callId);
+
for (const call of this.calls.values()) {
call.hangup(CallErrorCode.UserHangup, false);
}
break;
case 'answer': {
+ this.stopRingingIfPossible(this.calls.get(payload.room_id).callId);
+
if (!this.calls.has(payload.room_id)) {
return; // no call to answer
}
@@ -922,6 +942,12 @@ export default class CallHandler extends EventEmitter {
}
};
+ private stopRingingIfPossible(callId: string): void {
+ this.silencedCalls.delete(callId);
+ if (this.areAnyCallsUnsilenced()) return;
+ this.pause(AudioID.Ring);
+ }
+
private async dialNumber(number: string) {
const results = await this.pstnLookup(number);
if (!results || results.length === 0 || !results[0].userid) {
@@ -1123,4 +1149,21 @@ export default class CallHandler extends EventEmitter {
messaging.transport.send(ElementWidgetActions.HangupCall, {});
});
}
+
+ private addCallForRoom(roomId: string, call: MatrixCall, changedRooms = false): void {
+ if (this.calls.has(roomId)) {
+ console.log(`Couldn't add call to room ${roomId}: already have a call for this room`);
+ throw new Error("Already have a call for room " + roomId);
+ }
+
+ console.log("setting call for room " + roomId);
+ this.calls.set(roomId, call);
+
+ // Should we always emit CallsChanged too?
+ if (changedRooms) {
+ this.emit(CallHandlerEvent.CallChangeRoom, call);
+ } else {
+ this.emit(CallHandlerEvent.CallsChanged, this.calls);
+ }
+ }
}
diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx
index 14a0c1ed51..40f8e307a5 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.tsx
@@ -39,6 +39,8 @@ import {
import { IUpload } from "./models/IUpload";
import { IAbortablePromise, IImageInfo } from "matrix-js-sdk/src/@types/partials";
import { BlurhashEncoder } from "./BlurhashEncoder";
+import SettingsStore from "./settings/SettingsStore";
+import { decorateStartSendingTime, sendRoundTripMetric } from "./sendTimePerformanceMetrics";
const MAX_WIDTH = 800;
const MAX_HEIGHT = 600;
@@ -539,6 +541,10 @@ export default class ContentMessages {
msgtype: "", // set later
};
+ if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+ decorateStartSendingTime(content);
+ }
+
// if we have a mime type for the file, add it to the message metadata
if (file.type) {
content.info.mimetype = file.type;
@@ -614,6 +620,11 @@ export default class ContentMessages {
}).then(function() {
if (upload.canceled) throw new UploadCanceledError();
const prom = matrixClient.sendMessage(roomId, content);
+ if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+ prom.then(resp => {
+ sendRoundTripMetric(matrixClient, roomId, resp.event_id);
+ });
+ }
CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, false, content);
return prom;
}, function(err) {
diff --git a/src/DateUtils.ts b/src/DateUtils.ts
index e8b81ca315..c81099b893 100644
--- a/src/DateUtils.ts
+++ b/src/DateUtils.ts
@@ -136,6 +136,18 @@ export function formatCallTime(delta: Date): string {
return output;
}
+export function formatSeconds(inSeconds: number): string {
+ const hours = Math.floor(inSeconds / (60 * 60)).toFixed(0).padStart(2, '0');
+ const minutes = Math.floor((inSeconds % (60 * 60)) / 60).toFixed(0).padStart(2, '0');
+ const seconds = Math.floor(((inSeconds % (60 * 60)) % 60)).toFixed(0).padStart(2, '0');
+
+ let output = "";
+ if (hours !== "00") output += `${hours}:`;
+ output += `${minutes}:${seconds}`;
+
+ return output;
+}
+
const MILLIS_IN_DAY = 86400000;
export function wantsDateSeparator(prevEventDate: Date, nextEventDate: Date): boolean {
if (!nextEventDate || !prevEventDate) {
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index 51c624e3c3..1a551d7813 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -100,6 +100,7 @@ export default class DeviceListener {
* @param {String[]} deviceIds List of device IDs to dismiss notifications for
*/
async dismissUnverifiedSessions(deviceIds: Iterable<string>) {
+ console.log("Dismissing unverified sessions: " + Array.from(deviceIds).join(','));
for (const d of deviceIds) {
this.dismissed.add(d);
}
@@ -285,6 +286,9 @@ export default class DeviceListener {
}
}
+ console.log("Old unverified sessions: " + Array.from(oldUnverifiedDeviceIds).join(','));
+ console.log("New unverified sessions: " + Array.from(newUnverifiedDeviceIds).join(','));
+
// Display or hide the batch toast for old unverified sessions
if (oldUnverifiedDeviceIds.size > 0) {
showBulkUnverifiedSessionsToast(oldUnverifiedDeviceIds);
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index f43351aab2..7d0ff560b7 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -213,6 +213,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
opts.pendingEventOrdering = PendingEventOrdering.Detached;
opts.lazyLoadMembers = true;
opts.clientWellKnownPollPeriod = 2 * 60 * 60; // 2 hours
+ opts.experimentalThreadSupport = SettingsStore.getValue("feature_thread");
// Connect the matrix client to the dispatcher and setting handlers
MatrixActionCreators.start(this.matrixClient);
diff --git a/src/MediaDeviceHandler.ts b/src/MediaDeviceHandler.ts
index 073f24523d..154f167745 100644
--- a/src/MediaDeviceHandler.ts
+++ b/src/MediaDeviceHandler.ts
@@ -17,8 +17,8 @@ limitations under the License.
import SettingsStore from "./settings/SettingsStore";
import { SettingLevel } from "./settings/SettingLevel";
-import { setMatrixCallAudioInput, setMatrixCallVideoInput } from "matrix-js-sdk/src/matrix";
import EventEmitter from 'events';
+import { MatrixClientPeg } from "./MatrixClientPeg";
// XXX: MediaDeviceKind is a union type, so we make our own enum
export enum MediaDeviceKindEnum {
@@ -74,8 +74,8 @@ export default class MediaDeviceHandler extends EventEmitter {
const audioDeviceId = SettingsStore.getValue("webrtc_audioinput");
const videoDeviceId = SettingsStore.getValue("webrtc_videoinput");
- setMatrixCallAudioInput(audioDeviceId);
- setMatrixCallVideoInput(videoDeviceId);
+ MatrixClientPeg.get().getMediaHandler().setAudioInput(audioDeviceId);
+ MatrixClientPeg.get().getMediaHandler().setVideoInput(videoDeviceId);
}
public setAudioOutput(deviceId: string): void {
@@ -90,7 +90,7 @@ export default class MediaDeviceHandler extends EventEmitter {
*/
public setAudioInput(deviceId: string): void {
SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId);
- setMatrixCallAudioInput(deviceId);
+ MatrixClientPeg.get().getMediaHandler().setAudioInput(deviceId);
}
/**
@@ -100,7 +100,7 @@ export default class MediaDeviceHandler extends EventEmitter {
*/
public setVideoInput(deviceId: string): void {
SettingsStore.setValue("webrtc_videoinput", null, SettingLevel.DEVICE, deviceId);
- setMatrixCallVideoInput(deviceId);
+ MatrixClientPeg.get().getMediaHandler().setVideoInput(deviceId);
}
public setDevice(deviceId: string, kind: MediaDeviceKindEnum): void {
diff --git a/src/PasswordReset.js b/src/PasswordReset.ts
similarity index 89%
rename from src/PasswordReset.js
rename to src/PasswordReset.ts
index 88ae00d088..76f54de245 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.ts
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import { createClient } from 'matrix-js-sdk/src/matrix';
+import { createClient, IRequestTokenResponse, MatrixClient } from 'matrix-js-sdk/src/matrix';
import { _t } from './languageHandler';
/**
@@ -26,12 +26,18 @@ import { _t } from './languageHandler';
* API on the homeserver in question with the new password.
*/
export default class PasswordReset {
+ private client: MatrixClient;
+ private clientSecret: string;
+ private identityServerDomain: string;
+ private password: string;
+ private sessionId: string;
+
/**
* Configure the endpoints for password resetting.
* @param {string} homeserverUrl The URL to the HS which has the account to reset.
* @param {string} identityUrl The URL to the IS which has linked the email -> mxid mapping.
*/
- constructor(homeserverUrl, identityUrl) {
+ constructor(homeserverUrl: string, identityUrl: string) {
this.client = createClient({
baseUrl: homeserverUrl,
idBaseUrl: identityUrl,
@@ -47,7 +53,7 @@ export default class PasswordReset {
* @param {string} newPassword The new password for the account.
* @return {Promise} Resolves when the email has been sent. Then call checkEmailLinkClicked().
*/
- resetPassword(emailAddress, newPassword) {
+ public resetPassword(emailAddress: string, newPassword: string): Promise<IRequestTokenResponse> {
this.password = newPassword;
return this.client.requestPasswordEmailToken(emailAddress, this.clientSecret, 1).then((res) => {
this.sessionId = res.sid;
@@ -69,7 +75,7 @@ export default class PasswordReset {
* with a "message" property which contains a human-readable message detailing why
* the reset failed, e.g. "There is no mapped matrix user ID for the given email address".
*/
- async checkEmailLinkClicked() {
+ public async checkEmailLinkClicked(): Promise<void> {
const creds = {
sid: this.sessionId,
client_secret: this.clientSecret,
diff --git a/src/Resend.ts b/src/Resend.ts
index 38b84a28e0..be9fb9550b 100644
--- a/src/Resend.ts
+++ b/src/Resend.ts
@@ -48,11 +48,6 @@ export default class Resend {
// XXX: temporary logging to try to diagnose
// https://github.com/vector-im/element-web/issues/3148
console.log('Resend got send failure: ' + err.name + '(' + err + ')');
-
- dis.dispatch({
- action: 'message_send_failed',
- event: event,
- });
});
}
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index b4deb6d8c4..902c82fff8 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -50,7 +50,6 @@ import CallHandler from "./CallHandler";
import { guessAndSetDMRoom } from "./Rooms";
import { upgradeRoom } from './utils/RoomUpgrade';
import UploadConfirmDialog from './components/views/dialogs/UploadConfirmDialog';
-import ErrorDialog from './components/views/dialogs/ErrorDialog';
import DevtoolsDialog from './components/views/dialogs/DevtoolsDialog';
import RoomUpgradeWarningDialog from "./components/views/dialogs/RoomUpgradeWarningDialog";
import InfoDialog from "./components/views/dialogs/InfoDialog";
@@ -245,21 +244,6 @@ export const Commands = [
},
category: CommandCategories.messages,
}),
- new Command({
- command: 'ddg',
- args: '<query>',
- description: _td('Searches DuckDuckGo for results'),
- runFn: function() {
- // TODO Don't explain this away, actually show a search UI here.
- Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
- title: _t('/ddg is not a command'),
- description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
- });
- return success();
- },
- category: CommandCategories.actions,
- hideCompletionAfterSpace: true,
- }),
new Command({
command: 'upgraderoom',
args: '<new_version>',
diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
index b9295be3ed..0e9dc1cf15 100644
--- a/src/TextForEvent.tsx
+++ b/src/TextForEvent.tsx
@@ -441,6 +441,15 @@ function textForPowerEvent(event: MatrixEvent): () => string | null {
});
}
+const onPinnedOrUnpinnedMessageClick = (messageId: string, roomId: string): void => {
+ defaultDispatcher.dispatch({
+ action: 'view_room',
+ event_id: messageId,
+ highlighted: true,
+ room_id: roomId,
+ });
+};
+
const onPinnedMessagesClick = (): void => {
defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
action: Action.SetRightPanelPhase,
@@ -452,17 +461,77 @@ const onPinnedMessagesClick = (): void => {
function textForPinnedEvent(event: MatrixEvent, allowJSX: boolean): () => string | JSX.Element | null {
if (!SettingsStore.getValue("feature_pinning")) return null;
const senderName = event.sender ? event.sender.name : event.getSender();
+ const roomId = event.getRoomId();
+
+ const pinned = event.getContent().pinned ?? [];
+ const previouslyPinned = event.getPrevContent().pinned ?? [];
+ const newlyPinned = pinned.filter(item => previouslyPinned.indexOf(item) < 0);
+ const newlyUnpinned = previouslyPinned.filter(item => pinned.indexOf(item) < 0);
+
+ if (newlyPinned.length === 1 && newlyUnpinned.length === 0) {
+ // A single message was pinned, include a link to that message.
+ if (allowJSX) {
+ const messageId = newlyPinned.pop();
+
+ return () => (
+ <span>
+ { _t(
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.",
+ { senderName },
+ {
+ "a": (sub) =>
+ <a onClick={(e) => onPinnedOrUnpinnedMessageClick(messageId, roomId)}>
+ { sub }
+ </a>,
+ "b": (sub) =>
+ <a onClick={onPinnedMessagesClick}>
+ { sub }
+ </a>,
+ },
+ ) }
+ </span>
+ );
+ }
+
+ return () => _t("%(senderName)s pinned a message to this room. See all pinned messages.", { senderName });
+ }
+
+ if (newlyUnpinned.length === 1 && newlyPinned.length === 0) {
+ // A single message was unpinned, include a link to that message.
+ if (allowJSX) {
+ const messageId = newlyUnpinned.pop();
+
+ return () => (
+ <span>
+ { _t(
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.",
+ { senderName },
+ {
+ "a": (sub) =>
+ <a onClick={(e) => onPinnedOrUnpinnedMessageClick(messageId, roomId)}>
+ { sub }
+ </a>,
+ "b": (sub) =>
+ <a onClick={onPinnedMessagesClick}>
+ { sub }
+ </a>,
+ },
+ ) }
+ </span>
+ );
+ }
+
+ return () => _t("%(senderName)s unpinned a message from this room. See all pinned messages.", { senderName });
+ }
if (allowJSX) {
return () => (
<span>
- {
- _t(
- "%(senderName)s changed the <a>pinned messages</a> for the room.",
- { senderName },
- { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> },
- )
- }
+ { _t(
+ "%(senderName)s changed the <a>pinned messages</a> for the room.",
+ { senderName },
+ { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> },
+ ) }
</span>
);
}
diff --git a/src/audio/ManagedPlayback.ts b/src/audio/ManagedPlayback.ts
index bff6ce7088..5db07671f1 100644
--- a/src/audio/ManagedPlayback.ts
+++ b/src/audio/ManagedPlayback.ts
@@ -26,7 +26,7 @@ export class ManagedPlayback extends Playback {
}
public async play(): Promise<void> {
- this.manager.playOnly(this);
+ this.manager.pauseAllExcept(this);
return super.play();
}
diff --git a/src/audio/Playback.ts b/src/audio/Playback.ts
index 9dad828a79..03f3bad760 100644
--- a/src/audio/Playback.ts
+++ b/src/audio/Playback.ts
@@ -117,6 +117,8 @@ export class Playback extends EventEmitter implements IDestroyable {
}
public destroy() {
+ // Dev note: It's critical that we call stop() during cleanup to ensure that downstream callers
+ // are aware of the final clock position before the user triggered an unload.
// noinspection JSIgnoredPromiseFromCall - not concerned about being called async here
this.stop();
this.removeAllListeners();
@@ -177,9 +179,12 @@ export class Playback extends EventEmitter implements IDestroyable {
this.waveformObservable.update(this.resampledWaveform);
- this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
this.clock.flagLoadTime(); // must happen first because setting the duration fires a clock update
this.clock.durationSeconds = this.element ? this.element.duration : this.audioBuf.duration;
+
+ // Signal that we're not decoding anymore. This is done last to ensure the clock is updated for
+ // when the downstream callers try to use it.
+ this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
}
private onPlaybackEnd = async () => {
diff --git a/src/audio/PlaybackClock.ts b/src/audio/PlaybackClock.ts
index 712d1bfa94..5716d6ac2f 100644
--- a/src/audio/PlaybackClock.ts
+++ b/src/audio/PlaybackClock.ts
@@ -89,9 +89,9 @@ export class PlaybackClock implements IDestroyable {
return this.observable;
}
- private checkTime = () => {
+ private checkTime = (force = false) => {
const now = this.timeSeconds; // calculated dynamically
- if (this.lastCheck !== now) {
+ if (this.lastCheck !== now || force) {
this.observable.update([now, this.durationSeconds]);
this.lastCheck = now;
}
@@ -141,7 +141,7 @@ export class PlaybackClock implements IDestroyable {
public syncTo(contextTime: number, clipTime: number) {
this.clipStart = contextTime - clipTime;
this.stopped = false; // count as a mid-stream pause (if we were stopped)
- this.checkTime();
+ this.checkTime(true);
}
public destroy() {
diff --git a/src/audio/PlaybackManager.ts b/src/audio/PlaybackManager.ts
index 58fa61df56..58c0b9b624 100644
--- a/src/audio/PlaybackManager.ts
+++ b/src/audio/PlaybackManager.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import { DEFAULT_WAVEFORM, Playback } from "./Playback";
+import { DEFAULT_WAVEFORM, Playback, PlaybackState } from "./Playback";
import { ManagedPlayback } from "./ManagedPlayback";
/**
@@ -34,12 +34,14 @@ export class PlaybackManager {
}
/**
- * Stops all other playback instances. If no playback is provided, all instances
- * are stopped.
+ * Pauses all other playback instances. If no playback is provided, all playing
+ * instances are paused.
* @param playback Optional. The playback to leave untouched.
*/
- public playOnly(playback?: Playback) {
- this.instances.filter(p => p !== playback).forEach(p => p.stop());
+ public pauseAllExcept(playback?: Playback) {
+ this.instances
+ .filter(p => p !== playback && p.currentState === PlaybackState.Playing)
+ .forEach(p => p.pause());
}
public destroyPlaybackInstance(playback: ManagedPlayback) {
diff --git a/src/audio/PlaybackQueue.ts b/src/audio/PlaybackQueue.ts
new file mode 100644
index 0000000000..611b88938a
--- /dev/null
+++ b/src/audio/PlaybackQueue.ts
@@ -0,0 +1,219 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { Playback, PlaybackState } from "./Playback";
+import { UPDATE_EVENT } from "../stores/AsyncStore";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { arrayFastClone } from "../utils/arrays";
+import { PlaybackManager } from "./PlaybackManager";
+import { isVoiceMessage } from "../utils/EventUtils";
+import RoomViewStore from "../stores/RoomViewStore";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+/**
+ * Audio playback queue management for a given room. This keeps track of where the user
+ * was at for each playback, what order the playbacks were played in, and triggers subsequent
+ * playbacks.
+ *
+ * Currently this is only intended to be used by voice messages.
+ *
+ * The primary mechanics are:
+ * * Persisted clock state for each playback instance (tied to Event ID).
+ * * Limited memory of playback order (see code; not persisted).
+ * * Autoplay of next eligible playback instance.
+ */
+export class PlaybackQueue {
+ private static queues = new Map<string, PlaybackQueue>(); // keyed by room ID
+
+ private playbacks = new Map<string, Playback>(); // keyed by event ID
+ private clockStates = new Map<string, number>(); // keyed by event ID
+ private playbackIdOrder: string[] = []; // event IDs, last == current
+ private currentPlaybackId: string; // event ID, broken out from above for ease of use
+ private recentFullPlays = new Set<string>(); // event IDs
+
+ constructor(private client: MatrixClient, private room: Room) {
+ this.loadClocks();
+
+ RoomViewStore.addListener(() => {
+ if (RoomViewStore.getRoomId() === this.room.roomId) {
+ // Reset the state of the playbacks before they start mounting and enqueuing updates.
+ // We reset the entirety of the queue, including order, to ensure the user isn't left
+ // confused with what order the messages are playing in.
+ this.currentPlaybackId = null; // this in particular stops autoplay when the room is switched to
+ this.recentFullPlays = new Set<string>();
+ this.playbackIdOrder = [];
+ }
+ });
+ }
+
+ public static forRoom(roomId: string): PlaybackQueue {
+ const cli = MatrixClientPeg.get();
+ const room = cli.getRoom(roomId);
+ if (!room) throw new Error("Unknown room");
+ if (PlaybackQueue.queues.has(room.roomId)) {
+ return PlaybackQueue.queues.get(room.roomId);
+ }
+ const queue = new PlaybackQueue(cli, room);
+ PlaybackQueue.queues.set(room.roomId, queue);
+ return queue;
+ }
+
+ private persistClocks() {
+ localStorage.setItem(
+ `mx_voice_message_clocks_${this.room.roomId}`,
+ JSON.stringify(Array.from(this.clockStates.entries())),
+ );
+ }
+
+ private loadClocks() {
+ const val = localStorage.getItem(`mx_voice_message_clocks_${this.room.roomId}`);
+ if (!!val) {
+ this.clockStates = new Map<string, number>(JSON.parse(val));
+ }
+ }
+
+ public unsortedEnqueue(mxEvent: MatrixEvent, playback: Playback) {
+ // We don't ever detach our listeners: we expect the Playback to clean up for us
+ this.playbacks.set(mxEvent.getId(), playback);
+ playback.on(UPDATE_EVENT, (state) => this.onPlaybackStateChange(playback, mxEvent, state));
+ playback.clockInfo.liveData.onUpdate((clock) => this.onPlaybackClock(playback, mxEvent, clock));
+ }
+
+ private onPlaybackStateChange(playback: Playback, mxEvent: MatrixEvent, newState: PlaybackState) {
+ // Remember where the user got to in playback
+ const wasLastPlaying = this.currentPlaybackId === mxEvent.getId();
+ if (newState === PlaybackState.Stopped && this.clockStates.has(mxEvent.getId()) && !wasLastPlaying) {
+ // noinspection JSIgnoredPromiseFromCall
+ playback.skipTo(this.clockStates.get(mxEvent.getId()));
+ } else if (newState === PlaybackState.Stopped) {
+ // Remove the now-useless clock for some space savings
+ this.clockStates.delete(mxEvent.getId());
+
+ if (wasLastPlaying) {
+ this.recentFullPlays.add(this.currentPlaybackId);
+ const orderClone = arrayFastClone(this.playbackIdOrder);
+ const last = orderClone.pop();
+ if (last === this.currentPlaybackId) {
+ const next = orderClone.pop();
+ if (next) {
+ const instance = this.playbacks.get(next);
+ if (!instance) {
+ console.warn(
+ "Voice message queue desync: Missing playback for next message: "
+ + `Current=${this.currentPlaybackId} Last=${last} Next=${next}`,
+ );
+ } else {
+ this.playbackIdOrder = orderClone;
+ PlaybackManager.instance.pauseAllExcept(instance);
+
+ // This should cause a Play event, which will re-populate our playback order
+ // and update our current playback ID.
+ // noinspection JSIgnoredPromiseFromCall
+ instance.play();
+ }
+ } else {
+ // else no explicit next event, so find an event we haven't played that comes next. The live
+ // timeline is already most recent last, so we can iterate down that.
+ const timeline = arrayFastClone(this.room.getLiveTimeline().getEvents());
+ let scanForVoiceMessage = false;
+ let nextEv: MatrixEvent;
+ for (const event of timeline) {
+ if (event.getId() === mxEvent.getId()) {
+ scanForVoiceMessage = true;
+ continue;
+ }
+ if (!scanForVoiceMessage) continue;
+
+ if (!isVoiceMessage(event)) {
+ const evType = event.getType();
+ if (evType !== EventType.RoomMessage && evType !== EventType.Sticker) {
+ continue; // Event can be skipped for automatic playback consideration
+ }
+ break; // Stop automatic playback: next useful event is not a voice message
+ }
+
+ const havePlayback = this.playbacks.has(event.getId());
+ const isRecentlyCompleted = this.recentFullPlays.has(event.getId());
+ if (havePlayback && !isRecentlyCompleted) {
+ nextEv = event;
+ break;
+ }
+ }
+ if (!nextEv) {
+ // if we don't have anywhere to go, reset the recent playback queue so the user
+ // can start a new chain of playbacks.
+ this.recentFullPlays = new Set<string>();
+ this.playbackIdOrder = [];
+ } else {
+ this.playbackIdOrder = orderClone;
+
+ const instance = this.playbacks.get(nextEv.getId());
+ PlaybackManager.instance.pauseAllExcept(instance);
+
+ // This should cause a Play event, which will re-populate our playback order
+ // and update our current playback ID.
+ // noinspection JSIgnoredPromiseFromCall
+ instance.play();
+ }
+ }
+ } else {
+ console.warn(
+ "Voice message queue desync: Expected playback stop to be last in order. "
+ + `Current=${this.currentPlaybackId} Last=${last} EventID=${mxEvent.getId()}`,
+ );
+ }
+ }
+ }
+
+ if (newState === PlaybackState.Playing) {
+ const order = this.playbackIdOrder;
+ if (this.currentPlaybackId !== mxEvent.getId() && !!this.currentPlaybackId) {
+ if (order.length === 0 || order[order.length - 1] !== this.currentPlaybackId) {
+ const lastInstance = this.playbacks.get(this.currentPlaybackId);
+ if (
+ lastInstance.currentState === PlaybackState.Playing
+ || lastInstance.currentState === PlaybackState.Paused
+ ) {
+ order.push(this.currentPlaybackId);
+ }
+ }
+ }
+
+ this.currentPlaybackId = mxEvent.getId();
+ if (order.length === 0 || order[order.length - 1] !== this.currentPlaybackId) {
+ order.push(this.currentPlaybackId);
+ }
+ }
+
+ // Only persist clock information on pause/stop (end) to avoid overwhelming the storage.
+ // This should get triggered from normal voice message component unmount due to the playback
+ // stopping itself for cleanup.
+ if (newState === PlaybackState.Paused || newState === PlaybackState.Stopped) {
+ this.persistClocks();
+ }
+ }
+
+ private onPlaybackClock(playback: Playback, mxEvent: MatrixEvent, clocks: number[]) {
+ if (playback.currentState === PlaybackState.Decoding) return; // ignore pre-ready values
+
+ if (playback.currentState !== PlaybackState.Stopped) {
+ this.clockStates.set(mxEvent.getId(), clocks[0]); // [0] is the current seek position
+ }
+ }
+}
diff --git a/src/audio/RecorderWorklet.ts b/src/audio/RecorderWorklet.ts
index 2d1bb0bcd2..73b053db93 100644
--- a/src/audio/RecorderWorklet.ts
+++ b/src/audio/RecorderWorklet.ts
@@ -45,7 +45,13 @@ class MxVoiceWorklet extends AudioWorkletProcessor {
process(inputs, outputs, parameters) {
const currentSecond = roundTimeToTargetFreq(currentTime);
- if (currentSecond === this.nextAmplitudeSecond) {
+ // We special case the first ping because there's a fairly good chance that we'll miss the zeroth
+ // update. Firefox for instance takes 0.06 seconds (roughly) to call this function for the first
+ // time. Edge and Chrome occasionally lag behind too, but for the most part are on time.
+ //
+ // When this doesn't work properly we end up producing a waveform of nulls and no live preview
+ // of the recorded message.
+ if (currentSecond === this.nextAmplitudeSecond || this.nextAmplitudeSecond === 0) {
// We're expecting exactly one mono input source, so just grab the very first frame of
// samples for the analysis.
const monoChan = inputs[0][0];
diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts
index acc7846510..4c9e82f290 100644
--- a/src/autocomplete/Autocompleter.ts
+++ b/src/autocomplete/Autocompleter.ts
@@ -20,7 +20,6 @@ import { Room } from 'matrix-js-sdk/src/models/room';
import CommandProvider from './CommandProvider';
import CommunityProvider from './CommunityProvider';
-import DuckDuckGoProvider from './DuckDuckGoProvider';
import RoomProvider from './RoomProvider';
import UserProvider from './UserProvider';
import EmojiProvider from './EmojiProvider';
@@ -55,7 +54,6 @@ const PROVIDERS = [
EmojiProvider,
NotifProvider,
CommandProvider,
- DuckDuckGoProvider,
];
if (SpaceStore.spacesEnabled) {
diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx
index d56adc026c..143b7e4cdc 100644
--- a/src/autocomplete/CommandProvider.tsx
+++ b/src/autocomplete/CommandProvider.tsx
@@ -53,7 +53,7 @@ export default class CommandProvider extends AutocompleteProvider {
// The input looks like a command with arguments, perform exact match
const name = command[1].substr(1); // strip leading `/`
if (CommandMap.has(name) && CommandMap.get(name).isEnabled()) {
- // some commands, namely `me` and `ddg` don't suit having the usage shown whilst typing their arguments
+ // some commands, namely `me` don't suit having the usage shown whilst typing their arguments
if (CommandMap.get(name).hideCompletionAfterSpace) return [];
matches = [CommandMap.get(name)];
}
@@ -95,7 +95,7 @@ export default class CommandProvider extends AutocompleteProvider {
renderCompletions(completions: React.ReactNode[]): React.ReactNode {
return (
<div
- className="mx_Autocomplete_Completion_container_block"
+ className="mx_Autocomplete_Completion_container_pill"
role="presentation"
aria-label={_t("Command Autocomplete")}
>
diff --git a/src/autocomplete/DuckDuckGoProvider.tsx b/src/autocomplete/DuckDuckGoProvider.tsx
deleted file mode 100644
index c41a91b97f..0000000000
--- a/src/autocomplete/DuckDuckGoProvider.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-Copyright 2016 Aviral Dasgupta
-Copyright 2017 Vector Creations Ltd
-Copyright 2017, 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { _t } from '../languageHandler';
-import AutocompleteProvider from './AutocompleteProvider';
-
-import { TextualCompletion } from './Components';
-import { ICompletion, ISelectionRange } from "./Autocompleter";
-
-const DDG_REGEX = /\/ddg\s+(.+)$/g;
-const REFERRER = 'vector';
-
-export default class DuckDuckGoProvider extends AutocompleteProvider {
- constructor() {
- super(DDG_REGEX);
- }
-
- static getQueryUri(query: string) {
- return `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}`
- + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`;
- }
-
- async getCompletions(
- query: string,
- selection: ISelectionRange,
- force = false,
- limit = -1,
- ): Promise<ICompletion[]> {
- const { command, range } = this.getCurrentCommand(query, selection);
- if (!query || !command) {
- return [];
- }
-
- const response = await fetch(DuckDuckGoProvider.getQueryUri(command[1]), {
- method: 'GET',
- });
- const json = await response.json();
- const maxLength = limit > -1 ? limit : json.Results.length;
- const results = json.Results.slice(0, maxLength).map((result) => {
- return {
- completion: result.Text,
- component: (
- <TextualCompletion
- title={result.Text}
- description={result.Result} />
- ),
- range,
- };
- });
- if (json.Answer) {
- results.unshift({
- completion: json.Answer,
- component: (
- <TextualCompletion
- title={json.Answer}
- description={json.AnswerType} />
- ),
- range,
- });
- }
- if (json.RelatedTopics && json.RelatedTopics.length > 0) {
- results.unshift({
- completion: json.RelatedTopics[0].Text,
- component: (
- <TextualCompletion
- title={json.RelatedTopics[0].Text} />
- ),
- range,
- });
- }
- if (json.AbstractText) {
- results.unshift({
- completion: json.AbstractText,
- component: (
- <TextualCompletion
- title={json.AbstractText} />
- ),
- range,
- });
- }
- return results;
- }
-
- getName() {
- return '🔍 ' + _t('Results from DuckDuckGo');
- }
-
- renderCompletions(completions: React.ReactNode[]): React.ReactNode {
- return (
- <div
- className="mx_Autocomplete_Completion_container_block"
- role="presentation"
- aria-label={_t("DuckDuckGo Results")}
- >
- { completions }
- </div>
- );
- }
-}
diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index 0aae8c6372..326651e037 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -67,7 +67,7 @@ export default class EmojiProvider extends AutocompleteProvider {
constructor() {
super(EMOJI_REGEX);
this.matcher = new QueryMatcher<ISortedEmoji>(SORTED_EMOJI, {
- keys: ['emoji.emoticon'],
+ keys: [],
funcs: [o => o.emoji.shortcodes.map(s => `:${s}:`)],
// For matching against ascii equivalents
shouldMatchWordsOnly: false,
@@ -91,7 +91,8 @@ export default class EmojiProvider extends AutocompleteProvider {
let completions = [];
const { command, range } = this.getCurrentCommand(query, selection);
- if (command) {
+
+ if (command && command[0].length > 2) {
const matchedString = command[0];
completions = this.matcher.match(matchedString, limit);
diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx
new file mode 100644
index 0000000000..08f6c33738
--- /dev/null
+++ b/src/components/structures/BackdropPanel.tsx
@@ -0,0 +1,44 @@
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { CSSProperties } from "react";
+
+interface IProps {
+ backgroundImage?: string;
+ blurMultiplier?: number;
+}
+
+export const BackdropPanel: React.FC<IProps> = ({ backgroundImage, blurMultiplier }) => {
+ if (!backgroundImage) return null;
+
+ const styles: CSSProperties = {};
+ if (blurMultiplier) {
+ const rootStyle = getComputedStyle(document.documentElement);
+ const blurValue = rootStyle.getPropertyValue('--lp-background-blur');
+ const pixelsValue = blurValue.replace('px', '');
+ const parsed = parseInt(pixelsValue, 10);
+ if (!isNaN(parsed)) {
+ styles.filter = `blur(${parsed * blurMultiplier}px)`;
+ }
+ }
+ return <div className="mx_BackdropPanel">
+ <img
+ style={styles}
+ className="mx_BackdropPanel--image"
+ src={backgroundImage} />
+ </div>;
+};
+export default BackdropPanel;
diff --git a/src/components/structures/CallEventGrouper.ts b/src/components/structures/CallEventGrouper.ts
index b48bb32efe..84e004d1de 100644
--- a/src/components/structures/CallEventGrouper.ts
+++ b/src/components/structures/CallEventGrouper.ts
@@ -25,6 +25,7 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
export enum CallEventGrouperEvent {
StateChanged = "state_changed",
SilencedChanged = "silenced_changed",
+ LengthChanged = "length_changed",
}
const CONNECTING_STATES = [
@@ -104,8 +105,12 @@ export default class CallEventGrouper extends EventEmitter {
return ![...this.events].some((event) => event.sender?.userId === MatrixClientPeg.get().getUserId());
}
- private get callId(): string {
- return [...this.events][0].getContent().call_id;
+ private get callId(): string | undefined {
+ return [...this.events][0]?.getContent()?.call_id;
+ }
+
+ private get roomId(): string | undefined {
+ return [...this.events][0]?.getRoomId();
}
private onSilencedCallsChanged = () => {
@@ -113,19 +118,29 @@ export default class CallEventGrouper extends EventEmitter {
this.emit(CallEventGrouperEvent.SilencedChanged, newState);
};
+ private onLengthChanged = (length: number): void => {
+ this.emit(CallEventGrouperEvent.LengthChanged, length);
+ };
+
public answerCall = () => {
- this.call?.answer();
+ defaultDispatcher.dispatch({
+ action: 'answer',
+ room_id: this.roomId,
+ });
};
public rejectCall = () => {
- this.call?.reject();
+ defaultDispatcher.dispatch({
+ action: 'reject',
+ room_id: this.roomId,
+ });
};
public callBack = () => {
defaultDispatcher.dispatch({
action: 'place_call',
type: this.isVoice ? CallType.Voice : CallType.Video,
- room_id: [...this.events][0]?.getRoomId(),
+ room_id: this.roomId,
});
};
@@ -139,6 +154,7 @@ export default class CallEventGrouper extends EventEmitter {
private setCallListeners() {
if (!this.call) return;
this.call.addListener(CallEvent.State, this.setState);
+ this.call.addListener(CallEvent.LengthChanged, this.onLengthChanged);
}
private setState = () => {
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index 332b6cd318..d65f8e3a10 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -322,10 +322,16 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
const menuClasses = classNames({
'mx_ContextualMenu': true,
- 'mx_ContextualMenu_left': !hasChevron && position.left,
- 'mx_ContextualMenu_right': !hasChevron && position.right,
- 'mx_ContextualMenu_top': !hasChevron && position.top,
- 'mx_ContextualMenu_bottom': !hasChevron && position.bottom,
+ /**
+ * In some cases we may get the number of 0, which still means that we're supposed to properly
+ * add the specific position class, but as it was falsy things didn't work as intended.
+ * In addition, defensively check for counter cases where we may get more than one value,
+ * even if we shouldn't.
+ */
+ 'mx_ContextualMenu_left': !hasChevron && position.left !== undefined && !position.right,
+ 'mx_ContextualMenu_right': !hasChevron && position.right !== undefined && !position.left,
+ 'mx_ContextualMenu_top': !hasChevron && position.top !== undefined && !position.bottom,
+ 'mx_ContextualMenu_bottom': !hasChevron && position.bottom !== undefined && !position.top,
'mx_ContextualMenu_withChevron_left': chevronFace === ChevronFace.Left,
'mx_ContextualMenu_withChevron_right': chevronFace === ChevronFace.Right,
'mx_ContextualMenu_withChevron_top': chevronFace === ChevronFace.Top,
@@ -404,17 +410,27 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
}
}
+export type ToRightOf = {
+ left: number;
+ top: number;
+ chevronOffset: number;
+};
+
// Placement method for <ContextMenu /> to position context menu to right of elementRect with chevronOffset
-export const toRightOf = (elementRect: Pick<DOMRect, "right" | "top" | "height">, chevronOffset = 12) => {
+export const toRightOf = (elementRect: Pick<DOMRect, "right" | "top" | "height">, chevronOffset = 12): ToRightOf => {
const left = elementRect.right + window.pageXOffset + 3;
let top = elementRect.top + (elementRect.height / 2) + window.pageYOffset;
top -= chevronOffset + 8; // where 8 is half the height of the chevron
return { left, top, chevronOffset };
};
+export type AboveLeftOf = IPosition & {
+ chevronFace: ChevronFace;
+};
+
// Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect,
// and either above or below: wherever there is more space (maybe this should be aboveOrBelowLeftOf?)
-export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
+export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0): AboveLeftOf => {
const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
const buttonRight = elementRect.right + window.pageXOffset;
diff --git a/src/components/structures/GroupFilterPanel.js b/src/components/structures/GroupFilterPanel.tsx
similarity index 71%
rename from src/components/structures/GroupFilterPanel.js
rename to src/components/structures/GroupFilterPanel.tsx
index 5d1be64f25..3e7c6e9b17 100644
--- a/src/components/structures/GroupFilterPanel.js
+++ b/src/components/structures/GroupFilterPanel.tsx
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+import type { EventSubscription } from "fbemitter";
import React from 'react';
import GroupFilterOrderStore from '../../stores/GroupFilterOrderStore';
@@ -30,22 +31,43 @@ import AutoHideScrollbar from "./AutoHideScrollbar";
import SettingsStore from "../../settings/SettingsStore";
import UserTagTile from "../views/elements/UserTagTile";
import { replaceableComponent } from "../../utils/replaceableComponent";
+import UIStore from "../../stores/UIStore";
+
+interface IGroupFilterPanelProps {
+
+}
+
+// FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+type OrderedTagsTemporaryType = Array<{}>;
+// FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+type SelectedTagsTemporaryType = Array<{}>;
+
+interface IGroupFilterPanelState {
+ // FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+ orderedTags: OrderedTagsTemporaryType;
+ // FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+ selectedTags: SelectedTagsTemporaryType;
+}
@replaceableComponent("structures.GroupFilterPanel")
-class GroupFilterPanel extends React.Component {
- static contextType = MatrixClientContext;
+class GroupFilterPanel extends React.Component<IGroupFilterPanelProps, IGroupFilterPanelState> {
+ public static contextType = MatrixClientContext;
- state = {
+ public state = {
orderedTags: [],
selectedTags: [],
};
- componentDidMount() {
- this.unmounted = false;
- this.context.on("Group.myMembership", this._onGroupMyMembership);
- this.context.on("sync", this._onClientSync);
+ private ref = React.createRef<HTMLDivElement>();
+ private unmounted = false;
+ private groupFilterOrderStoreToken?: EventSubscription;
- this._groupFilterOrderStoreToken = GroupFilterOrderStore.addListener(() => {
+ public componentDidMount() {
+ this.unmounted = false;
+ this.context.on("Group.myMembership", this.onGroupMyMembership);
+ this.context.on("sync", this.onClientSync);
+
+ this.groupFilterOrderStoreToken = GroupFilterOrderStore.addListener(() => {
if (this.unmounted) {
return;
}
@@ -56,23 +78,25 @@ class GroupFilterPanel extends React.Component {
});
// This could be done by anything with a matrix client
dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
+ UIStore.instance.trackElementDimensions("GroupPanel", this.ref.current);
}
- componentWillUnmount() {
+ public componentWillUnmount() {
this.unmounted = true;
- this.context.removeListener("Group.myMembership", this._onGroupMyMembership);
- this.context.removeListener("sync", this._onClientSync);
- if (this._groupFilterOrderStoreToken) {
- this._groupFilterOrderStoreToken.remove();
+ this.context.removeListener("Group.myMembership", this.onGroupMyMembership);
+ this.context.removeListener("sync", this.onClientSync);
+ if (this.groupFilterOrderStoreToken) {
+ this.groupFilterOrderStoreToken.remove();
}
+ UIStore.instance.stopTrackingElementDimensions("GroupPanel");
}
- _onGroupMyMembership = () => {
+ private onGroupMyMembership = () => {
if (this.unmounted) return;
dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
};
- _onClientSync = (syncState, prevState) => {
+ private onClientSync = (syncState, prevState) => {
// Consider the client reconnected if there is no error with syncing.
// This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
const reconnected = syncState !== "ERROR" && prevState !== syncState;
@@ -82,18 +106,18 @@ class GroupFilterPanel extends React.Component {
}
};
- onClick = e => {
+ private onClick = e => {
// only dispatch if its not a no-op
if (this.state.selectedTags.length > 0) {
dis.dispatch({ action: 'deselect_tags' });
}
};
- onClearFilterClick = ev => {
+ private onClearFilterClick = ev => {
dis.dispatch({ action: 'deselect_tags' });
};
- renderGlobalIcon() {
+ private renderGlobalIcon() {
if (!SettingsStore.getValue("feature_communities_v2_prototypes")) return null;
return (
@@ -104,7 +128,7 @@ class GroupFilterPanel extends React.Component {
);
}
- render() {
+ public render() {
const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const ActionButton = sdk.getComponent('elements.ActionButton');
@@ -147,7 +171,7 @@ class GroupFilterPanel extends React.Component {
);
}
- return <div className={classes} onClick={this.onClearFilterClick}>
+ return <div className={classes} onClick={this.onClearFilterClick} ref={this.ref}>
<AutoHideScrollbar
className="mx_GroupFilterPanel_scroller"
onClick={this.onClick}
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index ff5d15d44d..9a2ebd45e2 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -19,8 +19,6 @@ import { createRef } from "react";
import classNames from "classnames";
import { Room } from "matrix-js-sdk/src/models/room";
-import GroupFilterPanel from "./GroupFilterPanel";
-import CustomRoomTagPanel from "./CustomRoomTagPanel";
import dis from "../../dispatcher/dispatcher";
import { _t } from "../../languageHandler";
import RoomList from "../views/rooms/RoomList";
@@ -33,15 +31,12 @@ import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
import { UPDATE_EVENT } from "../../stores/AsyncStore";
import ResizeNotifier from "../../utils/ResizeNotifier";
-import SettingsStore from "../../settings/SettingsStore";
import RoomListStore, { LISTS_UPDATE_EVENT } from "../../stores/room-list/RoomListStore";
import IndicatorScrollbar from "../structures/IndicatorScrollbar";
import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import { OwnProfileStore } from "../../stores/OwnProfileStore";
import RoomListNumResults from "../views/rooms/RoomListNumResults";
import LeftPanelWidget from "./LeftPanelWidget";
import { replaceableComponent } from "../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../customisations/Media";
import SpaceStore, { UPDATE_SELECTED_SPACE } from "../../stores/SpaceStore";
import { getKeyBindingsManager, RoomListAction } from "../../KeyBindingsManager";
import UIStore from "../../stores/UIStore";
@@ -53,7 +48,6 @@ interface IProps {
interface IState {
showBreadcrumbs: boolean;
- showGroupFilterPanel: boolean;
activeSpace?: Room;
}
@@ -70,8 +64,6 @@ const cssClasses = [
export default class LeftPanel extends React.Component<IProps, IState> {
private ref: React.RefObject<HTMLDivElement> = createRef();
private listContainerRef: React.RefObject<HTMLDivElement> = createRef();
- private groupFilterPanelWatcherRef: string;
- private bgImageWatcherRef: string;
private focusedElement = null;
private isDoingStickyHeaders = false;
@@ -80,22 +72,16 @@ export default class LeftPanel extends React.Component<IProps, IState> {
this.state = {
showBreadcrumbs: BreadcrumbsStore.instance.visible,
- showGroupFilterPanel: SettingsStore.getValue('TagPanel.enableTagPanel'),
activeSpace: SpaceStore.instance.activeSpace,
};
BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.onBreadcrumbsUpdate);
- OwnProfileStore.instance.on(UPDATE_EVENT, this.onBackgroundImageUpdate);
SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
- this.bgImageWatcherRef = SettingsStore.watchSetting(
- "RoomList.backgroundImage", null, this.onBackgroundImageUpdate);
- this.groupFilterPanelWatcherRef = SettingsStore.watchSetting("TagPanel.enableTagPanel", null, () => {
- this.setState({ showGroupFilterPanel: SettingsStore.getValue("TagPanel.enableTagPanel") });
- });
}
public componentDidMount() {
+ UIStore.instance.trackElementDimensions("LeftPanel", this.ref.current);
UIStore.instance.trackElementDimensions("ListContainer", this.listContainerRef.current);
UIStore.instance.on("ListContainer", this.refreshStickyHeaders);
// Using the passive option to not block the main thread
@@ -104,11 +90,8 @@ export default class LeftPanel extends React.Component<IProps, IState> {
}
public componentWillUnmount() {
- SettingsStore.unwatchSetting(this.groupFilterPanelWatcherRef);
- SettingsStore.unwatchSetting(this.bgImageWatcherRef);
BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.onBreadcrumbsUpdate);
- OwnProfileStore.instance.off(UPDATE_EVENT, this.onBackgroundImageUpdate);
SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
UIStore.instance.stopTrackingElementDimensions("ListContainer");
UIStore.instance.removeListener("ListContainer", this.refreshStickyHeaders);
@@ -149,23 +132,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
}
};
- private onBackgroundImageUpdate = () => {
- // Note: we do this in the LeftPanel as it uses this variable most prominently.
- const avatarSize = 32; // arbitrary
- let avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
- const settingBgMxc = SettingsStore.getValue("RoomList.backgroundImage");
- if (settingBgMxc) {
- avatarUrl = mediaFromMxc(settingBgMxc).getSquareThumbnailHttp(avatarSize);
- }
-
- const avatarUrlProp = `url(${avatarUrl})`;
- if (!avatarUrl) {
- document.body.style.removeProperty("--avatar-url");
- } else if (document.body.style.getPropertyValue("--avatar-url") !== avatarUrlProp) {
- document.body.style.setProperty("--avatar-url", avatarUrlProp);
- }
- };
-
private handleStickyHeaders(list: HTMLDivElement) {
if (this.isDoingStickyHeaders) return;
this.isDoingStickyHeaders = true;
@@ -433,23 +399,15 @@ export default class LeftPanel extends React.Component<IProps, IState> {
mx_LeftPanel_exploreButton_space: !!this.state.activeSpace,
})}
onClick={this.onExplore}
- title={_t("Explore rooms")}
+ title={this.state.activeSpace
+ ? _t("Explore %(spaceName)s", { spaceName: this.state.activeSpace.name })
+ : _t("Explore rooms")}
/>
</div>
);
}
public render(): React.ReactNode {
- let leftLeftPanel;
- if (this.state.showGroupFilterPanel) {
- leftLeftPanel = (
- <div className="mx_LeftPanel_GroupFilterPanelContainer">
- <GroupFilterPanel />
- { SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null }
- </div>
- );
- }
-
const roomList = <RoomList
onKeyDown={this.onKeyDown}
resizeNotifier={this.props.resizeNotifier}
@@ -473,7 +431,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
return (
<div className={containerClasses} ref={this.ref}>
- { leftLeftPanel }
<aside className="mx_LeftPanel_roomListContainer">
{ this.renderHeader() }
{ this.renderSearchDialExplore() }
diff --git a/src/components/structures/LeftPanelWidget.tsx b/src/components/structures/LeftPanelWidget.tsx
index 144c0e3051..331e428355 100644
--- a/src/components/structures/LeftPanelWidget.tsx
+++ b/src/components/structures/LeftPanelWidget.tsx
@@ -115,7 +115,7 @@ const LeftPanelWidget: React.FC = () => {
aria-expanded={expanded}
aria-level={1}
onClick={() => {
- setExpanded(e => !e);
+ setExpanded(!expanded);
}}
>
<span className={classNames({
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 2392a8b28d..bbe0e42a0a 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -1,7 +1,5 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017, 2018, 2020 New Vector Ltd
+Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -55,15 +53,22 @@ import { getKeyBindingsManager, NavigationAction, RoomAction } from '../../KeyBi
import { IOpts } from "../../createRoom";
import SpacePanel from "../views/spaces/SpacePanel";
import { replaceableComponent } from "../../utils/replaceableComponent";
-import CallHandler, { CallHandlerEvent } from '../../CallHandler';
+import CallHandler from '../../CallHandler';
import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import AudioFeedArrayForCall from '../views/voip/AudioFeedArrayForCall';
+import { OwnProfileStore } from '../../stores/OwnProfileStore';
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
import RoomView from './RoomView';
import ToastContainer from './ToastContainer';
import MyGroups from "./MyGroups";
import UserView from "./UserView";
import GroupView from "./GroupView";
+import BackdropPanel from "./BackdropPanel";
import SpaceStore from "../../stores/SpaceStore";
+import classNames from 'classnames';
+import GroupFilterPanel from './GroupFilterPanel';
+import CustomRoomTagPanel from './CustomRoomTagPanel';
+import { mediaFromMxc } from "../../customisations/Media";
// We need to fetch each pinned message individually (if we don't already have it)
// so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -127,6 +132,7 @@ interface IState {
usageLimitEventTs?: number;
useCompactLayout: boolean;
activeCalls: Array<MatrixCall>;
+ backgroundImage?: string;
}
/**
@@ -142,10 +148,13 @@ interface IState {
class LoggedInView extends React.Component<IProps, IState> {
static displayName = 'LoggedInView';
+ private dispatcherRef: string;
protected readonly _matrixClient: MatrixClient;
protected readonly _roomView: React.RefObject<any>;
- protected readonly _resizeContainer: React.RefObject<ResizeHandle>;
+ protected readonly _resizeContainer: React.RefObject<HTMLDivElement>;
+ protected readonly resizeHandler: React.RefObject<HTMLDivElement>;
protected compactLayoutWatcherRef: string;
+ protected backgroundImageWatcherRef: string;
protected resizer: Resizer;
constructor(props, context) {
@@ -156,7 +165,7 @@ class LoggedInView extends React.Component<IProps, IState> {
// use compact timeline view
useCompactLayout: SettingsStore.getValue('useCompactLayout'),
usageLimitDismissed: false,
- activeCalls: [],
+ activeCalls: CallHandler.sharedInstance().getAllActiveCalls(),
};
// stash the MatrixClient in case we log out before we are unmounted
@@ -168,11 +177,12 @@ class LoggedInView extends React.Component<IProps, IState> {
this._roomView = React.createRef();
this._resizeContainer = React.createRef();
+ this.resizeHandler = React.createRef();
}
componentDidMount() {
document.addEventListener('keydown', this.onNativeKeyDown, false);
- CallHandler.sharedInstance().addListener(CallHandlerEvent.CallsChanged, this.onCallsChanged);
+ this.dispatcherRef = dis.register(this.onAction);
this.updateServerNoticeEvents();
@@ -189,26 +199,51 @@ class LoggedInView extends React.Component<IProps, IState> {
this.compactLayoutWatcherRef = SettingsStore.watchSetting(
"useCompactLayout", null, this.onCompactLayoutChanged,
);
+ this.backgroundImageWatcherRef = SettingsStore.watchSetting(
+ "RoomList.backgroundImage", null, this.refreshBackgroundImage,
+ );
this.resizer = this.createResizer();
this.resizer.attach();
+
+ OwnProfileStore.instance.on(UPDATE_EVENT, this.refreshBackgroundImage);
this.loadResizerPreferences();
+ this.refreshBackgroundImage();
}
componentWillUnmount() {
document.removeEventListener('keydown', this.onNativeKeyDown, false);
- CallHandler.sharedInstance().removeListener(CallHandlerEvent.CallsChanged, this.onCallsChanged);
+ dis.unregister(this.dispatcherRef);
this._matrixClient.removeListener("accountData", this.onAccountData);
this._matrixClient.removeListener("sync", this.onSync);
this._matrixClient.removeListener("RoomState.events", this.onRoomStateEvents);
+ OwnProfileStore.instance.off(UPDATE_EVENT, this.refreshBackgroundImage);
SettingsStore.unwatchSetting(this.compactLayoutWatcherRef);
+ SettingsStore.unwatchSetting(this.backgroundImageWatcherRef);
this.resizer.detach();
}
- private onCallsChanged = () => {
- this.setState({
- activeCalls: CallHandler.sharedInstance().getAllActiveCalls(),
- });
+ private refreshBackgroundImage = async (): Promise<void> => {
+ let backgroundImage = SettingsStore.getValue("RoomList.backgroundImage");
+ if (backgroundImage) {
+ // convert to http before going much further
+ backgroundImage = mediaFromMxc(backgroundImage).srcHttp;
+ } else {
+ backgroundImage = OwnProfileStore.instance.getHttpAvatarUrl();
+ }
+ this.setState({ backgroundImage });
+ };
+
+ private onAction = (payload): void => {
+ switch (payload.action) {
+ case 'call_state': {
+ const activeCalls = CallHandler.sharedInstance().getAllActiveCalls();
+ if (activeCalls !== this.state.activeCalls) {
+ this.setState({ activeCalls });
+ }
+ break;
+ }
+ }
};
public canResetTimelineInRoom = (roomId: string) => {
@@ -247,6 +282,7 @@ class LoggedInView extends React.Component<IProps, IState> {
isItemCollapsed: domNode => {
return domNode.classList.contains("mx_LeftPanel_minimized");
},
+ handler: this.resizeHandler.current,
};
const resizer = new Resizer(this._resizeContainer.current, CollapseDistributor, collapseConfig);
resizer.setClassNames({
@@ -262,7 +298,7 @@ class LoggedInView extends React.Component<IProps, IState> {
if (isNaN(lhsSize)) {
lhsSize = 350;
}
- this.resizer.forHandleAt(0).resize(lhsSize);
+ this.resizer.forHandleWithId('lp-resizer').resize(lhsSize);
}
private onAccountData = (event: MatrixEvent) => {
@@ -601,10 +637,14 @@ class LoggedInView extends React.Component<IProps, IState> {
break;
}
- let bodyClasses = 'mx_MatrixChat';
- if (this.state.useCompactLayout) {
- bodyClasses += ' mx_MatrixChat_useCompactLayout';
- }
+ const wrapperClasses = classNames({
+ 'mx_MatrixChat_wrapper': true,
+ 'mx_MatrixChat_useCompactLayout': this.state.useCompactLayout,
+ });
+ const bodyClasses = classNames({
+ 'mx_MatrixChat': true,
+ 'mx_MatrixChat--with-avatar': this.state.backgroundImage,
+ });
const audioFeedArraysForCalls = this.state.activeCalls.map((call) => {
return (
@@ -617,18 +657,47 @@ class LoggedInView extends React.Component<IProps, IState> {
<div
onPaste={this.onPaste}
onKeyDown={this.onReactKeyDown}
- className='mx_MatrixChat_wrapper'
+ className={wrapperClasses}
aria-hidden={this.props.hideToSRUsers}
>
<ToastContainer />
- <div ref={this._resizeContainer} className={bodyClasses}>
- { SpaceStore.spacesEnabled ? <SpacePanel /> : null }
- <LeftPanel
- isMinimized={this.props.collapseLhs || false}
- resizeNotifier={this.props.resizeNotifier}
- />
- <ResizeHandle />
- { pageElement }
+ <div className={bodyClasses}>
+ <div className='mx_LeftPanel_wrapper'>
+ { SettingsStore.getValue('TagPanel.enableTagPanel') &&
+ (<div className="mx_GroupFilterPanelContainer">
+ <BackdropPanel
+ blurMultiplier={0.5}
+ backgroundImage={this.state.backgroundImage}
+ />
+ <GroupFilterPanel />
+ { SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null }
+ </div>)
+ }
+ { SpaceStore.spacesEnabled ? <>
+ <BackdropPanel
+ blurMultiplier={0.5}
+ backgroundImage={this.state.backgroundImage}
+ />
+ <SpacePanel />
+ </> : null }
+ <BackdropPanel
+ backgroundImage={this.state.backgroundImage}
+ />
+ <div
+ className="mx_LeftPanel_wrapper--user"
+ ref={this._resizeContainer}
+ data-collapsed={this.props.collapseLhs ? true : undefined}
+ >
+ <LeftPanel
+ isMinimized={this.props.collapseLhs || false}
+ resizeNotifier={this.props.resizeNotifier}
+ />
+ </div>
+ </div>
+ <ResizeHandle passRef={this.resizeHandler} id="lp-resizer" />
+ <div className="mx_RoomView_wrapper">
+ { pageElement }
+ </div>
</div>
</div>
<CallContainer />
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 902d2a0921..280d56d3c0 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -143,7 +143,7 @@ export enum Views {
SOFT_LOGOUT,
}
-const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"];
+const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas", "welcome"];
// Actions that are redirected through the onboarding process prior to being
// re-dispatched. NOTE: some actions are non-trivial and would require
@@ -1016,6 +1016,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
this.setStateForNewView({
view: Views.LOGGED_IN,
justRegistered,
+ currentRoomId: null,
});
this.setPage(PageTypes.HomePage);
this.notifyNewScreen('home');
@@ -1896,15 +1897,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
onSendEvent(roomId: string, event: MatrixEvent) {
const cli = MatrixClientPeg.get();
- if (!cli) {
- dis.dispatch({ action: 'message_send_failed' });
- return;
- }
+ if (!cli) return;
cli.sendEvent(roomId, event.getType(), event.getContent()).then(() => {
dis.dispatch({ action: 'message_sent' });
- }, (err) => {
- dis.dispatch({ action: 'message_send_failed' });
});
}
diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index 1691d90651..589947af73 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -173,6 +173,8 @@ interface IProps {
onUnfillRequest?(backwards: boolean, scrollToken: string): void;
getRelationsForEvent?(eventId: string, relationType: string, eventType: string): Relations;
+
+ hideThreadedMessages?: boolean;
}
interface IState {
@@ -265,6 +267,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
componentDidMount() {
this.calculateRoomMembersCount();
this.props.room?.on("RoomState.members", this.calculateRoomMembersCount);
+ if (SettingsStore.getValue("feature_thread")) {
+ this.props.room?.getThreads().forEach(thread => thread.fetchReplyChain());
+ }
this.isMounted = true;
}
@@ -443,6 +448,12 @@ export default class MessagePanel extends React.Component<IProps, IState> {
// Always show highlighted event
if (this.props.highlightedEventId === mxEv.getId()) return true;
+ if (mxEv.replyInThread
+ && this.props.hideThreadedMessages
+ && SettingsStore.getValue("feature_thread")) {
+ return false;
+ }
+
return !shouldHideEvent(mxEv, this.context);
}
@@ -694,9 +705,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
let willWantDateSeparator = false;
let lastInSection = true;
- if (nextEvent) {
- willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEvent.getDate() || new Date());
- lastInSection = willWantDateSeparator || mxEv.getSender() !== nextEvent.getSender();
+ if (nextEventWithTile) {
+ willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEventWithTile.getDate() || new Date());
+ lastInSection = willWantDateSeparator || mxEv.getSender() !== nextEventWithTile.getSender();
}
// is this a continuation of the previous message?
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 95d70e913a..32a875557c 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -45,17 +45,23 @@ import GroupRoomInfo from "../views/groups/GroupRoomInfo";
import UserInfo from "../views/right_panel/UserInfo";
import ThirdPartyMemberInfo from "../views/rooms/ThirdPartyMemberInfo";
import FilePanel from "./FilePanel";
+import ThreadView from "./ThreadView";
+import ThreadPanel from "./ThreadPanel";
import NotificationPanel from "./NotificationPanel";
import ResizeNotifier from "../../utils/ResizeNotifier";
import PinnedMessagesCard from "../views/right_panel/PinnedMessagesCard";
import { throttle } from 'lodash';
import SpaceStore from "../../stores/SpaceStore";
+import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
+import { E2EStatus } from '../../utils/ShieldUtils';
interface IProps {
room?: Room; // if showing panels for a given room, this is set
groupId?: string; // if showing panels for a given group, this is set
user?: User; // used if we know the user ahead of opening the panel
resizeNotifier: ResizeNotifier;
+ permalinkCreator?: RoomPermalinkCreator;
+ e2eStatus?: E2EStatus;
}
interface IState {
@@ -265,7 +271,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
case RightPanelPhases.EncryptionPanel:
panel = <UserInfo
user={this.state.member}
- room={this.state.phase === RightPanelPhases.SpaceMemberInfo ? this.state.space : this.props.room}
+ room={this.context.getRoom(this.state.member.roomId) ?? this.props.room}
key={roomId || this.state.member.userId}
onClose={this.onClose}
phase={this.state.phase}
@@ -309,6 +315,23 @@ export default class RightPanel extends React.Component<IProps, IState> {
panel = <FilePanel roomId={roomId} resizeNotifier={this.props.resizeNotifier} onClose={this.onClose} />;
break;
+ case RightPanelPhases.ThreadView:
+ panel = <ThreadView
+ room={this.props.room}
+ resizeNotifier={this.props.resizeNotifier}
+ onClose={this.onClose}
+ mxEvent={this.state.event}
+ permalinkCreator={this.props.permalinkCreator}
+ e2eStatus={this.props.e2eStatus} />;
+ break;
+
+ case RightPanelPhases.ThreadPanel:
+ panel = <ThreadPanel
+ roomId={roomId}
+ resizeNotifier={this.props.resizeNotifier}
+ onClose={this.onClose} />;
+ break;
+
case RightPanelPhases.RoomSummary:
panel = <RoomSummaryCard room={this.props.room} onClose={this.onClose} />;
break;
diff --git a/src/components/structures/RoomDirectory.tsx b/src/components/structures/RoomDirectory.tsx
index 84e8de8221..3c5f99cc7d 100644
--- a/src/components/structures/RoomDirectory.tsx
+++ b/src/components/structures/RoomDirectory.tsx
@@ -347,7 +347,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
});
}
- private onRoomClicked = (room: IPublicRoomsChunkRoom, ev: ButtonEvent) => {
+ private onRoomClicked = (room: IPublicRoomsChunkRoom, ev: React.MouseEvent) => {
// If room was shift-clicked, remove it from the room directory
if (ev.shiftKey && !this.state.selectedCommunityId) {
ev.preventDefault();
@@ -833,6 +833,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
// Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
// but works with the objects we get from the public room list
-function getDisplayAliasForRoom(room: IPublicRoomsChunkRoom) {
+export function getDisplayAliasForRoom(room: IPublicRoomsChunkRoom) {
return getDisplayAliasForAliasSet(room.canonical_alias, room.aliases);
}
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 474b99262d..d788f9a489 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1848,6 +1848,19 @@ export default class RoomView extends React.Component<IProps, IState> {
/>;
}
+ const statusBarAreaClass = classNames("mx_RoomView_statusArea", {
+ "mx_RoomView_statusArea_expanded": isStatusAreaExpanded,
+ });
+
+ // if statusBar does not exist then statusBarArea is blank and takes up unnecessary space on the screen
+ // show statusBarArea only if statusBar is present
+ const statusBarArea = statusBar && <div className={statusBarAreaClass}>
+ <div className="mx_RoomView_statusAreaBox">
+ <div className="mx_RoomView_statusAreaBox_line" />
+ { statusBar }
+ </div>
+ </div>;
+
const roomVersionRecommendation = this.state.upgradeRecommendation;
const showRoomUpgradeBar = (
roomVersionRecommendation &&
@@ -1867,7 +1880,7 @@ export default class RoomView extends React.Component<IProps, IState> {
isRoomEncrypted={this.context.isRoomEncrypted(this.state.room.roomId)}
/>;
} else if (showRoomUpgradeBar) {
- aux = <RoomUpgradeWarningBar room={this.state.room} recommendation={roomVersionRecommendation} />;
+ aux = <RoomUpgradeWarningBar room={this.state.room} />;
} else if (myMembership !== "join") {
// We do have a room object for this room, but we're not currently in it.
// We may have a 3rd party invite to it.
@@ -2042,17 +2055,16 @@ export default class RoomView extends React.Component<IProps, IState> {
highlight={this.state.room.getUnreadNotificationCount(NotificationCountType.Highlight) > 0}
numUnreadMessages={this.state.numUnreadMessages}
onScrollToBottomClick={this.jumpToLiveTimeline}
- roomId={this.state.roomId}
/>);
}
- const statusBarAreaClass = classNames("mx_RoomView_statusArea", {
- "mx_RoomView_statusArea_expanded": isStatusAreaExpanded,
- });
-
const showRightPanel = this.state.room && this.state.showRightPanel;
const rightPanel = showRightPanel
- ? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} />
+ ? <RightPanel
+ room={this.state.room}
+ resizeNotifier={this.props.resizeNotifier}
+ permalinkCreator={this.getPermalinkCreatorForRoom(this.state.room)}
+ e2eStatus={this.state.e2eStatus} />
: null;
const timelineClasses = classNames("mx_RoomView_timeline", {
@@ -2095,12 +2107,7 @@ export default class RoomView extends React.Component<IProps, IState> {
{ messagePanel }
{ searchResultsPanel }
</div>
- <div className={statusBarAreaClass}>
- <div className="mx_RoomView_statusAreaBox">
- <div className="mx_RoomView_statusAreaBox_line" />
- { statusBar }
- </div>
- </div>
+ { statusBarArea }
{ previewBar }
{ messageComposer }
</div>
diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx
new file mode 100644
index 0000000000..09099032dc
--- /dev/null
+++ b/src/components/structures/SpaceHierarchy.tsx
@@ -0,0 +1,719 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {
+ ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+ KeyboardEvent,
+ KeyboardEventHandler,
+ useContext,
+ SetStateAction,
+ Dispatch,
+} from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
+import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
+import { IHierarchyRelation, IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import classNames from "classnames";
+import { sortBy } from "lodash";
+
+import dis from "../../dispatcher/dispatcher";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { _t } from "../../languageHandler";
+import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
+import Spinner from "../views/elements/Spinner";
+import SearchBox from "./SearchBox";
+import RoomAvatar from "../views/avatars/RoomAvatar";
+import StyledCheckbox from "../views/elements/StyledCheckbox";
+import BaseAvatar from "../views/avatars/BaseAvatar";
+import { mediaFromMxc } from "../../customisations/Media";
+import InfoTooltip from "../views/elements/InfoTooltip";
+import TextWithTooltip from "../views/elements/TextWithTooltip";
+import { useStateToggle } from "../../hooks/useStateToggle";
+import { getChildOrder } from "../../stores/SpaceStore";
+import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
+import { linkifyElement } from "../../HtmlUtils";
+import { useDispatcher } from "../../hooks/useDispatcher";
+import { Action } from "../../dispatcher/actions";
+import { Key } from "../../Keyboard";
+import { IState, RovingTabIndexProvider, useRovingTabIndex } from "../../accessibility/RovingTabIndex";
+import { getDisplayAliasForRoom } from "./RoomDirectory";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { useEventEmitterState } from "../../hooks/useEventEmitter";
+
+interface IProps {
+ space: Room;
+ initialText?: string;
+ additionalButtons?: ReactNode;
+ showRoom(cli: MatrixClient, hierarchy: RoomHierarchy, roomId: string, autoJoin?: boolean): void;
+}
+
+interface ITileProps {
+ room: IHierarchyRoom;
+ suggested?: boolean;
+ selected?: boolean;
+ numChildRooms?: number;
+ hasPermissions?: boolean;
+ onViewRoomClick(autoJoin: boolean): void;
+ onToggleClick?(): void;
+}
+
+const Tile: React.FC<ITileProps> = ({
+ room,
+ suggested,
+ selected,
+ hasPermissions,
+ onToggleClick,
+ onViewRoomClick,
+ numChildRooms,
+ children,
+}) => {
+ const cli = useContext(MatrixClientContext);
+ const joinedRoom = cli.getRoom(room.room_id)?.getMyMembership() === "join" ? cli.getRoom(room.room_id) : null;
+ const joinedRoomName = useEventEmitterState(joinedRoom, "Room.name", room => room?.name);
+ const name = joinedRoomName || room.name || room.canonical_alias || room.aliases?.[0]
+ || (room.room_type === RoomType.Space ? _t("Unnamed Space") : _t("Unnamed Room"));
+
+ const [showChildren, toggleShowChildren] = useStateToggle(true);
+ const [onFocus, isActive, ref] = useRovingTabIndex();
+
+ const onPreviewClick = (ev: ButtonEvent) => {
+ ev.preventDefault();
+ ev.stopPropagation();
+ onViewRoomClick(false);
+ };
+ const onJoinClick = (ev: ButtonEvent) => {
+ ev.preventDefault();
+ ev.stopPropagation();
+ onViewRoomClick(true);
+ };
+
+ let button;
+ if (joinedRoom) {
+ button = <AccessibleButton
+ onClick={onPreviewClick}
+ kind="primary_outline"
+ onFocus={onFocus}
+ tabIndex={isActive ? 0 : -1}
+ >
+ { _t("View") }
+ </AccessibleButton>;
+ } else if (onJoinClick) {
+ button = <AccessibleButton
+ onClick={onJoinClick}
+ kind="primary"
+ onFocus={onFocus}
+ tabIndex={isActive ? 0 : -1}
+ >
+ { _t("Join") }
+ </AccessibleButton>;
+ }
+
+ let checkbox;
+ if (onToggleClick) {
+ if (hasPermissions) {
+ checkbox = <StyledCheckbox checked={!!selected} onChange={onToggleClick} tabIndex={isActive ? 0 : -1} />;
+ } else {
+ checkbox = <TextWithTooltip
+ tooltip={_t("You don't have permission")}
+ onClick={ev => { ev.stopPropagation(); }}
+ >
+ <StyledCheckbox disabled={true} tabIndex={isActive ? 0 : -1} />
+ </TextWithTooltip>;
+ }
+ }
+
+ let avatar;
+ if (joinedRoom) {
+ avatar = <RoomAvatar room={joinedRoom} width={20} height={20} />;
+ } else {
+ avatar = <BaseAvatar
+ name={name}
+ idName={room.room_id}
+ url={room.avatar_url ? mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(20) : null}
+ width={20}
+ height={20}
+ />;
+ }
+
+ let description = _t("%(count)s members", { count: room.num_joined_members });
+ if (numChildRooms !== undefined) {
+ description += " · " + _t("%(count)s rooms", { count: numChildRooms });
+ }
+
+ const topic = joinedRoom?.currentState?.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic || room.topic;
+ if (topic) {
+ description += " · " + topic;
+ }
+
+ let suggestedSection;
+ if (suggested) {
+ suggestedSection = <InfoTooltip tooltip={_t("This room is suggested as a good one to join")}>
+ { _t("Suggested") }
+ </InfoTooltip>;
+ }
+
+ const content = <React.Fragment>
+ { avatar }
+ <div className="mx_SpaceHierarchy_roomTile_name">
+ { name }
+ { suggestedSection }
+ </div>
+
+ <div
+ className="mx_SpaceHierarchy_roomTile_info"
+ ref={e => e && linkifyElement(e)}
+ onClick={ev => {
+ // prevent clicks on links from bubbling up to the room tile
+ if ((ev.target as HTMLElement).tagName === "A") {
+ ev.stopPropagation();
+ }
+ }}
+ >
+ { description }
+ </div>
+ <div className="mx_SpaceHierarchy_actions">
+ { button }
+ { checkbox }
+ </div>
+ </React.Fragment>;
+
+ let childToggle: JSX.Element;
+ let childSection: JSX.Element;
+ let onKeyDown: KeyboardEventHandler;
+ if (children) {
+ // the chevron is purposefully a div rather than a button as it should be ignored for a11y
+ childToggle = <div
+ className={classNames("mx_SpaceHierarchy_subspace_toggle", {
+ mx_SpaceHierarchy_subspace_toggle_shown: showChildren,
+ })}
+ onClick={ev => {
+ ev.stopPropagation();
+ toggleShowChildren();
+ }}
+ />;
+
+ if (showChildren) {
+ const onChildrenKeyDown = (e) => {
+ if (e.key === Key.ARROW_LEFT) {
+ e.preventDefault();
+ e.stopPropagation();
+ ref.current?.focus();
+ }
+ };
+
+ childSection = <div
+ className="mx_SpaceHierarchy_subspace_children"
+ onKeyDown={onChildrenKeyDown}
+ role="group"
+ >
+ { children }
+ </div>;
+ }
+
+ onKeyDown = (e) => {
+ let handled = false;
+
+ switch (e.key) {
+ case Key.ARROW_LEFT:
+ if (showChildren) {
+ handled = true;
+ toggleShowChildren();
+ }
+ break;
+
+ case Key.ARROW_RIGHT:
+ handled = true;
+ if (showChildren) {
+ const childSection = ref.current?.nextElementSibling;
+ childSection?.querySelector<HTMLDivElement>(".mx_SpaceHierarchy_roomTile")?.focus();
+ } else {
+ toggleShowChildren();
+ }
+ break;
+ }
+
+ if (handled) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ };
+ }
+
+ return <li
+ className="mx_SpaceHierarchy_roomTileWrapper"
+ role="treeitem"
+ aria-expanded={children ? showChildren : undefined}
+ >
+ <AccessibleButton
+ className={classNames("mx_SpaceHierarchy_roomTile", {
+ mx_SpaceHierarchy_subspace: room.room_type === RoomType.Space,
+ })}
+ onClick={(hasPermissions && onToggleClick) ? onToggleClick : onPreviewClick}
+ onKeyDown={onKeyDown}
+ inputRef={ref}
+ onFocus={onFocus}
+ tabIndex={isActive ? 0 : -1}
+ >
+ { content }
+ { childToggle }
+ </AccessibleButton>
+ { childSection }
+ </li>;
+};
+
+export const showRoom = (cli: MatrixClient, hierarchy: RoomHierarchy, roomId: string, autoJoin = false) => {
+ const room = hierarchy.roomMap.get(roomId);
+
+ // Don't let the user view a room they won't be able to either peek or join:
+ // fail earlier so they don't have to click back to the directory.
+ if (cli.isGuest()) {
+ if (!room.world_readable && !room.guest_can_join) {
+ dis.dispatch({ action: "require_registration" });
+ return;
+ }
+ }
+
+ const roomAlias = getDisplayAliasForRoom(room) || undefined;
+ dis.dispatch({
+ action: "view_room",
+ auto_join: autoJoin,
+ should_peek: true,
+ _type: "room_directory", // instrumentation
+ room_alias: roomAlias,
+ room_id: room.room_id,
+ via_servers: Array.from(hierarchy.viaMap.get(roomId) || []),
+ oob_data: {
+ avatarUrl: room.avatar_url,
+ // XXX: This logic is duplicated from the JS SDK which would normally decide what the name is.
+ name: room.name || roomAlias || _t("Unnamed room"),
+ },
+ });
+};
+
+interface IHierarchyLevelProps {
+ root: IHierarchyRoom;
+ roomSet: Set<IHierarchyRoom>;
+ hierarchy: RoomHierarchy;
+ parents: Set<string>;
+ selectedMap?: Map<string, Set<string>>;
+ onViewRoomClick(roomId: string, autoJoin: boolean): void;
+ onToggleClick?(parentId: string, childId: string): void;
+}
+
+export const HierarchyLevel = ({
+ root,
+ roomSet,
+ hierarchy,
+ parents,
+ selectedMap,
+ onViewRoomClick,
+ onToggleClick,
+}: IHierarchyLevelProps) => {
+ const cli = useContext(MatrixClientContext);
+ const space = cli.getRoom(root.room_id);
+ const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
+
+ const sortedChildren = sortBy(root.children_state, ev => {
+ return getChildOrder(ev.content.order, ev.origin_server_ts, ev.state_key);
+ });
+
+ const [subspaces, childRooms] = sortedChildren.reduce((result, ev: IHierarchyRelation) => {
+ const room = hierarchy.roomMap.get(ev.state_key);
+ if (room && roomSet.has(room)) {
+ result[room.room_type === RoomType.Space ? 0 : 1].push(room);
+ }
+ return result;
+ }, [[] as IHierarchyRoom[], [] as IHierarchyRoom[]]);
+
+ const newParents = new Set(parents).add(root.room_id);
+ return <React.Fragment>
+ {
+ childRooms.map(room => (
+ <Tile
+ key={room.room_id}
+ room={room}
+ suggested={hierarchy.isSuggested(root.room_id, room.room_id)}
+ selected={selectedMap?.get(root.room_id)?.has(room.room_id)}
+ onViewRoomClick={(autoJoin) => {
+ onViewRoomClick(room.room_id, autoJoin);
+ }}
+ hasPermissions={hasPermissions}
+ onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, room.room_id) : undefined}
+ />
+ ))
+ }
+
+ {
+ subspaces.filter(room => !newParents.has(room.room_id)).map(space => (
+ <Tile
+ key={space.room_id}
+ room={space}
+ numChildRooms={space.children_state.filter(ev => {
+ const room = hierarchy.roomMap.get(ev.state_key);
+ return room && roomSet.has(room) && !room.room_type;
+ }).length}
+ suggested={hierarchy.isSuggested(root.room_id, space.room_id)}
+ selected={selectedMap?.get(root.room_id)?.has(space.room_id)}
+ onViewRoomClick={(autoJoin) => {
+ onViewRoomClick(space.room_id, autoJoin);
+ }}
+ hasPermissions={hasPermissions}
+ onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, space.room_id) : undefined}
+ >
+ <HierarchyLevel
+ root={space}
+ roomSet={roomSet}
+ hierarchy={hierarchy}
+ parents={newParents}
+ selectedMap={selectedMap}
+ onViewRoomClick={onViewRoomClick}
+ onToggleClick={onToggleClick}
+ />
+ </Tile>
+ ))
+ }
+ </React.Fragment>;
+};
+
+const INITIAL_PAGE_SIZE = 20;
+
+export const useSpaceSummary = (space: Room): {
+ loading: boolean;
+ rooms: IHierarchyRoom[];
+ hierarchy: RoomHierarchy;
+ loadMore(pageSize?: number): Promise <void>;
+} => {
+ const [rooms, setRooms] = useState<IHierarchyRoom[]>([]);
+ const [loading, setLoading] = useState(true);
+ const [hierarchy, setHierarchy] = useState<RoomHierarchy>();
+
+ const resetHierarchy = useCallback(() => {
+ const hierarchy = new RoomHierarchy(space, INITIAL_PAGE_SIZE);
+ setHierarchy(hierarchy);
+
+ let discard = false;
+ hierarchy.load().then(() => {
+ if (discard) return;
+ setRooms(hierarchy.rooms);
+ setLoading(false);
+ });
+
+ return () => {
+ discard = true;
+ };
+ }, [space]);
+ useEffect(resetHierarchy, [resetHierarchy]);
+
+ useDispatcher(defaultDispatcher, (payload => {
+ if (payload.action === Action.UpdateSpaceHierarchy) {
+ setLoading(true);
+ setRooms([]); // TODO
+ resetHierarchy();
+ }
+ }));
+
+ const loadMore = useCallback(async (pageSize?: number) => {
+ if (!hierarchy.canLoadMore || hierarchy.noSupport) return;
+
+ setLoading(true);
+ await hierarchy.load(pageSize);
+ setRooms(hierarchy.rooms);
+ setLoading(false);
+ }, [hierarchy]);
+
+ return { loading, rooms, hierarchy, loadMore };
+};
+
+const useIntersectionObserver = (callback: () => void) => {
+ const handleObserver = (entries: IntersectionObserverEntry[]) => {
+ const target = entries[0];
+ if (target.isIntersecting) {
+ callback();
+ }
+ };
+
+ const observerRef = useRef<IntersectionObserver>();
+ return (element: HTMLDivElement) => {
+ if (observerRef.current) {
+ observerRef.current.disconnect();
+ } else if (element) {
+ observerRef.current = new IntersectionObserver(handleObserver, {
+ root: element.parentElement,
+ rootMargin: "0px 0px 600px 0px",
+ });
+ }
+
+ if (observerRef.current && element) {
+ observerRef.current.observe(element);
+ }
+ };
+};
+
+interface IManageButtonsProps {
+ hierarchy: RoomHierarchy;
+ selected: Map<string, Set<string>>;
+ setSelected: Dispatch<SetStateAction<Map<string, Set<string>>>>;
+ setError: Dispatch<SetStateAction<string>>;
+}
+
+const ManageButtons = ({ hierarchy, selected, setSelected, setError }: IManageButtonsProps) => {
+ const cli = useContext(MatrixClientContext);
+
+ const [removing, setRemoving] = useState(false);
+ const [saving, setSaving] = useState(false);
+
+ const selectedRelations = Array.from(selected.keys()).flatMap(parentId => {
+ return [
+ ...selected.get(parentId).values(),
+ ].map(childId => [parentId, childId]) as [string, string][];
+ });
+
+ const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
+ return hierarchy.isSuggested(parentId, childId);
+ });
+
+ const disabled = !selectedRelations.length || removing || saving;
+
+ let Button: React.ComponentType<React.ComponentProps<typeof AccessibleButton>> = AccessibleButton;
+ let props = {};
+ if (!selectedRelations.length) {
+ Button = AccessibleTooltipButton;
+ props = {
+ tooltip: _t("Select a room below first"),
+ yOffset: -40,
+ };
+ }
+
+ return <>
+ <Button
+ {...props}
+ onClick={async () => {
+ setRemoving(true);
+ try {
+ for (const [parentId, childId] of selectedRelations) {
+ await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
+
+ hierarchy.removeRelation(parentId, childId);
+ }
+ } catch (e) {
+ setError(_t("Failed to remove some rooms. Try again later"));
+ }
+ setRemoving(false);
+ setSelected(new Map());
+ }}
+ kind="danger_outline"
+ disabled={disabled}
+ >
+ { removing ? _t("Removing...") : _t("Remove") }
+ </Button>
+ <Button
+ {...props}
+ onClick={async () => {
+ setSaving(true);
+ try {
+ for (const [parentId, childId] of selectedRelations) {
+ const suggested = !selectionAllSuggested;
+ const existingContent = hierarchy.getRelation(parentId, childId)?.content;
+ if (!existingContent || existingContent.suggested === suggested) continue;
+
+ const content = {
+ ...existingContent,
+ suggested: !selectionAllSuggested,
+ };
+
+ await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId);
+
+ // mutate the local state to save us having to refetch the world
+ existingContent.suggested = content.suggested;
+ }
+ } catch (e) {
+ setError("Failed to update some suggestions. Try again later");
+ }
+ setSaving(false);
+ setSelected(new Map());
+ }}
+ kind="primary_outline"
+ disabled={disabled}
+ >
+ { saving
+ ? _t("Saving...")
+ : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested"))
+ }
+ </Button>
+ </>;
+};
+
+const SpaceHierarchy = ({
+ space,
+ initialText = "",
+ showRoom,
+ additionalButtons,
+}: IProps) => {
+ const cli = useContext(MatrixClientContext);
+ const [query, setQuery] = useState(initialText);
+
+ const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
+
+ const { loading, rooms, hierarchy, loadMore } = useSpaceSummary(space);
+
+ const filteredRoomSet = useMemo<Set<IHierarchyRoom>>(() => {
+ if (!rooms.length) return new Set();
+ const lcQuery = query.toLowerCase().trim();
+ if (!lcQuery) return new Set(rooms);
+
+ const directMatches = rooms.filter(r => {
+ return r.name?.toLowerCase().includes(lcQuery) || r.topic?.toLowerCase().includes(lcQuery);
+ });
+
+ // Walk back up the tree to find all parents of the direct matches to show their place in the hierarchy
+ const visited = new Set<string>();
+ const queue = [...directMatches.map(r => r.room_id)];
+ while (queue.length) {
+ const roomId = queue.pop();
+ visited.add(roomId);
+ hierarchy.backRefs.get(roomId)?.forEach(parentId => {
+ if (!visited.has(parentId)) {
+ queue.push(parentId);
+ }
+ });
+ }
+
+ return new Set(rooms.filter(r => visited.has(r.room_id)));
+ }, [rooms, hierarchy, query]);
+
+ const [error, setError] = useState("");
+
+ const loaderRef = useIntersectionObserver(loadMore);
+
+ if (!loading && hierarchy.noSupport) {
+ return <p>{ _t("Your server does not support showing space hierarchies.") }</p>;
+ }
+
+ const onKeyDown = (ev: KeyboardEvent, state: IState): void => {
+ if (ev.key === Key.ARROW_DOWN && ev.currentTarget.classList.contains("mx_SpaceHierarchy_search")) {
+ state.refs[0]?.current?.focus();
+ }
+ };
+
+ const onToggleClick = (parentId: string, childId: string): void => {
+ setError("");
+ if (!selected.has(parentId)) {
+ setSelected(new Map(selected.set(parentId, new Set([childId]))));
+ return;
+ }
+
+ const parentSet = selected.get(parentId);
+ if (!parentSet.has(childId)) {
+ setSelected(new Map(selected.set(parentId, new Set([...parentSet, childId]))));
+ return;
+ }
+
+ parentSet.delete(childId);
+ setSelected(new Map(selected.set(parentId, new Set(parentSet))));
+ };
+
+ return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
+ { ({ onKeyDownHandler }) => {
+ let content: JSX.Element;
+ let loader: JSX.Element;
+
+ if (loading && !rooms.length) {
+ content = <Spinner />;
+ } else {
+ const hasPermissions = space?.getMyMembership() === "join" &&
+ space.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
+
+ let results: JSX.Element;
+ if (filteredRoomSet.size) {
+ results = <>
+ <HierarchyLevel
+ root={hierarchy.roomMap.get(space.roomId)}
+ roomSet={filteredRoomSet}
+ hierarchy={hierarchy}
+ parents={new Set()}
+ selectedMap={selected}
+ onToggleClick={hasPermissions ? onToggleClick : undefined}
+ onViewRoomClick={(roomId, autoJoin) => {
+ showRoom(cli, hierarchy, roomId, autoJoin);
+ }}
+ />
+ </>;
+
+ if (hierarchy.canLoadMore) {
+ loader = <div ref={loaderRef}>
+ <Spinner />
+ </div>;
+ }
+ } else {
+ results = <div className="mx_SpaceHierarchy_noResults">
+ <h3>{ _t("No results found") }</h3>
+ <div>{ _t("You may want to try a different search or check for typos.") }</div>
+ </div>;
+ }
+
+ content = <>
+ <div className="mx_SpaceHierarchy_listHeader">
+ <h4>{ query.trim() ? _t("Results") : _t("Rooms and spaces") }</h4>
+ <span>
+ { additionalButtons }
+ { hasPermissions && (
+ <ManageButtons
+ hierarchy={hierarchy}
+ selected={selected}
+ setSelected={setSelected}
+ setError={setError}
+ />
+ ) }
+ </span>
+ </div>
+ { error && <div className="mx_SpaceHierarchy_error">
+ { error }
+ </div> }
+ <ul
+ className="mx_SpaceHierarchy_list"
+ onKeyDown={onKeyDownHandler}
+ role="tree"
+ aria-label={_t("Space")}
+ >
+ { results }
+ </ul>
+ { loader }
+ </>;
+ }
+
+ return <>
+ <SearchBox
+ className="mx_SpaceHierarchy_search mx_textinput_icon mx_textinput_search"
+ placeholder={_t("Search names and descriptions")}
+ onSearch={setQuery}
+ autoFocus={true}
+ initialValue={initialText}
+ onKeyDown={onKeyDownHandler}
+ />
+
+ { content }
+ </>;
+ } }
+ </RovingTabIndexProvider>;
+};
+
+export default SpaceHierarchy;
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
deleted file mode 100644
index 27b70c6841..0000000000
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { ReactNode, KeyboardEvent, useMemo, useState, KeyboardEventHandler } from "react";
-import { Room } from "matrix-js-sdk/src/models/room";
-import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
-import { ISpaceSummaryRoom, ISpaceSummaryEvent } from "matrix-js-sdk/src/@types/spaces";
-import classNames from "classnames";
-import { sortBy } from "lodash";
-
-import { MatrixClientPeg } from "../../MatrixClientPeg";
-import dis from "../../dispatcher/dispatcher";
-import { _t } from "../../languageHandler";
-import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
-import BaseDialog from "../views/dialogs/BaseDialog";
-import Spinner from "../views/elements/Spinner";
-import SearchBox from "./SearchBox";
-import RoomAvatar from "../views/avatars/RoomAvatar";
-import RoomName from "../views/elements/RoomName";
-import { useAsyncMemo } from "../../hooks/useAsyncMemo";
-import { EnhancedMap } from "../../utils/maps";
-import StyledCheckbox from "../views/elements/StyledCheckbox";
-import AutoHideScrollbar from "./AutoHideScrollbar";
-import BaseAvatar from "../views/avatars/BaseAvatar";
-import { mediaFromMxc } from "../../customisations/Media";
-import InfoTooltip from "../views/elements/InfoTooltip";
-import TextWithTooltip from "../views/elements/TextWithTooltip";
-import { useStateToggle } from "../../hooks/useStateToggle";
-import { getChildOrder } from "../../stores/SpaceStore";
-import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import { linkifyElement } from "../../HtmlUtils";
-import { getDisplayAliasForAliasSet } from "../../Rooms";
-import { useDispatcher } from "../../hooks/useDispatcher";
-import defaultDispatcher from "../../dispatcher/dispatcher";
-import { Action } from "../../dispatcher/actions";
-import { Key } from "../../Keyboard";
-import { IState, RovingTabIndexProvider, useRovingTabIndex } from "../../accessibility/RovingTabIndex";
-
-interface IHierarchyProps {
- space: Room;
- initialText?: string;
- additionalButtons?: ReactNode;
- showRoom(room: ISpaceSummaryRoom, viaServers?: string[], autoJoin?: boolean): void;
-}
-
-interface ITileProps {
- room: ISpaceSummaryRoom;
- suggested?: boolean;
- selected?: boolean;
- numChildRooms?: number;
- hasPermissions?: boolean;
- onViewRoomClick(autoJoin: boolean): void;
- onToggleClick?(): void;
-}
-
-const Tile: React.FC<ITileProps> = ({
- room,
- suggested,
- selected,
- hasPermissions,
- onToggleClick,
- onViewRoomClick,
- numChildRooms,
- children,
-}) => {
- const cli = MatrixClientPeg.get();
- const joinedRoom = cli.getRoom(room.room_id)?.getMyMembership() === "join" ? cli.getRoom(room.room_id) : null;
- const name = joinedRoom?.name || room.name || room.canonical_alias || room.aliases?.[0]
- || (room.room_type === RoomType.Space ? _t("Unnamed Space") : _t("Unnamed Room"));
-
- const [showChildren, toggleShowChildren] = useStateToggle(true);
- const [onFocus, isActive, ref] = useRovingTabIndex();
-
- const onPreviewClick = (ev: ButtonEvent) => {
- ev.preventDefault();
- ev.stopPropagation();
- onViewRoomClick(false);
- };
- const onJoinClick = (ev: ButtonEvent) => {
- ev.preventDefault();
- ev.stopPropagation();
- onViewRoomClick(true);
- };
-
- let button;
- if (joinedRoom) {
- button = <AccessibleButton
- onClick={onPreviewClick}
- kind="primary_outline"
- onFocus={onFocus}
- tabIndex={isActive ? 0 : -1}
- >
- { _t("View") }
- </AccessibleButton>;
- } else if (onJoinClick) {
- button = <AccessibleButton
- onClick={onJoinClick}
- kind="primary"
- onFocus={onFocus}
- tabIndex={isActive ? 0 : -1}
- >
- { _t("Join") }
- </AccessibleButton>;
- }
-
- let checkbox;
- if (onToggleClick) {
- if (hasPermissions) {
- checkbox = <StyledCheckbox checked={!!selected} onChange={onToggleClick} tabIndex={isActive ? 0 : -1} />;
- } else {
- checkbox = <TextWithTooltip
- tooltip={_t("You don't have permission")}
- onClick={ev => { ev.stopPropagation(); }}
- >
- <StyledCheckbox disabled={true} tabIndex={isActive ? 0 : -1} />
- </TextWithTooltip>;
- }
- }
-
- let avatar;
- if (joinedRoom) {
- avatar = <RoomAvatar room={joinedRoom} width={20} height={20} />;
- } else {
- avatar = <BaseAvatar
- name={name}
- idName={room.room_id}
- url={room.avatar_url ? mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(20) : null}
- width={20}
- height={20}
- />;
- }
-
- let description = _t("%(count)s members", { count: room.num_joined_members });
- if (numChildRooms !== undefined) {
- description += " · " + _t("%(count)s rooms", { count: numChildRooms });
- }
-
- const topic = joinedRoom?.currentState?.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic || room.topic;
- if (topic) {
- description += " · " + topic;
- }
-
- let suggestedSection;
- if (suggested) {
- suggestedSection = <InfoTooltip tooltip={_t("This room is suggested as a good one to join")}>
- { _t("Suggested") }
- </InfoTooltip>;
- }
-
- const content = <React.Fragment>
- { avatar }
- <div className="mx_SpaceRoomDirectory_roomTile_name">
- { name }
- { suggestedSection }
- </div>
-
- <div
- className="mx_SpaceRoomDirectory_roomTile_info"
- ref={e => e && linkifyElement(e)}
- onClick={ev => {
- // prevent clicks on links from bubbling up to the room tile
- if ((ev.target as HTMLElement).tagName === "A") {
- ev.stopPropagation();
- }
- }}
- >
- { description }
- </div>
- <div className="mx_SpaceRoomDirectory_actions">
- { button }
- { checkbox }
- </div>
- </React.Fragment>;
-
- let childToggle: JSX.Element;
- let childSection: JSX.Element;
- let onKeyDown: KeyboardEventHandler;
- if (children) {
- // the chevron is purposefully a div rather than a button as it should be ignored for a11y
- childToggle = <div
- className={classNames("mx_SpaceRoomDirectory_subspace_toggle", {
- mx_SpaceRoomDirectory_subspace_toggle_shown: showChildren,
- })}
- onClick={ev => {
- ev.stopPropagation();
- toggleShowChildren();
- }}
- />;
-
- if (showChildren) {
- const onChildrenKeyDown = (e) => {
- if (e.key === Key.ARROW_LEFT) {
- e.preventDefault();
- e.stopPropagation();
- ref.current?.focus();
- }
- };
-
- childSection = <div
- className="mx_SpaceRoomDirectory_subspace_children"
- onKeyDown={onChildrenKeyDown}
- role="group"
- >
- { children }
- </div>;
- }
-
- onKeyDown = (e) => {
- let handled = false;
-
- switch (e.key) {
- case Key.ARROW_LEFT:
- if (showChildren) {
- handled = true;
- toggleShowChildren();
- }
- break;
-
- case Key.ARROW_RIGHT:
- handled = true;
- if (showChildren) {
- const childSection = ref.current?.nextElementSibling;
- childSection?.querySelector<HTMLDivElement>(".mx_SpaceRoomDirectory_roomTile")?.focus();
- } else {
- toggleShowChildren();
- }
- break;
- }
-
- if (handled) {
- e.preventDefault();
- e.stopPropagation();
- }
- };
- }
-
- return <li
- className="mx_SpaceRoomDirectory_roomTileWrapper"
- role="treeitem"
- aria-expanded={children ? showChildren : undefined}
- >
- <AccessibleButton
- className={classNames("mx_SpaceRoomDirectory_roomTile", {
- mx_SpaceRoomDirectory_subspace: room.room_type === RoomType.Space,
- })}
- onClick={(hasPermissions && onToggleClick) ? onToggleClick : onPreviewClick}
- onKeyDown={onKeyDown}
- inputRef={ref}
- onFocus={onFocus}
- tabIndex={isActive ? 0 : -1}
- >
- { content }
- { childToggle }
- </AccessibleButton>
- { childSection }
- </li>;
-};
-
-export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
- // Don't let the user view a room they won't be able to either peek or join:
- // fail earlier so they don't have to click back to the directory.
- if (MatrixClientPeg.get().isGuest()) {
- if (!room.world_readable && !room.guest_can_join) {
- dis.dispatch({ action: "require_registration" });
- return;
- }
- }
-
- const roomAlias = getDisplayAliasForRoom(room) || undefined;
- dis.dispatch({
- action: "view_room",
- auto_join: autoJoin,
- should_peek: true,
- _type: "room_directory", // instrumentation
- room_alias: roomAlias,
- room_id: room.room_id,
- via_servers: viaServers,
- oob_data: {
- avatarUrl: room.avatar_url,
- // XXX: This logic is duplicated from the JS SDK which would normally decide what the name is.
- name: room.name || roomAlias || _t("Unnamed room"),
- },
- });
-};
-
-interface IHierarchyLevelProps {
- spaceId: string;
- rooms: Map<string, ISpaceSummaryRoom>;
- relations: Map<string, Map<string, ISpaceSummaryEvent>>;
- parents: Set<string>;
- selectedMap?: Map<string, Set<string>>;
- onViewRoomClick(roomId: string, autoJoin: boolean): void;
- onToggleClick?(parentId: string, childId: string): void;
-}
-
-export const HierarchyLevel = ({
- spaceId,
- rooms,
- relations,
- parents,
- selectedMap,
- onViewRoomClick,
- onToggleClick,
-}: IHierarchyLevelProps) => {
- const cli = MatrixClientPeg.get();
- const space = cli.getRoom(spaceId);
- const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
-
- const children = Array.from(relations.get(spaceId)?.values() || []);
- const sortedChildren = sortBy(children, ev => {
- // XXX: Space Summary API doesn't give the child origin_server_ts but once it does we should use it for sorting
- return getChildOrder(ev.content.order, null, ev.state_key);
- });
- const [subspaces, childRooms] = sortedChildren.reduce((result, ev: ISpaceSummaryEvent) => {
- const roomId = ev.state_key;
- if (!rooms.has(roomId)) return result;
- result[rooms.get(roomId).room_type === RoomType.Space ? 0 : 1].push(roomId);
- return result;
- }, [[], []]) || [[], []];
-
- const newParents = new Set(parents).add(spaceId);
- return <React.Fragment>
- {
- childRooms.map(roomId => (
- <Tile
- key={roomId}
- room={rooms.get(roomId)}
- suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
- selected={selectedMap?.get(spaceId)?.has(roomId)}
- onViewRoomClick={(autoJoin) => {
- onViewRoomClick(roomId, autoJoin);
- }}
- hasPermissions={hasPermissions}
- onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined}
- />
- ))
- }
-
- {
- subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => (
- <Tile
- key={roomId}
- room={rooms.get(roomId)}
- numChildRooms={Array.from(relations.get(roomId)?.values() || [])
- .filter(ev => rooms.has(ev.state_key) && !rooms.get(ev.state_key).room_type).length}
- suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
- selected={selectedMap?.get(spaceId)?.has(roomId)}
- onViewRoomClick={(autoJoin) => {
- onViewRoomClick(roomId, autoJoin);
- }}
- hasPermissions={hasPermissions}
- onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined}
- >
- <HierarchyLevel
- spaceId={roomId}
- rooms={rooms}
- relations={relations}
- parents={newParents}
- selectedMap={selectedMap}
- onViewRoomClick={onViewRoomClick}
- onToggleClick={onToggleClick}
- />
- </Tile>
- ))
- }
- </React.Fragment>;
-};
-
-export const useSpaceSummary = (space: Room): [
- null,
- ISpaceSummaryRoom[],
- Map<string, Map<string, ISpaceSummaryEvent>>?,
- Map<string, Set<string>>?,
- Map<string, Set<string>>?,
-] | [Error] => {
- // crude temporary refresh token approach until we have pagination and rework the data flow here
- const [refreshToken, setRefreshToken] = useState(0);
- useDispatcher(defaultDispatcher, (payload => {
- if (payload.action === Action.UpdateSpaceHierarchy) {
- setRefreshToken(t => t + 1);
- }
- }));
-
- // TODO pagination
- return useAsyncMemo(async () => {
- try {
- const data = await space.client.getSpaceSummary(space.roomId);
-
- const parentChildRelations = new EnhancedMap<string, Map<string, ISpaceSummaryEvent>>();
- const childParentRelations = new EnhancedMap<string, Set<string>>();
- const viaMap = new EnhancedMap<string, Set<string>>();
- data.events.map((ev: ISpaceSummaryEvent) => {
- if (ev.type === EventType.SpaceChild) {
- parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
- childParentRelations.getOrCreate(ev.state_key, new Set()).add(ev.room_id);
- }
- if (Array.isArray(ev.content.via)) {
- const set = viaMap.getOrCreate(ev.state_key, new Set());
- ev.content.via.forEach(via => set.add(via));
- }
- });
-
- return [null, data.rooms as ISpaceSummaryRoom[], parentChildRelations, viaMap, childParentRelations];
- } catch (e) {
- console.error(e); // TODO
- return [e];
- }
- }, [space, refreshToken], [undefined]);
-};
-
-export const SpaceHierarchy: React.FC<IHierarchyProps> = ({
- space,
- initialText = "",
- showRoom,
- additionalButtons,
- children,
-}) => {
- const cli = MatrixClientPeg.get();
- const userId = cli.getUserId();
- const [query, setQuery] = useState(initialText);
-
- const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
-
- const [summaryError, rooms, parentChildMap, viaMap, childParentMap] = useSpaceSummary(space);
-
- const roomsMap = useMemo(() => {
- if (!rooms) return null;
- const lcQuery = query.toLowerCase().trim();
-
- const roomsMap = new Map<string, ISpaceSummaryRoom>(rooms.map(r => [r.room_id, r]));
- if (!lcQuery) return roomsMap;
-
- const directMatches = rooms.filter(r => {
- return r.name?.toLowerCase().includes(lcQuery) || r.topic?.toLowerCase().includes(lcQuery);
- });
-
- // Walk back up the tree to find all parents of the direct matches to show their place in the hierarchy
- const visited = new Set<string>();
- const queue = [...directMatches.map(r => r.room_id)];
- while (queue.length) {
- const roomId = queue.pop();
- visited.add(roomId);
- childParentMap.get(roomId)?.forEach(parentId => {
- if (!visited.has(parentId)) {
- queue.push(parentId);
- }
- });
- }
-
- // Remove any mappings for rooms which were not visited in the walk
- Array.from(roomsMap.keys()).forEach(roomId => {
- if (!visited.has(roomId)) {
- roomsMap.delete(roomId);
- }
- });
- return roomsMap;
- }, [rooms, childParentMap, query]);
-
- const [error, setError] = useState("");
- const [removing, setRemoving] = useState(false);
- const [saving, setSaving] = useState(false);
-
- if (summaryError) {
- return <p>{ _t("Your server does not support showing space hierarchies.") }</p>;
- }
-
- const onKeyDown = (ev: KeyboardEvent, state: IState) => {
- if (ev.key === Key.ARROW_DOWN && ev.currentTarget.classList.contains("mx_SpaceRoomDirectory_search")) {
- state.refs[0]?.current?.focus();
- }
- };
-
- // TODO loading state/error state
- return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
- { ({ onKeyDownHandler }) => {
- let content;
- if (roomsMap) {
- const numRooms = Array.from(roomsMap.values()).filter(r => !r.room_type).length;
- const numSpaces = roomsMap.size - numRooms - 1; // -1 at the end to exclude the space we are looking at
-
- let countsStr;
- if (numSpaces > 1) {
- countsStr = _t("%(count)s rooms and %(numSpaces)s spaces", { count: numRooms, numSpaces });
- } else if (numSpaces > 0) {
- countsStr = _t("%(count)s rooms and 1 space", { count: numRooms, numSpaces });
- } else {
- countsStr = _t("%(count)s rooms", { count: numRooms, numSpaces });
- }
-
- let manageButtons;
- if (space.getMyMembership() === "join" &&
- space.currentState.maySendStateEvent(EventType.SpaceChild, userId)
- ) {
- const selectedRelations = Array.from(selected.keys()).flatMap(parentId => {
- return [
- ...selected.get(parentId).values(),
- ].map(childId => [parentId, childId]) as [string, string][];
- });
-
- const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
- return parentChildMap.get(parentId)?.get(childId)?.content.suggested;
- });
-
- const disabled = !selectedRelations.length || removing || saving;
-
- let Button: React.ComponentType<React.ComponentProps<typeof AccessibleButton>> = AccessibleButton;
- let props = {};
- if (!selectedRelations.length) {
- Button = AccessibleTooltipButton;
- props = {
- tooltip: _t("Select a room below first"),
- yOffset: -40,
- };
- }
-
- manageButtons = <>
- <Button
- {...props}
- onClick={async () => {
- setRemoving(true);
- try {
- for (const [parentId, childId] of selectedRelations) {
- await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
- parentChildMap.get(parentId).delete(childId);
- if (parentChildMap.get(parentId).size > 0) {
- parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
- } else {
- parentChildMap.delete(parentId);
- }
- }
- } catch (e) {
- setError(_t("Failed to remove some rooms. Try again later"));
- }
- setRemoving(false);
- }}
- kind="danger_outline"
- disabled={disabled}
- >
- { removing ? _t("Removing...") : _t("Remove") }
- </Button>
- <Button
- {...props}
- onClick={async () => {
- setSaving(true);
- try {
- for (const [parentId, childId] of selectedRelations) {
- const suggested = !selectionAllSuggested;
- const existingContent = parentChildMap.get(parentId)?.get(childId)?.content;
- if (!existingContent || existingContent.suggested === suggested) continue;
-
- const content = {
- ...existingContent,
- suggested: !selectionAllSuggested,
- };
-
- await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId);
-
- parentChildMap.get(parentId).get(childId).content = content;
- parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
- }
- } catch (e) {
- setError("Failed to update some suggestions. Try again later");
- }
- setSaving(false);
- setSelected(new Map());
- }}
- kind="primary_outline"
- disabled={disabled}
- >
- { saving
- ? _t("Saving...")
- : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested"))
- }
- </Button>
- </>;
- }
-
- let results;
- if (roomsMap.size) {
- const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
-
- results = <>
- <HierarchyLevel
- spaceId={space.roomId}
- rooms={roomsMap}
- relations={parentChildMap}
- parents={new Set()}
- selectedMap={selected}
- onToggleClick={hasPermissions ? (parentId, childId) => {
- setError("");
- if (!selected.has(parentId)) {
- setSelected(new Map(selected.set(parentId, new Set([childId]))));
- return;
- }
-
- const parentSet = selected.get(parentId);
- if (!parentSet.has(childId)) {
- setSelected(new Map(selected.set(parentId, new Set([...parentSet, childId]))));
- return;
- }
-
- parentSet.delete(childId);
- setSelected(new Map(selected.set(parentId, new Set(parentSet))));
- } : undefined}
- onViewRoomClick={(roomId, autoJoin) => {
- showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin);
- }}
- />
- { children && <hr /> }
- </>;
- } else {
- results = <div className="mx_SpaceRoomDirectory_noResults">
- <h3>{ _t("No results found") }</h3>
- <div>{ _t("You may want to try a different search or check for typos.") }</div>
- </div>;
- }
-
- content = <>
- <div className="mx_SpaceRoomDirectory_listHeader">
- { countsStr }
- <span>
- { additionalButtons }
- { manageButtons }
- </span>
- </div>
- { error && <div className="mx_SpaceRoomDirectory_error">
- { error }
- </div> }
- <AutoHideScrollbar
- className="mx_SpaceRoomDirectory_list"
- onKeyDown={onKeyDownHandler}
- role="tree"
- aria-label={_t("Space")}
- >
- { results }
- { children }
- </AutoHideScrollbar>
- </>;
- } else {
- content = <Spinner />;
- }
-
- return <>
- <SearchBox
- className="mx_SpaceRoomDirectory_search mx_textinput_icon mx_textinput_search"
- placeholder={_t("Search names and descriptions")}
- onSearch={setQuery}
- autoFocus={true}
- initialValue={initialText}
- onKeyDown={onKeyDownHandler}
- />
-
- { content }
- </>;
- } }
- </RovingTabIndexProvider>;
-};
-
-interface IProps {
- space: Room;
- initialText?: string;
- onFinished(): void;
-}
-
-const SpaceRoomDirectory: React.FC<IProps> = ({ space, onFinished, initialText }) => {
- const onCreateRoomClick = () => {
- dis.dispatch({
- action: 'view_create_room',
- public: true,
- });
- onFinished();
- };
-
- const title = <React.Fragment>
- <RoomAvatar room={space} height={32} width={32} />
- <div>
- <h1>{ _t("Explore rooms") }</h1>
- <div><RoomName room={space} /></div>
- </div>
- </React.Fragment>;
-
- return (
- <BaseDialog className="mx_SpaceRoomDirectory" hasCancel={true} onFinished={onFinished} title={title}>
- <div className="mx_Dialog_content">
- { _t("If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.",
- null,
- { a: sub => {
- return <AccessibleButton kind="link" onClick={onCreateRoomClick}>{ sub }</AccessibleButton>;
- } },
- ) }
-
- <SpaceHierarchy
- space={space}
- showRoom={(room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
- showRoom(room, viaServers, autoJoin);
- onFinished();
- }}
- initialText={initialText}
- >
- <AccessibleButton
- onClick={onCreateRoomClick}
- kind="primary"
- className="mx_SpaceRoomDirectory_createRoom"
- >
- { _t("Create room") }
- </AccessibleButton>
- </SpaceHierarchy>
- </div>
- </BaseDialog>
- );
-};
-
-export default SpaceRoomDirectory;
-
-// Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
-// but works with the objects we get from the public room list
-function getDisplayAliasForRoom(room: ISpaceSummaryRoom) {
- return getDisplayAliasForAliasSet(room.canonical_alias, room.aliases);
-}
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 7887e9b744..3837d26564 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -16,7 +16,7 @@ limitations under the License.
import React, { RefObject, useContext, useRef, useState } from "react";
import { EventType } from "matrix-js-sdk/src/@types/event";
-import { Preset, JoinRule } from "matrix-js-sdk/src/@types/partials";
+import { JoinRule, Preset } from "matrix-js-sdk/src/@types/partials";
import { Room } from "matrix-js-sdk/src/models/room";
import { EventSubscription } from "fbemitter";
@@ -54,7 +54,7 @@ import {
showCreateNewSubspace,
showSpaceSettings,
} from "../../utils/space";
-import { showRoom, SpaceHierarchy } from "./SpaceRoomDirectory";
+import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
import MemberAvatar from "../views/avatars/MemberAvatar";
import SpaceStore from "../../stores/SpaceStore";
import FacePile from "../views/elements/FacePile";
@@ -78,6 +78,7 @@ import { CreateEventField, IGroupSummary } from "../views/dialogs/CreateSpaceFro
import { useAsyncMemo } from "../../hooks/useAsyncMemo";
import Spinner from "../views/elements/Spinner";
import GroupAvatar from "../views/avatars/GroupAvatar";
+import { useDispatcher } from "../../hooks/useDispatcher";
interface IProps {
space: Room;
@@ -89,7 +90,7 @@ interface IProps {
interface IState {
phase: Phase;
- createdRooms?: boolean; // internal state for the creation wizard
+ firstRoomId?: string; // internal state for the creation wizard
showRightPanel: boolean;
myMembership: string;
}
@@ -191,6 +192,11 @@ interface ISpacePreviewProps {
const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISpacePreviewProps) => {
const cli = useContext(MatrixClientContext);
const myMembership = useMyRoomMembership(space);
+ useDispatcher(defaultDispatcher, payload => {
+ if (payload.action === Action.JoinRoomError && payload.roomId === space.roomId) {
+ setBusy(false); // stop the spinner, join failed
+ }
+ });
const [busy, setBusy] = useState(false);
@@ -496,6 +502,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
onChange={ev => setRoomName(i, ev.target.value)}
autoFocus={i === 2}
disabled={busy}
+ autoComplete="off"
/>;
});
@@ -505,11 +512,12 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
setError("");
setBusy(true);
try {
+ const isPublic = space.getJoinRule() === JoinRule.Public;
const filteredRoomNames = roomNames.map(name => name.trim()).filter(Boolean);
- await Promise.all(filteredRoomNames.map(name => {
+ const roomIds = await Promise.all(filteredRoomNames.map(name => {
return createRoom({
createOpts: {
- preset: space.getJoinRule() === "public" ? Preset.PublicChat : Preset.PrivateChat,
+ preset: isPublic ? Preset.PublicChat : Preset.PrivateChat,
name,
},
spinner: false,
@@ -517,9 +525,11 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
andView: false,
inlineErrors: true,
parentSpace: space,
+ joinRule: !isPublic ? JoinRule.Restricted : undefined,
+ suggested: true,
});
}));
- onFinished(filteredRoomNames.length > 0);
+ onFinished(roomIds[0]);
} catch (e) {
console.error("Failed to create initial space rooms", e);
setError(_t("Failed to create initial space rooms"));
@@ -529,7 +539,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
let onClick = (ev) => {
ev.preventDefault();
- onFinished(false);
+ onFinished();
};
let buttonLabel = _t("Skip for now");
if (roomNames.some(name => name.trim())) {
@@ -584,7 +594,11 @@ const SpaceAddExistingRooms = ({ space, onFinished }) => {
</div>;
};
-const SpaceSetupPublicShare = ({ justCreatedOpts, space, onFinished, createdRooms }) => {
+interface ISpaceSetupPublicShareProps extends Pick<IProps & IState, "justCreatedOpts" | "space" | "firstRoomId"> {
+ onFinished(): void;
+}
+
+const SpaceSetupPublicShare = ({ justCreatedOpts, space, onFinished, firstRoomId }: ISpaceSetupPublicShareProps) => {
return <div className="mx_SpaceRoomView_publicShare">
<h1>{ _t("Share %(name)s", {
name: justCreatedOpts?.createOpts?.name || space.name,
@@ -597,7 +611,7 @@ const SpaceSetupPublicShare = ({ justCreatedOpts, space, onFinished, createdRoom
<div className="mx_SpaceRoomView_buttons">
<AccessibleButton kind="primary" onClick={onFinished}>
- { createdRooms ? _t("Go to my first room") : _t("Go to my space") }
+ { firstRoomId ? _t("Go to my first room") : _t("Go to my space") }
</AccessibleButton>
</div>
</div>;
@@ -805,6 +819,11 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
};
private onAction = (payload: ActionPayload) => {
+ if (payload.action === "view_room" && payload.room_id === this.props.space.roomId) {
+ this.setState({ phase: Phase.Landing });
+ return;
+ }
+
if (payload.action !== Action.ViewUser && payload.action !== "view_3pid_invite") return;
if (payload.action === Action.ViewUser && payload.member) {
@@ -835,35 +854,10 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
};
private goToFirstRoom = async () => {
- // TODO actually go to the first room
-
- const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId);
- if (childRooms.length) {
- const room = childRooms[0];
+ if (this.state.firstRoomId) {
defaultDispatcher.dispatch({
action: "view_room",
- room_id: room.roomId,
- });
- return;
- }
-
- let suggestedRooms = SpaceStore.instance.suggestedRooms;
- if (SpaceStore.instance.activeSpace !== this.props.space) {
- // the space store has the suggested rooms loaded for a different space, fetch the right ones
- suggestedRooms = (await SpaceStore.instance.fetchSuggestedRooms(this.props.space, 1));
- }
-
- if (suggestedRooms.length) {
- const room = suggestedRooms[0];
- defaultDispatcher.dispatch({
- action: "view_room",
- room_id: room.room_id,
- room_alias: room.canonical_alias || room.aliases?.[0],
- via_servers: room.viaServers,
- oobData: {
- avatarUrl: room.avatar_url,
- name: room.name || room.canonical_alias || room.aliases?.[0] || _t("Empty room"),
- },
+ room_id: this.state.firstRoomId,
});
return;
}
@@ -893,14 +887,14 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
_t("Let's create a room for each of them.") + "\n" +
_t("You can add more later too, including already existing ones.")
}
- onFinished={(createdRooms: boolean) => this.setState({ phase: Phase.PublicShare, createdRooms })}
+ onFinished={(firstRoomId: string) => this.setState({ phase: Phase.PublicShare, firstRoomId })}
/>;
case Phase.PublicShare:
return <SpaceSetupPublicShare
justCreatedOpts={this.props.justCreatedOpts}
space={this.props.space}
onFinished={this.goToFirstRoom}
- createdRooms={this.state.createdRooms}
+ firstRoomId={this.state.firstRoomId}
/>;
case Phase.PrivateScope:
@@ -922,7 +916,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
title={_t("What projects are you working on?")}
description={_t("We'll create rooms for each of them. " +
"You can add more later too, including already existing ones.")}
- onFinished={(createdRooms: boolean) => this.setState({ phase: Phase.Landing, createdRooms })}
+ onFinished={(firstRoomId: string) => this.setState({ phase: Phase.Landing, firstRoomId })}
/>;
case Phase.PrivateExistingRooms:
return <SpaceAddExistingRooms
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
new file mode 100644
index 0000000000..a0bccfdce9
--- /dev/null
+++ b/src/components/structures/ThreadPanel.tsx
@@ -0,0 +1,93 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { MatrixEvent, Room } from 'matrix-js-sdk/src';
+import { Thread } from 'matrix-js-sdk/src/models/thread';
+
+import BaseCard from "../views/right_panel/BaseCard";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import { MatrixClientPeg } from '../../MatrixClientPeg';
+
+import ResizeNotifier from '../../utils/ResizeNotifier';
+import EventTile from '../views/rooms/EventTile';
+
+interface IProps {
+ roomId: string;
+ onClose: () => void;
+ resizeNotifier: ResizeNotifier;
+}
+
+interface IState {
+ threads?: Thread[];
+}
+
+@replaceableComponent("structures.ThreadView")
+export default class ThreadPanel extends React.Component<IProps, IState> {
+ private room: Room;
+
+ constructor(props: IProps) {
+ super(props);
+ this.room = MatrixClientPeg.get().getRoom(this.props.roomId);
+ }
+
+ public componentDidMount(): void {
+ this.room.on("Thread.update", this.onThreadEventReceived);
+ this.room.on("Thread.ready", this.onThreadEventReceived);
+ }
+
+ public componentWillUnmount(): void {
+ this.room.removeListener("Thread.update", this.onThreadEventReceived);
+ this.room.removeListener("Thread.ready", this.onThreadEventReceived);
+ }
+
+ private onThreadEventReceived = () => this.updateThreads();
+
+ private updateThreads = (callback?: () => void): void => {
+ this.setState({
+ threads: this.room.getThreads(),
+ }, callback);
+ };
+
+ private renderEventTile(event: MatrixEvent): JSX.Element {
+ return <EventTile
+ key={event.getId()}
+ mxEvent={event}
+ enableFlair={false}
+ showReadReceipts={false}
+ as="div"
+ />;
+ }
+
+ public render(): JSX.Element {
+ return (
+ <BaseCard
+ className="mx_ThreadPanel"
+ onClose={this.props.onClose}
+ previousPhase={RightPanelPhases.RoomSummary}
+ >
+ {
+ this.state?.threads.map((thread: Thread) => {
+ if (thread.ready) {
+ return this.renderEventTile(thread.rootEvent);
+ }
+ })
+ }
+ </BaseCard>
+ );
+ }
+}
diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
new file mode 100644
index 0000000000..614d3c9f4b
--- /dev/null
+++ b/src/components/structures/ThreadView.tsx
@@ -0,0 +1,160 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { MatrixEvent, Room } from 'matrix-js-sdk/src';
+import { Thread } from 'matrix-js-sdk/src/models/thread';
+
+import BaseCard from "../views/right_panel/BaseCard";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+import ResizeNotifier from '../../utils/ResizeNotifier';
+import { TileShape } from '../views/rooms/EventTile';
+import MessageComposer from '../views/rooms/MessageComposer';
+import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
+import { Layout } from '../../settings/Layout';
+import TimelinePanel from './TimelinePanel';
+import dis from "../../dispatcher/dispatcher";
+import { ActionPayload } from '../../dispatcher/payloads';
+import { SetRightPanelPhasePayload } from '../../dispatcher/payloads/SetRightPanelPhasePayload';
+import { Action } from '../../dispatcher/actions';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
+import { E2EStatus } from '../../utils/ShieldUtils';
+
+interface IProps {
+ room: Room;
+ onClose: () => void;
+ resizeNotifier: ResizeNotifier;
+ mxEvent: MatrixEvent;
+ permalinkCreator?: RoomPermalinkCreator;
+ e2eStatus?: E2EStatus;
+}
+
+interface IState {
+ replyToEvent?: MatrixEvent;
+ thread?: Thread;
+}
+
+@replaceableComponent("structures.ThreadView")
+export default class ThreadView extends React.Component<IProps, IState> {
+ private dispatcherRef: string;
+ private timelinePanelRef: React.RefObject<TimelinePanel> = React.createRef();
+
+ constructor(props: IProps) {
+ super(props);
+ this.state = {};
+ }
+
+ public componentDidMount(): void {
+ this.setupThread(this.props.mxEvent);
+ this.dispatcherRef = dis.register(this.onAction);
+ }
+
+ public componentWillUnmount(): void {
+ this.teardownThread();
+ dis.unregister(this.dispatcherRef);
+ }
+
+ public componentDidUpdate(prevProps) {
+ if (prevProps.mxEvent !== this.props.mxEvent) {
+ this.teardownThread();
+ this.setupThread(this.props.mxEvent);
+ }
+
+ if (prevProps.room !== this.props.room) {
+ dis.dispatch<SetRightPanelPhasePayload>({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.RoomSummary,
+ });
+ }
+ }
+
+ private onAction = (payload: ActionPayload): void => {
+ if (payload.phase == RightPanelPhases.ThreadView && payload.event) {
+ if (payload.event !== this.props.mxEvent) {
+ this.teardownThread();
+ this.setupThread(payload.event);
+ }
+ }
+ };
+
+ private setupThread = (mxEv: MatrixEvent) => {
+ let thread = mxEv.getThread();
+ if (!thread) {
+ const client = MatrixClientPeg.get();
+ thread = new Thread([mxEv], this.props.room, client);
+ mxEv.setThread(thread);
+ }
+ thread.on("Thread.update", this.updateThread);
+ thread.once("Thread.ready", this.updateThread);
+ this.updateThread(thread);
+ };
+
+ private teardownThread = () => {
+ if (this.state.thread) {
+ this.state.thread.removeListener("Thread.update", this.updateThread);
+ this.state.thread.removeListener("Thread.ready", this.updateThread);
+ }
+ };
+
+ private updateThread = (thread?: Thread) => {
+ if (thread) {
+ this.setState({
+ thread,
+ replyToEvent: thread.replyToEvent,
+ });
+ }
+
+ this.timelinePanelRef.current?.refreshTimeline();
+ };
+
+ public render(): JSX.Element {
+ return (
+ <BaseCard
+ className="mx_ThreadView"
+ onClose={this.props.onClose}
+ previousPhase={RightPanelPhases.RoomSummary}
+ withoutScrollContainer={true}
+ >
+ { this.state.thread && (
+ <TimelinePanel
+ ref={this.timelinePanelRef}
+ manageReadReceipts={false}
+ manageReadMarkers={false}
+ timelineSet={this.state?.thread?.timelineSet}
+ showUrlPreview={false}
+ tileShape={TileShape.Notif}
+ empty={<div>empty</div>}
+ alwaysShowTimestamps={true}
+ layout={Layout.Group}
+ hideThreadedMessages={false}
+ />
+ ) }
+ <MessageComposer
+ room={this.props.room}
+ resizeNotifier={this.props.resizeNotifier}
+ replyInThread={true}
+ replyToEvent={this.state?.thread?.replyToEvent}
+ showReplyPreview={false}
+ permalinkCreator={this.props.permalinkCreator}
+ e2eStatus={this.props.e2eStatus}
+ compact={true}
+ />
+ </BaseCard>
+ );
+ }
+}
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index f62676a4fc..dbd479c2ed 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -47,11 +47,14 @@ import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
import Spinner from "../views/elements/Spinner";
import EditorStateTransfer from '../../utils/EditorStateTransfer';
import ErrorDialog from '../views/dialogs/ErrorDialog';
+import { debounce } from 'lodash';
const PAGINATE_SIZE = 20;
const INITIAL_SIZE = 20;
const READ_RECEIPT_INTERVAL_MS = 500;
+const READ_MARKER_DEBOUNCE_MS = 100;
+
const DEBUG = false;
let debuglog = function(...s: any[]) {};
@@ -126,6 +129,8 @@ interface IProps {
// callback which is called when we wish to paginate the timeline window.
onPaginationRequest?(timelineWindow: TimelineWindow, direction: string, size: number): Promise<boolean>;
+
+ hideThreadedMessages?: boolean;
}
interface IState {
@@ -214,6 +219,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
timelineCap: Number.MAX_VALUE,
className: 'mx_RoomView_messagePanel',
sendReadReceiptOnLoad: true,
+ hideThreadedMessages: true,
};
private lastRRSentEventId: string = undefined;
@@ -472,22 +478,35 @@ class TimelinePanel extends React.Component<IProps, IState> {
}
if (this.props.manageReadMarkers) {
- const rmPosition = this.getReadMarkerPosition();
- // we hide the read marker when it first comes onto the screen, but if
- // it goes back off the top of the screen (presumably because the user
- // clicks on the 'jump to bottom' button), we need to re-enable it.
- if (rmPosition < 0) {
- this.setState({ readMarkerVisible: true });
- }
-
- // if read marker position goes between 0 and -1/1,
- // (and user is active), switch timeout
- const timeout = this.readMarkerTimeout(rmPosition);
- // NO-OP when timeout already has set to the given value
- this.readMarkerActivityTimer.changeTimeout(timeout);
+ this.doManageReadMarkers();
}
};
+ /*
+ * Debounced function to manage read markers because we don't need to
+ * do this on every tiny scroll update. It also sets state which causes
+ * a component update, which can in turn reset the scroll position, so
+ * it's important we allow the browser to scroll a bit before running this
+ * (hence trailing edge only and debounce rather than throttle because
+ * we really only need to update this once the user has finished scrolling,
+ * not periodically while they scroll).
+ */
+ private doManageReadMarkers = debounce(() => {
+ const rmPosition = this.getReadMarkerPosition();
+ // we hide the read marker when it first comes onto the screen, but if
+ // it goes back off the top of the screen (presumably because the user
+ // clicks on the 'jump to bottom' button), we need to re-enable it.
+ if (rmPosition < 0) {
+ this.setState({ readMarkerVisible: true });
+ }
+
+ // if read marker position goes between 0 and -1/1,
+ // (and user is active), switch timeout
+ const timeout = this.readMarkerTimeout(rmPosition);
+ // NO-OP when timeout already has set to the given value
+ this.readMarkerActivityTimer.changeTimeout(timeout);
+ }, READ_MARKER_DEBOUNCE_MS, { leading: false, trailing: true });
+
private onAction = (payload: ActionPayload): void => {
switch (payload.action) {
case "ignore_state_changed":
@@ -1176,6 +1195,12 @@ class TimelinePanel extends React.Component<IProps, IState> {
this.setState(this.getEvents());
}
+ // Force refresh the timeline before threads support pending events
+ public refreshTimeline(): void {
+ this.loadTimeline();
+ this.reloadEvents();
+ }
+
// get the list of events from the timeline window and the pending event list
private getEvents(): Pick<IState, "events" | "liveEvents" | "firstVisibleEventIndex"> {
const events: MatrixEvent[] = this.timelineWindow.getEvents();
@@ -1511,6 +1536,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
showReactions={this.props.showReactions}
layout={this.props.layout}
enableFlair={SettingsStore.getValue(UIFeature.Flair)}
+ hideThreadedMessages={this.props.hideThreadedMessages}
/>
);
}
diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx
index f978a6cded..24b47bfa03 100644
--- a/src/components/structures/auth/ForgotPassword.tsx
+++ b/src/components/structures/auth/ForgotPassword.tsx
@@ -31,6 +31,7 @@ import { replaceableComponent } from "../../../utils/replaceableComponent";
import { PASSWORD_MIN_SCORE } from '../../views/auth/RegistrationForm';
import { IValidationResult } from "../../views/elements/Validation";
+import InlineSpinner from '../../views/elements/InlineSpinner';
enum Phase {
// Show the forgot password inputs
@@ -66,13 +67,14 @@ interface IState {
serverDeadError: string;
passwordFieldValid: boolean;
+ currentHttpRequest?: Promise<any>;
}
@replaceableComponent("structures.auth.ForgotPassword")
export default class ForgotPassword extends React.Component<IProps, IState> {
private reset: PasswordReset;
- state = {
+ state: IState = {
phase: Phase.Forgot,
email: "",
password: "",
@@ -148,8 +150,10 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
console.error("onVerify called before submitPasswordReset!");
return;
}
+ if (this.state.currentHttpRequest) return;
+
try {
- await this.reset.checkEmailLinkClicked();
+ await this.handleHttpRequest(this.reset.checkEmailLinkClicked());
this.setState({ phase: Phase.Done });
} catch (err) {
this.showErrorDialog(err.message);
@@ -158,9 +162,10 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
private onSubmitForm = async (ev: React.FormEvent): Promise<void> => {
ev.preventDefault();
+ if (this.state.currentHttpRequest) return;
// refresh the server errors, just in case the server came back online
- await this.checkServerLiveliness(this.props.serverConfig);
+ await this.handleHttpRequest(this.checkServerLiveliness(this.props.serverConfig));
await this['password_field'].validate({ allowEmpty: false });
@@ -221,6 +226,17 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
});
}
+ private handleHttpRequest<T = unknown>(request: Promise<T>): Promise<T> {
+ this.setState({
+ currentHttpRequest: request,
+ });
+ return request.finally(() => {
+ this.setState({
+ currentHttpRequest: undefined,
+ });
+ });
+ }
+
renderForgot() {
const Field = sdk.getComponent('elements.Field');
@@ -320,6 +336,9 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
type="button"
onClick={this.onVerify}
value={_t('I have verified my email address')} />
+ { this.state.currentHttpRequest && (
+ <div className="mx_Login_spinner"><InlineSpinner w={64} h={64} /></div>)
+ }
</div>;
}
@@ -357,6 +376,8 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
case Phase.Done:
resetPasswordJsx = this.renderDone();
break;
+ default:
+ resetPasswordJsx = <div className="mx_Login_spinner"><InlineSpinner w={64} h={64} /></div>;
}
return (
diff --git a/src/components/views/audio_messages/Clock.tsx b/src/components/views/audio_messages/Clock.tsx
index cb1a179f2e..69244cc5ad 100644
--- a/src/components/views/audio_messages/Clock.tsx
+++ b/src/components/views/audio_messages/Clock.tsx
@@ -15,34 +15,30 @@ limitations under the License.
*/
import React from "react";
+import { formatSeconds } from "../../../DateUtils";
import { replaceableComponent } from "../../../utils/replaceableComponent";
export interface IProps {
seconds: number;
}
-interface IState {
-}
-
/**
* Simply converts seconds into minutes and seconds. Note that hours will not be
* displayed, making it possible to see "82:29".
*/
@replaceableComponent("views.audio_messages.Clock")
-export default class Clock extends React.Component<IProps, IState> {
+export default class Clock extends React.Component<IProps> {
public constructor(props) {
super(props);
}
- shouldComponentUpdate(nextProps: Readonly<IProps>, nextState: Readonly<IState>, nextContext: any): boolean {
+ shouldComponentUpdate(nextProps: Readonly<IProps>): boolean {
const currentFloor = Math.floor(this.props.seconds);
const nextFloor = Math.floor(nextProps.seconds);
return currentFloor !== nextFloor;
}
public render() {
- const minutes = Math.floor(this.props.seconds / 60).toFixed(0).padStart(2, '0');
- const seconds = Math.floor(this.props.seconds % 60).toFixed(0).padStart(2, '0'); // hide millis
- return <span className='mx_Clock'>{ minutes }:{ seconds }</span>;
+ return <span className='mx_Clock'>{ formatSeconds(this.props.seconds) }</span>;
}
}
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 11c24a5981..3c734705b7 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -36,6 +36,7 @@ interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" |
// Whether the onClick of the avatar should be overriden to dispatch `Action.ViewUser`
viewUserOnClick?: boolean;
title?: string;
+ style?: any;
}
interface IState {
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.tsx
similarity index 76%
rename from src/components/views/avatars/MemberStatusMessageAvatar.js
rename to src/components/views/avatars/MemberStatusMessageAvatar.tsx
index 82b7b8e400..8c703b3b32 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.tsx
@@ -15,43 +15,48 @@ limitations under the License.
*/
import React, { createRef } from 'react';
-import PropTypes from 'prop-types';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import { _t } from "../../../languageHandler";
import MemberAvatar from '../avatars/MemberAvatar';
import classNames from 'classnames';
import StatusMessageContextMenu from "../context_menus/StatusMessageContextMenu";
import SettingsStore from "../../../settings/SettingsStore";
-import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
+import { ChevronFace, ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { ResizeMethod } from "matrix-js-sdk/src/@types/partials";
+
+interface IProps {
+ member: RoomMember;
+ width?: number;
+ height?: number;
+ resizeMethod?: ResizeMethod;
+}
+
+interface IState {
+ hasStatus: boolean;
+ menuDisplayed: boolean;
+}
@replaceableComponent("views.avatars.MemberStatusMessageAvatar")
-export default class MemberStatusMessageAvatar extends React.Component {
- static propTypes = {
- member: PropTypes.object.isRequired,
- width: PropTypes.number,
- height: PropTypes.number,
- resizeMethod: PropTypes.string,
- };
-
- static defaultProps = {
+export default class MemberStatusMessageAvatar extends React.Component<IProps, IState> {
+ public static defaultProps: Partial<IProps> = {
width: 40,
height: 40,
resizeMethod: 'crop',
};
+ private button = createRef<HTMLDivElement>();
- constructor(props) {
+ constructor(props: IProps) {
super(props);
this.state = {
hasStatus: this.hasStatus,
menuDisplayed: false,
};
-
- this._button = createRef();
}
- componentDidMount() {
+ public componentDidMount(): void {
if (this.props.member.userId !== MatrixClientPeg.get().getUserId()) {
throw new Error("Cannot use MemberStatusMessageAvatar on anyone but the logged in user");
}
@@ -62,44 +67,44 @@ export default class MemberStatusMessageAvatar extends React.Component {
if (!user) {
return;
}
- user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+ user.on("User._unstable_statusMessage", this.onStatusMessageCommitted);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
const { user } = this.props.member;
if (!user) {
return;
}
user.removeListener(
"User._unstable_statusMessage",
- this._onStatusMessageCommitted,
+ this.onStatusMessageCommitted,
);
}
- get hasStatus() {
+ private get hasStatus(): boolean {
const { user } = this.props.member;
if (!user) {
return false;
}
- return !!user._unstable_statusMessage;
+ return !!user.unstable_statusMessage;
}
- _onStatusMessageCommitted = () => {
+ private onStatusMessageCommitted = (): void => {
// The `User` object has observed a status message change.
this.setState({
hasStatus: this.hasStatus,
});
};
- openMenu = () => {
+ private openMenu = (): void => {
this.setState({ menuDisplayed: true });
};
- closeMenu = () => {
+ private closeMenu = (): void => {
this.setState({ menuDisplayed: false });
};
- render() {
+ public render(): JSX.Element {
const avatar = <MemberAvatar
member={this.props.member}
width={this.props.width}
@@ -118,7 +123,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
let contextMenu;
if (this.state.menuDisplayed) {
- const elementRect = this._button.current.getBoundingClientRect();
+ const elementRect = this.button.current.getBoundingClientRect();
const chevronWidth = 16; // See .mx_ContextualMenu_chevron_bottom
const chevronMargin = 1; // Add some spacing away from target
@@ -126,13 +131,13 @@ export default class MemberStatusMessageAvatar extends React.Component {
contextMenu = (
<ContextMenu
chevronOffset={(elementRect.width - chevronWidth) / 2}
- chevronFace="bottom"
+ chevronFace={ChevronFace.Bottom}
left={elementRect.left + window.pageXOffset}
top={elementRect.top + window.pageYOffset - chevronMargin}
menuWidth={226}
onFinished={this.closeMenu}
>
- <StatusMessageContextMenu user={this.props.member.user} onFinished={this.closeMenu} />
+ <StatusMessageContextMenu user={this.props.member.user} />
</ContextMenu>
);
}
@@ -140,7 +145,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
return <React.Fragment>
<ContextMenuButton
className={classes}
- inputRef={this._button}
+ inputRef={this.button}
onClick={this.openMenu}
isExpanded={this.state.menuDisplayed}
label={_t("User Status")}
diff --git a/src/components/views/context_menus/GenericElementContextMenu.js b/src/components/views/context_menus/GenericElementContextMenu.tsx
similarity index 67%
rename from src/components/views/context_menus/GenericElementContextMenu.js
rename to src/components/views/context_menus/GenericElementContextMenu.tsx
index 87d44ef0d3..a0a8c89b37 100644
--- a/src/components/views/context_menus/GenericElementContextMenu.js
+++ b/src/components/views/context_menus/GenericElementContextMenu.tsx
@@ -15,45 +15,41 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
import { replaceableComponent } from "../../../utils/replaceableComponent";
-/*
+interface IProps {
+ element: React.ReactNode;
+ // Function to be called when the parent window is resized
+ // This can be used to reposition or close the menu on resize and
+ // ensure that it is not displayed in a stale position.
+ onResize?: () => void;
+}
+
+/**
* This component can be used to display generic HTML content in a contextual
* menu.
*/
-
@replaceableComponent("views.context_menus.GenericElementContextMenu")
-export default class GenericElementContextMenu extends React.Component {
- static propTypes = {
- element: PropTypes.element.isRequired,
- // Function to be called when the parent window is resized
- // This can be used to reposition or close the menu on resize and
- // ensure that it is not displayed in a stale position.
- onResize: PropTypes.func,
- };
-
- constructor(props) {
+export default class GenericElementContextMenu extends React.Component<IProps> {
+ constructor(props: IProps) {
super(props);
- this.resize = this.resize.bind(this);
}
- componentDidMount() {
- this.resize = this.resize.bind(this);
+ public componentDidMount(): void {
window.addEventListener("resize", this.resize);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
window.removeEventListener("resize", this.resize);
}
- resize() {
+ private resize = (): void => {
if (this.props.onResize) {
this.props.onResize();
}
- }
+ };
- render() {
+ public render(): JSX.Element {
return <div>{ this.props.element }</div>;
}
}
diff --git a/src/components/views/context_menus/GenericTextContextMenu.js b/src/components/views/context_menus/GenericTextContextMenu.tsx
similarity index 86%
rename from src/components/views/context_menus/GenericTextContextMenu.js
rename to src/components/views/context_menus/GenericTextContextMenu.tsx
index 474732e88b..3ca158dd02 100644
--- a/src/components/views/context_menus/GenericTextContextMenu.js
+++ b/src/components/views/context_menus/GenericTextContextMenu.tsx
@@ -15,16 +15,15 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
import { replaceableComponent } from "../../../utils/replaceableComponent";
-@replaceableComponent("views.context_menus.GenericTextContextMenu")
-export default class GenericTextContextMenu extends React.Component {
- static propTypes = {
- message: PropTypes.string.isRequired,
- };
+interface IProps {
+ message: string;
+}
- render() {
+@replaceableComponent("views.context_menus.GenericTextContextMenu")
+export default class GenericTextContextMenu extends React.Component<IProps> {
+ public render(): JSX.Element {
return <div>{ this.props.message }</div>;
}
}
diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx
index 3da00e71aa..28c35eef8f 100644
--- a/src/components/views/context_menus/SpaceContextMenu.tsx
+++ b/src/components/views/context_menus/SpaceContextMenu.tsx
@@ -168,7 +168,7 @@ const SpaceContextMenu = ({ space, onFinished, ...props }: IProps) => {
defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
action: Action.SetRightPanelPhase,
phase: RightPanelPhases.SpaceMemberList,
- refireParams: { space: space },
+ refireParams: { space },
});
onFinished();
};
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.tsx
similarity index 71%
rename from src/components/views/context_menus/StatusMessageContextMenu.js
rename to src/components/views/context_menus/StatusMessageContextMenu.tsx
index e05b05116c..954dc3f5c0 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.tsx
@@ -14,53 +14,59 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { ChangeEvent } from 'react';
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import AccessibleButton from '../elements/AccessibleButton';
+import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { User } from "matrix-js-sdk/src/models/user";
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+ // js-sdk User object. Not required because it might not exist.
+ user?: User;
+}
+
+interface IState {
+ message: string;
+ waiting: boolean;
+}
@replaceableComponent("views.context_menus.StatusMessageContextMenu")
-export default class StatusMessageContextMenu extends React.Component {
- static propTypes = {
- // js-sdk User object. Not required because it might not exist.
- user: PropTypes.object,
- };
-
- constructor(props) {
+export default class StatusMessageContextMenu extends React.Component<IProps, IState> {
+ constructor(props: IProps) {
super(props);
this.state = {
message: this.comittedStatusMessage,
+ waiting: false,
};
}
- componentDidMount() {
+ public componentDidMount(): void {
const { user } = this.props;
if (!user) {
return;
}
- user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+ user.on("User._unstable_statusMessage", this.onStatusMessageCommitted);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
const { user } = this.props;
if (!user) {
return;
}
user.removeListener(
"User._unstable_statusMessage",
- this._onStatusMessageCommitted,
+ this.onStatusMessageCommitted,
);
}
- get comittedStatusMessage() {
- return this.props.user ? this.props.user._unstable_statusMessage : "";
+ get comittedStatusMessage(): string {
+ return this.props.user ? this.props.user.unstable_statusMessage : "";
}
- _onStatusMessageCommitted = () => {
+ private onStatusMessageCommitted = (): void => {
// The `User` object has observed a status message change.
this.setState({
message: this.comittedStatusMessage,
@@ -68,14 +74,14 @@ export default class StatusMessageContextMenu extends React.Component {
});
};
- _onClearClick = (e) => {
+ private onClearClick = (): void=> {
MatrixClientPeg.get()._unstable_setStatusMessage("");
this.setState({
waiting: true,
});
};
- _onSubmit = (e) => {
+ private onSubmit = (e: ButtonEvent): void => {
e.preventDefault();
MatrixClientPeg.get()._unstable_setStatusMessage(this.state.message);
this.setState({
@@ -83,27 +89,25 @@ export default class StatusMessageContextMenu extends React.Component {
});
};
- _onStatusChange = (e) => {
+ private onStatusChange = (e: ChangeEvent): void => {
// The input field's value was changed.
this.setState({
- message: e.target.value,
+ message: (e.target as HTMLInputElement).value,
});
};
- render() {
- const Spinner = sdk.getComponent('views.elements.Spinner');
-
+ public render(): JSX.Element {
let actionButton;
if (this.comittedStatusMessage) {
if (this.state.message === this.comittedStatusMessage) {
actionButton = <AccessibleButton className="mx_StatusMessageContextMenu_clear"
- onClick={this._onClearClick}
+ onClick={this.onClearClick}
>
<span>{ _t("Clear status") }</span>
</AccessibleButton>;
} else {
actionButton = <AccessibleButton className="mx_StatusMessageContextMenu_submit"
- onClick={this._onSubmit}
+ onClick={this.onSubmit}
>
<span>{ _t("Update status") }</span>
</AccessibleButton>;
@@ -112,7 +116,7 @@ export default class StatusMessageContextMenu extends React.Component {
actionButton = <AccessibleButton
className="mx_StatusMessageContextMenu_submit"
disabled={!this.state.message}
- onClick={this._onSubmit}
+ onClick={this.onSubmit}
>
<span>{ _t("Set status") }</span>
</AccessibleButton>;
@@ -120,13 +124,13 @@ export default class StatusMessageContextMenu extends React.Component {
let spinner = null;
if (this.state.waiting) {
- spinner = <Spinner w="24" h="24" />;
+ spinner = <Spinner w={24} h={24} />;
}
const form = <form
className="mx_StatusMessageContextMenu_form"
autoComplete="off"
- onSubmit={this._onSubmit}
+ onSubmit={this.onSubmit}
>
<input
type="text"
@@ -134,9 +138,9 @@ export default class StatusMessageContextMenu extends React.Component {
key="message"
placeholder={_t("Set a new status...")}
autoFocus={true}
- maxLength="60"
+ maxLength={60}
value={this.state.message}
- onChange={this._onStatusChange}
+ onChange={this.onStatusChange}
/>
<div className="mx_StatusMessageContextMenu_actionContainer">
{ actionButton }
diff --git a/src/components/views/dialogs/BugReportDialog.tsx b/src/components/views/dialogs/BugReportDialog.tsx
index 8f22c7ca9a..38566cdf04 100644
--- a/src/components/views/dialogs/BugReportDialog.tsx
+++ b/src/components/views/dialogs/BugReportDialog.tsx
@@ -215,7 +215,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
{
a: (sub) => <a
target="_blank"
- href="https://github.com/vector-im/element-web/issues/new"
+ href="https://github.com/vector-im/element-web/issues/new/choose"
>
{ sub }
</a>,
diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
index d573882f40..0da5f189bf 100644
--- a/src/components/views/dialogs/CreateRoomDialog.tsx
+++ b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -39,11 +39,13 @@ interface IProps {
defaultPublic?: boolean;
defaultName?: string;
parentSpace?: Room;
+ defaultEncrypted?: boolean;
onFinished(proceed: boolean, opts?: IOpts): void;
}
interface IState {
joinRule: JoinRule;
+ isPublic: boolean;
isEncrypted: boolean;
name: string;
topic: string;
@@ -74,8 +76,9 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
const config = SdkConfig.get();
this.state = {
+ isPublic: this.props.defaultPublic || false,
+ isEncrypted: this.props.defaultEncrypted ?? privateShouldBeEncrypted(),
joinRule,
- isEncrypted: privateShouldBeEncrypted(),
name: this.props.defaultName || "",
topic: "",
alias: "",
diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx
index 03927c7d62..d80245918f 100644
--- a/src/components/views/dialogs/CreateSubspaceDialog.tsx
+++ b/src/components/views/dialogs/CreateSubspaceDialog.tsx
@@ -79,7 +79,7 @@ const CreateSubspaceDialog: React.FC<IProps> = ({ space, onAddExistingSpaceClick
}
try {
- await createSpace(name, joinRule === JoinRule.Public, alias, topic, avatar, {}, { parentSpace });
+ await createSpace(name, joinRule === JoinRule.Public, alias, topic, avatar, {}, { parentSpace, joinRule });
onFinished(true);
} catch (e) {
diff --git a/src/components/views/dialogs/FeedbackDialog.js b/src/components/views/dialogs/FeedbackDialog.js
index 85171c9bf6..ceb8cb2175 100644
--- a/src/components/views/dialogs/FeedbackDialog.js
+++ b/src/components/views/dialogs/FeedbackDialog.js
@@ -28,7 +28,7 @@ import StyledRadioGroup from "../elements/StyledRadioGroup";
const existingIssuesUrl = "https://github.com/vector-im/element-web/issues" +
"?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
-const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
+const newIssueUrl = "https://github.com/vector-im/element-web/issues/new/choose";
export default (props) => {
const [rating, setRating] = useState("");
diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx
index 6e1e798e9d..3a8cd53945 100644
--- a/src/components/views/dialogs/LeaveSpaceDialog.tsx
+++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx
@@ -80,7 +80,7 @@ const SpaceChildPicker = ({ filterPlaceholder, rooms, selected, onChange }) => {
const LeaveRoomsPicker = ({ space, spaceChildren, roomsToLeave, setRoomsToLeave }) => {
const selected = useMemo(() => new Set(roomsToLeave), [roomsToLeave]);
- const [state, setState] = useState<string>(RoomsToLeave.All);
+ const [state, setState] = useState<string>(RoomsToLeave.None);
useEffect(() => {
if (state === RoomsToLeave.All) {
@@ -97,11 +97,11 @@ const LeaveRoomsPicker = ({ space, spaceChildren, roomsToLeave, setRoomsToLeave
onChange={setState}
definitions={[
{
- value: RoomsToLeave.All,
- label: _t("Leave all rooms and spaces"),
- }, {
value: RoomsToLeave.None,
label: _t("Don't leave any"),
+ }, {
+ value: RoomsToLeave.All,
+ label: _t("Leave all rooms and spaces"),
}, {
value: RoomsToLeave.Specific,
label: _t("Leave specific rooms and spaces"),
diff --git a/src/components/views/dialogs/RoomSettingsDialog.tsx b/src/components/views/dialogs/RoomSettingsDialog.tsx
index a426dce5c7..a73f0a595b 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.tsx
+++ b/src/components/views/dialogs/RoomSettingsDialog.tsx
@@ -79,7 +79,10 @@ export default class RoomSettingsDialog extends React.Component<IProps> {
ROOM_SECURITY_TAB,
_td("Security & Privacy"),
"mx_RoomSettingsDialog_securityIcon",
- <SecurityRoomSettingsTab roomId={this.props.roomId} />,
+ <SecurityRoomSettingsTab
+ roomId={this.props.roomId}
+ closeSettingsFn={() => this.props.onFinished(true)}
+ />,
));
tabs.push(new Tab(
ROOM_ROLES_TAB,
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 85e9c6f192..80c0543c4e 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -158,7 +158,7 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
if (this.state.linkSpecificEvent) {
matrixToUrl = this.props.permalinkCreator.forEvent(this.props.target.getId());
} else {
- matrixToUrl = this.props.permalinkCreator.forRoom();
+ matrixToUrl = this.props.permalinkCreator.forShareableRoom();
}
}
return matrixToUrl;
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
index fe836ebc5c..7abcb0eceb 100644
--- a/src/components/views/dialogs/SpaceSettingsDialog.tsx
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -29,10 +29,12 @@ import SpaceSettingsVisibilityTab from "../spaces/SpaceSettingsVisibilityTab";
import SettingsStore from "../../../settings/SettingsStore";
import { UIFeature } from "../../../settings/UIFeature";
import AdvancedRoomSettingsTab from "../settings/tabs/room/AdvancedRoomSettingsTab";
+import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
export enum SpaceSettingsTab {
General = "SPACE_GENERAL_TAB",
Visibility = "SPACE_VISIBILITY_TAB",
+ Roles = "SPACE_ROLES_TAB",
Advanced = "SPACE_ADVANCED_TAB",
}
@@ -60,7 +62,13 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
SpaceSettingsTab.Visibility,
_td("Visibility"),
"mx_SpaceSettingsDialog_visibilityIcon",
- <SpaceSettingsVisibilityTab matrixClient={cli} space={space} />,
+ <SpaceSettingsVisibilityTab matrixClient={cli} space={space} closeSettingsFn={onFinished} />,
+ ),
+ new Tab(
+ SpaceSettingsTab.Roles,
+ _td("Roles & Permissions"),
+ "mx_RoomSettingsDialog_rolesIcon",
+ <RolesRoomSettingsTab roomId={space.roomId} />,
),
SettingsStore.getValue(UIFeature.AdvancedSettings)
? new Tab(
diff --git a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
index ebeab191b1..366adb887c 100644
--- a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
+++ b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import { _t } from "../../../languageHandler";
import { IDialogProps } from "./IDialogProps";
import {
Capability,
+ isTimelineCapability,
Widget,
WidgetEventCapability,
WidgetKind,
@@ -30,14 +31,7 @@ import DialogButtons from "../elements/DialogButtons";
import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
import { CapabilityText } from "../../../widgets/CapabilityText";
import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-export function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
- return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
-}
-
-function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
- localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
-}
+import { lexicographicCompare } from "matrix-js-sdk/src/utils";
interface IProps extends IDialogProps {
requestedCapabilities: Set<Capability>;
@@ -95,14 +89,24 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
};
private closeAndTryRemember(approved: Capability[]) {
- if (this.state.rememberSelection) {
- setRememberedCapabilitiesForWidget(this.props.widget, approved);
- }
- this.props.onFinished({ approved });
+ this.props.onFinished({ approved, remember: this.state.rememberSelection });
}
public render() {
- const checkboxRows = Object.entries(this.state.booleanStates).map(([cap, isChecked], i) => {
+ // We specifically order the timeline capabilities down to the bottom. The capability text
+ // generation cares strongly about this.
+ const orderedCapabilities = Object.entries(this.state.booleanStates).sort(([capA], [capB]) => {
+ const isTimelineA = isTimelineCapability(capA);
+ const isTimelineB = isTimelineCapability(capB);
+
+ if (!isTimelineA && !isTimelineB) return lexicographicCompare(capA, capB);
+ if (isTimelineA && !isTimelineB) return 1;
+ if (!isTimelineA && isTimelineB) return -1;
+ if (isTimelineA && isTimelineB) return lexicographicCompare(capA, capB);
+
+ return 0;
+ });
+ const checkboxRows = orderedCapabilities.map(([cap, isChecked], i) => {
const text = CapabilityText.for(cap, this.props.widgetKind);
const byline = text.byline
? <span className="mx_WidgetCapabilitiesPromptDialog_byline">{ text.byline }</span>
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
similarity index 71%
rename from src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
rename to src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
index 1bc6444ac1..7993f9c418 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
@@ -1,5 +1,6 @@
/*
Copyright 2019 Travis Ralston
+Copyright 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,42 +16,46 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
import { _t } from "../../../languageHandler";
-import * as sdk from "../../../index";
import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import { Widget } from "matrix-widget-api";
+import { Widget, WidgetKind } from "matrix-widget-api";
import { OIDCState, WidgetPermissionStore } from "../../../stores/widgets/WidgetPermissionStore";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps extends IDialogProps {
+ widget: Widget;
+ widgetKind: WidgetKind;
+ inRoomId?: string;
+}
+
+interface IState {
+ rememberSelection: boolean;
+}
@replaceableComponent("views.dialogs.WidgetOpenIDPermissionsDialog")
-export default class WidgetOpenIDPermissionsDialog extends React.Component {
- static propTypes = {
- onFinished: PropTypes.func.isRequired,
- widget: PropTypes.objectOf(Widget).isRequired,
- widgetKind: PropTypes.string.isRequired, // WidgetKind from widget-api
- inRoomId: PropTypes.string,
- };
-
- constructor() {
- super();
+export default class WidgetOpenIDPermissionsDialog extends React.PureComponent<IProps, IState> {
+ constructor(props: IProps) {
+ super(props);
this.state = {
rememberSelection: false,
};
}
- _onAllow = () => {
- this._onPermissionSelection(true);
+ private onAllow = () => {
+ this.onPermissionSelection(true);
};
- _onDeny = () => {
- this._onPermissionSelection(false);
+ private onDeny = () => {
+ this.onPermissionSelection(false);
};
- _onPermissionSelection(allowed) {
+ private onPermissionSelection(allowed: boolean) {
if (this.state.rememberSelection) {
- console.log(`Remembering ${this.props.widgetId} as allowed=${allowed} for OpenID`);
+ console.log(`Remembering ${this.props.widget.id} as allowed=${allowed} for OpenID`);
WidgetPermissionStore.instance.setOIDCState(
this.props.widget, this.props.widgetKind, this.props.inRoomId,
@@ -61,14 +66,11 @@ export default class WidgetOpenIDPermissionsDialog extends React.Component {
this.props.onFinished(allowed);
}
- _onRememberSelectionChange = (newVal) => {
+ private onRememberSelectionChange = (newVal: boolean) => {
this.setState({ rememberSelection: newVal });
};
- render() {
- const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
- const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
+ public render() {
return (
<BaseDialog
className='mx_WidgetOpenIDPermissionsDialog'
@@ -87,13 +89,13 @@ export default class WidgetOpenIDPermissionsDialog extends React.Component {
</div>
<DialogButtons
primaryButton={_t("Continue")}
- onPrimaryButtonClick={this._onAllow}
- onCancel={this._onDeny}
+ onPrimaryButtonClick={this.onAllow}
+ onCancel={this.onDeny}
additive={
<LabelledToggleSwitch
value={this.state.rememberSelection}
toggleInFront={true}
- onChange={this._onRememberSelectionChange}
+ onChange={this.onRememberSelectionChange}
label={_t("Remember this")} />}
/>
</BaseDialog>
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 0ce9a3a030..75b6890112 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -19,7 +19,7 @@ import React, { ReactHTML } from 'react';
import { Key } from '../../../Keyboard';
import classnames from 'classnames';
-export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element>;
+export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element> | React.FormEvent<Element>;
/**
* children: React's magic prop. Represents all children given to the element.
@@ -39,7 +39,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
tabIndex?: number;
disabled?: boolean;
className?: string;
- onClick(e?: ButtonEvent): void;
+ onClick(e?: ButtonEvent): void | Promise<void>;
}
interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index 8ac41ad1a2..d2a4801a2d 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -25,6 +25,7 @@ import { replaceableComponent } from "../../../utils/replaceableComponent";
interface ITooltipProps extends React.ComponentProps<typeof AccessibleButton> {
title: string;
tooltip?: React.ReactNode;
+ label?: React.ReactNode;
tooltipClassName?: string;
forceHide?: boolean;
yOffset?: number;
@@ -84,7 +85,8 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
aria-label={title}
>
{ children }
- { tip }
+ { this.props.label }
+ { (tooltip || title) && tip }
</AccessibleButton>
);
}
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 74ef178066..a02465d01e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -218,6 +218,7 @@ export default class AppTile extends React.Component {
// Delete the widget from the persisted store for good measure.
PersistedElement.destroyElement(this._persistKey);
+ ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
if (this._sgWidget) this._sgWidget.stop({ forceDestroy: true });
}
@@ -307,7 +308,6 @@ export default class AppTile extends React.Component {
if (this.iframe) {
// Reload iframe
this.iframe.src = this._sgWidget.embedUrl;
- this.setState({});
}
});
}
@@ -333,7 +333,7 @@ export default class AppTile extends React.Component {
// this would only be for content hosted on the same origin as the element client: anything
// hosted on the same origin as the client will get the same access as if you clicked
// a link to it.
- const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox "+
+ const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox " +
"allow-same-origin allow-scripts allow-presentation";
// Additional iframe feature pemissions
@@ -443,25 +443,25 @@ export default class AppTile extends React.Component {
return <React.Fragment>
<div className={appTileClasses} id={this.props.app.id}>
{ this.props.showMenubar &&
- <div className="mx_AppTileMenuBar">
- <span className="mx_AppTileMenuBarTitle" style={{ pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false) }}>
- { this.props.showTitle && this._getTileTitle() }
- </span>
- <span className="mx_AppTileMenuBarWidgets">
- { this.props.showPopout && <AccessibleButton
- className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_popout"
- title={_t('Popout widget')}
- onClick={this._onPopoutWidgetClick}
- /> }
- <ContextMenuButton
- className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_menu"
- label={_t("Options")}
- isExpanded={this.state.menuDisplayed}
- inputRef={this._contextMenuButton}
- onClick={this._onContextMenuClick}
- />
- </span>
- </div> }
+ <div className="mx_AppTileMenuBar">
+ <span className="mx_AppTileMenuBarTitle" style={{ pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false) }}>
+ { this.props.showTitle && this._getTileTitle() }
+ </span>
+ <span className="mx_AppTileMenuBarWidgets">
+ { this.props.showPopout && <AccessibleButton
+ className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_popout"
+ title={_t('Popout widget')}
+ onClick={this._onPopoutWidgetClick}
+ /> }
+ <ContextMenuButton
+ className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_menu"
+ label={_t("Options")}
+ isExpanded={this.state.menuDisplayed}
+ inputRef={this._contextMenuButton}
+ onClick={this._onContextMenuClick}
+ />
+ </span>
+ </div> }
{ appTileBody }
</div>
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index 1f00353aeb..034fc3d49c 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -20,14 +20,21 @@ import BaseDialog from "..//dialogs/BaseDialog";
import DialogButtons from "./DialogButtons";
import classNames from 'classnames';
import AccessibleButton from './AccessibleButton';
-import { getDesktopCapturerSources } from "matrix-js-sdk/src/webrtc/call";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import TabbedView, { Tab, TabLocation } from '../../structures/TabbedView';
-export interface DesktopCapturerSource {
- id: string;
- name: string;
- thumbnailURL;
+export function getDesktopCapturerSources(): Promise<Array<DesktopCapturerSource>> {
+ const options: GetSourcesOptions = {
+ thumbnailSize: {
+ height: 176,
+ width: 312,
+ },
+ types: [
+ "screen",
+ "window",
+ ],
+ };
+ return window.electron.getDesktopCapturerSources(options);
}
export enum Tabs {
@@ -78,7 +85,7 @@ export interface PickerIState {
selectedSource: DesktopCapturerSource | null;
}
export interface PickerIProps {
- onFinished(source: DesktopCapturerSource): void;
+ onFinished(sourceId: string): void;
}
@replaceableComponent("views.elements.DesktopCapturerSourcePicker")
@@ -123,7 +130,7 @@ export default class DesktopCapturerSourcePicker extends React.Component<
};
private onShare = (): void => {
- this.props.onFinished(this.state.selectedSource);
+ this.props.onFinished(this.state.selectedSource.id);
};
private onTabChange = (): void => {
diff --git a/src/components/views/elements/ErrorBoundary.tsx b/src/components/views/elements/ErrorBoundary.tsx
index 03d331bd9f..50ea7d9a56 100644
--- a/src/components/views/elements/ErrorBoundary.tsx
+++ b/src/components/views/elements/ErrorBoundary.tsx
@@ -77,7 +77,7 @@ export default class ErrorBoundary extends React.PureComponent<{}, IState> {
render() {
if (this.state.error) {
- const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
+ const newIssueUrl = "https://github.com/vector-im/element-web/issues/new/choose";
let bugReportSection;
if (SdkConfig.get().bug_report_endpoint_url) {
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index 68a70133e6..a7ebf40c3a 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -25,6 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore";
import { Layout } from "../../../settings/Layout";
import { UIFeature } from "../../../settings/UIFeature";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from './Spinner';
interface IProps {
/**
@@ -45,7 +46,7 @@ interface IProps {
/**
* The ID of the displayed user
*/
- userId: string;
+ userId?: string;
/**
* The display name of the displayed user
@@ -118,13 +119,16 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
}
public render() {
- const event = this.fakeEvent(this.state);
-
const className = classnames(this.props.className, {
"mx_IRCLayout": this.props.layout == Layout.IRC,
"mx_GroupLayout": this.props.layout == Layout.Group,
+ "mx_EventTilePreview_loader": !this.props.userId,
});
+ if (!this.props.userId) return <div className={className}><Spinner /></div>;
+
+ const event = this.fakeEvent(this.state);
+
return <div className={className}>
<EventTile
mxEvent={event}
diff --git a/src/components/views/elements/ImageView.tsx b/src/components/views/elements/ImageView.tsx
index 87f3dab718..7a1efb7a62 100644
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -419,6 +419,7 @@ export default class ImageView extends React.Component<IProps, IState> {
const avatar = (
<MemberAvatar
member={mxEvent.sender}
+ fallbackUserId={mxEvent.getSender()}
width={32}
height={32}
viewUserOnClick={true}
diff --git a/src/components/views/elements/InviteReason.tsx b/src/components/views/elements/InviteReason.tsx
index dff5c7d6bd..865a5be747 100644
--- a/src/components/views/elements/InviteReason.tsx
+++ b/src/components/views/elements/InviteReason.tsx
@@ -16,11 +16,13 @@ limitations under the License.
import classNames from "classnames";
import React from "react";
+import { sanitizedHtmlNode } from "../../../HtmlUtils";
import { _t } from "../../../languageHandler";
import { replaceableComponent } from "../../../utils/replaceableComponent";
interface IProps {
reason: string;
+ htmlReason?: string;
}
interface IState {
@@ -51,7 +53,7 @@ export default class InviteReason extends React.PureComponent<IProps, IState> {
});
return <div className={classes}>
- <div className="mx_InviteReason_reason">{ this.props.reason }</div>
+ <div className="mx_InviteReason_reason">{ this.props.htmlReason ? sanitizedHtmlNode(this.props.htmlReason) : this.props.reason }</div>
<div className="mx_InviteReason_view"
onClick={this.onViewClick}
>
diff --git a/src/components/views/elements/ReplyThread.tsx b/src/components/views/elements/ReplyThread.tsx
index 0eb795e257..d061d52f46 100644
--- a/src/components/views/elements/ReplyThread.tsx
+++ b/src/components/views/elements/ReplyThread.tsx
@@ -19,6 +19,7 @@ import React from 'react';
import { _t } from '../../../languageHandler';
import dis from '../../../dispatcher/dispatcher';
import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { UNSTABLE_ELEMENT_REPLY_IN_THREAD } from "matrix-js-sdk/src/@types/event";
import { makeUserPermalink, RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
import SettingsStore from "../../../settings/SettingsStore";
import { Layout } from "../../../settings/Layout";
@@ -206,15 +207,28 @@ export default class ReplyThread extends React.Component<IProps, IState> {
return { body, html };
}
- public static makeReplyMixIn(ev: MatrixEvent) {
+ public static makeReplyMixIn(ev: MatrixEvent, replyInThread: boolean) {
if (!ev) return {};
- return {
+
+ const replyMixin = {
'm.relates_to': {
'm.in_reply_to': {
'event_id': ev.getId(),
},
},
};
+
+ /**
+ * @experimental
+ * Rendering hint for threads, only attached if true to make
+ * sure that Element does not start sending that property for all events
+ */
+ if (replyInThread) {
+ const inReplyTo = replyMixin['m.relates_to']['m.in_reply_to'];
+ inReplyTo[UNSTABLE_ELEMENT_REPLY_IN_THREAD.name] = replyInThread;
+ }
+
+ return replyMixin;
}
public static makeThread(
diff --git a/src/components/views/elements/ResizeHandle.js b/src/components/views/elements/ResizeHandle.tsx
similarity index 54%
rename from src/components/views/elements/ResizeHandle.js
rename to src/components/views/elements/ResizeHandle.tsx
index 578689b45c..5ca4cadb54 100644
--- a/src/components/views/elements/ResizeHandle.js
+++ b/src/components/views/elements/ResizeHandle.tsx
@@ -1,27 +1,27 @@
import React from 'react'; // eslint-disable-line no-unused-vars
-import PropTypes from 'prop-types';
//see src/resizer for the actual resizing code, this is just the DOM for the resize handle
-const ResizeHandle = (props) => {
+interface IResizeHandleProps {
+ vertical?: boolean;
+ reverse?: boolean;
+ id?: string;
+ passRef?: React.RefObject<HTMLDivElement>;
+}
+
+const ResizeHandle: React.FC<IResizeHandleProps> = ({ vertical, reverse, id, passRef }) => {
const classNames = ['mx_ResizeHandle'];
- if (props.vertical) {
+ if (vertical) {
classNames.push('mx_ResizeHandle_vertical');
} else {
classNames.push('mx_ResizeHandle_horizontal');
}
- if (props.reverse) {
+ if (reverse) {
classNames.push('mx_ResizeHandle_reverse');
}
return (
- <div className={classNames.join(' ')} data-id={props.id}><div /></div>
+ <div ref={passRef} className={classNames.join(' ')} data-id={id}><div /></div>
);
};
-ResizeHandle.propTypes = {
- vertical: PropTypes.bool,
- reverse: PropTypes.bool,
- id: PropTypes.string,
-};
-
export default ResizeHandle;
diff --git a/src/components/views/elements/RoomAliasField.tsx b/src/components/views/elements/RoomAliasField.tsx
index a7676e4214..9c383989b1 100644
--- a/src/components/views/elements/RoomAliasField.tsx
+++ b/src/components/views/elements/RoomAliasField.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, { createRef } from "react";
+import React, { createRef, KeyboardEventHandler } from "react";
import { _t } from '../../../languageHandler';
import withValidation from './Validation';
@@ -28,6 +28,7 @@ interface IProps {
label?: string;
placeholder?: string;
disabled?: boolean;
+ onKeyDown?: KeyboardEventHandler;
onChange?(value: string): void;
}
@@ -70,6 +71,8 @@ export default class RoomAliasField extends React.PureComponent<IProps, IState>
value={this.props.value.substring(1, this.props.value.length - this.props.domain.length - 1)}
maxLength={maxlength}
disabled={this.props.disabled}
+ autoComplete="off"
+ onKeyDown={this.props.onKeyDown}
/>
);
}
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index 0884db7101..9cc995a140 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -173,16 +173,16 @@ class EmojiPicker extends React.Component<IProps, IState> {
};
private onChangeFilter = (filter: string) => {
- filter = filter.toLowerCase(); // filter is case insensitive stored lower-case
+ const lcFilter = filter.toLowerCase().trim(); // filter is case insensitive
for (const cat of this.categories) {
let emojis;
// If the new filter string includes the old filter string, we don't have to re-filter the whole dataset.
- if (filter.includes(this.state.filter)) {
+ if (lcFilter.includes(this.state.filter)) {
emojis = this.memoizedDataByCategory[cat.id];
} else {
emojis = cat.id === "recent" ? this.recentlyUsed : DATA_BY_CATEGORY[cat.id];
}
- emojis = emojis.filter(emoji => this.emojiMatchesFilter(emoji, filter));
+ emojis = emojis.filter(emoji => this.emojiMatchesFilter(emoji, lcFilter));
this.memoizedDataByCategory[cat.id] = emojis;
cat.enabled = emojis.length > 0;
// The setState below doesn't re-render the header and we already have the refs for updateVisibility, so...
@@ -194,9 +194,12 @@ class EmojiPicker extends React.Component<IProps, IState> {
setTimeout(this.updateVisibility, 0);
};
- private emojiMatchesFilter = (emoji: IEmoji, filter: string): boolean =>
- [emoji.annotation, ...emoji.shortcodes, emoji.emoticon, ...emoji.unicode.split(ZERO_WIDTH_JOINER)]
- .some(x => x?.includes(filter));
+ private emojiMatchesFilter = (emoji: IEmoji, filter: string): boolean => {
+ return emoji.annotation.toLowerCase().includes(filter) ||
+ emoji.emoticon?.toLowerCase().includes(filter) ||
+ emoji.shortcodes.some(x => x.toLowerCase().includes(filter)) ||
+ emoji.unicode.split(ZERO_WIDTH_JOINER).includes(filter);
+ };
private onEnterFilter = () => {
const btn = this.bodyRef.current.querySelector<HTMLButtonElement>(".mx_EmojiPicker_item");
diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx
index 8c9a3da060..5f514b8390 100644
--- a/src/components/views/messages/CallEvent.tsx
+++ b/src/components/views/messages/CallEvent.tsx
@@ -17,7 +17,7 @@ limitations under the License.
import React, { createRef } from 'react';
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { _t, _td } from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
import MemberAvatar from '../avatars/MemberAvatar';
import CallEventGrouper, { CallEventGrouperEvent, CustomCallState } from '../../structures/CallEventGrouper';
import AccessibleButton from '../elements/AccessibleButton';
@@ -26,6 +26,7 @@ import InfoTooltip, { InfoTooltipKind } from '../elements/InfoTooltip';
import classNames from 'classnames';
import AccessibleTooltipButton from '../elements/AccessibleTooltipButton';
import { formatCallTime } from "../../../DateUtils";
+import Clock from "../audio_messages/Clock";
const MAX_NON_NARROW_WIDTH = 450 / 70 * 100;
@@ -38,13 +39,9 @@ interface IState {
callState: CallState | CustomCallState;
silenced: boolean;
narrow: boolean;
+ length: number;
}
-const TEXTUAL_STATES: Map<CallState | CustomCallState, string> = new Map([
- [CallState.Connected, _td("Connected")],
- [CallState.Connecting, _td("Connecting")],
-]);
-
export default class CallEvent extends React.PureComponent<IProps, IState> {
private wrapperElement = createRef<HTMLDivElement>();
private resizeObserver: ResizeObserver;
@@ -56,12 +53,14 @@ export default class CallEvent extends React.PureComponent<IProps, IState> {
callState: this.props.callEventGrouper.state,
silenced: false,
narrow: false,
+ length: 0,
};
}
componentDidMount() {
this.props.callEventGrouper.addListener(CallEventGrouperEvent.StateChanged, this.onStateChanged);
this.props.callEventGrouper.addListener(CallEventGrouperEvent.SilencedChanged, this.onSilencedChanged);
+ this.props.callEventGrouper.addListener(CallEventGrouperEvent.LengthChanged, this.onLengthChanged);
this.resizeObserver = new ResizeObserver(this.resizeObserverCallback);
this.resizeObserver.observe(this.wrapperElement.current);
@@ -70,10 +69,15 @@ export default class CallEvent extends React.PureComponent<IProps, IState> {
componentWillUnmount() {
this.props.callEventGrouper.removeListener(CallEventGrouperEvent.StateChanged, this.onStateChanged);
this.props.callEventGrouper.removeListener(CallEventGrouperEvent.SilencedChanged, this.onSilencedChanged);
+ this.props.callEventGrouper.removeListener(CallEventGrouperEvent.LengthChanged, this.onLengthChanged);
this.resizeObserver.disconnect();
}
+ private onLengthChanged = (length: number): void => {
+ this.setState({ length });
+ };
+
private resizeObserverCallback = (entries: ResizeObserverEntry[]): void => {
const wrapperElementEntry = entries.find((entry) => entry.target === this.wrapperElement.current);
if (!wrapperElementEntry) return;
@@ -214,10 +218,17 @@ export default class CallEvent extends React.PureComponent<IProps, IState> {
</div>
);
}
- if (Array.from(TEXTUAL_STATES.keys()).includes(state)) {
+ if (state === CallState.Connected) {
return (
<div className="mx_CallEvent_content">
- { TEXTUAL_STATES.get(state) }
+ <Clock seconds={this.state.length} />
+ </div>
+ );
+ }
+ if (state === CallState.Connecting) {
+ return (
+ <div className="mx_CallEvent_content">
+ { _t("Connecting") }
</div>
);
}
diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
index 0f716ed010..8f352610e0 100644
--- a/src/components/views/messages/EncryptionEvent.tsx
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -16,26 +16,38 @@ limitations under the License.
import React, { forwardRef, useContext } from 'react';
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IRoomEncryption } from "matrix-js-sdk/src/crypto/RoomList";
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import EventTileBubble from "./EventTileBubble";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import DMRoomMap from "../../../utils/DMRoomMap";
+import { objectHasDiff } from "../../../utils/objects";
interface IProps {
mxEvent: MatrixEvent;
}
+const ALGORITHM = "m.megolm.v1.aes-sha2";
+
const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({ mxEvent }, ref) => {
const cli = useContext(MatrixClientContext);
const roomId = mxEvent.getRoomId();
const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId);
- if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
+ const prevContent = mxEvent.getPrevContent() as IRoomEncryption;
+ const content = mxEvent.getContent<IRoomEncryption>();
+
+ // if no change happened then skip rendering this, a shallow check is enough as all known fields are top-level.
+ if (!objectHasDiff(prevContent, content)) return null; // nop
+
+ if (content.algorithm === ALGORITHM && isRoomEncrypted) {
let subtitle: string;
const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId);
- if (dmPartner) {
+ if (prevContent.algorithm === ALGORITHM) {
+ subtitle = _t("Some encryption parameters have been changed.");
+ } else if (dmPartner) {
const displayName = cli?.getRoom(roomId)?.getMember(dmPartner)?.rawDisplayName || dmPartner;
subtitle = _t("Messages here are end-to-end encrypted. " +
"Verify %(displayName)s in their profile - tap on their avatar.", { displayName });
@@ -49,7 +61,9 @@ const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({ mxEvent }, ref) =>
title={_t("Encryption enabled")}
subtitle={subtitle}
/>;
- } else if (isRoomEncrypted) {
+ }
+
+ if (isRoomEncrypted) {
return <EventTileBubble
className="mx_cryptoEvent mx_cryptoEvent_icon"
title={_t("Encryption enabled")}
diff --git a/src/components/views/messages/MAudioBody.tsx b/src/components/views/messages/MAudioBody.tsx
index 288ad16d88..1975fe8d42 100644
--- a/src/components/views/messages/MAudioBody.tsx
+++ b/src/components/views/messages/MAudioBody.tsx
@@ -24,6 +24,8 @@ import { IMediaEventContent } from "../../../customisations/models/IMediaEventCo
import MFileBody from "./MFileBody";
import { IBodyProps } from "./IBodyProps";
import { PlaybackManager } from "../../../audio/PlaybackManager";
+import { isVoiceMessage } from "../../../utils/EventUtils";
+import { PlaybackQueue } from "../../../audio/PlaybackQueue";
interface IState {
error?: Error;
@@ -67,6 +69,10 @@ export default class MAudioBody extends React.PureComponent<IBodyProps, IState>
playback.clockInfo.populatePlaceholdersFrom(this.props.mxEvent);
this.setState({ playback });
+ if (isVoiceMessage(this.props.mxEvent)) {
+ PlaybackQueue.forRoom(this.props.mxEvent.getRoomId()).unsortedEnqueue(this.props.mxEvent, playback);
+ }
+
// Note: the components later on will handle preparing the Playback class for us.
}
diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx
index e7b77b731f..cb52155f42 100644
--- a/src/components/views/messages/MImageBody.tsx
+++ b/src/components/views/messages/MImageBody.tsx
@@ -47,6 +47,7 @@ interface IState {
};
hover: boolean;
showImage: boolean;
+ placeholder: 'no-image' | 'blurhash';
}
@replaceableComponent("views.messages.MImageBody")
@@ -54,6 +55,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
static contextType = MatrixClientContext;
private unmounted = true;
private image = createRef<HTMLImageElement>();
+ private timeout?: number;
constructor(props: IBodyProps) {
super(props);
@@ -68,6 +70,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
loadedImageDimensions: null,
hover: false,
showImage: SettingsStore.getValue("showImages"),
+ placeholder: 'no-image',
};
}
@@ -126,7 +129,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
private onImageEnter = (e: React.MouseEvent<HTMLImageElement>): void => {
this.setState({ hover: true });
- if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
+ if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
return;
}
const imgElement = e.currentTarget;
@@ -136,7 +139,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
private onImageLeave = (e: React.MouseEvent<HTMLImageElement>): void => {
this.setState({ hover: false });
- if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
+ if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
return;
}
const imgElement = e.currentTarget;
@@ -144,12 +147,14 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
};
private onImageError = (): void => {
+ this.clearBlurhashTimeout();
this.setState({
imgError: true,
});
};
private onImageLoad = (): void => {
+ this.clearBlurhashTimeout();
this.props.onHeightChanged();
let loadedImageDimensions;
@@ -265,6 +270,13 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
}
}
+ private clearBlurhashTimeout() {
+ if (this.timeout) {
+ clearTimeout(this.timeout);
+ this.timeout = undefined;
+ }
+ }
+
componentDidMount() {
this.unmounted = false;
this.context.on('sync', this.onClientSync);
@@ -277,11 +289,24 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
this.downloadImage();
this.setState({ showImage: true });
} // else don't download anything because we don't want to display anything.
+
+ // Add a 150ms timer for blurhash to first appear.
+ if (this.props.mxEvent.getContent().info?.[BLURHASH_FIELD]) {
+ this.clearBlurhashTimeout();
+ this.timeout = setTimeout(() => {
+ if (!this.state.imgLoaded || !this.state.imgError) {
+ this.setState({
+ placeholder: 'blurhash',
+ });
+ }
+ }, 150);
+ }
}
componentWillUnmount() {
this.unmounted = true;
this.context.removeListener('sync', this.onClientSync);
+ this.clearBlurhashTimeout();
}
protected messageContent(
@@ -374,13 +399,13 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
showPlaceholder = false; // because we're hiding the image, so don't show the placeholder.
}
- if (this.isGif() && !SettingsStore.getValue("autoplayGifsAndVideos") && !this.state.hover) {
+ if (this.isGif() && !SettingsStore.getValue("autoplayGifs") && !this.state.hover) {
gifLabel = <p className="mx_MImageBody_gifLabel">GIF</p>;
}
const classes = classNames({
'mx_MImageBody_thumbnail': true,
- 'mx_MImageBody_thumbnail--blurhash': this.props.mxEvent.getContent().info[BLURHASH_FIELD],
+ 'mx_MImageBody_thumbnail--blurhash': this.props.mxEvent.getContent().info?.[BLURHASH_FIELD],
});
// This has incredibly broken types.
@@ -433,8 +458,15 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
// Overidden by MStickerBody
protected getPlaceholder(width: number, height: number): JSX.Element {
- const blurhash = this.props.mxEvent.getContent().info[BLURHASH_FIELD];
- if (blurhash) return <Blurhash className="mx_Blurhash" hash={blurhash} width={width} height={height} />;
+ const blurhash = this.props.mxEvent.getContent().info?.[BLURHASH_FIELD];
+
+ if (blurhash) {
+ if (this.state.placeholder === 'no-image') {
+ return <div className="mx_no-image-placeholder" style={{ width: width, height: height }} />;
+ } else if (this.state.placeholder === 'blurhash') {
+ return <Blurhash className="mx_Blurhash" hash={blurhash} width={width} height={height} />;
+ }
+ }
return (
<InlineSpinner w={32} h={32} />
);
@@ -467,7 +499,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
const contentUrl = this.getContentUrl();
let thumbUrl;
- if (this.isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) {
+ if (this.isGif() && SettingsStore.getValue("autoplayGifs")) {
thumbUrl = contentUrl;
} else {
thumbUrl = this.getThumbUrl();
diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx
index 61be246ed9..365426245d 100644
--- a/src/components/views/messages/MStickerBody.tsx
+++ b/src/components/views/messages/MStickerBody.tsx
@@ -43,7 +43,7 @@ export default class MStickerBody extends MImageBody {
// Placeholder to show in place of the sticker image if
// img onLoad hasn't fired yet.
protected getPlaceholder(width: number, height: number): JSX.Element {
- if (this.props.mxEvent.getContent().info[BLURHASH_FIELD]) return super.getPlaceholder(width, height);
+ if (this.props.mxEvent.getContent().info?.[BLURHASH_FIELD]) return super.getPlaceholder(width, height);
return <img src={require("../../../../res/img/icons-show-stickers.svg")} width="75" height="75" />;
}
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 77c7ebacda..de1915299c 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -145,7 +145,7 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
}
async componentDidMount() {
- const autoplay = SettingsStore.getValue("autoplayGifsAndVideos") as boolean;
+ const autoplay = SettingsStore.getValue("autoplayVideo") as boolean;
this.loadBlurhash();
if (this.props.mediaEventHelper.media.isEncrypted && this.state.decryptedUrl === null) {
@@ -209,7 +209,7 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
render() {
const content = this.props.mxEvent.getContent();
- const autoplay = SettingsStore.getValue("autoplayGifsAndVideos");
+ const autoplay = SettingsStore.getValue("autoplayVideo");
if (this.state.error !== null) {
return (
diff --git a/src/components/views/messages/MVoiceOrAudioBody.tsx b/src/components/views/messages/MVoiceOrAudioBody.tsx
index 2d78ea192e..5a7e34b8a1 100644
--- a/src/components/views/messages/MVoiceOrAudioBody.tsx
+++ b/src/components/views/messages/MVoiceOrAudioBody.tsx
@@ -19,14 +19,12 @@ import MAudioBody from "./MAudioBody";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import MVoiceMessageBody from "./MVoiceMessageBody";
import { IBodyProps } from "./IBodyProps";
+import { isVoiceMessage } from "../../../utils/EventUtils";
@replaceableComponent("views.messages.MVoiceOrAudioBody")
export default class MVoiceOrAudioBody extends React.PureComponent<IBodyProps> {
public render() {
- // MSC2516 is a legacy identifier. See https://github.com/matrix-org/matrix-doc/pull/3245
- const isVoiceMessage = !!this.props.mxEvent.getContent()['org.matrix.msc2516.voice']
- || !!this.props.mxEvent.getContent()['org.matrix.msc3245.voice'];
- if (isVoiceMessage) {
+ if (isVoiceMessage(this.props.mxEvent)) {
return <MVoiceMessageBody {...this.props} />;
} else {
return <MAudioBody {...this.props} />;
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.tsx
similarity index 65%
rename from src/components/views/messages/MessageActionBar.js
rename to src/components/views/messages/MessageActionBar.tsx
index 7fe0eca697..f76fa32ddc 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -17,12 +17,13 @@ limitations under the License.
*/
import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { EventStatus } from 'matrix-js-sdk/src/models/event';
+import { MatrixEvent, EventStatus } from 'matrix-js-sdk/src/models/event';
import { _t } from '../../../languageHandler';
import * as sdk from '../../../index';
import dis from '../../../dispatcher/dispatcher';
+import { Action } from '../../../dispatcher/actions';
+import { RightPanelPhases } from '../../../stores/RightPanelStorePhases';
import { aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu } from '../../structures/ContextMenu';
import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
import RoomContext from "../../../contexts/RoomContext";
@@ -34,48 +35,66 @@ import Resend from "../../../Resend";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import { MediaEventHelper } from "../../../utils/MediaEventHelper";
import DownloadActionButton from "./DownloadActionButton";
+import SettingsStore from '../../../settings/SettingsStore';
+import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
+import ReplyThread from '../elements/ReplyThread';
-const OptionsButton = ({ mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange }) => {
- const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
- const [onFocus, isActive, ref] = useRovingTabIndex(button);
- useEffect(() => {
- onFocusChange(menuDisplayed);
- }, [onFocusChange, menuDisplayed]);
+interface IOptionsButtonProps {
+ mxEvent: MatrixEvent;
+ getTile: () => any; // TODO: FIXME, haven't figured out what the return type is here
+ getReplyThread: () => ReplyThread;
+ permalinkCreator: RoomPermalinkCreator;
+ onFocusChange: (menuDisplayed: boolean) => void;
+}
- let contextMenu;
- if (menuDisplayed) {
- const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
+const OptionsButton: React.FC<IOptionsButtonProps> =
+ ({ mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange }) => {
+ const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
+ const [onFocus, isActive, ref] = useRovingTabIndex(button);
+ useEffect(() => {
+ onFocusChange(menuDisplayed);
+ }, [onFocusChange, menuDisplayed]);
- const tile = getTile && getTile();
- const replyThread = getReplyThread && getReplyThread();
+ let contextMenu;
+ if (menuDisplayed) {
+ const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
- const buttonRect = button.current.getBoundingClientRect();
- contextMenu = <MessageContextMenu
- {...aboveLeftOf(buttonRect)}
- mxEvent={mxEvent}
- permalinkCreator={permalinkCreator}
- eventTileOps={tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined}
- collapseReplyThread={replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined}
- onFinished={closeMenu}
- />;
- }
+ const tile = getTile && getTile();
+ const replyThread = getReplyThread && getReplyThread();
- return <React.Fragment>
- <ContextMenuTooltipButton
- className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
- title={_t("Options")}
- onClick={openMenu}
- isExpanded={menuDisplayed}
- inputRef={ref}
- onFocus={onFocus}
- tabIndex={isActive ? 0 : -1}
- />
+ const buttonRect = button.current.getBoundingClientRect();
+ contextMenu = <MessageContextMenu
+ {...aboveLeftOf(buttonRect)}
+ mxEvent={mxEvent}
+ permalinkCreator={permalinkCreator}
+ eventTileOps={tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined}
+ collapseReplyThread={replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined}
+ onFinished={closeMenu}
+ />;
+ }
- { contextMenu }
- </React.Fragment>;
-};
+ return <React.Fragment>
+ <ContextMenuTooltipButton
+ className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
+ title={_t("Options")}
+ onClick={openMenu}
+ isExpanded={menuDisplayed}
+ inputRef={ref}
+ onFocus={onFocus}
+ tabIndex={isActive ? 0 : -1}
+ />
-const ReactButton = ({ mxEvent, reactions, onFocusChange }) => {
+ { contextMenu }
+ </React.Fragment>;
+ };
+
+interface IReactButtonProps {
+ mxEvent: MatrixEvent;
+ reactions: any; // TODO: types
+ onFocusChange: (menuDisplayed: boolean) => void;
+}
+
+const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusChange }) => {
const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
const [onFocus, isActive, ref] = useRovingTabIndex(button);
useEffect(() => {
@@ -106,21 +125,21 @@ const ReactButton = ({ mxEvent, reactions, onFocusChange }) => {
</React.Fragment>;
};
+interface IMessageActionBarProps {
+ mxEvent: MatrixEvent;
+ // The Relations model from the JS SDK for reactions to `mxEvent`
+ reactions?: any; // TODO: types
+ permalinkCreator?: RoomPermalinkCreator;
+ getTile: () => any; // TODO: FIXME, haven't figured out what the return type is here
+ getReplyThread?: () => ReplyThread;
+ onFocusChange?: (menuDisplayed: boolean) => void;
+}
+
@replaceableComponent("views.messages.MessageActionBar")
-export default class MessageActionBar extends React.PureComponent {
- static propTypes = {
- mxEvent: PropTypes.object.isRequired,
- // The Relations model from the JS SDK for reactions to `mxEvent`
- reactions: PropTypes.object,
- permalinkCreator: PropTypes.object,
- getTile: PropTypes.func,
- getReplyThread: PropTypes.func,
- onFocusChange: PropTypes.func,
- };
+export default class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
+ public static contextType = RoomContext;
- static contextType = RoomContext;
-
- componentDidMount() {
+ public componentDidMount(): void {
if (this.props.mxEvent.status && this.props.mxEvent.status !== EventStatus.SENT) {
this.props.mxEvent.on("Event.status", this.onSent);
}
@@ -134,43 +153,54 @@ export default class MessageActionBar extends React.PureComponent {
this.props.mxEvent.on("Event.beforeRedaction", this.onBeforeRedaction);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
this.props.mxEvent.off("Event.status", this.onSent);
this.props.mxEvent.off("Event.decrypted", this.onDecrypted);
this.props.mxEvent.off("Event.beforeRedaction", this.onBeforeRedaction);
}
- onDecrypted = () => {
+ private onDecrypted = (): void => {
// When an event decrypts, it is likely to change the set of available
// actions, so we force an update to check again.
this.forceUpdate();
};
- onBeforeRedaction = () => {
+ private onBeforeRedaction = (): void => {
// When an event is redacted, we can't edit it so update the available actions.
this.forceUpdate();
};
- onSent = () => {
+ private onSent = (): void => {
// When an event is sent and echoed the possible actions change.
this.forceUpdate();
};
- onFocusChange = (focused) => {
+ private onFocusChange = (focused: boolean): void => {
if (!this.props.onFocusChange) {
return;
}
this.props.onFocusChange(focused);
};
- onReplyClick = (ev) => {
+ private onReplyClick = (ev: React.MouseEvent): void => {
dis.dispatch({
action: 'reply_to_event',
event: this.props.mxEvent,
});
};
- onEditClick = (ev) => {
+ private onThreadClick = (): void => {
+ dis.dispatch({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.ThreadView,
+ allowClose: false,
+ refireParams: {
+ event: this.props.mxEvent,
+ },
+ });
+ };
+
+ private onEditClick = (ev: React.MouseEvent): void => {
dis.dispatch({
action: 'edit_event',
event: this.props.mxEvent,
@@ -186,7 +216,7 @@ export default class MessageActionBar extends React.PureComponent {
* @param {Function} fn The execution function.
* @param {Function} checkFn The test function.
*/
- runActionOnFailedEv(fn, checkFn) {
+ private runActionOnFailedEv(fn: (ev: MatrixEvent) => void, checkFn?: (ev: MatrixEvent) => boolean): void {
if (!checkFn) checkFn = () => true;
const mxEvent = this.props.mxEvent;
@@ -201,18 +231,18 @@ export default class MessageActionBar extends React.PureComponent {
}
}
- onResendClick = (ev) => {
+ private onResendClick = (ev: React.MouseEvent): void => {
this.runActionOnFailedEv((tarEv) => Resend.resend(tarEv));
};
- onCancelClick = (ev) => {
+ private onCancelClick = (ev: React.MouseEvent): void => {
this.runActionOnFailedEv(
(tarEv) => Resend.removeFromQueue(tarEv),
(testEv) => canCancel(testEv.status),
);
};
- render() {
+ public render(): JSX.Element {
const toolbarOpts = [];
if (canEditContent(this.props.mxEvent)) {
toolbarOpts.push(<RovingAccessibleTooltipButton
@@ -235,7 +265,7 @@ export default class MessageActionBar extends React.PureComponent {
const editStatus = mxEvent.replacingEvent() && mxEvent.replacingEvent().status;
const redactStatus = mxEvent.localRedactionEvent() && mxEvent.localRedactionEvent().status;
const allowCancel = canCancel(mxEvent.status) || canCancel(editStatus) || canCancel(redactStatus);
- const isFailed = [mxEvent.status, editStatus, redactStatus].includes("not_sent");
+ const isFailed = [mxEvent.status, editStatus, redactStatus].includes(EventStatus.NOT_SENT);
if (allowCancel && isFailed) {
// The resend button needs to appear ahead of the edit button, so insert to the
// start of the opts
@@ -254,12 +284,22 @@ export default class MessageActionBar extends React.PureComponent {
// The only catch is we do the reply button first so that we can make sure the react
// button is the very first button without having to do length checks for `splice()`.
if (this.context.canReply) {
- toolbarOpts.splice(0, 0, <RovingAccessibleTooltipButton
- className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
- title={_t("Reply")}
- onClick={this.onReplyClick}
- key="reply"
- />);
+ toolbarOpts.splice(0, 0, <>
+ <RovingAccessibleTooltipButton
+ className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
+ title={_t("Reply")}
+ onClick={this.onReplyClick}
+ key="reply"
+ />
+ { SettingsStore.getValue("feature_thread") && (
+ <RovingAccessibleTooltipButton
+ className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
+ title={_t("Thread")}
+ onClick={this.onThreadClick}
+ key="thread"
+ />
+ ) }
+ </>);
}
if (this.context.canReact) {
toolbarOpts.splice(0, 0, <ReactButton
diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx
index b1c8d427bf..8beb089b38 100644
--- a/src/components/views/right_panel/EncryptionPanel.tsx
+++ b/src/components/views/right_panel/EncryptionPanel.tsx
@@ -57,7 +57,7 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
// state to show a spinner immediately after clicking "start verification",
// before we have a request
const [isRequesting, setRequesting] = useState(false);
- const [phase, setPhase] = useState(request && request.phase);
+ const [phase, setPhase] = useState(request?.phase);
useEffect(() => {
setRequest(verificationRequest);
if (verificationRequest) {
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 047448d925..00d52831c7 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -220,6 +220,13 @@ const onRoomFilesClick = () => {
});
};
+const onRoomThreadsClick = () => {
+ defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.ThreadPanel,
+ });
+};
+
const onRoomSettingsClick = () => {
defaultDispatcher.dispatch({ action: "open_room_settings" });
};
@@ -273,6 +280,11 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
<Button className="mx_RoomSummaryCard_icon_files" onClick={onRoomFilesClick}>
{ _t("Show files") }
</Button>
+ { SettingsStore.getValue("feature_thread") && (
+ <Button className="mx_RoomSummaryCard_icon_threads" onClick={onRoomThreadsClick}>
+ { _t("Show threads") }
+ </Button>
+ ) }
<Button className="mx_RoomSummaryCard_icon_share" onClick={onShareRoomClick}>
{ _t("Share room") }
</Button>
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 138f5bf9fe..4446ee1415 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -428,7 +428,7 @@ const UserOptionsSection: React.FC<{
let directMessageButton;
if (!isMe) {
directMessageButton = (
- <AccessibleButton onClick={() => openDMForUser(cli, member.userId)} className="mx_UserInfo_field">
+ <AccessibleButton onClick={() => { openDMForUser(cli, member.userId); }} className="mx_UserInfo_field">
{ _t('Direct message') }
</AccessibleButton>
);
@@ -826,7 +826,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
if (canAffectUser && me.powerLevel >= banPowerLevel) {
banButton = <BanToggleButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
}
- if (canAffectUser && me.powerLevel >= editPowerLevel) {
+ if (canAffectUser && me.powerLevel >= editPowerLevel && !room.isSpaceRoom()) {
muteButton = (
<MuteToggleButton
member={member}
@@ -1278,7 +1278,9 @@ const BasicUserInfo: React.FC<{
// hide the Roles section for DMs as it doesn't make sense there
if (!DMRoomMap.shared().getUserIdForRoomId((member as RoomMember).roomId)) {
memberDetails = <div className="mx_UserInfo_container">
- <h3>{ _t("Role") }</h3>
+ <h3>{ _t("Role in <RoomName/>", {}, {
+ RoomName: () => <b>{ room.name }</b>,
+ }) }</h3>
<PowerLevelSection
powerLevels={powerLevels}
user={member as RoomMember}
@@ -1573,11 +1575,12 @@ const UserInfo: React.FC<IProps> = ({
// We have no previousPhase for when viewing a UserInfo from a Group or without a Room at this time
if (room && phase === RightPanelPhases.EncryptionPanel) {
previousPhase = RightPanelPhases.RoomMemberInfo;
- refireParams = { member: member };
+ refireParams = { member };
+ } else if (room?.isSpaceRoom() && SpaceStore.spacesEnabled) {
+ previousPhase = previousPhase = RightPanelPhases.SpaceMemberList;
+ refireParams = { space: room };
} else if (room) {
- previousPhase = previousPhase = SpaceStore.spacesEnabled && room.isSpaceRoom()
- ? RightPanelPhases.SpaceMemberList
- : RightPanelPhases.RoomMemberList;
+ previousPhase = RightPanelPhases.RoomMemberList;
}
const onEncryptionPanelClose = () => {
diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx
index 395bdc21e0..a29bdea90b 100644
--- a/src/components/views/right_panel/VerificationPanel.tsx
+++ b/src/components/views/right_panel/VerificationPanel.tsx
@@ -29,43 +29,27 @@ import VerificationQRCode from "../elements/crypto/VerificationQRCode";
import { _t } from "../../../languageHandler";
import SdkConfig from "../../../SdkConfig";
import E2EIcon from "../rooms/E2EIcon";
-import {
- PHASE_READY,
- PHASE_DONE,
- PHASE_STARTED,
- PHASE_CANCELLED,
-} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { Phase } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
import Spinner from "../elements/Spinner";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import AccessibleButton from "../elements/AccessibleButton";
import VerificationShowSas from "../verification/VerificationShowSas";
-// XXX: Should be defined in matrix-js-sdk
-enum VerificationPhase {
- PHASE_UNSENT,
- PHASE_REQUESTED,
- PHASE_READY,
- PHASE_DONE,
- PHASE_STARTED,
- PHASE_CANCELLED,
-}
-
interface IProps {
layout: string;
request: VerificationRequest;
member: RoomMember | User;
- phase: VerificationPhase;
+ phase: Phase;
onClose: () => void;
isRoomEncrypted: boolean;
inDialog: boolean;
- key: number;
}
interface IState {
- sasEvent?: SAS;
+ sasEvent?: SAS["sasEvent"];
emojiButtonClicked?: boolean;
reciprocateButtonClicked?: boolean;
- reciprocateQREvent?: ReciprocateQRCode;
+ reciprocateQREvent?: ReciprocateQRCode["reciprocateQREvent"];
}
@replaceableComponent("views.right_panel.VerificationPanel")
@@ -321,9 +305,9 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
const displayName = (member as User).displayName || (member as RoomMember).name || member.userId;
switch (phase) {
- case PHASE_READY:
+ case Phase.Ready:
return this.renderQRPhase();
- case PHASE_STARTED:
+ case Phase.Started:
switch (request.chosenMethod) {
case verificationMethods.RECIPROCATE_QR_CODE:
return this.renderQRReciprocatePhase();
@@ -346,9 +330,9 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
default:
return null;
}
- case PHASE_DONE:
+ case Phase.Done:
return this.renderVerifiedPhase();
- case PHASE_CANCELLED:
+ case Phase.Cancelled:
return this.renderCancelledPhase();
}
console.error("VerificationPanel unhandled phase:", phase);
@@ -375,7 +359,8 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
private updateVerifierState = () => {
const { request } = this.props;
- const { sasEvent, reciprocateQREvent } = request.verifier;
+ const sasEvent = (request.verifier as SAS).sasEvent;
+ const reciprocateQREvent = (request.verifier as ReciprocateQRCode).reciprocateQREvent;
request.verifier.off('show_sas', this.updateVerifierState);
request.verifier.off('show_reciprocate_qr', this.updateVerifierState);
this.setState({ sasEvent, reciprocateQREvent });
@@ -402,7 +387,8 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
const { request } = this.props;
request.on("change", this.onRequestChange);
if (request.verifier) {
- const { sasEvent, reciprocateQREvent } = request.verifier;
+ const sasEvent = (request.verifier as SAS).sasEvent;
+ const reciprocateQREvent = (request.verifier as ReciprocateQRCode).reciprocateQREvent;
this.setState({ sasEvent, reciprocateQREvent });
}
this.onRequestChange();
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 48f2e2a39b..d83e2e964a 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -50,7 +50,8 @@ import { AutocompleteAction, getKeyBindingsManager, MessageComposerAction } from
import { replaceableComponent } from "../../../utils/replaceableComponent";
// matches emoticons which follow the start of a line or whitespace
-const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
+const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s|:^$');
+export const REGEX_EMOTICON = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')$');
const IS_MAC = navigator.platform.indexOf("Mac") !== -1;
@@ -161,7 +162,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
}
}
- private replaceEmoticon = (caretPosition: DocumentPosition): number => {
+ public replaceEmoticon(caretPosition: DocumentPosition, regex: RegExp): number {
const { model } = this.props;
const range = model.startRange(caretPosition);
// expand range max 8 characters backwards from caretPosition,
@@ -170,9 +171,9 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
range.expandBackwardsWhile((index, offset) => {
const part = model.parts[index];
n -= 1;
- return n >= 0 && (part.type === Type.Plain || part.type === Type.PillCandidate);
+ return n >= 0 && [Type.Plain, Type.PillCandidate, Type.Newline].includes(part.type);
});
- const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(range.text);
+ const emoticonMatch = regex.exec(range.text);
if (emoticonMatch) {
const query = emoticonMatch[1].replace("-", "");
// try both exact match and lower-case, this means that xd won't match xD but :P will match :p
@@ -180,18 +181,23 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
if (data) {
const { partCreator } = model;
- const hasPrecedingSpace = emoticonMatch[0][0] === " ";
+ const moveStart = emoticonMatch[0][0] === " " ? 1 : 0;
+ const moveEnd = emoticonMatch[0].length - emoticonMatch.length - moveStart;
+
// we need the range to only comprise of the emoticon
// because we'll replace the whole range with an emoji,
// so move the start forward to the start of the emoticon.
// Take + 1 because index is reported without the possible preceding space.
- range.moveStart(emoticonMatch.index + (hasPrecedingSpace ? 1 : 0));
+ range.moveStartForwards(emoticonMatch.index + moveStart);
+ // and move end backwards so that we don't replace the trailing space/newline
+ range.moveEndBackwards(moveEnd);
+
// this returns the amount of added/removed characters during the replace
// so the caret position can be adjusted.
- return range.replace([partCreator.plain(data.unicode + " ")]);
+ return range.replace([partCreator.plain(data.unicode)]);
}
}
- };
+ }
private updateEditorState = (selection: Caret, inputType?: string, diff?: IDiff): void => {
renderModel(this.editorRef.current, this.props.model);
@@ -607,8 +613,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
};
private configureEmoticonAutoReplace = (): void => {
- const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
- this.props.model.setTransformCallback(shouldReplace ? this.replaceEmoticon : null);
+ this.props.model.setTransformCallback(this.transform);
};
private configureShouldShowPillAvatar = (): void => {
@@ -621,6 +626,11 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
this.setState({ surroundWith });
};
+ private transform = (documentPosition: DocumentPosition): void => {
+ const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
+ if (shouldReplace) this.replaceEmoticon(documentPosition, REGEX_EMOTICON_WHITESPACE);
+ };
+
componentWillUnmount() {
document.removeEventListener("selectionchange", this.onSelectionChange);
this.editorRef.current.removeEventListener("input", this.onInput, true);
diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
index b7e067ee93..7a3767deb7 100644
--- a/src/components/views/rooms/EditMessageComposer.tsx
+++ b/src/components/views/rooms/EditMessageComposer.tsx
@@ -43,11 +43,6 @@ import QuestionDialog from "../dialogs/QuestionDialog";
import { ActionPayload } from "../../../dispatcher/payloads";
import AccessibleButton from '../elements/AccessibleButton';
-function eventIsReply(mxEvent: MatrixEvent): boolean {
- const relatesTo = mxEvent.getContent()["m.relates_to"];
- return !!(relatesTo && relatesTo["m.in_reply_to"]);
-}
-
function getHtmlReplyFallback(mxEvent: MatrixEvent): string {
const html = mxEvent.getContent().formatted_body;
if (!html) {
@@ -72,7 +67,7 @@ function createEditContent(model: EditorModel, editedEvent: MatrixEvent): IConte
if (isEmote) {
model = stripEmoteCommand(model);
}
- const isReply = eventIsReply(editedEvent);
+ const isReply = !!editedEvent.replyEventId;
let plainPrefix = "";
let htmlPrefix = "";
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index c97b28b368..cd4d7e39f2 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -21,6 +21,7 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event";
import { Relations } from "matrix-js-sdk/src/models/relations";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { Thread } from 'matrix-js-sdk/src/models/thread';
import ReplyThread from "../elements/ReplyThread";
import { _t } from '../../../languageHandler';
@@ -55,6 +56,8 @@ import ReadReceiptMarker from "./ReadReceiptMarker";
import MessageActionBar from "../messages/MessageActionBar";
import ReactionsRow from '../messages/ReactionsRow';
import { getEventDisplayInfo } from '../../../utils/EventUtils';
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
+import SettingsStore from "../../../settings/SettingsStore";
const eventTileTypes = {
[EventType.RoomMessage]: 'messages.MessageEvent',
@@ -240,6 +243,7 @@ interface IProps {
// opaque readreceipt info for each userId; used by ReadReceiptMarker
// to manage its animations. Should be an empty object when the room
// first loads
+ // TODO: Proper typing for RR info
readReceiptMap?: any;
// A function which is used to check if the parent panel is being
@@ -299,6 +303,9 @@ interface IProps {
// whether or not to display the sender
hideSender?: boolean;
+
+ // whether or not to display thread info
+ showThreadInfo?: boolean;
}
interface IState {
@@ -315,6 +322,8 @@ interface IState {
reactions: Relations;
hover: boolean;
+
+ thread?: Thread;
}
@replaceableComponent("views.rooms.EventTile")
@@ -351,6 +360,8 @@ export default class EventTile extends React.Component<IProps, IState> {
reactions: this.getReactions(),
hover: false,
+
+ thread: this.props.mxEvent?.getThread(),
};
// don't do RR animations until we are mounted
@@ -451,8 +462,20 @@ export default class EventTile extends React.Component<IProps, IState> {
client.on("Room.receipt", this.onRoomReceipt);
this.isListeningForReceipts = true;
}
+
+ if (SettingsStore.getValue("feature_thread")) {
+ this.props.mxEvent.once("Thread.ready", this.updateThread);
+ this.props.mxEvent.on("Thread.update", this.updateThread);
+ }
}
+ private updateThread = (thread) => {
+ this.setState({
+ thread,
+ });
+ this.forceUpdate();
+ };
+
// TODO: [REACT-WARNING] Replace with appropriate lifecycle event
// eslint-disable-next-line
UNSAFE_componentWillReceiveProps(nextProps) {
@@ -463,7 +486,7 @@ export default class EventTile extends React.Component<IProps, IState> {
}
}
- shouldComponentUpdate(nextProps, nextState) {
+ shouldComponentUpdate(nextProps, nextState, nextContext) {
if (objectHasDiff(this.state, nextState)) {
return true;
}
@@ -491,6 +514,43 @@ export default class EventTile extends React.Component<IProps, IState> {
}
}
+ private renderThreadInfo(): React.ReactNode {
+ if (!SettingsStore.getValue("feature_thread")) {
+ return null;
+ }
+
+ const thread = this.state.thread;
+ const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+ if (!thread || this.props.showThreadInfo === false) {
+ return null;
+ }
+
+ const avatars = Array.from(thread.participants).map((mxId: string) => {
+ const member = room.getMember(mxId);
+ return <MemberAvatar key={member.userId} member={member} width={14} height={14} />;
+ });
+
+ return (
+ <div
+ className="mx_ThreadInfo"
+ onClick={() => {
+ dis.dispatch({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.ThreadView,
+ refireParams: {
+ event: this.props.mxEvent,
+ },
+ });
+ }}
+ >
+ <span className="mx_EventListSummary_avatars">
+ { avatars }
+ </span>
+ { thread.length - 1 } { thread.length === 2 ? 'reply' : 'replies' }
+ </div>
+ );
+ }
+
private onRoomReceipt = (ev, room) => {
// ignore events for other rooms
const tileRoom = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
@@ -857,7 +917,12 @@ export default class EventTile extends React.Component<IProps, IState> {
render() {
const msgtype = this.props.mxEvent.getContent().msgtype;
const eventType = this.props.mxEvent.getType() as EventType;
- const { tileHandler, isBubbleMessage, isInfoMessage } = getEventDisplayInfo(this.props.mxEvent);
+ const {
+ tileHandler,
+ isBubbleMessage,
+ isInfoMessage,
+ isLeftAlignedBubbleMessage,
+ } = getEventDisplayInfo(this.props.mxEvent);
// This shouldn't happen: the caller should check we support this type
// before trying to instantiate us
@@ -879,6 +944,7 @@ export default class EventTile extends React.Component<IProps, IState> {
const isEditing = !!this.props.editState;
const classes = classNames({
mx_EventTile_bubbleContainer: isBubbleMessage,
+ mx_EventTile_leftAlignedBubble: isLeftAlignedBubbleMessage,
mx_EventTile: true,
mx_EventTile_isEditing: isEditing,
mx_EventTile_info: isInfoMessage,
@@ -1126,14 +1192,19 @@ export default class EventTile extends React.Component<IProps, IState> {
}
default: {
- const thread = ReplyThread.makeThread(
- this.props.mxEvent,
- this.props.onHeightChanged,
- this.props.permalinkCreator,
- this.replyThread,
- this.props.layout,
- this.props.alwaysShowTimestamps || this.state.hover,
- );
+ let thread;
+ // When the "showHiddenEventsInTimeline" lab is enabled,
+ // avoid showing replies for hidden events (events without tiles)
+ if (haveTileForEvent(this.props.mxEvent)) {
+ thread = ReplyThread.makeThread(
+ this.props.mxEvent,
+ this.props.onHeightChanged,
+ this.props.permalinkCreator,
+ this.replyThread,
+ this.props.layout,
+ this.props.alwaysShowTimestamps || this.state.hover,
+ );
+ }
const isOwnEvent = this.props.mxEvent?.sender?.userId === MatrixClientPeg.get().getUserId();
@@ -1174,6 +1245,7 @@ export default class EventTile extends React.Component<IProps, IState> {
{ keyRequestInfo }
{ actionBar }
{ this.props.layout === Layout.IRC && (reactionsRow) }
+ { this.renderThreadInfo() }
</div>
{ this.props.layout !== Layout.IRC && (reactionsRow) }
{ msgOption }
diff --git a/src/components/views/rooms/JumpToBottomButton.js b/src/components/views/rooms/JumpToBottomButton.tsx
similarity index 83%
rename from src/components/views/rooms/JumpToBottomButton.js
rename to src/components/views/rooms/JumpToBottomButton.tsx
index d2e2a391a6..0b680d093d 100644
--- a/src/components/views/rooms/JumpToBottomButton.js
+++ b/src/components/views/rooms/JumpToBottomButton.tsx
@@ -14,11 +14,18 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+import React from "react";
import { _t } from '../../../languageHandler';
import AccessibleButton from '../elements/AccessibleButton';
import classNames from 'classnames';
-export default (props) => {
+interface IProps {
+ numUnreadMessages: number;
+ highlight: boolean;
+ onScrollToBottomClick: (e: React.MouseEvent) => void;
+}
+
+const JumpToBottomButton: React.FC<IProps> = (props) => {
const className = classNames({
'mx_JumpToBottomButton': true,
'mx_JumpToBottomButton_highlight': props.highlight,
@@ -36,3 +43,5 @@ export default (props) => {
{ badge }
</div>);
};
+
+export default JumpToBottomButton;
diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx
index 0c90d2ee09..df4f2d21fa 100644
--- a/src/components/views/rooms/MemberList.tsx
+++ b/src/components/views/rooms/MemberList.tsx
@@ -45,6 +45,8 @@ import BaseAvatar from '../avatars/BaseAvatar';
import { throttle } from 'lodash';
import SpaceStore from "../../../stores/SpaceStore";
+const getSearchQueryLSKey = (roomId: string) => `mx_MemberList_searchQuarry_${roomId}`;
+
const INITIAL_LOAD_NUM_MEMBERS = 30;
const INITIAL_LOAD_NUM_INVITED = 5;
const SHOW_MORE_INCREMENT = 100;
@@ -171,20 +173,27 @@ export default class MemberList extends React.Component<IProps, IState> {
}
private getMembersState(members: Array<RoomMember>): IState {
+ let searchQuery;
+ try {
+ searchQuery = window.localStorage.getItem(getSearchQueryLSKey(this.props.roomId));
+ } catch (error) {
+ console.warn("Failed to get last the MemberList search query", error);
+ }
+
// set the state after determining showPresence to make sure it's
// taken into account while rendering
return {
loading: false,
members: members,
- filteredJoinedMembers: this.filterMembers(members, 'join'),
- filteredInvitedMembers: this.filterMembers(members, 'invite'),
+ filteredJoinedMembers: this.filterMembers(members, 'join', searchQuery),
+ filteredInvitedMembers: this.filterMembers(members, 'invite', searchQuery),
canInvite: this.canInvite,
// ideally we'd size this to the page height, but
// in practice I find that a little constraining
truncateAtJoined: INITIAL_LOAD_NUM_MEMBERS,
truncateAtInvited: INITIAL_LOAD_NUM_INVITED,
- searchQuery: "",
+ searchQuery: searchQuery ?? "",
};
}
@@ -414,6 +423,12 @@ export default class MemberList extends React.Component<IProps, IState> {
};
private onSearchQueryChanged = (searchQuery: string): void => {
+ try {
+ window.localStorage.setItem(getSearchQueryLSKey(this.props.roomId), searchQuery);
+ } catch (error) {
+ console.warn("Failed to set the last MemberList search query", error);
+ }
+
this.setState({
searchQuery,
filteredJoinedMembers: this.filterMembers(this.state.members, 'join', searchQuery),
@@ -554,7 +569,9 @@ export default class MemberList extends React.Component<IProps, IState> {
<SearchBox
className="mx_MemberList_query mx_textinput_icon mx_textinput_search"
placeholder={_t('Filter room members')}
- onSearch={this.onSearchQueryChanged} />
+ onSearch={this.onSearchQueryChanged}
+ initialValue={this.state.searchQuery}
+ />
);
let previousPhase = RightPanelPhases.RoomSummary;
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 8455e9aa11..332341fd23 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-import React from 'react';
+import React, { createRef } from 'react';
import classNames from 'classnames';
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -27,7 +27,13 @@ import { makeRoomPermalink, RoomPermalinkCreator } from '../../../utils/permalin
import ContentMessages from '../../../ContentMessages';
import E2EIcon from './E2EIcon';
import SettingsStore from "../../../settings/SettingsStore";
-import { aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu } from "../../structures/ContextMenu";
+import {
+ aboveLeftOf,
+ ContextMenu,
+ useContextMenu,
+ MenuItem,
+ AboveLeftOf,
+} from "../../structures/ContextMenu";
import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import ReplyPreview from "./ReplyPreview";
import { UIFeature } from "../../../settings/UIFeature";
@@ -45,9 +51,13 @@ import { Action } from "../../../dispatcher/actions";
import EditorModel from "../../../editor/model";
import EmojiPicker from '../emojipicker/EmojiPicker';
import MemberStatusMessageAvatar from "../avatars/MemberStatusMessageAvatar";
+import UIStore, { UI_EVENTS } from '../../../stores/UIStore';
+
+let instanceCount = 0;
+const NARROW_MODE_BREAKPOINT = 500;
interface IComposerAvatarProps {
- me: object;
+ me: RoomMember;
}
function ComposerAvatar(props: IComposerAvatarProps) {
@@ -71,13 +81,19 @@ function SendButton(props: ISendButtonProps) {
);
}
-const EmojiButton = ({ addEmoji }) => {
+interface IEmojiButtonProps {
+ addEmoji: (unicode: string) => boolean;
+ menuPosition: any; // TODO: Types
+ narrowMode: boolean;
+}
+
+const EmojiButton: React.FC<IEmojiButtonProps> = ({ addEmoji, menuPosition, narrowMode }) => {
const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
let contextMenu;
if (menuDisplayed) {
- const buttonRect = button.current.getBoundingClientRect();
- contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false}>
+ const position = menuPosition ?? aboveLeftOf(button.current.getBoundingClientRect());
+ contextMenu = <ContextMenu {...position} onFinished={closeMenu} managed={false}>
<EmojiPicker onChoose={addEmoji} showQuickReactions={true} />
</ContextMenu>;
}
@@ -93,12 +109,11 @@ const EmojiButton = ({ addEmoji }) => {
// TODO: replace ContextMenuTooltipButton with a unified representation of
// the header buttons and the right panel buttons
return <React.Fragment>
- <ContextMenuTooltipButton
+ <AccessibleTooltipButton
className={className}
onClick={openMenu}
- isExpanded={menuDisplayed}
- title={_t('Emoji picker')}
- inputRef={button}
+ title={!narrowMode && _t('Emoji picker')}
+ label={narrowMode && _t("Add emoji")}
/>
{ contextMenu }
@@ -183,7 +198,10 @@ interface IProps {
resizeNotifier: ResizeNotifier;
permalinkCreator: RoomPermalinkCreator;
replyToEvent?: MatrixEvent;
+ replyInThread?: boolean;
+ showReplyPreview?: boolean;
e2eStatus?: E2EStatus;
+ compact?: boolean;
}
interface IState {
@@ -193,6 +211,9 @@ interface IState {
haveRecording: boolean;
recordingTimeLeftSeconds?: number;
me?: RoomMember;
+ narrowMode?: boolean;
+ isMenuOpen: boolean;
+ showStickers: boolean;
}
@replaceableComponent("views.rooms.MessageComposer")
@@ -200,6 +221,14 @@ export default class MessageComposer extends React.Component<IProps, IState> {
private dispatcherRef: string;
private messageComposerInput: SendMessageComposer;
private voiceRecordingButton: VoiceRecordComposerTile;
+ private ref: React.RefObject<HTMLDivElement> = createRef();
+ private instanceId: number;
+
+ static defaultProps = {
+ replyInThread: false,
+ showReplyPreview: true,
+ compact: false,
+ };
constructor(props) {
super(props);
@@ -211,15 +240,32 @@ export default class MessageComposer extends React.Component<IProps, IState> {
isComposerEmpty: true,
haveRecording: false,
recordingTimeLeftSeconds: null, // when set to a number, shows a toast
+ isMenuOpen: false,
+ showStickers: false,
};
+
+ this.instanceId = instanceCount++;
}
componentDidMount() {
this.dispatcherRef = dis.register(this.onAction);
MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
this.waitForOwnMember();
+ UIStore.instance.trackElementDimensions(`MessageComposer${this.instanceId}`, this.ref.current);
+ UIStore.instance.on(`MessageComposer${this.instanceId}`, this.onResize);
}
+ private onResize = (type: UI_EVENTS, entry: ResizeObserverEntry) => {
+ if (type === UI_EVENTS.Resize) {
+ const narrowMode = entry.contentRect.width <= NARROW_MODE_BREAKPOINT;
+ this.setState({
+ narrowMode,
+ isMenuOpen: !narrowMode ? false : this.state.isMenuOpen,
+ showStickers: false,
+ });
+ }
+ };
+
private onAction = (payload: ActionPayload) => {
if (payload.action === 'reply_to_event') {
// add a timeout for the reply preview to be rendered, so
@@ -254,6 +300,8 @@ export default class MessageComposer extends React.Component<IProps, IState> {
}
VoiceRecordingStore.instance.off(UPDATE_EVENT, this.onVoiceStoreUpdate);
dis.unregister(this.dispatcherRef);
+ UIStore.instance.stopTrackingElementDimensions(`MessageComposer${this.instanceId}`);
+ UIStore.instance.removeListener(`MessageComposer${this.instanceId}`, this.onResize);
}
private onRoomStateEvents = (ev, state) => {
@@ -303,7 +351,11 @@ export default class MessageComposer extends React.Component<IProps, IState> {
private renderPlaceholderText = () => {
if (this.props.replyToEvent) {
- if (this.props.e2eStatus) {
+ if (this.props.replyInThread && this.props.e2eStatus) {
+ return _t('Reply to encrypted thread…');
+ } else if (this.props.replyInThread) {
+ return _t('Reply to thread…');
+ } else if (this.props.e2eStatus) {
return _t('Send an encrypted reply…');
} else {
return _t('Send a reply…');
@@ -317,11 +369,12 @@ export default class MessageComposer extends React.Component<IProps, IState> {
}
};
- private addEmoji(emoji: string) {
+ private addEmoji(emoji: string): boolean {
dis.dispatch<ComposerInsertPayload>({
action: Action.ComposerInsert,
text: emoji,
});
+ return true;
}
private sendMessage = async () => {
@@ -360,14 +413,111 @@ export default class MessageComposer extends React.Component<IProps, IState> {
}
};
+ private shouldShowStickerPicker = (): boolean => {
+ return SettingsStore.getValue(UIFeature.Widgets)
+ && SettingsStore.getValue("MessageComposerInput.showStickersButton")
+ && !this.state.haveRecording;
+ };
+
+ private showStickers = (showStickers: boolean) => {
+ this.setState({ showStickers });
+ };
+
+ private toggleButtonMenu = (): void => {
+ this.setState({
+ isMenuOpen: !this.state.isMenuOpen,
+ });
+ };
+
+ private renderButtons(menuPosition): JSX.Element | JSX.Element[] {
+ const buttons: JSX.Element[] = [];
+ if (!this.state.haveRecording) {
+ buttons.push(
+ <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
+ );
+ buttons.push(
+ <EmojiButton key="emoji_button" addEmoji={this.addEmoji} menuPosition={menuPosition} narrowMode={this.state.narrowMode} />,
+ );
+ }
+ if (this.shouldShowStickerPicker()) {
+ let title;
+ if (!this.state.narrowMode) {
+ title = this.state.showStickers ? _t("Hide Stickers") : _t("Show Stickers");
+ }
+
+ buttons.push(
+ <AccessibleTooltipButton
+ id='stickersButton'
+ key="controls_stickers"
+ className="mx_MessageComposer_button mx_MessageComposer_stickers"
+ onClick={() => this.showStickers(!this.state.showStickers)}
+ title={title}
+ label={this.state.narrowMode && _t("Send a sticker")}
+ />,
+ );
+ }
+ if (!this.state.haveRecording && !this.state.narrowMode) {
+ buttons.push(
+ <AccessibleTooltipButton
+ className="mx_MessageComposer_button mx_MessageComposer_voiceMessage"
+ onClick={() => this.voiceRecordingButton?.onRecordStartEndClick()}
+ title={_t("Send voice message")}
+ />,
+ );
+ }
+
+ if (!this.state.narrowMode) {
+ return buttons;
+ } else {
+ const classnames = classNames({
+ mx_MessageComposer_button: true,
+ mx_MessageComposer_buttonMenu: true,
+ mx_MessageComposer_closeButtonMenu: this.state.isMenuOpen,
+ });
+
+ return <>
+ { buttons[0] }
+ <AccessibleTooltipButton
+ className={classnames}
+ onClick={this.toggleButtonMenu}
+ title={_t("More options")}
+ tooltip={false}
+ />
+ { this.state.isMenuOpen && (
+ <ContextMenu
+ onFinished={this.toggleButtonMenu}
+ {...menuPosition}
+ menuPaddingRight={10}
+ menuPaddingTop={5}
+ menuPaddingBottom={5}
+ menuWidth={150}
+ wrapperClassName="mx_MessageComposer_Menu"
+ >
+ { buttons.slice(1).map((button, index) => (
+ <MenuItem className="mx_CallContextMenu_item" key={index} onClick={this.toggleButtonMenu}>
+ { button }
+ </MenuItem>
+ )) }
+ </ContextMenu>
+ ) }
+ </>;
+ }
+ }
+
render() {
const controls = [
- this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
+ this.state.me && !this.props.compact ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
this.props.e2eStatus ?
<E2EIcon key="e2eIcon" status={this.props.e2eStatus} className="mx_MessageComposer_e2eIcon" /> :
null,
];
+ let menuPosition: AboveLeftOf | undefined;
+ if (this.ref.current) {
+ const contentRect = this.ref.current.getBoundingClientRect();
+ menuPosition = aboveLeftOf(contentRect);
+ }
+
if (!this.state.tombstone && this.state.canSendMessages) {
controls.push(
<SendMessageComposer
@@ -376,39 +526,17 @@ export default class MessageComposer extends React.Component<IProps, IState> {
room={this.props.room}
placeholder={this.renderPlaceholderText()}
permalinkCreator={this.props.permalinkCreator}
+ replyInThread={this.props.replyInThread}
replyToEvent={this.props.replyToEvent}
onChange={this.onChange}
disabled={this.state.haveRecording}
/>,
);
- if (!this.state.haveRecording) {
- controls.push(
- <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
- <EmojiButton key="emoji_button" addEmoji={this.addEmoji} />,
- );
- }
-
- if (SettingsStore.getValue(UIFeature.Widgets) &&
- SettingsStore.getValue("MessageComposerInput.showStickersButton") &&
- !this.state.haveRecording) {
- controls.push(<Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />);
- }
-
controls.push(<VoiceRecordComposerTile
key="controls_voice_record"
ref={c => this.voiceRecordingButton = c}
room={this.props.room} />);
-
- if (!this.state.isComposerEmpty || this.state.haveRecording) {
- controls.push(
- <SendButton
- key="controls_send"
- onClick={this.sendMessage}
- title={this.state.haveRecording ? _t("Send voice message") : undefined}
- />,
- );
- }
} else if (this.state.tombstone) {
const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
@@ -449,14 +577,39 @@ export default class MessageComposer extends React.Component<IProps, IState> {
yOffset={-50}
/>;
}
+ controls.push(
+ <Stickerpicker
+ room={this.props.room}
+ showStickers={this.state.showStickers}
+ setShowStickers={this.showStickers}
+ menuPosition={menuPosition} />,
+ );
+
+ const showSendButton = !this.state.isComposerEmpty || this.state.haveRecording;
+
+ const classes = classNames({
+ "mx_MessageComposer": true,
+ "mx_GroupLayout": true,
+ "mx_MessageComposer--compact": this.props.compact,
+ });
return (
- <div className="mx_MessageComposer mx_GroupLayout">
+ <div className={classes} ref={this.ref}>
{ recordingTooltip }
<div className="mx_MessageComposer_wrapper">
- <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
+ { this.props.showReplyPreview && (
+ <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
+ ) }
<div className="mx_MessageComposer_row">
{ controls }
+ { this.renderButtons(menuPosition) }
+ { showSendButton && (
+ <SendButton
+ key="controls_send"
+ onClick={this.sendMessage}
+ title={this.state.haveRecording ? _t("Send voice message") : undefined}
+ />
+ ) }
</div>
</div>
</div>
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index 674bcdaec2..8a96b8a9ba 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -36,6 +36,7 @@ import { showSpaceInvite } from "../../../utils/space";
import { privateShouldBeEncrypted } from "../../../createRoom";
import EventTileBubble from "../messages/EventTileBubble";
import { ROOM_SECURITY_TAB } from "../dialogs/RoomSettingsDialog";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
function hasExpectedEncryptionSettings(matrixClient: MatrixClient, room: Room): boolean {
const isEncrypted: boolean = matrixClient.isRoomEncrypted(room.roomId);
@@ -191,11 +192,21 @@ const NewRoomIntro = () => {
});
}
- const sub2 = _t(
+ const subText = _t(
"Your private messages are normally encrypted, but this room isn't. "+
"Usually this is due to an unsupported device or method being used, " +
- "like email invites. <a>Enable encryption in settings.</a>", {},
- { a: sub => <a onClick={openRoomSettings} href="#">{ sub }</a> },
+ "like email invites.",
+ );
+
+ let subButton;
+ if (room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, MatrixClientPeg.get())) {
+ subButton = (
+ <a onClick={openRoomSettings} href="#"> { _t("Enable encryption in settings.") }</a>
+ );
+ }
+
+ const subtitle = (
+ <span> { subText } { subButton } </span>
);
return <div className="mx_NewRoomIntro">
@@ -204,7 +215,7 @@ const NewRoomIntro = () => {
<EventTileBubble
className="mx_cryptoEvent mx_cryptoEvent_icon_warning"
title={_t("End-to-end encryption isn't enabled")}
- subtitle={sub2}
+ subtitle={subtitle}
/>
) }
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 8329de7391..a97d51fc90 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React from "react";
+import React, { MouseEvent } from "react";
import classNames from "classnames";
import { formatCount } from "../../../utils/FormattingUtils";
import SettingsStore from "../../../settings/SettingsStore";
@@ -22,6 +22,9 @@ import AccessibleButton from "../elements/AccessibleButton";
import { XOR } from "../../../@types/common";
import { NOTIFICATION_STATE_UPDATE, NotificationState } from "../../../stores/notifications/NotificationState";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Tooltip from "../elements/Tooltip";
+import { _t } from "../../../languageHandler";
+import { NotificationColor } from "../../../stores/notifications/NotificationColor";
interface IProps {
notification: NotificationState;
@@ -39,6 +42,7 @@ interface IProps {
}
interface IClickableProps extends IProps, React.InputHTMLAttributes<Element> {
+ showUnsentTooltip?: boolean;
/**
* If specified will return an AccessibleButton instead of a div.
*/
@@ -47,6 +51,7 @@ interface IClickableProps extends IProps, React.InputHTMLAttributes<Element> {
interface IState {
showCounts: boolean; // whether or not to show counts. Independent of props.forceCount
+ showTooltip: boolean;
}
@replaceableComponent("views.rooms.NotificationBadge")
@@ -59,6 +64,7 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
this.state = {
showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId),
+ showTooltip: false,
};
this.countWatcherRef = SettingsStore.watchSetting(
@@ -93,9 +99,22 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
this.forceUpdate(); // notification state changed - update
};
+ private onMouseOver = (e: MouseEvent) => {
+ e.stopPropagation();
+ this.setState({
+ showTooltip: true,
+ });
+ };
+
+ private onMouseLeave = () => {
+ this.setState({
+ showTooltip: false,
+ });
+ };
+
public render(): React.ReactElement {
/* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
- const { notification, forceCount, roomId, onClick, ...props } = this.props;
+ const { notification, showUnsentTooltip, forceCount, roomId, onClick, ...props } = this.props;
// Don't show a badge if we don't need to
if (notification.isIdle) return null;
@@ -124,9 +143,24 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
});
if (onClick) {
+ let label: string;
+ let tooltip: JSX.Element;
+ if (showUnsentTooltip && this.state.showTooltip && notification.color === NotificationColor.Unsent) {
+ label = _t("Message didn't send. Click for info.");
+ tooltip = <Tooltip className="mx_RoleButton_tooltip" label={label} />;
+ }
+
return (
- <AccessibleButton {...props} className={classes} onClick={onClick}>
+ <AccessibleButton
+ aria-label={label}
+ {...props}
+ className={classes}
+ onClick={onClick}
+ onMouseOver={this.onMouseOver}
+ onMouseLeave={this.onMouseLeave}
+ >
<span className="mx_NotificationBadge_count">{ symbol }</span>
+ { tooltip }
</AccessibleButton>
);
}
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.tsx
similarity index 71%
rename from src/components/views/rooms/ReadReceiptMarker.js
rename to src/components/views/rooms/ReadReceiptMarker.tsx
index c9688b4d29..cfc535b23d 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.tsx
@@ -15,62 +15,75 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, { createRef } from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef, RefObject } from 'react';
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
import { _t } from '../../../languageHandler';
import { formatDate } from '../../../DateUtils';
import NodeAnimator from "../../../NodeAnimator";
-import * as sdk from "../../../index";
import { toPx } from "../../../utils/units";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import MemberAvatar from '../avatars/MemberAvatar';
+
+interface IProps {
+ // the RoomMember to show the RR for
+ member?: RoomMember;
+ // userId to fallback the avatar to
+ // if the member hasn't been loaded yet
+ fallbackUserId: string;
+
+ // number of pixels to offset the avatar from the right of its parent;
+ // typically a negative value.
+ leftOffset?: number;
+
+ // true to hide the avatar (it will still be animated)
+ hidden?: boolean;
+
+ // don't animate this RR into position
+ suppressAnimation?: boolean;
+
+ // an opaque object for storing information about this user's RR in
+ // this room
+ // TODO: proper typing for RR info
+ readReceiptInfo: any;
+
+ // A function which is used to check if the parent panel is being
+ // unmounted, to avoid unnecessary work. Should return true if we
+ // are being unmounted.
+ checkUnmounting?: () => boolean;
+
+ // callback for clicks on this RR
+ onClick?: (e: React.MouseEvent) => void;
+
+ // Timestamp when the receipt was read
+ timestamp?: number;
+
+ // True to show twelve hour format, false otherwise
+ showTwelveHour?: boolean;
+}
+
+interface IState {
+ suppressDisplay: boolean;
+ startStyles?: IReadReceiptMarkerStyle[];
+}
+
+interface IReadReceiptMarkerStyle {
+ top: number;
+ left: number;
+}
+
@replaceableComponent("views.rooms.ReadReceiptMarker")
-export default class ReadReceiptMarker extends React.PureComponent {
- static propTypes = {
- // the RoomMember to show the RR for
- member: PropTypes.object,
- // userId to fallback the avatar to
- // if the member hasn't been loaded yet
- fallbackUserId: PropTypes.string.isRequired,
-
- // number of pixels to offset the avatar from the right of its parent;
- // typically a negative value.
- leftOffset: PropTypes.number,
-
- // true to hide the avatar (it will still be animated)
- hidden: PropTypes.bool,
-
- // don't animate this RR into position
- suppressAnimation: PropTypes.bool,
-
- // an opaque object for storing information about this user's RR in
- // this room
- readReceiptInfo: PropTypes.object,
-
- // A function which is used to check if the parent panel is being
- // unmounted, to avoid unnecessary work. Should return true if we
- // are being unmounted.
- checkUnmounting: PropTypes.func,
-
- // callback for clicks on this RR
- onClick: PropTypes.func,
-
- // Timestamp when the receipt was read
- timestamp: PropTypes.number,
-
- // True to show twelve hour format, false otherwise
- showTwelveHour: PropTypes.bool,
- };
+export default class ReadReceiptMarker extends React.PureComponent<IProps, IState> {
+ private avatar: React.RefObject<HTMLDivElement | HTMLImageElement | HTMLSpanElement> = createRef();
static defaultProps = {
leftOffset: 0,
};
- constructor(props) {
+ constructor(props: IProps) {
super(props);
- this._avatar = createRef();
-
this.state = {
// if we are going to animate the RR, we don't show it on first render,
// and instead just add a placeholder to the DOM; once we've been
@@ -80,7 +93,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
};
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
// before we remove the rr, store its location in the map, so that if
// it reappears, it can be animated from the right place.
const rrInfo = this.props.readReceiptInfo;
@@ -95,29 +108,29 @@ export default class ReadReceiptMarker extends React.PureComponent {
return;
}
- const avatarNode = this._avatar.current;
+ const avatarNode = this.avatar.current;
rrInfo.top = avatarNode.offsetTop;
rrInfo.left = avatarNode.offsetLeft;
rrInfo.parent = avatarNode.offsetParent;
}
- componentDidMount() {
+ public componentDidMount(): void {
if (!this.state.suppressDisplay) {
// we've already done our display - nothing more to do.
return;
}
- this._animateMarker();
+ this.animateMarker();
}
- componentDidUpdate(prevProps) {
+ public componentDidUpdate(prevProps: IProps): void {
const differentLeftOffset = prevProps.leftOffset !== this.props.leftOffset;
const visibilityChanged = prevProps.hidden !== this.props.hidden;
if (differentLeftOffset || visibilityChanged) {
- this._animateMarker();
+ this.animateMarker();
}
}
- _animateMarker() {
+ private animateMarker(): void {
// treat new RRs as though they were off the top of the screen
let oldTop = -15;
@@ -126,7 +139,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
oldTop = oldInfo.top + oldInfo.parent.getBoundingClientRect().top;
}
- const newElement = this._avatar.current;
+ const newElement = this.avatar.current;
let startTopOffset;
if (!newElement.offsetParent) {
// this seems to happen sometimes for reasons I don't understand
@@ -156,10 +169,9 @@ export default class ReadReceiptMarker extends React.PureComponent {
});
}
- render() {
- const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+ public render(): JSX.Element {
if (this.state.suppressDisplay) {
- return <div ref={this._avatar} />;
+ return <div ref={this.avatar as RefObject<HTMLDivElement>} />;
}
const style = {
@@ -198,7 +210,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
style={style}
title={title}
onClick={this.props.onClick}
- inputRef={this._avatar}
+ inputRef={this.avatar as RefObject<HTMLImageElement>}
/>
</NodeAnimator>
);
diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx
index 8c0e09c76c..cf7d1ce945 100644
--- a/src/components/views/rooms/ReplyTile.tsx
+++ b/src/components/views/rooms/ReplyTile.tsx
@@ -25,8 +25,9 @@ import MImageReplyBody from "../messages/MImageReplyBody";
import * as sdk from '../../../index';
import { EventType, MsgType } from 'matrix-js-sdk/src/@types/event';
import { replaceableComponent } from '../../../utils/replaceableComponent';
-import { getEventDisplayInfo } from '../../../utils/EventUtils';
+import { getEventDisplayInfo, isVoiceMessage } from '../../../utils/EventUtils';
import MFileBody from "../messages/MFileBody";
+import MVoiceMessageBody from "../messages/MVoiceMessageBody";
interface IProps {
mxEvent: MatrixEvent;
@@ -95,7 +96,7 @@ export default class ReplyTile extends React.PureComponent<IProps> {
const msgType = mxEvent.getContent().msgtype;
const evType = mxEvent.getType() as EventType;
- const { tileHandler, isInfoMessage } = getEventDisplayInfo(this.props.mxEvent);
+ const { tileHandler, isInfoMessage } = getEventDisplayInfo(mxEvent);
// This shouldn't happen: the caller should check we support this type
// before trying to instantiate us
if (!tileHandler) {
@@ -109,14 +110,14 @@ export default class ReplyTile extends React.PureComponent<IProps> {
const EventTileType = sdk.getComponent(tileHandler);
const classes = classNames("mx_ReplyTile", {
- mx_ReplyTile_info: isInfoMessage && !this.props.mxEvent.isRedacted(),
+ mx_ReplyTile_info: isInfoMessage && !mxEvent.isRedacted(),
mx_ReplyTile_audio: msgType === MsgType.Audio,
mx_ReplyTile_video: msgType === MsgType.Video,
});
let permalink = "#";
if (this.props.permalinkCreator) {
- permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
+ permalink = this.props.permalinkCreator.forEvent(mxEvent.getId());
}
let sender;
@@ -129,7 +130,7 @@ export default class ReplyTile extends React.PureComponent<IProps> {
if (needsSenderProfile) {
sender = <SenderProfile
- mxEvent={this.props.mxEvent}
+ mxEvent={mxEvent}
enableFlair={false}
/>;
}
@@ -137,7 +138,7 @@ export default class ReplyTile extends React.PureComponent<IProps> {
const msgtypeOverrides = {
[MsgType.Image]: MImageReplyBody,
// Override audio and video body with file body. We also hide the download/decrypt button using CSS
- [MsgType.Audio]: MFileBody,
+ [MsgType.Audio]: isVoiceMessage(mxEvent) ? MVoiceMessageBody : MFileBody,
[MsgType.Video]: MFileBody,
};
const evOverrides = {
@@ -151,14 +152,14 @@ export default class ReplyTile extends React.PureComponent<IProps> {
{ sender }
<EventTileType
ref="tile"
- mxEvent={this.props.mxEvent}
+ mxEvent={mxEvent}
highlights={this.props.highlights}
highlightLink={this.props.highlightLink}
onHeightChanged={this.props.onHeightChanged}
showUrlPreview={false}
overrideBodyTypes={msgtypeOverrides}
overrideEventTypes={evOverrides}
- replacingEventId={this.props.mxEvent.replacingEventId()}
+ replacingEventId={mxEvent.replacingEventId()}
maxImageHeight={96} />
</a>
</div>
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.tsx
similarity index 76%
rename from src/components/views/rooms/RoomDetailList.js
rename to src/components/views/rooms/RoomDetailList.tsx
index bf2f5418c9..869ab9e8f3 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.tsx
@@ -14,41 +14,38 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
import React from 'react';
-import { _t } from '../../../languageHandler';
-import PropTypes from 'prop-types';
+import { Room } from 'matrix-js-sdk/src';
import classNames from 'classnames';
+import dis from '../../../dispatcher/dispatcher';
+import { _t } from '../../../languageHandler';
-import { roomShape } from './RoomDetailRow';
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RoomDetailRow from "./RoomDetailRow";
+
+interface IProps {
+ rooms?: Room[];
+ className?: string;
+}
@replaceableComponent("views.rooms.RoomDetailList")
-export default class RoomDetailList extends React.Component {
- static propTypes = {
- rooms: PropTypes.arrayOf(roomShape),
- className: PropTypes.string,
- };
-
- getRows() {
+export default class RoomDetailList extends React.Component<IProps> {
+ private getRows(): JSX.Element[] {
if (!this.props.rooms) return [];
-
- const RoomDetailRow = sdk.getComponent('rooms.RoomDetailRow');
return this.props.rooms.map((room, index) => {
return <RoomDetailRow key={index} room={room} onClick={this.onDetailsClick} />;
});
}
- onDetailsClick = (ev, room) => {
+ private onDetailsClick = (ev: React.MouseEvent, room: Room): void => {
dis.dispatch({
action: 'view_room',
room_id: room.roomId,
- room_alias: room.canonicalAlias || (room.aliases || [])[0],
+ room_alias: room.getCanonicalAlias() || (room.getAltAliases() || [])[0],
});
};
- render() {
+ public render(): JSX.Element {
const rows = this.getRows();
let rooms;
if (rows.length === 0) {
diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx
index 15b25ed64b..d0e438bcda 100644
--- a/src/components/views/rooms/RoomHeader.tsx
+++ b/src/components/views/rooms/RoomHeader.tsx
@@ -195,7 +195,7 @@ export default class RoomHeader extends React.Component<IProps> {
videoCallButton =
<AccessibleTooltipButton
className="mx_RoomHeader_button mx_RoomHeader_videoCallButton"
- onClick={(ev) => ev.shiftKey ?
+ onClick={(ev: React.MouseEvent<Element>) => ev.shiftKey ?
this.displayInfoDialogAboutScreensharing() : this.props.onCallPlaced(PlaceCallType.Video)}
title={_t("Video call")} />;
}
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 010780565b..541d0e1d9d 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -38,7 +38,6 @@ import { StaticNotificationState } from "../../../stores/notifications/StaticNot
import { Action } from "../../../dispatcher/actions";
import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
-import SettingsStore from "../../../settings/SettingsStore";
import CustomRoomTagStore from "../../../stores/CustomRoomTagStore";
import { arrayFastClone, arrayHasDiff } from "../../../utils/arrays";
import { objectShallowClone, objectWithOnly } from "../../../utils/objects";
@@ -49,6 +48,7 @@ import SpaceStore, { ISuggestedRoom, SUGGESTED_ROOMS } from "../../../stores/Spa
import { showAddExistingRooms, showCreateNewRoom, showSpaceInvite } from "../../../utils/space";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import RoomAvatar from "../avatars/RoomAvatar";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
interface IProps {
onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -320,11 +320,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
private updateLists = () => {
const newLists = RoomListStore.instance.orderedLists;
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log("new lists", newLists);
- }
-
const previousListIds = Object.keys(this.state.sublists);
const newListIds = Object.keys(newLists).filter(t => {
if (!isCustomTag(t)) return true; // always include non-custom tags
@@ -528,20 +523,23 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
} else if (
this.props.activeSpace?.canInvite(userId) || this.props.activeSpace?.getMyMembership() === "join"
) {
+ const spaceName = this.props.activeSpace.name;
explorePrompt = <div className="mx_RoomList_explorePrompt">
<div>{ _t("Quick actions") }</div>
- { this.props.activeSpace.canInvite(userId) && <AccessibleButton
+ { this.props.activeSpace.canInvite(userId) && <AccessibleTooltipButton
className="mx_RoomList_explorePrompt_spaceInvite"
onClick={this.onSpaceInviteClick}
+ title={_t("Invite to %(spaceName)s", { spaceName })}
>
{ _t("Invite people") }
- </AccessibleButton> }
- { this.props.activeSpace.getMyMembership() === "join" && <AccessibleButton
+ </AccessibleTooltipButton> }
+ { this.props.activeSpace.getMyMembership() === "join" && <AccessibleTooltipButton
className="mx_RoomList_explorePrompt_spaceExplore"
onClick={this.onExplore}
+ title={_t("Explore %(spaceName)s", { spaceName })}
>
{ _t("Explore rooms") }
- </AccessibleButton> }
+ </AccessibleTooltipButton> }
</div>;
} else if (Object.values(this.state.sublists).some(list => list.length > 0)) {
const unfilteredLists = RoomListStore.instance.unfilteredLists;
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index b8a4315e2d..89b493595f 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -28,6 +28,8 @@ import { UPDATE_EVENT } from "../../../stores/AsyncStore";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import InviteReason from "../elements/InviteReason";
+const MemberEventHtmlReasonField = "io.element.html_reason";
+
const MessageCase = Object.freeze({
NotLoggedIn: "NotLoggedIn",
Joining: "Joining",
@@ -492,9 +494,13 @@ export default class RoomPreviewBar extends React.Component {
}
const myUserId = MatrixClientPeg.get().getUserId();
- const reason = this.props.room.currentState.getMember(myUserId).events.member.event.content.reason;
- if (reason) {
- reasonElement = <InviteReason reason={reason} />;
+ const memberEventContent = this.props.room.currentState.getMember(myUserId).events.member.getContent();
+
+ if (memberEventContent.reason) {
+ reasonElement = <InviteReason
+ reason={memberEventContent.reason}
+ htmlReason={memberEventContent[MemberEventHtmlReasonField]}
+ />;
}
primaryActionHandler = this.props.onJoinClick;
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index cf82040793..3c9f0ea65e 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -670,6 +670,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
onClick={this.onBadgeClick}
tabIndex={tabIndex}
aria-label={ariaLabel}
+ showUnsentTooltip={true}
/>
);
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 4d6de10e1f..970915d653 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -17,7 +17,6 @@ limitations under the License.
import React, { createRef } from "react";
import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import classNames from "classnames";
import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
@@ -51,8 +50,6 @@ import IconizedContextMenu, {
} from "../context_menus/IconizedContextMenu";
import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/CommunityPrototypeStore";
import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { getUnsentMessages } from "../../structures/RoomStatusBar";
-import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
interface IProps {
room: Room;
@@ -68,7 +65,6 @@ interface IState {
notificationsMenuPosition: PartialDOMRect;
generalMenuPosition: PartialDOMRect;
messagePreview?: string;
- hasUnsentEvents: boolean;
}
const messagePreviewId = (roomId: string) => `mx_RoomTile_messagePreview_${roomId}`;
@@ -95,7 +91,6 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
notificationsMenuPosition: null,
generalMenuPosition: null,
- hasUnsentEvents: this.countUnsentEvents() > 0,
// generatePreview() will return nothing if the user has previews disabled
messagePreview: "",
@@ -106,11 +101,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
this.roomProps = EchoChamber.forRoom(this.props.room);
}
- private countUnsentEvents(): number {
- return getUnsentMessages(this.props.room).length;
- }
-
- private onRoomNameUpdate = (room) => {
+ private onRoomNameUpdate = (room: Room) => {
this.forceUpdate();
};
@@ -118,11 +109,6 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
this.forceUpdate(); // notification state changed - update
};
- private onLocalEchoUpdated = (ev: MatrixEvent, room: Room) => {
- if (room?.roomId !== this.props.room.roomId) return;
- this.setState({ hasUnsentEvents: this.countUnsentEvents() > 0 });
- };
-
private onRoomPropertyUpdate = (property: CachedRoomKey) => {
if (property === CachedRoomKey.NotificationVolume) this.onNotificationUpdate();
// else ignore - not important for this tile
@@ -178,12 +164,11 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
);
this.notificationState.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
this.roomProps.on(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
- this.roomProps.on("Room.name", this.onRoomNameUpdate);
+ this.props.room?.on("Room.name", this.onRoomNameUpdate);
CommunityPrototypeStore.instance.on(
CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
this.onCommunityUpdate,
);
- MatrixClientPeg.get().on("Room.localEchoUpdated", this.onLocalEchoUpdated);
}
public componentWillUnmount() {
@@ -208,7 +193,6 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
this.onCommunityUpdate,
);
- MatrixClientPeg.get()?.removeListener("Room.localEchoUpdated", this.onLocalEchoUpdated);
}
private onAction = (payload: ActionPayload) => {
@@ -587,30 +571,17 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
/>;
let badge: React.ReactNode;
- if (!this.props.isMinimized) {
+ if (!this.props.isMinimized && this.notificationState) {
// aria-hidden because we summarise the unread count/highlight status in a manual aria-label below
- if (this.state.hasUnsentEvents) {
- // hardcode the badge to a danger state when there's unsent messages
- badge = (
- <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
- <NotificationBadge
- notification={StaticNotificationState.RED_EXCLAMATION}
- forceCount={false}
- roomId={this.props.room.roomId}
- />
- </div>
- );
- } else if (this.notificationState) {
- badge = (
- <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
- <NotificationBadge
- notification={this.notificationState}
- forceCount={false}
- roomId={this.props.room.roomId}
- />
- </div>
- );
- }
+ badge = (
+ <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
+ <NotificationBadge
+ notification={this.notificationState}
+ forceCount={false}
+ roomId={this.props.room.roomId}
+ />
+ </div>
+ );
}
let messagePreview = null;
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
similarity index 83%
rename from src/components/views/rooms/RoomUpgradeWarningBar.js
rename to src/components/views/rooms/RoomUpgradeWarningBar.tsx
index 384845cdf9..eb334ab825 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2018-2020 New Vector Ltd
+Copyright 2018-2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,41 +15,43 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { RoomState } from 'matrix-js-sdk/src/models/room-state';
+
import Modal from '../../../Modal';
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RoomUpgradeDialog from '../dialogs/RoomUpgradeDialog';
+import AccessibleButton from '../elements/AccessibleButton';
+
+interface IProps {
+ room: Room;
+}
+
+interface IState {
+ upgraded?: boolean;
+}
@replaceableComponent("views.rooms.RoomUpgradeWarningBar")
-export default class RoomUpgradeWarningBar extends React.PureComponent {
- static propTypes = {
- room: PropTypes.object.isRequired,
- recommendation: PropTypes.object.isRequired,
- };
-
- constructor(props) {
- super(props);
- this.state = {};
- }
-
- componentDidMount() {
+export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, IState> {
+ public componentDidMount(): void {
const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
this.setState({ upgraded: tombstone && tombstone.getContent().replacement_room });
- MatrixClientPeg.get().on("RoomState.events", this._onStateEvents);
+ MatrixClientPeg.get().on("RoomState.events", this.onStateEvents);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
const cli = MatrixClientPeg.get();
if (cli) {
- cli.removeListener("RoomState.events", this._onStateEvents);
+ cli.removeListener("RoomState.events", this.onStateEvents);
}
}
- _onStateEvents = (event, state) => {
+ private onStateEvents = (event: MatrixEvent, state: RoomState): void => {
if (!this.props.room || event.getRoomId() !== this.props.room.roomId) {
return;
}
@@ -60,14 +62,11 @@ export default class RoomUpgradeWarningBar extends React.PureComponent {
this.setState({ upgraded: tombstone && tombstone.getContent().replacement_room });
};
- onUpgradeClick = () => {
- const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
+ private onUpgradeClick = (): void => {
Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, { room: this.props.room });
};
- render() {
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
+ public render(): JSX.Element {
let doUpgradeWarnings = (
<div>
<div className="mx_RoomUpgradeWarningBar_body">
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index 205320fb68..b2fca33dfe 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -31,8 +31,8 @@ import {
textSerialize,
unescapeMessage,
} from '../../../editor/serialize';
+import BasicMessageComposer, { REGEX_EMOTICON } from "./BasicMessageComposer";
import { CommandPartCreator, Part, PartCreator, SerializedPart, Type } from '../../../editor/parts';
-import BasicMessageComposer from "./BasicMessageComposer";
import ReplyThread from "../elements/ReplyThread";
import { findEditableEvent } from '../../../utils/EventUtils';
import SendHistoryManager from "../../../SendHistoryManager";
@@ -54,18 +54,20 @@ import { Room } from 'matrix-js-sdk/src/models/room';
import ErrorDialog from "../dialogs/ErrorDialog";
import QuestionDialog from "../dialogs/QuestionDialog";
import { ActionPayload } from "../../../dispatcher/payloads";
+import { decorateStartSendingTime, sendRoundTripMetric } from "../../../sendTimePerformanceMetrics";
function addReplyToMessageContent(
content: IContent,
- repliedToEvent: MatrixEvent,
+ replyToEvent: MatrixEvent,
+ replyInThread: boolean,
permalinkCreator: RoomPermalinkCreator,
): void {
- const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
+ const replyContent = ReplyThread.makeReplyMixIn(replyToEvent, replyInThread);
Object.assign(content, replyContent);
// Part of Replies fallback support - prepend the text we're sending
// with the text we're replying to
- const nestedReply = ReplyThread.getNestedReplyText(repliedToEvent, permalinkCreator);
+ const nestedReply = ReplyThread.getNestedReplyText(replyToEvent, permalinkCreator);
if (nestedReply) {
if (content.formatted_body) {
content.formatted_body = nestedReply.html + content.formatted_body;
@@ -77,8 +79,9 @@ function addReplyToMessageContent(
// exported for tests
export function createMessageContent(
model: EditorModel,
- permalinkCreator: RoomPermalinkCreator,
replyToEvent: MatrixEvent,
+ replyInThread: boolean,
+ permalinkCreator: RoomPermalinkCreator,
): IContent {
const isEmote = containsEmote(model);
if (isEmote) {
@@ -101,7 +104,7 @@ export function createMessageContent(
}
if (replyToEvent) {
- addReplyToMessageContent(content, replyToEvent, permalinkCreator);
+ addReplyToMessageContent(content, replyToEvent, replyInThread, permalinkCreator);
}
return content;
@@ -129,6 +132,7 @@ interface IProps {
room: Room;
placeholder?: string;
permalinkCreator: RoomPermalinkCreator;
+ replyInThread?: boolean;
replyToEvent?: MatrixEvent;
disabled?: boolean;
onChange?(model: EditorModel): void;
@@ -343,21 +347,35 @@ export default class SendMessageComposer extends React.Component<IProps> {
}
public async sendMessage(): Promise<void> {
- if (this.model.isEmpty) {
+ const model = this.model;
+
+ if (model.isEmpty) {
return;
}
+ // Replace emoticon at the end of the message
+ if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+ const caret = this.editorRef.current?.getCaret();
+ const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
+ this.editorRef.current?.replaceEmoticon(position, REGEX_EMOTICON);
+ }
+
const replyToEvent = this.props.replyToEvent;
let shouldSend = true;
let content;
- if (!containsEmote(this.model) && this.isSlashCommand()) {
+ if (!containsEmote(model) && this.isSlashCommand()) {
const [cmd, args, commandText] = this.getSlashCommand();
if (cmd) {
if (cmd.category === CommandCategories.messages) {
content = await this.runSlashCommand(cmd, args);
if (replyToEvent) {
- addReplyToMessageContent(content, replyToEvent, this.props.permalinkCreator);
+ addReplyToMessageContent(
+ content,
+ replyToEvent,
+ this.props.replyInThread,
+ this.props.permalinkCreator,
+ );
}
} else {
this.runSlashCommand(cmd, args);
@@ -391,7 +409,7 @@ export default class SendMessageComposer extends React.Component<IProps> {
}
}
- if (isQuickReaction(this.model)) {
+ if (isQuickReaction(model)) {
shouldSend = false;
this.sendQuickReaction();
}
@@ -400,11 +418,20 @@ export default class SendMessageComposer extends React.Component<IProps> {
const startTime = CountlyAnalytics.getTimestamp();
const { roomId } = this.props.room;
if (!content) {
- content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
+ content = createMessageContent(
+ model,
+ replyToEvent,
+ this.props.replyInThread,
+ this.props.permalinkCreator,
+ );
}
// don't bother sending an empty message
if (!content.body.trim()) return;
+ if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+ decorateStartSendingTime(content);
+ }
+
const prom = this.context.sendMessage(roomId, content);
if (replyToEvent) {
// Clear reply_to_event as we put the message into the queue
@@ -420,12 +447,17 @@ export default class SendMessageComposer extends React.Component<IProps> {
dis.dispatch({ action: `effects.${effect.command}` });
}
});
+ if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+ prom.then(resp => {
+ sendRoundTripMetric(this.context, roomId, resp.event_id);
+ });
+ }
CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, !!replyToEvent, content);
}
- this.sendHistoryManager.save(this.model, replyToEvent);
+ this.sendHistoryManager.save(model, replyToEvent);
// clear composer
- this.model.reset([]);
+ model.reset([]);
this.editorRef.current?.clearUndoHistory();
this.editorRef.current?.focus();
this.clearStoredEditorState();
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.tsx
similarity index 82%
rename from src/components/views/rooms/SimpleRoomHeader.js
rename to src/components/views/rooms/SimpleRoomHeader.tsx
index a2b5566e39..d6effaceb4 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2016 OpenMarket Ltd
+Copyright 2016-2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,23 +15,21 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
import { replaceableComponent } from "../../../utils/replaceableComponent";
+interface IProps {
+ title?: string;
+ // `src` to an image. Optional.
+ icon?: string;
+}
+
/*
* A stripped-down room header used for things like the user settings
* and room directory.
*/
@replaceableComponent("views.rooms.SimpleRoomHeader")
-export default class SimpleRoomHeader extends React.Component {
- static propTypes = {
- title: PropTypes.string,
-
- // `src` to an image. Optional.
- icon: PropTypes.string,
- };
-
- render() {
+export default class SimpleRoomHeader extends React.PureComponent<IProps> {
+ public render(): JSX.Element {
let icon;
if (this.props.icon) {
icon = <img
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.tsx
similarity index 65%
rename from src/components/views/rooms/Stickerpicker.js
rename to src/components/views/rooms/Stickerpicker.tsx
index 6649948331..0806b4ab9d 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.tsx
@@ -14,23 +14,24 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from 'react';
-import classNames from 'classnames';
+import { Room } from 'matrix-js-sdk/src/models/room';
import { _t, _td } from '../../../languageHandler';
import AppTile from '../elements/AppTile';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
import dis from '../../../dispatcher/dispatcher';
import AccessibleButton from '../elements/AccessibleButton';
-import WidgetUtils from '../../../utils/WidgetUtils';
+import WidgetUtils, { IWidgetEvent } from '../../../utils/WidgetUtils';
import PersistedElement from "../elements/PersistedElement";
import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
import SettingsStore from "../../../settings/SettingsStore";
-import { ContextMenu } from "../../structures/ContextMenu";
+import { ChevronFace, ContextMenu } from "../../structures/ContextMenu";
import { WidgetType } from "../../../widgets/WidgetType";
-import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import { Action } from "../../../dispatcher/actions";
import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ActionPayload } from '../../../dispatcher/payloads';
+import ScalarAuthClient from '../../../ScalarAuthClient';
+import GenericElementContextMenu from "../context_menus/GenericElementContextMenu";
// This should be below the dialog level (4000), but above the rest of the UI (1000-2000).
// We sit in a context menu, so this should be given to the context menu.
@@ -39,29 +40,38 @@ const STICKERPICKER_Z_INDEX = 3500;
// Key to store the widget's AppTile under in PersistedElement
const PERSISTED_ELEMENT_KEY = "stickerPicker";
+interface IProps {
+ room: Room;
+ showStickers: boolean;
+ menuPosition?: any;
+ setShowStickers: (showStickers: boolean) => void;
+}
+
+interface IState {
+ imError: string;
+ stickerpickerX: number;
+ stickerpickerY: number;
+ stickerpickerChevronOffset?: number;
+ stickerpickerWidget: IWidgetEvent;
+ widgetId: string;
+}
+
@replaceableComponent("views.rooms.Stickerpicker")
-export default class Stickerpicker extends React.PureComponent {
+export default class Stickerpicker extends React.PureComponent<IProps, IState> {
static currentWidget;
- constructor(props) {
+ private dispatcherRef: string;
+
+ private prevSentVisibility: boolean;
+
+ private popoverWidth = 300;
+ private popoverHeight = 300;
+ // This is loaded by _acquireScalarClient on an as-needed basis.
+ private scalarClient: ScalarAuthClient = null;
+
+ constructor(props: IProps) {
super(props);
- this._onShowStickersClick = this._onShowStickersClick.bind(this);
- this._onHideStickersClick = this._onHideStickersClick.bind(this);
- this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
- this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
- this._updateWidget = this._updateWidget.bind(this);
- this._onWidgetAction = this._onWidgetAction.bind(this);
- this._onResize = this._onResize.bind(this);
- this._onFinished = this._onFinished.bind(this);
-
- this.popoverWidth = 300;
- this.popoverHeight = 300;
-
- // This is loaded by _acquireScalarClient on an as-needed basis.
- this.scalarClient = null;
-
this.state = {
- showStickers: false,
imError: null,
stickerpickerX: null,
stickerpickerY: null,
@@ -70,7 +80,7 @@ export default class Stickerpicker extends React.PureComponent {
};
}
- _acquireScalarClient() {
+ private acquireScalarClient(): Promise<void | ScalarAuthClient> {
if (this.scalarClient) return Promise.resolve(this.scalarClient);
// TODO: Pick the right manager for the widget
if (IntegrationManagers.sharedInstance().hasManager()) {
@@ -79,15 +89,15 @@ export default class Stickerpicker extends React.PureComponent {
this.forceUpdate();
return this.scalarClient;
}).catch((e) => {
- this._imError(_td("Failed to connect to integration manager"), e);
+ this.imError(_td("Failed to connect to integration manager"), e);
});
} else {
IntegrationManagers.sharedInstance().openNoManagerDialog();
}
}
- async _removeStickerpickerWidgets() {
- const scalarClient = await this._acquireScalarClient();
+ private removeStickerpickerWidgets = async (): Promise<void> => {
+ const scalarClient = await this.acquireScalarClient();
console.log('Removing Stickerpicker widgets');
if (this.state.widgetId) {
if (scalarClient) {
@@ -103,50 +113,50 @@ export default class Stickerpicker extends React.PureComponent {
console.warn('No widget ID specified, not disabling assets');
}
- this.setState({ showStickers: false });
+ this.props.setShowStickers(false);
WidgetUtils.removeStickerpickerWidgets().then(() => {
this.forceUpdate();
}).catch((e) => {
console.error('Failed to remove sticker picker widget', e);
});
- }
+ };
- componentDidMount() {
+ public componentDidMount(): void {
// Close the sticker picker when the window resizes
- window.addEventListener('resize', this._onResize);
+ window.addEventListener('resize', this.onResize);
- this.dispatcherRef = dis.register(this._onWidgetAction);
+ this.dispatcherRef = dis.register(this.onWidgetAction);
// Track updates to widget state in account data
- MatrixClientPeg.get().on('accountData', this._updateWidget);
+ MatrixClientPeg.get().on('accountData', this.updateWidget);
// Initialise widget state from current account data
- this._updateWidget();
+ this.updateWidget();
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
const client = MatrixClientPeg.get();
- if (client) client.removeListener('accountData', this._updateWidget);
+ if (client) client.removeListener('accountData', this.updateWidget);
- window.removeEventListener('resize', this._onResize);
+ window.removeEventListener('resize', this.onResize);
if (this.dispatcherRef) {
dis.unregister(this.dispatcherRef);
}
}
- componentDidUpdate(prevProps, prevState) {
- this._sendVisibilityToWidget(this.state.showStickers);
+ public componentDidUpdate(prevProps: IProps, prevState: IState): void {
+ this.sendVisibilityToWidget(this.props.showStickers);
}
- _imError(errorMsg, e) {
+ private imError(errorMsg: string, e: Error): void {
console.error(errorMsg, e);
this.setState({
- showStickers: false,
imError: _t(errorMsg),
});
+ this.props.setShowStickers(false);
}
- _updateWidget() {
+ private updateWidget = (): void => {
const stickerpickerWidget = WidgetUtils.getStickerpickerWidgets()[0];
if (!stickerpickerWidget) {
Stickerpicker.currentWidget = null;
@@ -175,27 +185,27 @@ export default class Stickerpicker extends React.PureComponent {
stickerpickerWidget,
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
});
- }
+ };
- _onWidgetAction(payload) {
+ private onWidgetAction = (payload: ActionPayload): void => {
switch (payload.action) {
case "user_widget_updated":
this.forceUpdate();
break;
case "stickerpicker_close":
- this.setState({ showStickers: false });
+ this.props.setShowStickers(false);
break;
case Action.AfterRightPanelPhaseChange:
case "show_left_panel":
case "hide_left_panel":
- this.setState({ showStickers: false });
+ this.props.setShowStickers(false);
break;
}
- }
+ };
- _defaultStickerpickerContent() {
+ private defaultStickerpickerContent(): JSX.Element {
return (
- <AccessibleButton onClick={this._launchManageIntegrations}
+ <AccessibleButton onClick={this.launchManageIntegrations}
className='mx_Stickers_contentPlaceholder'>
<p>{ _t("You don't currently have any stickerpacks enabled") }</p>
<p className='mx_Stickers_addLink'>{ _t("Add some now") }</p>
@@ -204,29 +214,29 @@ export default class Stickerpicker extends React.PureComponent {
);
}
- _errorStickerpickerContent() {
+ private errorStickerpickerContent(): JSX.Element {
return (
- <div style={{ "text-align": "center" }} className="error">
+ <div style={{ textAlign: "center" }} className="error">
<p> { this.state.imError } </p>
</div>
);
}
- _sendVisibilityToWidget(visible) {
+ private sendVisibilityToWidget(visible: boolean): void {
if (!this.state.stickerpickerWidget) return;
const messaging = WidgetMessagingStore.instance.getMessagingForId(this.state.stickerpickerWidget.id);
- if (messaging && visible !== this._prevSentVisibility) {
+ if (messaging && visible !== this.prevSentVisibility) {
messaging.updateVisibility(visible).catch(err => {
console.error("Error updating widget visibility: ", err);
});
- this._prevSentVisibility = visible;
+ this.prevSentVisibility = visible;
}
}
- _getStickerpickerContent() {
+ public getStickerpickerContent(): JSX.Element {
// Handle integration manager errors
- if (this.state._imError) {
- return this._errorStickerpickerContent();
+ if (this.state.imError) {
+ return this.errorStickerpickerContent();
}
// Stickers
@@ -239,12 +249,11 @@ export default class Stickerpicker extends React.PureComponent {
// Use a separate ReactDOM tree to render the AppTile separately so that it persists and does
// not unmount when we (a) close the sticker picker (b) switch rooms. It's properties are still
// updated.
- const PersistedElement = sdk.getComponent("elements.PersistedElement");
// Load stickerpack content
if (stickerpickerWidget && stickerpickerWidget.content && stickerpickerWidget.content.url) {
// Set default name
- stickerpickerWidget.content.name = stickerpickerWidget.name || _t("Stickerpack");
+ stickerpickerWidget.content.name = stickerpickerWidget.content.name || _t("Stickerpack");
// FIXME: could this use the same code as other apps?
const stickerApp = {
@@ -275,12 +284,12 @@ export default class Stickerpicker extends React.PureComponent {
creatorUserId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}
waitForIframeLoad={true}
showMenubar={true}
- onEditClick={this._launchManageIntegrations}
- onDeleteClick={this._removeStickerpickerWidgets}
+ onEditClick={this.launchManageIntegrations}
+ onDeleteClick={this.removeStickerpickerWidgets}
showTitle={false}
showCancel={false}
showPopout={false}
- onMinimiseClick={this._onHideStickersClick}
+ onMinimiseClick={this.onHideStickersClick}
handleMinimisePointerEvents={true}
userWidget={true}
/>
@@ -290,7 +299,7 @@ export default class Stickerpicker extends React.PureComponent {
);
} else {
// Default content to show if stickerpicker widget not added
- stickersContent = this._defaultStickerpickerContent();
+ stickersContent = this.defaultStickerpickerContent();
}
return stickersContent;
}
@@ -300,7 +309,7 @@ export default class Stickerpicker extends React.PureComponent {
* Show the sticker picker overlay
* If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
*/
- _onShowStickersClick(e) {
+ private onShowStickersClick = (e: React.MouseEvent<HTMLElement>): void => {
if (!SettingsStore.getValue("integrationProvisioning")) {
// Intercept this case and spawn a warning.
return IntegrationManagers.sharedInstance().showDisabledDialog();
@@ -308,7 +317,7 @@ export default class Stickerpicker extends React.PureComponent {
// XXX: Simplify by using a context menu that is positioned relative to the sticker picker button
- const buttonRect = e.target.getBoundingClientRect();
+ const buttonRect = e.currentTarget.getBoundingClientRect();
// The window X and Y offsets are to adjust position when zoomed in to page
let x = buttonRect.right + window.pageXOffset - 41;
@@ -324,50 +333,50 @@ export default class Stickerpicker extends React.PureComponent {
// Offset the chevron location, which is relative to the left of the context menu
// (10 = offset when context menu would not be displayed off viewport)
// (2 = context menu borders)
- const stickerPickerChevronOffset = Math.max(10, 2 + window.pageXOffset + buttonRect.left - x);
+ const stickerpickerChevronOffset = Math.max(10, 2 + window.pageXOffset + buttonRect.left - x);
const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
+ this.props.setShowStickers(true);
this.setState({
- showStickers: true,
- stickerPickerX: x,
- stickerPickerY: y,
- stickerPickerChevronOffset,
+ stickerpickerX: x,
+ stickerpickerY: y,
+ stickerpickerChevronOffset,
});
- }
+ };
/**
* Trigger hiding of the sticker picker overlay
* @param {Event} ev Event that triggered the function call
*/
- _onHideStickersClick(ev) {
- if (this.state.showStickers) {
- this.setState({ showStickers: false });
+ private onHideStickersClick = (ev: React.MouseEvent): void => {
+ if (this.props.showStickers) {
+ this.props.setShowStickers(false);
}
- }
+ };
/**
* Called when the window is resized
*/
- _onResize() {
- if (this.state.showStickers) {
- this.setState({ showStickers: false });
+ private onResize = (): void => {
+ if (this.props.showStickers) {
+ this.props.setShowStickers(false);
}
- }
+ };
/**
* The stickers picker was hidden
*/
- _onFinished() {
- if (this.state.showStickers) {
- this.setState({ showStickers: false });
+ private onFinished = (): void => {
+ if (this.props.showStickers) {
+ this.props.setShowStickers(false);
}
- }
+ };
/**
* Launch the integration manager on the stickers integration page
*/
- _launchManageIntegrations = () => {
+ private launchManageIntegrations = (): void => {
// TODO: Open the right integration manager for the widget
if (SettingsStore.getValue("feature_many_integration_managers")) {
IntegrationManagers.sharedInstance().openAll(
@@ -384,57 +393,24 @@ export default class Stickerpicker extends React.PureComponent {
}
};
- render() {
- let stickerPicker;
- let stickersButton;
- const className = classNames(
- "mx_MessageComposer_button",
- "mx_MessageComposer_stickers",
- "mx_Stickers_hideStickers",
- "mx_MessageComposer_button_highlight",
- );
- if (this.state.showStickers) {
- // Show hide-stickers button
- stickersButton =
- <AccessibleButton
- id='stickersButton'
- key="controls_hide_stickers"
- className={className}
- onClick={this._onHideStickersClick}
- active={this.state.showStickers.toString()}
- title={_t("Hide Stickers")}
- />;
+ public render(): JSX.Element {
+ if (!this.props.showStickers) return null;
- const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
- stickerPicker = <ContextMenu
- chevronOffset={this.state.stickerPickerChevronOffset}
- chevronFace="bottom"
- left={this.state.stickerPickerX}
- top={this.state.stickerPickerY}
- menuWidth={this.popoverWidth}
- menuHeight={this.popoverHeight}
- onFinished={this._onFinished}
- menuPaddingTop={0}
- menuPaddingLeft={0}
- menuPaddingRight={0}
- zIndex={STICKERPICKER_Z_INDEX}
- >
- <GenericElementContextMenu element={this._getStickerpickerContent()} onResize={this._onFinished} />
- </ContextMenu>;
- } else {
- // Show show-stickers button
- stickersButton =
- <AccessibleTooltipButton
- id='stickersButton'
- key="controls_show_stickers"
- className="mx_MessageComposer_button mx_MessageComposer_stickers"
- onClick={this._onShowStickersClick}
- title={_t("Show Stickers")}
- />;
- }
- return <React.Fragment>
- { stickersButton }
- { stickerPicker }
- </React.Fragment>;
+ return <ContextMenu
+ chevronOffset={this.state.stickerpickerChevronOffset}
+ chevronFace={ChevronFace.Bottom}
+ left={this.state.stickerpickerX}
+ top={this.state.stickerpickerY}
+ menuWidth={this.popoverWidth}
+ menuHeight={this.popoverHeight}
+ onFinished={this.onFinished}
+ menuPaddingTop={0}
+ menuPaddingLeft={0}
+ menuPaddingRight={0}
+ zIndex={STICKERPICKER_Z_INDEX}
+ {...this.props.menuPosition}
+ >
+ <GenericElementContextMenu element={this.getStickerpickerContent()} onResize={this.onFinished} />
+ </ContextMenu>;
}
}
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.tsx
similarity index 80%
rename from src/components/views/rooms/TopUnreadMessagesBar.js
rename to src/components/views/rooms/TopUnreadMessagesBar.tsx
index d2a3e3a303..14f9a27f2d 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.tsx
@@ -1,7 +1,5 @@
/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector Ltd
+Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,19 +15,18 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler';
import AccessibleButton from '../elements/AccessibleButton';
import { replaceableComponent } from "../../../utils/replaceableComponent";
-@replaceableComponent("views.rooms.TopUnreadMessagesBar")
-export default class TopUnreadMessagesBar extends React.Component {
- static propTypes = {
- onScrollUpClick: PropTypes.func,
- onCloseClick: PropTypes.func,
- };
+interface IProps {
+ onScrollUpClick?: (e: React.MouseEvent) => void;
+ onCloseClick?: (e: React.MouseEvent) => void;
+}
- render() {
+@replaceableComponent("views.rooms.TopUnreadMessagesBar")
+export default class TopUnreadMessagesBar extends React.PureComponent<IProps> {
+ public render(): JSX.Element {
return (
<div className="mx_TopUnreadMessagesBar">
<AccessibleButton
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index e8befb90fa..288d97fc50 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -20,7 +20,6 @@ import React, { ReactNode } from "react";
import { IUpload, RecordingState, VoiceRecording } from "../../../audio/VoiceRecording";
import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import classNames from "classnames";
import LiveRecordingWaveform from "../audio_messages/LiveRecordingWaveform";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import LiveRecordingClock from "../audio_messages/LiveRecordingClock";
@@ -137,7 +136,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
await this.disposeRecording();
};
- private onRecordStartEndClick = async () => {
+ public onRecordStartEndClick = async () => {
if (this.state.recorder) {
await this.state.recorder.stop();
return;
@@ -179,7 +178,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
try {
// stop any noises which might be happening
- await PlaybackManager.instance.playOnly(null);
+ await PlaybackManager.instance.pauseAllExcept(null);
const recorder = VoiceRecordingStore.instance.startRecording();
await recorder.start();
@@ -215,27 +214,23 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
}
public render(): ReactNode {
- let stopOrRecordBtn;
- let deleteButton;
- if (!this.state.recordingPhase || this.state.recordingPhase === RecordingState.Started) {
- const classes = classNames({
- 'mx_MessageComposer_button': !this.state.recorder,
- 'mx_MessageComposer_voiceMessage': !this.state.recorder,
- 'mx_VoiceRecordComposerTile_stop': this.state.recorder?.isRecording,
- });
+ if (!this.state.recordingPhase) return null;
+ let stopBtn;
+ let deleteButton;
+ if (this.state.recordingPhase === RecordingState.Started) {
let tooltip = _t("Send voice message");
if (!!this.state.recorder) {
tooltip = _t("Stop recording");
}
- stopOrRecordBtn = <AccessibleTooltipButton
- className={classes}
+ stopBtn = <AccessibleTooltipButton
+ className="mx_VoiceRecordComposerTile_stop"
onClick={this.onRecordStartEndClick}
title={tooltip}
/>;
if (this.state.recorder && !this.state.recorder?.isRecording) {
- stopOrRecordBtn = null;
+ stopBtn = null;
}
}
@@ -264,13 +259,10 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
</span>;
}
- // The record button (mic icon) is meant to be on the right edge, but we also want the
- // stop button to be left of the waveform area. Luckily, none of the surrounding UI is
- // rendered when we're not recording, so the record button ends up in the correct spot.
return (<>
{ uploadIndicator }
{ deleteButton }
- { stopOrRecordBtn }
+ { stopBtn }
{ this.renderWaveformArea() }
</>);
}
diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.tsx
similarity index 86%
rename from src/components/views/settings/AvatarSetting.js
rename to src/components/views/settings/AvatarSetting.tsx
index f22c4f1c85..806d0adb73 100644
--- a/src/components/views/settings/AvatarSetting.js
+++ b/src/components/views/settings/AvatarSetting.tsx
@@ -15,12 +15,19 @@ limitations under the License.
*/
import React, { useState } from "react";
-import PropTypes from "prop-types";
import { _t } from "../../../languageHandler";
import AccessibleButton from "../elements/AccessibleButton";
import classNames from "classnames";
-const AvatarSetting = ({ avatarUrl, avatarAltText, avatarName, uploadAvatar, removeAvatar }) => {
+interface IProps {
+ avatarUrl?: string;
+ avatarName: string; // name of user/room the avatar belongs to
+ uploadAvatar?: (e: React.MouseEvent) => void;
+ removeAvatar?: (e: React.MouseEvent) => void;
+ avatarAltText: string;
+}
+
+const AvatarSetting: React.FC<IProps> = ({ avatarUrl, avatarAltText, avatarName, uploadAvatar, removeAvatar }) => {
const [isHovering, setIsHovering] = useState(false);
const hoveringProps = {
onMouseEnter: () => setIsHovering(true),
@@ -78,12 +85,4 @@ const AvatarSetting = ({ avatarUrl, avatarAltText, avatarName, uploadAvatar, rem
</div>;
};
-AvatarSetting.propTypes = {
- avatarUrl: PropTypes.string,
- avatarName: PropTypes.string.isRequired, // name of user/room the avatar belongs to
- uploadAvatar: PropTypes.func,
- removeAvatar: PropTypes.func,
- avatarAltText: PropTypes.string.isRequired,
-};
-
export default AvatarSetting;
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.tsx
similarity index 71%
rename from src/components/views/settings/ChangeAvatar.js
rename to src/components/views/settings/ChangeAvatar.tsx
index c3a1544cdc..36178540f7 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2015-2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,54 +15,65 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import Spinner from '../elements/Spinner';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { mediaFromMxc } from "../../../customisations/Media";
+import RoomAvatar from '../avatars/RoomAvatar';
+import BaseAvatar from '../avatars/BaseAvatar';
+
+interface IProps {
+ initialAvatarUrl?: string;
+ room?: Room;
+ // if false, you need to call changeAvatar.onFileSelected yourself.
+ showUploadSection?: boolean;
+ width?: number;
+ height?: number;
+ className?: string;
+}
+
+interface IState {
+ avatarUrl?: string;
+ errorText?: string;
+ phase?: Phases;
+}
+
+enum Phases {
+ Display = "display",
+ Uploading = "uploading",
+ Error = "error",
+}
@replaceableComponent("views.settings.ChangeAvatar")
-export default class ChangeAvatar extends React.Component {
- static propTypes = {
- initialAvatarUrl: PropTypes.string,
- room: PropTypes.object,
- // if false, you need to call changeAvatar.onFileSelected yourself.
- showUploadSection: PropTypes.bool,
- width: PropTypes.number,
- height: PropTypes.number,
- className: PropTypes.string,
- };
-
- static Phases = {
- Display: "display",
- Uploading: "uploading",
- Error: "error",
- };
-
- static defaultProps = {
+export default class ChangeAvatar extends React.Component<IProps, IState> {
+ public static defaultProps = {
showUploadSection: true,
className: "",
width: 80,
height: 80,
};
- constructor(props) {
+ private avatarSet = false;
+
+ constructor(props: IProps) {
super(props);
this.state = {
avatarUrl: this.props.initialAvatarUrl,
- phase: ChangeAvatar.Phases.Display,
+ phase: Phases.Display,
};
}
- componentDidMount() {
+ public componentDidMount(): void {
MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
}
// TODO: [REACT-WARNING] Replace with appropriate lifecycle event
- UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
+ // eslint-disable-next-line
+ public UNSAFE_componentWillReceiveProps(newProps: IProps): void {
if (this.avatarSet) {
// don't clobber what the user has just set
return;
@@ -72,13 +83,13 @@ export default class ChangeAvatar extends React.Component {
});
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
}
}
- onRoomStateEvents = (ev) => {
+ private onRoomStateEvents = (ev: MatrixEvent) => {
if (!this.props.room) {
return;
}
@@ -94,18 +105,17 @@ export default class ChangeAvatar extends React.Component {
}
};
- setAvatarFromFile(file) {
+ private setAvatarFromFile(file: File): Promise<{}> {
let newUrl = null;
this.setState({
- phase: ChangeAvatar.Phases.Uploading,
+ phase: Phases.Uploading,
});
- const self = this;
- const httpPromise = MatrixClientPeg.get().uploadContent(file).then(function(url) {
+ const httpPromise = MatrixClientPeg.get().uploadContent(file).then((url) => {
newUrl = url;
- if (self.props.room) {
+ if (this.props.room) {
return MatrixClientPeg.get().sendStateEvent(
- self.props.room.roomId,
+ this.props.room.roomId,
'm.room.avatar',
{ url: url },
'',
@@ -115,38 +125,37 @@ export default class ChangeAvatar extends React.Component {
}
});
- httpPromise.then(function() {
- self.setState({
- phase: ChangeAvatar.Phases.Display,
+ httpPromise.then(() => {
+ this.setState({
+ phase: Phases.Display,
avatarUrl: mediaFromMxc(newUrl).srcHttp,
});
- }, function(error) {
- self.setState({
- phase: ChangeAvatar.Phases.Error,
+ }, () => {
+ this.setState({
+ phase: Phases.Error,
});
- self.onError(error);
+ this.onError();
});
return httpPromise;
}
- onFileSelected = (ev) => {
+ private onFileSelected = (ev: React.ChangeEvent<HTMLInputElement>) => {
this.avatarSet = true;
return this.setAvatarFromFile(ev.target.files[0]);
};
- onError = (error) => {
+ private onError = (): void => {
this.setState({
errorText: _t("Failed to upload profile picture!"),
});
};
- render() {
+ public render(): JSX.Element {
let avatarImg;
// Having just set an avatar we just display that since it will take a little
// time to propagate through to the RoomAvatar.
if (this.props.room && !this.avatarSet) {
- const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
avatarImg = <RoomAvatar
room={this.props.room}
width={this.props.width}
@@ -154,7 +163,6 @@ export default class ChangeAvatar extends React.Component {
resizeMethod='crop'
/>;
} else {
- const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
// XXX: FIXME: once we track in the JS what our own displayname is(!) then use it here rather than ?
avatarImg = <BaseAvatar
width={this.props.width}
@@ -178,8 +186,8 @@ export default class ChangeAvatar extends React.Component {
}
switch (this.state.phase) {
- case ChangeAvatar.Phases.Display:
- case ChangeAvatar.Phases.Error:
+ case Phases.Display:
+ case Phases.Error:
return (
<div>
<div className={this.props.className}>
@@ -188,7 +196,7 @@ export default class ChangeAvatar extends React.Component {
{ uploadSection }
</div>
);
- case ChangeAvatar.Phases.Uploading:
+ case Phases.Uploading:
return (
<Spinner />
);
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.tsx
similarity index 73%
rename from src/components/views/settings/ChangeDisplayName.js
rename to src/components/views/settings/ChangeDisplayName.tsx
index 2f336e18c6..9f0f813ec6 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.tsx
@@ -1,7 +1,5 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,14 +15,14 @@ limitations under the License.
*/
import React from 'react';
-import * as sdk from '../../../index';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import { _t } from '../../../languageHandler';
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import EditableTextContainer from "../elements/EditableTextContainer";
@replaceableComponent("views.settings.ChangeDisplayName")
export default class ChangeDisplayName extends React.Component {
- _getDisplayName = async () => {
+ private getDisplayName = async (): Promise<string> => {
const cli = MatrixClientPeg.get();
try {
const res = await cli.getProfileInfo(cli.getUserId());
@@ -34,21 +32,20 @@ export default class ChangeDisplayName extends React.Component {
}
};
- _changeDisplayName = (newDisplayname) => {
+ private changeDisplayName = (newDisplayname: string): Promise<{}> => {
const cli = MatrixClientPeg.get();
- return cli.setDisplayName(newDisplayname).catch(function(e) {
- throw new Error("Failed to set display name", e);
+ return cli.setDisplayName(newDisplayname).catch(function() {
+ throw new Error("Failed to set display name");
});
};
- render() {
- const EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
+ public render(): JSX.Element {
return (
<EditableTextContainer
- getInitialValue={this._getDisplayName}
+ getInitialValue={this.getDisplayName}
placeholder={_t("No display name")}
blurToSubmit={true}
- onSubmit={this._changeDisplayName} />
+ onSubmit={this.changeDisplayName} />
);
}
}
diff --git a/src/components/views/settings/CrossSigningPanel.tsx b/src/components/views/settings/CrossSigningPanel.tsx
index 21e38a762a..3fd67d6b5d 100644
--- a/src/components/views/settings/CrossSigningPanel.tsx
+++ b/src/components/views/settings/CrossSigningPanel.tsx
@@ -25,6 +25,8 @@ import InteractiveAuthDialog from '../dialogs/InteractiveAuthDialog';
import ConfirmDestroyCrossSigningDialog from '../dialogs/security/ConfirmDestroyCrossSigningDialog';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { MatrixEvent } from 'matrix-js-sdk/src';
+import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
+import { accessSecretStorage } from '../../../SecurityManager';
interface IState {
error?: Error;
@@ -72,7 +74,16 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
};
private onBootstrapClick = () => {
- this.bootstrapCrossSigning({ forceReset: false });
+ if (this.state.crossSigningPrivateKeysInStorage) {
+ Modal.createTrackedDialog(
+ "Verify session", "Verify session", SetupEncryptionDialog,
+ {}, null, /* priority = */ false, /* static = */ true,
+ );
+ } else {
+ // Trigger the flow to set up secure backup, which is what this will do when in
+ // the appropriate state.
+ accessSecretStorage();
+ }
};
private onStatusChanged = () => {
@@ -176,10 +187,14 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
summarisedStatus = <p>{ _t(
"Your homeserver does not support cross-signing.",
) }</p>;
- } else if (crossSigningReady) {
+ } else if (crossSigningReady && crossSigningPrivateKeysInStorage) {
summarisedStatus = <p>✅ { _t(
"Cross-signing is ready for use.",
) }</p>;
+ } else if (crossSigningReady && !crossSigningPrivateKeysInStorage) {
+ summarisedStatus = <p>⚠️ { _t(
+ "Cross-signing is ready but keys are not backed up.",
+ ) }</p>;
} else if (crossSigningPrivateKeysInStorage) {
summarisedStatus = <p>{ _t(
"Your account has a cross-signing identity in secret storage, " +
@@ -210,9 +225,13 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
// TODO: determine how better to expose this to users in addition to prompts at login/toast
if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
+ let buttonCaption = _t("Set up Secure Backup");
+ if (crossSigningPrivateKeysInStorage) {
+ buttonCaption = _t("Verify this session");
+ }
actions.push(
<AccessibleButton key="setup" kind="primary" onClick={this.onBootstrapClick}>
- { _t("Set up") }
+ { buttonCaption }
</AccessibleButton>,
);
}
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.tsx
similarity index 77%
rename from src/components/views/settings/DevicesPanel.js
rename to src/components/views/settings/DevicesPanel.tsx
index 0f052332ee..9a1321619e 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.tsx
@@ -1,6 +1,5 @@
/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,52 +15,58 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
import classNames from 'classnames';
+import { IMyDevice } from "matrix-js-sdk/src/client";
-import * as sdk from '../../../index';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import InteractiveAuthDialog from "../dialogs/InteractiveAuthDialog";
+import DevicesPanelEntry from "./DevicesPanelEntry";
+import Spinner from "../elements/Spinner";
+import AccessibleButton from "../elements/AccessibleButton";
+
+interface IProps {
+ className?: string;
+}
+
+interface IState {
+ devices: IMyDevice[];
+ deviceLoadError?: string;
+ selectedDevices: string[];
+ deleting?: boolean;
+}
@replaceableComponent("views.settings.DevicesPanel")
-export default class DevicesPanel extends React.Component {
- constructor(props) {
+export default class DevicesPanel extends React.Component<IProps, IState> {
+ private unmounted = false;
+
+ constructor(props: IProps) {
super(props);
-
this.state = {
- devices: undefined,
- deviceLoadError: undefined,
-
+ devices: [],
selectedDevices: [],
- deleting: false,
};
-
- this._unmounted = false;
-
- this._renderDevice = this._renderDevice.bind(this);
- this._onDeviceSelectionToggled = this._onDeviceSelectionToggled.bind(this);
- this._onDeleteClick = this._onDeleteClick.bind(this);
}
- componentDidMount() {
- this._loadDevices();
+ public componentDidMount(): void {
+ this.loadDevices();
}
- componentWillUnmount() {
- this._unmounted = true;
+ public componentWillUnmount(): void {
+ this.unmounted = true;
}
- _loadDevices() {
+ private loadDevices(): void {
MatrixClientPeg.get().getDevices().then(
(resp) => {
- if (this._unmounted) { return; }
+ if (this.unmounted) { return; }
this.setState({ devices: resp.devices || [] });
},
(error) => {
- if (this._unmounted) { return; }
+ if (this.unmounted) { return; }
let errtxt;
if (error.httpStatus == 404) {
// 404 probably means the HS doesn't yet support the API.
@@ -79,7 +84,7 @@ export default class DevicesPanel extends React.Component {
* compare two devices, sorting from most-recently-seen to least-recently-seen
* (and then, for stability, by device id)
*/
- _deviceCompare(a, b) {
+ private deviceCompare(a: IMyDevice, b: IMyDevice): number {
// return < 0 if a comes before b, > 0 if a comes after b.
const lastSeenDelta =
(b.last_seen_ts || 0) - (a.last_seen_ts || 0);
@@ -91,8 +96,8 @@ export default class DevicesPanel extends React.Component {
return (idA < idB) ? -1 : (idA > idB) ? 1 : 0;
}
- _onDeviceSelectionToggled(device) {
- if (this._unmounted) { return; }
+ private onDeviceSelectionToggled = (device: IMyDevice): void => {
+ if (this.unmounted) { return; }
const deviceId = device.device_id;
this.setState((state, props) => {
@@ -108,22 +113,21 @@ export default class DevicesPanel extends React.Component {
return { selectedDevices };
});
- }
+ };
- _onDeleteClick() {
+ private onDeleteClick = (): void => {
this.setState({
deleting: true,
});
- this._makeDeleteRequest(null).catch((error) => {
- if (this._unmounted) { return; }
+ this.makeDeleteRequest(null).catch((error) => {
+ if (this.unmounted) { return; }
if (error.httpStatus !== 401 || !error.data || !error.data.flows) {
// doesn't look like an interactive-auth failure
throw error;
}
// pop up an interactive auth dialog
- const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
const numDevices = this.state.selectedDevices.length;
const dialogAesthetics = {
@@ -148,7 +152,7 @@ export default class DevicesPanel extends React.Component {
title: _t("Authentication"),
matrixClient: MatrixClientPeg.get(),
authData: error.data,
- makeRequest: this._makeDeleteRequest.bind(this),
+ makeRequest: this.makeDeleteRequest.bind(this),
aestheticsForStagePhases: {
[SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
[SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
@@ -156,15 +160,16 @@ export default class DevicesPanel extends React.Component {
});
}).catch((e) => {
console.error("Error deleting sessions", e);
- if (this._unmounted) { return; }
+ if (this.unmounted) { return; }
}).finally(() => {
this.setState({
deleting: false,
});
});
- }
+ };
- _makeDeleteRequest(auth) {
+ // TODO: proper typing for auth
+ private makeDeleteRequest(auth?: any): Promise<any> {
return MatrixClientPeg.get().deleteMultipleDevices(this.state.selectedDevices, auth).then(
() => {
// Remove the deleted devices from `devices`, reset selection to []
@@ -178,20 +183,16 @@ export default class DevicesPanel extends React.Component {
);
}
- _renderDevice(device) {
- const DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
+ private renderDevice = (device: IMyDevice): JSX.Element => {
return <DevicesPanelEntry
key={device.device_id}
device={device}
selected={this.state.selectedDevices.includes(device.device_id)}
- onDeviceToggled={this._onDeviceSelectionToggled}
+ onDeviceToggled={this.onDeviceSelectionToggled}
/>;
- }
-
- render() {
- const Spinner = sdk.getComponent("elements.Spinner");
- const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+ };
+ public render(): JSX.Element {
if (this.state.deviceLoadError !== undefined) {
const classes = classNames(this.props.className, "error");
return (
@@ -204,15 +205,14 @@ export default class DevicesPanel extends React.Component {
const devices = this.state.devices;
if (devices === undefined) {
// still loading
- const classes = this.props.className;
- return <Spinner className={classes} />;
+ return <Spinner />;
}
- devices.sort(this._deviceCompare);
+ devices.sort(this.deviceCompare);
const deleteButton = this.state.deleting ?
<Spinner w={22} h={22} /> :
- <AccessibleButton onClick={this._onDeleteClick} kind="danger_sm">
+ <AccessibleButton onClick={this.onDeleteClick} kind="danger_sm">
{ _t("Delete %(count)s sessions", { count: this.state.selectedDevices.length }) }
</AccessibleButton>;
@@ -227,12 +227,8 @@ export default class DevicesPanel extends React.Component {
{ this.state.selectedDevices.length > 0 ? deleteButton : null }
</div>
</div>
- { devices.map(this._renderDevice) }
+ { devices.map(this.renderDevice) }
</div>
);
}
}
-
-DevicesPanel.propTypes = {
- className: PropTypes.string,
-};
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.tsx
similarity index 74%
rename from src/components/views/settings/DevicesPanelEntry.js
rename to src/components/views/settings/DevicesPanelEntry.tsx
index a5b674b8f6..d033bc41a9 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2016 OpenMarket Ltd
+Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,30 +15,28 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
+import { IMyDevice } from 'matrix-js-sdk/src/client';
-import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import { formatDate } from '../../../DateUtils';
import StyledCheckbox from '../elements/StyledCheckbox';
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import EditableTextContainer from "../elements/EditableTextContainer";
+
+interface IProps {
+ device?: IMyDevice;
+ onDeviceToggled?: (device: IMyDevice) => void;
+ selected?: boolean;
+}
@replaceableComponent("views.settings.DevicesPanelEntry")
-export default class DevicesPanelEntry extends React.Component {
- constructor(props) {
- super(props);
+export default class DevicesPanelEntry extends React.Component<IProps> {
+ public static defaultProps = {
+ onDeviceToggled: () => {},
+ };
- this._unmounted = false;
- this.onDeviceToggled = this.onDeviceToggled.bind(this);
- this._onDisplayNameChanged = this._onDisplayNameChanged.bind(this);
- }
-
- componentWillUnmount() {
- this._unmounted = true;
- }
-
- _onDisplayNameChanged(value) {
+ private onDisplayNameChanged = (value: string): Promise<{}> => {
const device = this.props.device;
return MatrixClientPeg.get().setDeviceDetails(device.device_id, {
display_name: value,
@@ -46,15 +44,13 @@ export default class DevicesPanelEntry extends React.Component {
console.error("Error setting session display name", e);
throw new Error(_t("Failed to set display name"));
});
- }
+ };
- onDeviceToggled() {
+ private onDeviceToggled = (): void => {
this.props.onDeviceToggled(this.props.device);
- }
-
- render() {
- const EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
+ };
+ public render(): JSX.Element {
const device = this.props.device;
let lastSeen = "";
@@ -76,7 +72,7 @@ export default class DevicesPanelEntry extends React.Component {
</div>
<div className="mx_DevicesPanel_deviceName">
<EditableTextContainer initialValue={device.display_name}
- onSubmit={this._onDisplayNameChanged}
+ onSubmit={this.onDisplayNameChanged}
placeholder={device.device_id}
/>
</div>
@@ -90,12 +86,3 @@ export default class DevicesPanelEntry extends React.Component {
);
}
}
-
-DevicesPanelEntry.propTypes = {
- device: PropTypes.object.isRequired,
- onDeviceToggled: PropTypes.func,
-};
-
-DevicesPanelEntry.defaultProps = {
- onDeviceToggled: function() {},
-};
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.tsx
similarity index 68%
rename from src/components/views/settings/IntegrationManager.js
rename to src/components/views/settings/IntegrationManager.tsx
index 9f2985df14..0b880c019f 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.tsx
@@ -1,6 +1,5 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,53 +15,55 @@ limitations under the License.
*/
import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import dis from '../../../dispatcher/dispatcher';
import { Key } from "../../../Keyboard";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ActionPayload } from '../../../dispatcher/payloads';
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+ // false to display an error saying that we couldn't connect to the integration manager
+ connected: boolean;
+
+ // true to display a loading spinner
+ loading: boolean;
+
+ // The source URL to load
+ url?: string;
+
+ // callback when the manager is dismissed
+ onFinished: () => void;
+}
+
+interface IState {
+ errored: boolean;
+}
@replaceableComponent("views.settings.IntegrationManager")
-export default class IntegrationManager extends React.Component {
- static propTypes = {
- // false to display an error saying that we couldn't connect to the integration manager
- connected: PropTypes.bool.isRequired,
+export default class IntegrationManager extends React.Component<IProps, IState> {
+ private dispatcherRef: string;
- // true to display a loading spinner
- loading: PropTypes.bool.isRequired,
-
- // The source URL to load
- url: PropTypes.string,
-
- // callback when the manager is dismissed
- onFinished: PropTypes.func.isRequired,
- };
-
- static defaultProps = {
+ public static defaultProps = {
connected: true,
loading: false,
};
- constructor(props) {
- super(props);
+ public state = {
+ errored: false,
+ };
- this.state = {
- errored: false,
- };
- }
-
- componentDidMount() {
+ public componentDidMount(): void {
this.dispatcherRef = dis.register(this.onAction);
document.addEventListener("keydown", this.onKeyDown);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
dis.unregister(this.dispatcherRef);
document.removeEventListener("keydown", this.onKeyDown);
}
- onKeyDown = (ev) => {
+ private onKeyDown = (ev: KeyboardEvent): void => {
if (ev.key === Key.ESCAPE) {
ev.stopPropagation();
ev.preventDefault();
@@ -70,19 +71,18 @@ export default class IntegrationManager extends React.Component {
}
};
- onAction = (payload) => {
+ private onAction = (payload: ActionPayload): void => {
if (payload.action === 'close_scalar') {
this.props.onFinished();
}
};
- onError = () => {
+ private onError = (): void => {
this.setState({ errored: true });
};
- render() {
+ public render(): JSX.Element {
if (this.props.loading) {
- const Spinner = sdk.getComponent("elements.Spinner");
return (
<div className='mx_IntegrationManager_loading'>
<h3>{ _t("Connecting to integration manager...") }</h3>
diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx
new file mode 100644
index 0000000000..94c70f861e
--- /dev/null
+++ b/src/components/views/settings/JoinRuleSettings.tsx
@@ -0,0 +1,269 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { IJoinRuleEventContent, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import StyledRadioGroup, { IDefinition } from "../elements/StyledRadioGroup";
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import RoomAvatar from "../avatars/RoomAvatar";
+import SpaceStore from "../../../stores/SpaceStore";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import Modal from "../../../Modal";
+import ManageRestrictedJoinRuleDialog from "../dialogs/ManageRestrictedJoinRuleDialog";
+import RoomUpgradeWarningDialog from "../dialogs/RoomUpgradeWarningDialog";
+import { upgradeRoom } from "../../../utils/RoomUpgrade";
+import { arrayHasDiff } from "../../../utils/arrays";
+import { useLocalEcho } from "../../../hooks/useLocalEcho";
+import dis from "../../../dispatcher/dispatcher";
+import { ROOM_SECURITY_TAB } from "../dialogs/RoomSettingsDialog";
+
+interface IProps {
+ room: Room;
+ promptUpgrade?: boolean;
+ closeSettingsFn(): void;
+ onError(error: Error): void;
+ beforeChange?(joinRule: JoinRule): Promise<boolean>; // if returns false then aborts the change
+}
+
+const JoinRuleSettings = ({ room, promptUpgrade, onError, beforeChange, closeSettingsFn }: IProps) => {
+ const cli = room.client;
+
+ const restrictedRoomCapabilities = SpaceStore.instance.restrictedJoinRuleSupport;
+ const roomSupportsRestricted = Array.isArray(restrictedRoomCapabilities?.support)
+ && restrictedRoomCapabilities.support.includes(room.getVersion());
+ const preferredRestrictionVersion = !roomSupportsRestricted && promptUpgrade
+ ? restrictedRoomCapabilities?.preferred
+ : undefined;
+
+ const disabled = !room.currentState.mayClientSendStateEvent(EventType.RoomJoinRules, cli);
+
+ const [content, setContent] = useLocalEcho<IJoinRuleEventContent>(
+ () => room.currentState.getStateEvents(EventType.RoomJoinRules, "")?.getContent(),
+ content => cli.sendStateEvent(room.roomId, EventType.RoomJoinRules, content, ""),
+ onError,
+ );
+
+ const { join_rule: joinRule } = content;
+ const restrictedAllowRoomIds = joinRule === JoinRule.Restricted
+ ? content.allow.filter(o => o.type === RestrictedAllowType.RoomMembership).map(o => o.room_id)
+ : undefined;
+
+ const editRestrictedRoomIds = async (): Promise<string[] | undefined> => {
+ let selected = restrictedAllowRoomIds;
+ if (!selected?.length && SpaceStore.instance.activeSpace) {
+ selected = [SpaceStore.instance.activeSpace.roomId];
+ }
+
+ const matrixClient = MatrixClientPeg.get();
+ const { finished } = Modal.createTrackedDialog('Edit restricted', '', ManageRestrictedJoinRuleDialog, {
+ matrixClient,
+ room,
+ selected,
+ }, "mx_ManageRestrictedJoinRuleDialog_wrapper");
+
+ const [roomIds] = await finished;
+ return roomIds;
+ };
+
+ const definitions: IDefinition<JoinRule>[] = [{
+ value: JoinRule.Invite,
+ label: _t("Private (invite only)"),
+ description: _t("Only invited people can join."),
+ checked: joinRule === JoinRule.Invite || (joinRule === JoinRule.Restricted && !restrictedAllowRoomIds?.length),
+ }, {
+ value: JoinRule.Public,
+ label: _t("Public"),
+ description: _t("Anyone can find and join."),
+ }];
+
+ if (roomSupportsRestricted || preferredRestrictionVersion || joinRule === JoinRule.Restricted) {
+ let upgradeRequiredPill;
+ if (preferredRestrictionVersion) {
+ upgradeRequiredPill = <span className="mx_SecurityRoomSettingsTab_upgradeRequired">
+ { _t("Upgrade required") }
+ </span>;
+ }
+
+ let description;
+ if (joinRule === JoinRule.Restricted && restrictedAllowRoomIds?.length) {
+ // only show the first 4 spaces we know about, so that the UI doesn't grow out of proportion there are lots.
+ const shownSpaces = restrictedAllowRoomIds
+ .map(roomId => cli.getRoom(roomId))
+ .filter(room => room?.isSpaceRoom())
+ .slice(0, 4);
+
+ let moreText;
+ if (shownSpaces.length < restrictedAllowRoomIds.length) {
+ if (shownSpaces.length > 0) {
+ moreText = _t("& %(count)s more", {
+ count: restrictedAllowRoomIds.length - shownSpaces.length,
+ });
+ } else {
+ moreText = _t("Currently, %(count)s spaces have access", {
+ count: restrictedAllowRoomIds.length,
+ });
+ }
+ }
+
+ const onRestrictedRoomIdsChange = (newAllowRoomIds: string[]) => {
+ if (!arrayHasDiff(restrictedAllowRoomIds || [], newAllowRoomIds)) return;
+
+ if (!newAllowRoomIds.length) {
+ setContent({
+ join_rule: JoinRule.Invite,
+ });
+ return;
+ }
+
+ setContent({
+ join_rule: JoinRule.Restricted,
+ allow: newAllowRoomIds.map(roomId => ({
+ "type": RestrictedAllowType.RoomMembership,
+ "room_id": roomId,
+ })),
+ });
+ };
+
+ const onEditRestrictedClick = async () => {
+ const restrictedAllowRoomIds = await editRestrictedRoomIds();
+ if (!Array.isArray(restrictedAllowRoomIds)) return;
+ if (restrictedAllowRoomIds.length > 0) {
+ onRestrictedRoomIdsChange(restrictedAllowRoomIds);
+ } else {
+ onChange(JoinRule.Invite);
+ }
+ };
+
+ description = <div>
+ <span>
+ { _t("Anyone in a space can find and join. <a>Edit which spaces can access here.</a>", {}, {
+ a: sub => <AccessibleButton
+ disabled={disabled}
+ onClick={onEditRestrictedClick}
+ kind="link"
+ >
+ { sub }
+ </AccessibleButton>,
+ }) }
+ </span>
+
+ <div className="mx_SecurityRoomSettingsTab_spacesWithAccess">
+ <h4>{ _t("Spaces with access") }</h4>
+ { shownSpaces.map(room => {
+ return <span key={room.roomId}>
+ <RoomAvatar room={room} height={32} width={32} />
+ { room.name }
+ </span>;
+ }) }
+ { moreText && <span>{ moreText }</span> }
+ </div>
+ </div>;
+ } else if (SpaceStore.instance.activeSpace) {
+ description = _t("Anyone in <spaceName/> can find and join. You can select other spaces too.", {}, {
+ spaceName: () => <b>{ SpaceStore.instance.activeSpace.name }</b>,
+ });
+ } else {
+ description = _t("Anyone in a space can find and join. You can select multiple spaces.");
+ }
+
+ definitions.splice(1, 0, {
+ value: JoinRule.Restricted,
+ label: <>
+ { _t("Space members") }
+ { upgradeRequiredPill }
+ </>,
+ description,
+ // if there are 0 allowed spaces then render it as invite only instead
+ checked: joinRule === JoinRule.Restricted && !!restrictedAllowRoomIds?.length,
+ });
+ }
+
+ const onChange = async (joinRule: JoinRule) => {
+ const beforeJoinRule = content.join_rule;
+
+ let restrictedAllowRoomIds: string[];
+ if (joinRule === JoinRule.Restricted) {
+ if (beforeJoinRule === JoinRule.Restricted || roomSupportsRestricted) {
+ // Have the user pick which spaces to allow joins from
+ restrictedAllowRoomIds = await editRestrictedRoomIds();
+ if (!Array.isArray(restrictedAllowRoomIds)) return;
+ } else if (preferredRestrictionVersion) {
+ // Block this action on a room upgrade otherwise it'd make their room unjoinable
+ const targetVersion = preferredRestrictionVersion;
+ Modal.createTrackedDialog('Restricted join rule upgrade', '', RoomUpgradeWarningDialog, {
+ roomId: room.roomId,
+ targetVersion,
+ description: _t("This upgrade will allow members of selected spaces " +
+ "access to this room without an invite."),
+ onFinished: async (resp) => {
+ if (!resp?.continue) return;
+ const roomId = await upgradeRoom(room, targetVersion, resp.invite, true, true, true);
+ closeSettingsFn();
+ // switch to the new room in the background
+ dis.dispatch({
+ action: "view_room",
+ room_id: roomId,
+ });
+ // open new settings on this tab
+ dis.dispatch({
+ action: "open_room_settings",
+ initial_tab_id: ROOM_SECURITY_TAB,
+ });
+ },
+ });
+ return;
+ }
+
+ // when setting to 0 allowed rooms/spaces set to invite only instead as per the note
+ if (!restrictedAllowRoomIds.length) {
+ joinRule = JoinRule.Invite;
+ }
+ }
+
+ if (beforeJoinRule === joinRule && !restrictedAllowRoomIds) return;
+ if (beforeChange && !await beforeChange(joinRule)) return;
+
+ const newContent: IJoinRuleEventContent = {
+ join_rule: joinRule,
+ };
+
+ // pre-set the accepted spaces with the currently viewed one as per the microcopy
+ if (joinRule === JoinRule.Restricted) {
+ newContent.allow = restrictedAllowRoomIds.map(roomId => ({
+ "type": RestrictedAllowType.RoomMembership,
+ "room_id": roomId,
+ }));
+ }
+
+ setContent(newContent);
+ };
+
+ return (
+ <StyledRadioGroup
+ name="joinRule"
+ value={joinRule}
+ onChange={onChange}
+ definitions={definitions}
+ disabled={disabled}
+ />
+ );
+};
+
+export default JoinRuleSettings;
diff --git a/src/components/views/settings/LayoutSwitcher.tsx b/src/components/views/settings/LayoutSwitcher.tsx
index dd7accf9a8..ad8abd0033 100644
--- a/src/components/views/settings/LayoutSwitcher.tsx
+++ b/src/components/views/settings/LayoutSwitcher.tsx
@@ -26,7 +26,7 @@ import { Layout } from "../../../settings/Layout";
import { SettingLevel } from "../../../settings/SettingLevel";
interface IProps {
- userId: string;
+ userId?: string;
displayName: string;
avatarUrl: string;
messagePreviewText: string;
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.tsx
similarity index 81%
rename from src/components/views/settings/ProfileSettings.js
rename to src/components/views/settings/ProfileSettings.tsx
index d05fca983c..4336463959 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2019 New Vector Ltd
+Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,17 +19,30 @@ import { _t } from "../../../languageHandler";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import Field from "../elements/Field";
import { getHostingLink } from '../../../utils/HostingLink';
-import * as sdk from "../../../index";
import { OwnProfileStore } from "../../../stores/OwnProfileStore";
import Modal from "../../../Modal";
import ErrorDialog from "../dialogs/ErrorDialog";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { mediaFromMxc } from "../../../customisations/Media";
+import AccessibleButton from '../elements/AccessibleButton';
+import AvatarSetting from './AvatarSetting';
+
+interface IState {
+ userId?: string;
+ originalDisplayName?: string;
+ displayName?: string;
+ originalAvatarUrl?: string;
+ avatarUrl?: string | ArrayBuffer;
+ avatarFile?: File;
+ enableProfileSave?: boolean;
+}
@replaceableComponent("views.settings.ProfileSettings")
-export default class ProfileSettings extends React.Component {
- constructor() {
- super();
+export default class ProfileSettings extends React.Component<{}, IState> {
+ private avatarUpload: React.RefObject<HTMLInputElement> = createRef();
+
+ constructor(props: {}) {
+ super(props);
const client = MatrixClientPeg.get();
let avatarUrl = OwnProfileStore.instance.avatarMxc;
@@ -43,17 +56,15 @@ export default class ProfileSettings extends React.Component {
avatarFile: null,
enableProfileSave: false,
};
-
- this._avatarUpload = createRef();
}
- _uploadAvatar = () => {
- this._avatarUpload.current.click();
+ private uploadAvatar = (): void => {
+ this.avatarUpload.current.click();
};
- _removeAvatar = () => {
+ private removeAvatar = (): void => {
// clear file upload field so same file can be selected
- this._avatarUpload.current.value = "";
+ this.avatarUpload.current.value = "";
this.setState({
avatarUrl: null,
avatarFile: null,
@@ -61,7 +72,7 @@ export default class ProfileSettings extends React.Component {
});
};
- _cancelProfileChanges = async (e) => {
+ private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();
@@ -74,7 +85,7 @@ export default class ProfileSettings extends React.Component {
});
};
- _saveProfile = async (e) => {
+ private saveProfile = async (e: React.FormEvent<HTMLFormElement>): Promise<void> => {
e.stopPropagation();
e.preventDefault();
@@ -82,7 +93,7 @@ export default class ProfileSettings extends React.Component {
this.setState({ enableProfileSave: false });
const client = MatrixClientPeg.get();
- const newState = {};
+ const newState: IState = {};
const displayName = this.state.displayName.trim();
try {
@@ -115,14 +126,14 @@ export default class ProfileSettings extends React.Component {
this.setState(newState);
};
- _onDisplayNameChanged = (e) => {
+ private onDisplayNameChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
this.setState({
displayName: e.target.value,
enableProfileSave: true,
});
};
- _onAvatarChanged = (e) => {
+ private onAvatarChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
if (!e.target.files || !e.target.files.length) {
this.setState({
avatarUrl: this.state.originalAvatarUrl,
@@ -144,7 +155,7 @@ export default class ProfileSettings extends React.Component {
reader.readAsDataURL(file);
};
- render() {
+ public render(): JSX.Element {
const hostingSignupLink = getHostingLink('user-settings');
let hostingSignup = null;
if (hostingSignupLink) {
@@ -161,20 +172,18 @@ export default class ProfileSettings extends React.Component {
</span>;
}
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
- const AvatarSetting = sdk.getComponent('settings.AvatarSetting');
return (
<form
- onSubmit={this._saveProfile}
+ onSubmit={this.saveProfile}
autoComplete="off"
noValidate={true}
className="mx_ProfileSettings_profileForm"
>
<input
type="file"
- ref={this._avatarUpload}
+ ref={this.avatarUpload}
className="mx_ProfileSettings_avatarUpload"
- onChange={this._onAvatarChanged}
+ onChange={this.onAvatarChanged}
accept="image/*"
/>
<div className="mx_ProfileSettings_profile">
@@ -185,7 +194,7 @@ export default class ProfileSettings extends React.Component {
type="text"
value={this.state.displayName}
autoComplete="off"
- onChange={this._onDisplayNameChanged}
+ onChange={this.onDisplayNameChanged}
/>
<p>
{ this.state.userId }
@@ -193,22 +202,22 @@ export default class ProfileSettings extends React.Component {
</p>
</div>
<AvatarSetting
- avatarUrl={this.state.avatarUrl}
+ avatarUrl={this.state.avatarUrl?.toString()}
avatarName={this.state.displayName || this.state.userId}
avatarAltText={_t("Profile picture")}
- uploadAvatar={this._uploadAvatar}
- removeAvatar={this._removeAvatar} />
+ uploadAvatar={this.uploadAvatar}
+ removeAvatar={this.removeAvatar} />
</div>
<div className="mx_ProfileSettings_buttons">
<AccessibleButton
- onClick={this._cancelProfileChanges}
+ onClick={this.cancelProfileChanges}
kind="link"
disabled={!this.state.enableProfileSave}
>
{ _t("Cancel") }
</AccessibleButton>
<AccessibleButton
- onClick={this._saveProfile}
+ onClick={this.saveProfile}
kind="primary"
disabled={!this.state.enableProfileSave}
>
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
index 9225bc6b94..d27910517d 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -28,36 +28,31 @@ import { compare } from "../../../../../utils/strings";
import ErrorDialog from '../../../dialogs/ErrorDialog';
import PowerSelector from "../../../elements/PowerSelector";
-const plEventsToLabels = {
- // These will be translated for us later.
- [EventType.RoomAvatar]: _td("Change room avatar"),
- [EventType.RoomName]: _td("Change room name"),
- [EventType.RoomCanonicalAlias]: _td("Change main address for the room"),
- [EventType.RoomHistoryVisibility]: _td("Change history visibility"),
- [EventType.RoomPowerLevels]: _td("Change permissions"),
- [EventType.RoomTopic]: _td("Change topic"),
- [EventType.RoomTombstone]: _td("Upgrade the room"),
- [EventType.RoomEncryption]: _td("Enable room encryption"),
- [EventType.RoomServerAcl]: _td("Change server ACLs"),
+interface IEventShowOpts {
+ isState?: boolean;
+ hideForSpace?: boolean;
+}
- // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
- "im.vector.modular.widgets": _td("Modify widgets"),
-};
+interface IPowerLevelDescriptor {
+ desc: string;
+ defaultValue: number;
+ hideForSpace?: boolean;
+}
-const plEventsToShow = {
+const plEventsToShow: Record<string, IEventShowOpts> = {
// If an event is listed here, it will be shown in the PL settings. Defaults will be calculated.
[EventType.RoomAvatar]: { isState: true },
[EventType.RoomName]: { isState: true },
[EventType.RoomCanonicalAlias]: { isState: true },
- [EventType.RoomHistoryVisibility]: { isState: true },
+ [EventType.RoomHistoryVisibility]: { isState: true, hideForSpace: true },
[EventType.RoomPowerLevels]: { isState: true },
[EventType.RoomTopic]: { isState: true },
- [EventType.RoomTombstone]: { isState: true },
- [EventType.RoomEncryption]: { isState: true },
- [EventType.RoomServerAcl]: { isState: true },
+ [EventType.RoomTombstone]: { isState: true, hideForSpace: true },
+ [EventType.RoomEncryption]: { isState: true, hideForSpace: true },
+ [EventType.RoomServerAcl]: { isState: true, hideForSpace: true },
// TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
- "im.vector.modular.widgets": { isState: true },
+ "im.vector.modular.widgets": { isState: true, hideForSpace: true },
};
// parse a string as an integer; if the input is undefined, or cannot be parsed
@@ -145,7 +140,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
private onPowerLevelsChanged = (inputValue: string, powerLevelKey: string) => {
const client = MatrixClientPeg.get();
const room = client.getRoom(this.props.roomId);
- const plEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+ const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, '');
let plContent = plEvent ? (plEvent.getContent() || {}) : {};
// Clone the power levels just in case
@@ -173,7 +168,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
parentObj[keyPath[keyPath.length - 1]] = value;
}
- client.sendStateEvent(this.props.roomId, "m.room.power_levels", plContent).catch(e => {
+ client.sendStateEvent(this.props.roomId, EventType.RoomPowerLevels, plContent).catch(e => {
console.error(e);
Modal.createTrackedDialog('Power level requirement change failed', '', ErrorDialog, {
@@ -189,7 +184,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
private onUserPowerLevelChanged = (value: string, powerLevelKey: string) => {
const client = MatrixClientPeg.get();
const room = client.getRoom(this.props.roomId);
- const plEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+ const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, '');
let plContent = plEvent ? (plEvent.getContent() || {}) : {};
// Clone the power levels just in case
@@ -199,7 +194,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
if (!plContent['users']) plContent['users'] = {};
plContent['users'][powerLevelKey] = value;
- client.sendStateEvent(this.props.roomId, "m.room.power_levels", plContent).catch(e => {
+ client.sendStateEvent(this.props.roomId, EventType.RoomPowerLevels, plContent).catch(e => {
console.error(e);
Modal.createTrackedDialog('Power level change failed', '', ErrorDialog, {
@@ -215,11 +210,31 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
render() {
const client = MatrixClientPeg.get();
const room = client.getRoom(this.props.roomId);
- const plEvent = room.currentState.getStateEvents('m.room.power_levels', '');
- const plContent = plEvent ? (plEvent.getContent() || {}) : {};
- const canChangeLevels = room.currentState.mayClientSendStateEvent('m.room.power_levels', client);
+ const isSpaceRoom = room.isSpaceRoom();
- const powerLevelDescriptors = {
+ const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, '');
+ const plContent = plEvent ? (plEvent.getContent() || {}) : {};
+ const canChangeLevels = room.currentState.mayClientSendStateEvent(EventType.RoomPowerLevels, client);
+
+ const plEventsToLabels = {
+ // These will be translated for us later.
+ [EventType.RoomAvatar]: isSpaceRoom ? _td("Change space avatar") : _td("Change room avatar"),
+ [EventType.RoomName]: isSpaceRoom ? _td("Change space name") : _td("Change room name"),
+ [EventType.RoomCanonicalAlias]: isSpaceRoom
+ ? _td("Change main address for the space")
+ : _td("Change main address for the room"),
+ [EventType.RoomHistoryVisibility]: _td("Change history visibility"),
+ [EventType.RoomPowerLevels]: _td("Change permissions"),
+ [EventType.RoomTopic]: isSpaceRoom ? _td("Change description") : _td("Change topic"),
+ [EventType.RoomTombstone]: _td("Upgrade the room"),
+ [EventType.RoomEncryption]: _td("Enable room encryption"),
+ [EventType.RoomServerAcl]: _td("Change server ACLs"),
+
+ // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+ "im.vector.modular.widgets": isSpaceRoom ? null : _td("Modify widgets"),
+ };
+
+ const powerLevelDescriptors: Record<string, IPowerLevelDescriptor> = {
"users_default": {
desc: _t('Default role'),
defaultValue: 0,
@@ -227,6 +242,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
"events_default": {
desc: _t('Send messages'),
defaultValue: 0,
+ hideForSpace: true,
},
"invite": {
desc: _t('Invite users'),
@@ -247,10 +263,12 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
"redact": {
desc: _t('Remove messages sent by others'),
defaultValue: 50,
+ hideForSpace: true,
},
"notifications.room": {
desc: _t('Notify everyone'),
defaultValue: 50,
+ hideForSpace: true,
},
};
@@ -361,6 +379,9 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
const powerSelectors = Object.keys(powerLevelDescriptors).map((key, index) => {
const descriptor = powerLevelDescriptors[key];
+ if (isSpaceRoom && descriptor.hideForSpace) {
+ return null;
+ }
const keyPath = key.split('.');
let currentObj = plContent;
@@ -382,14 +403,18 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
onChange={this.onPowerLevelsChanged}
/>
</div>;
- });
+ }).filter(Boolean);
// hide the power level selector for enabling E2EE if it the room is already encrypted
if (client.isRoomEncrypted(this.props.roomId)) {
- delete eventsLevels["m.room.encryption"];
+ delete eventsLevels[EventType.RoomEncryption];
}
const eventPowerSelectors = Object.keys(eventsLevels).map((eventType, i) => {
+ if (isSpaceRoom && plEventsToShow[eventType].hideForSpace) {
+ return null;
+ }
+
let label = plEventsToLabels[eventType];
if (label) {
label = _t(label);
@@ -408,7 +433,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
/>
</div>
);
- });
+ }).filter(Boolean);
return (
<div className="mx_SettingsTab mx_RolesRoomSettingsTab">
@@ -418,7 +443,10 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
{ bannedUsersSection }
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
<span className='mx_SettingsTab_subheading'>{ _t("Permissions") }</span>
- <p>{ _t('Select the roles required to change various parts of the room') }</p>
+ <p>{ isSpaceRoom
+ ? _t('Select the roles required to change various parts of the space')
+ : _t('Select the roles required to change various parts of the room')
+ }</p>
{ powerSelectors }
{ eventPowerSelectors }
</div>
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index ede9a5ddb5..d1c5bc8448 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -16,7 +16,7 @@ limitations under the License.
import React from 'react';
import { GuestAccess, HistoryVisibility, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials";
-import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType } from 'matrix-js-sdk/src/@types/event';
import { _t } from "../../../../../languageHandler";
@@ -24,33 +24,29 @@ import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
import Modal from "../../../../../Modal";
import QuestionDialog from "../../../dialogs/QuestionDialog";
-import StyledRadioGroup, { IDefinition } from '../../../elements/StyledRadioGroup';
+import StyledRadioGroup from '../../../elements/StyledRadioGroup';
import { SettingLevel } from "../../../../../settings/SettingLevel";
import SettingsStore from "../../../../../settings/SettingsStore";
import { UIFeature } from "../../../../../settings/UIFeature";
import { replaceableComponent } from "../../../../../utils/replaceableComponent";
import AccessibleButton from "../../../elements/AccessibleButton";
-import SpaceStore from "../../../../../stores/SpaceStore";
-import RoomAvatar from "../../../avatars/RoomAvatar";
-import ManageRestrictedJoinRuleDialog from '../../../dialogs/ManageRestrictedJoinRuleDialog';
-import RoomUpgradeWarningDialog from '../../../dialogs/RoomUpgradeWarningDialog';
-import { upgradeRoom } from "../../../../../utils/RoomUpgrade";
-import { arrayHasDiff } from "../../../../../utils/arrays";
import SettingsFlag from '../../../elements/SettingsFlag';
+import createRoom, { IOpts } from '../../../../../createRoom';
+import CreateRoomDialog from '../../../dialogs/CreateRoomDialog';
+import JoinRuleSettings from "../../JoinRuleSettings";
+import ErrorDialog from "../../../dialogs/ErrorDialog";
interface IProps {
roomId: string;
+ closeSettingsFn: () => void;
}
interface IState {
- joinRule: JoinRule;
restrictedAllowRoomIds?: string[];
guestAccess: GuestAccess;
history: HistoryVisibility;
hasAliases: boolean;
encrypted: boolean;
- roomSupportsRestricted?: boolean;
- preferredRestrictionVersion?: string;
showAdvancedSection: boolean;
}
@@ -60,7 +56,6 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
super(props);
this.state = {
- joinRule: JoinRule.Invite,
guestAccess: GuestAccess.Forbidden,
history: HistoryVisibility.Shared,
hasAliases: false,
@@ -101,12 +96,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
);
const encrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.roomId);
- const restrictedRoomCapabilities = SpaceStore.instance.restrictedJoinRuleSupport;
- const roomSupportsRestricted = Array.isArray(restrictedRoomCapabilities?.support)
- && restrictedRoomCapabilities.support.includes(room.getVersion());
- const preferredRestrictionVersion = roomSupportsRestricted ? undefined : restrictedRoomCapabilities?.preferred;
- this.setState({ joinRule, restrictedAllowRoomIds, guestAccess, history, encrypted,
- roomSupportsRestricted, preferredRestrictionVersion });
+ this.setState({ restrictedAllowRoomIds, guestAccess, history, encrypted });
this.hasAliases().then(hasAliases => this.setState({ hasAliases }));
}
@@ -129,7 +119,40 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
if (refreshWhenTypes.includes(e.getType() as EventType)) this.forceUpdate();
};
- private onEncryptionChange = () => {
+ private onEncryptionChange = async () => {
+ if (MatrixClientPeg.get().getRoom(this.props.roomId)?.getJoinRule() === JoinRule.Public) {
+ const dialog = Modal.createTrackedDialog('Confirm Public Encrypted Room', '', QuestionDialog, {
+ title: _t('Are you sure you want to add encryption to this public room?'),
+ description: <div>
+ <p> { _t(
+ "<b>It's not recommended to add encryption to public rooms.</b>" +
+ "Anyone can find and join public rooms, so anyone can read messages in them. " +
+ "You'll get none of the benefits of encryption, and you won't be able to turn it " +
+ "off later. Encrypting messages in a public room will make receiving and sending " +
+ "messages slower.",
+ null,
+ { "b": (sub) => <b>{ sub }</b> },
+ ) } </p>
+ <p> { _t(
+ "To avoid these issues, create a <a>new encrypted room</a> for " +
+ "the conversation you plan to have.",
+ null,
+ { "a": (sub) => <a
+ className="mx_linkButton"
+ onClick={() => {
+ dialog.close();
+ this.createNewRoom(false, true);
+ }}> { sub } </a> },
+ ) } </p>
+ </div>,
+
+ });
+
+ const { finished } = dialog;
+ const [confirm] = await finished;
+ if (!confirm) return;
+ }
+
Modal.createTrackedDialog('Enable encryption', '', QuestionDialog, {
title: _t('Enable encryption?'),
description: _t(
@@ -164,80 +187,6 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
});
};
- private onJoinRuleChange = async (joinRule: JoinRule) => {
- const beforeJoinRule = this.state.joinRule;
-
- let restrictedAllowRoomIds: string[];
- if (joinRule === JoinRule.Restricted) {
- const matrixClient = MatrixClientPeg.get();
- const roomId = this.props.roomId;
- const room = matrixClient.getRoom(roomId);
-
- if (beforeJoinRule === JoinRule.Restricted || this.state.roomSupportsRestricted) {
- // Have the user pick which spaces to allow joins from
- restrictedAllowRoomIds = await this.editRestrictedRoomIds();
- if (!Array.isArray(restrictedAllowRoomIds)) return;
- } else if (this.state.preferredRestrictionVersion) {
- // Block this action on a room upgrade otherwise it'd make their room unjoinable
- const targetVersion = this.state.preferredRestrictionVersion;
- Modal.createTrackedDialog('Restricted join rule upgrade', '', RoomUpgradeWarningDialog, {
- roomId,
- targetVersion,
- description: _t("This upgrade will allow members of selected spaces " +
- "access to this room without an invite."),
- onFinished: (resp) => {
- if (!resp?.continue) return;
- upgradeRoom(room, targetVersion, resp.invite);
- },
- });
- return;
- }
- }
-
- if (beforeJoinRule === joinRule && !restrictedAllowRoomIds) return;
-
- const content: IContent = {
- join_rule: joinRule,
- };
-
- // pre-set the accepted spaces with the currently viewed one as per the microcopy
- if (joinRule === JoinRule.Restricted) {
- content.allow = restrictedAllowRoomIds.map(roomId => ({
- "type": RestrictedAllowType.RoomMembership,
- "room_id": roomId,
- }));
- }
-
- this.setState({ joinRule, restrictedAllowRoomIds });
-
- const client = MatrixClientPeg.get();
- client.sendStateEvent(this.props.roomId, EventType.RoomJoinRules, content, "").catch((e) => {
- console.error(e);
- this.setState({
- joinRule: beforeJoinRule,
- restrictedAllowRoomIds: undefined,
- });
- });
- };
-
- private onRestrictedRoomIdsChange = (restrictedAllowRoomIds: string[]) => {
- const beforeRestrictedAllowRoomIds = this.state.restrictedAllowRoomIds;
- if (!arrayHasDiff(beforeRestrictedAllowRoomIds || [], restrictedAllowRoomIds)) return;
- this.setState({ restrictedAllowRoomIds });
-
- const client = MatrixClientPeg.get();
- client.sendStateEvent(this.props.roomId, EventType.RoomJoinRules, {
- join_rule: JoinRule.Restricted,
- allow: restrictedAllowRoomIds.map(roomId => ({
- "type": RestrictedAllowType.RoomMembership,
- "room_id": roomId,
- })),
- }, "").catch((e) => {
- console.error(e);
- this.setState({ restrictedAllowRoomIds: beforeRestrictedAllowRoomIds });
- });
- };
-
private onGuestAccessChange = (allowed: boolean) => {
const guestAccess = allowed ? GuestAccess.CanJoin : GuestAccess.Forbidden;
const beforeGuestAccess = this.state.guestAccess;
@@ -254,6 +203,20 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
});
};
+ private createNewRoom = async (defaultPublic: boolean, defaultEncrypted: boolean) => {
+ const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
+ "Create Room",
+ "Create room after trying to make an E2EE room public",
+ CreateRoomDialog,
+ { defaultPublic, defaultEncrypted },
+ );
+ const [shouldCreate, opts] = await modal.finished;
+ if (shouldCreate) {
+ await createRoom(opts);
+ }
+ return shouldCreate;
+ };
+
private onHistoryRadioToggle = (history: HistoryVisibility) => {
const beforeHistory = this.state.history;
if (beforeHistory === history) return;
@@ -285,42 +248,12 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
}
}
- private editRestrictedRoomIds = async (): Promise<string[] | undefined> => {
- let selected = this.state.restrictedAllowRoomIds;
- if (!selected?.length && SpaceStore.instance.activeSpace) {
- selected = [SpaceStore.instance.activeSpace.roomId];
- }
-
- const matrixClient = MatrixClientPeg.get();
- const { finished } = Modal.createTrackedDialog('Edit restricted', '', ManageRestrictedJoinRuleDialog, {
- matrixClient,
- room: matrixClient.getRoom(this.props.roomId),
- selected,
- }, "mx_ManageRestrictedJoinRuleDialog_wrapper");
-
- const [restrictedAllowRoomIds] = await finished;
- return restrictedAllowRoomIds;
- };
-
- private onEditRestrictedClick = async () => {
- const restrictedAllowRoomIds = await this.editRestrictedRoomIds();
- if (!Array.isArray(restrictedAllowRoomIds)) return;
- if (restrictedAllowRoomIds.length > 0) {
- this.onRestrictedRoomIdsChange(restrictedAllowRoomIds);
- } else {
- this.onJoinRuleChange(JoinRule.Invite);
- }
- };
-
private renderJoinRule() {
const client = MatrixClientPeg.get();
const room = client.getRoom(this.props.roomId);
- const joinRule = this.state.joinRule;
-
- const canChangeJoinRule = room.currentState.mayClientSendStateEvent(EventType.RoomJoinRules, client);
let aliasWarning = null;
- if (joinRule === JoinRule.Public && !this.state.hasAliases) {
+ if (room.getJoinRule() === JoinRule.Public && !this.state.hasAliases) {
aliasWarning = (
<div className='mx_SecurityRoomSettingsTab_warning'>
<img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />
@@ -331,111 +264,68 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
);
}
- const radioDefinitions: IDefinition<JoinRule>[] = [{
- value: JoinRule.Invite,
- label: _t("Private (invite only)"),
- description: _t("Only invited people can join."),
- checked: this.state.joinRule === JoinRule.Invite
- || (this.state.joinRule === JoinRule.Restricted && !this.state.restrictedAllowRoomIds?.length),
- }, {
- value: JoinRule.Public,
- label: _t("Public"),
- description: _t("Anyone can find and join."),
- }];
+ return <div className="mx_SecurityRoomSettingsTab_joinRule">
+ <div className="mx_SettingsTab_subsectionText">
+ <span>{ _t("Decide who can join %(roomName)s.", {
+ roomName: room?.name,
+ }) }</span>
+ </div>
- if (this.state.roomSupportsRestricted ||
- this.state.preferredRestrictionVersion ||
- joinRule === JoinRule.Restricted
- ) {
- let upgradeRequiredPill;
- if (this.state.preferredRestrictionVersion) {
- upgradeRequiredPill = <span className="mx_SecurityRoomSettingsTab_upgradeRequired">
- { _t("Upgrade required") }
- </span>;
- }
+ { aliasWarning }
- let description;
- if (joinRule === JoinRule.Restricted && this.state.restrictedAllowRoomIds?.length) {
- const shownSpaces = this.state.restrictedAllowRoomIds
- .map(roomId => client.getRoom(roomId))
- .filter(room => room?.isSpaceRoom())
- .slice(0, 4);
+ <JoinRuleSettings
+ room={room}
+ beforeChange={this.onBeforeJoinRuleChange}
+ onError={this.onJoinRuleChangeError}
+ closeSettingsFn={this.props.closeSettingsFn}
+ promptUpgrade={true}
+ />
+ </div>;
+ }
- let moreText;
- if (shownSpaces.length < this.state.restrictedAllowRoomIds.length) {
- if (shownSpaces.length > 0) {
- moreText = _t("& %(count)s more", {
- count: this.state.restrictedAllowRoomIds.length - shownSpaces.length,
- });
- } else {
- moreText = _t("Currently, %(count)s spaces have access", {
- count: this.state.restrictedAllowRoomIds.length,
- });
- }
- }
+ private onJoinRuleChangeError = (error: Error) => {
+ Modal.createTrackedDialog('Room not found', '', ErrorDialog, {
+ title: _t("Failed to update the join rules"),
+ description: error.message ?? _t("Unknown failure"),
+ });
+ };
- description = <div>
- <span>
- { _t("Anyone in a space can find and join. <a>Edit which spaces can access here.</a>", {}, {
- a: sub => <AccessibleButton
- disabled={!canChangeJoinRule}
- onClick={this.onEditRestrictedClick}
- kind="link"
- >
- { sub }
- </AccessibleButton>,
- }) }
- </span>
-
- <div className="mx_SecurityRoomSettingsTab_spacesWithAccess">
- <h4>{ _t("Spaces with access") }</h4>
- { shownSpaces.map(room => {
- return <span key={room.roomId}>
- <RoomAvatar room={room} height={32} width={32} />
- { room.name }
- </span>;
- }) }
- { moreText && <span>{ moreText }</span> }
- </div>
- </div>;
- } else if (SpaceStore.instance.activeSpace) {
- description = _t("Anyone in %(spaceName)s can find and join. You can select other spaces too.", {
- spaceName: SpaceStore.instance.activeSpace.name,
- });
- } else {
- description = _t("Anyone in a space can find and join. You can select multiple spaces.");
- }
-
- radioDefinitions.splice(1, 0, {
- value: JoinRule.Restricted,
- label: <>
- { _t("Space members") }
- { upgradeRequiredPill }
- </>,
- description,
- // if there are 0 allowed spaces then render it as invite only instead
- checked: this.state.joinRule === JoinRule.Restricted && !!this.state.restrictedAllowRoomIds?.length,
+ private onBeforeJoinRuleChange = async (joinRule: JoinRule): Promise<boolean> => {
+ if (this.state.encrypted && joinRule === JoinRule.Public) {
+ const dialog = Modal.createTrackedDialog('Confirm Public Encrypted Room', '', QuestionDialog, {
+ title: _t("Are you sure you want to make this encrypted room public?"),
+ description: <div>
+ <p> { _t(
+ "<b>It's not recommended to make encrypted rooms public.</b> " +
+ "It will mean anyone can find and join the room, so anyone can read messages. " +
+ "You'll get none of the benefits of encryption. Encrypting messages in a public " +
+ "room will make receiving and sending messages slower.",
+ null,
+ { "b": (sub) => <b>{ sub }</b> },
+ ) } </p>
+ <p> { _t(
+ "To avoid these issues, create a <a>new public room</a> for the conversation " +
+ "you plan to have.",
+ null,
+ {
+ "a": (sub) => <a
+ className="mx_linkButton"
+ onClick={() => {
+ dialog.close();
+ this.createNewRoom(true, false);
+ }}> { sub } </a>,
+ },
+ ) } </p>
+ </div>,
});
+
+ const { finished } = dialog;
+ const [confirm] = await finished;
+ if (!confirm) return false;
}
- return (
- <div className="mx_SecurityRoomSettingsTab_joinRule">
- <div className="mx_SettingsTab_subsectionText">
- <span>{ _t("Decide who can join %(roomName)s.", {
- roomName: client.getRoom(this.props.roomId)?.name,
- }) }</span>
- </div>
- { aliasWarning }
- <StyledRadioGroup
- name="joinRule"
- value={joinRule}
- onChange={this.onJoinRuleChange}
- definitions={radioDefinitions}
- disabled={!canChangeJoinRule}
- />
- </div>
- );
- }
+ return true;
+ };
private renderHistory() {
const client = MatrixClientPeg.get();
@@ -534,6 +424,22 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
historySection = null;
}
+ let advanced;
+ if (room.getJoinRule() === JoinRule.Public) {
+ advanced = (
+ <>
+ <AccessibleButton
+ onClick={this.toggleAdvancedSection}
+ kind="link"
+ className="mx_SettingsTab_showAdvanced"
+ >
+ { this.state.showAdvancedSection ? _t("Hide advanced") : _t("Show advanced") }
+ </AccessibleButton>
+ { this.state.showAdvancedSection && this.renderAdvanced() }
+ </>
+ );
+ }
+
return (
<div className="mx_SettingsTab mx_SecurityRoomSettingsTab">
<div className="mx_SettingsTab_heading">{ _t("Security & Privacy") }</div>
@@ -559,15 +465,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
{ this.renderJoinRule() }
</div>
- <AccessibleButton
- onClick={this.toggleAdvancedSection}
- kind="link"
- className="mx_SettingsTab_showAdvanced"
- >
- { this.state.showAdvancedSection ? _t("Hide advanced") : _t("Show advanced") }
- </AccessibleButton>
- { this.state.showAdvancedSection && this.renderAdvanced() }
-
+ { advanced }
{ historySection }
</div>
);
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index cbf0b7916c..bc54a8155c 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -67,7 +67,7 @@ interface IState extends IThemeState {
showAdvanced: boolean;
layout: Layout;
// User profile data for the message preview
- userId: string;
+ userId?: string;
displayName: string;
avatarUrl: string;
}
@@ -92,8 +92,8 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
systemFont: SettingsStore.getValue("systemFont"),
showAdvanced: false,
layout: SettingsStore.getValue("layout"),
- userId: "@erim:fink.fink",
- displayName: "Erimayas Fink",
+ userId: null,
+ displayName: null,
avatarUrl: null,
};
}
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index 6984ccc6f3..b57a978187 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -72,8 +72,10 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
private getVersionInfo(): { appVersion: string, olmVersion: string } {
const brand = SdkConfig.get().brand;
const appVersion = this.state.appVersion || 'unknown';
- let olmVersion = MatrixClientPeg.get().olmVersion;
- olmVersion = olmVersion ? `${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}` : '<not-enabled>';
+ const olmVersionTuple = MatrixClientPeg.get().olmVersion;
+ const olmVersion = olmVersionTuple
+ ? `${olmVersionTuple[0]}.${olmVersionTuple[1]}.${olmVersionTuple[2]}`
+ : '<not-enabled>';
return {
appVersion: `${_t("%(brand)s version:", { brand })} ${appVersion}`,
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 8cd991134f..943eb874ed 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -88,7 +88,6 @@ export default class LabsUserSettingsTab extends React.Component {
<SettingsFlag name="enableWidgetScreenshots" level={SettingLevel.ACCOUNT} />
<SettingsFlag name="showHiddenEventsInTimeline" level={SettingLevel.DEVICE} />
<SettingsFlag name="lowBandwidth" level={SettingLevel.DEVICE} />
- <SettingsFlag name="advancedRoomListLogging" level={SettingLevel.DEVICE} />
{ hiddenReadReceipts }
</div>;
}
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 21c3ab24ec..2209537967 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -172,7 +172,8 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
];
static IMAGES_AND_VIDEOS_SETTINGS = [
'urlPreviewsEnabled',
- 'autoplayGifsAndVideos',
+ 'autoplayGifs',
+ 'autoplayVideo',
'showImages',
];
static TIMELINE_SETTINGS = [
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 33e4a990ef..c09b26e45f 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, { ComponentProps, RefObject, SyntheticEvent, useContext, useRef, useState } from "react";
+import React, { ComponentProps, RefObject, SyntheticEvent, KeyboardEvent, useContext, useRef, useState } from "react";
import classNames from "classnames";
import { RoomType } from "matrix-js-sdk/src/@types/event";
import FocusLock from "react-focus-lock";
@@ -38,6 +38,7 @@ import SettingsStore from "../../../settings/SettingsStore";
import defaultDispatcher from "../../../dispatcher/dispatcher";
import { Action } from "../../../dispatcher/actions";
import { UserTab } from "../dialogs/UserSettingsDialog";
+import { Key } from "../../../Keyboard";
export const createSpace = async (
name: string,
@@ -55,7 +56,7 @@ export const createSpace = async (
power_level_content_override: {
// Only allow Admins to write to the timeline to prevent hidden sync spam
events_default: 100,
- ...isPublic ? { invite: 0 } : {},
+ invite: isPublic ? 0 : 50,
},
room_alias_name: isPublic && alias ? alias.substr(1, alias.indexOf(":") - 1) : undefined,
topic,
@@ -96,9 +97,8 @@ const spaceNameValidator = withValidation({
],
});
-const nameToAlias = (name: string, domain: string): string => {
- const localpart = name.trim().toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9_-]+/gi, "");
- return `#${localpart}:${domain}`;
+const nameToLocalpart = (name: string): string => {
+ return name.trim().toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9_-]+/gi, "");
};
// XXX: Temporary for the Spaces release only
@@ -159,6 +159,12 @@ export const SpaceCreateForm: React.FC<ISpaceCreateFormProps> = ({
const cli = useContext(MatrixClientContext);
const domain = cli.getDomain();
+ const onKeyDown = (ev: KeyboardEvent) => {
+ if (ev.key === Key.ENTER) {
+ onSubmit(ev);
+ }
+ };
+
return <form className="mx_SpaceBasicSettings" onSubmit={onSubmit}>
<SpaceAvatar avatarUrl={avatarUrl} setAvatar={setAvatar} avatarDisabled={busy} />
@@ -169,14 +175,17 @@ export const SpaceCreateForm: React.FC<ISpaceCreateFormProps> = ({
value={name}
onChange={ev => {
const newName = ev.target.value;
- if (!alias || alias === nameToAlias(name, domain)) {
- setAlias(nameToAlias(newName, domain));
+ if (!alias || alias === `#${nameToLocalpart(name)}:${domain}`) {
+ setAlias(`#${nameToLocalpart(newName)}:${domain}`);
+ aliasFieldRef.current?.validate({ allowEmpty: true });
}
setName(newName);
}}
+ onKeyDown={onKeyDown}
ref={nameFieldRef}
onValidate={spaceNameValidator}
disabled={busy}
+ autoComplete="off"
/>
{ showAliasField
@@ -185,9 +194,10 @@ export const SpaceCreateForm: React.FC<ISpaceCreateFormProps> = ({
onChange={setAlias}
domain={domain}
value={alias}
- placeholder={name ? nameToAlias(name, domain) : _t("e.g. my-space")}
+ placeholder={name ? nameToLocalpart(name) : _t("e.g. my-space")}
label={_t("Address")}
disabled={busy}
+ onKeyDown={onKeyDown}
/>
: null
}
@@ -207,6 +217,7 @@ export const SpaceCreateForm: React.FC<ISpaceCreateFormProps> = ({
};
const SpaceCreateMenu = ({ onFinished }) => {
+ const cli = useContext(MatrixClientContext);
const [visibility, setVisibility] = useState<Visibility>(null);
const [busy, setBusy] = useState<boolean>(false);
@@ -223,14 +234,18 @@ const SpaceCreateMenu = ({ onFinished }) => {
setBusy(true);
// require & validate the space name field
- if (!await spaceNameField.current.validate({ allowEmpty: false })) {
+ if (!(await spaceNameField.current.validate({ allowEmpty: false }))) {
spaceNameField.current.focus();
spaceNameField.current.validate({ allowEmpty: false, focused: true });
setBusy(false);
return;
}
- // validate the space name alias field but do not require it
- if (visibility === Visibility.Public && !await spaceAliasField.current.validate({ allowEmpty: true })) {
+
+ // validate the space alias field but do not require it
+ const aliasLocalpart = alias.substring(1, alias.length - cli.getDomain().length - 1);
+ if (visibility === Visibility.Public && aliasLocalpart &&
+ (await spaceAliasField.current.validate({ allowEmpty: true })) === false
+ ) {
spaceAliasField.current.focus();
spaceAliasField.current.validate({ allowEmpty: true, focused: true });
setBusy(false);
@@ -238,7 +253,13 @@ const SpaceCreateMenu = ({ onFinished }) => {
}
try {
- await createSpace(name, visibility === Visibility.Public, alias, topic, avatar);
+ await createSpace(
+ name,
+ visibility === Visibility.Public,
+ aliasLocalpart ? alias : undefined,
+ topic,
+ avatar,
+ );
onFinished();
} catch (e) {
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 40016af36f..d223f5b6a6 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -14,7 +14,16 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, { ComponentProps, Dispatch, ReactNode, SetStateAction, useEffect, useState } from "react";
+import React, {
+ ComponentProps,
+ Dispatch,
+ ReactNode,
+ SetStateAction,
+ useEffect,
+ useLayoutEffect,
+ useRef,
+ useState,
+} from "react";
import { DragDropContext, Draggable, Droppable } from "react-beautiful-dnd";
import classNames from "classnames";
import { Room } from "matrix-js-sdk/src/models/room";
@@ -43,6 +52,7 @@ import IconizedContextMenu, {
} from "../context_menus/IconizedContextMenu";
import SettingsStore from "../../../settings/SettingsStore";
import { SettingLevel } from "../../../settings/SettingLevel";
+import UIStore from "../../../stores/UIStore";
const useSpaces = (): [Room[], Room[], Room | null] => {
const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
@@ -185,12 +195,10 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(({ children, isPanelCo
{ (provided, snapshot) => (
<SpaceItem
{...provided.draggableProps}
- {...provided.dragHandleProps}
+ dragHandleProps={provided.dragHandleProps}
key={s.roomId}
innerRef={provided.innerRef}
- className={snapshot.isDragging
- ? "mx_SpaceItem_dragging"
- : undefined}
+ className={snapshot.isDragging ? "mx_SpaceItem_dragging" : undefined}
space={s}
activeSpaces={activeSpaces}
isPanelCollapsed={isPanelCollapsed}
@@ -206,8 +214,15 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(({ children, isPanelCo
const SpacePanel = () => {
const [isPanelCollapsed, setPanelCollapsed] = useState(true);
+ const ref = useRef<HTMLUListElement>();
+ useLayoutEffect(() => {
+ UIStore.instance.trackElementDimensions("SpacePanel", ref.current);
+ return () => UIStore.instance.stopTrackingElementDimensions("SpacePanel");
+ }, []);
const onKeyDown = (ev: React.KeyboardEvent) => {
+ if (ev.defaultPrevented) return;
+
let handled = true;
switch (ev.key) {
@@ -280,6 +295,7 @@ const SpacePanel = () => {
onKeyDown={onKeyDownHandler}
role="tree"
aria-label={_t("Spaces")}
+ ref={ref}
>
<Droppable droppableId="top-level-spaces">
{ (provided, snapshot) => (
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 39e5115e55..f8860ddd54 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -39,7 +39,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
onClick={async () => {
const permalinkCreator = new RoomPermalinkCreator(space);
permalinkCreator.load();
- const success = await copyPlaintext(permalinkCreator.forRoom());
+ const success = await copyPlaintext(permalinkCreator.forShareableRoom());
const text = success ? _t("Copied!") : _t("Failed to copy");
setCopiedText(text);
await sleep(5000);
@@ -54,8 +54,8 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
{ space.canInvite(MatrixClientPeg.get()?.getUserId()) ? <AccessibleButton
className="mx_SpacePublicShare_inviteButton"
onClick={() => {
- showRoomInviteDialog(space.roomId);
if (onFinished) onFinished();
+ showRoomInviteDialog(space.roomId);
}}
>
<h3>{ _t("Invite people") }</h3>
diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
index b48f5c79c6..5b06e1fdba 100644
--- a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
+++ b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
@@ -25,49 +25,22 @@ import AccessibleButton from "../elements/AccessibleButton";
import AliasSettings from "../room_settings/AliasSettings";
import { useStateToggle } from "../../../hooks/useStateToggle";
import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import StyledRadioGroup from "../elements/StyledRadioGroup";
+import { useLocalEcho } from "../../../hooks/useLocalEcho";
+import JoinRuleSettings from "../settings/JoinRuleSettings";
+import { useRoomState } from "../../../hooks/useRoomState";
interface IProps {
matrixClient: MatrixClient;
space: Room;
+ closeSettingsFn(): void;
}
-enum SpaceVisibility {
- Unlisted = "unlisted",
- Private = "private",
-}
-
-const useLocalEcho = <T extends any>(
- currentFactory: () => T,
- setterFn: (value: T) => Promise<unknown>,
- errorFn: (error: Error) => void,
-): [value: T, handler: (value: T) => void] => {
- const [value, setValue] = useState(currentFactory);
- const handler = async (value: T) => {
- setValue(value);
- try {
- await setterFn(value);
- } catch (e) {
- setValue(currentFactory());
- errorFn(e);
- }
- };
-
- return [value, handler];
-};
-
-const SpaceSettingsVisibilityTab = ({ matrixClient: cli, space }: IProps) => {
+const SpaceSettingsVisibilityTab = ({ matrixClient: cli, space, closeSettingsFn }: IProps) => {
const [error, setError] = useState("");
const userId = cli.getUserId();
- const [visibility, setVisibility] = useLocalEcho<SpaceVisibility>(
- () => space.getJoinRule() === JoinRule.Invite ? SpaceVisibility.Private : SpaceVisibility.Unlisted,
- visibility => cli.sendStateEvent(space.roomId, EventType.RoomJoinRules, {
- join_rule: visibility === SpaceVisibility.Unlisted ? JoinRule.Public : JoinRule.Invite,
- }, ""),
- () => setError(_t("Failed to update the visibility of this space")),
- );
+ const joinRule = useRoomState(space, state => state.getJoinRule());
const [guestAccessEnabled, setGuestAccessEnabled] = useLocalEcho<boolean>(
() => space.currentState.getStateEvents(EventType.RoomGuestAccess, "")
?.getContent()?.guest_access === GuestAccess.CanJoin,
@@ -87,41 +60,42 @@ const SpaceSettingsVisibilityTab = ({ matrixClient: cli, space }: IProps) => {
const [showAdvancedSection, toggleAdvancedSection] = useStateToggle();
- const canSetJoinRule = space.currentState.maySendStateEvent(EventType.RoomJoinRules, userId);
const canSetGuestAccess = space.currentState.maySendStateEvent(EventType.RoomGuestAccess, userId);
const canSetHistoryVisibility = space.currentState.maySendStateEvent(EventType.RoomHistoryVisibility, userId);
const canSetCanonical = space.currentState.mayClientSendStateEvent(EventType.RoomCanonicalAlias, cli);
const canonicalAliasEv = space.currentState.getStateEvents(EventType.RoomCanonicalAlias, "");
let advancedSection;
- if (showAdvancedSection) {
- advancedSection = <>
- <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
- { _t("Hide advanced") }
- </AccessibleButton>
+ if (joinRule === JoinRule.Public) {
+ if (showAdvancedSection) {
+ advancedSection = <>
+ <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
+ { _t("Hide advanced") }
+ </AccessibleButton>
- <LabelledToggleSwitch
- value={guestAccessEnabled}
- onChange={setGuestAccessEnabled}
- disabled={!canSetGuestAccess}
- label={_t("Enable guest access")}
- />
- <p>
- { _t("Guests can join a space without having an account.") }
- <br />
- { _t("This may be useful for public spaces.") }
- </p>
- </>;
- } else {
- advancedSection = <>
- <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
- { _t("Show advanced") }
- </AccessibleButton>
- </>;
+ <LabelledToggleSwitch
+ value={guestAccessEnabled}
+ onChange={setGuestAccessEnabled}
+ disabled={!canSetGuestAccess}
+ label={_t("Enable guest access")}
+ />
+ <p>
+ { _t("Guests can join a space without having an account.") }
+ <br />
+ { _t("This may be useful for public spaces.") }
+ </p>
+ </>;
+ } else {
+ advancedSection = <>
+ <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
+ { _t("Show advanced") }
+ </AccessibleButton>
+ </>;
+ }
}
let addressesSection;
- if (visibility !== SpaceVisibility.Private) {
+ if (space.getJoinRule() === JoinRule.Public) {
addressesSection = <>
<span className="mx_SettingsTab_subheading">{ _t("Address") }</span>
<div className="mx_SettingsTab_section mx_SettingsTab_subsectionText">
@@ -147,22 +121,10 @@ const SpaceSettingsVisibilityTab = ({ matrixClient: cli, space }: IProps) => {
</div>
<div>
- <StyledRadioGroup
- name="spaceVisibility"
- value={visibility}
- onChange={setVisibility}
- disabled={!canSetJoinRule}
- definitions={[
- {
- value: SpaceVisibility.Unlisted,
- label: _t("Public"),
- description: _t("anyone with the link can view and join"),
- }, {
- value: SpaceVisibility.Private,
- label: _t("Invite only"),
- description: _t("only invited people can view and join"),
- },
- ]}
+ <JoinRuleSettings
+ room={space}
+ onError={() => setError(_t("Failed to update the visibility of this space"))}
+ closeSettingsFn={closeSettingsFn}
/>
</div>
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 399c137e97..df6c4c8149 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -29,7 +29,6 @@ import RoomAvatar from "../avatars/RoomAvatar";
import SpaceStore from "../../../stores/SpaceStore";
import SpaceTreeLevelLayoutStore from "../../../stores/SpaceTreeLevelLayoutStore";
import NotificationBadge from "../rooms/NotificationBadge";
-import { RovingAccessibleTooltipButton } from "../../../accessibility/roving/RovingAccessibleTooltipButton";
import { _t } from "../../../languageHandler";
import { ContextMenuTooltipButton } from "../../../accessibility/context_menu/ContextMenuTooltipButton";
import { toRightOf, useContextMenu } from "../../structures/ContextMenu";
@@ -40,8 +39,11 @@ import { NotificationColor } from "../../../stores/notifications/NotificationCol
import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager";
import { NotificationState } from "../../../stores/notifications/NotificationState";
import SpaceContextMenu from "../context_menus/SpaceContextMenu";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import { DraggableProvidedDragHandleProps } from "react-beautiful-dnd";
+import { useRovingTabIndex } from "../../../accessibility/RovingTabIndex";
-interface IButtonProps extends Omit<ComponentProps<typeof RovingAccessibleTooltipButton>, "title"> {
+interface IButtonProps extends Omit<ComponentProps<typeof AccessibleTooltipButton>, "title"> {
space?: Room;
className?: string;
selected?: boolean;
@@ -68,7 +70,9 @@ export const SpaceButton: React.FC<IButtonProps> = ({
ContextMenuComponent,
...props
}) => {
- const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<HTMLElement>();
+ const [menuDisplayed, ref, openMenu, closeMenu] = useContextMenu<HTMLElement>();
+ const [onFocus, isActive, handle] = useRovingTabIndex(ref);
+ const tabIndex = isActive ? 0 : -1;
let avatar = <div className="mx_SpaceButton_avatarPlaceholder"><div className="mx_SpaceButton_icon" /></div>;
if (space) {
@@ -88,6 +92,8 @@ export const SpaceButton: React.FC<IButtonProps> = ({
forceCount={false}
notification={notificationState}
aria-label={ariaLabel}
+ tabIndex={tabIndex}
+ showUnsentTooltip={true}
/>
</div>;
}
@@ -102,7 +108,7 @@ export const SpaceButton: React.FC<IButtonProps> = ({
}
return (
- <RovingAccessibleTooltipButton
+ <AccessibleTooltipButton
{...props}
className={classNames("mx_SpaceButton", className, {
mx_SpaceButton_active: selected,
@@ -114,6 +120,8 @@ export const SpaceButton: React.FC<IButtonProps> = ({
onContextMenu={openMenu}
forceHide={!isNarrow || menuDisplayed}
inputRef={handle}
+ tabIndex={tabIndex}
+ onFocus={onFocus}
>
{ children }
<div className="mx_SpaceButton_selectionWrapper">
@@ -130,7 +138,7 @@ export const SpaceButton: React.FC<IButtonProps> = ({
{ contextMenu }
</div>
- </RovingAccessibleTooltipButton>
+ </AccessibleTooltipButton>
);
};
@@ -142,6 +150,7 @@ interface IItemProps extends InputHTMLAttributes<HTMLLIElement> {
onExpand?: Function;
parents?: Set<string>;
innerRef?: LegacyRef<HTMLLIElement>;
+ dragHandleProps?: DraggableProvidedDragHandleProps;
}
interface IItemState {
@@ -252,7 +261,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
render() {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- const { space, activeSpaces, isNested, isPanelCollapsed, onExpand, parents, innerRef,
+ const { space, activeSpaces, isNested, isPanelCollapsed, onExpand, parents, innerRef, dragHandleProps,
...otherProps } = this.props;
const collapsed = this.isCollapsed;
@@ -270,8 +279,10 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
? StaticNotificationState.forSymbol("!", NotificationColor.Red)
: SpaceStore.instance.getNotificationState(space.roomId);
+ const hasChildren = this.state.childSpaces?.length;
+
let childItems;
- if (this.state.childSpaces?.length && !collapsed) {
+ if (hasChildren && !collapsed) {
childItems = <SpaceTreeLevel
spaces={this.state.childSpaces}
activeSpaces={activeSpaces}
@@ -280,7 +291,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
/>;
}
- const toggleCollapseButton = this.state.childSpaces?.length ?
+ const toggleCollapseButton = hasChildren ?
<AccessibleButton
className="mx_SpaceButton_toggleCollapse"
onClick={this.toggleCollapse}
@@ -288,9 +299,19 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
aria-label={collapsed ? _t("Expand") : _t("Collapse")}
/> : null;
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const { tabIndex, ...restDragHandleProps } = dragHandleProps || {};
+
return (
- <li {...otherProps} className={itemClasses} ref={innerRef} aria-expanded={!collapsed} role="treeitem">
+ <li
+ {...otherProps}
+ className={itemClasses}
+ ref={innerRef}
+ aria-expanded={hasChildren ? !collapsed : undefined}
+ role="treeitem"
+ >
<SpaceButton
+ {...restDragHandleProps}
space={space}
className={isInvite ? "mx_SpaceButton_invite" : undefined}
selected={activeSpaces.includes(space)}
diff --git a/src/components/views/verification/VerificationShowSas.tsx b/src/components/views/verification/VerificationShowSas.tsx
index 71a947df49..2b9ea5da96 100644
--- a/src/components/views/verification/VerificationShowSas.tsx
+++ b/src/components/views/verification/VerificationShowSas.tsx
@@ -15,7 +15,7 @@ limitations under the License.
*/
import React from 'react';
-import { SAS } from "matrix-js-sdk/src/crypto/verification/SAS";
+import { IGeneratedSas } from "matrix-js-sdk/src/crypto/verification/SAS";
import { DeviceInfo } from "matrix-js-sdk/src//crypto/deviceinfo";
import { _t, _td } from '../../../languageHandler';
import { PendingActionSpinner } from "../right_panel/EncryptionInfo";
@@ -30,7 +30,7 @@ interface IProps {
device?: DeviceInfo;
onDone: () => void;
onCancel: () => void;
- sas: SAS.sas;
+ sas: IGeneratedSas;
isSelf?: boolean;
inDialog?: boolean; // whether this component is being shown in a dialog and to use DialogButtons
}
diff --git a/src/components/views/voip/AudioFeedArrayForCall.tsx b/src/components/views/voip/AudioFeedArrayForCall.tsx
index 958ac2a8d4..a7dd0283ff 100644
--- a/src/components/views/voip/AudioFeedArrayForCall.tsx
+++ b/src/components/views/voip/AudioFeedArrayForCall.tsx
@@ -32,7 +32,7 @@ export default class AudioFeedArrayForCall extends React.Component<IProps, IStat
super(props);
this.state = {
- feeds: [],
+ feeds: this.props.call.getRemoteFeeds(),
};
}
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 9d82291286..17fda93921 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -273,14 +273,18 @@ export default class CallView extends React.Component<IProps, IState> {
};
private onScreenshareClick = async (): Promise<void> => {
- const isScreensharing = await this.props.call.setScreensharingEnabled(
- !this.state.screensharing,
- async (): Promise<DesktopCapturerSource> => {
+ let isScreensharing;
+ if (this.state.screensharing) {
+ isScreensharing = await this.props.call.setScreensharingEnabled(false);
+ } else {
+ if (window.electron?.getDesktopCapturerSources) {
const { finished } = Modal.createDialog(DesktopCapturerSourcePicker);
const [source] = await finished;
- return source;
- },
- );
+ isScreensharing = await this.props.call.setScreensharingEnabled(true, source);
+ } else {
+ isScreensharing = await this.props.call.setScreensharingEnabled(true);
+ }
+ }
this.setState({
sidebarShown: true,
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index 4607b750eb..13461c3591 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -45,6 +45,7 @@ interface IProps {
interface IState {
audioMuted: boolean;
videoMuted: boolean;
+ speaking: boolean;
}
@replaceableComponent("views.voip.VideoFeed")
@@ -57,6 +58,7 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
this.state = {
audioMuted: this.props.feed.isAudioMuted(),
videoMuted: this.props.feed.isVideoMuted(),
+ speaking: false,
};
}
@@ -103,11 +105,19 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
if (oldFeed) {
this.props.feed.removeListener(CallFeedEvent.NewStream, this.onNewStream);
this.props.feed.removeListener(CallFeedEvent.MuteStateChanged, this.onMuteStateChanged);
+ if (this.props.feed.purpose === SDPStreamMetadataPurpose.Usermedia) {
+ this.props.feed.removeListener(CallFeedEvent.Speaking, this.onSpeaking);
+ this.props.feed.measureVolumeActivity(false);
+ }
this.stopMedia();
}
if (newFeed) {
this.props.feed.addListener(CallFeedEvent.NewStream, this.onNewStream);
this.props.feed.addListener(CallFeedEvent.MuteStateChanged, this.onMuteStateChanged);
+ if (this.props.feed.purpose === SDPStreamMetadataPurpose.Usermedia) {
+ this.props.feed.addListener(CallFeedEvent.Speaking, this.onSpeaking);
+ this.props.feed.measureVolumeActivity(true);
+ }
this.playMedia();
}
}
@@ -162,6 +172,10 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
});
};
+ private onSpeaking = (speaking: boolean): void => {
+ this.setState({ speaking });
+ };
+
private onResize = (e) => {
if (this.props.onResize && !this.props.feed.isLocal()) {
this.props.onResize(e);
@@ -173,6 +187,7 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
const wrapperClasses = classnames("mx_VideoFeed", {
mx_VideoFeed_voice: this.state.videoMuted,
+ mx_VideoFeed_speaking: this.state.speaking,
});
const micIconClasses = classnames("mx_VideoFeed_mic", {
mx_VideoFeed_mic_muted: this.state.audioMuted,
diff --git a/src/createRoom.ts b/src/createRoom.ts
index 31774bf56f..25e7257289 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -62,6 +62,8 @@ export interface IOpts {
roomType?: RoomType | string;
historyVisibility?: HistoryVisibility;
parentSpace?: Room;
+ // contextually only makes sense if parentSpace is specified, if true then will be added to parentSpace as suggested
+ suggested?: boolean;
joinRule?: JoinRule;
}
@@ -228,7 +230,7 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
}
}).then(() => {
if (opts.parentSpace) {
- return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], true);
+ return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], opts.suggested);
}
if (opts.associatedWithCommunity) {
return GroupStore.addRoomToGroup(opts.associatedWithCommunity, roomId, false);
diff --git a/src/editor/range.ts b/src/editor/range.ts
index 13776177a7..4336a15130 100644
--- a/src/editor/range.ts
+++ b/src/editor/range.ts
@@ -32,13 +32,20 @@ export default class Range {
this._end = bIsLarger ? positionB : positionA;
}
- public moveStart(delta: number): void {
+ public moveStartForwards(delta: number): void {
this._start = this._start.forwardsWhile(this.model, () => {
delta -= 1;
return delta >= 0;
});
}
+ public moveEndBackwards(delta: number): void {
+ this._end = this._end.backwardsWhile(this.model, () => {
+ delta -= 1;
+ return delta >= 0;
+ });
+ }
+
public trim(): void {
this._start = this._start.forwardsWhile(this.model, whitespacePredicate);
this._end = this._end.backwardsWhile(this.model, whitespacePredicate);
diff --git a/src/hooks/useEventEmitter.ts b/src/hooks/useEventEmitter.ts
index 74b23f0198..693eebc0e3 100644
--- a/src/hooks/useEventEmitter.ts
+++ b/src/hooks/useEventEmitter.ts
@@ -20,7 +20,11 @@ import type { EventEmitter } from "events";
type Handler = (...args: any[]) => void;
// Hook to wrap event emitter on and removeListener in hook lifecycle
-export const useEventEmitter = (emitter: EventEmitter, eventName: string | symbol, handler: Handler) => {
+export const useEventEmitter = (
+ emitter: EventEmitter | undefined,
+ eventName: string | symbol,
+ handler: Handler,
+) => {
// Create a ref that stores handler
const savedHandler = useRef(handler);
@@ -51,7 +55,11 @@ export const useEventEmitter = (emitter: EventEmitter, eventName: string | symbo
type Mapper<T> = (...args: any[]) => T;
-export const useEventEmitterState = <T>(emitter: EventEmitter, eventName: string | symbol, fn: Mapper<T>): T => {
+export const useEventEmitterState = <T>(
+ emitter: EventEmitter | undefined,
+ eventName: string | symbol,
+ fn: Mapper<T>,
+): T => {
const [value, setValue] = useState<T>(fn());
const handler = useCallback((...args: any[]) => {
setValue(fn(...args));
diff --git a/src/hooks/useLocalEcho.ts b/src/hooks/useLocalEcho.ts
new file mode 100644
index 0000000000..4b30fd2f00
--- /dev/null
+++ b/src/hooks/useLocalEcho.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useState } from "react";
+
+export const useLocalEcho = <T extends any>(
+ currentFactory: () => T,
+ setterFn: (value: T) => Promise<unknown>,
+ errorFn: (error: Error) => void,
+): [value: T, handler: (value: T) => void] => {
+ const [value, setValue] = useState(currentFactory);
+ const handler = async (value: T) => {
+ setValue(value);
+ try {
+ await setterFn(value);
+ } catch (e) {
+ setValue(currentFactory());
+ errorFn(e);
+ }
+ };
+
+ return [value, handler];
+};
diff --git a/src/hooks/useRoomState.ts b/src/hooks/useRoomState.ts
index e778acf8a9..89c94df10b 100644
--- a/src/hooks/useRoomState.ts
+++ b/src/hooks/useRoomState.ts
@@ -25,7 +25,7 @@ const defaultMapper: Mapper<RoomState> = (roomState: RoomState) => roomState;
// Hook to simplify watching Matrix Room state
export const useRoomState = <T extends any = RoomState>(
- room: Room,
+ room?: Room,
mapper: Mapper<T> = defaultMapper as Mapper<T>,
): T => {
const [value, setValue] = useState<T>(room ? mapper(room.currentState) : undefined);
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index a14e6f8ce8..aa43a5f789 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -128,8 +128,8 @@
"AM": "ص",
"%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
"%(weekDayName)s, %(monthName)s %(day)s %(time)s": "",
- "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
- "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s، %(day)s %(monthName)s %(fullYear)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s، %(day)s %(monthName)s %(fullYear)s %(time)s",
"Who would you like to add to this community?": "مَن تريد إضافته إلى هذا المجتمع؟",
"Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "تحذير: كلّ من تُضيفه إلى أحد المجتمعات سيكون ظاهرًا لكل من يعرف معرّف المجتمع",
"Invite new community members": "ادعُ أعضاء جدد إلى المجتمع",
@@ -1040,7 +1040,7 @@
"Cross-signing is not set up.": "لم يتم إعداد التوقيع المتبادل.",
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "يحتوي حسابك على هوية توقيع متبادل في وحدة تخزين سرية ، لكن هذا الاتصال لم يثق به بعد.",
"Cross-signing is ready for use.": "التوقيع المتبادل جاهز للاستخدام.",
- "Your homeserver does not support cross-signing.": "خادمك الوسيط لا يدعم التوقيع المتبادل (cross-signing).",
+ "Your homeserver does not support cross-signing.": "خادوم المنزل الذي تستعمل لا يدعم التوقيع المتبادل (cross-signing).",
"Change Password": "تغيير كلمة المرور",
"Confirm password": "تأكيد كلمة المرور",
"New Password": "كلمة مرور جديدة",
@@ -1558,9 +1558,9 @@
"Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "يتلقى مديرو التكامل بيانات الضبط ، ويمكنهم تعديل عناصر واجهة المستخدم ، وإرسال دعوات الغرف ، وتعيين مستويات القوة نيابة عنك.",
"Use an integration manager to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل لإدارة الروبوتات وعناصر الواجهة وحزم الملصقات.",
"Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل <b>(%(serverName)s)</b> لإدارة الروبوتات وعناصر الواجهة وحزم الملصقات.",
- "Identity server": "خادم الهوية",
- "Identity server (%(server)s)": "خادمة الهوية (%(server)s)",
- "Could not connect to identity server": "تعذر الاتصال بخادم هوية",
- "Not a valid identity server (status code %(code)s)": "خادم هوية مردود (رقم الحال %(code)s)",
- "Identity server URL must be HTTPS": "يجب أن يكون رابط (URL) خادم الهوية HTTPS"
+ "Identity server": "خادوم الهوية",
+ "Identity server (%(server)s)": "خادوم الهوية (%(server)s)",
+ "Could not connect to identity server": "تعذر الاتصال بخادوم الهوية",
+ "Not a valid identity server (status code %(code)s)": "ليس خادوم هوية صالح (رمز الحالة %(code)s)",
+ "Identity server URL must be HTTPS": "يجب أن يستعمل رابط (URL) خادوم الهوية ميفاق HTTPS"
}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 04956ba68c..65a1fc4040 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -149,7 +149,7 @@
"Identity Server is": "Server identity je",
"I have verified my email address": "Ověřil(a) jsem svou e-mailovou adresu",
"Import": "Importovat",
- "Import E2E room keys": "Importovat end-to-end klíče místností",
+ "Import E2E room keys": "Importovat šifrovací klíče místností",
"Incoming call from %(name)s": "Příchozí hovor od %(name)s",
"Incoming video call from %(name)s": "Příchozí videohovor od %(name)s",
"Incoming voice call from %(name)s": "Příchozí hlasový hovor od %(name)s",
@@ -194,7 +194,7 @@
"Return to login screen": "Vrátit k přihlašovací obrazovce",
"%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s není oprávněn posílat vám oznámení – zkontrolujte prosím nastavení svého prohlížeče",
"%(brand)s was not given permission to send notifications - please try again": "%(brand)s nebyl oprávněn k posílání oznámení – zkuste to prosím znovu",
- "%(brand)s version:": "verze %(brand)s:",
+ "%(brand)s version:": "Verze %(brand)s:",
"Room %(roomId)s not visible": "Místnost %(roomId)s není viditelná",
"Room Colour": "Barva místnosti",
"%(roomName)s does not exist.": "%(roomName)s neexistuje.",
@@ -926,7 +926,7 @@
"Email Address": "E-mailová adresa",
"Delete Backup": "Smazat zálohu",
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Opravdu? Pokud klíče nejsou správně zálohované můžete přijít o šifrované zprávy.",
- "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené end-to-end šifrováním. Klíče pro jejich dešifrování máte jen vy a příjemci zpráv.",
+ "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené koncovým šifrováním. Klíče pro jejich dešifrování máte jen vy a příjemci zpráv.",
"Unable to load key backup status": "Nepovedlo se načíst stav zálohy",
"Restore from Backup": "Obnovit ze zálohy",
"Back up your keys before signing out to avoid losing them.": "Před odhlášením si zazálohujte klíče abyste o ně nepřišli.",
@@ -995,7 +995,7 @@
"The other party cancelled the verification.": "Druhá strana ověření zrušila.",
"Verified!": "Ověřeno!",
"You've successfully verified this user.": "Uživatel úspěšně ověřen.",
- "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Bezpečné zprávy s tímto uživatelem jsou end-to-end šifrované a nikdo další je nemůže číst.",
+ "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Bezpečné zprávy s tímto uživatelem jsou koncově šifrované a nikdo další je nemůže číst.",
"Got It": "OK",
"Verify this user by confirming the following emoji appear on their screen.": "Ověřte uživatele zkontrolováním, že se mu na obrazovce objevily stejné emoji.",
"Verify this user by confirming the following number appears on their screen.": "Ověřte uživatele zkontrolováním, že se na obrazovce objevila stejná čísla.",
@@ -1084,7 +1084,7 @@
"Unable to load commit detail: %(msg)s": "Nepovedlo se načíst detaily revize: %(msg)s",
"Incompatible Database": "Nekompatibilní databáze",
"Continue With Encryption Disabled": "Pokračovat bez šifrování",
- "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů vám dává jistotu, že je komunikace důvěrná.",
+ "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů vám dává větší jistotu, že je komunikace důvěrná.",
"Waiting for partner to confirm...": "Čekám až to partner potvrdí...",
"Incoming Verification Request": "Přišla vám žádost o ověření",
"Incompatible local cache": "Nekompatibilní lokální vyrovnávací paměť",
@@ -1502,8 +1502,8 @@
"Unread mentions.": "Nepřečtená zmínka.",
"Unread messages.": "Nepřečtené zprávy.",
"Failed to deactivate user": "Deaktivace uživatele se nezdařila",
- "This client does not support end-to-end encryption.": "Tento klient nepodporuje end-to-end šifrování.",
- "Messages in this room are not end-to-end encrypted.": "Zprávy nejsou end-to-end šifrované.",
+ "This client does not support end-to-end encryption.": "Tento klient nepodporuje koncové šifrování.",
+ "Messages in this room are not end-to-end encrypted.": "Zprávy nejsou koncově šifrované.",
"React": "Reagovat",
"Message Actions": "Akce zprávy",
"Show image": "Zobrazit obrázek",
@@ -1658,7 +1658,7 @@
"Not trusted": "Nedůvěryhodné",
"Direct message": "Přímá zpráva",
"<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> v %(roomName)s",
- "Messages in this room are end-to-end encrypted.": "V této místnosti jsou zprávy šifrované end-to-end.",
+ "Messages in this room are end-to-end encrypted.": "V této místnosti jsou zprávy koncově šifrované.",
"Security": "Bezpečnost",
"Verify": "Ověřit",
"You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Tohoto uživatele ignorujete, takže jsou jeho zprávy skryté. <a>Přesto zobrazit.</a>",
@@ -1809,7 +1809,7 @@
"You have not verified this user.": "Tohoto uživatele jste neověřili.",
"You have verified this user. This user has verified all of their sessions.": "Tohoto uživatele jste ověřili a on ověřil všechny své relace.",
"Someone is using an unknown session": "Někdo používá neznámou relaci",
- "This room is end-to-end encrypted": "Místnost je šifrovaná end-to-end",
+ "This room is end-to-end encrypted": "Místnost je koncově šifrovaná",
"Everyone in this room is verified": "V této místnosti jsou všichni ověřeni",
"Mod": "Moderátor",
"Your key share request has been sent - please check your other sessions for key share requests.": "Požadavek na sdílení klíčů byl odeslán - podívejte se prosím na své ostatní relace, jestli vám přišel.",
@@ -1858,7 +1858,7 @@
"Session name": "Název relace",
"Session key": "Klíč relace",
"Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ověření uživatele označí jeho relace za důvěryhodné a vaše relace budou důvěryhodné pro něj.",
- "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dát trochu klidu mysli navíc při používání šifrovaných zpráv.",
+ "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dává větší jistotu, že je komunikace důvěrná.",
"Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ověření zařízení ho označí za důvěryhodné a uživatelé, kteří věří vám budou také tomuto zařízení důvěřovat.",
"Failed to invite the following users to chat: %(csvUsers)s": "Následující uživatele se nepovedlo do konverzace pozvat: %(csvUsers)s",
"We couldn't create your DM. Please check the users you want to invite and try again.": "Nepovedlo se nám vyrobit soukromou konverzaci. Zkontrolujte prosím, že pozvaný uživatel opravdu existuje a pak to zkuste znovu.",
@@ -2063,7 +2063,7 @@
"Add a new server...": "Přidat nový server...",
"%(networkName)s rooms": "místnosti v %(networkName)s",
"Matrix rooms": "místnosti na Matrixu",
- "Enable end-to-end encryption": "Povolit E2E šifrování",
+ "Enable end-to-end encryption": "Povolit koncové šifrování",
"You can’t disable this later. Bridges & most bots won’t work yet.": "Toto nelze později vypnout. Většina botů a propojení zatím nefunguje.",
"Server did not require any authentication": "Server nevyžadoval žádné ověření",
"Server did not return valid authentication information.": "Server neposkytl platné informace o ověření.",
@@ -2078,7 +2078,7 @@
"Verify all your sessions to ensure your account & messages are safe": "Ověřte všechny své relace, abyste zaručili, že jsou vaše zprávy a účet bezpečné",
"Verify the new login accessing your account: %(name)s": "Ověřte nové přihlášení na váš účet: %(name)s",
"Room name or address": "Jméno nebo adresa místnosti",
- "Joins room with given address": "Přidat se do místnosti s danou adresou",
+ "Joins room with given address": "Vstoupit do místnosti s danou adresou",
"Unrecognised room address:": "Nerozpoznaná adresa místnosti:",
"Font size": "Velikost písma",
"IRC display name width": "šířka zobrazovného IRC jména",
@@ -2194,7 +2194,7 @@
"Your server isn't responding to some <a>requests</a>.": "Váš server neodpovídá na některé <a>požadavky</a>.",
"Master private key:": "Hlavní soukromý klíč:",
"%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s nemůže bezpečně ukládat šifrované zprávy lokálně v prohlížeči. Pro zobrazení šifrovaných zpráv ve výsledcích vyhledávání použijte <desktopLink>%(brand)s Desktop</desktopLink>.",
- "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Váš administrátor vypnul šifrování ve výchozím nastavení soukromých místností a přímých chatů.",
+ "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Správce vašeho serveru vypnul ve výchozím nastavení koncové šifrování v soukromých místnostech a přímých zprávách.",
"To link to this room, please add an address.": "Přidejte prosím místnosti adresu aby na ní šlo odkazovat.",
"The authenticity of this encrypted message can't be guaranteed on this device.": "Pravost této šifrované zprávy nelze na tomto zařízení ověřit.",
"Emoji picker": "Výběr emoji",
@@ -2383,7 +2383,7 @@
"This is the start of <roomName/>.": "Toto je začátek místnosti <roomName/>.",
"Topic: %(topic)s ": "Téma: %(topic)s ",
"Topic: %(topic)s (<a>edit</a>)": "Téma: %(topic)s (<a>upravit</a>)",
- "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Zprávy zde jsou šifrovány end-to-end. Ověřte uživatele %(displayName)s v jeho profilu - klepněte na jeho avatar.",
+ "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Zprávy zde jsou koncově šifrovány. Ověřte uživatele %(displayName)s v jeho profilu - klepněte na jeho avatar.",
"Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Zadejte frázi zabezpečení, kterou znáte jen vy, k ochraně vašich dat. Z důvodu bezpečnosti byste neměli znovu používat heslo k účtu.",
"Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Použijte tajnou frázi, kterou znáte pouze vy, a volitelně uložte bezpečnostní klíč, který použijete pro zálohování.",
"Enter a Security Phrase": "Zadání bezpečnostní fráze",
@@ -2773,12 +2773,12 @@
"%(completed)s of %(total)s keys restored": "Obnoveno %(completed)s z %(total)s klíčů",
"Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Uložte bezpečnostní klíč někam na bezpečné místo, například do správce hesel nebo do trezoru, který slouží k ochraně vašich šifrovaných dat.",
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Váš klíč pro obnovení je bezpečnostní sítí - můžete jej použít k obnovení přístupu k šifrovaným zprávám, pokud zapomenete přístupovou frázi pro obnovení.",
- "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Byla zjištěna data ze starší verze %(brand)s. To bude mít za následek nefunkčnost end-to-end kryptografie ve starší verzi. End-to-end šifrované zprávy vyměněné nedávno při používání starší verze nemusí být v této verzi dešifrovatelné. To může také způsobit selhání zpráv vyměňovaných s touto verzí. Pokud narazíte na problémy, odhlaste se a znovu se přihlaste. Chcete-li zachovat historii zpráv, exportujte a znovu importujte klíče.",
+ "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Byla zjištěna data ze starší verze %(brand)s. To bude mít za následek nefunkčnost koncové kryptografie ve starší verzi. Koncově šifrované zprávy vyměněné nedávno při používání starší verze nemusí být v této verzi dešifrovatelné. To může také způsobit selhání zpráv vyměňovaných s touto verzí. Pokud narazíte na problémy, odhlaste se a znovu se přihlaste. Chcete-li zachovat historii zpráv, exportujte a znovu importujte klíče.",
"Failed to find the general chat for this community": "Nepodařilo se najít obecný chat pro tuto skupinu",
"We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Na náš server uložíme zašifrovanou kopii vašich klíčů. Zabezpečte zálohu pomocí přístupové fráze pro obnovení.",
"Enter your recovery passphrase a second time to confirm it.": "Zadejte podruhé přístupovou frázi pro obnovení a potvrďte ji.",
"If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Pokud nyní nebudete pokračovat, můžete ztratit šifrované zprávy a data, pokud ztratíte přístup ke svým přihlašovacím údajům.",
- "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Zprávy v této místnosti jsou šifrovány end-to-end. Když se lidé připojí, můžete je ověřit v jejich profilu, stačí klepnout na jejich avatara.",
+ "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Zprávy v této místnosti jsou koncově šifrovány. Když se lidé připojí, můžete je ověřit v jejich profilu, stačí klepnout na jejich avatara.",
"Revoke permissions": "Odvolat oprávnění",
"Continuing without email": "Pokračuje se bez e-mailu",
"You can change this later if needed.": "V případě potřeby to můžete později změnit.",
@@ -3368,7 +3368,7 @@
"Failed to update the guest access of this space": "Nepodařilo se aktualizovat přístup hosta do tohoto prostoru",
"Failed to update the visibility of this space": "Nepodařilo se aktualizovat viditelnost tohoto prostoru",
"e.g. my-space": "např. můj-prostor",
- "Silence call": "Tiché volání",
+ "Silence call": "Ztlumit zvonění",
"Sound on": "Zvuk zapnutý",
"Show notification badges for People in Spaces": "Zobrazit odznaky oznámení v Lidi v prostorech",
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Pokud je zakázáno, můžete stále přidávat přímé zprávy do osobních prostorů. Pokud je povoleno, automaticky se zobrazí všichni, kteří jsou členy daného prostoru.",
@@ -3564,5 +3564,61 @@
"%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s%(count)s krát změnil(a) <a>připnuté zprávy</a> místnosti.",
"%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s%(count)s krát změnili <a>připnuté zprávy</a> místnosti.",
"Olm version:": "Verze Olm:",
- "Don't send read receipts": "Neposílat potvrzení o přečtení"
+ "Don't send read receipts": "Neposílat potvrzení o přečtení",
+ "Delete avatar": "Smazat avatar",
+ "Created from <Community />": "Vytvořeno z <Community />",
+ "Communities won't receive further updates.": "Skupiny nebudou dostávat další aktualizace.",
+ "Spaces are a new way to make a community, with new features coming.": "Prostory jsou novým způsobem vytváření komunit a přibývají nové funkce.",
+ "Communities can now be made into Spaces": "Ze skupin lze nyní vytvořit prostory",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Požádejte <a>správce</a> této skupiny, aby z ní udělali prostor a počkejte na pozvánku.",
+ "You can create a Space from this community <a>here</a>.": "<a>Zde</a> můžete vytvořit prostor z této skupiny.",
+ "This description will be shown to people when they view your space": "Tento popis se zobrazí lidem při prohlížení vašeho prostoru",
+ "Flair won't be available in Spaces for the foreseeable future.": "Symbol příslušnosti ke skupině nebude v dohledné době dostupný ve Spaces.",
+ "All rooms will be added and all community members will be invited.": "Všechny místnosti budou přidány a všichni členové skupiny budou pozváni.",
+ "To create a Space from another community, just pick the community in Preferences.": "Chcete-li vytvořit prostor z jiné skupiny, vyberte ji v Předvolbách.",
+ "Show my Communities": "Zobrazit moje Skupiny",
+ "A link to the Space will be put in your community description.": "Odkaz na prostor bude vložen do popisu vaší skupiny.",
+ "Create Space from community": "Vytvořit prostor ze skupiny",
+ "Failed to migrate community": "Nepodařilo se převést skupinu",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> byl vytvořen a všichni, kteří byli součástí skupiny, do něj byli pozváni.",
+ "Space created": "Prostor byl vytvořen",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Chcete-li zobrazit Prostory, skryjte skupiny v <a>Předvolbách</a>",
+ "This community has been upgraded into a Space": "Tato skupina byla převedena na prostor",
+ "If a community isn't shown you may not have permission to convert it.": "Pokud skupina není zobrazena, nemusíte mít povolení k její konverzi.",
+ "You can also create a Space from a <a>community</a>.": "Prostor můžete vytvořit také ze <a>skupiny</a>.",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Skupiny byly archivovány, aby uvolnily místo pro Prostory, ale níže můžete své skupiny převést na prostory. Převedení zajistí, že vaše konverzace budou mít nejnovější funkce.",
+ "Create Space": "Vytvořit prostor",
+ "What kind of Space do you want to create?": "Jaký druh prostoru chcete vytvořit?",
+ "Open Space": "Otevřít prostor",
+ "To join an existing space you'll need an invite.": "Chcete-li se připojit k existujícímu prostoru, potřebujete pozvánku.",
+ "You can change this later.": "Toto můžete změnit později.",
+ "Unknown failure: %(reason)s": "Neznámá chyba: %(reason)s",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ladící protokoly obsahují údaje o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasů místností nebo skupin, které jste navštívili, s kterými prvky uživatelského rozhraní jste naposledy interagovali a uživatelská jména ostatních uživatelů. Neobsahují zprávy.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Pokud jste odeslali chybu prostřednictvím GitHubu, ladící protokoly nám mohou pomoci problém vysledovat. Ladicí protokoly obsahují údaje o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasů místností nebo skupin, které jste navštívili, s jakými prvky uživatelského rozhraní jste naposledy interagovali a uživatelská jména ostatních uživatelů. Neobsahují zprávy.",
+ "Rooms and spaces": "Místnosti a prostory",
+ "Results": "Výsledky",
+ "Enable encryption in settings.": "Povolte šifrování v nastavení.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Vaše soukromé zprávy jsou obvykle šifrované, ale tato místnost není. Obvykle je to způsobeno nepodporovaným zařízením nebo použitou metodou, například e-mailovými pozvánkami.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Abyste se těmto problémům vyhnuli, vytvořte pro plánovanou konverzaci <a>novou veřejnou místnost</a>.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nedoporučujeme šifrované místnosti zveřejňovat.</b> Znamená to, že místnost může kdokoli najít a připojit se k ní, takže si kdokoli může přečíst zprávy. Nezískáte tak žádnou z výhod šifrování. Šifrování zpráv ve veřejné místnosti zpomalí příjem a odesílání zpráv.",
+ "Are you sure you want to make this encrypted room public?": "Jste si jisti, že chcete tuto šifrovanou místnost zveřejnit?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Chcete-li se těmto problémům vyhnout, vytvořte pro plánovanou konverzaci <a>novou šifrovanou místnost</a>.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nedoporučuje se šifrovat veřejné místnosti.</b>Veřejné místnosti může najít a připojit se k nim kdokoli, takže si v nich může číst zprávy kdokoli. Nezískáte tak žádnou z výhod šifrování a nebudete ho moci později vypnout. Šifrování zpráv ve veřejné místnosti zpomalí příjem a odesílání zpráv.",
+ "Are you sure you want to add encryption to this public room?": "Opravdu chcete šifrovat tuto veřejnou místnost?",
+ "Cross-signing is ready but keys are not backed up.": "Křížové podepisování je připraveno, ale klíče nejsou zálohovány.",
+ "Low bandwidth mode (requires compatible homeserver)": "Režim malé šířky pásma (vyžaduje kompatibilní homeserver)",
+ "Multiple integration managers (requires manual setup)": "Více správců integrace (vyžaduje ruční nastavení)",
+ "Threaded messaging": "Zprávy ve vláknech",
+ "Thread": "Vlákno",
+ "Show threads": "Zobrazit vlákna",
+ "The above, but in <Room /> as well": "Výše uvedené, ale také v <Room />",
+ "The above, but in any room you are joined or invited to as well": "Výše uvedené, ale také v jakékoli místnosti, ke které jste připojeni nebo do které jste pozváni",
+ "Autoplay videos": "Automatické přehrávání videí",
+ "Autoplay GIFs": "Automatické přehrávání GIFů",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s odepnul zprávu z této místnosti. Zobrazit všechny připnuté zprávy.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s odepnul <a>zprávu</a> z této místnosti. Zobrazit všechny <b>připnuté zprávy</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s připnul zprávu k této místnosti. Zobrazit všechny připnuté zprávy.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s připnul <a>zprávu</a> k této místnosti. Zobrazit všechny <b>připnuté zprávy</b>.",
+ "Currently, %(count)s spaces have access|one": "V současné době má prostor přístup",
+ "& %(count)s more|one": "a %(count)s další"
}
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 991dd312bc..9ee1f56d55 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -402,7 +402,7 @@
"Featured Rooms:": "Hervorgehobene Räume:",
"Featured Users:": "Hervorgehobene Benutzer:",
"Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
- "Failed to upload image": "Bild-Hochladen fehlgeschlagen",
+ "Failed to upload image": "Hochladen des Bildes fehlgeschlagen",
"AM": "a. m.",
"PM": "p. m.",
"The maximum permitted number of widgets have already been added to this room.": "Die maximal erlaubte Anzahl an hinzufügbaren Widgets für diesen Raum wurde erreicht.",
@@ -645,7 +645,7 @@
"Clear filter": "Filter zurücksetzen",
"Key request sent.": "Schlüsselanfrage gesendet.",
"If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-IDs und Aliase, die du besucht hast sowie Nutzernamen anderer Nutzer mit denen du schreibst. Sie enthalten keine Nachrichten.",
- "Submit debug logs": "Fehlerberichte einreichen",
+ "Submit debug logs": "Fehlerbericht einreichen",
"Code": "Code",
"Opens the Developer Tools dialog": "Entwickler-Werkzeuge öffnen",
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Von %(displayName)s (%(userName)s) um %(dateTime)s gesehen",
@@ -1026,7 +1026,7 @@
"Versions": "Versionen",
"Room Addresses": "Raumadressen",
"Deactivating your account is a permanent action - be careful!": "Die Deaktivierung deines Kontos ist unwiderruflich - sei vorsichtig!",
- "Preferences": "Chats",
+ "Preferences": "Optionen",
"Room list": "Raumliste",
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Die Datei '%(fileName)s' überschreitet die maximale Uploadgröße deines Heimservers",
"This room has no topic.": "Dieser Raum hat kein Thema.",
@@ -1424,7 +1424,7 @@
"Cancel entering passphrase?": "Eingabe der Passphrase abbrechen?",
"Setting up keys": "Einrichten der Schlüssel",
"Encryption upgrade available": "Verschlüsselungsaufstufung verfügbar",
- "Verifies a user, session, and pubkey tuple": "Verifiziert einen Benutzer, eine Sitzung und die öffentlichen Schlüsselpaare",
+ "Verifies a user, session, and pubkey tuple": "Verifiziert Benutzer, Sitzung und öffentlichen Schlüsselpaare",
"Unknown (user, session) pair:": "Unbekanntes Nutzer-/Sitzungspaar:",
"Session already verified!": "Sitzung bereits verifiziert!",
"WARNING: Session already verified, but keys do NOT MATCH!": "WARNUNG: Die Sitzung wurde bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
@@ -2920,7 +2920,7 @@
"Decide where your account is hosted": "Gib an wo dein Benutzerkonto gehostet werden soll",
"Already have an account? <a>Sign in here</a>": "Hast du schon ein Benutzerkonto? <a>Melde dich hier an</a>",
"%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s oder %(usernamePassword)s",
- "Continue with %(ssoButtons)s": "Mit %(ssoButtons)s fortfahren",
+ "Continue with %(ssoButtons)s": "Mit %(ssoButtons)s anmelden",
"That username already exists, please try another.": "Dieser Benutzername existiert schon. Bitte versuche es mit einem anderen.",
"New? <a>Create account</a>": "Neu? <a>Erstelle ein Benutzerkonto</a>",
"There was a problem communicating with the homeserver, please try again later.": "Es gab ein Problem bei der Kommunikation mit dem Homseserver. Bitte versuche es später erneut.",
@@ -3228,7 +3228,7 @@
"You have unverified logins": "Du hast nicht-bestätigte Anmeldungen",
"Review to ensure your account is safe": "Überprüfen, um sicher zu sein, dass dein Konto sicher ist",
"Message search initilisation failed": "Initialisierung der Nachrichtensuche fehlgeschlagen",
- "Support": "Unterstützen",
+ "Support": "Support",
"This room is suggested as a good one to join": "Dieser Raum wurde als gut zum Beitreten vorgeschlagen",
"Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Deine Nachricht wurde nicht versendet, weil dieser Heimserver von dessen Administrator gesperrt wurde. Bitte <a>kontaktiere deinen Dienstadministrator</a> um den Dienst weiterzunutzen.",
"Verification requested": "Verifizierung angefragt",
@@ -3369,7 +3369,7 @@
"Nothing pinned, yet": "Es ist nichts angepinnt. Noch nicht.",
"End-to-end encryption isn't enabled": "Ende-zu-Ende-Verschlüsselung ist deaktiviert",
"See when people join, leave, or are invited to your active room": "Anzeigen, wenn Leute den aktuellen Raum betreten, verlassen oder in ihn eingeladen werden",
- "Teammates might not be able to view or join any private rooms you make.": "Mitglieder werden private Räume möglicherweise weder sehen noch betreten können.",
+ "Teammates might not be able to view or join any private rooms you make.": "Mitglieder werden private Räume möglicherweise weder anzeigen noch betreten können.",
"Error - Mixed content": "Fehler - Uneinheitlicher Inhalt",
"Kick, ban, or invite people to your active room, and make you leave": "Den aktiven Raum verlassen, Leute einladen, entfernen oder bannen",
"Kick, ban, or invite people to this room, and make you leave": "Diesen Raum verlassen, Leute einladen, entfernen oder bannen",
@@ -3464,11 +3464,11 @@
"Unable to copy room link": "Raumlink konnte nicht kopiert werden",
"Integration manager": "Integrationsverwaltung",
"User Directory": "Benutzerverzeichnis",
- "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Dein %(brand)s erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
+ "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
"Copy Link": "Link kopieren",
"Transfer Failed": "Übertragen fehlgeschlagen",
"Unable to transfer call": "Übertragen des Anrufs fehlgeschlagen",
- "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsserver übertragen werden.",
+ "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsmanager übertragen werden.",
"Identity server is": "Der Identitätsserver ist",
"Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationsverwalter erhalten Konfigurationsdaten und können Widgets modifizieren, Raumeinladungen verschicken und in deinem Namen Berechtigungslevel setzen.",
"Use an integration manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsverwalter, um Bots, Widgets und Stickerpakete zu verwalten.",
@@ -3518,6 +3518,129 @@
"Hide sidebar": "Seitenleiste verbergen",
"Start sharing your screen": "Bildschirmfreigabe starten",
"Stop sharing your screen": "Bildschirmfreigabe beenden",
- "Don't send read receipts": "Sende keine Lesebestätigungen",
- "Send pseudonymous analytics data": "Sende pseudonymisierte Nutzungsdaten"
+ "Don't send read receipts": "Keine Lesebestätigungen senden",
+ "Send pseudonymous analytics data": "Sende pseudonymisierte Nutzungsdaten",
+ "Your camera is still enabled": "Deine Kamera ist noch aktiv",
+ "Your camera is turned off": "Deine Kamera ist ausgeschaltet",
+ "Missed call": "Verpasster Anruf",
+ "Call declined": "Anruf abgelehnt",
+ "Dialpad": "Telefontastatur",
+ "Stop the camera": "Kamera stoppen",
+ "Start the camera": "Kamera starten",
+ "You can change this at any time from room settings.": "Du kannst das jederzeit in den Raumeinstellungen ändern.",
+ "Everyone in <SpaceName/> will be able to find and join this room.": "Alle in <SpaceName/> können diesen Raum beitreten.",
+ "Adding spaces has moved.": "Das Hinzufügen von Spaces ist umgezogen.",
+ "Search for rooms": "Räume suchen",
+ "Search for spaces": "Spaces suchen",
+ "Create a new space": "Neuen Space erstellen",
+ "Want to add a new space instead?": "Willst du stattdessen einen neuen Space hinzufügen?",
+ "Add existing space": "Existierenden Space hinzufügen",
+ "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> %(count)s mal geändert.",
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> %(count)s mal geändert.",
+ "Share content": "Inhalt teilen",
+ "Application window": "Anwendungsfenster",
+ "Share entire screen": "Vollständigen Bildschirm teilen",
+ "Decrypting": "Entschlüsseln",
+ "Unknown failure: %(reason)s": "Unbekannter Fehler: %(reason)s",
+ "Stop recording": "Aufnahme beenden",
+ "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Ab sofort kannst du deinen Bildschirm teilen. Klicke im Anruf dazu auf den „Bildschirm teilen“-Knopf. Das ist auch in Sprachanrufen möglich!",
+ "Screen sharing is here!": "Ab sofort kannst du deinen Bildschirm teilen 🎉",
+ "Send voice message": "Sprachnachricht senden",
+ "Access": "Zugriff",
+ "Decide who can join %(roomName)s.": "Entscheide, wer %(roomName)s betreten kann.",
+ "Space members": "Spacemitglieder",
+ "Anyone in a space can find and join. You can select multiple spaces.": "Alle aus den ausgewählten Spaces können beitreten.",
+ "Anyone in %(spaceName)s can find and join. You can select other spaces too.": "Alle in %(spaceName)s können beitreten. Du kannst weitere Spaces auswählen.",
+ "Spaces with access": "Spaces mit Zugriff",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Alle in den ausgewählten Spaces können beitreten. <a>Du kannst die Spaces hier ändern.</a>",
+ "Currently, %(count)s spaces have access|other": "%(count)s Spaces haben Zugriff",
+ "& %(count)s more|other": "und %(count)s weitere",
+ "Upgrade required": "Upgrade erforderlich",
+ "Only invited people can join.": "Nur eingeladene Personen können beitreten.",
+ "Private (invite only)": "Privat (Beitreten mit Einladung)",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "Dieses Upgrade erlaubt Mitgliedern der ausgewählten Spaces automatisch Zugriff.",
+ "If a community isn't shown you may not have permission to convert it.": "Wenn eine Community nicht angezeigt wird, hast du keine Berechtigung, sie zu konvertieren.",
+ "Show my Communities": "Meine Communities anzeigen",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Die Communities wurden archiviert, um Platz für Spaces zu machen. Du kannst sie aber konvertieren und so alle neuen Features der Spaces nutzen.",
+ "Create Space": "Space erstellen",
+ "Open Space": "Space öffnen",
+ "Olm version:": "Version von Olm:",
+ "Show all rooms": "Alle Räume anzeigen",
+ "To join an existing space you'll need an invite.": "Um einen Space beizutreten, musst du eingeladen werden.",
+ "You can also create a Space from a <a>community</a>.": "Außerdem kannst du einen Space aus einer <a>Community</a> erstellen.",
+ "You can change this later.": "Du kannst dies jederzeit ändern.",
+ "What kind of Space do you want to create?": "Was für einen Space willst du erstellen?",
+ "Give feedback.": "Feedback geben.",
+ "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Danke dass du die Spaces ausprobierst. Dein Feedback hilft, uns das Feature zu verbessern.",
+ "Spaces feedback": "Feedback zu Spaces",
+ "Spaces are a new feature.": "Spaces sind ein neues Feature.",
+ "Delete avatar": "Avatar löschen",
+ "%(sharerName)s is presenting": "%(sharerName)s präsentiert",
+ "You are presenting": "Du präsentierst",
+ "All rooms you're in will appear in Home.": "Alle Räume werden auf der Startseite angezeigt.",
+ "Only people invited will be able to find and join this room.": "Nur eingeladene Personen können den Raum finden und betreten.",
+ "Anyone will be able to find and join this room.": "Alle können diesen Raum finden und betreten.",
+ "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Alle, nicht nur Mitglieder von <SpaceName/>, können beitreten.",
+ "This community has been upgraded into a Space": "Diese Community hat ein Upgrade erhalten und ist jetzt ein Space",
+ "Visible to space members": "Für Space-Mitglieder sichtbar",
+ "Public room": "Öffentlicher Raum",
+ "Private room (invite only)": "Privater Raum (Einladung erforderlich)",
+ "Room visibility": "Raumsichtbarkeit",
+ "Create a room": "Raum erstellen",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Um Spaces zu sehen, <a>verstecke Communities in den Einstellungen</a>",
+ "We're working on this, but just want to let you know.": "Wir arbeiten daran, wollten dich aber darauf hinweisen.",
+ "Search for rooms or spaces": "Räume und Spaces suchen",
+ "Created from <Community />": "Erstellt aus <Community />",
+ "Communities won't receive further updates.": "Communities werden keine Updates mehr erhalten.",
+ "Spaces are a new way to make a community, with new features coming.": "Spaces sind der neue Weg, eine Community zu gründen und bieten viele neue Features.",
+ "Communities can now be made into Spaces": "Communities können ab sofort zu Spaces konvertiert werden",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "<a>Frag die Admins</a> dieser Community, dass sie sie zu einem Space konvertieren.",
+ "You can create a Space from this community <a>here</a>.": "<a>Hier kannst du die Community zu einem Space konvertieren</a>.",
+ "Add space": "Space hinzufügen",
+ "Automatically invite members from this room to the new one": "Mitglieder automatisch in den neuen Raum einladen",
+ "Search spaces": "Spaces durchsuchen",
+ "Select spaces": "Spaces auswählen",
+ "Are you sure you want to leave <spaceName/>?": "Willst du <spaceName/> wirklich verlassen?",
+ "Leave %(spaceName)s": "%(spaceName)s verlassen",
+ "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Du bist der einzige Admin einiger Räume oder Spaces, die du verlassen willst. Dadurch werden diese keine Admins mehr haben.",
+ "You're the only admin of this space. Leaving it will mean no one has control over it.": "Du bist der letzte Admin in diesem Space. Wenn du ihn jetzt verlässt, hat niemand mehr die Kontrolle über ihn.",
+ "You won't be able to rejoin unless you are re-invited.": "Ohne neuer Einladung kannst du nicht erneut beitreten.",
+ "Search %(spaceName)s": "%(spaceName)s durchsuchen",
+ "Leave specific rooms and spaces": "Manche Räume und Spaces verlassen",
+ "Don't leave any": "Nichts verlassen",
+ "Leave all rooms and spaces": "Alle Räume und Spaces verlassen",
+ "Want to add an existing space instead?": "Willst du einen existierenden Space hinzufügen?",
+ "Only people invited will be able to find and join this space.": "Nur eingeladene Personen können diesen Space sehen und beitreten.",
+ "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Alle, nicht nur Mitglieder von <SpaceName/> können beitreten.",
+ "Anyone in <SpaceName/> will be able to find and join.": "Alle in <SpaceName/> können beitreten.",
+ "Private space (invite only)": "Privater Space (Betreten auf Einladung)",
+ "Space visibility": "Sichtbarkeit des Space",
+ "This description will be shown to people when they view your space": "Dieser Text wird Leuten, die den Space betrachten, angezeigt",
+ "Flair won't be available in Spaces for the foreseeable future.": "Abzeichen in Spaces werden in absehbarer Zeit nicht verfügbar sein.",
+ "All rooms will be added and all community members will be invited.": "Alle Räume werden hinzugefügt werden und alle Community-Mitglider eingeladen.",
+ "A link to the Space will be put in your community description.": "In die Beschreibung der Community wird ein Link zum Space hinzugefügt.",
+ "Create Space from community": "Space aus einer Community erstellen",
+ "Failed to migrate community": "Fehler beim konvertieren der Community",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> wurde erfolgreich erstellt. Alle aus der alten Community wurden eingeladen.",
+ "Space created": "Space erstellt",
+ "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Upgraden wird eine neue Version des Raums erstellen</b>. Die alten Nachrichten bleiben im alten Raum archiviert.",
+ "Other spaces or rooms you might not know": "Andere Spaces, die du möglicherweise nicht kennst",
+ "Spaces you know that contain this room": "Spaces, in denen du Mitglied bist und diesen Raum enthalten",
+ "You're removing all spaces. Access will default to invite only": "Du entfernst alle Spaces. Neue Personen können nur mehr mit Einladung beitreten",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug Logs enthalten Nutzungsdaten wie Nutzernamen von dir und anderen Personen, Raum-IDs deiner beigetretenen Räume und Spaces sowie mit welchen Elementen der Oberfläche du kürzlich interagiert hast aber keine Nachrichteninhalte.",
+ "People with supported clients will be able to join the room without having a registered account.": "Personen können diesen Raum ohne registrierten Account betreten.",
+ "Anyone can find and join.": "Jeder kann finden und beitreten.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Wenn du einen Bugreport bei GitHub einreichst, können uns Debug Logs helfen, das Problem ausfindig zu machen. Sie enthalten Nutzungsdaten wie Nutzernamen von dir und anderen Personen, Raum-IDs deiner beigetretenen Räume und Spaces sowie mit welchen Elementen der Oberfläche du kürzlich interagiert hast.",
+ "Mute the microphone": "Stummschalten",
+ "Unmute the microphone": "Stummschaltung deaktivieren",
+ "Displaying time": "Zeitanzeige",
+ "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "In der linken Leiste kannst du eine Community auswählen, damit dir nur die Räume und Personen dieser Community angezeigt werden.",
+ "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Entscheide, welche Spaces auf den Raum zugreifen können. Mitglieder ausgewählter Spaces können <RoomName/> betreten.",
+ "To create a Space from another community, just pick the community in Preferences.": "Um eine andere Community in einen Space zu konvertieren, wähle sie in Einstellungen -> Chats.",
+ "Their device couldn't start the camera or microphone": "Mikrofon oder Kamera des Gesprächspartners konnte nicht gestartet werden",
+ "Enable encryption in settings.": "Aktiviere Verschlüsselung in den Einstellungen.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Dieser Raum ist nicht verschlüsselt. Oft ist dies aufgrund eines nicht unterstützten Geräts oder Methode wie E-Mail-Einladungen der Fall.",
+ "Cross-signing is ready but keys are not backed up.": "Quersignatur ist bereit, die Schlüssel sind aber nicht gesichert.",
+ "Help people in spaces to find and join private rooms": "Hilf Personen in Spaces, privaten Räumen beizutreten",
+ "Use Command + F to search timeline": "Nutze Command + F um den Verlauf zu durchsuchen"
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e3b1978bee..90c02aa1b3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -52,12 +52,12 @@
"A microphone and webcam are plugged in and set up correctly": "A microphone and webcam are plugged in and set up correctly",
"Permission is granted to use the webcam": "Permission is granted to use the webcam",
"No other application is using the webcam": "No other application is using the webcam",
+ "Already in call": "Already in call",
+ "You're already in a call with this person.": "You're already in a call with this person.",
"VoIP is unsupported": "VoIP is unsupported",
"You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
"Too Many Calls": "Too Many Calls",
"You've reached the maximum number of simultaneous calls.": "You've reached the maximum number of simultaneous calls.",
- "Already in call": "Already in call",
- "You're already in a call with this person.": "You're already in a call with this person.",
"You cannot place a call with yourself.": "You cannot place a call with yourself.",
"Unable to look up phone number": "Unable to look up phone number",
"There was an error looking up the phone number": "There was an error looking up the phone number",
@@ -426,9 +426,6 @@
"Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message",
"Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
"Sends a message as html, without interpreting it as markdown": "Sends a message as html, without interpreting it as markdown",
- "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
- "/ddg is not a command": "/ddg is not a command",
- "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
"Upgrades a room to a new version": "Upgrades a room to a new version",
"You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
"Changes your display nickname": "Changes your display nickname",
@@ -547,6 +544,10 @@
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s pinned a message to this room. See all pinned messages.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s unpinned a message from this room. See all pinned messages.",
"%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s changed the <a>pinned messages</a> for the room.",
"%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
"%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
@@ -604,6 +605,8 @@
"See when anyone posts a sticker to your active room": "See when anyone posts a sticker to your active room",
"with an empty state key": "with an empty state key",
"with state key %(stateKey)s": "with state key %(stateKey)s",
+ "The above, but in any room you are joined or invited to as well": "The above, but in any room you are joined or invited to as well",
+ "The above, but in <Room /> as well": "The above, but in <Room /> as well",
"Send <b>%(eventType)s</b> events as you in this room": "Send <b>%(eventType)s</b> events as you in this room",
"See <b>%(eventType)s</b> events posted to this room": "See <b>%(eventType)s</b> events posted to this room",
"Send <b>%(eventType)s</b> events as you in your active room": "Send <b>%(eventType)s</b> events as you in your active room",
@@ -809,17 +812,17 @@
"Render LaTeX maths in messages": "Render LaTeX maths in messages",
"Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
"Message Pinning": "Message Pinning",
+ "Threaded messaging": "Threaded messaging",
"Custom user status messages": "Custom user status messages",
"Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
"Render simple counters in room header": "Render simple counters in room header",
- "Multiple integration managers": "Multiple integration managers",
+ "Multiple integration managers (requires manual setup)": "Multiple integration managers (requires manual setup)",
"Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
"Support adding custom themes": "Support adding custom themes",
"Show message previews for reactions in DMs": "Show message previews for reactions in DMs",
"Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
"Offline encrypted messaging using dehydrated devices": "Offline encrypted messaging using dehydrated devices",
"Send pseudonymous analytics data": "Send pseudonymous analytics data",
- "Enable advanced debugging for the room list": "Enable advanced debugging for the room list",
"Show info about bridges in room settings": "Show info about bridges in room settings",
"New layout switcher (with message bubbles)": "New layout switcher (with message bubbles)",
"Don't send read receipts": "Don't send read receipts",
@@ -835,7 +838,8 @@
"Show read receipts sent by other users": "Show read receipts sent by other users",
"Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
"Always show message timestamps": "Always show message timestamps",
- "Autoplay GIFs and videos": "Autoplay GIFs and videos",
+ "Autoplay GIFs": "Autoplay GIFs",
+ "Autoplay videos": "Autoplay videos",
"Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
"Expand code blocks by default": "Expand code blocks by default",
"Show line numbers in code blocks": "Show line numbers in code blocks",
@@ -869,7 +873,7 @@
"Show rooms with unread notifications first": "Show rooms with unread notifications first",
"Show shortcuts to recently viewed rooms above the room list": "Show shortcuts to recently viewed rooms above the room list",
"Show hidden events in timeline": "Show hidden events in timeline",
- "Low bandwidth mode": "Low bandwidth mode",
+ "Low bandwidth mode (requires compatible homeserver)": "Low bandwidth mode (requires compatible homeserver)",
"Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
"Show previews/thumbnails for images": "Show previews/thumbnails for images",
"Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
@@ -1061,7 +1065,6 @@
"Saving...": "Saving...",
"Save Changes": "Save Changes",
"Leave Space": "Leave Space",
- "Failed to update the visibility of this space": "Failed to update the visibility of this space",
"Failed to update the guest access of this space": "Failed to update the guest access of this space",
"Failed to update the history visibility of this space": "Failed to update the history visibility of this space",
"Hide advanced": "Hide advanced",
@@ -1071,9 +1074,7 @@
"Show advanced": "Show advanced",
"Visibility": "Visibility",
"Decide who can view and join %(spaceName)s.": "Decide who can view and join %(spaceName)s.",
- "anyone with the link can view and join": "anyone with the link can view and join",
- "Invite only": "Invite only",
- "only invited people can view and join": "only invited people can view and join",
+ "Failed to update the visibility of this space": "Failed to update the visibility of this space",
"Preview Space": "Preview Space",
"Allow people to preview your space before they join.": "Allow people to preview your space before they join.",
"Recommended for public spaces.": "Recommended for public spaces.",
@@ -1102,9 +1103,9 @@
"Change Password": "Change Password",
"Your homeserver does not support cross-signing.": "Your homeserver does not support cross-signing.",
"Cross-signing is ready for use.": "Cross-signing is ready for use.",
+ "Cross-signing is ready but keys are not backed up.": "Cross-signing is ready but keys are not backed up.",
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
"Cross-signing is not set up.": "Cross-signing is not set up.",
- "Set up": "Set up",
"Reset": "Reset",
"Cross-signing public keys:": "Cross-signing public keys:",
"in memory": "in memory",
@@ -1147,6 +1148,20 @@
"Connecting to integration manager...": "Connecting to integration manager...",
"Cannot connect to integration manager": "Cannot connect to integration manager",
"The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
+ "Private (invite only)": "Private (invite only)",
+ "Only invited people can join.": "Only invited people can join.",
+ "Anyone can find and join.": "Anyone can find and join.",
+ "Upgrade required": "Upgrade required",
+ "& %(count)s more|other": "& %(count)s more",
+ "& %(count)s more|one": "& %(count)s more",
+ "Currently, %(count)s spaces have access|other": "Currently, %(count)s spaces have access",
+ "Currently, %(count)s spaces have access|one": "Currently, a space has access",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>",
+ "Spaces with access": "Spaces with access",
+ "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Anyone in <spaceName/> can find and join. You can select other spaces too.",
+ "Anyone in a space can find and join. You can select multiple spaces.": "Anyone in a space can find and join. You can select multiple spaces.",
+ "Space members": "Space members",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "This upgrade will allow members of selected spaces access to this room without an invite.",
"Message layout": "Message layout",
"IRC": "IRC",
"Modern": "Modern",
@@ -1202,6 +1217,7 @@
"Algorithm:": "Algorithm:",
"Your keys are <b>not being backed up from this session</b>.": "Your keys are <b>not being backed up from this session</b>.",
"Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
+ "Set up": "Set up",
"well formed": "well formed",
"unexpected type": "unexpected type",
"Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.",
@@ -1416,16 +1432,6 @@
"Notification sound": "Notification sound",
"Set a new custom sound": "Set a new custom sound",
"Browse": "Browse",
- "Change room avatar": "Change room avatar",
- "Change room name": "Change room name",
- "Change main address for the room": "Change main address for the room",
- "Change history visibility": "Change history visibility",
- "Change permissions": "Change permissions",
- "Change topic": "Change topic",
- "Upgrade the room": "Upgrade the room",
- "Enable room encryption": "Enable room encryption",
- "Change server ACLs": "Change server ACLs",
- "Modify widgets": "Modify widgets",
"Failed to unban": "Failed to unban",
"Unban": "Unban",
"Banned by %(displayName)s": "Banned by %(displayName)s",
@@ -1434,6 +1440,20 @@
"An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.",
"Error changing power level": "Error changing power level",
"An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.",
+ "Change space avatar": "Change space avatar",
+ "Change room avatar": "Change room avatar",
+ "Change space name": "Change space name",
+ "Change room name": "Change room name",
+ "Change main address for the space": "Change main address for the space",
+ "Change main address for the room": "Change main address for the room",
+ "Change history visibility": "Change history visibility",
+ "Change permissions": "Change permissions",
+ "Change description": "Change description",
+ "Change topic": "Change topic",
+ "Upgrade the room": "Upgrade the room",
+ "Enable room encryption": "Enable room encryption",
+ "Change server ACLs": "Change server ACLs",
+ "Modify widgets": "Modify widgets",
"Default role": "Default role",
"Send messages": "Send messages",
"Invite users": "Invite users",
@@ -1448,23 +1468,20 @@
"Banned users": "Banned users",
"Send %(eventType)s events": "Send %(eventType)s events",
"Permissions": "Permissions",
+ "Select the roles required to change various parts of the space": "Select the roles required to change various parts of the space",
"Select the roles required to change various parts of the room": "Select the roles required to change various parts of the room",
+ "Are you sure you want to add encryption to this public room?": "Are you sure you want to add encryption to this public room?",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.",
"Enable encryption?": "Enable encryption?",
"Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
- "This upgrade will allow members of selected spaces access to this room without an invite.": "This upgrade will allow members of selected spaces access to this room without an invite.",
"To link to this room, please add an address.": "To link to this room, please add an address.",
- "Private (invite only)": "Private (invite only)",
- "Only invited people can join.": "Only invited people can join.",
- "Anyone can find and join.": "Anyone can find and join.",
- "Upgrade required": "Upgrade required",
- "& %(count)s more|other": "& %(count)s more",
- "Currently, %(count)s spaces have access|other": "Currently, %(count)s spaces have access",
- "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>",
- "Spaces with access": "Spaces with access",
- "Anyone in %(spaceName)s can find and join. You can select other spaces too.": "Anyone in %(spaceName)s can find and join. You can select other spaces too.",
- "Anyone in a space can find and join. You can select multiple spaces.": "Anyone in a space can find and join. You can select multiple spaces.",
- "Space members": "Space members",
"Decide who can join %(roomName)s.": "Decide who can join %(roomName)s.",
+ "Failed to update the join rules": "Failed to update the join rules",
+ "Unknown failure": "Unknown failure",
+ "Are you sure you want to make this encrypted room public?": "Are you sure you want to make this encrypted room public?",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.",
"Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
"Members only (since they were invited)": "Members only (since they were invited)",
"Members only (since they joined)": "Members only (since they joined)",
@@ -1546,12 +1563,19 @@
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
"Send message": "Send message",
"Emoji picker": "Emoji picker",
+ "Add emoji": "Add emoji",
"Upload file": "Upload file",
+ "Reply to encrypted thread…": "Reply to encrypted thread…",
+ "Reply to thread…": "Reply to thread…",
"Send an encrypted reply…": "Send an encrypted reply…",
"Send a reply…": "Send a reply…",
"Send an encrypted message…": "Send an encrypted message…",
"Send a message…": "Send a message…",
+ "Hide Stickers": "Hide Stickers",
+ "Show Stickers": "Show Stickers",
+ "Send a sticker": "Send a sticker",
"Send voice message": "Send voice message",
+ "More options": "More options",
"The conversation continues here.": "The conversation continues here.",
"This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
"You do not have permission to post to this room": "You do not have permission to post to this room",
@@ -1571,8 +1595,10 @@
"Invite to just this room": "Invite to just this room",
"Add a photo, so people can easily spot your room.": "Add a photo, so people can easily spot your room.",
"This is the start of <roomName/>.": "This is the start of <roomName/>.",
- "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites. <a>Enable encryption in settings.</a>": "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites. <a>Enable encryption in settings.</a>",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.",
+ "Enable encryption in settings.": "Enable encryption in settings.",
"End-to-end encryption isn't enabled": "End-to-end encryption isn't enabled",
+ "Message didn't send. Click for info.": "Message didn't send. Click for info.",
"Unpin": "Unpin",
"View message": "View message",
"%(duration)ss": "%(duration)ss",
@@ -1629,6 +1655,7 @@
"Start a new chat": "Start a new chat",
"Explore all public rooms": "Explore all public rooms",
"Quick actions": "Quick actions",
+ "Explore %(spaceName)s": "Explore %(spaceName)s",
"Use the + to make a new room or explore existing ones below": "Use the + to make a new room or explore existing ones below",
"%(count)s results in all spaces|other": "%(count)s results in all spaces",
"%(count)s results in all spaces|one": "%(count)s result in all spaces",
@@ -1711,8 +1738,6 @@
"You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
"Add some now": "Add some now",
"Stickerpack": "Stickerpack",
- "Hide Stickers": "Hide Stickers",
- "Show Stickers": "Show Stickers",
"Failed to revoke invite": "Failed to revoke invite",
"Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.",
"Admin Tools": "Admin Tools",
@@ -1799,6 +1824,7 @@
"%(count)s people|other": "%(count)s people",
"%(count)s people|one": "%(count)s person",
"Show files": "Show files",
+ "Show threads": "Show threads",
"Share room": "Share room",
"Room settings": "Room settings",
"Trusted": "Trusted",
@@ -1851,7 +1877,7 @@
"Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?",
"Deactivate user": "Deactivate user",
"Failed to deactivate user": "Failed to deactivate user",
- "Role": "Role",
+ "Role in <RoomName/>": "Role in <RoomName/>",
"This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
"Edit devices": "Edit devices",
"Security": "Security",
@@ -1884,7 +1910,6 @@
"You cancelled verification.": "You cancelled verification.",
"Verification cancelled": "Verification cancelled",
"Compare emoji": "Compare emoji",
- "Connected": "Connected",
"Call declined": "Call declined",
"Call back": "Call back",
"No answer": "No answer",
@@ -1908,6 +1933,7 @@
"Decrypting": "Decrypting",
"Download": "Download",
"View Source": "View Source",
+ "Some encryption parameters have been changed.": "Some encryption parameters have been changed.",
"Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.",
"Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.",
"Encryption enabled": "Encryption enabled",
@@ -1918,6 +1944,7 @@
"React": "React",
"Edit": "Edit",
"Reply": "Reply",
+ "Thread": "Thread",
"Message Actions": "Message Actions",
"Download %(text)s": "Download %(text)s",
"Error decrypting attachment": "Error decrypting attachment",
@@ -2404,8 +2431,8 @@
"Clear cache and resync": "Clear cache and resync",
"%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
"Updating %(brand)s": "Updating %(brand)s",
- "Leave all rooms and spaces": "Leave all rooms and spaces",
"Don't leave any": "Don't leave any",
+ "Leave all rooms and spaces": "Leave all rooms and spaces",
"Leave specific rooms and spaces": "Leave specific rooms and spaces",
"Search %(spaceName)s": "Search %(spaceName)s",
"You won't be able to rejoin unless you are re-invited.": "You won't be able to rejoin unless you are re-invited.",
@@ -2844,22 +2871,18 @@
"You don't have permission": "You don't have permission",
"This room is suggested as a good one to join": "This room is suggested as a good one to join",
"Suggested": "Suggested",
- "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
- "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s rooms and %(numSpaces)s spaces",
- "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s room and %(numSpaces)s spaces",
- "%(count)s rooms and 1 space|other": "%(count)s rooms and 1 space",
- "%(count)s rooms and 1 space|one": "%(count)s room and 1 space",
"Select a room below first": "Select a room below first",
"Failed to remove some rooms. Try again later": "Failed to remove some rooms. Try again later",
"Removing...": "Removing...",
"Mark as not suggested": "Mark as not suggested",
"Mark as suggested": "Mark as suggested",
+ "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
"No results found": "No results found",
"You may want to try a different search or check for typos.": "You may want to try a different search or check for typos.",
+ "Results": "Results",
+ "Rooms and spaces": "Rooms and spaces",
"Space": "Space",
"Search names and descriptions": "Search names and descriptions",
- "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.",
- "Create room": "Create room",
"Private space": "Private space",
"<inviter/> invites you": "<inviter/> invites you",
"To view %(spaceName)s, turn on the <a>Spaces beta</a>": "To view %(spaceName)s, turn on the <a>Spaces beta</a>",
@@ -2999,8 +3022,6 @@
"Commands": "Commands",
"Command Autocomplete": "Command Autocomplete",
"Community Autocomplete": "Community Autocomplete",
- "Results from DuckDuckGo": "Results from DuckDuckGo",
- "DuckDuckGo Results": "DuckDuckGo Results",
"Emoji": "Emoji",
"Emoji Autocomplete": "Emoji Autocomplete",
"Notify the whole room": "Notify the whole room",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index d70b933e31..823384e306 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2011,7 +2011,7 @@
"cached locally": "kaŝmemorita loke",
"not found locally": "ne trovita loke",
"User signing private key:": "Uzantosubskriba privata ŝlosilo:",
- "Keyboard Shortcuts": "Klavkombinoj",
+ "Keyboard Shortcuts": "Ŝparklavoj",
"Start a conversation with someone using their name, username (like <userId/>) or email address.": "Komencu interparolon kun iu per ĝia nomo, uzantonomo (kiel <userId/>), aŭ retpoŝtadreso.",
"a new master key signature": "nova ĉefŝlosila subskribo",
"a new cross-signing key signature": "nova subskribo de delega ŝlosilo",
@@ -3329,7 +3329,7 @@
"User Busy": "Uzanto estas okupata",
"Integration manager": "Kunigilo",
"Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Via %(brand)so ne permesas al vi uzi kunigilon por tio. Bonvolu kontakti administranton.",
- "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s kaj via kunigilo.",
+ "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> al %(widgetDomain)s kaj via kunigilo.",
"Identity server is": "Identiga servilo estas",
"Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi povnivelojn.",
"Use an integration manager to manage bots, widgets, and sticker packs.": "Uzu kunigilon por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
@@ -3337,5 +3337,272 @@
"Identity server": "Identiga servilo",
"Identity server (%(server)s)": "Identiga servilo (%(server)s)",
"Could not connect to identity server": "Ne povis konektiĝi al identiga servilo",
- "Not a valid identity server (status code %(code)s)": "Nevalida identiga servilo (statkodo %(code)s)"
+ "Not a valid identity server (status code %(code)s)": "Nevalida identiga servilo (statkodo %(code)s)",
+ "Silence call": "Silenta voko",
+ "Sound on": "Kun sono",
+ "User %(userId)s is already invited to the room": "Uzanto %(userId)s jam invitiĝis al la ĉambro",
+ "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s ŝanĝis la <a>fiksitajn mesaĝojn</a> de la ĉambro.",
+ "%(senderName)s kicked %(targetName)s": "%(senderName)s forpelis uzanton %(targetName)s",
+ "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s forpelis uzanton %(targetName)s: %(reason)s",
+ "%(senderName)s unbanned %(targetName)s": "%(senderName)s malforbaris uzanton %(targetName)s",
+ "%(targetName)s left the room": "%(targetName)s foriris de la ĉambro",
+ "%(targetName)s left the room: %(reason)s": "%(targetName)s foriris de la ĉambro: %(reason)s",
+ "%(targetName)s rejected the invitation": "%(targetName)s rifuzis la inviton",
+ "%(targetName)s joined the room": "%(targetName)s aliĝis al la ĉambro",
+ "%(senderName)s made no change": "%(senderName)s faris nenian ŝanĝon",
+ "%(senderName)s set a profile picture": "%(senderName)s agordis profilbildon",
+ "%(senderName)s changed their profile picture": "%(senderName)s ŝanĝis sian profilbildon",
+ "%(senderName)s removed their profile picture": "%(senderName)s forigis sian profilbildon",
+ "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s forigis sian prezentan nomon (%(oldDisplayName)s)",
+ "%(senderName)s set their display name to %(displayName)s": "%(senderName)s ŝanĝis sian prezentan nomon al %(displayName)s",
+ "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s ŝanĝis sian prezentan nomon al %(displayName)s",
+ "%(senderName)s banned %(targetName)s": "%(senderName)s forbaris uzanton %(targetName)s",
+ "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s forbaris uzanton %(targetName)s: %(reason)s",
+ "%(targetName)s accepted an invitation": "%(targetName)s akceptis inviton",
+ "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s akceptis la inviton por %(displayName)s",
+ "Some invites couldn't be sent": "Ne povis sendi iujn invitojn",
+ "We sent the others, but the below people couldn't be invited to <RoomName/>": "Ni sendis la aliajn, sed la ĉi-subaj personoj ne povis ricevi inviton al <RoomName/>",
+ "Transfer Failed": "Malsukcesis transdono",
+ "Unable to transfer call": "Ne povas transdoni vokon",
+ "Preview Space": "Antaŭrigardi aron",
+ "only invited people can view and join": "nur invititoj povas rigardi kaj aliĝi",
+ "anyone with the link can view and join": "ĉiu kun ligilo povas rigardi kaj aliĝi",
+ "Decide who can view and join %(spaceName)s.": "Decidu, kiu povas rigardi kaj aliĝi aron %(spaceName)s.",
+ "Visibility": "Videbleco",
+ "This may be useful for public spaces.": "Tio povas esti utila por publikaj aroj.",
+ "Guests can join a space without having an account.": "Gastoj povas aliĝi al aro sen konto.",
+ "Enable guest access": "Ŝalti aliron de gastoj",
+ "Failed to update the history visibility of this space": "Malsukcesis ĝisdatigi videblecon de historio de ĉi tiu aro",
+ "Failed to update the guest access of this space": "Malsukcesis ĝisdatigi aliron de gastoj al ĉi tiu aro",
+ "Failed to update the visibility of this space": "Malsukcesis ĝisdatigi la videblecon de ĉi tiu aro",
+ "Show all rooms": "Montri ĉiujn ĉambrojn",
+ "Address": "Adreso",
+ "e.g. my-space": "ekz. mia-aro",
+ "Give feedback.": "Prikomentu.",
+ "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Dankon ĉar vi provas arojn. Viaj prikomentoj helpos al ni evoluigi la venontajn versiojn.",
+ "Spaces feedback": "Prikomentoj pri aroj",
+ "Spaces are a new feature.": "Aroj estas nova funkcio.",
+ "Delete avatar": "Forigi profilbildon",
+ "Mute the microphone": "Silentigi la mikrofonon",
+ "Unmute the microphone": "Malsilentigi la mikrofonon",
+ "Dialpad": "Ciferplato",
+ "More": "Pli",
+ "Show sidebar": "Montri flankan breton",
+ "Hide sidebar": "Kaŝi flankan breton",
+ "Start sharing your screen": "Ŝalti ekranvidadon",
+ "Stop sharing your screen": "Malŝalti ekranvidadon",
+ "Stop the camera": "Malŝalti la filmilon",
+ "Start the camera": "Ŝalti la filmilon",
+ "Your camera is still enabled": "Via filmilo ankoraŭ estas ŝaltita",
+ "Your camera is turned off": "Via filmilo estas malŝaltita",
+ "%(sharerName)s is presenting": "%(sharerName)s prezentas",
+ "You are presenting": "Vi prezentas",
+ "Surround selected text when typing special characters": "Ĉirkaŭi elektitan tekston dum tajpado de specialaj signoj",
+ "Don't send read receipts": "Ne sendi legokonfirmojn",
+ "New layout switcher (with message bubbles)": "Nova baskulo de aranĝo (kun mesaĝaj vezikoj)",
+ "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Pratipo de raportado al reguligistoj. En ĉambroj, kiuj subtenas reguligadon, la butono «raporti» povigos vin raporti misuzon al reguligistoj de ĉambro",
+ "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Tio faciligas, ke ĉambroj restu privataj por aro, sed ebligas serĉadon kaj aliĝadon al personoj en tiu sama aro. Ĉiuj novaj ĉambroj en aro havos tiun ĉi elekteblon.",
+ "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Por helpi al aranoj trovi kaj aliĝi privatan ĉambron, iru al la agordoj de Sekureco kaj Privateco de tiu ĉambro.",
+ "Help space members find private rooms": "Helpu aranojn trovi privatajn ĉambrojn",
+ "Help people in spaces to find and join private rooms": "Helpu al personoj en aroj trovi kaj aliĝi privatajn ĉambrojn",
+ "New in the Spaces beta": "Nove en beta-versio de aroj",
+ "This space has no local addresses": "Ĉi tiu aro ne havas lokajn adresojn",
+ "Stop recording": "Malŝalti registradon",
+ "Copy Room Link": "Kopii ligilon al ĉambro",
+ "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Nun vi povas vidigi vian ekranon per la butono «ekranvidado» dum voko. Vi eĉ povas fari tion dum voĉvokoj, se ambaŭ flankoj tion subtenas!",
+ "Screen sharing is here!": "Ekranvidado venis!",
+ "End-to-end encryption isn't enabled": "Tutvoja ĉifrado ne estas ŝaltita",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites. <a>Enable encryption in settings.</a>": "Viaj privataj mesaĝoj estas ordinare ĉifrataj, sed ĉi tiu ĉambro ne estas ĉifrata. Plej ofte tio okazas pro uzo de nesubtenataj aparato aŭ metodo, kiel ekzemple retpoŝtaj invitoj. <a>Ŝaltu ĉifradon per agordoj.</a>",
+ "Send voice message": "Sendi voĉmesaĝon",
+ "Show %(count)s other previews|one": "Montri %(count)s alian antaŭrigardon",
+ "Show %(count)s other previews|other": "Montri %(count)s aliajn antaŭrigardojn",
+ "Access": "Aliro",
+ "People with supported clients will be able to join the room without having a registered account.": "Personoj kun subtenataj klientoj povos aliĝi al la ĉambro sen registrita konto.",
+ "Decide who can join %(roomName)s.": "Decidu, kiu povas aliĝi al %(roomName)s.",
+ "Space members": "Aranoj",
+ "Anyone in a space can find and join. You can select multiple spaces.": "Ĉiu en aro povas trovi kaj aliĝi. Vi povas elekti plurajn arojn.",
+ "Anyone in %(spaceName)s can find and join. You can select other spaces too.": "Ĉiu en %(spaceName)s povas trovi kaj aliĝi. Vi povas elekti ankaŭ aliajn arojn.",
+ "Spaces with access": "Aroj kun aliro",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Ĉiu en aro povas trovi kaj aliĝi. <a>Redaktu, kiuj aroj povas aliri, tie ĉi.</a>",
+ "Currently, %(count)s spaces have access|other": "Nun, %(count)s aroj rajtas aliri",
+ "& %(count)s more|other": "kaj %(count)s pli",
+ "Upgrade required": "Necesas gradaltigo",
+ "Anyone can find and join.": "Ĉiu povas trovi kaj aliĝi.",
+ "Only invited people can join.": "Nur invititoj povas aliĝi.",
+ "Private (invite only)": "Privata (nur invititoj)",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "Ĉi tiu gradaltigo povigos anojn de la elektitaj aroj aliri ĉi tiun ĉambron sen invito.",
+ "Space information": "Informoj pri aro",
+ "Images, GIFs and videos": "Bildoj, GIF-bildoj kaj filmoj",
+ "Code blocks": "Kodujoj",
+ "To view all keyboard shortcuts, click here.": "Por vidi ĉiujn ŝparklavojn, klaku ĉi tie.",
+ "Keyboard shortcuts": "Ŝparklavoj",
+ "Olm version:": "Versio de Olm:",
+ "Identity server URL must be HTTPS": "URL de identiga servilo devas esti je HTTPS",
+ "There was an error loading your notification settings.": "Eraris enlegado de viaj agordoj pri sciigoj.",
+ "Mentions & keywords": "Mencioj kaj ĉefvortoj",
+ "Global": "Ĉie",
+ "New keyword": "Nova ĉefvorto",
+ "Keyword": "Ĉefvorto",
+ "Enable email notifications for %(email)s": "Ŝalti retpoŝtajn sciigojn por %(email)s",
+ "Enable for this account": "Ŝalti por ĉi tiu konto",
+ "An error occurred whilst saving your notification preferences.": "Eraris konservado de viaj preferoj pri sciigoj.",
+ "Error saving notification preferences": "Eraris konservado de preferoj pri sciigoj",
+ "Messages containing keywords": "Mesaĝoj enhavantaj ĉefvortojn",
+ "Message bubbles": "Mesaĝaj vezikoj",
+ "IRC": "IRC",
+ "Collapse": "Maletendi",
+ "Expand": "Etendi",
+ "Recommended for public spaces.": "Rekomendita por publikaj aroj.",
+ "Allow people to preview your space before they join.": "Povigi personojn antaŭrigardi vian aron antaŭ aliĝo.",
+ "To publish an address, it needs to be set as a local address first.": "Por ke adreso publikiĝu, ĝi unue devas esti loka adreso.",
+ "Published addresses can be used by anyone on any server to join your room.": "Publikigitajn adresojn povas uzi ajna persono sur ajna servilo por aliĝi al via ĉambro.",
+ "Published addresses can be used by anyone on any server to join your space.": "Publikigitajn adresojn povas uzi ajna persono sur ajna servilo por aliĝi al via aro.",
+ "We're working on this, but just want to let you know.": "Ni prilaboras ĉi tion, sed volas simple informi vin.",
+ "Search for rooms or spaces": "Serĉi ĉambrojn aŭ arojn",
+ "Created from <Community />": "Kreita el <Community />",
+ "To view %(spaceName)s, you need an invite": "Por vidi aron %(spaceName)s, vi bezonas inviton",
+ "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Vi ĉiam povas klaki profilbildon en la filtra breto, por vidi nur la ĉambrojn kaj homojn ligitajn al tiu komunumo.",
+ "Unable to copy a link to the room to the clipboard.": "Ne povas kopii ligilon al ĉambro al tondujo.",
+ "Unable to copy room link": "Ne povas kopii ligilon al ĉambro",
+ "Communities won't receive further updates.": "Komunumoj ne ĝisdatiĝos plu.",
+ "Spaces are a new way to make a community, with new features coming.": "Aroj estas nova maniero fari komunumon, kun novaj funkcioj.",
+ "Communities can now be made into Spaces": "Komunumoj nun povas iĝi aroj",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Petu, ke <a>administrantoj</a> de ĉi tiu komunumo igu ĝin aro, kaj atentu la inviton.",
+ "You can create a Space from this community <a>here</a>.": "Vi povas krei aron el ĉi tiu komunumo <a>tie ĉi</a>.",
+ "Error downloading audio": "Eraris elŝuto de sondosiero",
+ "Unnamed audio": "Sennoma sondosiero",
+ "Move down": "Subenigi",
+ "Move up": "Suprenigi",
+ "Add space": "Aldoni aron",
+ "Report": "Raporti",
+ "Collapse reply thread": "Maletendi respondan fadenon",
+ "Show preview": "Antaŭrigardi",
+ "View source": "Montri fonton",
+ "Settings - %(spaceName)s": "Agordoj – %(spaceName)s",
+ "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Sciu, ke gradaltigo kreos novan version de la ĉambro</b>. Ĉiuj nunaj mesaĝoj restos en ĉi tiu arĥivita ĉambro.",
+ "Automatically invite members from this room to the new one": "Memage inviti anojn de ĉi tiu ĉambro al la nova",
+ "Report the entire room": "Raporti la tutan ĉambron",
+ "Spam or propaganda": "Rubmesaĝo aŭ propagando",
+ "Illegal Content": "Kontraŭleĝa enhavo",
+ "Toxic Behaviour": "Vunda konduto",
+ "Disagree": "Malkonsento",
+ "Please pick a nature and describe what makes this message abusive.": "Bonvolu elekti karakteron kaj priskribi, kial la mesaĝo estas mistrakta.",
+ "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Alia kialo. Bonvolu priskribi la problemon.\nĈi tio raportiĝos al reguligistoj de la ĉambro.",
+ "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Ĉi tiu ĉambro estas dediĉita al kontraŭleĝa aŭ vunda enhavo, aŭ la reguligistoj malsukcesas tian enhavon reguligi.\nĈi tio raportiĝos al administrantoj de %(homeserver)s.",
+ "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Ĉi tiu ĉambro estas destinita al kontraŭleĝa al vunda enhavo, aŭ la reguligistoj ne sukcesas tian enhavon reguligi.\nĈi tio raportiĝos al administrantoj de %(homeserver)s. La administrantoj NE povos legi ĉifritan historion de ĉi tiu ĉambro.",
+ "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Ĉi tiu uzanto sendas rubmesaĝojn kun reklamoj, ligiloj al reklamoj, aŭ al propagando.\nĈi tio raportiĝos al reguligistoj de la ĉambro.",
+ "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Ĉi tiu uzanto kondutas kontraŭleĝe, ekzemple malkaŝante personajn informojn pri aliuloj, aŭ minacante per agreso.\nĈi tio raportiĝos al reguligistoj de la ĉambro, kiuj povos ĝin plusendi al leĝa aŭtoritato.",
+ "This user is displaying toxic behaviour, for instance by insulting other users or sharing adult-only content in a family-friendly room or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Ĉi tiu uzanto kondutas vunde, ekzemple insultante aliajn uzantojn aŭ havigante konsternan enhavon en infantaŭga ĉambro, aŭ alimaniere malobeante regulojn de la ĉambro.\nTio ĉi raportiĝos al reguligistoj de la ĉambro.",
+ "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Tio, kion skribas ĉi tiu uzanto, maltaŭgas.\nTio ĉi raportiĝos al reguligistoj de la ĉambro.",
+ "Other spaces or rooms you might not know": "Aliaj aroj aŭ ĉambroj, kiujn vi eble ne konas",
+ "Spaces you know that contain this room": "Konataj aroj, kiuj enhavas ĉi tiun ĉambron",
+ "Search spaces": "Serĉi arojn",
+ "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decidu, kiuj aroj rajtos aliri ĉi tiun ĉambron. Se aro estas elektita, ĝiaj anoj povas trovi kaj aliĝi al <RoomName/>.",
+ "Select spaces": "Elekti arojn",
+ "You're removing all spaces. Access will default to invite only": "Vi forigas ĉiujn arojn. Implicite povos aliri nur invititoj",
+ "Are you sure you want to leave <spaceName/>?": "Ĉu vi certas, ke vi volas foriri de <spaceName/>?",
+ "Leave %(spaceName)s": "Foriri de %(spaceName)s",
+ "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Vi estas la sola administranto de iuj ĉambroj aŭ aroj, de kie vi volas foriri. Se vi faros tion, neniu povos ilin plu administri.",
+ "You're the only admin of this space. Leaving it will mean no one has control over it.": "Vi estas la sola administranto de ĉi tiu aro. Se vi foriros, neniu povos ĝin administri.",
+ "You won't be able to rejoin unless you are re-invited.": "Vi ne povos ree aliĝi, krom se oni ree invitos vin.",
+ "Search %(spaceName)s": "Serĉi je %(spaceName)s",
+ "Leave specific rooms and spaces": "Foriri de iuj ĉambroj kaj aroj",
+ "Don't leave any": "Foriri de neniu",
+ "Leave all rooms and spaces": "Foriri de ĉiuj ĉambroj kaj aroj",
+ "User Directory": "Katologo de uzantoj",
+ "Or send invite link": "Aŭ sendu invitan ligilon",
+ "If you can't see who you’re looking for, send them your invite link below.": "Se vi ne trovis tiun, kiun vi serĉis, sendu al ĝi inviton per la ĉi-suba ligilo.",
+ "Some suggestions may be hidden for privacy.": "Iuj proponoj povas esti kaŝitaj pro privateco.",
+ "Search for rooms or people": "Serĉi ĉambrojn aŭ personojn",
+ "Forward message": "Plusendi mesaĝon",
+ "Open link": "Malfermi ligilon",
+ "Sent": "Sendite",
+ "You don't have permission to do this": "Vi ne rajtas fari tion",
+ "Want to add an existing space instead?": "Ĉu vi volas aldoni jaman aron anstataŭe?",
+ "Add a space to a space you manage.": "Aldoni aron al administrata aro.",
+ "Only people invited will be able to find and join this space.": "Nur invititoj povos trovi kaj aliĝi ĉi tiun aron.",
+ "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Ĉiu povos trovi kaj aliĝi ĉi tiun aron, ne nur anoj de <SpaceName/>.",
+ "Anyone in <SpaceName/> will be able to find and join.": "Ĉiu en <SpaceName/> povos ĝin trovi kaj aliĝi.",
+ "Private space (invite only)": "Privata aro (nur por invititoj)",
+ "Space visibility": "Videbleco de aro",
+ "This description will be shown to people when they view your space": "Ĉi tiu priskribo montriĝos al homoj, kiam ili rigardos vian aron",
+ "Flair won't be available in Spaces for the foreseeable future.": "Insigno ne estos baldaŭ disponebla en aroj.",
+ "All rooms will be added and all community members will be invited.": "Ĉiuj ĉambroj aldoniĝos kaj ĉiuj komunumanoj invitiĝos.",
+ "A link to the Space will be put in your community description.": "Ligilo al la aro metiĝos en la priskribon de via komunumo.",
+ "Create Space from community": "Krei aron el komunumo",
+ "Failed to migrate community": "Malsukcesis migri komunumon",
+ "To create a Space from another community, just pick the community in Preferences.": "Por krei aron el alia komunumo, simple elektu la komunumon en Agordoj.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> kreiĝis, kaj ĉiu komunumano invitiĝis.",
+ "Space created": "Aro kreiĝis",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Por vidi arojn, kaŝu komunumojn en <a>Agordoj</a>",
+ "This community has been upgraded into a Space": "Ĉi tiu komunumo gradaltiĝis al aro",
+ "Visible to space members": "Videbla al aranoj",
+ "Public room": "Publika ĉambro",
+ "Private room (invite only)": "Privata ĉambro (nur por invititoj)",
+ "Room visibility": "Videbleco de ĉambro",
+ "Create a room": "Krei ĉambron",
+ "Only people invited will be able to find and join this room.": "Nur invititoj povos trovi kaj aliĝi ĉi tiun ĉambron.",
+ "Anyone will be able to find and join this room.": "Ĉiu povos trovi kaj aliĝi ĉi tiun ĉambron.",
+ "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Ĉiu povos trovi kaj aliĝi ĉi tiun ĉambron, ne nur anoj de <SpaceName/>.",
+ "You can change this at any time from room settings.": "Vi povas ŝanĝi ĉi tion iam ajn per agordoj de la ĉambro.",
+ "Everyone in <SpaceName/> will be able to find and join this room.": "Ĉiu en <SpaceName/> povos trovi kaj aliĝi ĉi tiun ĉambron.",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Erarserĉaj protokoloj enhavas datumojn pri uzado de la aplikaĵo, inkluzive vian uzantonomon, la identigilojn aŭ kromnomojn de vizititaj ĉambroj aŭ grupoj, fasadaj elementoj, kun kiuj vi freŝe interagis, kaj uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
+ "Adding spaces has moved.": "Aldonejo de aroj moviĝis.",
+ "Search for rooms": "Serĉi ĉambrojn",
+ "Search for spaces": "Serĉi arojn",
+ "Create a new space": "Krei novan aron",
+ "Want to add a new space instead?": "Ĉu vi volas aldoni novan aron anstataŭe?",
+ "Add existing space": "Aldoni jaman aron",
+ "Please provide an address": "Bonvolu doni adreson",
+ "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s ŝanĝis la <a>fiksitajn mesaĝojn</a> de la ĉambro %(count)s-foje.",
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s ŝanĝis la <a>fiksitajn mesaĝojn</a> de la ĉambro %(count)s-foje.",
+ "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s ŝanĝis la servilblokajn listojn",
+ "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s ŝanĝis la servilblokajn listojn %(count)s-foje",
+ "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ŝanĝis la servilblokajn listojn",
+ "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ŝanĝis la servilblokajn listojn %(count)s-foje",
+ "Share content": "Havigi enhavon",
+ "Application window": "Fenestro de aplikaĵo",
+ "Share entire screen": "Vidigi tutan ekranon",
+ "Message search initialisation failed, check <a>your settings</a> for more information": "Malsukcesis komencigo de serĉado de mesaĝoj, kontrolu <a>viajn agordojn</a> por pliaj informoj",
+ "Error - Mixed content": "Eraris – Miksita enhavo",
+ "Error loading Widget": "Eraris enlegado de fenestraĵo",
+ "Image": "Bildo",
+ "Sticker": "Glumarko",
+ "Error processing audio message": "Eraris traktado de sonmesaĝo",
+ "Decrypting": "Malĉifrante",
+ "The call is in an unknown state!": "La voko estas en nekonata stato!",
+ "Unknown failure: %(reason)s": "Malsukceso nekonata: %(reason)s",
+ "No answer": "Sen respondo",
+ "Enable encryption in settings.": "Ŝaltu ĉifradon per agordoj.",
+ "Send pseudonymous analytics data": "Sendi kromnomaj analizajn datumojn",
+ "Offline encrypted messaging using dehydrated devices": "Eksterreta ĉifrita komunikado per alsalutaĵoj",
+ "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s nuligis inviton por %(targetName)s",
+ "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s nuligis inviton por %(targetName)s: %(reason)s",
+ "An unknown error occurred": "Okazis nekonata eraro",
+ "Their device couldn't start the camera or microphone": "Ĝia aparato ne povis startigi la filmilon aŭ la mikrofonon",
+ "Connection failed": "Malsukcesis konekto",
+ "Could not connect media": "Ne povis konekti vidaŭdaĵon",
+ "Missed call": "Nerespondita voko",
+ "Call back": "Revoki",
+ "Call declined": "Voko rifuziĝis",
+ "Connected": "Konektite",
+ "Pinned messages": "Fiksitaj mesaĝoj",
+ "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Se vi havas la bezonajn permesojn, malfermu la menuon sur ajna mesaĝo, kaj klaku al <b>Fiksi</b> por meti ĝin ĉi tien.",
+ "Nothing pinned, yet": "Ankoraŭ nenio fiksita",
+ "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Agordu adresojn por ĉi tiu aro, por ke uzantoj trovu ĝin per via hejmservilo (%(localDomain)s)",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Viaj privataj mesaĝoj normale estas ĉifrataj, sed ĉi tiu ĉambro ne estas ĉifrata. Plej ofte tio okazas pro uzo de nesubtenata aparato aŭ metodo, ekzemple retpoŝtaj invitoj.",
+ "Displaying time": "Montrado de tempo",
+ "If a community isn't shown you may not have permission to convert it.": "Se komunumo ne montriĝas, eble vi ne rajtas fari aron el ĝi.",
+ "Show my Communities": "Montri miajn komunumojn",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Komunumoj arĥiviĝis pro aroj, sed ĉi-sube vi povas krei arojn el viaj komunumoj. Tiel vi certigos, ke viaj interparoloj havos la plej freŝajn funkciojn.",
+ "Create Space": "Krei aron",
+ "Open Space": "Malfermi aron",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se vi raportis eraron per GitHub, erarserĉaj protokoloj povas helpi nin trovi la problemon. Erarserĉaj protokoloj enhavas datumojn pri via uzado de aplikaĵo, inkluzive vian uzantonomon, identigilojn aŭ kromnomojn de ĉambroj aŭ grupoj, kiujn vi vizitis, freŝe uzitajn fasadajn elementojn, kaj la uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
+ "Cross-signing is ready but keys are not backed up.": "Delegaj subskriboj pretas, sed ŝlosiloj ne estas savkopiitaj.",
+ "To join an existing space you'll need an invite.": "Por aliĝi al jama aro, vi bezonos inviton.",
+ "You can also create a Space from a <a>community</a>.": "Vi ankaŭ povas krei novan aron el <a>komunumo</a>.",
+ "You can change this later.": "Vi povas ŝanĝi ĉi tion poste.",
+ "What kind of Space do you want to create?": "Kian aron volas vi krei?",
+ "All rooms you're in will appear in Home.": "Ĉiuj ĉambroj, kie vi estas, aperos en la ĉefpaĝo.",
+ "Show all rooms in Home": "Montri ĉiujn ĉambrojn en ĉefpaĝo"
}
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index f192fc9163..69110f4aea 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -18,7 +18,7 @@
"Are you sure?": "¿Estás seguro?",
"Are you sure you want to reject the invitation?": "¿Estás seguro que quieres rechazar la invitación?",
"Attachment": "Adjunto",
- "Autoplay GIFs and videos": "Reproducir automáticamente GIFs y videos",
+ "Autoplay GIFs and videos": "Reproducir automáticamente GIFs y vídeos",
"%(senderName)s banned %(targetName)s.": "%(senderName)s vetó a %(targetName)s.",
"Ban": "Vetar",
"Banned users": "Usuarios vetados",
@@ -360,7 +360,7 @@
"Your language of choice": "Idioma elegido",
"Your homeserver's URL": "La URL de tu servidor base",
"The information being sent to us to help make %(brand)s better includes:": "La información que se nos envía para ayudarnos a mejorar %(brand)s incluye:",
- "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de texto enriquecido del editor de texto enriquecido",
+ "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si estás o no usando el editor de texto enriquecido",
"Who would you like to add to this community?": "¿A quién te gustaría añadir a esta comunidad?",
"Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advertencia: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca la ID de la comunidad",
"Invite new community members": "Invita nuevos miembros a la comunidad",
@@ -527,7 +527,7 @@
"Stops ignoring a user, showing their messages going forward": "Deja de ignorar a un usuario, mostrando sus mensajes a partir de ahora",
"Unignored user": "Usuario no ignorado",
"You are no longer ignoring %(userId)s": "Ya no ignoras a %(userId)s",
- "Opens the Developer Tools dialog": "Abre el diálogo de Herramientas de Desarrollador",
+ "Opens the Developer Tools dialog": "Abre el diálogo de herramientas de desarrollo",
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambió su nombre público a %(displayName)s.",
"%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes anclados de la sala.",
"%(widgetName)s widget modified by %(senderName)s": "el widget %(widgetName)s fue modificado por %(senderName)s",
@@ -610,7 +610,7 @@
"When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cuando alguien incluye una URL en su mensaje, se mostrará una vista previa para ofrecer información sobre el enlace, que incluirá el título, descripción, y una imagen del sitio web.",
"Error decrypting audio": "Error al descifrar el sonido",
"Error decrypting image": "Error al descifrar imagen",
- "Error decrypting video": "Error al descifrar video",
+ "Error decrypting video": "Error al descifrar el vídeo",
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambió el avatar para %(roomName)s",
"%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eliminó el avatar de la sala.",
"%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s cambió el avatar de la sala a <img/>",
@@ -855,8 +855,8 @@
"Please contact your homeserver administrator.": "Por favor, contacta con la administración de tu servidor base.",
"This room has been replaced and is no longer active.": "Esta sala ha sido reemplazada y ya no está activa.",
"The conversation continues here.": "La conversación continúa aquí.",
- "This room is a continuation of another conversation.": "Esta sala es una continuación de otra conversación.",
- "Click here to see older messages.": "Haz clic aquí para ver mensajes más antiguos.",
+ "This room is a continuation of another conversation.": "Esta sala es una continuación de otra.",
+ "Click here to see older messages.": "Haz clic aquí para ver mensajes anteriores.",
"Failed to upgrade room": "No se pudo actualizar la sala",
"The room upgrade could not be completed": "La actualización de la sala no pudo ser completada",
"Upgrade this room to version %(version)s": "Actualiza esta sala a la versión %(version)s",
@@ -867,7 +867,7 @@
"%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s ahora utiliza de 3 a 5 veces menos memoria, porque solo carga información sobre otros usuarios cuando es necesario. Por favor, ¡aguarda mientras volvemos a sincronizar con el servidor!",
"Updating %(brand)s": "Actualizando %(brand)s",
"Room version:": "Versión de la sala:",
- "Developer options": "Opciones de desarrollador",
+ "Developer options": "Opciones de desarrollo",
"Room version": "Versión de la sala",
"Room information": "Información de la sala",
"Room Topic": "Asunto de la sala",
@@ -938,7 +938,7 @@
"Send typing notifications": "Enviar notificaciones de tecleo",
"Allow Peer-to-Peer for 1:1 calls": "Permitir conexiones «peer-to-peer en llamadas individuales",
"Prompt before sending invites to potentially invalid matrix IDs": "Pedir confirmación antes de enviar invitaciones a IDs de matrix que parezcan inválidas",
- "Show developer tools": "Mostrar herramientas de desarrollador",
+ "Show developer tools": "Mostrar herramientas de desarrollo",
"Messages containing my username": "Mensajes que contengan mi nombre",
"Messages containing @room": "Mensajes que contengan @room",
"Encrypted messages in one-to-one chats": "Mensajes cifrados en salas uno a uno",
@@ -1091,8 +1091,8 @@
"Enable Community Filter Panel": "Activar el panel de filtro de comunidad",
"Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
"Your %(brand)s is misconfigured": "Tu %(brand)s tiene un error de configuración",
- "Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
- "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no las «migas de pan» (iconos sobre la lista de salas)",
+ "Whether or not you're logged in (we don't record your username)": "Si has iniciado sesión o no (no guardamos tu nombre de usuario)",
+ "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Si estás usando o no las «migas de pan» (iconos sobre la lista de salas)",
"Replying With Files": "Respondiendo con archivos",
"At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?",
"The file '%(fileName)s' failed to upload.": "La subida del archivo «%(fileName)s ha fallado.",
@@ -1260,8 +1260,8 @@
"Upgrade private room": "Actualizar sala privada",
"Upgrade public room": "Actualizar sala pública",
"Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Actualizar una sala es una acción avanzada y es normalmente recomendada cuando una sala es inestable debido a fallos, funcionalidades no disponibles y vulnerabilidades.",
- "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Esto solo afecta a como la sala es procesada en el servidor. Si estás teniendo problemas con tu %(brand)s, por favor<a>reporta un fallo</a>.",
- "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Actualizarás esta sala de <oldVersion /> a <newVersion />.",
+ "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Esto solo afecta a cómo procesa la sala el servidor. Si estás teniendo problemas con %(brand)s, por favor, <a>avísanos del fallo</a>.",
+ "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Actualizarás esta sala de la versión <oldVersion /> a la <newVersion />.",
"Sign out and remove encryption keys?": "¿Salir y borrar las claves de cifrado?",
"A username can only contain lower case letters, numbers and '=_-./'": "Un nombre de usuario solo puede contener letras minúsculas, números y '=_-./'",
"Checking...": "Comprobando...",
@@ -1422,7 +1422,7 @@
"Disconnect from the identity server <idserver />?": "¿Desconectarse del servidor de identidad <idserver />?",
"Disconnect": "Desconectarse",
"You should:": "Deberías:",
- "Use Single Sign On to continue": "Continuar con SSO",
+ "Use Single Sign On to continue": "Continuar con registro único (SSO)",
"Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma la nueva dirección de correo usando SSO para probar tu identidad.",
"Single Sign On": "Single Sign On",
"Confirm adding email": "Confirmar un nuevo correo electrónico",
@@ -1441,7 +1441,7 @@
"Use your account or create a new one to continue.": "Usa tu cuenta existente o crea una nueva para continuar.",
"Create Account": "Crear cuenta",
"Sign In": "Iniciar sesión",
- "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo en markdown",
+ "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como HTML, sin interpretarlo en Markdown",
"Failed to set topic": "No se ha podido cambiar el tema",
"Command failed": "El comando falló",
"Could not find user in room": "No se ha encontrado el usuario en la sala",
@@ -1481,7 +1481,7 @@
"Verify the new login accessing your account: %(name)s": "Verifica el nuevo inicio de sesión que está accediendo a tu cuenta: %(name)s",
"From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
"This bridge was provisioned by <user />.": "Este puente fue aportado por <user />.",
- "This bridge is managed by <user />.": "Este puente es administrado por <user />.",
+ "This bridge is managed by <user />.": "Este puente lo gestiona <user />.",
"Your homeserver does not support cross-signing.": "Tu servidor base no soporta las firmas cruzadas.",
"Cross-signing and secret storage are enabled.": "La firma cruzada y el almacenamiento secreto están activados.",
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Su cuenta tiene una identidad de firma cruzada en un almacenamiento secreto, pero aún no es confiada en esta sesión.",
@@ -1693,7 +1693,7 @@
"Try to join anyway": "Intentar unirse de todas formas",
"You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública.",
"Join the discussion": "Unirme a la Sala",
- "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?",
+ "Do you want to chat with %(user)s?": "¿Quieres empezar una conversación con %(user)s?",
"Do you want to join %(roomName)s?": "¿Quieres unirte a %(roomName)s?",
"<userName/> invited you": "<userName/> te ha invitado",
"You're previewing %(roomName)s. Want to join it?": "Esto es una vista previa de %(roomName)s. ¿Te quieres unir?",
@@ -1738,8 +1738,8 @@
"This invite to %(roomName)s was sent to %(email)s": "Esta invitación a %(roomName)s fue enviada a %(email)s",
"Use an identity server in Settings to receive invites directly in %(brand)s.": "Utilice un servidor de identidad en Configuración para recibir invitaciones directamente en %(brand)s.",
"Share this email in Settings to receive invites directly in %(brand)s.": "Comparte este correo electrónico en Configuración para recibir invitaciones directamente en %(brand)s.",
- "<userName/> wants to chat": "<userName/> quiere chatear",
- "Start chatting": "Empieza una conversación",
+ "<userName/> wants to chat": "<userName/> quiere mandarte mensajes",
+ "Start chatting": "Empezar una conversación",
"Reject & Ignore user": "Rechazar e ignorar usuario",
"Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Actualizar esta sala cerrará la instancia actual de la sala y creará una sala actualizada con el mismo nombre.",
"This room has already been upgraded.": "Esta sala ya ha sido actualizada.",
@@ -2081,7 +2081,7 @@
"Joins room with given address": "Entrar a la sala con la dirección especificada",
"Unrecognised room address:": "No se encuentra la dirección de la sala:",
"Opens chat with the given user": "Abrir una conversación con el usuario especificado",
- "Sends a message to the given user": "Enviar un mensaje al usuario especificado",
+ "Sends a message to the given user": "Enviar un mensaje al usuario seleccionado",
"Light": "Claro",
"Dark": "Oscuro",
"Unexpected server error trying to leave the room": "Error inesperado del servidor al abandonar esta sala",
@@ -2423,7 +2423,7 @@
"Navigate composer history": "Navegar por el historial del editor",
"Cancel replying to a message": "Cancelar responder al mensaje",
"Toggle microphone mute": "Alternar silencio del micrófono",
- "Toggle video on/off": "Activar/desactivar video",
+ "Toggle video on/off": "Activar/desactivar vídeo",
"Scroll up/down in the timeline": "Desplazarse hacia arriba o hacia abajo en la línea de tiempo",
"Dismiss read marker and jump to bottom": "Descartar el marcador de lectura y saltar al final",
"Jump to oldest unread message": "Ir al mensaje no leído más antiguo",
@@ -2452,7 +2452,7 @@
"This version of %(brand)s does not support searching encrypted messages": "Esta versión de %(brand)s no puede buscar mensajes cifrados",
"Video conference ended by %(senderName)s": "Videoconferencia terminada por %(senderName)s",
"Join the conference from the room information card on the right": "Únete a la conferencia desde el panel de información de la sala de la derecha",
- "Join the conference at the top of this room": "Unirse a la conferencia en la parte de arriba de la sala",
+ "Join the conference at the top of this room": "Únete a la conferencia en la parte de arriba de la sala",
"Ignored attempt to disable encryption": "Se ha ignorado un intento de desactivar el cifrado",
"Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Los mensajes en esta sala están cifrados de extremo a extremo. Cuando alguien se una podrás verificarle en su perfil, tan solo pulsa en su imagen.",
"Add widgets, bridges & bots": "Añadir widgets, puentes y bots",
@@ -3248,7 +3248,7 @@
"%(seconds)ss left": "%(seconds)ss restantes",
"Failed to send": "No se ha podido mandar",
"Change server ACLs": "Cambiar los ACLs del servidor",
- "Show options to enable 'Do not disturb' mode": "Mostrar opciones para activar el modo «no molestar»",
+ "Show options to enable 'Do not disturb' mode": "Ver opciones para activar el modo «no molestar»",
"Stop the recording": "Parar grabación",
"Delete recording": "Borrar grabación",
"Enter your Security Phrase a second time to confirm it.": "Escribe tu frase de seguridad de nuevo para confirmarla.",
@@ -3311,7 +3311,7 @@
"sends space invaders": "enviar space invaders",
"Sends the given message with a space themed effect": "Envía un mensaje con efectos espaciales",
"If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Si sales, %(brand)s volverá a cargarse con los espacios desactivados. Las comunidades y las etiquetas personalizadas serán visibles de nuevo.",
- "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permitir conexión directa (peer-to-peer) en las llamadas individuales (si lo activas, la otra parte podría ver tu dirección IP)",
+ "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permitir conexión directa (peer-to-peer) en las llamadas individuales (si lo activas, la otra persona podría ver tu dirección IP)",
"See when people join, leave, or are invited to your active room": "Ver cuando alguien se una, salga o se le invite a tu sala activa",
"Kick, ban, or invite people to this room, and make you leave": "Expulsar, vetar o invitar personas a esta sala, y hacerte salir de ella",
"Kick, ban, or invite people to your active room, and make you leave": "Expulsar, vetar o invitar a gente a tu sala activa, o hacerte salir",
@@ -3347,7 +3347,7 @@
"%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s ha echado a %(targetName)s: %(reason)s",
"Disagree": "No estoy de acuerdo",
"[number]": "[número]",
- "To view %(spaceName)s, you need an invite": "Para ver %(spaceName)s, necesitas que te inviten.",
+ "To view %(spaceName)s, you need an invite": "Para ver %(spaceName)s, necesitas que te inviten",
"You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Haz clic sobre una imagen en el panel de filtro para ver solo las salas y personas asociadas con una comunidad.",
"Move down": "Bajar",
"Move up": "Subir",
@@ -3374,7 +3374,7 @@
"%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s ha cambiado los permisos del servidor %(count)s veces",
"%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ha cambiado los permisos del servidor",
"%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ha cambiado los permisos del servidor %(count)s veces",
- "Message search initialisation failed, check <a>your settings</a> for more information": "Ha fallado el sistema de búsqueda de mensajes. Comprueba <a>tus ajustes</a> para más información.",
+ "Message search initialisation failed, check <a>your settings</a> for more information": "Ha fallado el sistema de búsqueda de mensajes. Comprueba <a>tus ajustes</a> para más información",
"Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Elige una dirección para este espacio y los usuarios de tu servidor base (%(localDomain)s) podrán encontrarlo a través del buscador",
"To publish an address, it needs to be set as a local address first.": "Para publicar una dirección, primero debe ser añadida como dirección local.",
"Published addresses can be used by anyone on any server to join your room.": "Las direcciones publicadas pueden usarse por cualquiera para unirse a tu sala, independientemente de su servidor base.",
@@ -3404,7 +3404,7 @@
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Si lo desactivas, todavía podrás añadir mensajes directos a tus espacios personales. Si lo activas, aparecerá todo el mundo que pertenezca al espacio.",
"Show people in spaces": "Mostrar gente en los espacios",
"Show all rooms in Home": "Mostrar todas las salas en la pantalla de inicio",
- "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototipo de reportes a los moderadores. En las salas que lo permitan, verás el botón «reportar», que te permitirá avisar de mensajes abusivos a los moderadores de la sala.",
+ "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototipo de reportes a los moderadores. En las salas que lo permitan, verás el botón «reportar», que te permitirá avisar de mensajes abusivos a los moderadores de la sala",
"%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s ha anulado la invitación a %(targetName)s",
"%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s ha anulado la invitación a %(targetName)s: %(reason)s",
"%(targetName)s left the room": "%(targetName)s ha salido de la sala",
@@ -3422,7 +3422,7 @@
"We sent the others, but the below people couldn't be invited to <RoomName/>": "Hemos enviado el resto, pero no hemos podido invitar las siguientes personas a la sala <RoomName/>",
"Some invites couldn't be sent": "No se han podido enviar algunas invitaciones",
"Integration manager": "Gestor de integración",
- "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s no utilizar un \"gestor de integración\" para hacer esto. Por favor, contacta con un administrador.",
+ "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Tu aplicación %(brand)s no te permite usar un gestor de integración para hacer esto. Por favor, contacta con un administrador.",
"Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Al usar este widget puede que se compartan datos <helpIcon /> con %(widgetDomain)s y tu gestor de integraciones.",
"Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los gestores de integraciones reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establecer niveles de poder en tu nombre.",
"Use an integration manager to manage bots, widgets, and sticker packs.": "Usa un gestor de integraciones para bots, widgets y paquetes de pegatinas.",
@@ -3445,7 +3445,7 @@
"To view all keyboard shortcuts, click here.": "Para ver todos los atajos de teclado, haz clic aquí.",
"Keyboard shortcuts": "Atajos de teclado",
"Identity server is": "El servidor de identidad es",
- "There was an error loading your notification settings.": "Ha ocurrido un error al cargar tus ajustes de notificaciones",
+ "There was an error loading your notification settings.": "Ha ocurrido un error al cargar tus ajustes de notificaciones.",
"Mentions & keywords": "Menciones y palabras clave",
"Global": "Global",
"New keyword": "Nueva palabra clave",
@@ -3465,7 +3465,7 @@
"Image": "Imagen",
"Sticker": "Pegatina",
"Downloading": "Descargando",
- "The call is in an unknown state!": "La llamada está en un estado desconocido",
+ "The call is in an unknown state!": "¡La llamada está en un estado desconocido!",
"Call back": "Devolver",
"You missed this call": "No has cogido esta llamada",
"This call has failed": "Esta llamada ha fallado",
@@ -3479,10 +3479,10 @@
"IRC": "IRC",
"Use Ctrl + F to search timeline": "Usa Control + F para buscar dentro de la conversación",
"<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Ten en cuenta que actualizar crea una nueva versión de la sala</b>. Todos los mensajes hasta ahora quedarán archivados aquí, en esta sala.",
- "Automatically invite members from this room to the new one": "Invitar a la nueva sala automáticamente miembros de esta",
+ "Automatically invite members from this room to the new one": "Invitar a la nueva sala automáticamente a los miembros que tiene ahora",
"These are likely ones other room admins are a part of.": "Otros administradores de la sala estarán dentro.",
"Other spaces or rooms you might not know": "Otros espacios o salas que puede que no conozcas",
- "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decide qué espacios pueden acceder a esta sala. Si seleccionas un espacio, sus miembros podrán encontrar y unirse a <RoomName/>.",
+ "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decide qué espacios tienen acceso a esta sala. Si seleccionas un espacio, sus miembros podrán encontrar y unirse a <RoomName/>.",
"You're removing all spaces. Access will default to invite only": "Al quitar todos los espacios, el acceso por defecto pasará a ser «solo por invitación»",
"Only people invited will be able to find and join this space.": "Solo las personas invitadas podrán encontrar y unirse a este espacio.",
"Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Cualquiera podrá encontrar y unirse a este espacio, incluso si no forman parte de <SpaceName/>.",
@@ -3498,14 +3498,14 @@
"Anyone in a space can find and join. You can select multiple spaces.": "Cualquiera en un espacio puede encontrar y unirse. Puedes seleccionar varios espacios.",
"Anyone in %(spaceName)s can find and join. You can select other spaces too.": "Cualquiera en %(spaceName)s puede encontrar y unirse. También puedes seleccionar otros espacios.",
"Spaces with access": "Espacios con acceso",
- "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Cualquiera en un espacio puede encontrar y unirse. <a>Ajusta qué espacios pueden acceder desde aquí.",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Cualquiera en un espacio puede encontrar y unirse. <a>Ajusta qué espacios pueden acceder desde aquí.</a>",
"Currently, %(count)s spaces have access|other": "Ahora mismo, %(count)s espacios tienen acceso",
"& %(count)s more|other": "y %(count)s más",
"Upgrade required": "Actualización necesaria",
"Anyone can find and join.": "Cualquiera puede encontrar y unirse.",
"Only invited people can join.": "Solo las personas invitadas pueden unirse.",
"Private (invite only)": "Privado (solo por invitación)",
- "This upgrade will allow members of selected spaces access to this room without an invite.": "Esta actualización permitirá a los miembros de los espacios que elijas acceder a esta sala sin que tengas que invitarles.",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "Si actualizas, podrás configurar la sala para que los miembros de los espacios que elijas puedan unirse sin que tengas que invitarles.",
"Message bubbles": "Burbujas de mensaje",
"Show all rooms": "Ver todas las salas",
"Give feedback.": "Danos tu opinión.",
@@ -3585,5 +3585,58 @@
"Stop the camera": "Parar la cámara",
"Start the camera": "Iniciar la cámara",
"Surround selected text when typing special characters": "Rodear texto seleccionado al escribir caracteres especiales",
- "Send pseudonymous analytics data": "Enviar datos estadísticos seudonimizados"
+ "Send pseudonymous analytics data": "Enviar datos estadísticos seudonimizados",
+ "Created from <Community />": "Creado a partir de <Community />",
+ "Space created": "Espacio creado",
+ "This community has been upgraded into a Space": "Esta comunidad se ha convertido en un espacio",
+ "Unknown failure: %(reason)s": "Fallo desconocido: %(reason)s",
+ "Show my Communities": "Ver mis comunidades",
+ "Create Space": "Crear espacio",
+ "Open Space": "Abrir espacio",
+ "To join an existing space you'll need an invite.": "Para unirte a un espacio ya existente necesitas que te inviten a él.",
+ "You can also create a Space from a <a>community</a>.": "También puedes crear un espacio a partir de una <a>comunidad</a>.",
+ "You can change this later.": "Puedes cambiarlo más tarde.",
+ "What kind of Space do you want to create?": "¿Qué tipo de espacio quieres crear?",
+ "Don't send read receipts": "No enviar confirmaciones de lectura",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Para ver espacios, oculta las comunidades en <a>ajustes</a>",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>No está recomendado activar el cifrado en salas públicas.</b> Cualquiera puede encontrar la sala y unirse, por lo que cualquiera puede leer los mensajes. No disfrutarás de los beneficios del cifrado. Además, activarlo en una sala pública hará que recibir y enviar mensajes tarde más.",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Las comunidades han sido archivadas para dar paso a los espacios, pero puedes convertir tus comunidades a espacios debajo. Al convertirlas, te aseguras de que tus conversaciones tienen acceso a las últimas funcionalidades.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Si nos has avisado de un fallo a través de Github, los registros de depuración nos pueden ayudar a encontrar más fácil el problema. Los registros incluyen datos de uso de la aplicación incluyendo tu nombre de usuario, las IDs o nombres de las salas o grupos que has visitado, los elementos de la interfaz con los que hayas interactuado recientemente, y los nombres de usuario de otras personas. No contienen mensajes.",
+ "Delete avatar": "Borrar avatar",
+ "Flair won't be available in Spaces for the foreseeable future.": "Por ahora no está previsto que las insignias estén disponibles en los espacios.",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Pídele a los <a>admins</a> que conviertan la comunidad en un espacio y espera a que te inviten.",
+ "You can create a Space from this community <a>here</a>.": "Puedes crear un espacio a partir de esta comunidad desde <a>aquí</a>.",
+ "To create a Space from another community, just pick the community in Preferences.": "Para crear un espacio a partir de otra comunidad, escoge la comunidad en ajustes.",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Los registros de depuración contienen datos de uso de la aplicación como tu nombre de usuario, las IDs o los nombres de las salas o grupos que has visitado, con qué elementos de la interfaz has interactuado recientemente, y nombres de usuario de otras personas. No incluyen mensajes.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Para evitar estos problemas, crea una <a>nueva sala pública</a> para la conversación que planees tener.",
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s han cambiado los <a>mensajes anclados</a> de la sala %(count)s veces.",
+ "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s han cambiado los <a>mensajes anclados</a> de la sala %(count)s veces.",
+ "Cross-signing is ready but keys are not backed up.": "La firma cruzada está lista, pero no hay copia de seguridad de las claves.",
+ "Rooms and spaces": "Salas y espacios",
+ "Results": "Resultados",
+ "Communities won't receive further updates.": "Las comunidades no van a recibir actualizaciones.",
+ "Spaces are a new way to make a community, with new features coming.": "Los espacios son una nueva manera de formar una comunidad, con nuevas funcionalidades próximamente.",
+ "Communities can now be made into Spaces": "Ahora puedes convertir comunidades en espacios",
+ "This description will be shown to people when they view your space": "Esta descripción aparecerá cuando alguien vea tu espacio",
+ "All rooms will be added and all community members will be invited.": "Todas las salas se añadirán, e invitaremos a todos los miembros de la comunidad.",
+ "A link to the Space will be put in your community description.": "Pondremos un enlace al espacio en la descripción de tu comunidad.",
+ "Create Space from community": "Crear espacio a partir de una comunidad",
+ "Failed to migrate community": "Fallo al migrar la comunidad",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> ha sido creado, y cualquier persona que formara parte ha sido invitada.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Tus mensajes privados están cifrados normalmente, pero esta sala no lo está. A menudo, esto pasa porque has iniciado sesión con un dispositivo o método no compatible, como las invitaciones por correo.",
+ "Enable encryption in settings.": "Activa el cifrado en los ajustes.",
+ "Are you sure you want to make this encrypted room public?": "¿Seguro que quieres activar el cifrado en esta sala pública?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Para evitar estos problemas, crea una <a>nueva sala cifrada</a> para la conversación que quieras tener.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>No recomendamos activar el cifrado para salas públicas.</b>Cualquiera puede encontrar y unirse a una sala pública, por lo también puede leer los mensajes. No aprovecharás ningún beneficio del cifrado, y no podrás desactivarlo en el futuro. Cifrar mensajes en una sala pública hará que tarden más en enviarse y recibirse.",
+ "If a community isn't shown you may not have permission to convert it.": "Si echas en falta alguna comunidad, es posible que no tengas permisos suficientes para convertirla.",
+ "Are you sure you want to add encryption to this public room?": "¿Seguro que quieres activar el cifrado en esta sala pública?",
+ "Low bandwidth mode (requires compatible homeserver)": "Modo de bajo consumo de datos (el servidor base debe ser compatible)",
+ "Multiple integration managers (requires manual setup)": "Varios gestores de integración (hay que configurarlos manualmente)",
+ "Threaded messaging": "Mensajes en hilos",
+ "Show threads": "Ver hilos",
+ "Thread": "Hilo",
+ "The above, but in any room you are joined or invited to as well": "Lo de arriba, pero en cualquier sala en la que estés o te inviten",
+ "The above, but in <Room /> as well": "Lo de arriba, pero también en <Room />",
+ "Autoplay videos": "Reproducir automáticamente los vídeos",
+ "Autoplay GIFs": "Reproducir automáticamente los GIFs"
}
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index c76fdbe727..817ff8d312 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2232,7 +2232,7 @@
"For help with using %(brand)s, click <a>here</a>.": "Kui otsid lisateavet %(brand)s'i kasutamise kohta, palun vaata <a>siia</a>.",
"Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Lisa siia kasutajad ja serverid, mida sa soovid eirata. Kui soovid, et %(brand)s kasutaks üldist asendamist, siis kasuta tärni. Näiteks <code>@bot:*</code> eirab kõikide serverite kasutajat 'bot'.",
"Use default": "Kasuta vaikimisi väärtusi",
- "Mentions & Keywords": "Mainimised ja võtmesõnad",
+ "Mentions & Keywords": "Mainimised ja märksõnad",
"Notification options": "Teavituste eelistused",
"Room options": "Jututoa eelistused",
"This room is public": "See jututuba on avalik",
@@ -3543,7 +3543,7 @@
"Spaces feedback": "Tagasiside kogukonnakeskuste kohta",
"Give feedback.": "Jaga tagasisidet.",
"We're working on this, but just want to let you know.": "Me küll alles arendame seda võimalust, kuid soovisime, et tead, mis tulemas on.",
- "All rooms you're in will appear in Home.": "Kõik sinu jututoad on nähtavad kodulehel.",
+ "All rooms you're in will appear in Home.": "Kõik sinu jututoad on nähtavad avalehel.",
"Show all rooms": "Näita kõiki jututubasid",
"Leave all rooms and spaces": "Lahku kõikidest jututubadest ja kogukondadest",
"Don't leave any": "Ära lahku ühestki",
@@ -3579,5 +3579,100 @@
"More": "Veel",
"Dialpad": "Numbriklahvistik",
"Unmute the microphone": "Eemalda mikrofoni summutamine",
- "Mute the microphone": "Summuta mikrofon"
+ "Mute the microphone": "Summuta mikrofon",
+ "You can create a Space from this community <a>here</a>.": "Sellest vana tüüpi kogukonnast saad luua uue kogukonnakeskuse <a>siin</a>.",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Palu et <a>haldaja</a> muudaks vana kogukonna uueks kogukonnakeskuseks ja oota liitumiskutset.",
+ "Communities can now be made into Spaces": "Vanad kogukonnad saab nüüd muuta uuteks kogukonnakeskusteks",
+ "Spaces are a new way to make a community, with new features coming.": "Kogukonnakeskused on nüüd uus ja pidevalt täienev lahendus seniste kogukondade jaoks.",
+ "Communities won't receive further updates.": "Kogukondade vana funktsionaalsus enam ei uuene.",
+ "Created from <Community />": "Loodud kogukonnas: <Community />",
+ "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Vajutades kõne ajal „Jaga ekraani“ nuppu saad sa nüüd ekraanivaadet jagada. Kui mõlemad osapooled seda toetavad, siis toimib see ka tavakõne ajal!",
+ "Add space": "Lisa kogukonnakeskus",
+ "Olm version:": "Olm-teegi versioon:",
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s muutsid jututoa <a>klammerdatud sõnumeid</a> %(count)s korda.",
+ "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s muutis jututoa <a>klammerdatud sõnumeid</a> %(count)s korda.",
+ "Don't send read receipts": "Ära saada lugemisteatisi",
+ "Delete avatar": "Kustuta tunnuspilt",
+ "What kind of Space do you want to create?": "Missugust kogukonnakeskust sooviksid sa luua?",
+ "You can change this later.": "Sa võid seda hiljem muuta.",
+ "You can also create a Space from a <a>community</a>.": "Sa või uue kogukonnakeskuse teha ka <a>senise kogukonna</a> alusel.",
+ "To join an existing space you'll need an invite.": "Olemasoleva kogukonnakeskusega liitumiseks vajad sa kutset.",
+ "Open Space": "Ava kogukonnakeskus",
+ "Create Space": "Loo kogukonnakeskus",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Senised kogukonnad on nüüd arhiveeritud ning nende asemel on kogukonnakeskused. Soovi korral võid oma senised kogukonnad muuta uuteks kogukonnakeskusteks ning seeläbi saad kasutada ka viimaseid uuendusi.",
+ "Show my Communities": "Näita minu kogukondi",
+ "If a community isn't shown you may not have permission to convert it.": "Kui sa kogukonda siin loendis ei näe, siis ei pruugi sul olla piisavalt õigusi.",
+ "This community has been upgraded into a Space": "Oleme selle vana kogukonna alusel loonud uue kogukonnakeskuse",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Uute kogukonnakeskuste nägemiseks peida <a>seadistustest</a> vanad kogukonnad",
+ "Space created": "Kogukonnakeskus on loodud",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> on nüüd olemas kõik vanas kogukonnas osalejad said sinna ka kutse.",
+ "To create a Space from another community, just pick the community in Preferences.": "Kui soovid uut kogukonnakeskust luua mõne teise vana kogukonna alusel, siis vali too seadistustest.",
+ "Failed to migrate community": "Vana kogukonna muutmine uueks kogukonnakeskuseks ei õnnestunud",
+ "Create Space from community": "Loo senise kogukonna alusel uus kogukonnakeskus",
+ "A link to the Space will be put in your community description.": "Uue kogukonnakeskuse viite lisame vana kogukonna kirjeldusele.",
+ "All rooms will be added and all community members will be invited.": "Lisame kõik jututoad ja saadame kitse kõikidele senise kogukonna liikmetele.",
+ "Flair won't be available in Spaces for the foreseeable future.": "Me ei plaani lähitulevikus pakkuda kogukondades rinnamärkide funktsionaalsust.",
+ "This description will be shown to people when they view your space": "Seda kirjeldust kuvame kõigile, kes vaatavad sinu kogukonda",
+ "Unknown failure: %(reason)s": "Tundmatu viga: %(reason)s",
+ "Help space members find private rooms": "Aita kogukonnakeskuse liitmetel leida privaatseid jututube",
+ "New in the Spaces beta": "Mida",
+ "We sent the others, but the below people couldn't be invited to <RoomName/>": "Teised kasutajad said kutse, kuid allpool toodud kasutajatele ei õnnestunud saata kutset <RoomName/> jututuppa",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Kui sa oled teatanud meile GitHub'i vahendusel veast, siis silumislogid aitavad meil seda viga kergemini parandada. Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi, viimatikasutatud liidese funktsionaalsusi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi, viimatikasutatud liidese funktsionaalsusi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Sinu isiklikud sõnumid on tavaliselt läbivalt krüptitud, aga see jututuba ei ole. Tavaliselt on põhjuseks, et kasutusel on mõni seade või meetod nagu e-posti põhised kutsed, mis krüptimist veel ei toeta.",
+ "Enable encryption in settings.": "Võta seadistustes krüptimine kasutusele.",
+ "Cross-signing is ready but keys are not backed up.": "Risttunnustamine on töövalmis, aga krüptovõtmed on varundamata.",
+ "New layout switcher (with message bubbles)": "Uue kujunduse valik (koos sõnumimullidega)",
+ "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "See muudab lihtsaks, et jututoad jääksid kogukonnakeskuse piires privaatseks, kuid lasevad kogukonnakeskuses viibivatel inimestel need üles leida ja nendega liituda. Kõik kogukonnakeskuse uued jututoad on selle võimalusega.",
+ "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Selleks, et aidata kogukonnakeskuse liikmetel leida privaatne jututuba ja sellega liituda, minge selle toa turvalisuse ja privaatsuse seadistustesse.",
+ "Help people in spaces to find and join private rooms": "Aita kogukonnakeskuse liikmetel leida privaatseid jututube ning nendega liituda",
+ "See when people join, leave, or are invited to your active room": "Näita, millal teised sinu aktiivse toaga liituvad, sealt lahkuvad või sellesse tuppa kutsutakse",
+ "Kick, ban, or invite people to your active room, and make you leave": "Aktiivsest toast inimeste väljalükkamine, keelamine või tuppa kutsumine",
+ "See when people join, leave, or are invited to this room": "Näita, millal inimesed toaga liituvad, lahkuvad või siia tuppa kutsutakse",
+ "Kick, ban, or invite people to this room, and make you leave": "Sellest toast inimeste väljalükkamine, keelamine või tuppa kutsumine",
+ "Rooms and spaces": "Jututoad ja kogukonnad",
+ "Results": "Tulemused",
+ "Error downloading audio": "Helifaili allalaadimine ei õnnestunud",
+ "These are likely ones other room admins are a part of.": "Ilmselt on tegemist nendega, mille liikmed on teiste jututubade haldajad.",
+ "& %(count)s more|other": "ja veel %(count)s",
+ "Add existing space": "Lisa olemasolev kogukonnakeskus",
+ "Image": "Pilt",
+ "Sticker": "Kleeps",
+ "An unknown error occurred": "Tekkis teadmata viga",
+ "Their device couldn't start the camera or microphone": "Teise osapoole seadmes ei õnnestunud sisse lülitada kaamerat või mikrofoni",
+ "Connection failed": "Ühendus ebaõnnestus",
+ "Could not connect media": "Meediaseadme ühendamine ei õnnestunud",
+ "Connected": "Ühendatud",
+ "Copy Room Link": "Kopeeri jututoa link",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Kõik kogukonnakeskuse liikmed saavad jututuba leida ja sellega liituda. <a>Muuda lubatud kogukonnakeskuste loendit.</a>",
+ "Currently, %(count)s spaces have access|other": "Hetkel on ligipääs %(count)s'l kogukonnakeskusel",
+ "Upgrade required": "Vajalik on uuendus",
+ "Anyone can find and join.": "Kõik saavad jututuba leida ja sellega liituda.",
+ "Only invited people can join.": "Liitumine toimub vaid kutse alusel.",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Võimalike probleemide vältimiseks loo oma suhtluse jaoks <a>uus krüptitud jututuba</a>.",
+ "Private (invite only)": "Privaatne jututuba (eeldab kutset)",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Võimalike probleemide vältimiseks loo oma suhtluse jaoks <a>uus avalik jututuba</a>.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Me ei soovita krüptitud jututoa muutmist avalikuks.</b> See tähendaks, et kõik huvilised saavad vabalt seda jututuba leida ning temaga liituda ning seega ka kõiki selles leiduvaid sõnumeid lugeda. Olemuselt puuduvad sellises olukorras krüptimise eelised. Avalike jututubade sõnumite krüptimine teeb ka sõnumite saatmise ja vastuvõtmise aeglasemaks.",
+ "Are you sure you want to make this encrypted room public?": "Kas sa oled kindel, et soovid seda krüptitud jututuba muuta avalikuks?",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "Antud uuendusega on valitud kogukonnakeskuste liikmetel võimalik selle jututoaga ilma kutseta liituda.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Me ei soovita avalikes jututubades krüptimise kasutamist.</b> Kuna kõik huvilised saavad vabalt leida avalikke jututube ning nendega liituda, siis saavad nad niikuinii ka neis leiduvaid sõnumeid lugeda. Olemuselt puuduvad sellises olukorras krüptimise eelised ning sa ei saa hiljem krüptimist välja lülitada. Avalike jututubade sõnumite krüptimine teeb ka sõnumite saatmise ja vastuvõtmise aeglasemaks.",
+ "Are you sure you want to add encryption to this public room?": "Kas sa oled kindel, et soovid selles avalikus jututoas kasutada krüptimist?",
+ "Message bubbles": "Jutumullid",
+ "IRC": "IRC",
+ "Low bandwidth mode (requires compatible homeserver)": "Režiim kehva internetiühenduse jaoks (eeldab koduserveripoolset tuge)",
+ "Surround selected text when typing special characters": "Erimärkide sisestamisel märgista valitud tekst",
+ "Multiple integration managers (requires manual setup)": "Mitmed lõiminguhaldurid (eeldab käsitsi seadistamist)",
+ "Thread": "Jutulõng",
+ "Show threads": "Näita jutulõnga",
+ "Threaded messaging": "Sõnumid jutulõngana",
+ "Autoplay videos": "Esita automaatselt videosid",
+ "Autoplay GIFs": "Esita automaatselt liikuvaid pilte",
+ "The above, but in any room you are joined or invited to as well": "Ülaltoodu, aga samuti igas jututoas, millega oled liitunud või kuhu oled kutsutud",
+ "The above, but in <Room /> as well": "Ülaltoodu, aga samuti <Room /> jututoas",
+ "Currently, %(count)s spaces have access|one": "Hetkel sellel kogukonnal on ligipääs",
+ "& %(count)s more|one": "ja veel %(count)s",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s eemaldas siin jututoas klammerduse ühelt sõnumilt. Vaata kõiki klammerdatud sõnumeid.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s eemaldas siin jututoas klammerduse <a>ühelt sõnumilt</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s klammerdas siin jututoas <a>ühe sõnumi</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s klammerdas siin jututoas ühe sõnumi. Vaata kõiki klammerdatud sõnumeid."
}
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f5e04a6581..862cefe06d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -3436,7 +3436,7 @@
"Show all rooms in Home": "Afficher tous les salons dans Accueil",
"%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s a changé <a>les messages épinglés</a> du salon.",
"%(senderName)s kicked %(targetName)s": "%(senderName)s a expulsé %(targetName)s",
- "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s a explusé %(targetName)s : %(reason)s",
+ "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s a expulsé %(targetName)s : %(reason)s",
"%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s a annulé l’invitation de %(targetName)s",
"%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s a annulé l’invitation de %(targetName)s : %(reason)s",
"%(senderName)s unbanned %(targetName)s": "%(senderName)s a révoqué le bannissement de %(targetName)s",
@@ -3620,5 +3620,63 @@
"Stop sharing your screen": "Arrêter de partager mon écran",
"Stop the camera": "Arrêter la caméra",
"Start the camera": "Démarrer la caméra",
- "Surround selected text when typing special characters": "Entourer le texte sélectionné lors de la saisie de certains caractères"
+ "Surround selected text when typing special characters": "Entourer le texte sélectionné lors de la saisie de certains caractères",
+ "Created from <Community />": "Créé à partir de <Community />",
+ "Communities won't receive further updates.": "Les communautés ne recevront plus de mises-à-jour.",
+ "Spaces are a new way to make a community, with new features coming.": "Les espaces sont une nouvelle manière de créer une communauté, avec l’apparition de nouvelles fonctionnalités.",
+ "Communities can now be made into Spaces": "Les communautés peuvent maintenant être transformées en espaces",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Demandez aux <a>administrateurs</a> de cette communauté de la transformer en espace et attendez l’invitation.",
+ "You can create a Space from this community <a>here</a>.": "Vous pouvez créer un espace à partir de cette communauté <a>ici</a>.",
+ "This description will be shown to people when they view your space": "Cette description sera affichée aux personnes qui verront votre espace",
+ "Flair won't be available in Spaces for the foreseeable future.": "Les badges ne seront pas disponibles pour les espaces dans un futur proche.",
+ "All rooms will be added and all community members will be invited.": "Tous les salons seront ajoutés et tous les membres de la communauté seront invités.",
+ "A link to the Space will be put in your community description.": "A lien vers l’espace sera ajouté dans la description de votre communauté.",
+ "Create Space from community": "Créer un espace à partir d’une communauté",
+ "Failed to migrate community": "Échec lors de la migration de la communauté",
+ "To create a Space from another community, just pick the community in Preferences.": "Pour créer un espace à partir d’une autre communauté, choisissez là simplement dans les préférences.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> a été créé et tous ceux qui faisaient partie de la communauté y ont été invités.",
+ "Space created": "Espace créé",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Pour voir les espaces, cachez les communautés dans les <a>préférences</a>",
+ "This community has been upgraded into a Space": "Cette communauté a été mise-à-jour vers un espace",
+ "Unknown failure: %(reason)s": "Erreur inconnue : %(reason)s",
+ "No answer": "Pas de réponse",
+ "If a community isn't shown you may not have permission to convert it.": "Si une communauté n’est pas affichée, vous n’avez peut-être pas le droit de la convertir.",
+ "Show my Communities": "Afficher mes communautés",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Les communautés ont été archivés pour faire place aux espaces mais il est possible de convertir vos communautés en espaces ci-dessous. La conversion garantira à vos conversions l’accès aux fonctionnalités les plus récentes.",
+ "Create Space": "Créer l’espace",
+ "Open Space": "Ouvrir l’espace",
+ "To join an existing space you'll need an invite.": "Vous aurez besoin d’une invitation pour rejoindre un espace existant.",
+ "You can also create a Space from a <a>community</a>.": "Vous pouvez également créer un espace à partir d’une <a>communauté</a>.",
+ "You can change this later.": "Vous pourrez changer ceci plus tard.",
+ "What kind of Space do you want to create?": "Quel type d’espace voulez-vous créer ?",
+ "Delete avatar": "Supprimer l’avatar",
+ "Don't send read receipts": "Ne pas envoyer les accusés de réception",
+ "Rooms and spaces": "Salons et espaces",
+ "Results": "Résultats",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Les journaux de débogage contiennent les données d’utilisation de l’application incluant votre nom d’utilisateur, les identifiants ou les alias des salons ou groupes que vous avez visités, les derniers élément de l’interface avec lesquels vous avez interagis, et les noms d’utilisateurs des autres utilisateurs. Ils ne contiennent pas de messages.",
+ "Thread": "Discussion",
+ "Show threads": "Afficher les fils de discussion",
+ "Enable encryption in settings.": "Activer le chiffrement dans les paramètres.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Vos messages privés sont normalement chiffrés, mais ce salon ne l’est pas. Cela est généralement dû à un périphérique non supporté, ou à un moyen de communication non supporté comme les invitations par e-mail.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Pour éviter ces problèmes, créez un <a>nouveau salon public</a> pour la conversation que vous souhaitez avoir.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Il n’est pas recommandé de rendre public les salons chiffrés.</b> Cela veut dire que quiconque pourra trouver et rejoindre le salon, donc tout le monde pourra lire les messages. Vous n’aurez plus aucun avantage lié au chiffrement. Chiffrer les messages dans un salon public ralentira la réception et l’envoi de messages.",
+ "Are you sure you want to make this encrypted room public?": "Êtes-vous sûr de vouloir rendre public ce salon chiffré ?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Pour éviter ces problèmes, créez un <a>nouveau salon chiffré</a> pour la conversation que vous souhaitez avoir.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Il n'est pas recommandé d’ajouter le chiffrement aux salons publics.</b> Tout le monde peut trouver et rejoindre les salons publics, donc tout le monde peut lire les messages qui s’y trouvent. Vous n’aurez aucun des avantages du chiffrement, et vous ne pourrez pas le désactiver plus tard. Chiffrer les messages dans un salon public ralentira la réception et l’envoi de messages.",
+ "Are you sure you want to add encryption to this public room?": "Êtes-vous sûr de vouloir ajouter le chiffrement dans ce salon public ?",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Si vous avez soumis un rapport d’anomalie via GitHub, les journaux de débogage nous aiderons à localiser le problème. Les journaux de débogage contiennent les données d’utilisation de l’application incluant votre nom d’utilisateur, les identifiants ou les alias des salons ou groupes que vous avez visités, les derniers élément de l’interface avec lesquels vous avez interagis, et les noms d’utilisateurs des autres utilisateurs. Ils ne contiennent pas de messages.",
+ "Cross-signing is ready but keys are not backed up.": "La signature croisée est prête mais les clés ne sont pas sauvegardées.",
+ "Low bandwidth mode (requires compatible homeserver)": "Mode faible bande passante (nécessite un serveur d’accueil compatible)",
+ "Autoplay videos": "Jouer automatiquement les vidéos",
+ "Autoplay GIFs": "Jouer automatiquement les GIFs",
+ "Multiple integration managers (requires manual setup)": "Multiple gestionnaires d’intégration (nécessite un réglage manuel)",
+ "Threaded messaging": "Fils de discussion",
+ "The above, but in <Room /> as well": "Comme ci-dessus, mais également dans <Room />",
+ "The above, but in any room you are joined or invited to as well": "Comme ci-dessus, mais également dans tous les salons dans lesquels vous avez été invité ou que vous avez rejoint",
+ "Currently, %(count)s spaces have access|one": "Actuellement, un espace a accès",
+ "& %(count)s more|one": "& %(count)s autres",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s a désépinglé un message de ce salon. Voir tous les messages épinglés.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s a désépinglé <a>un message</a> de ce salon. Voir tous les <b>messages épinglés</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s a épinglé un message dans ce salon. Voir tous les messages épinglés.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s a épinglé <a>un message</a> dans ce salon. Voir tous les <b>messages épinglés</b>."
}
diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json
index c98107b767..bf8ca8c157 100644
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@@ -504,14 +504,14 @@
"Invite": "Tabhair cuireadh",
"Mention": "Luaigh",
"Demote": "Bain ceadanna",
- "Ban": "Coisc",
+ "Ban": "Toirmisc",
"Kick": "Caith amach",
"Disinvite": "Tarraing siar cuireadh",
"Encrypted": "Criptithe",
"Encryption": "Criptiúchán",
"Anyone": "Aon duine",
"Permissions": "Ceadanna",
- "Unban": "Bain an coisc",
+ "Unban": "Bain an cosc",
"Browse": "Brabhsáil",
"Reset": "Athshocraigh",
"Sounds": "Fuaimeanna",
@@ -671,5 +671,157 @@
"Signed Out": "Sínithe Amach",
"Unable to query for supported registration methods.": "Ní féidir iarratas a dhéanamh faoi modhanna cláraithe tacaithe.",
"Host account on": "Óstáil cuntas ar",
- "Create account": "Déan cuntas a chruthú"
+ "Create account": "Déan cuntas a chruthú",
+ "Deactivate Account": "Cuir cuntas as feidhm",
+ "Account management": "Bainistíocht cuntais",
+ "Phone numbers": "Uimhreacha guthán",
+ "Email addresses": "Seoltaí r-phost",
+ "Display Name": "Ainm Taispeána",
+ "Profile picture": "Pictiúr próifíle",
+ "Phone Number": "Uimhir Fóin",
+ "Verification code": "Cód fíoraithe",
+ "Notification targets": "Spriocanna fógraí",
+ "Results": "Torthaí",
+ "Hangup": "Cuir síos",
+ "Dialpad": "Eochaircheap",
+ "More": "Níos mó",
+ "Decrypting": "Ag Díchriptiú",
+ "Adding...": "Ag Cur...",
+ "Access": "Rochtain",
+ "Image": "Íomhá",
+ "Sticker": "Greamán",
+ "Connected": "Ceangailte",
+ "IRC": "IRC",
+ "Modern": "Comhaimseartha",
+ "Global": "Uilíoch",
+ "Keyword": "Eochairfhocal",
+ "[number]": "[uimhir]",
+ "Report": "Tuairiscigh",
+ "Forward": "Seol ar aghaidh",
+ "Disagree": "Easaontaigh",
+ "Collapse": "Cumaisc",
+ "Expand": "Leath",
+ "Visibility": "Léargas",
+ "Address": "Seoladh",
+ "Sent": "Seolta",
+ "Beta": "Béite",
+ "Connecting": "Ag Ceangal",
+ "Play": "Cas",
+ "Pause": "Cuir ar sos",
+ "Sending": "Ag Seoladh",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "Avatar": "Abhatár",
+ "Removing...": "Ag Baint...",
+ "Suggested": "Moltaí",
+ "The file '%(fileName)s' failed to upload.": "Níor éirigh leis an gcomhad '%(fileName)s' a uaslódáil.",
+ "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Ag an am seo ní féidir freagra a thabhairt le comhad. Ar mhaith leat an comhad seo a uaslódáil gan freagra a thabhairt?",
+ "Replying With Files": "Ag Freagairt le Comhaid",
+ "You do not have permission to start a conference call in this room": "Níl cead agat glao comhdhála a thosú sa seomra seo",
+ "You cannot place a call with yourself.": "Ní féidir leat glaoch ort féin.",
+ "The user you called is busy.": "Tá an t-úsáideoir ar a ghlaoigh tú gnóthach.",
+ "User Busy": "Úsáideoir Gnóthach",
+ "Share your public space": "Roinn do spás poiblí",
+ "Invite to %(spaceName)s": "Tabhair cuireadh chun %(spaceName)s",
+ "Unnamed room": "Seomra gan ainm",
+ "Command error": "Earráid ordaithe",
+ "Server error": "Earráid freastalaí",
+ "Upload file": "Uaslódáil comhad",
+ "Video call": "Físghlao",
+ "Voice call": "Glao gutha",
+ "Admin Tools": "Uirlisí Riaracháin",
+ "Demote yourself?": "Tabhair ísliú céime duit féin?",
+ "Enable encryption?": "Cumasaigh criptiú?",
+ "Banned users": "Úsáideoirí toirmiscthe",
+ "Muted Users": "Úsáideoirí Fuaim",
+ "Privileged Users": "Úsáideoirí Pribhléideacha",
+ "Notify everyone": "Tabhair fógraí do gach duine",
+ "Ban users": "Toirmisc úsáideoirí",
+ "Kick users": "Caith úsáideoirí amach",
+ "Change settings": "Athraigh socruithe",
+ "Invite users": "Tabhair cuirí d'úsáideoirí",
+ "Send messages": "Seol teachtaireachtaí",
+ "Default role": "Gnáth-ról",
+ "Modify widgets": "Mionathraigh giuirléidí",
+ "Change topic": "Athraigh ábhar",
+ "Change permissions": "Athraigh ceadanna",
+ "Notification sound": "Fuaim fógra",
+ "Uploaded sound": "Fuaim uaslódáilte",
+ "URL Previews": "Réamhamhairc URL",
+ "Room Addresses": "Seoltaí Seomra",
+ "Open Devtools": "Oscail Devtools",
+ "Developer options": "Roghanna forbróra",
+ "Room version:": "Leagan seomra:",
+ "Room version": "Leagan seomra",
+ "Too Many Calls": "Barraíocht Glaonna",
+ "You cannot place VoIP calls in this browser.": "Ní féidir leat glaonna VoIP a chur sa brabhsálaí seo.",
+ "VoIP is unsupported": "Tá VoIP gan tacaíocht",
+ "No other application is using the webcam": "Níl aon fheidhmchlár eile ag úsáid an cheamara gréasáin",
+ "Permission is granted to use the webcam": "Tugtar cead an ceamara gréasáin a úsáid",
+ "A microphone and webcam are plugged in and set up correctly": "Tá micreafón agus ceamara gréasáin plugáilte isteach agus curtha ar bun i gceart",
+ "Call failed because webcam or microphone could not be accessed. Check that:": "Níor glaodh toisc nach raibh rochtain ar ceamara gréasáin nó mhicreafón. Seiceáil go:",
+ "Unable to access webcam / microphone": "Ní féidir rochtain a fháil ar ceamara gréasáin / mhicreafón",
+ "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Níor glaodh toisc nach raibh rochtain ar mhicreafón. Seiceáil go bhfuil micreafón plugáilte isteach agus curtha ar bun i gceart.",
+ "Which rooms would you like to add to this community?": "Cé na seomraí ar mhaith leat a chur leis an bpobal seo?",
+ "Invite to Community": "Tabhair cuireadh chun an pobal",
+ "Name or Matrix ID": "Ainm nó ID Matrix",
+ "Invite new community members": "Tabhair cuireadh do baill nua chun an phobail",
+ "Who would you like to add to this community?": "Cé ba mhaith leat a chur leis an bpobal seo?",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+ "Failure to create room": "Níorbh fhéidir an seomra a chruthú",
+ "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Sáraíonn an comhad '%(fileName)s' teorainn méide an freastalaí baile seo le haghaidh uaslódálacha",
+ "The server does not support the room version specified.": "Ní thacaíonn an freastalaí leis an leagan seomra a shonraítear.",
+ "Server may be unavailable, overloaded, or you hit a bug.": "D’fhéadfadh nach mbeadh an freastalaí ar fáil, ró-ualaithe, nó fuair tú fabht.",
+ "Rooms and spaces": "Seomraí agus spásanna",
+ "Collapse reply thread": "Cuir na freagraí i bhfolach",
+ "Threaded messaging": "Teachtaireachtaí i snáitheanna",
+ "Thread": "Snáithe",
+ "Show threads": "Taispeáin snáitheanna",
+ "Low priority": "Tosaíocht íseal",
+ "Start chat": "Tosaigh comhrá",
+ "Share room": "Roinn seomra",
+ "Forget room": "Déan dearmad ar an seomra",
+ "Join Room": "Téigh isteach an seomra",
+ "(~%(count)s results)|one": "(~%(count)s toradh)",
+ "(~%(count)s results)|other": "(~%(count)s torthaí)",
+ "World readable": "Inléite ag gach duine",
+ "Communities can now be made into Spaces": "Is féidir Pobail a dhéanamh ina Spásanna anois",
+ "Spaces are a new way to make a community, with new features coming.": "Is bealach nua iad spásanna chun pobal a dhéanamh, le gnéithe nua ag teacht.",
+ "Communities won't receive further updates.": "Ní bhfaighidh pobail nuashonruithe breise.",
+ "Created from <Community />": "Cruthaithe ó <Community />",
+ "No answer": "Gan freagair",
+ "Unknown failure: %(reason)s": "Teip anaithnid: %(reason)s",
+ "Low bandwidth mode (requires compatible homeserver)": "Modh bandaleithid íseal (teastaíonn freastalaí comhoiriúnach)",
+ "Enable encryption in settings.": "Tosaigh criptiú sna socruithe.",
+ "Cross-signing is ready but keys are not backed up.": "Tá tras-sínigh réidh ach ní dhéantar cóip chúltaca d'eochracha.",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "",
+ "You can create a Space from this community <a>here</a>.": "",
+ "Bans user with given id": "Toirmisc úsáideoir leis an ID áirithe",
+ "Failed to reject invitation": "Níorbh fhéidir an cuireadh a dhiúltú",
+ "Failed to reject invite": "Níorbh fhéidir an cuireadh a dhiúltú",
+ "Failed to mute user": "Níor ciúnaíodh an úsáideoir",
+ "Failed to load timeline position": "Níor lódáladh áit amlíne",
+ "Failed to kick": "Níor caitheadh amach é",
+ "Failed to forget room %(errCode)s": "Níor dhearnadh dearmad ar an seomra %(errCode)s",
+ "Failed to join room": "Níor éiríodh le dul isteach an seomra",
+ "Failed to change power level": "Níor éiríodh leis an leibhéal cumhachta a hathrú",
+ "Failed to change password. Is your password correct?": "Níor éiríodh leis do phasfhocal a hathrú. An bhfuil do phasfhocal ceart?",
+ "Failed to ban user": "Níor éiríodh leis an úsáideoir a thoirmeasc",
+ "Export E2E room keys": "Easpórtáil eochracha an tseomra le criptiú ó dheireadh go deireadh",
+ "Error decrypting attachment": "Earráid le ceangaltán a dhíchriptiú",
+ "Enter passphrase": "Iontráil pasfrása",
+ "Email address": "Seoladh ríomhphoist",
+ "Download %(text)s": "Íoslódáil %(text)s",
+ "Deops user with given id": "Bain an cumhacht oibritheora ó úsáideoir leis an ID áirithe",
+ "Decrypt %(text)s": "Díchriptigh %(text)s",
+ "Custom level": "Leibhéal saincheaptha",
+ "Create Room": "Déan Seomra",
+ "Changes your display nickname": "Athraíonn sé d'ainm taispeána",
+ "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "D'athraigh %(senderDisplayName)s an ábhar go \"%(topic)s\".",
+ "%(senderDisplayName)s removed the room name.": "Bhain %(senderDisplayName)s ainm an tseomra.",
+ "%(senderDisplayName)s changed the room name to %(roomName)s.": "D'athraigh %(senderDisplayName)s ainm an tseomra go %(roomName)s.",
+ "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "D'athraigh %(senderName)s an leibhéal cumhachta %(powerLevelDiffText)s.",
+ "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Ní féidir ceangal leis an bhfreastalaí baile trí HTTP nuair a bhíonn URL HTTPS i mbarra do bhrabhsálaí. Bain úsáid as HTTPS nó <a> scripteanna neamhshábháilte a chumasú </a>.",
+ "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ní féidir ceangal leis an bhfreastalaí baile - seiceáil do nascacht le do thoil, déan cinnte go bhfuil muinín i dteastas <a>SSL do fhreastalaí baile</a>, agus nach bhfuil síneadh brabhsálaí ag cur bac ar iarratais."
}
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 90c120abb1..6d08bcb266 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -3645,5 +3645,62 @@
"Stop sharing your screen": "Deixar de compartir a pantalla",
"Stop the camera": "Pechar a cámara",
"Start the camera": "Abrir a cámara",
- "Surround selected text when typing special characters": "Rodea o texto seleccionado ao escribir caracteres especiais"
+ "Surround selected text when typing special characters": "Rodea o texto seleccionado ao escribir caracteres especiais",
+ "Delete avatar": "Eliminar avatar",
+ "Don't send read receipts": "Non enviar confirmación de lectura",
+ "Flair won't be available in Spaces for the foreseeable future.": "Non agardamos que Aura esté dispoñible en Espazos no futuro.",
+ "Created from <Community />": "Creado desde <Community />",
+ "Communities won't receive further updates.": "As Comunidades non van recibir máis actualizacións.",
+ "Spaces are a new way to make a community, with new features coming.": "Os Espazos son un novo xeito de crear comunidade, con novas características por chegar.",
+ "Communities can now be made into Spaces": "Xa podes convertir as Comunidades en Espazos",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Pídelle á <a>administración</a> da comunidade que a converta nun Espazo e agarda polo convite.",
+ "You can create a Space from this community <a>here</a>.": "Podes crear <a>aquí</a> un Espazo a partir desta comunidade.",
+ "This description will be shown to people when they view your space": "Esta descrición váiselle mostrar ás persoas que vexan o teu espazo",
+ "All rooms will be added and all community members will be invited.": "Vanse engadir tódalas salas e tódolos membros da comunidade serán convidados.",
+ "A link to the Space will be put in your community description.": "Vaise pór unha ligazón ao Espazo na descrición da comunidade.",
+ "Create Space from community": "Crear Esapazo desde a comunidade",
+ "Failed to migrate community": "Fallou a migración da comunidade",
+ "To create a Space from another community, just pick the community in Preferences.": "Para crear un Espazo desde outra comunidade, só tes que elexir a comunidade nas Preferencias.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> foi creado e calquera que fose parte da comunidade foi convidada a el.",
+ "Space created": "Espazo creado",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Para ver Espazos, agocha as comunidades en <a>Preferencias</a>",
+ "This community has been upgraded into a Space": "Esta comunidade foi convertida a un Espazo",
+ "If a community isn't shown you may not have permission to convert it.": "Se unha comunidade non aparece pode que non teñas permiso para convertila.",
+ "Show my Communities": "Mostrar as miñas Comunidades",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "As Comunidades foron arquivadas para facerlle sitio a Espazos pero podes convertir as túas comunidades en Espazos. Ao convertilas permites que as túas conversas teñan as últimas ferramentas.",
+ "Create Space": "Crear Espazo",
+ "Open Space": "Abrir Espazo",
+ "To join an existing space you'll need an invite.": "Para unirte a un espazo existente precisas un convite.",
+ "You can also create a Space from a <a>community</a>.": "Tamén podes crear un Espazo a partir dunha <a>comunidade</a>.",
+ "You can change this later.": "Esto poderalo cambiar máis tarde.",
+ "What kind of Space do you want to create?": "Que tipo de Espazo queres crear?",
+ "Unknown failure: %(reason)s": "Fallo descoñecido: %(reason)s",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Os rexistros de depuración conteñen datos de uso da aplicación incluíndo o teu nome de usuaria, IDs ou alias das salas e grupos que visitaches, os últimos elementos da interface cos que interactuaches así como nomes de usuaria de outras usuarias. Non conteñen mensaxes.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se informaches dun fallo en GitHub, os rexistros de depuración poden axudarnos a solucionar o problema. Estos rexistros conteñen datos de uso da aplicación incluíndo o nome de usuaria, IDs ou alias das salas ou grupos que visitaches, os últimos elementos da interface cos que interactuaches así como nomes de usuaria de outras usuarias. Non conteñen mensaxes.",
+ "Rooms and spaces": "Salas e espazos",
+ "Results": "Resultados",
+ "Enable encryption in settings.": "Activar cifrado non axustes.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "As túas mensaxes privadas normalmente están cifradas, pero esta sala non o está. Normalmente esto é debido a que estás a usar un dispositivo ou método non soportados, como convites por email.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Par evitar estos problemas, crea unha <a>nova sala pública</a> para a conversa que pretendes manter.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non se recomenda converter salas cifradas en salas públicas.</b> Significará que calquera pode atopar e unirse á sala, e calquera poderá ler as mensaxes. Non terás ningún dos beneficios do cifrado. Cifrar mensaxes nunha sala pública fará máis lenta a entrega e recepción das mensaxes.",
+ "Are you sure you want to make this encrypted room public?": "Tes a certeza de querer convertir en pública esta sala cifrada?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Para evitar estos problemas, crea unha <a>nova sala cifrada</a> para a conversa que pretendes manter.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non se recomenda engadir cifrado a salas públicas.</b> Calquera pode atopar e unirse a salas públicas, polo que tamén ler as mensaxes. Non vas ter ningún dos beneficios do cifrado, e máis tarde non poderás desactivalo. Cifrar as mensaxes nunha sala pública tamén fará máis lenta a entrega e recepción das mensaxes.",
+ "Are you sure you want to add encryption to this public room?": "Tes a certeza de querer engadir cifrado a esta sala pública?",
+ "Cross-signing is ready but keys are not backed up.": "A sinatura-cruzada está preparada pero non hai copia das chaves.",
+ "Low bandwidth mode (requires compatible homeserver)": "Modo de ancho de banda limitado (require servidor de inicio compatible)",
+ "Multiple integration managers (requires manual setup)": "Varios xestores de integración (require configuración manual)",
+ "Thread": "Tema",
+ "Show threads": "Mostrar temas",
+ "Currently, %(count)s spaces have access|one": "Actualmente, un espazo ten acceso",
+ "& %(count)s more|one": "e %(count)s máis",
+ "Autoplay GIFs": "Reprod. automática GIFs",
+ "Autoplay videos": "Reprod. automática vídeo",
+ "Threaded messaging": "Mensaxes fiadas",
+ "The above, but in <Room /> as well": "O de arriba, pero tamén en <Room />",
+ "The above, but in any room you are joined or invited to as well": "O de enriba, pero en calquera sala á que te uniches ou foches convidada",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s desafixou unha mensaxe desta sala. Mira tódalas mensaxes fixadas.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s deafixou <a>unha mensaxe</a> desta sala. Mira tódalas <b>mensaxes fixadas</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fixou unha mensaxe nesta sala. Mira tódalas mensaxes fixadas.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fixou <a>unha mensaxe</a> nesta sala. Mira tódalas <b>mensaxes fixadas</b>."
}
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index a616d0cc23..df48f631cf 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -3444,7 +3444,7 @@
"Move down": "Mozgatás le",
"Move up": "Mozgatás fel",
"Report": "Jelentés",
- "Collapse reply thread": "Beszélgetés szál becsukása",
+ "Collapse reply thread": "Üzenetszál becsukása",
"Show preview": "Előnézet megjelenítése",
"View source": "Forrás megtekintése",
"Forward": "Továbbítás",
@@ -3638,5 +3638,63 @@
"Stop sharing your screen": "Képernyőmegosztás kikapcsolása",
"Stop the camera": "Kamera kikapcsolása",
"Start the camera": "Kamera bekapcsolása",
- "Surround selected text when typing special characters": "Kijelölt szöveg körülvétele speciális karakterek beírásakor"
+ "Surround selected text when typing special characters": "Kijelölt szöveg körülvétele speciális karakterek beírásakor",
+ "Don't send read receipts": "Ne küldjön olvasási visszajelzést",
+ "Created from <Community />": "<Community /> közösségből készült",
+ "Communities won't receive further updates.": "A közösségek nem kapnak több fejlesztést.",
+ "Spaces are a new way to make a community, with new features coming.": "Terek az út a közösségek számára, további új lehetőségekkel hamarosan.",
+ "Communities can now be made into Spaces": "Közösségeket Terekké lehet alakítani",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Kérje meg a közösség <a>adminisztrátorát</a>, hogy változtassa Térré és figyelje a meghívót.",
+ "You can create a Space from this community <a>here</a>.": "A közösségből Teret <a>itt</a> csinálhat.",
+ "This description will be shown to people when they view your space": "Ezt a leírást látják majd azok az emberek akik benéznek a Térre",
+ "Flair won't be available in Spaces for the foreseeable future.": "A kitűzők egy jó ideig nem lesznek elérhetők még a Terekben.",
+ "All rooms will be added and all community members will be invited.": "Minden szoba hozzá lesz adva és minden közösségi tag meg lesz hívva.",
+ "A link to the Space will be put in your community description.": "A hivatkozás a Térre bekerül a közössége leírásába.",
+ "Create Space from community": "Tér létrehozása közösségből",
+ "Failed to migrate community": "Közösség migrálása sikertelen",
+ "To create a Space from another community, just pick the community in Preferences.": "Közösségből új Tér készítéséhez csak válasszon egy közösséget a Beállításokból.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> létrehozva mindenki aki a közösség tagja volt meg lett hívva ide.",
+ "Space created": "Tér létrehozva",
+ "To view Spaces, hide communities in <a>Preferences</a>": "A Terek megjelenítéséhez rejtse el a közösségeket a <a>Beállításokban</a>",
+ "This community has been upgraded into a Space": "Ez a közösség Térré lett formálva",
+ "Unknown failure: %(reason)s": "Ismeretlen hiba: %(reason)s",
+ "No answer": "Nincs válasz",
+ "If a community isn't shown you may not have permission to convert it.": "Ha egy közösség nem jelenik meg valószínűleg nincs joga átformálni azt.",
+ "Show my Communities": "Közösségeim megjelenítése",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "A közösségek archiválásra kerültek, hogy helyet adjanak a Tereknek de a közösségeket Terekké lehet formálni alább. Az átformálással a beszélgetések megkapják a legújabb lehetőségeket.",
+ "Create Space": "Tér készítése",
+ "Open Space": "Nyilvános tér",
+ "To join an existing space you'll need an invite.": "Létező térbe való belépéshez meghívó szükséges.",
+ "You can also create a Space from a <a>community</a>.": "<a>Közösségből</a> is lehet Teret készíteni.",
+ "You can change this later.": "Ezt később meg lehet változtatni.",
+ "What kind of Space do you want to create?": "Milyen típusú teret szeretne készíteni?",
+ "Delete avatar": "Profilkép törlése",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "A hibakereső napló alkalmazás használati adatokat tartalmaz beleértve a felhasználói nevedet, az általad meglátogatott szobák és csoportok azonosítóit alternatív neveit, az utolsó felhasználói felület elemét amit használt és más felhasználói neveket. Csevegés üzenetek szövegét nem tartalmazza.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét, az utolsó felhasználói felület elemét amit használt és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
+ "Are you sure you want to add encryption to this public room?": "Biztos, hogy titkosítást állít be ehhez a nyilvános szobához?",
+ "Cross-signing is ready but keys are not backed up.": "Eszközök közötti hitelesítés megvan de a kulcsokhoz nincs biztonsági mentés.",
+ "Rooms and spaces": "Szobák és terek",
+ "Results": "Eredmények",
+ "Enable encryption in settings.": "Titkosítás bekapcsolása a beállításokban.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "A privát üzenetek általában titkosítottak de ez a szoba nem az. Általában ez a titkosítást nem támogató eszköz vagy metódus használata miatt lehet, mint az e-mail meghívók.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Az ehhez hasonló problémák elkerüléséhez készítsen <a>új nyilvános szobát</a> a tervezett beszélgetésekhez.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Titkosított szobát nem célszerű nyilvánossá tenni.</b> Bárki megtalálhatja és csatlakozhat nyilvános szobákhoz, így bárki elolvashatja az üzeneteket bennük. A titkosítás előnyeit így nem jelentkeznek és később ezt nem lehet kikapcsolni. Nyilvános szobákban a titkosított üzenetek az üzenetküldést és fogadást csak lassítják.",
+ "Are you sure you want to make this encrypted room public?": "Biztos, hogy nyilvánossá teszi ezt a titkosított szobát?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Az ehhez hasonló problémák elkerüléséhez készítsen <a>új titkosított szobát</a> a tervezett beszélgetésekhez.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nyilvános szobához nem javasolt a titkosítás beállítása.</b>Bárki megtalálhatja és csatlakozhat nyilvános szobákhoz, így bárki elolvashatja az üzeneteket bennük. A titkosítás előnyeit így nem jelentkeznek és később ezt nem lehet kikapcsolni. Nyilvános szobákban a titkosított üzenetek az üzenetküldést és fogadást csak lassítják.",
+ "Low bandwidth mode (requires compatible homeserver)": "Alacsony sávszélesség mód (kompatibilis matrix szervert igényel)",
+ "Multiple integration managers (requires manual setup)": "Több integrációs menedzser (kézi beállítást igényel)",
+ "Autoplay videos": "Videók automatikus lejátszása",
+ "Autoplay GIFs": "GIF-ek automatikus lejátszása",
+ "The above, but in <Room /> as well": "A felül lévő, de ebben a szobában is: <Room />",
+ "Show threads": "Üzenetszálak megjelenítése",
+ "Threaded messaging": "Üzenetszálas beszélgetés",
+ "The above, but in any room you are joined or invited to as well": "Ami felette van, de minden szobában amibe belépett vagy meghívták",
+ "Thread": "Üzenetszál",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s levett egy kitűzött üzenetet ebből a szobában. Minden kitűzött üzenet megjelenítése.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s levett egy kitűzött <a>üzenetet</a> ebből a szobában. Minden <b>kitűzött üzenet</b> megjelenítése.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s kitűzött egy üzenetet ebben a szobában. Minden kitűzött üzenet megjelenítése.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s kitűzött <a>egy üzenetet</a> ebben a szobában. Minden <b>kitűzött üzenet</b> megjelenítése.",
+ "Currently, %(count)s spaces have access|one": "Jelenleg a Térnek hozzáférése van",
+ "& %(count)s more|one": "és még %(count)s"
}
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 8d15449973..1ea18cd5ac 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -3644,5 +3644,54 @@
"Stop sharing your screen": "Ferma la condivisione dello schermo",
"Stop the camera": "Ferma la fotocamera",
"Start the camera": "Avvia la fotocamera",
- "Surround selected text when typing special characters": "Circonda il testo selezionato quando si digitano caratteri speciali"
+ "Surround selected text when typing special characters": "Circonda il testo selezionato quando si digitano caratteri speciali",
+ "Created from <Community />": "Creato da <Community />",
+ "Communities won't receive further updates.": "Le comunità non riceveranno altri aggiornamenti.",
+ "Spaces are a new way to make a community, with new features coming.": "Gli spazi sono un nuovo modo di creare una comunità, con nuove funzioni in arrivo.",
+ "Communities can now be made into Spaces": "Le comunità ora possono diventare spazi",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Chiedi agli <a>amministratori</a> di questa comunità di renderla uno spazio e di tenere d'occhio l'invito.",
+ "You can create a Space from this community <a>here</a>.": "Puoi creare uno spazio da questa comunità <a>qui</a>.",
+ "This description will be shown to people when they view your space": "Questa descrizione verrà mostrata alle persone quando vedono il tuo spazio",
+ "Flair won't be available in Spaces for the foreseeable future.": "Le predisposizioni non saranno disponibili negli spazi per l'immediato futuro.",
+ "All rooms will be added and all community members will be invited.": "Tutte le stanze verranno aggiunte e tutti i membri della comunità saranno invitati.",
+ "A link to the Space will be put in your community description.": "Un collegamento allo spazio verrà inserito nella descrizione della tua comunità.",
+ "Create Space from community": "Crea spazio da comunità",
+ "Failed to migrate community": "Migrazione delle comunità fallita",
+ "To create a Space from another community, just pick the community in Preferences.": "Per creare uno spazio da un'altra comunità, scegli la comunità nelle preferenze.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> è stato creato e chiunque facesse parte della comunità è stato invitato.",
+ "Space created": "Spazio creato",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Per vedere gli spazi, nascondi le comunità nelle <a>preferenze</a>",
+ "This community has been upgraded into a Space": "La comunità è stata aggiornata in uno spazio",
+ "Unknown failure: %(reason)s": "Malfunzionamento sconosciuto: %(reason)s",
+ "If a community isn't shown you may not have permission to convert it.": "Se una comunità non è mostrata, potresti non avere il permesso di convertirla.",
+ "Show my Communities": "Mostra le mie comunità",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Le comunità sono state archiviate per introdurre gli spazi, ma puoi convertirle in spazi qua sotto. La conversione assicurerà che le tue conversazioni otterranno le funzionalità più recenti.",
+ "Create Space": "Crea spazio",
+ "Open Space": "Apri spazio",
+ "To join an existing space you'll need an invite.": "Per entrare in uno spazio esistente ti serve un invito.",
+ "You can also create a Space from a <a>community</a>.": "Puoi anche creare uno spazio da una <a>comunità</a>.",
+ "You can change this later.": "Puoi cambiarlo in seguito.",
+ "What kind of Space do you want to create?": "Che tipo di spazio vuoi creare?",
+ "Delete avatar": "Elimina avatar",
+ "Don't send read receipts": "Non inviare ricevute di lettura",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati, gli ultimi elementi dell'interfaccia con cui hai interagito e i nomi degli altri utenti. Non contengono messaggi.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se hai segnalato un errore via Github, i log di debug possono aiutarci a identificare il problema. I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati, gli ultimi elementi dell'interfaccia con cui hai interagito e i nomi degli altri utenti. Non contengono messaggi.",
+ "Enable encryption in settings.": "Attiva la crittografia nelle impostazioni.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "I tuoi messaggi privati normalmente sono cifrati, ma questa stanza non lo è. Di solito ciò è dovuto ad un dispositivo non supportato o dal metodo usato, come gli inviti per email.",
+ "Cross-signing is ready but keys are not backed up.": "La firma incrociata è pronta ma c'è un backup delle chiavi.",
+ "Rooms and spaces": "Stanze e spazi",
+ "Results": "Risultati",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Per evitare questi problemi, crea una <a>nuova stanza pubblica</a> per la conversazione che vuoi avere.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non è consigliabile rendere pubbliche le stanze cifrate.</b> Se lo fai, chiunque potrà trovare ed entrare nella stanza, quindi chiunque potrà leggere i messaggi. Non avrai alcun beneficio dalla crittografia. Cifrare i messaggi in una stanza pubblica renderà più lenti l'invio e la ricezione dei messaggi.",
+ "Are you sure you want to make this encrypted room public?": "Vuoi veramente rendere pubblica questa stanza cifrata?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Per evitare questi problemi, crea una <a>nuova stanza cifrata</a> per la conversazione che vuoi avere.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non è consigliabile aggiungere la crittografia alle stanze pubbliche.</b>Chiunque può trovare ed entrare in stanze pubbliche, quindi chiunque può leggere i messaggi. Non avrai alcun beneficio dalla crittografia e non potrai disattivarla in seguito. Cifrare i messaggi in una stanza pubblica renderà più lenti l'invio e la ricezione dei messaggi.",
+ "Are you sure you want to add encryption to this public room?": "Vuoi veramente aggiungere la crittografia a questa stanza pubblica?",
+ "Low bandwidth mode (requires compatible homeserver)": "Modalità a connessione lenta (richiede un homeserver compatibile)",
+ "Multiple integration managers (requires manual setup)": "Gestori di integrazione multipli (richiede configurazione manuale)",
+ "Thread": "Argomento",
+ "Show threads": "Mostra argomenti",
+ "Threaded messaging": "Messaggi raggruppati",
+ "The above, but in any room you are joined or invited to as well": "Quanto sopra, ma anche in qualsiasi stanza tu sia entrato o invitato",
+ "The above, but in <Room /> as well": "Quanto sopra, ma anche in <Room />"
}
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 14295b0532..3ce4a121d2 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -23,9 +23,9 @@
"New Password": "新しいパスワード",
"Failed to change password. Is your password correct?": "パスワード変更に失敗しました。パスワードは正しいですか?",
"Only people who have been invited": "この部屋に招待された人のみ参加可能",
- "Always show message timestamps": "発言時刻を常に表示",
+ "Always show message timestamps": "発言時刻を常に表示する",
"Filter room members": "部屋メンバーを検索",
- "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
+ "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を 12 時間形式で表示する (例: 2:30午後)",
"Upload avatar": "アイコン画像を変更",
"Upload file": "ファイルのアップロード",
"%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)sはアプリケーションを改善するために匿名の分析情報を収集しています。",
@@ -320,11 +320,11 @@
"(no answer)": "(応答なし)",
"(unknown failure: %(reason)s)": "(不明なエラー: %(reason)s)",
"%(senderName)s ended the call.": "%(senderName)s が通話を終了しました。",
- "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s は部屋に加わるよう %(targetDisplayName)s に招待状を送りました。",
- "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s が、部屋のメンバー全員に招待された時点からの部屋履歴を参照できるようにしました。",
- "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s が、部屋のメンバー全員に参加した時点からの部屋履歴を参照できるようにしました。",
- "%(senderName)s made future room history visible to all room members.": "%(senderName)s が、部屋のメンバー全員に部屋履歴を参照できるようにしました。",
- "%(senderName)s made future room history visible to anyone.": "%(senderName)s が、部屋履歴を誰でも参照できるようにしました。",
+ "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s が %(targetDisplayName)s をこの部屋に招待しました。",
+ "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「メンバーのみ (招待された時点以降)」閲覧できるようにしました。",
+ "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「メンバーのみ (参加した時点以降)」閲覧できるようにしました。",
+ "%(senderName)s made future room history visible to all room members.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「メンバーのみ」閲覧できるようにしました。",
+ "%(senderName)s made future room history visible to anyone.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「誰でも」閲覧できるようにしました。",
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s が、見知らぬ (%(visibility)s) に部屋履歴を参照できるようにしました。",
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s は %(fromPowerLevel)s から %(toPowerLevel)s",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s が %(powerLevelDiffText)s の権限レベルを変更しました。",
@@ -479,8 +479,8 @@
"Publish this room to the public in %(domain)s's room directory?": "%(domain)s のルームディレクトリにこの部屋を公開しますか？",
"Who can read history?": "誰が履歴を読むことができますか？",
"Members only (since the point in time of selecting this option)": "メンバーのみ (このオプションを選択した時点以降)",
- "Members only (since they were invited)": "メンバーのみ (招待されて以来)",
- "Members only (since they joined)": "メンバーのみ (参加して以来)",
+ "Members only (since they were invited)": "メンバーのみ (招待された時点以降)",
+ "Members only (since they joined)": "メンバーのみ (参加した時点以降)",
"Permissions": "アクセス許可",
"Advanced": "詳細",
"Add a topic": "トピックを追加",
@@ -1304,8 +1304,8 @@
"Prompt before sending invites to potentially invalid matrix IDs": "不正な可能性のある Matrix ID に招待を送るまえに確認を表示",
"Order rooms by name": "名前順で部屋を整列",
"Show rooms with unread notifications first": "未読通知のある部屋をトップに表示",
- "Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示",
- "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示",
+ "Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示する",
+ "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示する",
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "あなたのアカウントではクロス署名の認証情報がシークレットストレージに保存されていますが、このセッションでは信頼されていません。",
"This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "このセッションでは<b>キーをバックアップしていません</b>。ですが、あなたは復元に使用したり今後キーを追加したりできるバックアップを持っています。",
"Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "このセッションのみにあるキーを失なわないために、セッションをキーバックアップに接続しましょう。",
@@ -1820,7 +1820,7 @@
"Send general files as you in this room": "あなたとしてファイルを部屋に送る",
"See videos posted to this room": "部屋に送られた動画を見る",
"See videos posted to your active room": "アクティブな部屋に送られた動画を見る",
- "Send videos as you in your active room": "あなたとしてアクティブな部屋に画像を送る",
+ "Send videos as you in your active room": "あなたとしてアクティブな部屋に動画を送る",
"Send videos as you in this room": "あなたとして部屋に動画を送る",
"See images posted to your active room": "アクティブな部屋に送られた画像を見る",
"See images posted to this room": "部屋に送られた画像を見る",
@@ -1887,7 +1887,7 @@
"%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s は部屋の禁止ルール %(glob)s を削除しました",
"%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s はユーザー禁止ルール %(glob)s を削除しました",
"%(senderName)s has updated the widget layout": "%(senderName)s はウィジェットのレイアウトを更新しました",
- "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s は部屋 %(targetDisplayName)s への招待を取り消しました。",
+ "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s が %(targetDisplayName)s への招待を取り消しました。",
"%(senderName)s declined the call.": "%(senderName)s は通話を拒否しました。",
"(an error occurred)": "(エラーが発生しました)",
"(their device couldn't start the camera / microphone)": "(彼らのデバイスはカメラ/マイクを使用できませんでした)",
@@ -2518,5 +2518,29 @@
"Saving...": "保存しています…",
"Failed to save space settings.": "スペースの設定を保存できませんでした。",
"Transfer Failed": "転送に失敗しました",
- "Unable to transfer call": "通話が転送できませんでした"
+ "Unable to transfer call": "通話が転送できませんでした",
+ "All rooms you're in will appear in Home.": "ホームに、あなたが参加しているすべての部屋が表示されます。",
+ "Show all rooms in Home": "ホームにすべての部屋を表示する",
+ "Images, GIFs and videos": "画像・GIF・動画",
+ "Displaying time": "表示時刻",
+ "Use Command + F to search timeline": "Command + F でタイムラインを検索する",
+ "Use Ctrl + F to search timeline": "Ctrl + F でタイムラインを検索する",
+ "To view all keyboard shortcuts, click here.": "ここをクリックすると、すべてのキーボードショートカットを確認できます。",
+ "Keyboard shortcuts": "キーボードショートカット",
+ "Messages containing keywords": "指定のキーワードを含むメッセージ",
+ "Mentions & keywords": "メンションとキーワード",
+ "Global": "グローバル",
+ "New keyword": "新しいキーワード",
+ "Keyword": "キーワード",
+ "Enable for this account": "このアカウントで有効にする",
+ "%(targetName)s joined the room": "%(targetName)s がこの部屋に参加しました",
+ "Anyone can find and join.": "誰でも検索・参加できます。",
+ "Anyone in %(spaceName)s can find and join. You can select other spaces too.": "%(spaceName)s のメンバーが検索・参加できます。他のスペースも選択可能です。",
+ "Anyone in a space can find and join. You can select multiple spaces.": "スペースのメンバーが検索・参加できます。複数のスペースも選択可能です。",
+ "Space members": "スペースのメンバー",
+ "Upgrade required": "アップグレードが必要",
+ "Only invited people can join.": "招待された人のみ参加できます。",
+ "Private (invite only)": "プライベート (招待者のみ)",
+ "Decide who can join %(roomName)s.": "%(roomName)s に参加できる人を設定します。",
+ "%(senderName)s invited %(targetName)s": "%(senderName)s が %(targetName)s を招待しました"
}
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1dc7cd04f4..573ed6922a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -21,8 +21,8 @@
"Autoplay GIFs and videos": "GIF’s en video’s automatisch afspelen",
"%(senderName)s banned %(targetName)s.": "%(senderName)s heeft %(targetName)s verbannen.",
"Ban": "Verbannen",
- "Banned users": "Verbannen gebruikers",
- "Bans user with given id": "Verbant de gebruiker met de gegeven ID",
+ "Banned users": "Verbannen personen",
+ "Bans user with given id": "Verbant de persoon met de gegeven ID",
"Call Timeout": "Oproeptime-out",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan geen verbinding maken met de homeserver via HTTP wanneer er een HTTPS-URL in uw browserbalk staat. Gebruik HTTPS of <a>schakel onveilige scripts in</a>.",
"Change Password": "Wachtwoord veranderen",
@@ -83,14 +83,14 @@
"No display name": "Geen weergavenaam",
"No more results": "Geen resultaten meer",
"No results": "Geen resultaten",
- "No users have specific privileges in this room": "Geen enkele gebruiker heeft specifieke bevoegdheden in dit gesprek",
+ "No users have specific privileges in this room": "Geen enkele persoon heeft specifieke bevoegdheden in deze kamer",
"olm version:": "olm-versie:",
"Password": "Wachtwoord",
"Passwords can't be empty": "Wachtwoorden kunnen niet leeg zijn",
"Permissions": "Rechten",
"Phone": "Telefoonnummer",
"Private Chat": "Privégesprek",
- "Privileged Users": "Bevoegde gebruikers",
+ "Privileged Users": "Bevoegde personen",
"Profile": "Profiel",
"Public Chat": "Openbaar gesprek",
"Reason": "Reden",
@@ -140,7 +140,7 @@
"Email address": "E-mailadres",
"Custom": "Aangepast",
"Custom level": "Aangepast niveau",
- "Deops user with given id": "Ontmachtigt gebruiker met de gegeven ID",
+ "Deops user with given id": "Ontmachtigt persoon met de gegeven ID",
"Default": "Standaard",
"Displays action": "Toont actie",
"Emoji": "Emoji",
@@ -151,13 +151,13 @@
"Existing Call": "Bestaande oproep",
"Export": "Wegschrijven",
"Export E2E room keys": "E2E-gesprekssleutels exporteren",
- "Failed to ban user": "Verbannen van gebruiker is mislukt",
+ "Failed to ban user": "Verbannen van persoon is mislukt",
"Failed to change power level": "Wijzigen van machtsniveau is mislukt",
"Failed to fetch avatar URL": "Ophalen van avatar-URL is mislukt",
"Failed to join room": "Toetreden tot gesprek is mislukt",
"Failed to leave room": "Verlaten van gesprek is mislukt",
"Failed to load timeline position": "Laden van tijdslijnpositie is mislukt",
- "Failed to mute user": "Dempen van gebruiker is mislukt",
+ "Failed to mute user": "Dempen van persoon is mislukt",
"Failed to reject invite": "Weigeren van uitnodiging is mislukt",
"Failed to reject invitation": "Weigeren van uitnodiging is mislukt",
"Failed to send email": "Versturen van e-mail is mislukt",
@@ -185,7 +185,7 @@
"Incoming call from %(name)s": "Inkomende oproep van %(name)s",
"Incoming video call from %(name)s": "Inkomende video-oproep van %(name)s",
"Incoming voice call from %(name)s": "Inkomende spraakoproep van %(name)s",
- "Incorrect username and/or password.": "Onjuiste gebruikersnaam en/of wachtwoord.",
+ "Incorrect username and/or password.": "Onjuiste inlognaam en/of wachtwoord.",
"Incorrect verification code": "Onjuiste verificatiecode",
"Invalid Email Address": "Ongeldig e-mailadres",
"Invalid file%(extra)s": "Ongeldig bestand %(extra)s",
@@ -230,7 +230,7 @@
"Room Colour": "Gesprekskleur",
"%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
"%(roomName)s is not accessible at this time.": "%(roomName)s is op dit moment niet toegankelijk.",
- "Rooms": "Gesprekken",
+ "Rooms": "Kamers",
"Save": "Opslaan",
"Search failed": "Zoeken mislukt",
"Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
@@ -288,7 +288,7 @@
"Usage": "Gebruik",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
"Username invalid: %(errMessage)s": "Ongeldige gebruikersnaam: %(errMessage)s",
- "Users": "Gebruikers",
+ "Users": "Personen",
"Verification Pending": "Verificatie in afwachting",
"Verified key": "Geverifieerde sleutel",
"Video call": "Video-oproep",
@@ -311,12 +311,12 @@
"You have <a>enabled</a> URL previews by default.": "U heeft URL-voorvertoningen standaard <a>ingeschakeld</a>.",
"You have no visible notifications": "U heeft geen zichtbare meldingen",
"You must <a>register</a> to use this functionality": "U dient u te <a>registreren</a> om deze functie te gebruiken",
- "You need to be able to invite users to do that.": "Dit vereist de bevoegdheid gebruikers uit te nodigen.",
+ "You need to be able to invite users to do that.": "Dit vereist de bevoegdheid om personen uit te nodigen.",
"You need to be logged in.": "Hiervoor dient u ingelogd te zijn.",
"Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zo te zien is uw e-mailadres op deze homeserver niet aan een Matrix-ID gekoppeld.",
"You seem to be in a call, are you sure you want to quit?": "Het ziet er naar uit dat u in gesprek bent, weet u zeker dat u wilt afsluiten?",
"You seem to be uploading files, are you sure you want to quit?": "Het ziet er naar uit dat u bestanden aan het uploaden bent, weet u zeker dat u wilt afsluiten?",
- "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U zult deze veranderingen niet terug kunnen draaien, daar u de gebruiker tot uw eigen niveau promoveert.",
+ "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U zult deze veranderingen niet terug kunnen draaien, omdat u de persoon tot uw eigen machtsniveau promoveert.",
"This server does not support authentication with a phone number.": "Deze server biedt geen ondersteuning voor authenticatie met een telefoonnummer.",
"An error occurred: %(error_string)s": "Er is een fout opgetreden: %(error_string)s",
"There are no visible files in this room": "Er zijn geen zichtbare bestanden in dit gesprek",
@@ -338,7 +338,7 @@
"Confirm passphrase": "Wachtwoord bevestigen",
"Import room keys": "Gesprekssleutels inlezen",
"File to import": "In te lezen bestand",
- "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Hiermee kunt u de sleutels van uw ontvangen berichten in versleutelde gesprekken naar een lokaal bestand wegschrijven. Als u dat bestand dan in een andere Matrix-cliënt inleest kan die ook die berichten ontcijferen.",
+ "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Hiermee kunt u de sleutels van uw ontvangen berichten in versleutelde kamers naar een lokaal bestand wegschrijven. Als u dat bestand dan in een andere Matrix-cliënt inleest kan het ook die berichten ontcijferen.",
"The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Het opgeslagen bestand geeft toegang tot het lezen en schrijven van uw versleutelde berichten - ga er dus zorgvuldig mee om! Bescherm uzelf door hieronder een wachtwoord in te voeren, dat dan gebruikt zal worden om het bestand te versleutelen. Het is dan alleen mogelijk de gegevens te lezen met hetzelfde wachtwoord.",
"This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Hiermee kunt u vanuit een andere Matrix-cliënt weggeschreven versleutelingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
"The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het weggeschreven bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontsleutelen.",
@@ -386,7 +386,7 @@
"Do you want to set an email address?": "Wilt u een e-mailadres instellen?",
"This will allow you to reset your password and receive notifications.": "Zo kunt u een nieuw wachtwoord instellen en meldingen ontvangen.",
"Skip": "Overslaan",
- "Define the power level of a user": "Bepaal het machtsniveau van een gebruiker",
+ "Define the power level of a user": "Bepaal het machtsniveau van een persoon",
"Add a widget": "Widget toevoegen",
"Allow": "Toestaan",
"Cannot add any more widgets": "Er kunnen niet nog meer widgets toegevoegd worden",
@@ -403,8 +403,8 @@
"You do not have permission to do that in this room.": "U heeft geen rechten om dat in deze kamer te doen.",
"Example": "Voorbeeld",
"Create": "Aanmaken",
- "Featured Rooms:": "Prominente gesprekken:",
- "Featured Users:": "Prominente gebruikers:",
+ "Featured Rooms:": "Uitgelichte kamers:",
+ "Featured Users:": "Uitgelichte personen:",
"Automatically replace plain text Emoji": "Tekst automatisch vervangen door emoji",
"Failed to upload image": "Uploaden van afbeelding is mislukt",
"%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd door %(senderName)s",
@@ -413,7 +413,7 @@
"Copied!": "Gekopieerd!",
"Failed to copy": "Kopiëren mislukt",
"Unpin Message": "Bericht losmaken",
- "Add rooms to this community": "Voeg gesprekken toe aan deze gemeenschap",
+ "Add rooms to this community": "Voeg kamers toe aan deze gemeenschap",
"Call Failed": "Oproep mislukt",
"Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Let op: elke persoon die u toevoegt aan een gemeenschap zal publiek zichtbaar zijn voor iedereen die de gemeenschaps-ID kent",
"Invite new community members": "Nodig nieuwe gemeenschapsleden uit",
@@ -425,14 +425,14 @@
"Show these rooms to non-members on the community page and room list?": "Deze kamers tonen aan niet-leden op de gemeenschapspagina en openbare kamerlijst?",
"Add rooms to the community": "Voeg kamers toe aan de gemeenschap",
"Add to community": "Toevoegen aan gemeenschap",
- "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende gebruikers tot %(groupId)s is mislukt:",
- "Failed to invite users to community": "Uitnodigen van gebruikers tot de gemeenschap is mislukt",
- "Failed to invite users to %(groupId)s": "Uitnodigen van gebruikers tot %(groupId)s is mislukt",
+ "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende personen tot %(groupId)s is mislukt:",
+ "Failed to invite users to community": "Uitnodigen van personen tot de gemeenschap is mislukt",
+ "Failed to invite users to %(groupId)s": "Uitnodigen van personen tot %(groupId)s is mislukt",
"Failed to add the following rooms to %(groupId)s:": "Toevoegen van de volgende kamers aan %(groupId)s is mislukt:",
"Restricted": "Beperkte toegang",
- "Ignored user": "Genegeerde gebruiker",
+ "Ignored user": "Genegeerde persoon",
"You are now ignoring %(userId)s": "U negeert nu %(userId)s",
- "Unignored user": "Niet-genegeerde gebruiker",
+ "Unignored user": "Niet-genegeerde persoon",
"You are no longer ignoring %(userId)s": "U negeert %(userId)s niet meer",
"%(senderName)s changed the pinned messages for the room.": "%(senderName)s heeft de vastgeprikte boodschappen voor de kamer gewijzigd.",
"Send": "Versturen",
@@ -444,12 +444,12 @@
"%(senderName)s sent an image": "%(senderName)s heeft een afbeelding gestuurd",
"%(senderName)s sent a video": "%(senderName)s heeft een video gestuurd",
"%(senderName)s uploaded a file": "%(senderName)s heeft een bestand geüpload",
- "Disinvite this user?": "Uitnodiging van deze gebruiker intrekken?",
- "Kick this user?": "Deze gebruiker uit het gesprek zetten?",
- "Unban this user?": "Deze gebruiker ontbannen?",
- "Ban this user?": "Deze gebruiker verbannen?",
+ "Disinvite this user?": "Uitnodiging van deze persoon intrekken?",
+ "Kick this user?": "Deze persoon verwijderen?",
+ "Unban this user?": "Deze persoon ontbannen?",
+ "Ban this user?": "Deze persoon verbannen?",
"Mirror local video feed": "Lokale videoaanvoer ook elders opslaan (spiegelen)",
- "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Zelfdegradatie is onomkeerbaar. Als u de laatste bevoorrechte gebruiker in het gesprek bent zullen deze rechten voorgoed verloren gaan.",
+ "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Zelfdegradatie is onomkeerbaar. Als u de laatste gemachtigde persoon in de kamer bent zullen deze rechten voorgoed verloren gaan.",
"Unignore": "Niet meer negeren",
"Ignore": "Negeren",
"Jump to read receipt": "Naar het laatst gelezen bericht gaan",
@@ -471,7 +471,7 @@
"Unknown for %(duration)s": "Onbekend voor %(duration)s",
"Unknown": "Onbekend",
"Replying": "Aan het beantwoorden",
- "No rooms to show": "Geen weer te geven gesprekken",
+ "No rooms to show": "Geen kamers om weer te geven",
"Unnamed room": "Naamloos gesprek",
"World readable": "Leesbaar voor iedereen",
"Guests can join": "Gasten kunnen toetreden",
@@ -491,10 +491,10 @@
"An email has been sent to %(emailAddress)s": "Er is een e-mail naar %(emailAddress)s verstuurd",
"A text message has been sent to %(msisdn)s": "Er is een sms naar %(msisdn)s verstuurd",
"Remove from community": "Verwijderen uit gemeenschap",
- "Disinvite this user from community?": "Uitnodiging voor deze gebruiker tot de gemeenschap intrekken?",
- "Remove this user from community?": "Deze gebruiker uit de gemeenschap verwijderen?",
+ "Disinvite this user from community?": "Uitnodiging voor deze persoon tot de gemeenschap intrekken?",
+ "Remove this user from community?": "Deze persoon uit de gemeenschap verwijderen?",
"Failed to withdraw invitation": "Intrekken van uitnodiging is mislukt",
- "Failed to remove user from community": "Verwijderen van gebruiker uit gemeenschap is mislukt",
+ "Failed to remove user from community": "Verwijderen van persoon uit gemeenschap is mislukt",
"Filter community members": "Gemeenschapsleden filteren",
"Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Weet u zeker dat u ‘%(roomName)s’ uit %(groupId)s wilt verwijderen?",
"Removing a room from the community will also remove it from the community page.": "Het gesprek uit de gemeenschap verwijderen zal dit ook van de gemeenschapspagina verwijderen.",
@@ -504,9 +504,9 @@
"Visibility in Room List": "Zichtbaarheid in gesprekslijst",
"Visible to everyone": "Zichtbaar voor iedereen",
"Only visible to community members": "Alleen zichtbaar voor gemeenschapsleden",
- "Filter community rooms": "Gemeenschapsgesprekken filteren",
+ "Filter community rooms": "Gemeenschapskamers filteren",
"Something went wrong when trying to get your communities.": "Er ging iets mis bij het ophalen van uw gemeenschappen.",
- "Display your community flair in rooms configured to show it.": "Toon uw gemeenschapsbadge in gesprekken die daarvoor ingesteld zijn.",
+ "Display your community flair in rooms configured to show it.": "Toon uw gemeenschapsbadge in kamers die daarvoor ingesteld zijn.",
"You're not currently a member of any communities.": "U bent momenteel geen lid van een gemeenschap.",
"Minimize apps": "Apps minimaliseren",
"Communities": "Gemeenschappen",
@@ -552,7 +552,7 @@
"was kicked %(count)s times|one": "is uit het gesprek gezet",
"%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s hebben hun naam %(count)s keer gewijzigd",
"%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s hebben hun naam gewijzigd",
- "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)s maal van naam veranderd",
+ "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)s keer van naam veranderd",
"%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s is van naam veranderd",
"%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s hebben hun afbeelding %(count)s keer gewijzigd",
"%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s hebben hun afbeelding gewijzigd",
@@ -577,19 +577,19 @@
"Community ID": "Gemeenschaps-ID",
"example": "voorbeeld",
"<h1>HTML for your community's page</h1>\n<p>\n Use the long description to introduce new members to the community, or distribute\n some important <a href=\"foo\">links</a>\n</p>\n<p>\n You can even use 'img' tags\n</p>\n": "<h1>HTML voor uw gemeenschapspagina</h1>\n<p>\n Gebruik de lange beschrijving om nieuwe leden in de gemeenschap te introduceren of om belangrijke <a href=\"foo\">koppelingen</a> aan te bieden.\n</p>\n<p>\n U kunt zelfs ‘img’-tags gebruiken.\n</p>\n",
- "Add rooms to the community summary": "Voeg gesprekken aan het gemeenschapsoverzicht toe",
- "Which rooms would you like to add to this summary?": "Welke gesprekken zou u aan dit overzicht willen toevoegen?",
+ "Add rooms to the community summary": "Voeg kamers aan het gemeenschapsoverzicht toe",
+ "Which rooms would you like to add to this summary?": "Welke kamers zou u aan dit overzicht willen toevoegen?",
"Add to summary": "Toevoegen aan overzicht",
- "Failed to add the following rooms to the summary of %(groupId)s:": "Kon de volgende gesprekken niet aan het overzicht van %(groupId)s toevoegen:",
+ "Failed to add the following rooms to the summary of %(groupId)s:": "Kon de volgende kamers niet aan het overzicht van %(groupId)s toevoegen:",
"Add a Room": "Voeg een gesprek toe",
"Failed to remove the room from the summary of %(groupId)s": "Kon het gesprek niet uit het overzicht van %(groupId)s verwijderen",
"The room '%(roomName)s' could not be removed from the summary.": "Het gesprek ‘%(roomName)s’ kan niet uit het overzicht verwijderd worden.",
- "Add users to the community summary": "Voeg gebruikers aan het gemeenschapsoverzicht toe",
+ "Add users to the community summary": "Voeg personen aan het gemeenschapsoverzicht toe",
"Who would you like to add to this summary?": "Wie zou u aan het overzicht willen toevoegen?",
- "Failed to add the following users to the summary of %(groupId)s:": "Kon de volgende gebruikers niet aan het overzicht van %(groupId)s toevoegen:",
- "Add a User": "Voeg een gebruiker toe",
- "Failed to remove a user from the summary of %(groupId)s": "Verwijderen van gebruiker uit het overzicht van %(groupId)s is mislukt",
- "The user '%(displayName)s' could not be removed from the summary.": "De gebruiker ‘%(displayName)s’ kon niet uit het overzicht verwijderd worden.",
+ "Failed to add the following users to the summary of %(groupId)s:": "Kon de volgende personen niet aan het overzicht van %(groupId)s toevoegen:",
+ "Add a User": "Voeg een persoon toe",
+ "Failed to remove a user from the summary of %(groupId)s": "Verwijderen van persoon uit het overzicht van %(groupId)s is mislukt",
+ "The user '%(displayName)s' could not be removed from the summary.": "De persoon ‘%(displayName)s’ kon niet uit het overzicht verwijderd worden.",
"Failed to update community": "Bijwerken van gemeenschap is mislukt",
"Unable to accept invite": "Kan de uitnodiging niet aannemen",
"Unable to reject invite": "Kan de uitnodiging niet weigeren",
@@ -597,7 +597,7 @@
"Leave %(groupName)s?": "%(groupName)s verlaten?",
"Leave": "Verlaten",
"Community Settings": "Gemeenschapsinstellingen",
- "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Op de gemeenschapspagina worden deze gesprekken getoond aan gemeenschapsleden, die er dan aan kunnen deelnemen door erop te klikken.",
+ "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Op de gemeenschapspagina worden deze kamers getoond aan gemeenschapsleden, die er dan aan kunnen deelnemen door erop te klikken.",
"%(inviter)s has invited you to join this community": "%(inviter)s heeft u uitgenodigd in deze gemeenschap",
"You are an administrator of this community": "U bent een beheerder van deze gemeenschap",
"You are a member of this community": "U bent lid van deze gemeenschap",
@@ -611,7 +611,7 @@
"Your Communities": "Uw gemeenschappen",
"Error whilst fetching joined communities": "Er is een fout opgetreden bij het ophalen van de gemeenschappen waarvan u lid bent",
"Create a new community": "Maak een nieuwe gemeenschap aan",
- "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om gebruikers en gesprekken bijeen te brengen! Schep met een startpagina op maat uw eigen plaats in het Matrix-universum.",
+ "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om personen en kamers bijeen te brengen! Schep met een startpagina op maat uw eigen plaats in het Matrix-universum.",
"%(count)s of your messages have not been sent.|one": "Uw bericht is niet verstuurd.",
"%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alles nu opnieuw versturen</resendText> of <cancelText>annuleren</cancelText>. U kunt ook individuele berichten selecteren om opnieuw te versturen of te annuleren.",
"%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Bericht opnieuw versturen</resendText> of <cancelText>bericht annuleren</cancelText>.",
@@ -622,8 +622,8 @@
"An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Er is een e-mail naar %(emailAddress)s verstuurd. Klik hieronder van zodra u de koppeling erin hebt gevolgd.",
"Please note you are logging into the %(hs)s server, not matrix.org.": "Let op dat u inlogt bij de %(hs)s-server, niet matrix.org.",
"This homeserver doesn't offer any login flows which are supported by this client.": "Deze homeserver heeft geen loginmethodes die door deze cliënt worden ondersteund.",
- "Ignores a user, hiding their messages from you": "Negeert een gebruiker, waardoor de berichten ervan onzichtbaar voor u worden",
- "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een gebruiker, hierdoor worden de berichten van de gebruiker weer zichtbaar",
+ "Ignores a user, hiding their messages from you": "Negeert een persoon, waardoor de berichten ervan onzichtbaar voor u worden",
+ "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een persoon, hierdoor worden de berichten van de persoon weer zichtbaar",
"Notify the whole room": "Laat dit aan het hele groepsgesprek weten",
"Room Notification": "Groepsgespreksmelding",
"The information being sent to us to help make %(brand)s better includes:": "De informatie die naar ons wordt verstuurd om %(brand)s te verbeteren bevat:",
@@ -653,12 +653,12 @@
"Code": "Code",
"Unable to join community": "Kan niet toetreden tot de gemeenschap",
"Unable to leave community": "Kan de gemeenschap niet verlaten",
- "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Veranderingen aan uw gemeenschaps<bold1>naam</bold1> en -<bold2>afbeelding</bold2> zullen mogelijk niet gezien worden door anderen tot maximaal 30 minuten.",
+ "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Veranderingen aan uw gemeenschaps<bold1>naam</bold1> en -<bold2>afbeelding</bold2> zullen mogelijk nog niet gezien worden door anderen voor 30 minuten.",
"Join this community": "Toetreden tot deze gemeenschap",
"Who can join this community?": "Wie kan er tot deze gemeenschap toetreden?",
"Everyone": "Iedereen",
"Leave this community": "Deze gemeenschap verlaten",
- "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Voor het oplossen van, via GitHub, gemelde bugs helpen foutenlogboeken ons enorm. Deze bevatten wel uw gebruiksgegevens, maar geen berichten. Het bevat onder meer uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht en de namen van andere gebruikers.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Voor het oplossen van, via GitHub, gemelde bugs helpen foutenlogboeken ons enorm. Deze bevatten wel uw accountgegevens, maar geen berichten. Het bevat onder meer uw inlognaam, de ID’s of bijnamen van de kamers en groepen die u heeft bezocht en de namen van andere personen.",
"Submit debug logs": "Foutenlogboek versturen",
"Opens the Developer Tools dialog": "Opent het dialoogvenster met ontwikkelaarsgereedschap",
"Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
@@ -686,7 +686,7 @@
"Resend": "Opnieuw versturen",
"Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
"Messages containing my display name": "Berichten die mijn weergavenaam bevatten",
- "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
+ "Messages in one-to-one chats": "Berichten in één-op-één chats",
"Unavailable": "Niet beschikbaar",
"View Decrypted Source": "Ontsleutelde bron bekijken",
"Failed to update keywords": "Updaten van trefwoorden is mislukt",
@@ -744,7 +744,7 @@
"Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/gesprekken",
"Unable to look up room ID from server": "Kon de gesprek-ID niet van de server ophalen",
"Couldn't find a matching Matrix room": "Kon geen bijbehorend Matrix-gesprek vinden",
- "All Rooms": "Alle gesprekken",
+ "All Rooms": "Alle kamers",
"You cannot delete this message. (%(code)s)": "U kunt dit bericht niet verwijderen. (%(code)s)",
"Thursday": "Donderdag",
"Forward Message": "Bericht doorsturen",
@@ -779,7 +779,7 @@
"With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Met uw huidige browser kan de toepassing er volledig onjuist uitzien. Tevens is het mogelijk dat niet alle functies naar behoren werken. U kunt doorgaan als u het toch wilt proberen, maar bij problemen bent u volledig op uzelf aangewezen!",
"Checking for an update...": "Bezig met controleren op updates…",
"Logs sent": "Logs verstuurd",
- "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Foutenlogboeken bevatten gebruiksgegevens van de app inclusief uw gebruikersnaam, de ID’s of bijnamen van de gesprekken die u heeft bezocht, en de gebruikersnamen van andere gebruikers. Ze bevatten geen berichten.",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Foutenlogboeken bevatten persoonsgegevens van de app inclusief uw inlognaam, de ID’s of bijnamen van de kamers die u heeft bezocht, en de inlognamen van andere personen. Ze bevatten geen berichten.",
"Failed to send logs: ": "Versturen van logs mislukt: ",
"Preparing to send logs": "Logs voorbereiden voor versturen",
"e.g. %(exampleValue)s": "bv. %(exampleValue)s",
@@ -790,12 +790,12 @@
"Always show encryption icons": "Versleutelingspictogrammen altijd tonen",
"Send analytics data": "Gebruiksgegevens delen",
"Enable widget screenshots on supported widgets": "Widget-schermafbeeldingen inschakelen op ondersteunde widgets",
- "Muted Users": "Gedempte gebruikers",
+ "Muted Users": "Gedempte personen",
"Popout widget": "Widget in nieuw venster openen",
"Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of u heeft geen toestemming die te bekijken.",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit zal uw account voorgoed onbruikbaar maken. U zult niet meer kunnen inloggen, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan u deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</b>",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit zal uw account voorgoed onbruikbaar maken. U zult niet meer kunnen inloggen, en niemand anders zal zich met dezelfde persoon-ID kunnen registreren. Hierdoor zal uw account alle kamers waar u aan deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</b>",
"Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het sluiten van uw account <b>maakt standaard niet dat wij de door u verstuurde berichten vergeten.</b> Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.",
- "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is zoals bij e-mails. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is vergelijkbaar met e-mail. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde personen, maar geregistreerde personen die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.",
"Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (<b>Let op:</b> hierdoor zullen personen een onvolledig beeld krijgen van gesprekken)",
"To continue, please enter your password:": "Voer uw wachtwoord in om verder te gaan:",
"Clear Storage and Sign Out": "Opslag wissen en uitloggen",
@@ -817,10 +817,10 @@
"This event could not be displayed": "Deze gebeurtenis kon niet weergegeven worden",
"Demote yourself?": "Uzelf degraderen?",
"Demote": "Degraderen",
- "Share Link to User": "Koppeling naar gebruiker delen",
+ "Share Link to User": "Koppeling naar persoon delen",
"Share room": "Gesprek delen",
"System Alerts": "Systeemmeldingen",
- "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde gesprekken zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw homeserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
+ "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde kamers zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw homeserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
"When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Als iemand een URL in een bericht invoegt, kan er een URL-voorvertoning weergegeven worden met meer informatie over de koppeling, zoals de titel, omschrijving en een afbeelding van de website.",
"The email field must not be blank.": "Het e-mailveld mag niet leeg zijn.",
"The phone number field must not be blank.": "Het telefoonnummerveld mag niet leeg zijn.",
@@ -829,7 +829,7 @@
"An error ocurred whilst trying to remove the widget from the room": "Er trad een fout op bij de verwijderpoging van de widget uit dit gesprek",
"Share Room": "Gesprek delen",
"Link to most recent message": "Koppeling naar meest recente bericht",
- "Share User": "Gebruiker delen",
+ "Share User": "Persoon delen",
"Share Community": "Gemeenschap delen",
"Share Room Message": "Bericht uit gesprek delen",
"Link to selected message": "Koppeling naar geselecteerd bericht",
@@ -838,14 +838,14 @@
"You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "U kunt geen berichten sturen totdat u <consentLink>onze algemene voorwaarden</consentLink> heeft gelezen en aanvaard.",
"No Audio Outputs detected": "Geen geluidsuitgangen gedetecteerd",
"Audio Output": "Geluidsuitgang",
- "Ignored users": "Genegeerde gebruikers",
+ "Ignored users": "Genegeerde personen",
"Bulk options": "Bulkopties",
- "This homeserver has hit its Monthly Active User limit.": "Deze homeserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt.",
+ "This homeserver has hit its Monthly Active User limit.": "Deze homeserver heeft zijn limiet voor maandelijks actieve personen bereikt.",
"This homeserver has exceeded one of its resource limits.": "Deze homeserver heeft één van zijn systeembronlimieten overschreden.",
- "Whether or not you're logged in (we don't record your username)": "Of u al dan niet ingelogd bent (we slaan je gebruikersnaam niet op)",
+ "Whether or not you're logged in (we don't record your username)": "Of u al dan niet ingelogd bent (we slaan uw inlognaam niet op)",
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Het bestand ‘%(fileName)s’ is groter dan de uploadlimiet van de homeserver",
"Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer je netwerktoegang en probeer het nogmaals.",
- "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:",
+ "Failed to invite users to the room:": "Kon de volgende personen hier niet uitnodigen:",
"Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór een bericht zonder opmaak",
"Upgrades a room to a new version": "Upgrade deze kamer naar een nieuwere versie",
"Changes your display nickname in the current room only": "Stelt uw weergavenaam alleen in de huidige kamer in",
@@ -872,10 +872,10 @@
"Unable to connect to Homeserver. Retrying...": "Kon geen verbinding met de homeserver maken. Nieuwe poging…",
"Unrecognised address": "Adres niet herkend",
"You do not have permission to invite people to this room.": "U bent niet bevoegd anderen tot dit gesprek uit te nodigen.",
- "User %(userId)s is already in the room": "De gebruiker %(userId)s is al aanwezig",
- "User %(user_id)s does not exist": "Er bestaat geen gebruiker %(user_id)s",
- "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen gebruiker %(user_id)s",
- "The user must be unbanned before they can be invited.": "De gebruiker kan niet uitgenodigd worden voordat diens ban teniet is gedaan.",
+ "User %(userId)s is already in the room": "De persoon %(userId)s is al aanwezig",
+ "User %(user_id)s does not exist": "Er bestaat geen persoon %(user_id)s",
+ "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen persoon %(user_id)s",
+ "The user must be unbanned before they can be invited.": "De persoon kan niet uitgenodigd worden totdat zijn ban is verwijderd.",
"Unknown server error": "Onbekende serverfout",
"Use a few words, avoid common phrases": "Gebruik enkele woorden - maar geen bekende uitdrukkingen",
"No need for symbols, digits, or uppercase letters": "Hoofdletters, cijfers of speciale tekens hoeven niet, mogen wel",
@@ -907,34 +907,34 @@
"There was an error joining the room": "Er is een fout opgetreden bij het betreden van het gesprek",
"Sorry, your homeserver is too old to participate in this room.": "Helaas - uw homeserver is te oud voor dit gesprek.",
"Please contact your homeserver administrator.": "Gelieve contact op te nemen met de beheerder van uw homeserver.",
- "Custom user status messages": "Aangepaste gebruikersstatusberichten",
- "Group & filter rooms by custom tags (refresh to apply changes)": "Gesprekken groeperen en filteren volgens eigen labels (herlaad om de verandering te zien)",
+ "Custom user status messages": "Aangepaste statusberichten",
+ "Group & filter rooms by custom tags (refresh to apply changes)": "Kamers groeperen en filteren volgens eigen labels (herlaad om de verandering te zien)",
"Render simple counters in room header": "Eenvoudige tellers bovenaan het gesprek tonen",
"Enable Emoji suggestions while typing": "Emoticons voorstellen tijdens het typen",
"Show a placeholder for removed messages": "Verwijderde berichten vulling tonen",
"Show join/leave messages (invites/kicks/bans unaffected)": "Berichten over toe- en uittredingen tonen (dit heeft geen effect op uitnodigingen, berispingen of verbanningen)",
"Show avatar changes": "Veranderingen van afbeelding tonen",
"Show display name changes": "Veranderingen van weergavenamen tonen",
- "Show read receipts sent by other users": "Door andere gebruikers verstuurde leesbevestigingen tonen",
+ "Show read receipts sent by other users": "Door andere personen verstuurde leesbevestigingen tonen",
"Show a reminder to enable Secure Message Recovery in encrypted rooms": "Herinnering tonen om veilig berichtherstel in te schakelen in versleutelde gesprekken",
"Show avatars in user and room mentions": "Vermelde personen- of kamerafbeelding tonen",
- "Enable big emoji in chat": "Grote emoji in gesprekken inschakelen",
+ "Enable big emoji in chat": "Grote emoji in kamers inschakelen",
"Send typing notifications": "Typmeldingen versturen",
"Enable Community Filter Panel": "Gemeenschapsfilterpaneel inschakelen",
"Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer voor één-op-één oproepen toestaan",
"Prompt before sending invites to potentially invalid matrix IDs": "Uitnodigingen naar mogelijk ongeldige Matrix-ID’s bevestigen",
"Show developer tools": "Ontwikkelgereedschap tonen",
- "Messages containing my username": "Berichten die mijn gebruikersnaam bevatten",
+ "Messages containing my username": "Berichten die mijn inlognaam bevatten",
"Messages containing @room": "Berichten die ‘@room’ bevatten",
- "Encrypted messages in one-to-one chats": "Versleutelde berichten in één-op-één gesprekken",
+ "Encrypted messages in one-to-one chats": "Versleutelde berichten in één-op-één chats",
"Encrypted messages in group chats": "Versleutelde berichten in groepsgesprekken",
"The other party cancelled the verification.": "De tegenpartij heeft de verificatie geannuleerd.",
"Verified!": "Geverifieerd!",
- "You've successfully verified this user.": "U heeft deze gebruiker geverifieerd.",
- "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Beveiligde berichten met deze gebruiker zijn eind-tot-eind-versleuteld en kunnen niet door derden worden gelezen.",
+ "You've successfully verified this user.": "U heeft deze persoon geverifieerd.",
+ "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Beveiligde berichten met deze persoon zijn eind-tot-eind-versleuteld en kunnen niet door derden worden gelezen.",
"Got It": "Ik snap het",
- "Verify this user by confirming the following emoji appear on their screen.": "Verifieer deze gebruiker door te bevestigen dat hun scherm de volgende emoji toont.",
- "Verify this user by confirming the following number appears on their screen.": "Verifieer deze gebruiker door te bevestigen dat hun scherm het volgende getal toont.",
+ "Verify this user by confirming the following emoji appear on their screen.": "Verifieer deze persoon door te bevestigen dat hun scherm de volgende emoji toont.",
+ "Verify this user by confirming the following number appears on their screen.": "Verifieer deze persoon door te bevestigen dat hun scherm het volgende getal toont.",
"Unable to find a supported verification method.": "Kan geen ondersteunde verificatiemethode vinden.",
"Dog": "Hond",
"Cat": "Kat",
@@ -1066,17 +1066,17 @@
"Modify widgets": "Widgets aanpassen",
"Default role": "Standaardrol",
"Send messages": "Berichten versturen",
- "Invite users": "Gebruikers uitnodigen",
+ "Invite users": "Personen uitnodigen",
"Change settings": "Instellingen wijzigen",
- "Kick users": "Gebruikers uit het gesprek verwijderen",
- "Ban users": "Gebruikers verbannen",
+ "Kick users": "Personen verwijderen",
+ "Ban users": "Personen verbannen",
"Remove messages": "Berichten verwijderen",
"Notify everyone": "Iedereen melden",
"Send %(eventType)s events": "%(eventType)s-gebeurtenissen versturen",
"Roles & Permissions": "Rollen & rechten",
"Select the roles required to change various parts of the room": "Selecteer de vereiste rollen om verschillende delen van het gesprek te wijzigen",
"Enable encryption?": "Versleuteling inschakelen?",
- "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Gespreksversleuteling is onomkeerbaar. Berichten in versleutelde gesprekken zijn niet leesbaar voor de server; enkel voor de gespreksdeelnemers. Veel robots en overbruggingen werken niet correct in versleutelde gesprekken. <a>Lees meer over versleuteling.</a>",
+ "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Kamerversleuteling is onomkeerbaar. Berichten in versleutelde kamers zijn niet leesbaar voor de server; enkel voor de deelnemers. Veel robots en bruggen werken niet correct in versleutelde kamers. <a>Lees meer over versleuteling.</a>",
"Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wijzigingen aan wie de geschiedenis kan lezen gelden enkel voor toekomstige berichten in dit gesprek. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
"Encryption": "Versleuteling",
"Once enabled, encryption cannot be disabled.": "Eenmaal ingeschakeld kan versleuteling niet meer worden uitgeschakeld.",
@@ -1104,7 +1104,7 @@
"Join": "Deelnemen",
"Power level": "Machtsniveau",
"That doesn't look like a valid email address": "Dit is geen geldig e-mailadres",
- "The following users may not exist": "Volgende gebruikers bestaan mogelijk niet",
+ "The following users may not exist": "Volgende personen bestaan mogelijk niet",
"Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kan geen profielen voor de Matrix-ID’s hieronder vinden - wilt u ze toch uitnodigen?",
"Invite anyway and never warn me again": "Alsnog uitnodigen en mij nooit meer waarschuwen",
"Invite anyway": "Alsnog uitnodigen",
@@ -1113,14 +1113,14 @@
"To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Om uw gespreksgeschiedenis niet te verliezen vóór het uitloggen dient u uw veiligheidssleutel te exporteren. Dat moet vanuit de nieuwere versie van %(brand)s",
"Incompatible Database": "Incompatibele database",
"Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",
- "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze gebruiker om hem/haar als vertrouwd te markeren. Gebruikers vertrouwen geeft u extra gemoedsrust bij het gebruik van eind-tot-eind-versleutelde berichten.",
+ "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze persoon om als vertrouwd te markeren. Personen vertrouwen geeft u extra zekerheid bij het gebruik van eind-tot-eind-versleutelde berichten.",
"Waiting for partner to confirm...": "Wachten op bevestiging van partner…",
"Incoming Verification Request": "Inkomend verificatieverzoek",
"You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "U heeft voorheen %(brand)s op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. De lokale cache is niet compatibel tussen deze twee instellingen, zodat %(brand)s uw account moet hersynchroniseren.",
"If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Indien de andere versie van %(brand)s nog open staat in een ander tabblad kunt u dat beter sluiten, want het geeft problemen als %(brand)s op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld draait.",
"Incompatible local cache": "Incompatibele lokale cache",
"Clear cache and resync": "Cache wissen en hersynchroniseren",
- "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s verbruikt nu 3-5x minder geheugen, door informatie over andere gebruikers enkel te laden wanneer nodig. Even geduld, we hersynchroniseren met de server!",
+ "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s verbruikt nu 3-5x minder geheugen, door informatie over andere personen enkel te laden wanneer nodig. Even geduld, we synchroniseren met de server!",
"Updating %(brand)s": "%(brand)s wordt bijgewerkt",
"I don't want my encrypted messages": "Ik wil mijn versleutelde berichten niet",
"Manually export keys": "Sleutels handmatig wegschrijven",
@@ -1131,13 +1131,13 @@
"Report bugs & give feedback": "Fouten melden & feedback geven",
"Go back": "Terug",
"Room Settings - %(roomName)s": "Gespreksinstellingen - %(roomName)s",
- "Failed to upgrade room": "Gesprek upgraden mislukt",
- "The room upgrade could not be completed": "Het upgraden van het gesprek kon niet voltooid worden",
- "Upgrade this room to version %(version)s": "Upgrade dit gesprek tot versie %(version)s",
+ "Failed to upgrade room": "Kamerupgrade mislukt",
+ "The room upgrade could not be completed": "Het upgraden van de kamer kon niet worden voltooid",
+ "Upgrade this room to version %(version)s": "Upgrade de kamer naar versie %(version)s",
"Upgrade Room Version": "Gespreksversie upgraden",
"Create a new room with the same name, description and avatar": "Een nieuw kamer aanmaken met dezelfde naam, beschrijving en afbeelding",
"Update any local room aliases to point to the new room": "Alle lokale gespreksbijnamen naar het nieuwe gesprek laten verwijzen",
- "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Mensen verhinderen aan de oude versie van het gesprek bij te dragen en daar een bericht te plaatsen dat de gebruikers verwijst naar het nieuwe gesprek",
+ "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Personen verhinderen om aan de oude versie van de kamer bij te dragen en plaats een bericht te dat de personen verwijst naar de nieuwe kamer",
"Put a link back to the old room at the start of the new room so people can see old messages": "Bovenaan het nieuwe gesprek naar het oude verwijzen, om oude berichten te lezen",
"A username can only contain lower case letters, numbers and '=_-./'": "Een gebruikersnaam mag enkel kleine letters, cijfers en ‘=_-./’ bevatten",
"Checking...": "Bezig met controleren…",
@@ -1165,7 +1165,7 @@
"Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Voer de locatie van uw Modular-thuisserver in. Deze kan uw eigen domeinnaam gebruiken, of een subdomein van <a>modular.im</a> zijn.",
"Server Name": "Servernaam",
"The username field must not be blank.": "Het gebruikersnaamveld mag niet leeg zijn.",
- "Username": "Gebruikersnaam",
+ "Username": "Inlognaam",
"Not sure of your password? <a>Set a new one</a>": "Onzeker over uw wachtwoord? <a>Stel een nieuw in</a>",
"Sign in to your Matrix account on %(serverName)s": "Aanmelden met uw Matrix-account op %(serverName)s",
"Change": "Wijzigen",
@@ -1187,10 +1187,10 @@
"You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "U bent een beheerder van deze gemeenschap. U zult niet opnieuw kunnen toetreden zonder een uitnodiging van een andere beheerder.",
"Want more than a community? <a>Get your own server</a>": "Wilt u meer dan een gemeenschap? <a>Verkrijg uw eigen server</a>",
"This homeserver does not support communities": "Deze homeserver biedt geen ondersteuning voor gemeenschappen",
- "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Uw bericht is niet verstuurd omdat deze homeserver zijn limiet voor maandelijks actieve gebruikers heeft bereikt. <a>Neem contact op met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
+ "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Uw bericht is niet verstuurd omdat deze homeserver zijn limiet voor maandelijks actieve personen heeft bereikt. <a>Neem contact op met uw beheerder</a> om de dienst te blijven gebruiken.",
"Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Uw bericht is niet verstuurd omdat deze homeserver een systeembronlimiet heeft overschreden. <a>Neem contact op met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
"Guest": "Gast",
- "Could not load user profile": "Kon gebruikersprofiel niet laden",
+ "Could not load user profile": "Kon persoonsprofiel niet laden",
"Your Matrix account on %(serverName)s": "Uw Matrix-account op %(serverName)s",
"A verification email will be sent to your inbox to confirm setting your new password.": "Er is een verificatie-e-mail naar u gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.",
"Sign in instead": "In plaats daarvan inloggen",
@@ -1233,7 +1233,7 @@
"Set up Secure Messages": "Beveiligde berichten instellen",
"Recovery Method Removed": "Herstelmethode verwijderd",
"If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u de herstelmethode niet heeft verwijderd, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw wachtwoord en stel bij instellingen een nieuwe herstelmethode in.",
- "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let op</b>: gesprekken bijwerken <i>voegt gespreksleden niet automatisch toe aan de nieuwe versie van het gesprek</i>. Er komt in het oude gesprek een koppeling naar het nieuwe, waarop gespreksleden moeten klikken om aan het nieuwe gesprek deel te nemen.",
+ "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let op</b>: kamers bijwerken <i>voegt leden niet automatisch toe aan de nieuwe versie van de kamer</i>. Er komt in de oude kamer een koppeling naar de nieuwe, waarop leden moeten klikken om aan de nieuwe kamer deel te nemen.",
"Adds a custom widget by URL to the room": "Voegt met een URL een aangepaste widget toe aan de kamer",
"Please supply a https:// or http:// widget URL": "Voer een https://- of http://-widget-URL in",
"You cannot modify widgets in this room.": "U kunt de widgets in deze kamer niet aanpassen.",
@@ -1251,7 +1251,7 @@
"Remember my selection for this widget": "Onthoud mijn keuze voor deze widget",
"Deny": "Weigeren",
"%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s kon de protocollijst niet ophalen van de homeserver. Mogelijk is de homeserver te oud om derde-partij-netwerken te ondersteunen.",
- "%(brand)s failed to get the public room list.": "%(brand)s kon de lijst met openbare gesprekken niet verkrijgen.",
+ "%(brand)s failed to get the public room list.": "%(brand)s kon de lijst met publieke kamers niet verkrijgen.",
"The homeserver may be unavailable or overloaded.": "De homeserver is mogelijk onbereikbaar of overbelast.",
"You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
"You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
@@ -1263,7 +1263,7 @@
"Rotate clockwise": "Met de klok mee draaien",
"GitHub issue": "GitHub-melding",
"Notes": "Opmerkingen",
- "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Gelieve alle verdere informatie die zou kunnen helpen het probleem te analyseren (wat u aan het doen was, relevante gespreks-ID’s, gebruikers-ID’s, enz.) bij te voegen.",
+ "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Alle verdere informatie die zou kunnen helpen het probleem te analyseren graag toevoegen (wat u aan het doen was, relevante kamer-ID’s, persoon-ID’s, etc.).",
"Sign out and remove encryption keys?": "Uitloggen en versleutelingssleutels verwijderen?",
"To help us prevent this in future, please <a>send us logs</a>.": "<a>Stuur ons uw logs</a> om dit in de toekomst te helpen voorkomen.",
"Missing session data": "Sessiegegevens ontbreken",
@@ -1282,14 +1282,14 @@
"The server does not support the room version specified.": "De server ondersteunt deze versie van kamers niet.",
"Name or Matrix ID": "Naam of Matrix-ID",
"Changes your avatar in this current room only": "Verandert uw afbeelding alleen in de huidige kamer",
- "Unbans user with given ID": "Ontbant de gebruiker met de gegeven ID",
+ "Unbans user with given ID": "Ontbant de persoon met de gegeven ID",
"Sends the given message coloured as a rainbow": "Verstuurt het gegeven bericht in regenboogkleuren",
"Sends the given emote coloured as a rainbow": "Verstuurt de gegeven emoticon in regenboogkleuren",
"No homeserver URL provided": "Geen homeserver-URL opgegeven",
"Unexpected error resolving homeserver configuration": "Onverwachte fout bij het controleren van de homeserverconfiguratie",
- "The user's homeserver does not support the version of the room.": "De homeserver van de gebruiker biedt geen ondersteuning voor de gespreksversie.",
+ "The user's homeserver does not support the version of the room.": "De homeserver van de persoon biedt geen ondersteuning voor deze kamerversie.",
"Show hidden events in timeline": "Verborgen gebeurtenissen op de tijdslijn weergeven",
- "When rooms are upgraded": "Wanneer gesprekken geüpgraded worden",
+ "When rooms are upgraded": "Wanneer kamers geüpgraded worden",
"this room": "dit gesprek",
"View older messages in %(roomName)s.": "Bekijk oudere berichten in %(roomName)s.",
"Joining room …": "Deelnemen aan gesprek…",
@@ -1332,10 +1332,10 @@
"Password is allowed, but unsafe": "Wachtwoord is toegestaan, maar onveilig",
"Nice, strong password!": "Dit is een sterk wachtwoord!",
"Passwords don't match": "Wachtwoorden komen niet overeen",
- "Other users can invite you to rooms using your contact details": "Andere gebruikers kunnen u in gesprekken uitnodigen op basis van uw contactgegevens",
+ "Other users can invite you to rooms using your contact details": "Andere personen kunnen u in kamers uitnodigen op basis van uw contactgegevens",
"Enter phone number (required on this homeserver)": "Voer telefoonnummer in (vereist op deze homeserver)",
"Doesn't look like a valid phone number": "Dit lijkt geen geldig telefoonnummer",
- "Enter username": "Voer gebruikersnaam in",
+ "Enter username": "Voer inlognaam in",
"Some characters not allowed": "Sommige tekens zijn niet toegestaan",
"Create your Matrix account on <underlinedServerName />": "Maak uw Matrix-account op <underlinedServerName /> aan",
"Add room": "Gesprek toevoegen",
@@ -1472,7 +1472,7 @@
"Error changing power level requirement": "Fout bij wijzigen van machtsniveauvereiste",
"An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van de machtsniveauvereisten van het gesprek. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.",
"Error changing power level": "Fout bij wijzigen van machtsniveau",
- "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van het machtsniveau van de gebruiker. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.",
+ "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van het machtsniveau van de persoon. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.",
"Verify the link in your inbox": "Verifieer de koppeling in uw postvak",
"Complete": "Voltooien",
"No recent messages by %(user)s found": "Geen recente berichten door %(user)s gevonden",
@@ -1481,9 +1481,9 @@
"You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "U staat op het punt %(count)s berichten van %(user)s te verwijderen. Dit kan niet teruggedraaid worden. Wilt u doorgaan?",
"For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Bij een groot aantal berichten kan dit even duren. Herlaad uw cliënt niet gedurende deze tijd.",
"Remove %(count)s messages|other": "%(count)s berichten verwijderen",
- "Deactivate user?": "Gebruiker deactiveren?",
- "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deze gebruiker deactiveren zal deze gebruiker uitloggen en verhinderen dat de gebruiker weer inlogt. Bovendien zal de gebruiker alle gesprekken waaraan de gebruiker deelneemt verlaten. Deze actie is niet terug te draaien. Weet u zeker dat u deze gebruiker wilt deactiveren?",
- "Deactivate user": "Gebruiker deactiveren",
+ "Deactivate user?": "Persoon deactiveren?",
+ "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deze persoon deactiveren zal deze persoon uitloggen en verhinderen dat de persoon weer inlogt. Bovendien zal de persoon alle kamers waaraan de persoon deelneemt verlaten. Deze actie is niet terug te draaien. Weet u zeker dat u deze persoon wilt deactiveren?",
+ "Deactivate user": "Persoon deactiveren",
"Remove recent messages": "Recente berichten verwijderen",
"Bold": "Vet",
"Italics": "Cursief",
@@ -1513,8 +1513,8 @@
"View": "Bekijken",
"Find a room…": "Zoek een gesprek…",
"Find a room… (e.g. %(exampleRoom)s)": "Zoek een gesprek… (bv. %(exampleRoom)s)",
- "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u de kamer die u zoekt niet kunt vinden, vraag dan een uitnodiging of <a>maak een nieuwe kamer aan</a>.",
- "Explore rooms": "Kamers ontdekken",
+ "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u de kamer niet kunt vinden is het mogelijk privé, vraag dan om een uitnodiging of <a>maak een nieuwe kamer aan</a>.",
+ "Explore rooms": "Kamersgids",
"Show previews/thumbnails for images": "Miniaturen voor afbeeldingen tonen",
"Clear cache and reload": "Cache wissen en herladen",
"You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan gemaakt worden. Wilt u doorgaan?",
@@ -1541,8 +1541,8 @@
"Community Autocomplete": "Gemeenschappen autoaanvullen",
"Emoji Autocomplete": "Emoji autoaanvullen",
"Notification Autocomplete": "Meldingen autoaanvullen",
- "Room Autocomplete": "Gesprekken autoaanvullen",
- "User Autocomplete": "Gebruikers autoaanvullen",
+ "Room Autocomplete": "Kamers autoaanvullen",
+ "User Autocomplete": "Personen autoaanvullen",
"Add Email Address": "E-mailadres toevoegen",
"Add Phone Number": "Telefoonnummer toevoegen",
"Your email address hasn't been verified yet": "Uw e-mailadres is nog niet geverifieerd",
@@ -1559,8 +1559,8 @@
"Custom (%(level)s)": "Aangepast (%(level)s)",
"Error upgrading room": "Upgraden van gesprek mislukt",
"Double check that your server supports the room version chosen and try again.": "Ga nogmaals na dat de server de gekozen gespreksversie ondersteunt, en probeer het dan opnieuw.",
- "Verifies a user, session, and pubkey tuple": "Verifieert een combinatie van gebruiker+sessie+publieke sleutel",
- "Unknown (user, session) pair:": "Onbekende combinatie gebruiker+sessie:",
+ "Verifies a user, session, and pubkey tuple": "Verifieert de combinatie van persoon, sessie en publieke sleutel",
+ "Unknown (user, session) pair:": "Onbekende combinatie persoon en sessie:",
"Session already verified!": "Sessie al geverifieerd!",
"WARNING: Session already verified, but keys do NOT MATCH!": "PAS OP: de sessie is al geverifieerd, maar de sleutels komen NIET OVEREEN!",
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "PAS OP: sleutelverificatie MISLUKT! De combinatie %(userId)s + sessie %(deviceId)s is ondertekend met ‘%(fprint)s’ - maar de opgegeven sleutel is ‘%(fingerprint)s’. Wellicht worden uw berichten onderschept!",
@@ -1569,20 +1569,20 @@
"%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s poogt u te bellen, maar uw browser ondersteunt dat niet",
"%(senderName)s placed a video call.": "%(senderName)s doet een video-oproep.",
"%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s doet een video-oproep, maar uw browser ondersteunt dat niet",
- "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s heeft de banregel voor gebruikers die met %(glob)s stroken verwijderd",
+ "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s heeft de banregel voor personen die met %(glob)s stroken verwijderd",
"%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s heeft de banregel voor kamers met %(glob)s verwijderd",
"%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s heeft de banregel voor servers die met %(glob)s stroken verwijderd",
"%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s heeft een banregel die met %(glob)s strookt verwijderd",
"%(senderName)s updated an invalid ban rule": "%(senderName)s heeft een ongeldige banregel bijgewerkt",
- "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die gebruikers die met %(glob)s sporen verbant vanwege %(reason)s",
+ "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die personen die met %(glob)s sporen verbant vanwege %(reason)s",
"%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die kamers met %(glob)s verbant vanwege %(reason)s",
"%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die servers die met %(glob)s sporen verbant vanwege %(reason)s",
"%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s heeft een banregel vanwege %(reason)s die met %(glob)s spoort bijgewerkt",
- "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat gebruikers die met %(glob)s sporen verbannen worden vanwege %(reason)s",
+ "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat personen die met %(glob)s sporen verbannen worden vanwege %(reason)s",
"%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat kamers met %(glob)s verbannen worden vanwege %(reason)s",
"%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat servers die met %(glob)s sporen verbannen worden vanwege %(reason)s",
"%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat alles wat met %(glob)s spoort verbannen wordt vanwege %(reason)s",
- "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor gebruikers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+ "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor personen wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
"%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor kamers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
"%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor servers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
"%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
@@ -1607,10 +1607,10 @@
"Match system theme": "Aanpassen aan systeemthema",
"Never send encrypted messages to unverified sessions from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies versturen",
"Never send encrypted messages to unverified sessions in this room from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in dit gesprek versturen",
- "Enable message search in encrypted rooms": "Zoeken in versleutelde gesprekken inschakelen",
+ "Enable message search in encrypted rooms": "Zoeken in versleutelde kamers inschakelen",
"How fast should messages be downloaded.": "Ophaalfrequentie van berichten.",
"My Ban List": "Mijn banlijst",
- "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/gebruikers. Verlaat dit gesprek niet!",
+ "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/personen. Verlaat deze kamer niet!",
"Waiting for %(displayName)s to verify…": "Wachten tot %(displayName)s geverifieerd heeft…",
"They match": "Ze komen overeen",
"They don't match": "Ze komen niet overeen",
@@ -1638,7 +1638,7 @@
"Delete %(count)s sessions|one": "%(count)s sessie verwijderen",
"Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Of u %(brand)s op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
"Whether you're using %(brand)s as an installed Progressive Web App": "Of u %(brand)s gebruikt als een geïnstalleerde Progressieve Web-App",
- "Your user agent": "Jouw gebruikersagent",
+ "Your user agent": "Uw persoonsagent",
"If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zult u de andere gebruiker niet verifiëren.",
"If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zult u uw andere sessie niet verifiëren.",
"Cancel entering passphrase?": "Wachtwoord annuleren?",
@@ -1658,10 +1658,10 @@
"not stored": "niet opgeslagen",
"Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zult geen pushmeldingen op uw andere sessies meer ontvangen, totdat u zichzelf daar opnieuw inlogt",
"Ignored/Blocked": "Genegeerd/geblokkeerd",
- "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde gebruiker/server",
+ "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde persoon/server",
"Something went wrong. Please try again or view your console for hints.": "Er is iets fout gegaan. Probeer het opnieuw of bekijk de console om voor meer informatie.",
"Error subscribing to list": "Fout bij het abonneren op de lijst",
- "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde gebruiker/server",
+ "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde persoon/server",
"Error unsubscribing from list": "Fout bij het opzeggen van een abonnement op de lijst",
"Please try again or view your console for hints.": "Probeer het opnieuw of bekijk de console voor meer informatie.",
"None": "Geen",
@@ -1671,15 +1671,15 @@
"Unsubscribe": "Abonnement opzeggen",
"View rules": "Bekijk regels",
"You are currently subscribed to:": "U heeft een abonnement op:",
- "⚠ These settings are meant for advanced users.": "⚠ Deze instellingen zijn bedoeld voor gevorderde gebruikers.",
- "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van gebruikers gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het abonneren op een banlijst betekent dat u de gebruikers/servers die op de lijst staan niet meer zult zien.",
+ "⚠ These settings are meant for advanced users.": "⚠ Deze instellingen zijn bedoeld voor gevorderde personen.",
+ "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van personen gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het abonneren op een banlijst betekent dat u de personen/servers die op de lijst staan niet meer zult zien.",
"Personal ban list": "Persoonlijke banlijst",
- "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle gebruikers/server waar u geen berichten meer van wilt zien. Nadat u een gebruiker/server heeft genegeerd, zal er een nieuw gesprek worden aangemaakt met de naam ‘Mijn banlijst’. Om de lijst actief te houden dient u het gesprek niet te verlaten.",
- "Server or user ID to ignore": "Server of gebruikers-ID om te negeren",
+ "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle personen/servers waar u geen berichten meer van wilt zien. Nadat u een persoon/server heeft genegeerd, zal er een nieuw kamer worden aangemaakt met de naam ‘Mijn banlijst’. Om de lijst actief te houden dient u de kamer niet te verlaten.",
+ "Server or user ID to ignore": "Server of persoon-ID om te negeren",
"eg: @bot:* or example.org": "bijvoorbeeld: @bot:* of voorbeeld.org",
"Subscribed lists": "Abonnementen op lijsten",
"Subscribing to a ban list will cause you to join it!": "Wanneer u zich abonneert op een banlijst zal u eraan worden toegevoegd!",
- "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om gebruikers te negeren.",
+ "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om personen te negeren.",
"Subscribe": "Abonneren",
"Enable desktop notifications for this session": "Bureaubladmeldingen voor deze sessie inschakelen",
"Enable audible notifications for this session": "Meldingen met geluid voor deze sessie inschakelen",
@@ -1693,7 +1693,7 @@
"Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integratiebeheerders ontvangen configuratie-informatie en kunnen widgets aanpassen, gespreksuitnodigingen versturen en machtsniveau’s namens u aanpassen.",
"Ban list rules - %(roomName)s": "Banlijstregels - %(roomName)s",
"Server rules": "Serverregels",
- "User rules": "Gebruikersregels",
+ "User rules": "Persoonsregels",
"Show tray icon and minimize window to it on close": "Geef een pictogram weer in de systeembalk en minimaliseer het venster wanneer het wordt gesloten",
"Session ID:": "Sessie-ID:",
"Session key:": "Sessiesleutel:",
@@ -1702,9 +1702,9 @@
"This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dit gesprek wordt overbrugd naar de volgende platformen. <a>Lees meer</a>",
"This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dit gesprek wordt niet overbrugd naar andere platformen. <a>Lees meer.</a>",
"Bridges": "Bruggen",
- "This user has not verified all of their sessions.": "Deze gebruiker heeft niet al zijn sessies geverifieerd.",
- "You have not verified this user.": "U heeft deze gebruiker niet geverifieerd.",
- "You have verified this user. This user has verified all of their sessions.": "U heeft deze gebruiker geverifieerd. Deze gebruiker heeft al zijn sessies geverifieerd.",
+ "This user has not verified all of their sessions.": "Deze persoon heeft niet al zijn sessies geverifieerd.",
+ "You have not verified this user.": "U heeft deze persoon niet geverifieerd.",
+ "You have verified this user. This user has verified all of their sessions.": "U heeft deze persoon geverifieerd. Deze persoon heeft al zijn sessies geverifieerd.",
"Someone is using an unknown session": "Iemand gebruikt een onbekende sessie",
"This room is end-to-end encrypted": "Dit gesprek is eind-tot-eind-versleuteld",
"Everyone in this room is verified": "Iedereen in dit gesprek is geverifieerd",
@@ -1712,8 +1712,8 @@
"rooms.": "gesprekken.",
"Recent rooms": "Actuele gesprekken",
"Direct Messages": "Direct gesprek",
- "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde gesprekken.",
- "Indexed rooms:": "Geïndexeerde gesprekken:",
+ "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde kamers.",
+ "Indexed rooms:": "Geïndexeerde kamers:",
"Cross-signing and secret storage are enabled.": "Kruiselings ondertekenen en sleutelopslag zijn ingeschakeld.",
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar die wordt nog niet vertrouwd door de huidige sessie.",
"Cross-signing and secret storage are not yet set up.": "Kruiselings ondertekenen en sleutelopslag zijn nog niet ingesteld.",
@@ -1729,9 +1729,9 @@
"Manage": "Beheren",
"Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u zich afmeldt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
"Connect this session to Key Backup": "Verbind deze sessie met de sleutelback-up",
- "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>geldige</validity> ondertekening van deze gebruiker",
- "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze gebruiker",
- "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> gebruiker met ID %(deviceId)s",
+ "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>geldige</validity> ondertekening van deze persoon",
+ "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze persoon",
+ "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> persoon met ID %(deviceId)s",
"Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> sessie met ID %(deviceId)s",
"Backup has a <validity>valid</validity> signature from this session": "De back-up heeft een <validity>geldige</validity> ondertekening van deze sessie",
"Backup has an <validity>invalid</validity> signature from this session": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze sessie",
@@ -1751,10 +1751,10 @@
"Sign In or Create Account": "Meld u aan of maak een account aan",
"Use your account or create a new one to continue.": "Gebruik uw bestaande account of maak een nieuwe aan om verder te gaan.",
"Create Account": "Registreren",
- "Displays information about a user": "Geeft informatie weer over een gebruiker",
- "Order rooms by name": "Gesprekken sorteren op naam",
- "Show rooms with unread notifications first": "Gesprekken met ongelezen meldingen eerst tonen",
- "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de gesprekken die u recent heeft bekeken bovenaan de gesprekslijst weergeven",
+ "Displays information about a user": "Geeft informatie weer over een persoon",
+ "Order rooms by name": "Kamers sorteren op naam",
+ "Show rooms with unread notifications first": "Kamers met ongelezen meldingen eerst tonen",
+ "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de kamers die u recent heeft bekeken bovenaan de kamerlijst weergeven",
"Cancelling…": "Bezig met annuleren…",
"%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "In %(brand)s ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten. Wilt u deze functie uittesten, compileer dan een aangepaste versie van %(brand)s Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
"This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Deze sessie <b>maakt geen back-ups van uw sleutels</b>, maar u beschikt over een reeds bestaande back-up waaruit u kunt herstellen en waaraan u nieuwe sleutels vanaf nu kunt toevoegen.",
@@ -1770,13 +1770,13 @@
"Encrypted by a deleted session": "Versleuteld door een verwijderde sessie",
"Invite only": "Enkel op uitnodiging",
"Close preview": "Voorbeeld sluiten",
- "Failed to deactivate user": "Deactiveren van gebruiker is mislukt",
+ "Failed to deactivate user": "Deactiveren van persoon is mislukt",
"Send a reply…": "Verstuur een antwoord…",
"Send a message…": "Verstuur een bericht…",
"Room %(name)s": "Gesprek %(name)s",
- "<userName/> wants to chat": "<userName/> wil een gesprek met u beginnen",
+ "<userName/> wants to chat": "<userName/> wil een chat met u beginnen",
"Start chatting": "Gesprek beginnen",
- "Reject & Ignore user": "Weigeren en gebruiker negeren",
+ "Reject & Ignore user": "Weigeren en persoon negeren",
"%(count)s unread messages including mentions.|one": "1 ongelezen vermelding.",
"%(count)s unread messages.|one": "1 ongelezen bericht.",
"Unread messages.": "Ongelezen berichten.",
@@ -1790,17 +1790,17 @@
"Start Verification": "Verificatie beginnen",
"Messages in this room are end-to-end encrypted.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld.",
"Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Uw berichten zijn beveiligd, en enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
- "Verify User": "Gebruiker verifiëren",
- "For extra security, verify this user by checking a one-time code on both of your devices.": "Als extra beveiliging kunt u deze gebruiker verifiëren door een eenmalige code op uw toestellen te controleren.",
+ "Verify User": "Persoon verifiëren",
+ "For extra security, verify this user by checking a one-time code on both of your devices.": "Als extra beveiliging kunt u deze persoon verifiëren door een eenmalige code op jullie toestellen te controleren.",
"Your messages are not secure": "Uw berichten zijn niet veilig",
"One of the following may be compromised:": "Eén van volgende onderdelen kan gecompromitteerd zijn:",
"Your homeserver": "Uw homeserver",
- "The homeserver the user you’re verifying is connected to": "De homeserver waarmee de gebruiker die u probeert te verifiëren verbonden is",
- "Yours, or the other users’ internet connection": "De internetverbinding van uzelf of de andere gebruiker",
- "Yours, or the other users’ session": "De sessie van uzelf of de andere gebruiker",
+ "The homeserver the user you’re verifying is connected to": "De homeserver waarmee de persoon die u probeert te verifiëren verbonden is",
+ "Yours, or the other users’ internet connection": "De internetverbinding van uzelf of de andere persoon",
+ "Yours, or the other users’ session": "De sessie van uzelf of de andere persoon",
"Not Trusted": "Niet vertrouwd",
"%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s%(userId)s heeft zich aangemeld bij een nieuwe sessie zonder deze te verifiëren:",
- "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker haar/zijn sessie te verifiëren, of verifieer die hieronder handmatig.",
+ "Ask this user to verify their session, or manually verify it below.": "Vraag deze persoon de sessie te verifiëren, of verifieer het handmatig hieronder.",
"Done": "Klaar",
"Trusted": "Vertrouwd",
"Not trusted": "Niet vertrouwd",
@@ -1829,7 +1829,7 @@
"The encryption used by this room isn't supported.": "De versleuteling gebruikt in dit gesprek wordt niet ondersteund.",
"React": "Reageren",
"Message Actions": "Berichtacties",
- "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "U heeft deze gebruiker genegeerd, dus zijn/haar berichten worden verborgen. <a>Toch tonen?</a>",
+ "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "U heeft deze persoon genegeerd, dus de berichten worden verborgen. <a>Toch tonen?</a>",
"You verified %(name)s": "U heeft %(name)s geverifieerd",
"You cancelled verifying %(name)s": "U heeft de verificatie van %(name)s geannuleerd",
"%(name)s cancelled verifying": "%(name)s heeft de verificatie geannuleerd",
@@ -1859,7 +1859,7 @@
"Any of the following data may be shared:": "De volgende gegevens worden mogelijk gedeeld:",
"Your display name": "Uw weergavenaam",
"Your avatar URL": "De URL van uw afbeelding",
- "Your user ID": "Uw gebruikers-ID",
+ "Your user ID": "Uw persoon-ID",
"Your theme": "Uw thema",
"%(brand)s URL": "%(brand)s-URL",
"Room ID": "Gespreks-ID",
@@ -1880,22 +1880,22 @@
"Session name": "Sessienaam",
"Session key": "Sessiesleutel",
"Verification Requests": "Verificatieverzoeken",
- "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Deze gebruiker verifiëren zal de sessie als vertrouwd markeren voor u en voor hem/haar.",
- "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifieer dit apparaat om het als vertrouwd te markeren. Door dit apparaat te vertrouwen geeft u extra gemoedsrust aan uzelf en andere gebruikers bij het gebruik van eind-tot-eind-versleutelde berichten.",
- "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Dit apparaat verifiëren zal het als vertrouwd markeren, en gebruikers die met u geverifieerd hebben zullen het vertrouwen.",
+ "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Deze persoon verifiëren zal de sessie als vertrouwd markeren voor u beide.",
+ "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifieer dit apparaat om het als vertrouwd te markeren. Door dit apparaat te vertrouwen geeft u extra zekerheid aan uzelf en andere personen bij het gebruik van eind-tot-eind-versleutelde berichten.",
+ "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Dit apparaat verifiëren zal het als vertrouwd markeren, en personen die met u geverifieerd hebben zullen het vertrouwen.",
"Integrations are disabled": "Integraties zijn uitgeschakeld",
"Enable 'Manage Integrations' in Settings to do this.": "Schakel de ‘Integratiebeheerder’ in in uw Instellingen om dit te doen.",
"Integrations not allowed": "Integraties niet toegestaan",
"Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Uw %(brand)s laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
"Failed to invite the following users to chat: %(csvUsers)s": "Het uitnodigen van volgende gebruikers voor gesprek is mislukt: %(csvUsers)s",
"We couldn't create your DM. Please check the users you want to invite and try again.": "Uw direct gesprek kon niet aangemaakt worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
- "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de gebruikers.",
- "We couldn't invite those users. Please check the users you want to invite and try again.": "Deze gebruikers konden niet uitgenodigd worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
- "Failed to find the following users": "Kon volgende gebruikers niet vinden",
- "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Volgende gebruikers bestaan mogelijk niet of zijn ongeldig, en kunnen dan ook niet uitgenodigd worden: %(csvNames)s",
+ "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de personen.",
+ "We couldn't invite those users. Please check the users you want to invite and try again.": "Deze personen konden niet uitgenodigd worden. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.",
+ "Failed to find the following users": "Kon volgende personen niet vinden",
+ "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Volgende personen bestaan mogelijk niet of zijn ongeldig, en kunnen niet uitgenodigd worden: %(csvNames)s",
"Recent Conversations": "Recente gesprekken",
"Suggestions": "Suggesties",
- "Recently Direct Messaged": "Recente gesprekken",
+ "Recently Direct Messaged": "Recente directe gesprekken",
"Go": "Start",
"Your account is not secure": "Uw account is onveilig",
"Your password": "Uw wachtwoord",
@@ -1911,7 +1911,7 @@
"Upgrade public room": "Openbaar gesprek upgraden",
"Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Het bijwerken van een gesprek is een gevorderde actie en wordt meestal aanbevolen wanneer een gesprek onstabiel is door bugs, ontbrekende functies of problemen met de beveiliging.",
"This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw %(brand)s ondervindt, <a>dien dan een foutmelding in</a>.",
- "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U upgrade dit gesprek van <oldVersion /> naar <newVersion />.",
+ "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U upgrade deze kamer van <oldVersion /> naar <newVersion />.",
"This will allow you to return to your account after signing out, and sign in on other sessions.": "Daardoor kunt u na afmelding terugkeren tot uw account, en u bij andere sessies aanmelden.",
"Verification Request": "Verificatieverzoek",
"Recovery key mismatch": "Herstelsleutel komt niet overeen",
@@ -1925,15 +1925,15 @@
"Take picture": "Neem een foto",
"Remove for everyone": "Verwijderen voor iedereen",
"Remove for me": "Verwijderen voor mezelf",
- "User Status": "Gebruikersstatus",
+ "User Status": "Persoonsstatus",
"Country Dropdown": "Landselectie",
"Confirm your identity by entering your account password below.": "Bevestig uw identiteit door hieronder uw wachtwoord in te voeren.",
"No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Er is geen identiteitsserver geconfigureerd, dus u kunt geen e-mailadres toevoegen om in de toekomst een nieuw wachtwoord in te stellen.",
"Jump to first unread room.": "Ga naar het eerste ongelezen gesprek.",
"Jump to first invite.": "Ga naar de eerste uitnodiging.",
"Session verified": "Sessie geverifieerd",
- "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. U heeft nu toegang tot uw versleutelde berichten en deze sessie zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
- "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
+ "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. U heeft nu toegang tot uw versleutelde berichten en deze sessie zal voor andere personen als vertrouwd gemarkeerd worden.",
+ "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Deze zal voor andere personen als vertrouwd gemarkeerd worden.",
"Without completing security on this session, it won’t have access to encrypted messages.": "Als u de beveiliging van deze sessie niet vervolledigt, zal ze geen toegang hebben tot uw versleutelde berichten.",
"Go Back": "Terugkeren",
"Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel uw sleutelback-up in of sla uw gesprekssleutels van een andere sessie op voor u een nieuw wachtwoord instelt.",
@@ -1946,7 +1946,7 @@
"Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling te upgraden",
"Restore": "Herstellen",
"You'll need to authenticate with the server to confirm the upgrade.": "U zult moeten inloggen bij de server om het upgraden te bevestigen.",
- "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade deze sessie om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en deze voor andere gebruikers als vertrouwd gemarkeerd worden.",
+ "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade deze sessie om er andere sessies mee te verifiëren. Hiermee krijgen de andere sessies toegang tot uw versleutelde berichten en is het voor andere personen als vertrouwd gemarkeerd .",
"Set up with a recovery key": "Instellen met een herstelsleutel",
"Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewaar een kopie op een veilige plaats, zoals in een wachtwoordbeheerder of een kluis.",
"Your recovery key": "Uw herstelsleutel",
@@ -2004,7 +2004,7 @@
"Interactively verify by Emoji": "Interactief middels emojis",
"Support adding custom themes": "Sta maatwerkthema's toe",
"Opens chat with the given user": "Start een chat met die persoon",
- "Sends a message to the given user": "Zendt die gebruiker een bericht",
+ "Sends a message to the given user": "Zendt die persoon een bericht",
"Font scaling": "Lettergrootte",
"Verify all your sessions to ensure your account & messages are safe": "Controleer al uw sessies om zeker te zijn dat uw account & berichten veilig zijn",
"Verify the new login accessing your account: %(name)s": "Verifieer de nieuwe login op uw account: %(name)s",
@@ -2017,7 +2017,7 @@
"Help us improve %(brand)s": "Help ons %(brand)s nog beter te maken",
"Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Stuur <UsageDataLink>anonieme gebruiksinformatie</UsageDataLink> waarmee we %(brand)s kunnen verbeteren. Dit plaatst een <PolicyLink>cookie</PolicyLink>.",
"I want to help": "Ik wil helpen",
- "Your homeserver has exceeded its user limit.": "Uw homeserver heeft het maximaal aantal gebruikers overschreden.",
+ "Your homeserver has exceeded its user limit.": "Uw homeserver heeft het maximaal aantal personen overschreden.",
"Your homeserver has exceeded one of its resource limits.": "Uw homeserver heeft een van zijn limieten overschreden.",
"Ok": "Oké",
"Light": "Helder",
@@ -2318,16 +2318,16 @@
"We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "De browser is verzocht uw homeserver te onthouden die u gebruikt om in te loggen, maar helaas heeft de browser deze vergeten. Ga naar de inlog-pagina en probeer het opnieuw.",
"We couldn't log you in": "We konden u niet inloggen",
"Room Info": "Gespreksinfo",
- "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is de grootste openbare homeserver van de wereld, dus het is een goede plek voor vele.",
- "Explore Public Rooms": "Verken openbare gesprekken",
- "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privégesprekken zijn alleen zichtbaar en toegankelijk met een uitnodiging. Openbare gesprekken zijn zichtbaar en toegankelijk voor iedereen in deze gemeenschap.",
+ "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is de grootste publieke homeserver van de wereld, en dus een goede plek voor de meeste.",
+ "Explore Public Rooms": "Ontdek publieke kamers",
+ "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privékamers zijn alleen zichtbaar en toegankelijk met een uitnodiging. Publieke kamers zijn zichtbaar en toegankelijk voor iedereen in deze gemeenschap.",
"This room is public": "Dit gesprek is openbaar",
"Show previews of messages": "Voorvertoning van berichten inschakelen",
"Show message previews for reactions in all rooms": "Berichtvoorbeelden voor reacties in alle kamers tonen",
- "Explore public rooms": "Verken openbare gesprekken",
+ "Explore public rooms": "Ontdek publieke kamers",
"Leave Room": "Gesprek verlaten",
"Room options": "Gesprekopties",
- "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start een gesprek met iemand door hun naam, emailadres of gebruikersnaam (zoals <userId/>) te typen.",
+ "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start een gesprek met iemand door hun naam, e-mailadres of inlognaam (zoals <userId/>) te typen.",
"Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Berichten hier zijn eind-tot-eind versleuteld. Verifieer %(displayName)s op hun profiel - klik op hun afbeelding.",
"%(creator)s created this DM.": "%(creator)s maakte deze DM.",
"Switch to dark mode": "Naar donkere modus wisselen",
@@ -2346,14 +2346,14 @@
"Use default": "Gebruik standaardinstelling",
"Show %(count)s more|one": "Toon %(count)s meer",
"Show %(count)s more|other": "Toon %(count)s meer",
- "Show rooms with unread messages first": "Gesprekken met ongelezen berichten als eerste tonen",
+ "Show rooms with unread messages first": "Kamers met ongelezen berichten als eerste tonen",
"%(count)s results|one": "%(count)s resultaten",
"%(count)s results|other": "%(count)s resultaten",
"Explore all public rooms": "Verken alle openbare gespreken",
"Start a new chat": "Nieuw gesprek beginnen",
"Can't see what you’re looking for?": "Niet kunnen vinden waar u naar zocht?",
"Custom Tag": "Aangepast label",
- "Explore community rooms": "Gemeenschapsgesprekken verkennen",
+ "Explore community rooms": "Gemeenschapskamers verkennen",
"Start a Conversation": "Begin een gesprek",
"Show Widgets": "Widgets tonen",
"Hide Widgets": "Widgets verbergen",
@@ -2363,7 +2363,7 @@
"Topic: %(topic)s ": "Onderwerp: %(topic)s ",
"Topic: %(topic)s (<a>edit</a>)": "Onderwerp: %(topic)s (<a>bewerken</a>)",
"This is the beginning of your direct message history with <displayName/>.": "Dit is het begin van de geschiedenis van uw direct gesprek met <displayName/>.",
- "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "De beheerder van uw server heeft eind-tot-eind-versleuteling standaard uitgeschakeld in alle privégesprekken en directe gesprekken.",
+ "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "De beheerder van uw server heeft eind-tot-eind-versleuteling standaard uitgeschakeld in alle privékamers en directe gesprekken.",
"Scroll to most recent messages": "Spring naar meest recente bericht",
"The authenticity of this encrypted message can't be guaranteed on this device.": "De echtheid van dit versleutelde bericht kan op dit apparaat niet worden gegarandeerd.",
"To link to this room, please add an address.": "Voeg een adres toe om naar dit gesprek te kunnen verwijzen.",
@@ -2425,7 +2425,7 @@
"Use a more compact ‘Modern’ layout": "Compacte 'Modern'-layout inschakelen",
"Use custom size": "Aangepaste lettergrootte gebruiken",
"Font size": "Lettergrootte",
- "Enable advanced debugging for the room list": "Geavanceerde bugopsporing voor de gesprekkenlijst inschakelen",
+ "Enable advanced debugging for the room list": "Geavanceerde bugopsporing voor de kamerlijst inschakelen",
"Render LaTeX maths in messages": "Weergeef LaTeX-wiskundenotatie in berichten",
"Change notification settings": "Meldingsinstellingen wijzigen",
"%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
@@ -2474,7 +2474,7 @@
"Matrix": "Matrix",
"Are you sure you want to remove <b>%(serverName)s</b>": "Weet u zeker dat u <b>%(serverName)s</b> wilt verwijderen",
"Your server": "Uw server",
- "Can't find this server or its room list": "Kan deze server of de gesprekkenlijst niet vinden",
+ "Can't find this server or its room list": "Kan de server of haar kamerlijst niet vinden",
"Looks good": "Ziet er goed uit",
"Enter a server name": "Geef een servernaam",
"Continue with %(provider)s": "Doorgaan met %(provider)s",
@@ -2515,7 +2515,7 @@
"Unpin a widget to view it in this panel": "Maak een widget los om het in dit deel te weergeven",
"Unpin": "Losmaken",
"You can only pin up to %(count)s widgets|other": "U kunt maar %(count)s widgets vastzetten",
- "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In versleutelde gesprekken zijn uw berichten beveiligd, enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
+ "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In versleutelde kamers zijn uw berichten beveiligd, enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
"Waiting for you to accept on your other session…": "Wachten totdat u uw uitnodiging in uw andere sessie aanneemt…",
"Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Stel een adres in zodat personen dit gesprek via uw homeserver (%(localDomain)s) kunnen vinden",
"Local Addresses": "Lokale adressen",
@@ -2529,12 +2529,12 @@
"Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Let op, wanneer u geen e-mailadres toevoegt en uw wachtwoord vergeet, kunt u <b>toegang tot uw account permanent verliezen</b>.",
"Continuing without email": "Doorgaan zonder e-mail",
"If they don't match, the security of your communication may be compromised.": "Als deze niet overeenkomen, dan wordt deze sessie mogelijk door iemand anders onderschept.",
- "Confirm by comparing the following with the User Settings in your other session:": "Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar Gebruikersinstellingen van deze sessie overeenkomt met de sleutel hieronder:",
+ "Confirm by comparing the following with the User Settings in your other session:": "Bevestig door het volgende te vergelijken met de persoonsinstellingen in uw andere sessie:",
"Signature upload failed": "Versturen van ondertekening mislukt",
"Signature upload success": "Ondertekening succesvol verstuurd",
"Unable to upload": "Versturen niet mogelijk",
"Transfer": "Doorschakelen",
- "Start a conversation with someone using their name or username (like <userId/>).": "Start een gesprek met iemand door hun naam of gebruikersnaam (zoals <userId/>) te typen.",
+ "Start a conversation with someone using their name or username (like <userId/>).": "Start een gesprek met iemand door hun naam of inlognaam (zoals <userId/>) te typen.",
"May include members not in %(communityName)s": "Mag deelnemers bevatten die geen deel uitmaken van %(communityName)s",
"Invite by email": "Via e-mail uitnodigen",
"Click the button below to confirm your identity.": "Druk op de knop hieronder om uw identiteit te bevestigen.",
@@ -2634,15 +2634,15 @@
"Oman": "Oman",
"Theme added!": "Thema toegevoegd!",
"Add theme": "Thema toevoegen",
- "No recently visited rooms": "Geen onlangs bezochte gesprekken",
+ "No recently visited rooms": "Geen onlangs bezochte kamers",
"Use the <a>Desktop app</a> to see all encrypted files": "Gebruik de <a>Desktop-app</a> om alle versleutelde bestanden te zien",
"Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Herinnering: Uw browser wordt niet ondersteund. Dit kan een negatieve impact hebben op uw ervaring.",
"Use this when referencing your community to others. The community ID cannot be changed.": "Gebruik dit om anderen naar uw gemeenschap te verwijzen. De gemeenschaps-ID kan later niet meer veranderd worden.",
"Please go into as much detail as you like, so we can track down the problem.": "Gebruik a.u.b. zoveel mogelijk details, zodat wij uw probleem kunnen vinden.",
"There are two ways you can provide feedback and help us improve %(brand)s.": "U kunt op twee manieren feedback geven en ons helpen %(brand)s te verbeteren.",
"Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bekijk eerst de <existingIssuesLink>bestaande bugs op GitHub</existingIssuesLink>. <newIssueLink>Maak een nieuwe aan</newIssueLink> wanneer u uw bugs niet heeft gevonden.",
- "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, e-mailadres, gebruikersnaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
- "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, gebruikersnaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
+ "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, e-mailadres, inlognaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
+ "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, inlognaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
"Send feedback": "Feedback versturen",
"Feedback": "Feedback",
"Feedback sent": "Feedback verstuurd",
@@ -2741,29 +2741,29 @@
"Already have an account? <a>Sign in here</a>": "Heeft u al een account? <a>Inloggen</a>",
"%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s of %(usernamePassword)s",
"Continue with %(ssoButtons)s": "Ga verder met %(ssoButtons)s",
- "That username already exists, please try another.": "Die gebruikersnaam bestaat al, probeer een andere.",
+ "That username already exists, please try another.": "Die inlognaam bestaat al, probeer een andere.",
"New? <a>Create account</a>": "Nieuw? <a>Maak een account aan</a>",
- "If you've joined lots of rooms, this might take a while": "Als u zich bij veel gesprekken heeft aangesloten, kan dit een tijdje duren",
+ "If you've joined lots of rooms, this might take a while": "Als u zich bij veel kamers heeft aangesloten, kan dit een tijdje duren",
"Signing In...": "Inloggen...",
"Syncing...": "Synchroniseren...",
"There was a problem communicating with the homeserver, please try again later.": "Er was een communicatieprobleem met de homeserver, probeer het later opnieuw.",
- "Community and user menu": "Gemeenschaps- en gebruikersmenu",
- "User menu": "Gebruikersmenu",
+ "Community and user menu": "Gemeenschaps- en persoonsmenu",
+ "User menu": "Persoonsmenu",
"Switch theme": "Thema wisselen",
"Community settings": "Gemeenschapsinstellingen",
- "User settings": "Gebruikersinstellingen",
+ "User settings": "Persoonsinstellingen",
"Security & privacy": "Veiligheid & privacy",
"New here? <a>Create an account</a>": "Nieuw hier? <a>Maak een account</a>",
"Got an account? <a>Sign in</a>": "Heeft u een account? <a>Inloggen</a>",
"Failed to find the general chat for this community": "De algemene chat voor deze gemeenschap werd niet gevonden",
"Filter rooms and people": "Gespreken en personen filteren",
- "Explore rooms in %(communityName)s": "Ontdek de gesprekken van %(communityName)s",
+ "Explore rooms in %(communityName)s": "Ontdek de kamers van %(communityName)s",
"delete the address.": "het adres verwijderen.",
"Delete the room address %(alias)s and remove %(name)s from the directory?": "Het kameradres %(alias)s en %(name)s uit de gids verwijderen?",
"You have no visible notifications.": "U hebt geen zichtbare meldingen.",
"You’re all caught up": "U bent helemaal bij",
"Self-verification request": "Verzoek om zelfverificatie",
- "You do not have permission to create rooms in this community.": "U hebt geen toestemming om gesprekken te maken in deze gemeenschap.",
+ "You do not have permission to create rooms in this community.": "U hebt geen toestemming om kamers te maken in deze gemeenschap.",
"Cannot create rooms in this community": "Kan geen gesprek maken in deze gemeenschap",
"Upgrade to pro": "Upgrade naar pro",
"Now, let's help you get started": "Laten we u helpen om te beginnen",
@@ -2821,7 +2821,7 @@
"Looks good!": "Ziet er goed uit!",
"Wrong file type": "Verkeerd bestandstype",
"Remember this": "Onthoud dit",
- "The widget will verify your user ID, but won't be able to perform actions for you:": "De widget zal uw gebruikers-ID verifiëren, maar zal geen acties voor u kunnen uitvoeren:",
+ "The widget will verify your user ID, but won't be able to perform actions for you:": "De widget zal uw persoon-ID verifiëren, maar zal geen acties voor u kunnen uitvoeren:",
"Allow this widget to verify your identity": "Sta deze widget toe om uw identiteit te verifiëren",
"Decline All": "Alles weigeren",
"Approve": "Goedkeuren",
@@ -2838,7 +2838,7 @@
"We recommend you change your password and Security Key in Settings immediately": "Wij raden u aan uw wachtwoord en veiligheidssleutel in de instellingen onmiddellijk te wijzigen",
"Data on this screen is shared with %(widgetDomain)s": "Gegevens op dit scherm worden gedeeld met %(widgetDomain)s",
"Modal Widget": "Modale widget",
- "Confirm this user's session by comparing the following with their User Settings:": "Bevestig de sessie van deze gebruiker door het volgende te vergelijken met zijn gebruikersinstellingen:",
+ "Confirm this user's session by comparing the following with their User Settings:": "Bevestig de sessie van deze persoon door het volgende te vergelijken met zijn persoonsinstellingen:",
"Cancelled signature upload": "Geannuleerde ondertekening upload",
"%(brand)s encountered an error during upload of:": "%(brand)s is een fout tegengekomen tijdens het uploaden van:",
"a key signature": "een sleutel ondertekening",
@@ -2847,7 +2847,7 @@
"a new master key signature": "een nieuwe hoofdsleutel ondertekening",
"This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Dit zal ze niet uitnodigen voor %(communityName)s. Als u iemand wilt uitnodigen voor %(communityName)s, klik <a>hier</a>",
"Failed to transfer call": "Oproep niet doorverbonden",
- "A call can only be transferred to a single user.": "Een oproep kan slechts naar één gebruiker worden doorverbonden.",
+ "A call can only be transferred to a single user.": "Een oproep kan slechts naar één personen worden doorverbonden.",
"Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Meer informatie vindt u in onze <privacyPolicyLink />, <termsOfServiceLink /> en <cookiePolicyLink />.",
"Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Door tijdelijk door te gaan, krijgt het installatieproces van %(hostSignupBrand)s toegang tot uw account om geverifieerde e-mailadressen op te halen. Deze gegevens worden niet opgeslagen.",
"Failed to connect to your homeserver. Please close this dialog and try again.": "Kan geen verbinding maken met uw homeserver. Sluit dit dialoogvenster en probeer het opnieuw.",
@@ -2878,18 +2878,18 @@
"You can’t disable this later. Bridges & most bots won’t work yet.": "U kunt dit later niet uitschakelen. Bruggen en de meeste bots zullen nog niet werken.",
"There was an error creating your community. The name may be taken or the server is unable to process your request.": "Er is een fout opgetreden bij het aanmaken van uw gemeenschap. De naam kan bezet zijn of de server is niet in staat om uw aanvraag te verwerken.",
"Preparing to download logs": "Klaarmaken om logs te downloaden",
- "Matrix rooms": "Matrix-gesprekken",
- "%(networkName)s rooms": "%(networkName)s gesprekken",
+ "Matrix rooms": "Matrix-kamers",
+ "%(networkName)s rooms": "%(networkName)s kamers",
"Enter the name of a new server you want to explore.": "Voer de naam in van een nieuwe server die u wilt verkennen.",
"Remove server": "Server verwijderen",
- "All rooms": "Alle gesprekken",
+ "All rooms": "Alle kamers",
"Windows": "Windows",
"Screens": "Schermen",
"Share your screen": "Uw scherm delen",
"Submit logs": "Logs versturen",
"Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Berichten in deze kamer zijn eind-tot-eind-versleuteld. Als personen deelnemen, kan u ze verifiëren in hun profiel, tik hiervoor op hun afbeelding.",
- "In encrypted rooms, verify all users to ensure it’s secure.": "Controleer alle gebruikers in versleutelde gesprekken om er zeker van te zijn dat het veilig is.",
- "Verify all users in a room to ensure it's secure.": "Controleer alle gebruikers in een gesprek om er zeker van te zijn dat het veilig is.",
+ "In encrypted rooms, verify all users to ensure it’s secure.": "Controleer alle personen in versleutelde kamers om er zeker van te zijn dat het veilig is.",
+ "Verify all users in a room to ensure it's secure.": "Controleer alle personen in een kamer om er zeker van te zijn dat het veilig is.",
"%(count)s people|one": "%(count)s persoon",
"Add widgets, bridges & bots": "Widgets, bruggen & bots toevoegen",
"Edit widgets, bridges & bots": "Widgets, bruggen & bots bewerken",
@@ -2900,14 +2900,14 @@
"Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om aan je groep deel te nemen. Om een adres te publiceren moet het eerste ingesteld worden als lokaaladres.",
"Published Addresses": "Gepubliceerde adressen",
"Mentions & Keywords": "Vermeldingen & Trefwoorden",
- "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuw gesprek te beginnen of ontdek de bestaande gesprekken hieronder",
+ "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuwe kamer te beginnen of ontdek de bestaande kamers hieronder",
"Open dial pad": "Kiestoetsen openen",
- "Recently visited rooms": "Onlangs geopende gesprekken",
+ "Recently visited rooms": "Onlangs geopende kamers",
"Add a photo, so people can easily spot your room.": "Voeg een foto toe, zodat personen u gemakkelijk kunnen herkennen in het gesprek.",
"Only the two of you are in this conversation, unless either of you invites anyone to join.": "Alleen u beiden nemen deel aan dit gesprek, tenzij een van u beiden iemand uitnodigt om deel te nemen.",
"Emoji picker": "Emoji kiezer",
"Room ID or address of ban list": "Gesprek-ID of het adres van de banlijst",
- "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Voeg hier gebruikers en servers toe die u wilt negeren. Gebruik asterisken om %(brand)s met alle tekens te laten overeenkomen. Bijvoorbeeld, <code>@bot:*</code> zou alle gebruikers negeren die de naam 'bot' hebben op elke server.",
+ "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Voeg hier personen en servers toe die u wilt negeren. Gebruik asterisken om %(brand)s met alle tekens te laten overeenkomen. Bijvoorbeeld, <code>@bot:*</code> zou alle personen negeren die de naam 'bot' hebben op elke server.",
"Please verify the room ID or address and try again.": "Controleer het gesprek-ID of het adres en probeer het opnieuw.",
"Message layout": "Berichtlayout",
"Custom theme URL": "Aangepaste thema-URL",
@@ -2920,9 +2920,9 @@
"well formed": "goed gevormd",
"%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kan versleutelde berichten niet veilig lokaal opslaan in een webbrowser. Gebruik <desktopLink>%(brand)s Desktop</desktopLink> om versleutelde berichten in zoekresultaten te laten verschijnen.",
"Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprek.",
- "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprekken.",
- "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifieer elke sessie die door een gebruiker wordt gebruikt afzonderlijk. Dit markeert hem als vertrouwd zonder te vertrouwen op kruislings ondertekende apparaten.",
- "User signing private key:": "Gebruikerondertekening-privésleutel:",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s kamers.",
+ "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifieer elke sessie die door een persoon wordt gebruikt afzonderlijk. Dit markeert hem als vertrouwd zonder te vertrouwen op kruislings ondertekende apparaten.",
+ "User signing private key:": "Persoonsondertekening-privésleutel:",
"Master private key:": "Hoofdprivésleutel:",
"Self signing private key:": "Zelfondertekening-privésleutel:",
"Cross-signing is not set up.": "Kruiselings ondertekenen is niet ingesteld.",
@@ -2951,7 +2951,7 @@
"Send a Direct Message": "Start een direct gesprek",
"Welcome to %(appName)s": "Welkom bij %(appName)s",
"<a>Add a topic</a> to help people know what it is about.": "<a>Stel een gespreksonderwerp in</a> zodat de personen weten waar het over gaat.",
- "Upgrade to %(hostSignupBrand)s": "Upgrade naar %(hostSignupBrand)s",
+ "Upgrade to %(hostSignupBrand)s": "%(hostSignupBrand)s upgrade",
"Edit Values": "Waarde wijzigen",
"Values at explicit levels in this room:": "Waarde op expliciete niveaus in dit gesprek:",
"Values at explicit levels:": "Waardes op expliciete niveaus:",
@@ -2981,9 +2981,9 @@
"We'll create rooms for each topic.": "We maken gesprekken voor elk onderwerp.",
"What are some things you want to discuss?": "Wat zijn dingen die u wilt bespreken?",
"Inviting...": "Uitnodigen...",
- "Invite by username": "Op gebruikersnaam uitnodigen",
+ "Invite by username": "Op inlognaam uitnodigen",
"Invite your teammates": "Uw teamgenoten uitnodigen",
- "Failed to invite the following users to your space: %(csvUsers)s": "Het uitnodigen van de volgende gebruikers voor uw space is mislukt: %(csvUsers)s",
+ "Failed to invite the following users to your space: %(csvUsers)s": "Het uitnodigen van de volgende personen voor uw space is mislukt: %(csvUsers)s",
"A private space for you and your teammates": "Een privé space voor u en uw teamgenoten",
"Me and my teammates": "Ik en mijn teamgenoten",
"A private space just for you": "Een privé space alleen voor u",
@@ -2992,9 +2992,9 @@
"Who are you working with?": "Met wie werkt u samen?",
"Finish": "Voltooien",
"At the moment only you can see it.": "Op dit moment kan u deze alleen zien.",
- "Creating rooms...": "Gesprekken aanmaken...",
+ "Creating rooms...": "Kamers aanmaken...",
"Skip for now": "Voorlopig overslaan",
- "Failed to create initial space rooms": "Het maken van de space gesprekken is mislukt",
+ "Failed to create initial space rooms": "Het maken van de space kamers is mislukt",
"Room name": "Gespreksnaam",
"Support": "Ondersteuning",
"Random": "Willekeurig",
@@ -3032,8 +3032,8 @@
"Failed to save space settings.": "Het opslaan van de space-instellingen is mislukt.",
"Space settings": "Space-instellingen",
"Edit settings relating to your space.": "Bewerk instellingen gerelateerd aan uw space.",
- "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, gebruikersnaam (zoals <userId/>) of <a>deel deze space</a>.",
- "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, e-mailadres, gebruikersnaam (zoals <userId/>) of <a>deel deze space</a>.",
+ "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, inlognaam (zoals <userId/>) of <a>deel deze space</a>.",
+ "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, e-mailadres, inlognaam (zoals <userId/>) of <a>deel deze space</a>.",
"Unnamed Space": "Naamloze space",
"Invite to %(spaceName)s": "Voor %(spaceName)s uitnodigen",
"Failed to add rooms to space": "Het toevoegen van gesprekken aan de space is mislukt",
@@ -3045,13 +3045,13 @@
"Filter your rooms and spaces": "Gesprekken en spaces filteren",
"Add existing spaces/rooms": "Bestaande spaces/gesprekken toevoegen",
"Space selection": "Space-selectie",
- "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "U kunt deze wijziging niet ongedaan maken omdat u uzelf rechten ontneemt, als u de laatste bevoegde gebruiker in de ruimte bent zal het onmogelijk zijn om weer rechten te krijgen.",
+ "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "U kunt deze wijziging niet ongedaan maken, omdat u uzelf rechten ontneemt. Als u de laatste bevoegde persoon in de space bent zal het onmogelijk zijn om weer rechten te krijgen.",
"Empty room": "Leeg gesprek",
"Suggested Rooms": "Gespreksuggesties",
"Explore space rooms": "Space-gesprekken ontdekken",
- "You do not have permissions to add rooms to this space": "U hebt geen toestemming om gesprekken toe te voegen in deze space",
- "Add existing room": "Bestaande gesprekken toevoegen",
- "You do not have permissions to create new rooms in this space": "U hebt geen toestemming om gesprekken te maken in deze space",
+ "You do not have permissions to add rooms to this space": "U hebt geen toestemming om kamers toe te voegen in deze space",
+ "Add existing room": "Bestaande kamers toevoegen",
+ "You do not have permissions to create new rooms in this space": "U hebt geen toestemming om kamers te maken in deze space",
"Send message": "Bericht versturen",
"Invite to this space": "Uitnodigen voor deze space",
"Your message was sent": "Uw bericht is verstuurd",
@@ -3090,10 +3090,10 @@
"You're already in a call with this person.": "U bent al een oproep met deze persoon.",
"Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifieer deze login om toegang te krijgen tot uw versleutelde berichten en om anderen te bewijzen dat deze login echt van u is.",
"Verify with another session": "Verifieer met een andere sessie",
- "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We zullen voor elk een gesprek maken. U kunt er later meer toevoegen, inclusief al bestaande gesprekken.",
+ "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We zullen voor elk een kamer maken. U kunt er later meer toevoegen, inclusief al bestaande kamers.",
"Let's create a room for each of them. You can add more later too, including already existing ones.": "Laten we voor elk een gesprek maken. U kunt er later meer toevoegen, inclusief al bestaande gesprekken.",
"Make sure the right people have access. You can invite more later.": "Controleer of de juiste mensen toegang hebben. U kunt later meer mensen uitnodigen.",
- "A private space to organise your rooms": "Een privé space om uw gesprekken te organiseren",
+ "A private space to organise your rooms": "Een privé space om uw kamers te organiseren",
"Just me": "Alleen ik",
"Make sure the right people have access to %(name)s": "Controleer of de juiste mensen toegang hebben tot %(name)s",
"Go to my first room": "Ga naar mijn eerste gesprek",
@@ -3109,16 +3109,16 @@
"Mark as suggested": "Markeer als aanbeveling",
"Mark as not suggested": "Markeer als geen aanbeveling",
"Removing...": "Verwijderen...",
- "Failed to remove some rooms. Try again later": "Het verwijderen van sommige gesprekken is mislukt. Probeer het opnieuw",
+ "Failed to remove some rooms. Try again later": "Het verwijderen van sommige kamers is mislukt. Probeer het opnieuw",
"%(count)s rooms and 1 space|one": "%(count)s gesprek en 1 space",
- "%(count)s rooms and 1 space|other": "%(count)s gesprekken en 1 space",
+ "%(count)s rooms and 1 space|other": "%(count)s kamers en 1 space",
"%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s gesprek en %(numSpaces)s spaces",
- "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s gesprekken en %(numSpaces)s spaces",
+ "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s kamers en %(numSpaces)s spaces",
"If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Als u uw gesprek niet kan vinden, vraag dan om een uitnodiging of <a>maak een nieuw gesprek</a>.",
"Suggested": "Aanbevolen",
"This room is suggested as a good one to join": "Dit is een aanbevolen gesprek om aan deel te nemen",
"%(count)s rooms|one": "%(count)s gesprek",
- "%(count)s rooms|other": "%(count)s gesprekken",
+ "%(count)s rooms|other": "%(count)s kamers",
"You don't have permission": "U heeft geen toestemming",
"Open": "Openen",
"%(count)s messages deleted.|one": "%(count)s bericht verwijderd.",
@@ -3127,7 +3127,7 @@
"Invite to %(roomName)s": "Uitnodiging voor %(roomName)s",
"Edit devices": "Apparaten bewerken",
"Invite People": "Mensen uitnodigen",
- "Invite with email or username": "Uitnodigen per e-mail of gebruikersnaam",
+ "Invite with email or username": "Uitnodigen per e-mail of inlognaam",
"You can change these anytime.": "U kan dit elk moment nog aanpassen.",
"Add some details to help people recognise it.": "Voeg details toe zodat mensen het herkennen.",
"Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Spaces zijn een nieuwe manier voor het groeperen van gesprekken. Voor deelname aan een bestaande space heeft u een uitnodiging nodig.",
@@ -3139,7 +3139,7 @@
"Verify your identity to access encrypted messages and prove your identity to others.": "Verifeer uw identiteit om toegang te krijgen tot uw versleutelde berichten en om uw identiteit te bewijzen voor anderen.",
"Use another login": "Gebruik andere login",
"Please choose a strong password": "Kies een sterk wachtwoord",
- "You can add more later too, including already existing ones.": "U kunt er later nog meer toevoegen, inclusief al bestaande gesprekken.",
+ "You can add more later too, including already existing ones.": "U kunt er later nog meer toevoegen, inclusief al bestaande kamers.",
"Let's create a room for each of them.": "Laten we voor elk een los gesprek maken.",
"What are some things you want to discuss in %(spaceName)s?": "Wat wilt u allemaal bespreken in %(spaceName)s?",
"Verification requested": "Verificatieverzocht",
@@ -3153,7 +3153,7 @@
"Invited people will be able to read old messages.": "Uitgenodigde personen kunnen de oude berichten lezen.",
"We couldn't create your DM.": "We konden uw DM niet aanmaken.",
"Adding...": "Toevoegen...",
- "Add existing rooms": "Bestaande gesprekken toevoegen",
+ "Add existing rooms": "Bestaande kamers toevoegen",
"%(count)s people you know have already joined|one": "%(count)s persoon die u kent is al geregistreerd",
"%(count)s people you know have already joined|other": "%(count)s personen die u kent hebben zijn al geregistreerd",
"Accept on your other login…": "Accepteer op uw andere login…",
@@ -3164,7 +3164,7 @@
"Invite to just this room": "Uitnodigen voor alleen dit gesprek",
"Warn before quitting": "Waarschuwen voordat u afsluit",
"Message search initilisation failed": "Zoeken in berichten opstarten is mislukt",
- "Manage & explore rooms": "Beheer & ontdek gesprekken",
+ "Manage & explore rooms": "Beheer & ontdek kamers",
"Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Overleggen met %(transferTarget)s. <a>Verstuur naar %(transferee)s</a>",
"unknown person": "onbekend persoon",
"Share decryption keys for room history when inviting users": "Deel ontsleutelsleutels voor de gespreksgeschiedenis wanneer u personen uitnodigd",
@@ -3173,7 +3173,7 @@
"Review to ensure your account is safe": "Controleer ze zodat uw account veilig is",
"Sends the given message as a spoiler": "Verstuurt het bericht als een spoiler",
"You are the only person here. If you leave, no one will be able to join in the future, including you.": "U bent de enige persoon hier. Als u weggaat, zal niemand in de toekomst kunnen toetreden, u ook niet.",
- "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Als u alles reset, zult u opnieuw opstarten zonder vertrouwde sessies, zonder vertrouwde gebruikers, en zult u misschien geen vroegere berichten meer kunnen zien.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Als u alles reset zult u opnieuw opstarten zonder vertrouwde sessies, zonder vertrouwde personen, en zult u misschien geen oude berichten meer kunnen zien.",
"Only do this if you have no other device to complete verification with.": "Doe dit alleen als u geen ander apparaat hebt om de verificatie mee uit te voeren.",
"Reset everything": "Alles opnieuw instellen",
"Forgotten or lost all recovery methods? <a>Reset all</a>": "Alles vergeten en alle herstelmethoden verloren? <a>Alles opnieuw instellen</a>",
@@ -3203,7 +3203,7 @@
"Stop the recording": "Opname stoppen",
"%(count)s results in all spaces|one": "%(count)s resultaat in alle spaces",
"%(count)s results in all spaces|other": "%(count)s resultaten in alle spaces",
- "You have no ignored users.": "U heeft geen gebruiker genegeerd.",
+ "You have no ignored users.": "U heeft geen persoon genegeerd.",
"Play": "Afspelen",
"Pause": "Pauze",
"<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Dit is een experimentele functie.</b> Voorlopig moeten nieuwe personen die een uitnodiging krijgen de <link/> gebruiken om daadwerkelijk deel te nemen.",
@@ -3218,11 +3218,11 @@
"Spaces is a beta feature": "Spaces zijn in beta",
"Want to add a new room instead?": "Wilt u anders een nieuw gesprek toevoegen?",
"Adding rooms... (%(progress)s out of %(count)s)|one": "Gesprek toevoegen...",
- "Adding rooms... (%(progress)s out of %(count)s)|other": "Gesprekken toevoegen... (%(progress)s van %(count)s)",
+ "Adding rooms... (%(progress)s out of %(count)s)|other": "Kamers toevoegen... (%(progress)s van %(count)s)",
"Not all selected were added": "Niet alle geselecteerden zijn toegevoegd",
"You can add existing spaces to a space.": "U kunt bestaande spaces toevoegen aan een space.",
"Feeling experimental?": "Zin in een experiment?",
- "You are not allowed to view this server's rooms list": "U heeft geen toegang tot deze server zijn gesprekkenlijst",
+ "You are not allowed to view this server's rooms list": "U heeft geen toegang tot deze server zijn kamerlijst",
"Error processing voice message": "Fout bij verwerking spraakbericht",
"We didn't find a microphone on your device. Please check your settings and try again.": "We hebben geen microfoon gevonden op uw apparaat. Controleer uw instellingen en probeer het opnieuw.",
"No microphone found": "Geen microfoon gevonden",
@@ -3240,13 +3240,13 @@
"%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s zal herladen met Spaces ingeschakeld. Gemeenschappen en labels worden verborgen.",
"Beta available for web, desktop and Android. Thank you for trying the beta.": "De beta is beschikbaar voor web, desktop en Android. Bedankt dat u de beta wilt proberen.",
"%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s zal herladen met Spaces uitgeschakeld. Gemeenschappen en labels zullen weer zichtbaar worden.",
- "Spaces are a new way to group rooms and people.": "Spaces zijn de nieuwe manier om gesprekken en personen te groeperen.",
+ "Spaces are a new way to group rooms and people.": "Spaces zijn de nieuwe manier om kamers en personen te groeperen.",
"Message search initialisation failed": "Zoeken in berichten opstarten is mislukt",
"Spaces are a beta feature.": "Spaces zijn een beta functie.",
"Search names and descriptions": "Namen en beschrijvingen zoeken",
"You may contact me if you have any follow up questions": "U mag contact met mij opnemen als u nog vervolg vragen heeft",
"To leave the beta, visit your settings.": "Om de beta te verlaten, ga naar uw instellingen.",
- "Your platform and username will be noted to help us use your feedback as much as we can.": "Uw platform en gebruikersnaam zullen worden opgeslagen om onze te helpen uw feedback zo goed mogelijk te gebruiken.",
+ "Your platform and username will be noted to help us use your feedback as much as we can.": "Uw platform en inlognaam zullen worden opgeslagen om onze te helpen uw feedback zo goed mogelijk te gebruiken.",
"%(featureName)s beta feedback": "%(featureName)s beta feedback",
"Thank you for your feedback, we really appreciate it.": "Bedankt voor uw feedback, we waarderen het enorm.",
"Beta feedback": "Beta feedback",
@@ -3263,17 +3263,17 @@
"See when people join, leave, or are invited to this room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd voor deze kamer",
"Kick, ban, or invite people to this room, and make you leave": "Verwijder, verban of verwijder personen uit deze kamer en uzelf laten vertrekken",
"Currently joining %(count)s rooms|one": "Momenteel aan het toetreden tot %(count)s gesprek",
- "Currently joining %(count)s rooms|other": "Momenteel aan het toetreden tot %(count)s gesprekken",
+ "Currently joining %(count)s rooms|other": "Momenteel aan het toetreden tot %(count)s kamers",
"Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Probeer andere woorden of controleer op typefouten. Sommige resultaten zijn mogelijk niet zichtbaar omdat ze privé zijn of u een uitnodiging nodig heeft om deel te nemen.",
"No results for \"%(query)s\"": "Geen resultaten voor \"%(query)s\"",
- "The user you called is busy.": "De gebruiker die u belde is bezet.",
- "User Busy": "Gebruiker Bezet",
+ "The user you called is busy.": "De persoon die u belde is bezet.",
+ "User Busy": "Persoon Bezet",
"We're working on this as part of the beta, but just want to let you know.": "We werken hieraan als onderdeel van de beta, maar we willen het u gewoon laten weten.",
- "Teammates might not be able to view or join any private rooms you make.": "Teamgenoten zijn mogelijk niet in staat zijn om privégesprekken die u maakt te bekijken of er lid van te worden.",
+ "Teammates might not be able to view or join any private rooms you make.": "Teamgenoten zijn mogelijk niet in staat zijn om privékamers die u maakt te bekijken of er lid van te worden.",
"Or send invite link": "Of verstuur uw uitnodigingslink",
"If you can't see who you’re looking for, send them your invite link below.": "Als u niet kunt vinden wie u zoekt, stuur ze dan uw uitnodigingslink hieronder.",
"Some suggestions may be hidden for privacy.": "Sommige suggesties kunnen om privacyredenen verborgen zijn.",
- "Search for rooms or people": "Zoek naar gesprekken of personen",
+ "Search for rooms or people": "Zoek naar kamers of personen",
"Message preview": "Voorbeeld van bericht",
"Forward message": "Bericht doorsturen",
"Open link": "Koppeling openen",
@@ -3321,7 +3321,7 @@
"Published addresses can be used by anyone on any server to join your room.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om bij uw gesprek te komen.",
"Published addresses can be used by anyone on any server to join your space.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om uw space te betreden.",
"This space has no local addresses": "Deze space heeft geen lokaaladres",
- "Space information": "Space informatie",
+ "Space information": "Spaceinformatie",
"Collapse": "Invouwen",
"Expand": "Uitvouwen",
"Recommended for public spaces.": "Aanbevolen voor openbare spaces.",
@@ -3344,8 +3344,8 @@
"Show notification badges for People in Spaces": "Toon meldingsbadge voor personen in spaces",
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Indien uitgeschakeld, kunt u nog steeds directe gesprekken toevoegen aan persoonlijke spaces. Indien ingeschakeld, ziet u automatisch iedereen die lid is van de space.",
"Show people in spaces": "Toon personen in spaces",
- "Show all rooms in Home": "Alle gesprekken in Thuis tonen",
- "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Meld aan moderators prototype. In gesprekken die moderatie ondersteunen, kunt u met de `melden` knop misbruik melden aan de gesprekmoderators",
+ "Show all rooms in Home": "Alle kamers in Thuis tonen",
+ "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Meld aan moderators prototype. In kamers die moderatie ondersteunen, kunt u met de `melden` knop misbruik melden aan de kamermoderators",
"%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s heeft de <a>vastgeprikte berichten</a> voor de kamer gewijzigd.",
"%(senderName)s kicked %(targetName)s": "%(senderName)s heeft %(targetName)s verwijderd",
"%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s heeft %(targetName)s verbannen: %(reason)s",
@@ -3381,7 +3381,7 @@
"Keyboard shortcuts": "Sneltoetsen",
"Use Ctrl + F to search timeline": "Gebruik Ctrl +F om te zoeken in de tijdlijn",
"Use Command + F to search timeline": "Gebruik Command + F om te zoeken in de tijdlijn",
- "User %(userId)s is already invited to the room": "De gebruiker %(userId)s is al uitgenodigd voor dit gesprek",
+ "User %(userId)s is already invited to the room": "De persoon %(userId)s is al uitgenodigd voor deze kamer",
"Integration manager": "Integratiebeheerder",
"Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Uw %(brand)s laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
"Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Met het gebruik van deze widget deelt u mogelijk gegevens <helpIcon /> met %(widgetDomain)s & uw integratiebeheerder.",
@@ -3394,7 +3394,7 @@
"Could not connect to identity server": "Kon geen verbinding maken met de identiteitsserver",
"Not a valid identity server (status code %(code)s)": "Geen geldige identiteitsserver (statuscode %(code)s)",
"Identity server URL must be HTTPS": "Identiteitsserver-URL moet HTTPS zijn",
- "User Directory": "Gebruikersgids",
+ "User Directory": "Personengids",
"Copy Link": "Link kopieren",
"There was an error loading your notification settings.": "Er was een fout bij het laden van uw meldingsvoorkeuren.",
"Mentions & keywords": "Vermeldingen & trefwoorden",
@@ -3436,10 +3436,10 @@
"Only invited people can join.": "Alleen uitgenodigde personen kunnen deelnemen.",
"Private (invite only)": "Privé (alleen op uitnodiging)",
"This upgrade will allow members of selected spaces access to this room without an invite.": "Deze upgrade maakt het mogelijk voor leden van geselecteerde spaces om toegang te krijgen tot dit gesprek zonder een uitnodiging.",
- "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Dit maakt het makkelijk om gesprekken privé te houden voor een space, terwijl personen in de space hem kunnen vinden en aan deelnemen. Alle nieuwe gesprekken in deze space hebben deze optie beschikbaar.",
- "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Om space leden te helpen met het vinden van en deel te nemen aan privégesprekken, ga naar uw gespreksinstellingen voor veiligheid & privacy.",
- "Help space members find private rooms": "Help space leden privégesprekken te vinden",
- "Help people in spaces to find and join private rooms": "Help personen in spaces om privégesprekken te vinden en aan deel te nemen",
+ "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Dit maakt het makkelijk om kamers privé te houden voor een space, terwijl personen in de space hem kunnen vinden en aan deelnemen. Alle nieuwe kamers in deze space hebben deze optie beschikbaar.",
+ "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Om space leden te helpen met het vinden van en deel te nemen aan privékamers, ga naar uw kamerinstellingen voor veiligheid & privacy.",
+ "Help space members find private rooms": "Help space leden privékamers te vinden",
+ "Help people in spaces to find and join private rooms": "Help personen in spaces om privékamers te vinden en aan deel te nemen",
"New in the Spaces beta": "Nieuw in de spaces beta",
"Everyone in <SpaceName/> will be able to find and join this room.": "Iedereen in <SpaceName/> kan dit gesprek vinden en aan deelnemen.",
"Image": "Afbeelding",
@@ -3450,7 +3450,7 @@
"You declined this call": "U heeft deze oproep geweigerd",
"The voice message failed to upload.": "Het spraakbericht versturen is mislukt.",
"Access": "Toegang",
- "People with supported clients will be able to join the room without having a registered account.": "Personen met geschikte apps zullen aan de gesprekken kunnen deelnemen zonder een account te hebben.",
+ "People with supported clients will be able to join the room without having a registered account.": "Personen met geschikte apps zullen aan de kamer kunnen deelnemen zonder een account te hebben.",
"Decide who can join %(roomName)s.": "Kies wie kan deelnemen aan %(roomName)s.",
"Space members": "Space leden",
"Anyone in a space can find and join. You can select multiple spaces.": "Iedereen in een space kan zoeken en deelnemen. U kunt meerdere spaces selecteren.",
@@ -3465,8 +3465,8 @@
"Error downloading audio": "Fout bij downloaden van audio",
"<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Let op bijwerken maakt een nieuwe versie van dit gesprek</b>. Alle huidige berichten blijven in dit gearchiveerde gesprek.",
"Automatically invite members from this room to the new one": "Automatisch leden uitnodigen van dit gesprek in de nieuwe",
- "These are likely ones other room admins are a part of.": "Er zijn waarschijnlijk gesprekken waar andere gespreksbeheerders deel van uitmaken.",
- "Other spaces or rooms you might not know": "Andere spaces of gesprekken die u misschien niet kent",
+ "These are likely ones other room admins are a part of.": "Dit zijn waarschijnlijk kamers waar andere kamerbeheerders deel van uitmaken.",
+ "Other spaces or rooms you might not know": "Andere spaces of kamers die u misschien niet kent",
"Spaces you know that contain this room": "Spaces die u kent met dit gesprek",
"Search spaces": "Spaces zoeken",
"Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Kies welke spaces toegang hebben tot dit gesprek. Als een space is geselecteerd kunnen deze leden <RoomName/> vinden en aan deelnemen.",
@@ -3533,5 +3533,62 @@
"Start sharing your screen": "Schermdelen starten",
"Stop sharing your screen": "Schermdelen stoppen",
"Stop the camera": "Camera stoppen",
- "Start the camera": "Camera starten"
+ "Start the camera": "Camera starten",
+ "If a community isn't shown you may not have permission to convert it.": "Als een gemeenschap niet zichtbaar is heeft u geen rechten om hem om te zetten.",
+ "Show my Communities": "Mijn gemeenschappen weergeven",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Gemeenschappen zijn gearchiveerd om ruimte te maken voor Spaces, maar u kunt uw gemeenschap omzetten naar een space hieronder. Hierdoor bent u er zeker van dat uw gesprekken de nieuwste functies krijgen.",
+ "Create Space": "Space aanmaken",
+ "Open Space": "Space openen",
+ "To join an existing space you'll need an invite.": "Om deel te nemen aan een bestaande space heeft u een uitnodiging nodig.",
+ "You can also create a Space from a <a>community</a>.": "U kunt ook een Space maken van een <a>gemeenschap</a>.",
+ "You can change this later.": "U kan dit later aanpassen.",
+ "What kind of Space do you want to create?": "Wat voor soort Space wilt u maken?",
+ "Delete avatar": "Afbeelding verwijderen",
+ "Don't send read receipts": "Geen leesbevestigingen versturen",
+ "Created from <Community />": "Gemaakt van <Community />",
+ "Communities won't receive further updates.": "Gemeenschappen zullen geen updates meer krijgen.",
+ "Spaces are a new way to make a community, with new features coming.": "Spaces zijn de nieuwe gemeenschappen, met binnenkort meer nieuwe functies.",
+ "Communities can now be made into Spaces": "Gemeenschappen kunnen nu omgezet worden in Spaces",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Vraag een <a>beheerder</a> van deze gemeenschap om hem om te zetten in een Space en kijk uit naar de uitnodiging.",
+ "You can create a Space from this community <a>here</a>.": "U kunt <a>hier</a> een Space maken van uw gemeenschap.",
+ "This description will be shown to people when they view your space": "Deze omschrijving zal getoond worden aan personen die uw space bekijken",
+ "Flair won't be available in Spaces for the foreseeable future.": "Badges zijn niet beschikbaar in Spaces in de nabije toekomst.",
+ "All rooms will be added and all community members will be invited.": "Alle kamers zullen worden toegevoegd en alle gemeenschapsleden zullen worden uitgenodigd.",
+ "A link to the Space will be put in your community description.": "Een link naar deze Space zal geplaatst worden in de gemeenschapsomschrijving.",
+ "Create Space from community": "Space van gemeenschap maken",
+ "Failed to migrate community": "Omzetten van de gemeenschap is mislukt",
+ "To create a Space from another community, just pick the community in Preferences.": "Om een Space te maken van een gemeenschap kiest u de gemeenschap in Instellingen.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> is gemaakt en iedereen die lid was van de gemeenschap is ervoor uitgenodigd.",
+ "Space created": "Space aangemaakt",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Om Spaces te zien, verberg gemeenschappen in uw <a>Instellingen</a>",
+ "This community has been upgraded into a Space": "Deze gemeenschap is geupgrade naar een Space",
+ "Unknown failure: %(reason)s": "Onbekende fout: %(reason)s",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug logs bevatten applicatie gebruiksgegevens inclusief uw inlognaam, de ID's of aliassen van de kamers of groepen die u hebt bezocht, welke UI elementen u het laatst hebt gebruikt, en de inlognamen van andere personen. Ze bevatten geen berichten.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Als u een bug hebt ingediend via GitHub, kunnen debug logs ons helpen het probleem op te sporen. Debug logs bevatten applicatie gebruiksgegevens inclusief uw inlognaam, de ID's of aliassen van de kamers of groepen die u hebt bezocht, welke UI elementen u het laatst hebt gebruikt, en de inlognamen van andere personen. Ze bevatten geen berichten.",
+ "Rooms and spaces": "Kamers en spaces",
+ "Results": "Resultaten",
+ "Enable encryption in settings.": "Versleuteling inschakelen in instellingen.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Uw privéberichten zijn versleuteld, maar deze kamer niet. Dit komt vaak doordat u een niet ondersteund apparaat of methode, zoals e-mailuitnodigingen.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Om problemen te voorkomen, maak een<a>nieuwe publieke kamer</a> voor de gesprekken die u wilt voeren.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Het wordt afgeraden om publieke kamers te versleutelen.</b> Het betekend dat iedereen u kan vinden en aan deelnemen, dus iedereen kan al de berichten lezen. U krijgt dus geen voordelen bij versleuteling. Versleutelde berichten in een publieke kamer maakt het ontvangen en versturen van berichten langzamer.",
+ "Are you sure you want to make this encrypted room public?": "Weet u zeker dat u deze publieke kamer wilt versleutelen?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Om deze problemen te voorkomen, maak een <a>nieuwe versleutelde kamer</a> voor de gesprekken die u wilt voeren.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Het wordt afgeraden om versleuteling in te schakelen voor publieke kamers.</b>Iedereen kan publieke kamers vinden en aan deelnemen, dus iedereen kan de berichten lezen. U krijgt geen voordelen van de versleuteling en u kunt het later niet uitschakelen. Berichten versleutelen in een publieke kamer maakt het ontvangen en versturen van berichten langzamer.",
+ "Are you sure you want to add encryption to this public room?": "Weet u zeker dat u versleuteling wil inschakelen voor deze publieke kamer?",
+ "Cross-signing is ready but keys are not backed up.": "Kruiselings ondertekenen is klaar, maar de sleutels zijn nog niet geback-upt.",
+ "Low bandwidth mode (requires compatible homeserver)": "Lage bandbreedte modus (compatibele homeserver vereist)",
+ "Multiple integration managers (requires manual setup)": "Meerdere integratiemanagers (vereist handmatige instelling)",
+ "Thread": "Draad",
+ "Show threads": "Draad weergeven",
+ "Threaded messaging": "Draad berichten",
+ "The above, but in <Room /> as well": "Het bovenstaande, maar ook in <Room />",
+ "The above, but in any room you are joined or invited to as well": "Het bovenstaande, maar in elke kamer waar u aan deelneemt en voor uitgenodigd bent",
+ "Autoplay videos": "Videos automatisch afspelen",
+ "Autoplay GIFs": "GIF's automatisch afspelen",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s maakte een vastgeprikt bericht los van deze kamer. Bekijk alle vastgeprikte berichten.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s maakte <a>een vastgeprikt bericht</a> los van deze kamer. Bekijk alle <b>vastgeprikte berichten</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s prikte een bericht vast aan deze kamer. Bekijk alle vastgeprikte berichten.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s prikte <a>een bericht</a> aan deze kamer. Bekijk alle <b>vastgeprikte berichten</b>.",
+ "Currently, %(count)s spaces have access|one": "Momenteel heeft één ruimte toegang",
+ "& %(count)s more|one": "& %(count)s meer"
}
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 524d73eeca..cccbed79a7 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -2378,5 +2378,9 @@
"Identity server (%(server)s)": "Serwer tożsamości (%(server)s)",
"Could not connect to identity server": "Nie można połączyć z serwerem tożsamości",
"Not a valid identity server (status code %(code)s)": "Nieprawidłowy serwer tożsamości (kod statusu %(code)s)",
- "Identity server URL must be HTTPS": "URL serwera tożsamości musi być HTTPS"
+ "Identity server URL must be HTTPS": "URL serwera tożsamości musi być HTTPS",
+ "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Twój serwer domowy odrzucił twoją próbę zalogowania się. Może być to spowodowane zbyt długim czasem oczekiwania. Prosimy spróbować ponownie. Jeśli problem się powtórzy, prosimy o kontakt z administratorem twojego serwera domowego.",
+ "Failed to transfer call": "Nie udało się przekazać połączenia",
+ "Transfer Failed": "Transfer nie powiódł się",
+ "Unable to transfer call": "Nie udało się przekazać połączenia"
}
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 789a38811f..6d6bf86559 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3579,5 +3579,7 @@
"Unable to transfer call": "Не удалось перевести звонок",
"Olm version:": "Версия Olm:",
"%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s изменил(а) <a>прикреплённые сообщения</a> в комнате %(count)s раз.",
- "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s изменили <a>прикреплённые сообщения</a> в комнате %(count)s раз."
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s изменили <a>прикреплённые сообщения</a> в комнате %(count)s раз.",
+ "Delete avatar": "Удалить аватар",
+ "Don't send read receipts": "Не отправлять уведомления о прочтении"
}
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 97fdc998dc..937461dbc7 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -3633,5 +3633,62 @@
"Stop sharing your screen": "Reshtni dhënien e ekranit tuaj",
"Stop the camera": "Ndale kamerën",
"Start the camera": "Nise kamerën",
- "Surround selected text when typing special characters": "Rrethoje tekstin e përzgjedhur, kur shtypen shenja speciale"
+ "Surround selected text when typing special characters": "Rrethoje tekstin e përzgjedhur, kur shtypen shenja speciale",
+ "Created from <Community />": "Krijuar prej <Community />",
+ "Communities won't receive further updates.": "Për bashkësitë s’do të ketë përditësime të mëtejshme.",
+ "Spaces are a new way to make a community, with new features coming.": "Hapësirat janë një rrugë e re për të krijuar një bashkësi, me veçori të reja së afërmi.",
+ "Communities can now be made into Spaces": "Tanimë bashkësitë mund të shndërrohen në Hapësira",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Kërkojini <a>përgjegjësve</a> të kësaj bashkësie ta shndërrojnë në një Hapësirë dhe hapni sytë për ftesën.",
+ "You can create a Space from this community <a>here</a>.": "<a>Këtu</a> mund të krijoni një Hapësirë prej kësaj bashkësie.",
+ "This description will be shown to people when they view your space": "Ky përshkrim do t’u tregohet personave kur shohin hapësirën tuaj",
+ "All rooms will be added and all community members will be invited.": "Do të shtohen krejt dhomat dhe do të ftohen krejt anëtarët e bashkësisë.",
+ "A link to the Space will be put in your community description.": "Një lidhje për te Hapësira do të vendoset te përshkrimi i bashkësisë tuaj.",
+ "Create Space from community": "Krijo Hapësirë prej bashkësie",
+ "Failed to migrate community": "S’u arrit të migrohej bashkësia",
+ "To create a Space from another community, just pick the community in Preferences.": "Që të krijoni një Hapësirë prej një bashkësie tjetër, thjesht zgjidhni bashkësinë te Parapëlqimet.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> është krijuar dhe cilido që qe pjesë e bashkësisë është ftuar në të.",
+ "Space created": "Hapësira u krijua",
+ "To view Spaces, hide communities in <a>Preferences</a>": "Që të shihni Hapësira, fshini bashkësitë te <a>Parapëlqime</a>",
+ "This community has been upgraded into a Space": "Kjo bashkësi është përmirësuar në një Hapësirë",
+ "If a community isn't shown you may not have permission to convert it.": "Nëse një bashkësi s’është shfaqur, mund të mos keni leje për ta shndërruar atë.",
+ "Show my Communities": "Shfaqi Bashkësitë e mia",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Bashkësitë janë arkivuar, për t’ua lënë vendin Hapësirave, por mundeni, më poshtë, të shndërroni bashkësitë tuaja në Hapësira. Shndërrimi do të garantojë që bisedat tuaja të marrin veçoritë më të reja.",
+ "Create Space": "Krijo Hapësirë",
+ "Open Space": "Hap Hapësirë",
+ "To join an existing space you'll need an invite.": "Që të hyni në një hapësirë ekzistuese, ju duhet një ftesë.",
+ "You can also create a Space from a <a>community</a>.": "Mundeni të krijoni një Hapësirë edhe prej një <a>bashkësie</a>.",
+ "You can change this later.": "Këtë mund ta ndryshoni më vonë.",
+ "What kind of Space do you want to create?": "Ç’lloj Hapësire doni të krijoni?",
+ "Delete avatar": "Fshije avatarin",
+ "Don't send read receipts": "Mos dërgo dëftesa leximi",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Regjistrat e diagnostikimit përmbajnë të dhëna mbi përdorimin e aplikacionit, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar, me cilat elemente të UI-t keni ndërvepruar së fundi, dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhe.",
+ "Unknown failure: %(reason)s": "Dështim për arsye të panjohur: %(reason)s",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Nëse keni parashtruar një të metë përmes GitHub-it, regjistrat e diagnostikimit mund të na ndihmojnë të zbulojmë problemin. Regjistrat e diagnostikimit përmbajnë të dhëna mbi përdorimin e aplikacionit, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar, me cilat elemente të UI-t keni ndërvepruar së fundi, dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhe.",
+ "Enable encryption in settings.": "Aktivizoni fshehtëzimin te rregullimet.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Mesazhet tuaja private normalisht fshehtëzohen, por kjo dhomë s’fshehtëzohet. Zakonisht kjo vjen për shkak të përdorimit të një pajisjeje ose metode të pambuluar, bie fjala, ftesa me email.",
+ "Cross-signing is ready but keys are not backed up.": "“Cross-signing” është gati, por kyçet s’janë koperuajtur.",
+ "Rooms and spaces": "Dhoma dhe hapësira",
+ "Results": "Përfundime",
+ "Are you sure you want to add encryption to this public room?": "A jeni i sigurt se doni të shtohet fshehtëzim në këtë dhomë publike?",
+ "Thumbs up": "",
+ "Remain on your screen while running": "Rrini në ekran për deri sa është hapur",
+ "Remain on your screen when viewing another room, when running": "Rrini në ekran për deri sa jeni duke shikuar një dhomë tjetër",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nuk rekomandohet të bëhen publike dhoma të fshehtëzuara.</b> Kjo do të thoshte se cilido mund të gjejë dhe hyjë te dhoma, pra cilido mund të lexojë mesazhet. S’do të përfitoni asnjë nga të mirat e fshehtëzimit. Fshehtëzimi i mesazheve në një dhomë publike do ta ngadalësojë marrjen dhe dërgimin e tyre.",
+ "Are you sure you want to make this encrypted room public?": "Jeni i sigurt se doni ta bëni publike këtë dhomë të fshehtëzuar?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Për të shmangur këto probleme, krijoni një <a>dhomë të re të fshehtëzuar</a> për bisedën që keni në plan të bëni.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nuk rekomandohet të shtohet fshehtëzim në dhoma publike.</b>Dhomat publike mund t’i gjejë dhe hyjë në to kushdo, që cilido të mund të lexojë mesazhet në to. S’do të përfitoni asnjë nga të mirat e fshehtëzimit, dhe s’do të jeni në gjendje ta çaktivizoni më vonë. Fshehtëzimi i mesazheve në një dhomë publike do të ngadalësojë marrjen dhe dërgimin e mesazheve.",
+ "Thread": "Rrjedhë",
+ "Show threads": "Shfaq rrjedha",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Për të shmangur këto probleme, krijoni për bisedën që keni në plan një <a>dhomë të re publike</a>.",
+ "Low bandwidth mode (requires compatible homeserver)": "Mënyra trafik me shpejtësi të ulët (lyp shërbyes Home të përputhshëm)",
+ "Multiple integration managers (requires manual setup)": "Përgjegjës të shumtë integrimi (lyp ujdisje dorazi)",
+ "Threaded messaging": "Mesazhe me rrjedha",
+ "The above, but in <Room /> as well": "Atë më sipër, por edhe te <Room />",
+ "The above, but in any room you are joined or invited to as well": "Atë më sipër, por edhe në çfarëdo dhome ku keni hyrë ose jeni ftuar",
+ "Autoplay videos": "Vetëluaji videot",
+ "Autoplay GIFs": "Vetëluaji GIF-et",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s hoqi fiksimin e një mesazhi nga kjo dhomë. Shihni krejt mesazhet e fiksuar.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s hoqi fiksimin e <a>një mesazhi</a> nga kjo dhomë. Shihni krejt <b>mesazhet e fiksuar</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fiksoi një mesazh te kjo dhomë. Shihni krejt mesazhet e fiksuar.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fiksoi <a>një mesazh</a> te kjo dhomë. Shini krejt <b>mesazhet e fiksuar</b>."
}
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index e5e9cc5d34..fdd5ab36ba 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -3354,7 +3354,7 @@
"%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepterade inbjudan för %(displayName)s",
"Some invites couldn't be sent": "Vissa inbjudningar kunde inte skickas",
"We sent the others, but the below people couldn't be invited to <RoomName/>": "Vi skickade de andra, men personerna nedan kunde inte bjudas in till <RoomName/>",
- "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Vad användaren skriver är fel.\nDet här kommer att anmälas till rumsmoderatorerna.",
+ "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Vad användaren skriver är fel.\nDetta kommer att anmälas till rumsmoderatorerna.",
"Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototyp av anmälan till moderatorer. I rum som söder moderering så kommer `anmäl`-knappen att låta dig anmäla olämpligt beteende till rummets moderatorer",
"Report": "Rapportera",
"Integration manager": "Integrationshanterare",
@@ -3367,5 +3367,257 @@
"Identity server (%(server)s)": "Identitetsserver (%(server)s)",
"Could not connect to identity server": "Kunde inte ansluta till identitetsservern",
"Not a valid identity server (status code %(code)s)": "Inte en giltig identitetsserver (statuskod %(code)s)",
- "Identity server URL must be HTTPS": "URL för identitetsserver måste vara HTTPS"
+ "Identity server URL must be HTTPS": "URL för identitetsserver måste vara HTTPS",
+ "Failed to update the history visibility of this space": "Misslyckades att uppdatera historiksynlighet för det här utrymmet",
+ "Failed to update the guest access of this space": "Misslyckades att uppdatera gäståtkomst för det här utrymmet",
+ "Failed to update the visibility of this space": "Misslyckades att uppdatera synligheten för det här utrymmet",
+ "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Tack för att du prövar utrymmen. Din återkoppling kommer att underrätta kommande versioner.",
+ "Show all rooms": "Visa alla rum",
+ "To join an existing space you'll need an invite.": "För att gå med i ett existerande utrymme så behöver du en inbjudan.",
+ "You can also create a Space from a <a>community</a>.": "Du kan också skapa ett utrymme från en <a>gemenskap</a>.",
+ "You can change this later.": "Du kan ändra detta senare.",
+ "What kind of Space do you want to create?": "Vad för slags utrymme vill du skapa?",
+ "Address": "Adress",
+ "e.g. my-space": "t.ex. mitt-utrymme",
+ "Give feedback.": "Ge återkoppling.",
+ "Spaces feedback": "Utrymmesåterkoppling",
+ "Spaces are a new feature.": "Utrymmen är en ny funktion.",
+ "Delete avatar": "Radera avatar",
+ "Mute the microphone": "Tysta mikrofonen",
+ "Unmute the microphone": "Avtysta mikrofonen",
+ "Dialpad": "Knappsats",
+ "More": "Mer",
+ "Show sidebar": "Visa sidopanel",
+ "Hide sidebar": "Göm sidopanel",
+ "Start sharing your screen": "Börja dela din skärm",
+ "Stop sharing your screen": "Sluta dela din skärm",
+ "Stop the camera": "Stoppa kameran",
+ "Start the camera": "Starta kameran",
+ "Your camera is still enabled": "Din kamera är fortfarande på",
+ "Your camera is turned off": "Din kamera är av",
+ "%(sharerName)s is presenting": "%(sharerName)s presenterar",
+ "You are presenting": "Du presenterar",
+ "All rooms you're in will appear in Home.": "Alla rum du är in kommer att visas i Hem.",
+ "Show all rooms in Home": "Visa alla rum i Hem",
+ "Surround selected text when typing special characters": "Inneslut valt text vid skrivning av specialtecken",
+ "Use Ctrl + F to search timeline": "Använd Ctrl + F för att söka på tidslinjen",
+ "Use Command + F to search timeline": "Använd Kommando + F för att söka på tidslinjen",
+ "Don't send read receipts": "Skicka inte läskvitton",
+ "New layout switcher (with message bubbles)": "Ny arrangemangsbytare (med meddelandebubblor)",
+ "Send pseudonymous analytics data": "Skicka pseudoanonym statistik",
+ "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Det här gör det enkelt för rum att hållas privat för ett utrymme, medan personer i utrymmet kan hitta och gå med i det. Alla nya rum i ett utrymme kommer att ha det här tillgängligt.",
+ "To help space members find and join a private room, go to that room's Security & Privacy settings.": "För att hjälpa utrymmesmedlemmar att hitta och gå med i ett privat rum, gå till det rummets säkerhets- och sekretessinställningar.",
+ "Help space members find private rooms": "Hjälp utrymmesmedlemmar att hitta privata rum",
+ "Help people in spaces to find and join private rooms": "Hjälp folk i utrymmen att hitta och gå med i privata rum",
+ "New in the Spaces beta": "Nytt i utrymmesbetan",
+ "Silence call": "Tysta samtal",
+ "Sound on": "Ljud på",
+ "User %(userId)s is already invited to the room": "Användaren %(userId)s har redan bjudits in till rummet",
+ "Transfer Failed": "Överföring misslyckades",
+ "Unable to transfer call": "Kan inte överföra samtal",
+ "Space information": "Utrymmesinfo",
+ "Images, GIFs and videos": "Bilder, GIF:ar och videor",
+ "Code blocks": "Kodblock",
+ "Displaying time": "Visar tid",
+ "To view all keyboard shortcuts, click here.": "För att se alla tangentbordsgenvägar, klicka här.",
+ "Keyboard shortcuts": "Tangentbordsgenvägar",
+ "If a community isn't shown you may not have permission to convert it.": "Om en gemenskap inte syns så kanske du inte har behörighet att se den.",
+ "Show my Communities": "Visa mina gemenskaper",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Gemenskaper har arkiverats för att göra plats för utrymmen men du kan konvertera dina gemenskaper till utrymmen nedan. Konvertering säkerställer att dina konversationer får de senaste funktionerna.",
+ "Create Space": "Skapa utrymme",
+ "Open Space": "Öppna utrymme",
+ "Identity server is": "Identitetsserver är",
+ "Olm version:": "Olm-version:",
+ "There was an error loading your notification settings.": "Ett fel inträffade när dina aviseringsinställningar laddades.",
+ "Mentions & keywords": "Omnämnanden & nyckelord",
+ "Global": "Globalt",
+ "New keyword": "Nytt nyckelord",
+ "Keyword": "Nyckelord",
+ "Enable email notifications for %(email)s": "Aktivera e-postaviseringar för %(email)s",
+ "Enable for this account": "Aktivera för det här kontot",
+ "An error occurred whilst saving your notification preferences.": "Ett fel inträffade när dina aviseringsinställningar sparades.",
+ "Error saving notification preferences": "Fel vid sparning av aviseringsinställningar",
+ "Messages containing keywords": "Meddelanden som innehåller nyckelord",
+ "Message bubbles": "Meddelandebubblor",
+ "IRC": "IRC",
+ "Collapse": "Kollapsa",
+ "Expand": "Expandera",
+ "Recommended for public spaces.": "Rekommenderas för offentliga utrymmen.",
+ "Allow people to preview your space before they join.": "Låt personer granska ditt utrymme innan de går med.",
+ "Preview Space": "Granska utrymme",
+ "only invited people can view and join": "bara inbjudna personer kan se och gå med",
+ "Invite only": "Endast inbjudan",
+ "anyone with the link can view and join": "vem som helst med länken kan se och gå med",
+ "Decide who can view and join %(spaceName)s.": "Bestäm vem kan se och gå med i %(spaceName)s.",
+ "Visibility": "Synlighet",
+ "This may be useful for public spaces.": "Det här kan vara användbart för ett offentligt utrymme.",
+ "Guests can join a space without having an account.": "Gäster kan gå med i ett utrymme utan att ha ett konto.",
+ "Enable guest access": "Aktivera gäståtkomst",
+ "Stop recording": "Stoppa inspelning",
+ "Copy Room Link": "Kopiera rumslänk",
+ "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Du kan nu dela din skärm genom att klicka på skärmdelningsknappen under ett samtal. Du kan till och med göra detta under ett ljudsamtal om båda ändar stöder det!",
+ "Screen sharing is here!": "Skärmdelning är här!",
+ "Send voice message": "Skicka röstmeddelande",
+ "Show %(count)s other previews|one": "Visa %(count)s annan förhandsgranskning",
+ "Show %(count)s other previews|other": "Visa %(count)s andra förhandsgranskningar",
+ "Access": "Åtkomst",
+ "People with supported clients will be able to join the room without having a registered account.": "Personer med stödda klienter kommer kunna gå med i rummet utan ett registrerat konto.",
+ "Decide who can join %(roomName)s.": "Bestäm vem som kan gå med i %(roomName)s.",
+ "Space members": "Utrymmesmedlemmar",
+ "Anyone in a space can find and join. You can select multiple spaces.": "Vem som helst i ett utrymme kan hitta och gå med. Du kan välja flera utrymmen.",
+ "Anyone in %(spaceName)s can find and join. You can select other spaces too.": "Vem som helst i %(spaceName)s kan hitta och gå med. Du kan välja andra utrymmen också.",
+ "Spaces with access": "Utrymmen med åtkomst",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Vem som helst i ett utrymme kan hitta och gå med. <a>Redigera vilka utrymmen som kan komma åt här.</a>",
+ "Currently, %(count)s spaces have access|other": "Just nu har %(count)s utrymmen åtkomst",
+ "& %(count)s more|other": "& %(count)s till",
+ "Upgrade required": "Uppgradering krävs",
+ "Anyone can find and join.": "Vem som helst kan hitta och gå med.",
+ "Only invited people can join.": "Endast inbjudna personer kan gå med.",
+ "Private (invite only)": "Privat (endast inbjudan)",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "Den här uppgraderingen kommer att låta medlemmar i valda utrymmen komma åt det här rummet utan en inbjudan.",
+ "This space has no local addresses": "Det här utrymmet har inga lokala adresser",
+ "Image": "Bild",
+ "Sticker": "Dekal",
+ "Error processing audio message": "Fel vid hantering av ljudmeddelande",
+ "Decrypting": "Avkrypterar",
+ "The call is in an unknown state!": "Det här samtalet är i ett okänt läge!",
+ "Missed call": "Missat samtal",
+ "Unknown failure: %(reason)s": "Okänt fel: %(reason)s",
+ "An unknown error occurred": "Ett okänt fel inträffade",
+ "Their device couldn't start the camera or microphone": "Deras enhet kunde inte starta kameran eller mikrofonen",
+ "Connection failed": "Anslutning misslyckad",
+ "Could not connect media": "Kunde inte ansluta media",
+ "No answer": "Inget svar",
+ "Call back": "Ring tillbaka",
+ "Call declined": "Samtal nekat",
+ "Connected": "Ansluten",
+ "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Sätt adresser för det här utrymmet så att användare kan hitta det genom din hemserver (%(localDomain)s)",
+ "To publish an address, it needs to be set as a local address first.": "För att publicera en adress så måste den vara satt som en lokal adress först.",
+ "Published addresses can be used by anyone on any server to join your room.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt rum.",
+ "Published addresses can be used by anyone on any server to join your space.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt utrymme.",
+ "Please provide an address": "Ange en adress, tack",
+ "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)sändrade de <a>fästa meddelandena</a> för rummet %(count)s gånger.",
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)sändrade de <a>fästa meddelandena</a> för rummet %(count)s gånger.",
+ "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sändrade server-ACL:erna",
+ "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sändrade server-ACL:erna %(count)s gånger",
+ "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sändrade server-ACL:erna",
+ "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sändrade server-ACL:erna %(count)s gånger",
+ "Share content": "Dela innehåll",
+ "Application window": "Programfönster",
+ "Share entire screen": "Dela hela skärmen",
+ "Message search initialisation failed, check <a>your settings</a> for more information": "Initialisering av meddelandesök misslyckades, kolla <a>dina inställningar</a> för mer information",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Om du har rapporterat en bugg via GitHub så kan felsökningsloggar hjälpa oss att hitta problemet. Felsökningsloggar innehåller användningsdata som inkluderar ditt användarnamn, ID:n eller alias för rum och grupper du har besökt, vilka UI-element du har interagerat med, och användarnamn för andra användare. De innehåller inte meddelanden.",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Felsökningsloggar innehåller användningsdata som inkluderar ditt användarnamn, ID:n eller alias för rum och grupper du har besökt, vilka UI-element du har interagerat med, och användarnamn för andra användare. De innehåller inte meddelanden.",
+ "Adding spaces has moved.": "Tilläggning av utrymmen har flyttats.",
+ "Search for rooms": "Sök efter rum",
+ "Search for spaces": "Sök efter utrymmen",
+ "Create a new space": "Skapa ett nytt utrymme",
+ "Want to add a new space instead?": "Vill du lägga till ett nytt utrymme istället?",
+ "Add existing space": "Lägg till existerande utrymme",
+ "[number]": "[nummer]",
+ "We're working on this, but just want to let you know.": "Vi jobbar på detta, men vill bara låta dig veta.",
+ "Search for rooms or spaces": "Sök efter rum eller gemenskaper",
+ "Created from <Community />": "Skapad från <Community />",
+ "To view %(spaceName)s, you need an invite": "För att se %(spaceName)s så behöver du en inbjudan",
+ "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Du kan klicka på en avatar i filterpanelen när som helst för att se endast rum och personer associerade med gemenskapen.",
+ "Unable to copy a link to the room to the clipboard.": "Kunde inte kopiera en länk till rummet till klippbordet.",
+ "Unable to copy room link": "Kunde inte kopiera rumslänken",
+ "Communities won't receive further updates.": "Gemenskaper kommer inte att uppgraderas vidare.",
+ "Spaces are a new way to make a community, with new features coming.": "Utrymmen är att nytt sätt att skapa en gemenskap, med ny funktionalitet inkommande.",
+ "Communities can now be made into Spaces": "Gemenskaper kan nu göras om till utrymmen",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Be <a>administratören</a> för den här gemenskapen att göra om den till ett utrymme och håll utkik efter en inbjudan.",
+ "You can create a Space from this community <a>here</a>.": "Du kan skapa ett utrymme från den här gemenskapen <a>här</a>.",
+ "Error downloading audio": "Fel vid nedladdning av ljud",
+ "Unnamed audio": "Namnlöst ljud",
+ "Move down": "Flytta ner",
+ "Move up": "Flytta upp",
+ "Add space": "Lägg till utrymme",
+ "Collapse reply thread": "Kollapsa svarstråd",
+ "Show preview": "Visa förhandsgranskning",
+ "View source": "Visa källkod",
+ "Forward": "Vidarebefordra",
+ "Settings - %(spaceName)s": "Inställningar - %(spaceName)s",
+ "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Observera att en uppgradering kommer att skapa en ny version av rummet</b>. Alla nuvarande meddelanden kommer att stanna i det arkiverade rummet.",
+ "Automatically invite members from this room to the new one": "Bjud automatiskt in medlemmar från det här rummet till det nya",
+ "Report the entire room": "Rapportera hela rummet",
+ "Spam or propaganda": "Spam eller propaganda",
+ "Illegal Content": "Olagligt innehåll",
+ "Toxic Behaviour": "Stötande beteende",
+ "Disagree": "Håll inte med",
+ "Please pick a nature and describe what makes this message abusive.": "Välj en art och beskriv vad som gör detta meddelande kränkande.",
+ "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Det här rummet är dedikerat till olagligt eller stötande innehåll, eller så modererar inte moderatorerna olagligt eller stötande innehåll ordentligt.\nDetta kommer att rapporteras till administratörerna för %(homeserver)s.",
+ "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Det här rummet är dedikerat till olagligt eller stötande innehåll, eller så modererar inte moderatorerna olagligt eller stötande innehåll ordentligt.\nDetta kommer att rapporteras till administratörerna för %(homeserver)s. Administratörerna kommer inte kunna läsa krypterat innehåll i rummet.",
+ "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Annan orsak. Beskriv problemet tack.\nDetta kommer att rapporteras till rumsmoderatorerna.",
+ "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Användaren spammar rummet med reklam eller länkar till reklam eller propaganda.\nDetta kommer att rapporteras till rumsmoderatorerna.",
+ "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Användaren påvisar olagligt beteende, som att doxa folk eller hota med våld.\nDetta kommer att rapporteras till rumsmoderatorerna som kanske eskalerar detta till juridiska myndigheter.",
+ "This user is displaying toxic behaviour, for instance by insulting other users or sharing adult-only content in a family-friendly room or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Användaren påvisar stötande beteende, som att förolämpa andra användare, att dela vuxet innehåll i ett familjevänligt rum eller på annat sätt bryta mot reglerna i rummet.\nDetta kommer att rapporteras till rummets moderatorer.",
+ "These are likely ones other room admins are a part of.": "Dessa är troligen såna andra rumsadmins är med i.",
+ "Other spaces or rooms you might not know": "Andra utrymmen du kanske inte känner till",
+ "Spaces you know that contain this room": "Utrymmen du känner till som innehåller det här rummet",
+ "Search spaces": "Sök i utrymmen",
+ "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Bestäm vilka utrymmen som kan komma åt det hör rummet. Om ett utrymme väljs så kan dess medlemmar hitta och gå med i <RoomName/>.",
+ "Select spaces": "Välj utrymmen",
+ "You're removing all spaces. Access will default to invite only": "Du tar bort alla utrymmen. Åtkomst kommer att sättas som förval till endast inbjudan",
+ "Are you sure you want to leave <spaceName/>?": "Är du säker på att du vill lämna <spaceName/>?",
+ "Leave %(spaceName)s": "Lämna %(spaceName)s",
+ "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Du är den enda administratören i vissa rum eller utrymmen du vill lämna. Om du lämnar så kommer vissa av dem sakna administratör.",
+ "You're the only admin of this space. Leaving it will mean no one has control over it.": "Du är den enda administratören i utrymmet. Om du lämnar nu så kommer ingen ha kontroll över det.",
+ "You won't be able to rejoin unless you are re-invited.": "Du kommer inte kunna gå med igen om du inte bjuds in igen.",
+ "Search %(spaceName)s": "Sök i %(spaceName)s",
+ "Leave specific rooms and spaces": "Lämna specifika rum och utrymmen",
+ "Don't leave any": "Lämna inte några",
+ "Leave all rooms and spaces": "Lämna alla rum och utrymmen",
+ "User Directory": "Användarkatalog",
+ "Want to add an existing space instead?": "Vill du lägga till ett existerande utrymme istället?",
+ "Add a space to a space you manage.": "Lägg till ett utrymme till ett utrymme du kan hantera.",
+ "Only people invited will be able to find and join this space.": "Bara inbjudna personer kommer kunna hitta och gå med i det här utrymmet.",
+ "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Vem som helst kommer kunna hitta och gå med i det här utrymme, inte bara medlemmar i <SpaceName/>.",
+ "Anyone in <SpaceName/> will be able to find and join.": "Vem som helst i <SpaceName/> kommer kunna hitta och gå med.",
+ "Private space (invite only)": "Privat utrymme (endast inbjudan)",
+ "Space visibility": "Utrymmessynlighet",
+ "This description will be shown to people when they view your space": "Den här beskrivningen kommer att visas för personer när de ser ditt utrymme",
+ "Flair won't be available in Spaces for the foreseeable future.": "Emblem kommer inte vara tillgängliga i utrymmen i den överskådliga framtiden.",
+ "All rooms will be added and all community members will be invited.": "Alla rum kommer att läggas till och alla gemenskapsmedlemmar kommer att bjudas in .",
+ "A link to the Space will be put in your community description.": "En länk till utrymmet kommer att läggas i gemenskapens beskrivning.",
+ "Create Space from community": "Skapa utrymme av gemenskapen",
+ "Failed to migrate community": "Misslyckades att migrera gemenskap",
+ "To create a Space from another community, just pick the community in Preferences.": "För att skapa ett utrymme från en annan gemenskap, välj en gemenskap i inställningarna.",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> har skapats och alla som var med i gemenskapen har bjudits in till det.",
+ "Space created": "Utrymme skapat",
+ "To view Spaces, hide communities in <a>Preferences</a>": "För att se utrymmen, göm gemenskaper i <a>inställningarna</a>",
+ "This community has been upgraded into a Space": "Den här gemenskapen har uppgraderats till ett utrymme",
+ "Visible to space members": "Synligt för utrymmesmedlemmar",
+ "Public room": "Offentligt rum",
+ "Private room (invite only)": "Privat rum (endast inbjudan)",
+ "Room visibility": "Rumssynlighet",
+ "Create a room": "Skapa ett rum",
+ "Only people invited will be able to find and join this room.": "Bara inbjudna personer kommer kunna hitta och gå med i det här rummet.",
+ "Anyone will be able to find and join this room.": "Vem som helst kommer kunna hitta och gå med i det här rummet.",
+ "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Vem som helst kommer kunna hitta och gå med i det här rummet, inta bara medlemmar i <SpaceName/>.",
+ "You can change this at any time from room settings.": "Du kan ändra detta när som helst i rumsinställningarna.",
+ "Everyone in <SpaceName/> will be able to find and join this room.": "Alla i <SpaceName/> kommer kunna hitta och gå med i det här rummet.",
+ "Rooms and spaces": "Rum och utrymmen",
+ "Results": "Resultat",
+ "Enable encryption in settings.": "Aktivera kryptering i inställningarna.",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Dina privata meddelanden är normalt krypterade, men det här rummet är inte det. Detta beror oftast på att en ostödd enhet eller metod används, som e-postinbjudningar.",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "För att undvika dessa problem, skapa ett <a>nytt offentligt rum</a> för konversationen du planerar att ha.",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Det rekommenderas inte att lägga till kryptering till offentliga rum.</b> Vem som helst kan hitta och gå med i offentliga rum, som vem som helst kan läsa meddelanden i dem. Du får inga av fördelarna med kryptering, och du kommer inte kunna stänga av det senare. Kryptering av meddelanden i ett offentligt rum kommer att göra sändning och mottagning av meddelanden långsammare.",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Det rekommenderas inte att föra krypterade rum offentliga.</b> Det kommer betyda att vem som helst kan hitta och gå med i rummet, som vem som helst kan läsa meddelanden i dem. Du får inga av fördelarna med kryptering. Kryptering av meddelanden i ett offentligt rum kommer att göra sändning och mottagning av meddelanden långsammare.",
+ "Are you sure you want to make this encrypted room public?": "Är du säker på att du vill göra det här krypterade rummet offentligt?",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "För att undvika dessa problem, skapa ett <a>nytt krypterat rum</a> för konversationen du planerar att ha.",
+ "Are you sure you want to add encryption to this public room?": "Är du säker på att du vill lägga till kryptering till det här offentliga rummet?",
+ "Cross-signing is ready but keys are not backed up.": "Korssignering är klart, men nycklarna är inte säkerhetskopierade än.",
+ "Low bandwidth mode (requires compatible homeserver)": "Lågbandbreddsläge (kräver kompatibel hemserver)",
+ "Multiple integration managers (requires manual setup)": "Flera integrationshanterare (kräver manuell inställning)",
+ "Thread": "Trådar",
+ "Show threads": "Visa trådar",
+ "Autoplay videos": "Autospela videor",
+ "Autoplay GIFs": "Autospela GIF:ar",
+ "Threaded messaging": "Trådat meddelande",
+ "The above, but in <Room /> as well": "Det ovanstående, men i <Room /> också",
+ "The above, but in any room you are joined or invited to as well": "Det ovanstående, men i vilket som helst rum du är med i eller inbjuden till också",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s avfäste ett meddelande i det här rummet. Se alla fästa meddelanden.",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s avfäste <a>ett meddelande</a> i det här rummet. Se alla <b>fästa meddelanden</b>.",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fäste ett meddelande i det här rummet. Se alla fästa meddelanden.",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fäste <a>ett meddelande</a> i det här rummet. Se alla <b>fästa meddelanden</b>."
}
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index c79df5a5ed..f559f78d7d 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -20,7 +20,7 @@
"OK": "Гаразд",
"Failed to change password. Is your password correct?": "Не вдалось змінити пароль. Ви впевнені, що пароль введено правильно?",
"Continue": "Продовжити",
- "Accept": "Прийняти",
+ "Accept": "Погодитись",
"Account": "Обліковий запис",
"%(targetName)s accepted an invitation.": "%(targetName)s приймає запрошення.",
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s приймає запрошення від %(displayName)s.",
@@ -61,7 +61,7 @@
"%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував/ла %(targetName)s.",
"Ban": "Заблокувати",
"Banned users": "Заблоковані користувачі",
- "Bans user with given id": "Блокує користувача з вказаним ідентифікатором",
+ "Bans user with given id": "Блокує користувача зі вказаним ID",
"Call Timeout": "Час очікування виклика",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не вдається підключитись до домашнього серверу - перевірте підключення, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> є довіреним і що розширення браузера не блокує запити.",
"Cannot add any more widgets": "Неможливо додати більше віджетів",
@@ -82,7 +82,7 @@
"This email address is already in use": "Ця е-пошта вже використовується",
"This phone number is already in use": "Цей телефонний номер вже використовується",
"Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
- "Messages in one-to-one chats": "Повідомлення у балачках віч-на-віч",
+ "Messages in one-to-one chats": "Повідомлення у бесідах віч-на-віч",
"Send Account Data": "Надіслати дані облікового запису",
"Advanced notification settings": "Додаткові налаштування сповіщень",
"Uploading report": "Завантаження звіту",
@@ -90,7 +90,7 @@
"Guests can join": "Гості можуть приєднуватися",
"Failed to add tag %(tagName)s to room": "Не вдалось додати до кімнати мітку %(tagName)s",
"Notification targets": "Цілі сповіщень",
- "Failed to set direct chat tag": "Не вдалося встановити мітку прямого чату",
+ "Failed to set direct chat tag": "Не вдалося встановити мітку особистої бесіди",
"Today": "Сьогодні",
"You are not receiving desktop notifications": "Ви не отримуєте системні сповіщення",
"Friday": "П'ятниця",
@@ -100,9 +100,9 @@
"Changelog": "Журнал змін",
"Waiting for response from server": "Очікується відповідь від сервера",
"Leave": "Вийти",
- "Send Custom Event": "Відправити приватний захід",
+ "Send Custom Event": "Надіслати не стандартну подію",
"All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей наразі момент вимкнені.",
- "Failed to send logs: ": "Не вдалося відправити журнали: ",
+ "Failed to send logs: ": "Не вдалося надіслати журнали: ",
"Forget": "Забути",
"World readable": "Відкрито для світу",
"You cannot delete this image. (%(code)s)": "Ви не можете видалити це зображення. (%(code)s)",
@@ -142,7 +142,7 @@
"Remove %(name)s from the directory?": "Прибрати %(name)s з каталогу?",
"%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s використовує багато новітніх функцій, деякі з яких не доступні або є експериментальними у вашому оглядачі.",
"Developer Tools": "Інструменти розробника",
- "Preparing to send logs": "Підготовка до відправки журланлу",
+ "Preparing to send logs": "Приготування до надсилання журланла",
"Unnamed room": "Неназвана кімната",
"Explore Account Data": "Переглянути дані облікового запису",
"All messages (noisy)": "Усі повідомлення (гучно)",
@@ -170,10 +170,10 @@
"Call invitation": "Запрошення до виклику",
"Downloading update...": "Завантаженя оновлення…",
"State Key": "Ключ стану",
- "Failed to send custom event.": "Не вдалося відправити приватний захід.",
+ "Failed to send custom event.": "Не вдалося надіслати не стандартну подію.",
"What's new?": "Що нового?",
"Notify me for anything else": "Сповіщати мене про будь-що інше",
- "View Source": "Переглянути джерело",
+ "View Source": "Переглянути код",
"Can't update user notification settings": "Неможливо оновити налаштування користувацьких сповіщень",
"Notify for all other messages/rooms": "Сповіщати щодо всіх повідомлень/кімнат",
"Unable to look up room ID from server": "Неможливо знайти ID кімнати на сервері",
@@ -188,7 +188,7 @@
"Unable to join network": "Неможливо приєднатись до мережі",
"Sorry, your browser is <b>not</b> able to run %(brand)s.": "Вибачте, ваш оглядач <b>не</b> спроможний запустити %(brand)s.",
"Uploaded on %(date)s by %(user)s": "Завантажено %(date)s користувачем %(user)s",
- "Messages in group chats": "Повідомлення у групових балачках",
+ "Messages in group chats": "Повідомлення у групових бесідах",
"Yesterday": "Вчора",
"Error encountered (%(errorDetail)s).": "Трапилась помилка (%(errorDetail)s).",
"Low Priority": "Неважливі",
@@ -205,7 +205,7 @@
"Download this file": "Звантажити цей файл",
"Pin Message": "Прикріпити повідомлення",
"Failed to change settings": "Не вдалось змінити налаштування",
- "Event sent!": "Захід відправлено!",
+ "Event sent!": "Подію надіслано!",
"Unhide Preview": "Відкрити попередній перегляд",
"Event Content": "Зміст заходу",
"Thank you!": "Дякуємо!",
@@ -266,13 +266,13 @@
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
"Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?",
- "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Там, де ця сторінка містить ототожненну інформацію, як-от назва кімнати, користувача чи групи, ці дані будуть вилучені перед надсиланням на сервер.",
+ "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Якщо ця сторінка містить ідентифікаційну інформацію, як-от назва кімнати, користувача або групи, ці дані видаляються перед надсиланням на сервер.",
"Call in Progress": "Триває виклик",
"A call is currently being placed!": "Зараз триває виклик!",
"A call is already in progress!": "Вже здійснюється дзвінок!",
"Permission Required": "Потрібен дозвіл",
"You do not have permission to start a conference call in this room": "У вас немає дозволу, щоб розпочати дзвінок-конференцію в цій кімнаті",
- "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Зверніть увагу: будь-яка людина, яку ви додаєте до спільноти, буде публічно видимою тим, хто знає ідентифікатор спільноти",
+ "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Зверніть увагу: будь-яка людина, яку ви додаєте до спільноти, буде видима усім, хто знає ID спільноти",
"Invite new community members": "Запросити до спільноти",
"Invite to Community": "Запросити до спільноти",
"Which rooms would you like to add to this community?": "Які кімнати ви хочете додати до цієї спільноти?",
@@ -287,7 +287,7 @@
"%(brand)s was not given permission to send notifications - please try again": "%(brand)s не має дозволу надсилати сповіщення — будь ласка, спробуйте ще раз",
"Unable to enable Notifications": "Не вдалося увімкнути сповіщення",
"This email address was not found": "Не знайдено адресу електронної пошти",
- "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Схоже, ваша адреса електронної пошти не пов'язана з жодним ідентифікатор Matrix на цьому домашньому сервері.",
+ "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Схоже, ваша адреса е-пошти не пов'язана з жодним Matrix ID на цьому домашньому сервері.",
"Restricted": "Обмежено",
"Moderator": "Модератор",
"Failed to invite": "Не вдалося запросити",
@@ -295,7 +295,7 @@
"You need to be logged in.": "Вам потрібно увійти.",
"You need to be able to invite users to do that.": "Щоб це зробити, вам необхідно мати можливість запрошувати людей.",
"Unable to create widget.": "Неможливо створити віджет.",
- "Missing roomId.": "Бракує ідентифікатора кімнати.",
+ "Missing roomId.": "Бракує ID кімнати.",
"Failed to send request.": "Не вдалося надіслати запит.",
"This room is not recognised.": "Кімнату не знайдено.",
"Power level must be positive integer.": "Рівень повноважень мусить бути додатним цілим числом.",
@@ -309,9 +309,9 @@
"/ddg is not a command": "/ddg не є командою",
"To use it, just wait for autocomplete results to load and tab through them.": "Щоб цим скористатися, просто почекайте на підказки автодоповнення й перемикайтеся між ними клавішею TAB.",
"Changes your display nickname": "Змінює ваш нік",
- "Invites user with given id to current room": "Запрошує користувача з вказаним ідентифікатором до кімнати",
+ "Invites user with given id to current room": "Запрошує користувача зі вказаним ID до кімнати",
"Leave room": "Залишити кімнату",
- "Kicks user with given id": "Викидає з кімнати користувача з вказаним ідентифікатором",
+ "Kicks user with given id": "Викидає з кімнати користувача зі вказаним ID",
"Ignores a user, hiding their messages from you": "Ігнорує користувача, приховуючи його повідомлення від вас",
"Ignored user": "Зігнорований користувач",
"You are now ignoring %(userId)s": "Ви ігноруєте %(userId)s",
@@ -319,10 +319,10 @@
"Unignored user": "Припинено ігнорування користувача",
"You are no longer ignoring %(userId)s": "Ви більше не ігноруєте %(userId)s",
"Define the power level of a user": "Вказати рівень повноважень користувача",
- "Deops user with given id": "Знімає права оператора з користувача з вказаним ідентифікатором",
+ "Deops user with given id": "Знімає права оператора з користувача зі вказаним ID",
"Opens the Developer Tools dialog": "Відкриває вікно інструментів розробника",
"Verified key": "Звірений ключ",
- "Displays action": "Відбиває дію",
+ "Displays action": "Показ дій",
"Reason": "Причина",
"%(senderName)s requested a VoIP conference.": "%(senderName)s бажає розпочати дзвінок-конференцію.",
"%(senderName)s invited %(targetName)s.": "%(senderName)s запрошує %(targetName)s.",
@@ -340,8 +340,8 @@
"%(senderName)s kicked %(targetName)s.": "%(senderName)s викинув/ла %(targetName)s.",
"%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s відкликав/ла запрошення %(targetName)s.",
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s надіслав(-ла) зображення.",
- "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s призначив(-ла) основну адресу цієї кімнати: %(address)s.",
- "%(senderName)s removed the main address for this room.": "%(senderName)s прибрав(-ла) основу адресу цієї кімнати.",
+ "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s встановлює основною адресою цієї кімнати %(address)s.",
+ "%(senderName)s removed the main address for this room.": "%(senderName)s вилучає основу адресу цієї кімнати.",
"Someone": "Хтось",
"(not supported by this browser)": "(не підтримується цією веб-переглядачкою)",
"(could not connect media)": "(не можливо під'єднати медіа)",
@@ -357,7 +357,7 @@
"%(senderName)s made future room history visible to anyone.": "%(senderName)s зробив(-ла) майбутню історію кімнати видимою для всіх.",
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s зробив(-ла) майбутню історію видимою для невідомого значення (%(visibility)s).",
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s з %(fromPowerLevel)s до %(toPowerLevel)s",
- "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінює приколоті повідомлення у кімнаті.",
+ "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінює прикріплені повідомлення у кімнаті.",
"%(widgetName)s widget modified by %(senderName)s": "%(senderName)s змінює знадіб %(widgetName)s",
"%(widgetName)s widget added by %(senderName)s": "%(senderName)s додав(-ла) знадіб %(widgetName)s",
"%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив(-ла) знадіб %(widgetName)s",
@@ -432,7 +432,7 @@
"Demote": "Знизити рівень прав",
"Failed to mute user": "Не вдалося заглушити користувача",
"Failed to change power level": "Не вдалося змінити рівень повноважень",
- "Chat with %(brand)s Bot": "Балачка з %(brand)s-ботом",
+ "Chat with %(brand)s Bot": "Бесіда з %(brand)s-ботом",
"Whether or not you're logged in (we don't record your username)": "Незалежно від того, увійшли ви чи ні (ми не записуємо ваше ім'я користувача)",
"The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не вийшло відвантажити.",
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Файл '%(fileName)s' перевищує ліміт розміру для відвантажень домашнього сервера",
@@ -470,7 +470,7 @@
"Sets the room name": "Встановлює назву кімнати",
"Use an identity server": "Використовувати сервер ідентифікації",
"Use an identity server to invite by email. Manage in Settings.": "Використовувати сервер ідентифікації для запрошень через е-пошту. Керуйте у налаштуваннях.",
- "Unbans user with given ID": "Розблоковує користувача з вказаним ідентифікатором",
+ "Unbans user with given ID": "Розблоковує користувача зі вказаним ID",
"Adds a custom widget by URL to the room": "Додає власний віджет до кімнати за посиланням",
"Please supply a https:// or http:// widget URL": "Вкажіть посилання на віджет — https:// або http://",
"You cannot modify widgets in this room.": "Ви не можете змінювати віджети у цій кімнаті.",
@@ -514,7 +514,7 @@
"Liberate your communication": "Вивільни своє спілкування",
"Send a Direct Message": "Надіслати особисте повідомлення",
"Explore Public Rooms": "Дослідити прилюдні кімнати",
- "Create a Group Chat": "Створити групову балачку",
+ "Create a Group Chat": "Створити групову бесіду",
"Explore": "Дослідити",
"Filter": "Фільтрувати",
"Filter rooms…": "Фільтрувати кімнати…",
@@ -562,7 +562,7 @@
"Legal": "Правова інформація",
"Credits": "Подяки",
"For help with using %(brand)s, click <a>here</a>.": "Якщо необхідна допомога у користуванні %(brand)s'ом, клацніть <a>тут</a>.",
- "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Якщо необхідна допомога у користуванні %(brand)s'ом, клацніть <a>тут</a> або розпочніть балачку з нашим ботом, клацнувши на кнопці нижче.",
+ "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Якщо необхідна допомога у користуванні %(brand)s, клацніть <a>тут</a> або розпочніть бесіду з нашим ботом, клацнувши на кнопку внизу.",
"Join the conversation with an account": "Приєднатись до бесіди з обліковим записом",
"Unable to restore session": "Не вдалося відновити сеанс",
"We encountered an error trying to restore your previous session.": "Ми натрапили на помилку, намагаючись відновити ваш попередній сеанс.",
@@ -578,9 +578,9 @@
"Forget this room": "Забути цю кімнату",
"Re-join": "Перепід'єднатись",
"This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Це запрошення до %(roomName)s було надіслане на %(email)s, яка не пов'язана з вашим обліковим записом",
- "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Зв'яжіть цю е-пошту з вашим обліковим записом у Налаштуваннях щоб отримувати сповіщення прямо у %(brand)s.",
+ "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Пов'яжіть цю е-пошту з вашим обліковим записом у Налаштуваннях, щоб отримувати запрошення безпосередньо в %(brand)s.",
"This invite to %(roomName)s was sent to %(email)s": "Це запрошення до %(roomName)s було надіслане на %(email)s",
- "Use an identity server in Settings to receive invites directly in %(brand)s.": "Використовувати сервер ідентифікації у Налаштуваннях щоб отримувати запрошення прямо у %(brand)s.",
+ "Use an identity server in Settings to receive invites directly in %(brand)s.": "Використовувати сервер ідентифікації у Налаштуваннях, щоб отримувати запрошення безпосередньо в %(brand)s.",
"Are you sure you want to deactivate your account? This is irreversible.": "Ви впевнені у тому, що бажаєте знедіяти ваш обліковий запис? Ця дія безповоротна.",
"Confirm account deactivation": "Підтвердьте знедіювання облікового запису",
"To continue, please enter your password:": "Щоб продовжити, введіть, будь ласка, ваш пароль:",
@@ -627,17 +627,17 @@
"Sends a message as html, without interpreting it as markdown": "Надсилає повідомлення у вигляді HTML, не інтерпретуючи його як розмітку",
"Failed to set topic": "Не вдалося встановити тему",
"Once enabled, encryption cannot be disabled.": "Після увімкнення шифрування не можна буде вимкнути.",
- "Please enter verification code sent via text.": "Будь ласка, введіть звірювальний код, відправлений у текстовому повідомленні.",
- "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Текстове повідомлення було відправлено на номер +%(msisdn)s. Будь ласка, введіть звірювальний код, який воно містить.",
+ "Please enter verification code sent via text.": "Введіть код перевірки, надісланий у текстовому повідомленні.",
+ "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Текстове повідомлення надіслано на номер +%(msisdn)s. Введіть код перевірки з нього.",
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Повідомлення у цій кімнаті захищені наскрізним шифруванням. Тільки ви та одержувачі мають ключі для прочитання цих повідомлень.",
"Messages in this room are end-to-end encrypted.": "Повідомлення у цій кімнаті наскрізно зашифровані.",
"Messages in this room are not end-to-end encrypted.": "Повідомлення у цій кімнаті не захищено наскрізним шифруванням.",
"Encryption enabled": "Шифрування увімкнено",
"Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Повідомлення у цій кімнаті наскрізно зашифровані. Дізнайтеся більше та звіртеся з цим користувачем через його профіль.",
- "You sent a verification request": "Ви відправили звірювальний запит",
+ "You sent a verification request": "Ви надіслали запит перевірки",
"Direct Messages": "Особисті повідомлення",
"Room Settings - %(roomName)s": "Налаштування кімнати - %(roomName)s",
- "A verification email will be sent to your inbox to confirm setting your new password.": "Ми відправимо перевіряльний електронний лист до вас для підтвердження зміни пароля.",
+ "A verification email will be sent to your inbox to confirm setting your new password.": "Ми надішлемо вам електронний лист перевірки для підтвердження зміни пароля.",
"To return to your account in future you need to set a password": "Щоб повернутися до своєї обліківки в майбутньому, вам потрібно встановити пароль",
"Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Використовувати сервер ідентифікації, щоб запрошувати через е-пошту. Натисніть \"Продовжити\", щоб використовувати типовий сервер ідентифікації (%(defaultIdentityServerName)s) або змініть його у налаштуваннях.",
"Joins room with given address": "Приєднатися до кімнати зі вказаною адресою",
@@ -653,9 +653,9 @@
"The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Наданий вами ключ підпису збігається з ключем підпису, що ви отримали від сеансу %(deviceId)s %(userId)s. Сеанс позначено як звірений.",
"Sends the given emote coloured as a rainbow": "Надсилає вказаний смайлик, розфарбований веселкою",
"Displays list of commands with usages and descriptions": "Відбиває перелік команд із прикладами вжитку та описом",
- "Displays information about a user": "Відбиває інформацію про користувача",
+ "Displays information about a user": "Показує відомості про користувача",
"Send a bug report with logs": "Надіслати звіт про ваду разом з журналами",
- "Opens chat with the given user": "Відкриває балачку з вказаним користувачем",
+ "Opens chat with the given user": "Відкриває бесіду з вказаним користувачем",
"Sends a message to the given user": "Надсилає повідомлення вказаному користувачеві",
"%(senderName)s made no change.": "%(senderName)s не запровадив(-ла) жодних змін.",
"%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s змінює назву кімнати з %(oldRoomName)s на %(newRoomName)s.",
@@ -668,30 +668,30 @@
"%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s змінює гостьовий доступ на \"%(rule)s\"",
"%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s увімкнув(-ла) значок для %(groups)s у цій кімнаті.",
"%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s вимкнув(-ла) значок для %(groups)s в цій кімнаті.",
- "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
- "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
- "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s прибрав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
- "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s прибрав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
+ "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
+ "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
+ "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
+ "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
"%(senderName)s changed the alternative addresses for this room.": "%(senderName)s змінює альтернативні адреси для цієї кімнати.",
"%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s змінює головні та альтернативні адреси для цієї кімнати.",
"%(senderName)s changed the addresses for this room.": "%(senderName)s змінює адреси для цієї кімнати.",
- "%(senderName)s placed a voice call.": "%(senderName)s розпочав(-ла) голосовий виклик.",
- "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s розпочав(-ла) голосовий виклик. (не підтримується цим переглядачем)",
- "%(senderName)s placed a video call.": "%(senderName)s розпочав(-ла) відеовиклик.",
- "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s розпочав(-ла) відеовиклик. (не підтримується цим переглядачем)",
+ "%(senderName)s placed a voice call.": "%(senderName)s розпочинає голосовий виклик.",
+ "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s розпочинає голосовий виклик. (не підтримується цим переглядачем)",
+ "%(senderName)s placed a video call.": "%(senderName)s розпочинає відеовиклик.",
+ "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s розпочинає відеовиклик. (не підтримується цим переглядачем)",
"%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s відкликав(-ла) запрошення %(targetDisplayName)s приєднання до кімнати.",
- "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування користувачів зі збігом з %(glob)s",
- "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування кімнат зі збігом з %(glob)s",
- "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування серверів зі збігом з %(glob)s",
- "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування зі збігом з %(glob)s",
- "%(senderName)s updated an invalid ban rule": "%(senderName)s оновив(-ла) хибне правило блокування",
- "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
- "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
- "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування серверів зі збігом з %(glob)s через %(reason)s",
- "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування зі збігом з %(glob)s через %(reason)s",
- "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
- "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
- "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування серверів зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s вилучає правило заборони користувачів зі збігом з %(glob)s",
+ "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s вилучає правило блокування кімнат зі збігом з %(glob)s",
+ "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s вилучає правило блокування серверів зі збігом з %(glob)s",
+ "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s вилучає правило блокування зі збігом з %(glob)s",
+ "%(senderName)s updated an invalid ban rule": "%(senderName)s оновлює хибне правило блокування",
+ "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування серверів зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування серверів зі збігом з %(glob)s через %(reason)s",
"Light": "Світла",
"Dark": "Темна",
"You signed in to a new session without verifying it:": "Ви увійшли в новий сеанс, не підтвердивши його:",
@@ -723,7 +723,7 @@
"a few seconds from now": "декілька секунд тому",
"about a minute from now": "приблизно через хвилинку",
"%(num)s minutes from now": "%(num)s хвилин по тому",
- "about an hour from now": "приблизно через годинку",
+ "about an hour from now": "приблизно через годину",
"%(num)s hours from now": "%(num)s годин по тому",
"about a day from now": "приблизно через день",
"%(num)s days from now": "%(num)s днів по тому",
@@ -731,7 +731,7 @@
"You do not have permission to invite people to this room.": "У вас немає прав запрошувати людей у цю кімнату.",
"User %(userId)s is already in the room": "Користувач %(userId)s вже перебуває в кімнаті",
"User %(user_id)s does not exist": "Користувача %(user_id)s не існує",
- "The user must be unbanned before they can be invited.": "Користувач має бути розблокованим(ою), перед тим як може бути запрошений(ая).",
+ "The user must be unbanned before they can be invited.": "Потрібно розблокувати користувача перед тим як їх можна буде запросити.",
"The user's homeserver does not support the version of the room.": "Домашній сервер користувача не підтримує версію кімнати.",
"Unknown server error": "Невідома помилка з боку сервера",
"Use a few words, avoid common phrases": "Використовуйте декілька слів, уникайте звичайних фраз",
@@ -799,7 +799,7 @@
"Try out new ways to ignore people (experimental)": "Спробуйте нові способи ігнорувати людей (експериментальні)",
"Support adding custom themes": "Підтримка користувацьких тем",
"Enable advanced debugging for the room list": "Увімкнути просунуте зневаджування для переліку кімнат",
- "Show info about bridges in room settings": "Показувати інформацію про мости в налаштуваннях кімнати",
+ "Show info about bridges in room settings": "Показувати відомості про мости в налаштуваннях кімнати",
"Font size": "Розмір шрифту",
"Use custom size": "Використовувати нетиповий розмір",
"Enable Emoji suggestions while typing": "Увімкнути пропонування емодзі при друкуванні",
@@ -824,7 +824,7 @@
"Error adding ignored user/server": "Помилка при додаванні ігнорованого користувача/сервера",
"Something went wrong. Please try again or view your console for hints.": "Щось пішло не так. Спробуйте знову, або пошукайте підказки в консолі.",
"Error subscribing to list": "Помилка при підписці на список",
- "Please verify the room ID or address and try again.": "Перевірте ID кімнати, або адресу та попробуйте знову.",
+ "Please verify the room ID or address and try again.": "Перевірте ID кімнати, або адресу та повторіть спробу.",
"Error removing ignored user/server": "Помилка при видаленні ігнорованого користувача/сервера",
"Error unsubscribing from list": "Не вдалося відписатися від списку",
"Please try again or view your console for hints.": "Спробуйте знову, або подивіться повідомлення в консолі.",
@@ -838,16 +838,16 @@
"View rules": "Подивитись правила",
"You are currently subscribed to:": "Ви підписані на:",
"⚠ These settings are meant for advanced users.": "⚠ Ці налаштування розраховані на досвідчених користувачів.",
- "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ігнорування людей реалізовано через списки правил блокування. Підписка на список блокування призведе до приховування від вас користувачів і серверів, які в ньому перераховані.",
- "Personal ban list": "Особистий бан-ліст",
- "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Ваш особистий список блокування містить всіх користувачів і сервери, повідомлення яких ви не хочете бачити. Після внесення туди першого користувача / сервера в списку кімнат з'явиться нова кімната 'Мій список блокування' - не покидає цю кімнату, щоб список блокування працював.",
+ "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Нехтування людей реалізовано через списки правил блокування. Підписка на список блокування призведе до приховування від вас перелічених у ньому користувачів і серверів.",
+ "Personal ban list": "Особистий список блокування",
+ "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Ваш особистий список блокування містить усіх користувачів і сервери, повідомлення яких ви не хочете бачити. Після внесення туди першого користувача/сервера в списку кімнат з'явиться нова кімната «Мій список блокування» — не залишайте цю кімнату, щоб список блокування працював.",
"Server or user ID to ignore": "Сервер або ID користувача для ігнорування",
"eg: @bot:* or example.org": "наприклад: @bot:* або example.org",
"Ignore": "Ігнорувати",
"Subscribed lists": "Підписані списки",
- "Subscribing to a ban list will cause you to join it!": "При підписці на список блокування ви приєднаєтесь до нього!",
+ "Subscribing to a ban list will cause you to join it!": "Підписавшись на список блокування ви приєднаєтесь до нього!",
"If this isn't what you want, please use a different tool to ignore users.": "Якщо вас це не влаштовує, спробуйте інший інструмент для ігнорування користувачів.",
- "Room ID or address of ban list": "Ідентифікатор номера або адреса бан-лісту",
+ "Room ID or address of ban list": "ID кімнати або адреса списку блокування",
"Subscribe": "Підписатись",
"Start automatically after system login": "Автозапуск при вході в систему",
"Always show the window menu bar": "Завжди показувати рядок меню",
@@ -855,7 +855,7 @@
"Preferences": "Параметри",
"Room list": "Перелік кімнат",
"Composer": "Редактор",
- "Security & Privacy": "Безпека та конфіденційність",
+ "Security & Privacy": "Безпека й приватність",
"Where you’re logged in": "Де ви ввійшли",
"Skip": "Пропустити",
"Notification settings": "Налаштування сповіщень",
@@ -869,7 +869,7 @@
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (повноваження %(powerLevelNumber)s)",
"Send a message…": "Надіслати повідомлення…",
"People": "Люди",
- "Share this email in Settings to receive invites directly in %(brand)s.": "Поширте цю адресу е-пошти у налаштуваннях щоб отримувати запрошення прямо у %(brand)s.",
+ "Share this email in Settings to receive invites directly in %(brand)s.": "Поширте цю адресу е-пошти у налаштуваннях, щоб отримувати запрошення безпосередньо в %(brand)s.",
"Room options": "Параметри кімнати",
"Send as message": "Надіслати як повідомлення",
"You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Ви не зможете скасувати цю зміну через те, що ви підвищуєте рівень повноважень користувача до свого рівня.",
@@ -895,11 +895,11 @@
"Cat": "Кіт",
"Lion": "Лев",
"Horse": "Кінь",
- "Pig": "Свиня",
+ "Pig": "Порося",
"Elephant": "Слон",
"Rabbit": "Кріль",
"Panda": "Панда",
- "Rooster": "Когут",
+ "Rooster": "Півень",
"Penguin": "Пінгвін",
"Turtle": "Черепаха",
"Fish": "Риба",
@@ -935,11 +935,11 @@
"Bicycle": "Велоcипед",
"Aeroplane": "Літак",
"Rocket": "Ракета",
- "Trophy": "Приз",
+ "Trophy": "Кубок",
"Ball": "М'яч",
"Guitar": "Гітара",
"Trumpet": "Труба",
- "Bell": "Дзвін",
+ "Bell": "Дзвінок",
"Anchor": "Якір",
"Headphones": "Навушники",
"Folder": "Тека",
@@ -1047,24 +1047,24 @@
"Revoke invite": "Відкликати запрошення",
"Security": "Безпека",
"Report bugs & give feedback": "Відзвітувати про вади та залишити відгук",
- "Report Content to Your Homeserver Administrator": "Поскаржитись на зміст адміністратору вашого домашнього сервера",
+ "Report Content to Your Homeserver Administrator": "Поскаржитися на вміст адміністратору вашого домашнього сервера",
"Failed to upgrade room": "Не вдалось поліпшити кімнату",
"The room upgrade could not be completed": "Поліпшення кімнати не може бути завершене",
"Upgrade this room to version %(version)s": "Поліпшити цю кімнату до версії %(version)s",
"Upgrade Room Version": "Поліпшити версію кімнати",
"Upgrade private room": "Поліпшити закриту кімнату",
"You'll upgrade this room from <oldVersion /> to <newVersion />.": "Ви поліпшите цю кімнату з <oldVersion /> до <newVersion /> версії.",
- "Share Room Message": "Поширити повідомлення кімнати",
- "Report Content": "Поскаржитись на зміст",
+ "Share Room Message": "Поділитися повідомленням кімнати",
+ "Report Content": "Поскаржитись на вміст",
"Feedback": "Зворотній зв'язок",
"General failure": "Загальний збій",
"Enter your account password to confirm the upgrade:": "Введіть пароль вашого облікового запису щоб підтвердити поліпшення:",
- "Security & privacy": "Безпека та конфіденційність",
+ "Security & privacy": "Безпека й приватність",
"Secret storage public key:": "Таємне сховище відкритого ключа:",
"Key backup": "Резервне копіювання ключів",
"Message search": "Пошук повідомлень",
"Cross-signing": "Перехресне підписування",
- "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Адміністратором вашого сервера було вимкнено початкове наскрізне шифрування у закритих кімнатах та особистих повідомленнях.",
+ "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Адміністратором вашого сервера було вимкнено автоматичне наскрізне шифрування у приватних кімнатах і особистих повідомленнях.",
"Something went wrong!": "Щось пішло не так!",
"expand": "розгорнути",
"Wrong Recovery Key": "Неправильний відновлювальний ключ",
@@ -1102,7 +1102,7 @@
"Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Поліпште цей сеанс щоб уможливити звіряння інших сеансів, надаючи їм доступ до зашифрованих повідомлень та позначуючи їх довіреними для інших користувачів.",
"Upgrade your encryption": "Поліпшити ваше шифрування",
"Show a placeholder for removed messages": "Показувати замісну позначку замість видалених повідомлень",
- "Show join/leave messages (invites/kicks/bans unaffected)": "Показувати повідомлення про приєднання/залишення (не впливає на запрошення/викидання/заборону)",
+ "Show join/leave messages (invites/kicks/bans unaffected)": "Показувати повідомлення про приєднання/залишення (не впливає на запрошення/викидання/блокування)",
"Show avatar changes": "Показувати зміни личини",
"Show display name changes": "Показувати зміни видимого імені",
"Show read receipts sent by other users": "Показувати мітки прочитання, надіслані іншими користувачами",
@@ -1112,8 +1112,8 @@
"Never send encrypted messages to unverified sessions in this room from this session": "Ніколи не надсилати зашифровані повідомлення до незвірених сеансів у цій кімнаті з цього сеансу",
"Enable message search in encrypted rooms": "Увімкнути шукання повідомлень у зашифрованих кімнатах",
"IRC display name width": "Ширина видимого імені IRC",
- "Encrypted messages in one-to-one chats": "Зашифровані повідомлення у балачках віч-на-віч",
- "Encrypted messages in group chats": "Зашифровані повідомлення у групових балачках",
+ "Encrypted messages in one-to-one chats": "Зашифровані повідомлення у бесідах віч-на-віч",
+ "Encrypted messages in group chats": "Зашифровані повідомлення у групових бесідах",
"Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Захищені повідомлення з цим користувачем є наскрізно зашифрованими та непрочитними для сторонніх осіб.",
"Securely cache encrypted messages locally for them to appear in search results.": "Безпечно локально кешувати зашифровані повідомлення щоб вони з'являлись у результатах пошуку.",
"%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s'ові бракує деяких складників, необхідних для безпечного локального кешування зашифрованих повідомлень. Якщо ви хочете поекспериментувати з цією властивістю, зберіть спеціальну збірку %(brand)s Desktop із <nativeLink>доданням пошукових складників</nativeLink>.",
@@ -1131,7 +1131,7 @@
"Send an encrypted reply…": "Надіслати зашифровану відповідь…",
"Replying": "Відповідання",
"Low priority": "Неважливі",
- "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "У зашифрованих кімнатах, подібних до цієї, попередній перегляд посилань є початково вимкненим. Це робиться задля гарантування того, що ваш домашній сервер (на якому генеруються перегляди) не матиме змоги збирати інформацію щодо посилань, які ви бачите у цій кімнаті.",
+ "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "У кімнатах з шифруванням, як у цій, попередній перегляд посилань усталено вимкнено. Це робиться, щоб гарантувати, що ваш домашній сервер (на якому генеруються перегляди) не матиме змоги збирати дані щодо посилань, які ви бачите у цій кімнаті.",
"In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "У зашифрованих кімнатах ваші повідомлення є захищеними, тож тільки ви та отримувач маєте ключі для їх розблокування.",
"In encrypted rooms, verify all users to ensure it’s secure.": "У зашифрованих кімнатах звіряйте усіх користувачів щоб переконатись у безпеці спілкування.",
"Failed to copy": "Не вдалось скопіювати",
@@ -1152,12 +1152,12 @@
"I don't want my encrypted messages": "Мені не потрібні мої зашифровані повідомлення",
"You'll lose access to your encrypted messages": "Ви втратите доступ до ваших зашифрованих повідомлень",
"Use this session to verify your new one, granting it access to encrypted messages:": "Використати цей сеанс для звірення вашого нового сеансу, надаючи йому доступ до зашифрованих повідомлень:",
- "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Скарження на це повідомлення надішле його унікальний 'ідентифікатор події (event ID)' адміністраторові вашого домашнього сервера. Якщо повідомлення у цій кімнаті зашифровані, то адміністратор не зможе бачити ані тексту повідомлень, ані жодних файлів чи зображень.",
+ "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Зі скаргою на це повідомлення буде надіслано його унікальний «ID події» адміністраторові вашого домашнього сервера. Якщо повідомлення у цій кімнаті зашифровані, то адміністратор не зможе побачити ані тексту повідомлень, ані жодних файлів чи зображень.",
"Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Бракує деяких даних сеансу, включно з ключами зашифрованих повідомлень. Вийдіть та зайдіть знову щоб виправити цю проблему, відновлюючи ключі з дубля.",
"Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Було виявлено дані зі старої версії %(brand)s. Це призведе до збоїння наскрізного шифрування у старій версії. Наскрізно зашифровані повідомлення, що обмінювані нещодавно, під час використання старої версії, можуть бути недешифровними у цій версії. Це може призвести до збоїв повідомлень, обмінюваних також і з цією версією. У разі виникнення проблем вийдіть з програми та зайдіть знову. Задля збереження історії повідомлень експортуйте та переімпортуйте ваші ключі.",
"Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Змінення паролю скине всі ключі наскрізного шифрування в усіх ваших сеансах, роблячи зашифровану історію листувань нечитабельною. Налагодьте дублювання ключів або експортуйте ключі кімнат з іншого сеансу перед скиданням пароля.",
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Підтвердьте вашу особу шляхом звіряння цього входу з одного з інших ваших сеансів, надаючи йому доступ до зашифрованих повідомлень.",
- "Enable big emoji in chat": "Увімкнути великі емодзі у балачках",
+ "Enable big emoji in chat": "Увімкнути великі емоджі у бесідах",
"Show typing notifications": "Сповіщати про друкування",
"Show rooms with unread notifications first": "Спочатку показувати кімнати з непрочитаними сповіщеннями",
"Show shortcuts to recently viewed rooms above the room list": "Показувати нещодавно бачені кімнати вгорі понад переліком кімнат",
@@ -1181,11 +1181,11 @@
"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ваш новий сеанс тепер є звірений. Він має доступ до ваших зашифрованих повідомлень, а інші користувачі бачитимуть його як довірений.",
"Emoji": "Емодзі",
"Emoji Autocomplete": "Самодоповнення емодзі",
- "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування зі збігом з %(glob)s через %(reason)s",
+ "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування зі збігом з %(glob)s через %(reason)s",
"%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування користувачів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
"%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування кімнат зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
"%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування серверів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
- "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінєю правило блокування зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
+ "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
"Enable Community Filter Panel": "Увімкнути фільтр панелі спільнот",
"Messages containing my username": "Повідомлення, що містять моє користувацьке ім'я",
"Messages containing @room": "Повідомлення, що містять @room",
@@ -1237,9 +1237,9 @@
"%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
"Unexpected server error trying to leave the room": "Виникла неочікувана помилка серверу під час спроби залишити кімнату",
"Unknown App": "Невідомий додаток",
- "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Відправляти <UsageDataLink>анонімну статистику користування</UsageDataLink>, що дозволяє нам покращувати %(brand)s. Це використовує <PolicyLink>кукі</PolicyLink>.",
+ "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Надсилати <UsageDataLink>анонімну статистику користування</UsageDataLink>, що дозволяє нам вдосконалювати %(brand)s. Це використовує <PolicyLink>кукі</PolicyLink>.",
"Set up Secure Backup": "Налаштувати захищене резервне копіювання",
- "Safeguard against losing access to encrypted messages & data": "Захист від втрати доступу до зашифрованих повідомлень та даних",
+ "Safeguard against losing access to encrypted messages & data": "Захистіться від втрати доступу до зашифрованих повідомлень і даних",
"The person who invited you already left the room.": "Особа, що вас запросила, вже залишила кімнату.",
"The person who invited you already left the room, or their server is offline.": "Особа, що вас запросила вже залишила кімнату, або її сервер відімкнено.",
"Change notification settings": "Змінити налаштування сповіщень",
@@ -1633,10 +1633,10 @@
"Sends the given message as a spoiler": "Надсилає вказане повідомлення згорненим",
"Integration manager": "Менеджер інтеграцій",
"Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Ваш %(brand)s не дозволяє вам користуватись для цього менеджером інтеграцій. Зверніться до адміністратора.",
- "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Користування цим знадобом може призвести до поширення ваших даних <helpIcon /> з %(widgetDomain)s та вашим менеджером інтеграцій.",
+ "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Користування цим віджетом може призвести до поширення ваших даних <helpIcon /> через %(widgetDomain)s і ваш менеджер інтеграцій.",
"Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджери інтеграцій отримують дані конфігурації та можуть змінювати знадоби, надсилати запрошення у кімнати й встановлювати рівні повноважень від вашого імені.",
- "Use an integration manager to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій для керування ботами, знадобами та паками наліпок.",
- "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій <b>%(serverName)s</b> для керування ботами, знадобами та паками наліпок.",
+ "Use an integration manager to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій для керування ботами, віджетами й пакунками наліпок.",
+ "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій <b>%(serverName)s</b> для керування ботами, віджетами й пакунками наліпок.",
"Identity server": "Сервер ідентифікації",
"Identity server (%(server)s)": "Сервер ідентифікації (%(server)s)",
"Could not connect to identity server": "Не вдалося під'єднатись до сервера ідентифікації",
@@ -1646,5 +1646,207 @@
"Trusted": "Довірений",
"This backup is trusted because it has been restored on this session": "Ця резервна копія є надійною, оскільки її було відновлено під час цього сеансу",
"Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Індивідуально перевіряйте кожен сеанс, який використовується користувачем, щоб позначити його довіреним, не довіряючи пристроям перехресного підписування.",
- "To be secure, do this in person or use a trusted way to communicate.": "Для забезпечення безпеки зробіть це особисто або скористайтесь надійним способом зв'язку."
+ "To be secure, do this in person or use a trusted way to communicate.": "Для забезпечення безпеки зробіть це особисто або скористайтесь надійним способом зв'язку.",
+ "You can change this at any time from room settings.": "Ви завжди можете змінити це у налаштуваннях кімнати.",
+ "Room settings": "Налаштування кімнати",
+ "Link to most recent message": "Посилання на останнє повідомлення",
+ "Share Room": "Поділитись кімнатою",
+ "Share room": "Поділитись кімнатою",
+ "Show files": "Показати файли",
+ "%(count)s people|one": "%(count)s осіб",
+ "%(count)s people|other": "%(count)s людей",
+ "Invite People": "Запросити людей",
+ "Invite people": "Запросити людей",
+ "Next": "Далі",
+ "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Дякуємо, що спробували Простори. Ваш відгук допоможе вдосконалити подальші версії.",
+ "Document": "Документ",
+ "Add to summary": "Додати до опису",
+ "Which rooms would you like to add to this summary?": "Які кімнати ви бажаєте додати до цього опису?",
+ "Add rooms to the community summary": "Додати кімнату до опису спільноти",
+ "Summary": "Опис",
+ "Service": "Служба",
+ "To continue you need to accept the terms of this service.": "Погодьтесь з Умовами надання послуг, щоб продовжити.",
+ "Terms of Service": "Умови надання послуг",
+ "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Докладніше про <privacyPolicyLink />, <termsOfServiceLink /> та <cookiePolicyLink />.",
+ "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Погодьтесь з Умовами надання послуг сервера ідентифікації (%(serverName)s), щоб дозволити знаходити вас за адресою електронної пошти або за номером телефону.",
+ "The identity server you have chosen does not have any terms of service.": "Вибраний вами сервер ідентифікації не містить жодних умов користування.",
+ "Terms of service not accepted or the identity server is invalid.": "Умови користування не прийнято або сервер ідентифікації недійсний.",
+ "About homeservers": "Про домашні сервери",
+ "About": "Відомості",
+ "Learn more about how we use analytics.": "Докладніше про використовування нами аналітики.",
+ "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s змінює <a>прикріплене повідомлення</a> для кімнати.",
+ "%(senderName)s kicked %(targetName)s": "%(senderName)s викидає %(targetName)s",
+ "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s викидає %(targetName)s: %(reason)s",
+ "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s відкликає запрошення %(targetName)s",
+ "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s відкликає запрошення %(targetName)s: %(reason)s",
+ "%(senderName)s unbanned %(targetName)s": "%(senderName)s розблоковує %(targetName)s",
+ "%(targetName)s left the room": "%(targetName)s залишає кімнату",
+ "%(targetName)s left the room: %(reason)s": "%(targetName)s залишає кімнату: %(reason)s",
+ "%(targetName)s rejected the invitation": "%(targetName)s відхиляє запрошення",
+ "%(senderName)s made no change": "%(senderName)s нічого не змінює",
+ "%(senderName)s set a profile picture": "%(senderName)s встановлює зображення профілю",
+ "%(senderName)s removed their profile picture": "%(senderName)s вилучає своє зображення профілю",
+ "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s вилучає своє видиме ім'я (%(oldDisplayName)s)",
+ "%(senderName)s set their display name to %(displayName)s": "%(senderName)s встановлює видимим іменем %(displayName)s",
+ "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s змінює видиме ім'я на %(displayName)s",
+ "%(senderName)s banned %(targetName)s": "%(senderName)s блокує %(targetName)s",
+ "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s блокує %(targetName)s: %(reason)s",
+ "%(senderName)s invited %(targetName)s": "%(senderName)s запрошує %(targetName)s",
+ "%(targetName)s accepted an invitation": "%(targetName)s приймає запрошення",
+ "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s приймає запрошення до %(displayName)s",
+ "Converts the DM to a room": "Перетворює приватну бесіду на кімнату",
+ "Converts the room to a DM": "Перетворює кімнату на приватну бесіду",
+ "Some invites couldn't be sent": "Деякі запрошення неможливо надіслати",
+ "Failed to transfer call": "Не вдалося переадресувати виклик",
+ "Transfer Failed": "Не вдалося переадресувати",
+ "Unable to transfer call": "Не вдалося переадресувати дзвінок",
+ "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Виберіть кімнати або бесіди, які потрібно додати. Це просто простір для вас, ніхто не буде поінформований. Пізніше ви можете додати більше.",
+ "Join the conference from the room information card on the right": "Приєднуйтесь до конференції з інформаційної картки кімнати праворуч",
+ "Room Info": "Відомості про кімнату",
+ "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Під час спроби перевірити ваше запрошення було повернуто помилку (%(errcode)s). Ви можете спробувати передати ці дані адміністратору кімнати.",
+ "Room information": "Відомості про кімнату",
+ "Send voice message": "Надіслати голосове повідомлення",
+ "%(targetName)s joined the room": "%(targetName)s приєднується до кімнати",
+ "edited": "змінено",
+ "Edited at %(date)s. Click to view edits.": "Змінено %(date)s. Натисніть, щоб переглянути зміни.",
+ "Edited at %(date)s": "Змінено %(date)s",
+ "%(senderName)s changed their profile picture": "%(senderName)s змінює зображення профілю",
+ "Phone Number": "Телефонний номер",
+ "%(oneUser)sleft %(count)s times|one": "%(oneUser)sвиходить",
+ "%(oneUser)sleft %(count)s times|other": "%(oneUser)sвийшли %(count)s разів",
+ "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sвийшли",
+ "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sвийшли %(count)s разів",
+ "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+ "Language Dropdown": "Спадне меню мов",
+ "Information": "Відомості",
+ "Rotate Right": "Обернути праворуч",
+ "Rotate Left": "Обернути ліворуч",
+ "Zoom in": "Збільшити",
+ "Zoom out": "Зменшити",
+ "collapse": "згорнути",
+ "No results": "Немає результатів",
+ "Application window": "Вікно застосунку",
+ "Error - Mixed content": "Помилка — змішаний вміст",
+ "Widget ID": "ID віджета",
+ "%(brand)s URL": "URL-адреса %(brand)s",
+ "Your theme": "Ваша тема",
+ "Your user ID": "Ваш ID користувача",
+ "Your avatar URL": "URL-адреса вашого аватара",
+ "Unknown Address": "Невідома адреса",
+ "Cancel search": "Скасувати пошук",
+ "Quick Reactions": "Швидкі реакції",
+ "Categories": "Категорії",
+ "Flags": "Прапори",
+ "Symbols": "Символи",
+ "Objects": "Об'єкти",
+ "Travel & Places": "Подорожі та місця",
+ "Food & Drink": "Їжа та напої",
+ "Animals & Nature": "Тварини та природа",
+ "Smileys & People": "Емоджі та люди",
+ "Frequently Used": "Часто використовувані",
+ "Activities": "Діяльність",
+ "Failed to unban": "Не вдалося розблокувати",
+ "Banned by %(displayName)s": "Блокує %(displayName)s",
+ "Ban users": "Блокування користувачів",
+ "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s блокує вас у %(roomName)s",
+ "were banned %(count)s times|other": "заблоковані %(count)s разів",
+ "were banned %(count)s times|one": "заблоковані",
+ "was banned %(count)s times|other": "заблоковано %(count)s разів",
+ "was banned %(count)s times|one": "заблоковано",
+ "were unbanned %(count)s times|other": "розблоковані %(count)s разів",
+ "were unbanned %(count)s times|one": "розблоковані",
+ "was unbanned %(count)s times|other": "розблоковано %(count)s разів",
+ "was unbanned %(count)s times|one": "розблоковано",
+ "This is the beginning of your direct message history with <displayName/>.": "Це початок історії вашого особистого спілкування з <displayName/>.",
+ "Publish this room to the public in %(domain)s's room directory?": "Опублікувати цю кімнату для всіх у каталозі кімнат %(domain)s?",
+ "Direct message": "Особисте повідомлення",
+ "Recently Direct Messaged": "Недавно надіслані особисті повідомлення",
+ "User Directory": "Каталог користувачів",
+ "Room version:": "Версія кімнати:",
+ "Change topic": "Змінити тему",
+ "Change the topic of this room": "Змінити тему цієї кімнати",
+ "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sзмінює серверні права доступу",
+ "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sзмінює серверні права доступу %(count)s разів",
+ "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sзмінює серверні права доступу",
+ "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sзмінює серверні права доступу %(count)s разів",
+ "Change server ACLs": "Змінити серверні права доступу",
+ "Change permissions": "Змінити дозволи",
+ "Change room name": "Змінити назву кімнати",
+ "Change the name of this room": "Змінити назву цієї кімнати",
+ "Change history visibility": "Змінити видимість історії",
+ "Change main address for the room": "Змінити основну адресу кімнати",
+ "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s змінює аватар кімнати на <img/>",
+ "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s змінює аватар %(roomName)s",
+ "Change room avatar": "Змінити аватар кімнати",
+ "Change the avatar of this room": "Змінює аватар цієї кімнати",
+ "Modify widgets": "Змінити віджети",
+ "Notify everyone": "Сповістити всіх",
+ "Remove messages sent by others": "Вилучити повідомлення надіслані іншими",
+ "Kick users": "Викинути користувачів",
+ "Invite users": "Запросити користувачів",
+ "Select the roles required to change various parts of the room": "Виберіть ролі, необхідні для зміни різних частин кімнати",
+ "Default role": "Типова роль",
+ "Privileged Users": "Привілейовані користувачі",
+ "Roles & Permissions": "Ролі й дозволи",
+ "Main address": "Основна адреса",
+ "Error updating main address": "Помилка оновлення основної адреси",
+ "No other published addresses yet, add one below": "Поки немає загальнодоступних адрес, додайте їх унизу",
+ "Other published addresses:": "Інші загальнодоступні адреси:",
+ "Published addresses can be used by anyone on any server to join your room.": "Загальнодоступні адреси можуть бути використані будь-ким на будь-якому сервері для приєднання до вашої кімнати.",
+ "Published addresses can be used by anyone on any server to join your space.": "Загальнодоступні адреси можуть бути використані будь-ким на будь-якому сервері для приєднання до вашого простору.",
+ "Published Addresses": "Загальнодоступні адреси",
+ "Room Addresses": "Адреси кімнати",
+ "Your Security Key is in your <b>Downloads</b> folder.": "Ваш ключ безпеки перебуває у теці <b>Завантажень</b>.",
+ "Error downloading audio": "Помилка завантаження аудіо",
+ "Download logs": "Завантажити журнали",
+ "Preparing to download logs": "Приготування до завантаження журналів",
+ "Download %(text)s": "Завантажити %(text)s",
+ "Download": "Завантажити",
+ "Error downloading theme information.": "Помилка завантаження відомостей теми.",
+ "Matrix Room ID": "Matrix ID кімнати",
+ "Room ID": "ID кімнати",
+ "Failed to remove '%(roomName)s' from %(groupId)s": "Не вдалося вилучити «%(roomName)s» з %(groupId)s",
+ "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ви впевнені, що хочете вилучити «%(roomName)s» з %(groupId)s?",
+ "Decide who can join %(roomName)s.": "Вкажіть, хто може приєднуватися до %(roomName)s.",
+ "Internal room ID:": "Внутрішній ID кімнати:",
+ "User %(userId)s is already invited to the room": "Користувача %(userId)s вже запрошено до кімнати",
+ "Original event source": "Оригінальний початковий код",
+ "View source": "Переглянути код",
+ "Report": "Поскаржитися",
+ "Send report": "Надіслати звіт",
+ "Report the entire room": "Поскаржитися на всю кімнату",
+ "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Те, що пише цей користувач, неправильно.\nПро це буде повідомлено модераторам кімнати.",
+ "Please fill why you're reporting.": "Будь ласка, вкажіть, чому ви скаржитеся.",
+ "Report a bug": "Повідомити про ваду",
+ "Share %(name)s": "Поділитися %(name)s",
+ "Share Community": "Поділитися спільнотою",
+ "Share User": "Поділитися користувачем",
+ "Share content": "Поділитися вмістом",
+ "Share entire screen": "Поділитися всім екраном",
+ "Any of the following data may be shared:": "Можна поділитися будь-якими з цих даних:",
+ "Unable to share phone number": "Не вдалося надіслати телефонний номер",
+ "Share": "Поділитись",
+ "Unable to share email address": "Не вдалося надіслати адресу е-пошти",
+ "Share invite link": "Надіслати запрошувальне посилання",
+ "%(sharerName)s is presenting": "%(sharerName)s показує",
+ "Yes": "Так",
+ "Invite to %(spaceName)s": "Запросити до %(spaceName)s",
+ "Share your public space": "Поділитися своїм загальнодоступним простором",
+ "Forward": "Переслати",
+ "Forward message": "Переслати повідомлення",
+ "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Бета-версія доступна для переглядачів інтернету, настільних ПК та Android. Деякі функції можуть бути недоступні на вашому домашньому сервері.",
+ "Join the beta": "Долучитися до beta",
+ "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Щоб приєднатися до %(spaceName)s, увімкніть <a>Простори beta</a>",
+ "Spaces are a new way to group rooms and people.": "Простори — це новий спосіб згуртувати кімнати та людей.",
+ "Communities are changing to Spaces": "Спільноти змінюються на Простори",
+ "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Створіть спільноту, щоб об’єднати користувачів та кімнати! Створіть власну домашню сторінку, щоб позначити своє місце у всесвіті Matrix.",
+ "Some suggestions may be hidden for privacy.": "Деякі пропозиції можуть бути сховані для приватності.",
+ "Privacy Policy": "Політика приватності",
+ "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Приватність важлива для нас, тому ми не збираємо жодних особистих або ідентифікаційних даних для нашої аналітики.",
+ "Privacy": "Приватність",
+ "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Щоб допомогти учасникам простору знайти та приєднатися до приватної кімнати, перейдіть у налаштування безпеки й приватності цієї кімнати.",
+ "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Захистіться від втрати доступу до зашифрованих повідомлень і даних створенням резервної копії ключів шифрування на своєму сервері.",
+ "Secure Backup": "Безпечне резервне копіювання",
+ "Give feedback.": "Надіслати відгук.",
+ "You may contact me if you have any follow up questions": "Можете зв’язатися зі мною, якщо у вас виникнуть додаткові запитання"
}
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 9bcb16c061..44af0d0288 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -354,7 +354,7 @@
"The other party declined the call.": "Bên kia đã từ chối cuộc gọi.",
"Call Declined": "Cuộc gọi bị từ chối",
"Your user agent": "Hành động của bạn",
- "Single Sign On": "Single Sign On",
+ "Single Sign On": "Đăng nhập một lần",
"Confirm adding this email address by using Single Sign On to prove your identity.": "Xác nhận việc thêm địa chỉ email này bằng cách sử dụng Single Sign On để chứng minh danh tính của bạn.",
"Use Single Sign On to continue": "Sử dụng Signle Sign On để tiếp tục"
}
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 384a4c09ba..62749185ac 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -71,7 +71,7 @@
"%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。",
"%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 将昵称改为了 %(displayName)s。",
"Settings": "设置",
- "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小时制显示时间戳 （如：下午 2:30）",
+ "Show timestamps in 12 hour format (e.g. 2:30pm)": "使用 12 小时制显示时间戳 （下午 2:30）",
"Signed Out": "已退出登录",
"Sign in": "登录",
"Sign out": "注销",
@@ -344,7 +344,7 @@
"(~%(count)s results)|one": "（~%(count)s 个结果）",
"(~%(count)s results)|other": "（~%(count)s 个结果）",
"Please select the destination room for this message": "请选择此消息的目标聊天室",
- "Start automatically after system login": "在系统登录后自动启动",
+ "Start automatically after system login": "开机自启",
"Analytics": "统计分析服务",
"Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 的邀请",
"Sun": "周日",
@@ -513,7 +513,7 @@
"Stickerpack": "贴纸包",
"You don't currently have any stickerpacks enabled": "你目前未启用任何贴纸包",
"Key request sent.": "已发送密钥共享请求。",
- "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果你是房间中最后一位有权限的用户，在你降低自己的权限等级后将无法撤回此修改，因为你将无法重新获得权限。",
+ "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果你是聊天室中最后一位拥有权限的用户，在你降低自己的权限等级后将无法撤销此修改，你将无法重新获得权限。",
"You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "你将无法撤回此修改，因为此用户的等级将与你相同。",
"Unmute": "取消静音",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（特权等级 %(powerLevelNumber)s）",
@@ -538,7 +538,7 @@
"Failed to remove user from community": "移除用户失败",
"Filter community members": "过滤社群成员",
"Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "你确定要从 %(groupId)s 中移除 %(roomName)s 吗？",
- "Removing a room from the community will also remove it from the community page.": "从社群中移除房间时，同时也会将其从社群页面中移除。",
+ "Removing a room from the community will also remove it from the community page.": "从社群中移除聊天室时，同时也会将其从社群页面中移除。",
"Failed to remove room from community": "从社群中移除聊天室失败",
"Failed to remove '%(roomName)s' from %(groupId)s": "从 %(groupId)s 中移除 “%(roomName)s” 失败",
"Only visible to community members": "仅对社群成员可见",
@@ -658,8 +658,8 @@
"This Room": "此聊天室",
"Noisy": "响铃",
"Error saving email notification preferences": "保存电子邮件通知选项时出错",
- "Messages containing my display name": "消息中含有我的显示名称",
- "Messages in one-to-one chats": "一对一聊天中的消息",
+ "Messages containing my display name": "当消息包含我的昵称时",
+ "Messages in one-to-one chats": "私聊中的消息",
"Unavailable": "无法获得",
"View Decrypted Source": "查看解密的来源",
"Failed to update keywords": "无法更新关键词",
@@ -712,7 +712,7 @@
"Quote": "引述",
"Send logs": "发送日志",
"All messages": "全部消息",
- "Call invitation": "语音邀请",
+ "Call invitation": "当受到通话邀请时",
"Downloading update...": "正在下载更新…",
"State Key": "状态键（State Key）",
"Failed to send custom event.": "自定义事件发送失败。",
@@ -735,7 +735,7 @@
"Unable to join network": "无法加入网络",
"Sorry, your browser is <b>not</b> able to run %(brand)s.": "抱歉，您的浏览器 <b>无法</b> 运行 %(brand)s.",
"Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上传",
- "Messages in group chats": "群组聊天中的消息",
+ "Messages in group chats": "群聊中的消息",
"Yesterday": "昨天",
"Error encountered (%(errorDetail)s).": "遇到错误 (%(errorDetail)s)。",
"Low Priority": "低优先级",
@@ -866,7 +866,7 @@
"There was an error joining the room": "加入聊天室时发生错误",
"Custom user status messages": "自定义用户状态信息",
"Show developer tools": "显示开发者工具",
- "Messages containing @room": "含有 @room 的消息",
+ "Messages containing @room": "当消息包含 @room 时",
"Delete Backup": "删除备份",
"Backup version: ": "备份版本： ",
"Algorithm: ": "算法： ",
@@ -944,7 +944,7 @@
"Render simple counters in room header": "在聊天室标题中显示简单计数",
"Enable Emoji suggestions while typing": "启用实时表情符号建议",
"Show a placeholder for removed messages": "已移除的消息显示为一个占位符",
- "Show join/leave messages (invites/kicks/bans unaffected)": "显示 加入/离开 消息（邀请/移除/封禁 不受影响）",
+ "Show join/leave messages (invites/kicks/bans unaffected)": "显示加入/离开提示（邀请/移除/封禁提示不受此影响）",
"Show avatar changes": "显示头像更改",
"Show display name changes": "显示昵称更改",
"Show read receipts sent by other users": "显示其他用户发送的已读回执",
@@ -955,8 +955,8 @@
"Enable Community Filter Panel": "启用社群筛选器面板",
"Allow Peer-to-Peer for 1:1 calls": "允许一对一通话使用 P2P",
"Prompt before sending invites to potentially invalid matrix IDs": "在发送邀请之前提示可能无效的 Matrix ID",
- "Messages containing my username": "包含我的用户名的消息",
- "Encrypted messages in one-to-one chats": "一对一聊天中的加密消息",
+ "Messages containing my username": "当消息包含我的用户名时",
+ "Encrypted messages in one-to-one chats": "私聊中的加密消息",
"Encrypted messages in group chats": "群聊中的加密消息",
"The other party cancelled the verification.": "另一方取消了验证。",
"Verified!": "已验证！",
@@ -1050,14 +1050,14 @@
"Set a new account password...": "设置一个新的账号密码...",
"Email addresses": "电子邮箱地址",
"Phone numbers": "电话号码",
- "Language and region": "语言与区域",
+ "Language and region": "语言与地区",
"Theme": "主题",
"Account management": "账号管理",
"Deactivating your account is a permanent action - be careful!": "停用你的账号是一项永久性操作 - 请小心！",
"General": "通用",
"Credits": "感谢",
- "For help with using %(brand)s, click <a>here</a>.": "对使用 %(brand)s 的说明，请点击 <a>这里</a>。",
- "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "对使用 %(brand)s 的说明，请点击 <a>这里</a> 或者使用下面的按钮开始与我们的机器人聊聊。",
+ "For help with using %(brand)s, click <a>here</a>.": "关于 %(brand)s 的<a>使用说明</a>。",
+ "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "关于 %(brand)s 的使用说明，请点击<a>这里</a>或者通过下方按钮同我们的机器人聊聊。",
"Chat with %(brand)s Bot": "与 %(brand)s 机器人聊天",
"Help & About": "帮助及关于",
"Bug reporting": "错误上报",
@@ -1108,7 +1108,7 @@
"Invite anyway": "还是邀请",
"Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "在提交日志之前，你必须<a>创建一个GitHub issue</a> 来描述你的问题。",
"Unable to load commit detail: %(msg)s": "无法加载提交详情：%(msg)s",
- "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "为避免丢失聊天记录，你必须在登出前导出房间密钥。 你需要回到较新版本的 %(brand)s 才能执行此操作",
+ "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "为避免丢失聊天记录，你必须在登出前导出聊天室密钥。你需要切换至新版 %(brand)s 方可继续执行此操作",
"Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "验证此用户并将其标记为已信任。在收发端到端加密消息时，信任用户可让你更加放心。",
"Waiting for partner to confirm...": "等待对方确认中...",
"Incoming Verification Request": "收到验证请求",
@@ -1205,7 +1205,7 @@
"Prepends ¯\\_(ツ)_/¯ to a plain-text message": "在纯文本消息开头添加 ¯\\_(ツ)_/¯",
"User %(userId)s is already in the room": "用户 %(userId)s 已在聊天室中",
"The user must be unbanned before they can be invited.": "用户必须先解封才能被邀请。",
- "<a>Upgrade</a> to your own domain": "<a>升级</a> 到你自己的域名",
+ "<a>Upgrade</a> to your own domain": "<a>切换</a>至自有域名",
"Accept all %(invitedRooms)s invites": "接受所有 %(invitedRooms)s 邀请",
"Change room avatar": "更改聊天室头像",
"Change room name": "更改聊天室名称",
@@ -1253,7 +1253,7 @@
"You have %(count)s unread notifications in a prior version of this room.|one": "你在此聊天室的先前版本中有 %(count)s 条未读通知。",
"Add Email Address": "添加 Email 地址",
"Add Phone Number": "添加电话号码",
- "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "是否使用“面包屑”功能（最近访问的房间的图标在房间列表上方显示）",
+ "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "是否使用「面包屑」功能（显示在聊天室列表的头像）",
"Call failed due to misconfigured server": "因为服务器配置错误通话失败",
"Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "请联系你主服务器（<code>%(homeserverDomain)s</code>）的管理员设置 TURN 服务器来确保通话运作稳定。",
"Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "你也可以尝试使用<code>turn.matrix.org</code>公共服务器，但通话质量稍差，并且其将会得知你的 IP。你可以在设置中更改此选项。",
@@ -1368,8 +1368,8 @@
"Ensure you have a stable internet connection, or get in touch with the server admin": "确保你的网络连接稳定，或与服务器管理员联系",
"Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "跟你的%(brand)s管理员确认<a>你的配置</a>不正确或重复的条目。",
"Cannot reach identity server": "不可连接到身份服务器",
- "Room name or address": "房间名称或地址",
- "Joins room with given address": "使用给定地址加入房间",
+ "Room name or address": "聊天室名称或地址",
+ "Joins room with given address": "使用指定地址加入聊天室",
"Verify this login": "验证此登录名",
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "通过从其他会话之一验证此登录名并授予其访问加密信息的权限来确认您的身份。",
"Which officially provided instance you are using, if any": "如果有的话，你正在使用官方所提供的哪个实例",
@@ -1451,12 +1451,12 @@
"Use a system font": "使用系统字体",
"System font name": "系统字体名称",
"Never send encrypted messages to unverified sessions from this session": "永不从本会话向未验证的会话发送加密信息",
- "Never send encrypted messages to unverified sessions in this room from this session": "永不从本会话在本房间中向未验证的会话发送加密信息",
- "Order rooms by name": "按名称排列房间",
- "Show rooms with unread notifications first": "优先显示有未读通知的房间",
+ "Never send encrypted messages to unverified sessions in this room from this session": "永不从此会话向此聊天室中未验证的会话发送加密信息",
+ "Order rooms by name": "按名称排列聊天室顺序",
+ "Show rooms with unread notifications first": "优先显示有未读通知的聊天室",
"Show previews/thumbnails for images": "显示图片的预览图",
- "Enable message search in encrypted rooms": "在加密房间中启用消息搜索",
- "Enable experimental, compact IRC style layout": "启用实验性的、紧凑的IRC式布局",
+ "Enable message search in encrypted rooms": "在加密聊天室中启用消息搜索",
+ "Enable experimental, compact IRC style layout": "启用实验性、紧凑的 IRC 式布局",
"Verify this session by completing one of the following:": "完成以下之一以验证这一会话：",
"or": "或者",
"Start": "开始",
@@ -1587,7 +1587,7 @@
"Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "你的密码已成功更改。在你重新登录别的会话之前，你将不会在那里收到推送通知",
"Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "同意身份服务器（%(serverName)s）的服务协议以允许自己被通过邮件地址或电话号码发现。",
"Discovery": "发现",
- "Clear cache and reload": "清除缓存重新加载",
+ "Clear cache and reload": "清理缓存并重载",
"Keyboard Shortcuts": "键盘快捷键",
"Customise your experience with experimental labs features. <a>Learn more</a>.": "通过实验功能自定义您的体验。<a>了解更多</a>。",
"Ignored/Blocked": "已忽略/已屏蔽",
@@ -1643,7 +1643,7 @@
"To link to this room, please add an address.": "要链接至此聊天室，请添加一个地址。",
"Unable to share email address": "无法共享邮件地址",
"Your email address hasn't been verified yet": "你的邮件地址尚未被验证",
- "Click the link in the email you received to verify and then click continue again.": "请点击你收到的邮件中的链接后再点击继续。",
+ "Click the link in the email you received to verify and then click continue again.": "点击你所收到的电子邮件中的链接进行验证，然后再次点击继续。",
"Verify the link in your inbox": "验证你的收件箱中的链接",
"Complete": "完成",
"Share": "共享",
@@ -1758,7 +1758,7 @@
"%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s 不能被预览。你想加入吗？",
"This room doesn't exist. Are you sure you're at the right place?": "此聊天室不存在。你确定你在正确的地方吗？",
"Try again later, or ask a room admin to check if you have access.": "请稍后重试，或询问聊天室管理员以检查你是否有权限。",
- "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "尝试访问该房间是返回了 %(errcode)s。如果你认为你看到此消息是个错误，请<issueLink>提交一个错误报告</issueLink>。",
+ "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "尝试访问此聊天室时返回错误 %(errcode)s。如果你认为这是个错误，请<issueLink>提交错误报告</issueLink>。",
"Appearance": "外观",
"Show rooms with unread messages first": "优先显示有未读消息的聊天室",
"Show previews of messages": "显示消息预览",
@@ -1772,7 +1772,7 @@
"Show %(count)s more|other": "多显示 %(count)s 个",
"Show %(count)s more|one": "多显示 %(count)s 个",
"Use default": "使用默认",
- "Mentions & Keywords": "提及和关键词",
+ "Mentions & Keywords": "提及&关键词",
"Notification options": "通知选项",
"Leave Room": "离开聊天室",
"Forget Room": "忘记聊天室",
@@ -1962,7 +1962,7 @@
"Reminder: Your browser is unsupported, so your experience may be unpredictable.": "提醒：你的浏览器不被支持，所以你的体验可能不可预料。",
"GitHub issue": "GitHub 上的 issue",
"Notes": "提示",
- "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "如果有额外的上下文可以帮助我们分析问题，比如你当时在做什么、房间 ID、用户 ID 等等，请将其列于此处。",
+ "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "如果有额外的上下文可以帮助我们分析问题，比如你当时在做什么、聊天室 ID、用户 ID 等等，请将其列于此处。",
"Removing…": "正在移除…",
"Destroy cross-signing keys?": "销毁交叉签名密钥？",
"Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "删除交叉签名密钥是永久的。所有你验证过的人都会看到安全警报。除非你丢失了所有可以交叉签名的设备，否则几乎可以确定你不想这么做。",
@@ -2311,7 +2311,7 @@
"Space": "空格",
"How fast should messages be downloaded.": "消息下载速度。",
"IRC display name width": "IRC 显示名称宽度",
- "When rooms are upgraded": "聊天室升级时间",
+ "When rooms are upgraded": "当聊天室升级时",
"Unexpected server error trying to leave the room": "试图离开聊天室时发生意外服务器错误",
"Error leaving room": "离开聊天室时出错",
"New spinner design": "新的下拉列表设计",
@@ -2824,7 +2824,7 @@
"Value in this room": "此聊天室中的值",
"Settings Explorer": "设置浏览器",
"with state key %(stateKey)s": "附带有状态键（state key）%(stateKey)s",
- "Your server requires encryption to be enabled in private rooms.": "你的服务器要求私人房间启用加密。",
+ "Your server requires encryption to be enabled in private rooms.": "你的服务器要求私有聊天室得启用加密。",
"An image will help people identify your community.": "图片可以让人们辨识你的社群。",
"What's the name of your community or team?": "你的社群或者团队的名称是什么？",
"You can change this later if needed.": "如果需要，你可以稍后更改。",
@@ -3115,8 +3115,8 @@
"What do you want to organise?": "你想要组织什么？",
"Skip for now": "暂时跳过",
"Failed to create initial space rooms": "创建初始空间聊天室失败",
- "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "加入 %(spaceName)s 前，请开启<a>空间测试版</a>",
- "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "查看 %(spaceName)s 前，请开启<a>空间测试版</a>",
+ "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "加入 %(spaceName)s 前，需加入<a>空间测试</a>",
+ "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "查看 %(spaceName)s 前，需加入<a>空间测试</a>",
"Private space": "私有空间",
"Public space": "公开空间",
"Spaces are a beta feature.": "空间为测试版功能。",
@@ -3126,9 +3126,9 @@
"Search names and descriptions": "搜索名称和描述",
"You may want to try a different search or check for typos.": "你可能要尝试其他搜索或检查是否有错别字。",
"You may contact me if you have any follow up questions": "如果你有任何后续问题，可以联系我",
- "To leave the beta, visit your settings.": "要退出测试版，请访问你的设置。",
+ "To leave the beta, visit your settings.": "要退出测试，请访问你的设置。",
"Your platform and username will be noted to help us use your feedback as much as we can.": "我们将会记录你的平台及用户名，以帮助我们尽我们所能地使用你的反馈。",
- "%(featureName)s beta feedback": "%(featureName)s 测试版反馈",
+ "%(featureName)s beta feedback": "%(featureName)s 测试反馈",
"Thank you for your feedback, we really appreciate it.": "感谢你的反馈，我们衷心地感谢。",
"Beta feedback": "测试版反馈",
"Want to add a new room instead?": "想要添加一个新的聊天室吗？",
@@ -3231,9 +3231,9 @@
"Open the link in the email to continue registration.": "打开电子邮件中的链接以继续注册。",
"A confirmation email has been sent to %(emailAddress)s": "确认电子邮件以发送至 %(emailAddress)s",
"Avatar": "头像",
- "Join the beta": "加入测试版",
- "Leave the beta": "退出测试版",
- "Beta": "测试版",
+ "Join the beta": "加入测试",
+ "Leave the beta": "退出测试",
+ "Beta": "测试",
"Tap for more info": "点击以获取更多信息",
"Spaces is a beta feature": "空间为测试功能",
"Start audio stream": "开始音频流",
@@ -3273,7 +3273,7 @@
"See when anyone posts a sticker to your active room": "查看何时有人发送贴纸到你所活跃的聊天室",
"Send stickers to your active room as you": "发送贴纸到你所活跃的聊天室",
"See when people join, leave, or are invited to your active room": "查看人们何时加入、离开或被邀请到你所活跃的聊天室",
- "See when people join, leave, or are invited to this room": "查看人们何时加入、离开或被邀请到这个房间",
+ "See when people join, leave, or are invited to this room": "查看人们加入、离开或被邀请到此聊天室的时间",
"Kick, ban, or invite people to this room, and make you leave": "移除、封禁或邀请用户到此聊天室，并让你离开",
"Currently joining %(count)s rooms|one": "目前正在加入 %(count)s 个聊天室",
"Currently joining %(count)s rooms|other": "目前正在加入 %(count)s 个聊天室",
@@ -3397,5 +3397,202 @@
"Not a valid identity server (status code %(code)s)": "身份服务器无效（状态码 %(code)s）",
"Identity server URL must be HTTPS": "必须以 HTTPS 协议连接身份服务器",
"Send pseudonymous analytics data": "发送匿名统计数据",
- "User %(userId)s is already invited to the room": "%(userId)s 已经被邀请过"
+ "User %(userId)s is already invited to the room": "%(userId)s 已经被邀请过",
+ "Only invited people can join.": "只有受邀的人才能加入。",
+ "Private (invite only)": "私有（仅邀请）",
+ "This upgrade will allow members of selected spaces access to this room without an invite.": "此升级将允许选定的空间成员无需邀请即可访问此聊天室。",
+ "Images, GIFs and videos": "图片、GIF 和视频",
+ "Code blocks": "代码块",
+ "Displaying time": "显示的时间戳",
+ "To view all keyboard shortcuts, click here.": "要查看所有键盘快捷键，请单击此处。",
+ "Keyboard shortcuts": "键盘快捷键",
+ "If a community isn't shown you may not have permission to convert it.": "如果社群未显示，你可能无权转换它。",
+ "Show my Communities": "显示我的社群",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "社区已存档以便为空间腾出位置，但你可以在下方将你的社群转换为空间。转换将确保你的对话获得最新功能。",
+ "Create Space": "创建空间",
+ "Open Space": "打开空间",
+ "Olm version:": "Olm 版本：",
+ "There was an error loading your notification settings.": "加载你的通知设置时出错。",
+ "Mentions & keywords": "提及&关键词",
+ "Global": "全局",
+ "New keyword": "新的关键词",
+ "Keyword": "关键词",
+ "Enable email notifications for %(email)s": "为 %(email)s 启用电子邮件通知",
+ "Enable for this account": "为此帐号启用",
+ "An error occurred whilst saving your notification preferences.": "保存你的通知首选项时出错。",
+ "Error saving notification preferences": "保存通知设置时出错",
+ "Messages containing keywords": "当消息包含关键词时",
+ "Message bubbles": "消息气泡",
+ "IRC": "IRC",
+ "Show all rooms": "显示所有聊天室",
+ "To join an existing space you'll need an invite.": "要加入现有空间，你需要获得邀请。",
+ "You can also create a Space from a <a>community</a>.": "你还可以从 <a>社区</a> 创建空间。",
+ "You can change this later.": "你可以稍后变更。",
+ "What kind of Space do you want to create?": "你想创建什么样的空间？",
+ "Give feedback.": "给出反馈。",
+ "Thank you for trying Spaces. Your feedback will help inform the next versions.": "感谢您试用空间。你的反馈将有助于下一个版本。",
+ "Spaces feedback": "空间反馈",
+ "Spaces are a new feature.": "空间是一个新特性。",
+ "Delete avatar": "删除头像",
+ "Mute the microphone": "静音麦克风",
+ "Unmute the microphone": "取消麦克风静音",
+ "Dialpad": "拨号盘",
+ "More": "更多",
+ "Show sidebar": "显示侧边栏",
+ "Hide sidebar": "隐藏侧边栏",
+ "Start sharing your screen": "开始分享你的屏幕",
+ "Stop sharing your screen": "停止分享你的屏幕",
+ "Stop the camera": "停用摄像头",
+ "Start the camera": "启动摄像头",
+ "Your camera is still enabled": "你的摄像头仍然处于启用状态",
+ "Your camera is turned off": "你的摄像头已关闭",
+ "All rooms you're in will appear in Home.": "你加入的所有聊天室都会显示在主页。",
+ "Use Ctrl + F to search timeline": "使用 Ctrl + F 搜索时间线",
+ "Use Command + F to search timeline": "使用 Command + F 搜索时间线",
+ "Don't send read receipts": "不要发送已读回执",
+ "New layout switcher (with message bubbles)": "新的布局切换器（带有消息气泡）",
+ "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "这使聊天室可以轻松地对空间保持私密，同时让空间中的人们找到并加入他们。空间中的所有新聊天室都将提供此选项。",
+ "To help space members find and join a private room, go to that room's Security & Privacy settings.": "要帮助空间成员找到并加入私人聊天室，请转到该聊天室的安全和隐私设置。",
+ "Help space members find private rooms": "帮助空间成员找到私人聊天室",
+ "Send voice message": "发送语音消息",
+ "Help people in spaces to find and join private rooms": "帮助空间中的人们找到并加入私人聊天室",
+ "New in the Spaces beta": "空间测试版的新功能",
+ "Transfer Failed": "转移失败",
+ "Unable to transfer call": "无法转移通话",
+ "Anyone can find and join.": "任何人都可以找到并加入。",
+ "We're working on this, but just want to let you know.": "我们正在为此努力，但只是想让你知道。",
+ "Search for rooms or spaces": "搜索聊天室或空间",
+ "Created from <Community />": "从 <Community /> 创建",
+ "Unable to copy a link to the room to the clipboard.": "无法将聊天室的链接复制到剪贴板。",
+ "Unable to copy room link": "无法复制聊天室链接",
+ "Communities won't receive further updates.": "社群不会收到进一步的更新。",
+ "Spaces are a new way to make a community, with new features coming.": "空间是一种建立社群的新方式，新功能即将到来。",
+ "Communities can now be made into Spaces": "社群现在可以变成空间了",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "请求该社群的<a>管理员</a>将其设为空间并留意邀请。",
+ "You can create a Space from this community <a>here</a>.": "你可以在<a>这里</a>从此社群创建一个空间。",
+ "Error downloading audio": "下载音频时出错",
+ "Unnamed audio": "未命名的音频",
+ "Add space": "添加空间",
+ "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>请注意升级将使聊天室焕然一新</b>。当前所有的消息都将保留在此存档聊天室中。",
+ "Automatically invite members from this room to the new one": "自动邀请该聊天室的成员加入新聊天室",
+ "These are likely ones other room admins are a part of.": "这些可能是其他聊天室管理员的一部分。",
+ "Other spaces or rooms you might not know": "你可能不知道的其他空间或聊天室",
+ "Spaces you know that contain this room": "你知道的包含此聊天室的空间",
+ "Search spaces": "搜索空间",
+ "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "决定哪些空间可以访问这个聊天室。如果一个空间被选中，它的成员可以找到并加入<RoomName/>。",
+ "Select spaces": "选择空间",
+ "You're removing all spaces. Access will default to invite only": "你正在移除所有空间。访问权限将预设为仅邀请",
+ "Are you sure you want to leave <spaceName/>?": "你确定要离开 <spaceName/> 吗？",
+ "Leave %(spaceName)s": "离开 %(spaceName)s",
+ "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "你是某些要离开的聊天室或空间的唯一管理员。离开将使它们没有任何管理员。",
+ "You're the only admin of this space. Leaving it will mean no one has control over it.": "你是此空间的唯一管理员。离开它将意味着没有人可以控制它。",
+ "You won't be able to rejoin unless you are re-invited.": "除非你被重新邀请，否则你将无法重新加入。",
+ "Search %(spaceName)s": "搜索 %(spaceName)s",
+ "Leave specific rooms and spaces": "离开特定的聊天室和空间",
+ "Don't leave any": "不要离开任何",
+ "Leave all rooms and spaces": "离开所有聊天室和空间",
+ "User Directory": "用户目录",
+ "Adding...": "添加中...",
+ "Want to add an existing space instead?": "想要添加现有空间？",
+ "Add a space to a space you manage.": "向你管理的空间添加空间。",
+ "Only people invited will be able to find and join this space.": "只有受邀者才能找到并加入此空间。",
+ "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "任何人都可以找到并加入这个空间，而不仅仅是 <SpaceName/> 的成员。",
+ "Anyone in <SpaceName/> will be able to find and join.": "<SpaceName/> 中的任何人都可以找到并加入。",
+ "Private space (invite only)": "私有空间（仅邀请）",
+ "Space visibility": "空间可见度",
+ "This description will be shown to people when they view your space": "当人们查看你的空间时，将会向他们显示此描述",
+ "Flair won't be available in Spaces for the foreseeable future.": "在可预见的未来，Flair 将无法在空间中使用。",
+ "All rooms will be added and all community members will be invited.": "将添加所有聊天室并邀请所有社群成员。",
+ "A link to the Space will be put in your community description.": "空间链接将放入你的社群描述中。",
+ "Create Space from community": "从社群创建空间",
+ "Failed to migrate community": "迁移社群失败",
+ "To create a Space from another community, just pick the community in Preferences.": "要从另一个社群创建空间，只需在设置中选择社群。",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> 已经创建，并且社群中的每个人都已被邀请加入其中。",
+ "Space created": "已建立空间",
+ "To view Spaces, hide communities in <a>Preferences</a>": "要查看空间，请在<a>设置</a>中隐藏社群",
+ "This community has been upgraded into a Space": "此社群已升级为空间",
+ "Visible to space members": "对空间成员可见",
+ "Public room": "公共聊天室",
+ "Private room (invite only)": "私有聊天室（仅邀请）",
+ "Room visibility": "聊天室可见度",
+ "Create a room": "创建聊天室",
+ "Only people invited will be able to find and join this room.": "只有被邀请的人才能找到并加入这个聊天室。",
+ "Anyone will be able to find and join this room.": "任何人都可以找到并加入这个聊天室。",
+ "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "任何人都可以找到并加入这个聊天室，而不仅仅是 <SpaceName/> 的成员。",
+ "Everyone in <SpaceName/> will be able to find and join this room.": "<SpaceName/> 中的每个人都可以找到并加入这个聊天室。",
+ "You can change this at any time from room settings.": "你可以随时从聊天室设置中更改此设置。",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "调试日志包含应用程序使用数据，包括你的用户名、你访问过的聊天室或群组的 ID 或别名、你上次与之交互的 UI 元素，以及其他用户的用户名。它们不包含消息。",
+ "Adding spaces has moved.": "新增空间已移动。",
+ "Search for rooms": "搜索聊天室",
+ "Search for spaces": "搜索空间",
+ "Create a new space": "创建新空间",
+ "Want to add a new space instead?": "想要添加一个新空间？",
+ "Add existing space": "增加现有的空间",
+ "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s 变更了聊天室的<a>置顶消息</a> %(count)s 次。",
+ "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s 变更了聊天室的<a>置顶消息</a> %(count)s 次。",
+ "Share content": "分享内容",
+ "Application window": "应用程序窗口",
+ "Share entire screen": "分享整个屏幕",
+ "Image": "图片",
+ "Sticker": "贴纸",
+ "Error processing audio message": "处理音频消息时出错",
+ "Decrypting": "解密中",
+ "The call is in an unknown state!": "通话处于未知状态！",
+ "Missed call": "未接来电",
+ "Unknown failure: %(reason)s": "未知错误：%(reason)s",
+ "An unknown error occurred": "出现未知错误",
+ "Their device couldn't start the camera or microphone": "他们的设备无法启动摄像头或麦克风",
+ "Connection failed": "连接失败",
+ "Could not connect media": "无法连接媒体",
+ "No answer": "无响应",
+ "Call back": "回拨",
+ "Call declined": "拒绝通话",
+ "Connected": "已连接",
+ "Stop recording": "停止录制",
+ "Copy Room Link": "复制聊天室链接",
+ "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "你现在可以通过在通话期间按“屏幕共享”按钮来共享你的屏幕。如果双方都支持，你甚至可以在音频通话中使用此功能！",
+ "Screen sharing is here!": "屏幕共享来了！",
+ "Show %(count)s other previews|one": "显示 %(count)s 个其他预览",
+ "Show %(count)s other previews|other": "显示 %(count)s 个其他预览",
+ "Access": "访问",
+ "People with supported clients will be able to join the room without having a registered account.": "拥有受支持客户端的人无需注册帐号即可加入聊天室。",
+ "Decide who can join %(roomName)s.": "决定谁可以加入 %(roomName)s。",
+ "Space members": "空间成员",
+ "Anyone in a space can find and join. You can select multiple spaces.": "空间中的任何人都可以找到并加入。你可以选择多个空间。",
+ "Anyone in %(spaceName)s can find and join. You can select other spaces too.": "%(spaceName)s 中的任何人都可以找到并加入。你也可以选择其他空间。",
+ "Spaces with access": "可访问的空间",
+ "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "空间中的任何人都可以找到并加入。<a>在此处编辑哪些空间可以访问。</a>",
+ "Currently, %(count)s spaces have access|other": "目前，%(count)s 个空间可以访问",
+ "& %(count)s more|other": "以及另 %(count)s",
+ "Upgrade required": "需要升级",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "如果你通过 GitHub 提交了错误，调试日志可以帮助我们追踪问题。 调试日志包含应用程序使用数据、你的用户名、你访问过的聊天室或群组的 ID 或别名、你上次与之交互的 UI 元素，以及其他用户的用户名。 它们不包含消息。",
+ "%(sharerName)s is presenting": "%(sharerName)s 正在展示",
+ "You are presenting": "你正在展示",
+ "Surround selected text when typing special characters": "输入特殊字符时圈出选定的文本",
+ "Rooms and spaces": "聊天室与空间",
+ "Results": "结果",
+ "Enable encryption in settings.": "在设置中启用加密。",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "你的私人信息通常是加密的，但此聊天室不是。这通常是因为使用了不受支持的设备或方法，例如电子邮件邀请。",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "为避免这些问题，请为计划中的对话创建一个<a>新的加密聊天室</a>。",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建议公开加密聊天室。</b>这意味着任何人都可以找到并加入聊天室，因此任何人都可以阅读消息。你您将无法享受加密带来的任何好处。 在公共聊天室加密消息会导致接收和发送消息的速度变慢。",
+ "Are you sure you want to make this encrypted room public?": "你确定要公开此加密聊天室吗？",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "为避免这些问题，请为计划中的对话创建一个<a>新的加密聊天室</a>。",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建议为公开聊天室开启加密。</b>任何人都可以找到并加入公开聊天室，因此任何人都可以阅读其中的消息。 你将无法从中体验加密的任何好处，且以后也无法将其关闭。 在公开聊天室中加密消息会导致接收和发送消息的速度变慢。",
+ "Are you sure you want to add encryption to this public room?": "你确定要为此公开聊天室开启加密吗？",
+ "Cross-signing is ready but keys are not backed up.": "交叉签名已就绪，但尚未备份密钥。",
+ "Low bandwidth mode (requires compatible homeserver)": "低带宽模式（需要主服务器兼容）",
+ "Multiple integration managers (requires manual setup)": "多个集成管理器（需要手动设置）",
+ "Show threads": "显示主题帖",
+ "Thread": "主题帖",
+ "Threaded messaging": "按主题排列的消息",
+ "The above, but in <Room /> as well": "以上，但也包括 <Room />",
+ "The above, but in any room you are joined or invited to as well": "以上，但也包括您加入或被邀请加入的任何房间中",
+ "Autoplay videos": "自动播放视频",
+ "Autoplay GIFs": "自动播放 GIF",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s从此聊天室中取消固定了一条消息。查看所有固定消息。",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s 从此聊天室中取消固定了<a>一条消息</a>。查看所有<b>固定消息</b>。",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s将一条消息固定到此聊天室。查看所有固定信息。",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s 将<a>一条消息</a>固定到此聊天室。查看所有<b>固定消息</b>。",
+ "Currently, %(count)s spaces have access|one": "目前，一个空间有访问权限",
+ "& %(count)s more|one": "& 另外 %(count)s"
}
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 837e371070..869a9f6e75 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -3648,5 +3648,62 @@
"Surround selected text when typing special characters": "輸入特殊字元以環繞選取的文字",
"%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次。",
"%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次。",
- "Olm version:": "Olm 版本："
+ "Olm version:": "Olm 版本：",
+ "Delete avatar": "刪除大頭照",
+ "Don't send read receipts": "不要傳送讀取回條",
+ "Created from <Community />": "從 <Community /> 建立",
+ "Communities won't receive further updates.": "社群不會收到進一步的更新。",
+ "Spaces are a new way to make a community, with new features coming.": "空間是一種建立社群的新方式，新功能即將到來。",
+ "Communities can now be made into Spaces": "社群現在可以變成空間了",
+ "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "請要求此社群的<a>管理員</a>設定為空間並留意邀請。",
+ "You can create a Space from this community <a>here</a>.": "您可以從此社群<a>這裡</a>建立一個空間。",
+ "This description will be shown to people when they view your space": "當人們檢視您的空間時，將會向他們顯示此描述",
+ "Flair won't be available in Spaces for the foreseeable future.": "在可預見的未來，Flair 將無法在空間中使用。",
+ "All rooms will be added and all community members will be invited.": "將新增所有聊天室並邀請所有社群成員。",
+ "A link to the Space will be put in your community description.": "空間連結將會放到您的社群描述中。",
+ "Create Space from community": "從社群建立空間",
+ "Failed to migrate community": "遷移社群失敗",
+ "To create a Space from another community, just pick the community in Preferences.": "要從另一個社群建立空間，僅需在「偏好設定」中挑選社群。",
+ "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "已建立 <SpaceName/>，且社群中的每個人都已被邀請加入。",
+ "Space created": "已建立空間",
+ "To view Spaces, hide communities in <a>Preferences</a>": "要檢視空間，在<a>偏好設定</a>中隱藏社群",
+ "This community has been upgraded into a Space": "此社群已被升級為空間",
+ "If a community isn't shown you may not have permission to convert it.": "若未顯示社群，代表您可能無權轉換它。",
+ "Show my Communities": "顯示我的社群",
+ "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "社群已封存，以便讓空間接棒，但您可以在下方將您的社群轉換為空間。轉換可確保您的對話取得最新功能。",
+ "Create Space": "建立空間",
+ "Open Space": "開啟空間",
+ "To join an existing space you'll need an invite.": "要加入現有的空間，您必須獲得邀請。",
+ "You can also create a Space from a <a>community</a>.": "您也可以從<a>社群</a>建立空間。",
+ "You can change this later.": "您可以在稍後變更此設定。",
+ "What kind of Space do you want to create?": "您想建立什麼樣的空間？",
+ "Unknown failure: %(reason)s": "未知錯誤：%(reason)s",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "除錯紀錄檔包含了使用資料，其中也包含了您的使用者名稱、ID 或您造訪過的聊天室別名、您上次與之互動的使用者介面元素，以及其他使用者的使用者名稱。但不包含訊息。",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "如果您透過 GitHub 遞交臭蟲，除錯紀錄檔可以協助我們追蹤問題。除錯紀錄檔包含了使用資料，其中也包含了您的使用者名稱、ID 或您造訪過的聊天室別名、您上次與之互動的使用者介面元素，以及其他使用者的使用者名稱。但不包含訊息。",
+ "Rooms and spaces": "聊天室與空間",
+ "Results": "結果",
+ "Enable encryption in settings.": "在設定中啟用加密。",
+ "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "您的私人訊息會正常加密，但聊天室不會。一般來說這是因為使用了不支援的裝置或方法，例如電子郵件邀請。",
+ "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "為了避免這些問題，請為您計畫中的對話建立<a>新的公開聊天室</a>。",
+ "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建議讓加密聊天室公開。</b>這代表了任何人都可以找到並加入聊天室，因此任何人都可以閱讀訊息。您無法取得任何加密的好處。在公開聊天室中加密訊息會讓接收與傳送訊息變慢。",
+ "Are you sure you want to make this encrypted room public?": "您確定您想要讓此加密聊天室公開？",
+ "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "為了避免這些問題，請為您計畫中的對話建立<a>新的加密聊天室</a>。",
+ "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建議加密公開聊天室。</b>任何人都可以尋找並加入公開聊天室，所以任何人都可以閱讀其中的訊息。您不會得到任何加密的好處，而您也無法在稍後關閉加密功能。在公開聊天室中加密訊息會讓接收與傳送訊息更慢。",
+ "Are you sure you want to add encryption to this public room?": "您確定您要在此公開聊天室新增加密？",
+ "Cross-signing is ready but keys are not backed up.": "已準備好交叉簽署但金鑰未備份。",
+ "Low bandwidth mode (requires compatible homeserver)": "低頻寬模式（需要相容的家伺服器）",
+ "Multiple integration managers (requires manual setup)": "多個整合管理程式（需要手動設定）",
+ "Thread": "討論串",
+ "Show threads": "顯示討論串",
+ "Threaded messaging": "討論串訊息",
+ "The above, but in <Room /> as well": "以上，但也在 <Room /> 中",
+ "The above, but in any room you are joined or invited to as well": "以上，但在任何您已加入或被邀請的聊天室中",
+ "Autoplay videos": "自動播放影片",
+ "Autoplay GIFs": "自動播放 GIF",
+ "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s 從此聊天室取消釘選了訊息。檢視所有釘選的訊息。",
+ "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s 從此聊天室取消釘選了<a>訊息</a>。檢視所有<b>釘選的訊息</b>。",
+ "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s 釘選了訊息到此聊天室。檢視所有已釘選的訊息。",
+ "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s 釘選了<a>訊息</a>到此聊天室。檢視所有<b>釘選的訊息</b>。",
+ "Currently, %(count)s spaces have access|one": "目前，1 個空間可存取",
+ "& %(count)s more|one": "與其他 %(count)s 個"
}
diff --git a/src/resizer/distributors/collapse.ts b/src/resizer/distributors/collapse.ts
index d39580667c..1cef94976d 100644
--- a/src/resizer/distributors/collapse.ts
+++ b/src/resizer/distributors/collapse.ts
@@ -40,8 +40,13 @@ class CollapseItem extends ResizeItem<ICollapseConfig> {
}
export default class CollapseDistributor extends FixedDistributor<ICollapseConfig, CollapseItem> {
- static createItem(resizeHandle: HTMLDivElement, resizer: Resizer<ICollapseConfig>, sizer: Sizer) {
- return new CollapseItem(resizeHandle, resizer, sizer);
+ static createItem(
+ resizeHandle: HTMLDivElement,
+ resizer: Resizer<ICollapseConfig>,
+ sizer: Sizer,
+ container?: HTMLElement,
+ ): CollapseItem {
+ return new CollapseItem(resizeHandle, resizer, sizer, container);
}
private readonly toggleSize: number;
@@ -55,12 +60,9 @@ export default class CollapseDistributor extends FixedDistributor<ICollapseConfi
public resize(newSize: number) {
const isCollapsedSize = newSize < this.toggleSize;
- if (isCollapsedSize && !this.isCollapsed) {
- this.isCollapsed = true;
- this.item.notifyCollapsed(true);
- } else if (!isCollapsedSize && this.isCollapsed) {
- this.item.notifyCollapsed(false);
- this.isCollapsed = false;
+ if (isCollapsedSize !== this.isCollapsed) {
+ this.isCollapsed = isCollapsedSize;
+ this.item.notifyCollapsed(isCollapsedSize);
}
if (!isCollapsedSize) {
super.resize(newSize);
diff --git a/src/resizer/item.ts b/src/resizer/item.ts
index 66a0554d3d..868cd8230f 100644
--- a/src/resizer/item.ts
+++ b/src/resizer/item.ts
@@ -26,15 +26,20 @@ export default class ResizeItem<C extends IConfig = IConfig> {
handle: HTMLElement,
public readonly resizer: Resizer<C>,
public readonly sizer: Sizer,
+ public readonly container?: HTMLElement,
) {
this.reverse = resizer.isReverseResizeHandle(handle);
- this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
+ if (container) {
+ this.domNode = <HTMLElement>(container);
+ } else {
+ this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
+ }
this.id = handle.getAttribute("data-id");
}
- private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer) {
+ private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer, container?: HTMLElement) {
const Ctor = this.constructor as typeof ResizeItem;
- return new Ctor(handle, resizer, sizer);
+ return new Ctor(handle, resizer, sizer, container);
}
private advance(forwards: boolean) {
diff --git a/src/resizer/resizer.ts b/src/resizer/resizer.ts
index e430c68e17..0db13e1af5 100644
--- a/src/resizer/resizer.ts
+++ b/src/resizer/resizer.ts
@@ -35,6 +35,7 @@ export interface IConfig {
onResizeStart?(): void;
onResizeStop?(): void;
onResized?(size: number, id: string, element: HTMLElement): void;
+ handler?: HTMLDivElement;
}
export default class Resizer<C extends IConfig = IConfig> {
@@ -46,8 +47,17 @@ export default class Resizer<C extends IConfig = IConfig> {
public container: HTMLElement,
private readonly distributorCtor: {
new(item: ResizeItem): FixedDistributor<C, any>;
- createItem(resizeHandle: HTMLDivElement, resizer: Resizer, sizer: Sizer): ResizeItem;
- createSizer(containerElement: HTMLElement, vertical: boolean, reverse: boolean): Sizer;
+ createItem(
+ resizeHandle: HTMLDivElement,
+ resizer: Resizer,
+ sizer: Sizer,
+ container: HTMLElement
+ ): ResizeItem;
+ createSizer(
+ containerElement: HTMLElement,
+ vertical: boolean,
+ reverse: boolean
+ ): Sizer;
},
public readonly config?: C,
) {
@@ -68,12 +78,14 @@ export default class Resizer<C extends IConfig = IConfig> {
}
public attach() {
- this.container.addEventListener("mousedown", this.onMouseDown, false);
+ const attachment = this?.config?.handler?.parentElement ?? this.container;
+ attachment.addEventListener("mousedown", this.onMouseDown, false);
window.addEventListener("resize", this.onResize);
}
public detach() {
- this.container.removeEventListener("mousedown", this.onMouseDown, false);
+ const attachment = this?.config?.handler?.parentElement ?? this.container;
+ attachment.removeEventListener("mousedown", this.onMouseDown, false);
window.removeEventListener("resize", this.onResize);
}
@@ -113,7 +125,8 @@ export default class Resizer<C extends IConfig = IConfig> {
// use closest in case the resize handle contains
// child dom nodes that can be the target
const resizeHandle = event.target && (<HTMLDivElement>event.target).closest(`.${this.classNames.handle}`);
- if (!resizeHandle || resizeHandle.parentElement !== this.container) {
+ const hasHandler = this?.config?.handler;
+ if (!resizeHandle || (!hasHandler && resizeHandle.parentElement !== this.container)) {
return;
}
// prevent starting a drag operation
@@ -174,16 +187,18 @@ export default class Resizer<C extends IConfig = IConfig> {
const vertical = resizeHandle.classList.contains(this.classNames.vertical);
const reverse = this.isReverseResizeHandle(resizeHandle);
const Distributor = this.distributorCtor;
+ const useItemContainer = this.config && this.config.handler ? this.container : undefined;
const sizer = Distributor.createSizer(this.container, vertical, reverse);
- const item = Distributor.createItem(resizeHandle, this, sizer);
+ const item = Distributor.createItem(resizeHandle, this, sizer, useItemContainer);
const distributor = new Distributor(item);
return { sizer, distributor };
}
private getResizeHandles() {
+ if (this?.config?.handler) {
+ return [this.config.handler];
+ }
if (!this.container.children) return [];
- return Array.from(this.container.children).filter(el => {
- return this.isResizeHandle(<HTMLElement>el);
- }) as HTMLElement[];
+ return Array.from(this.container.querySelectorAll(`.${this.classNames.handle}`)) as HTMLElement[];
}
}
diff --git a/src/sendTimePerformanceMetrics.ts b/src/sendTimePerformanceMetrics.ts
new file mode 100644
index 0000000000..ee5caa05a9
--- /dev/null
+++ b/src/sendTimePerformanceMetrics.ts
@@ -0,0 +1,46 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixClient } from "matrix-js-sdk/src";
+
+/**
+ * Decorates the given event content object with the "send start time". The
+ * object will be modified in-place.
+ * @param {object} content The event content.
+ */
+export function decorateStartSendingTime(content: object) {
+ content['io.element.performance_metrics'] = {
+ sendStartTs: Date.now(),
+ };
+}
+
+/**
+ * Called when an event decorated with `decorateStartSendingTime()` has been sent
+ * by the server (the client now knows the event ID).
+ * @param {MatrixClient} client The client to send as.
+ * @param {string} inRoomId The room ID where the original event was sent.
+ * @param {string} forEventId The event ID for the decorated event.
+ */
+export function sendRoundTripMetric(client: MatrixClient, inRoomId: string, forEventId: string) {
+ // noinspection JSIgnoredPromiseFromCall
+ client.sendEvent(inRoomId, 'io.element.performance_metric', {
+ "io.element.performance_metrics": {
+ forEventId: forEventId,
+ responseTs: Date.now(),
+ kind: 'send_time',
+ },
+ });
+}
diff --git a/src/sentry.ts b/src/sentry.ts
index 59152f66f2..206ff9811b 100644
--- a/src/sentry.ts
+++ b/src/sentry.ts
@@ -19,7 +19,7 @@ import PlatformPeg from "./PlatformPeg";
import SdkConfig from "./SdkConfig";
import { MatrixClientPeg } from "./MatrixClientPeg";
import SettingsStore from "./settings/SettingsStore";
-import { MatrixClient } from "matrix-js-sdk";
+import { MatrixClient } from "matrix-js-sdk/src/client";
/* eslint-disable camelcase */
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index d170f8d357..6dbefd4b8e 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -211,6 +211,15 @@ export const SETTINGS: {[setting: string]: ISetting} = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
+ "feature_thread": {
+ isFeature: true,
+ // Requires a reload as we change an option flag on the `js-sdk`
+ // And the entire sync history needs to be parsed again
+ controller: new ReloadOnChangeController(),
+ displayName: _td("Threaded messaging"),
+ supportedLevels: LEVELS_FEATURE,
+ default: false,
+ },
"feature_custom_status": {
isFeature: true,
displayName: _td("Custom user status messages"),
@@ -233,7 +242,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
},
"feature_many_integration_managers": {
isFeature: true,
- displayName: _td("Multiple integration managers"),
+ displayName: _td("Multiple integration managers (requires manual setup)"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
@@ -276,12 +285,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
default: false,
controller: new PseudonymousAnalyticsController(),
},
- "advancedRoomListLogging": {
- // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
- displayName: _td("Enable advanced debugging for the room list"),
- supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
- default: false,
- },
"doNotDisturb": {
supportedLevels: [SettingLevel.DEVICE],
default: false,
@@ -390,9 +393,14 @@ export const SETTINGS: {[setting: string]: ISetting} = {
displayName: _td('Always show message timestamps'),
default: false,
},
- "autoplayGifsAndVideos": {
+ "autoplayGifs": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
- displayName: _td('Autoplay GIFs and videos'),
+ displayName: _td('Autoplay GIFs'),
+ default: false,
+ },
+ "autoplayVideo": {
+ supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+ displayName: _td('Autoplay videos'),
default: false,
},
"enableSyntaxHighlightLanguageDetection": {
@@ -668,7 +676,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
},
"lowBandwidth": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
- displayName: _td('Low bandwidth mode'),
+ displayName: _td('Low bandwidth mode (requires compatible homeserver)'),
default: false,
controller: new ReloadOnChangeController(),
},
@@ -751,6 +759,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
default: true,
controller: new ReducedMotionController(),
},
+ "Performance.addSendMessageTimingMetadata": {
+ supportedLevels: [SettingLevel.CONFIG],
+ default: false,
+ },
"Widgets.pinned": { // deprecated
supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
default: {},
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
index 9c937ebd88..5afe50e4e9 100644
--- a/src/settings/handlers/AccountSettingsHandler.ts
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -110,6 +110,21 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
return content ? content['enabled'] : null;
}
+ // Special case for autoplaying videos and GIFs
+ if (["autoplayGifs", "autoplayVideo"].includes(settingName)) {
+ const settings = this.getSettings() || {};
+ const value = settings[settingName];
+ // Fallback to old combined setting
+ if (value === null || value === undefined) {
+ const oldCombinedValue = settings["autoplayGifsAndVideos"];
+ // Write, so that we can remove this in the future
+ this.setValue("autoplayGifs", roomId, oldCombinedValue);
+ this.setValue("autoplayVideo", roomId, oldCombinedValue);
+ return oldCombinedValue;
+ }
+ return value;
+ }
+
const settings = this.getSettings() || {};
let preferredValue = settings[settingName];
diff --git a/src/settings/handlers/DeviceSettingsHandler.ts b/src/settings/handlers/DeviceSettingsHandler.ts
index e4ad4cb51e..e57862a824 100644
--- a/src/settings/handlers/DeviceSettingsHandler.ts
+++ b/src/settings/handlers/DeviceSettingsHandler.ts
@@ -71,7 +71,13 @@ export default class DeviceSettingsHandler extends SettingsHandler {
// Special case for old useIRCLayout setting
if (settingName === "layout") {
const settings = this.getSettings() || {};
- if (settings["useIRCLayout"]) return Layout.IRC;
+ if (settings["useIRCLayout"]) {
+ // Set the new layout setting and delete the old one so that we
+ // can delete this block of code after some time
+ settings["layout"] = Layout.IRC;
+ delete settings["useIRCLayout"];
+ localStorage.setItem("mx_local_settings", JSON.stringify(settings));
+ }
return settings[settingName];
}
diff --git a/src/stores/RightPanelStorePhases.ts b/src/stores/RightPanelStorePhases.ts
index d62f6c6110..96a585b676 100644
--- a/src/stores/RightPanelStorePhases.ts
+++ b/src/stores/RightPanelStorePhases.ts
@@ -37,6 +37,10 @@ export enum RightPanelPhases {
SpaceMemberList = "SpaceMemberList",
SpaceMemberInfo = "SpaceMemberInfo",
Space3pidMemberInfo = "Space3pidMemberInfo",
+
+ // Thread stuff
+ ThreadView = "ThreadView",
+ ThreadPanel = "ThreadPanel",
}
// These are the phases that are safe to persist (the ones that don't require additional
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index da18646d0f..cd0acc9d88 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -19,7 +19,7 @@ import { ListIteratee, Many, sortBy, throttle } from "lodash";
import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { ISpaceSummaryRoom } from "matrix-js-sdk/src/@types/spaces";
+import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
import { JoinRule } from "matrix-js-sdk/src/@types/partials";
import { IRoomCapability } from "matrix-js-sdk/src/client";
@@ -64,7 +64,7 @@ export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
export const UPDATE_HOME_BEHAVIOUR = Symbol("home-behaviour");
// Space Room ID/HOME_SPACE will be emitted when a Space's children change
-export interface ISuggestedRoom extends ISpaceSummaryRoom {
+export interface ISuggestedRoom extends IHierarchyRoom {
viaServers: string[];
}
@@ -145,9 +145,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
return this._allRoomsInHome;
}
- public async setActiveRoomInSpace(space: Room | null): Promise<void> {
+ public setActiveRoomInSpace(space: Room | null): void {
if (space && !space.isSpaceRoom()) return;
- if (space !== this.activeSpace) await this.setActiveSpace(space);
+ if (space !== this.activeSpace) this.setActiveSpace(space);
if (space) {
const roomId = this.getNotificationState(space.roomId).getFirstRoomWithNotifications();
@@ -190,7 +190,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
* @param contextSwitch whether to switch the user's context,
* should not be done when the space switch is done implicitly due to another event like switching room.
*/
- public async setActiveSpace(space: Room | null, contextSwitch = true) {
+ public setActiveSpace(space: Room | null, contextSwitch = true) {
if (space === this.activeSpace || (space && !space.isSpaceRoom())) return;
this._activeSpace = space;
@@ -257,7 +257,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
"go to that room's Security & Privacy settings.") }</p>
{ /* Reuses classes from TabbedView for simplicity, non-interactive */ }
- <div style={{ width: "190px" }}>
+ <div className="mx_TabbedView_tabsOnLeft" style={{ width: "190px", position: "relative" }}>
<div className="mx_TabbedView_tabLabel">
<span className="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_settingsIcon" />
<span className="mx_TabbedView_tabLabel_text">{ _t("General") }</span>
@@ -293,28 +293,34 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
}
if (space) {
- const suggestedRooms = await this.fetchSuggestedRooms(space);
- if (this._activeSpace === space) {
- this._suggestedRooms = suggestedRooms;
- this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
- }
+ this.loadSuggestedRooms(space);
+ }
+ }
+
+ private async loadSuggestedRooms(space) {
+ const suggestedRooms = await this.fetchSuggestedRooms(space);
+ if (this._activeSpace === space) {
+ this._suggestedRooms = suggestedRooms;
+ this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
}
}
public fetchSuggestedRooms = async (space: Room, limit = MAX_SUGGESTED_ROOMS): Promise<ISuggestedRoom[]> => {
try {
- const data = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, limit);
+ const { rooms } = await this.matrixClient.getRoomHierarchy(space.roomId, limit, 1, true);
const viaMap = new EnhancedMap<string, Set<string>>();
- data.events.forEach(ev => {
- if (ev.type === EventType.SpaceChild && ev.content.via?.length) {
- ev.content.via.forEach(via => {
- viaMap.getOrCreate(ev.state_key, new Set()).add(via);
- });
- }
+ rooms.forEach(room => {
+ room.children_state.forEach(ev => {
+ if (ev.type === EventType.SpaceChild && ev.content.via?.length) {
+ ev.content.via.forEach(via => {
+ viaMap.getOrCreate(ev.state_key, new Set()).add(via);
+ });
+ }
+ });
});
- return data.rooms.filter(roomInfo => {
+ return rooms.filter(roomInfo => {
return roomInfo.room_type !== RoomType.Space
&& this.matrixClient.getRoom(roomInfo.room_id)?.getMyMembership() !== "join";
}).map(roomInfo => ({
@@ -360,16 +366,22 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
}
public getParents(roomId: string, canonicalOnly = false): Room[] {
+ const userId = this.matrixClient?.getUserId();
const room = this.matrixClient?.getRoom(roomId);
return room?.currentState.getStateEvents(EventType.SpaceParent)
- .filter(ev => {
+ .map(ev => {
const content = ev.getContent();
- if (!content?.via?.length) return false;
- // TODO apply permissions check to verify that the parent mapping is valid
- if (canonicalOnly && !content?.canonical) return false;
- return true;
+ if (Array.isArray(content?.via) && (!canonicalOnly || content?.canonical)) {
+ const parent = this.matrixClient.getRoom(ev.getStateKey());
+ // only respect the relationship if the sender has sufficient permissions in the parent to set
+ // child relations, as per MSC1772.
+ // https://github.com/matrix-org/matrix-doc/blob/main/proposals/1772-groups-as-rooms.md#relationship-between-rooms-and-spaces
+ if (parent?.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+ return parent;
+ }
+ }
+ // else implicit undefined which causes this element to be filtered out
})
- .map(ev => this.matrixClient.getRoom(ev.getStateKey()))
.filter(Boolean) || [];
}
@@ -524,6 +536,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
});
}
+ const hiddenChildren = new EnhancedMap<string, Set<string>>();
+ visibleRooms.forEach(room => {
+ if (room.getMyMembership() !== "join") return;
+ this.getParents(room.roomId).forEach(parent => {
+ hiddenChildren.getOrCreate(parent.roomId, new Set()).add(room.roomId);
+ });
+ });
+
this.rootSpaces.forEach(s => {
// traverse each space tree in DFS to build up the supersets as you go up,
// reusing results from like subtrees.
@@ -553,6 +573,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
roomIds.add(roomId);
});
});
+ hiddenChildren.get(spaceId)?.forEach(roomId => {
+ roomIds.add(roomId);
+ });
this.spaceFilteredRooms.set(spaceId, roomIds);
return roomIds;
};
@@ -606,11 +629,18 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
};
private onRoom = (room: Room, newMembership?: string, oldMembership?: string) => {
- const membership = newMembership || room.getMyMembership();
+ const roomMembership = room.getMyMembership();
+ if (!roomMembership) {
+ // room is still being baked in the js-sdk, we'll process it at Room.myMembership instead
+ return;
+ }
+ const membership = newMembership || roomMembership;
if (!room.isSpaceRoom()) {
// this.onRoomUpdate(room);
- this.onRoomsUpdate();
+ // this.onRoomsUpdate();
+ // ideally we only need onRoomsUpdate here but it doesn't rebuild parentMap so always adds new rooms to Home
+ this.rebuild();
if (membership === "join") {
// the user just joined a room, remove it from the suggested list if it was there
@@ -664,6 +694,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
this.onSpaceUpdate();
this.emit(room.roomId);
}
+
+ if (room === this.activeSpace && // current space
+ this.matrixClient.getRoom(ev.getStateKey())?.getMyMembership() !== "join" && // target not joined
+ ev.getPrevContent().suggested !== ev.getContent().suggested // suggested flag changed
+ ) {
+ this.loadSuggestedRooms(room);
+ }
+
break;
case EventType.SpaceParent:
@@ -677,14 +715,22 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
this.emit(room.roomId);
break;
- case EventType.RoomMember:
+ case EventType.RoomPowerLevels:
if (room.isSpaceRoom()) {
- this.onSpaceMembersChange(ev);
+ this.onRoomsUpdate();
}
break;
}
};
+ // listening for m.room.member events in onRoomState above doesn't work as the Member object isn't updated by then
+ private onRoomStateMembers = (ev: MatrixEvent) => {
+ const room = this.matrixClient.getRoom(ev.getRoomId());
+ if (room?.isSpaceRoom()) {
+ this.onSpaceMembersChange(ev);
+ }
+ };
+
private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEv?: MatrixEvent) => {
if (!room.isSpaceRoom()) return;
@@ -741,6 +787,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
this.matrixClient.removeListener("Room.myMembership", this.onRoom);
this.matrixClient.removeListener("Room.accountData", this.onRoomAccountData);
this.matrixClient.removeListener("RoomState.events", this.onRoomState);
+ this.matrixClient.removeListener("RoomState.members", this.onRoomStateMembers);
this.matrixClient.removeListener("accountData", this.onAccountData);
}
await this.reset();
@@ -752,6 +799,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
this.matrixClient.on("Room.myMembership", this.onRoom);
this.matrixClient.on("Room.accountData", this.onRoomAccountData);
this.matrixClient.on("RoomState.events", this.onRoomState);
+ this.matrixClient.on("RoomState.members", this.onRoomStateMembers);
this.matrixClient.on("accountData", this.onAccountData);
this.matrixClient.getCapabilities().then(capabilities => {
@@ -764,7 +812,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
// restore selected state from last session if any and still valid
const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY);
if (lastSpaceId) {
- this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId));
+ // don't context switch here as it may break permalinks
+ this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId), false);
}
}
diff --git a/src/stores/notifications/ListNotificationState.ts b/src/stores/notifications/ListNotificationState.ts
index 6c67dbdd08..97ba2bd80b 100644
--- a/src/stores/notifications/ListNotificationState.ts
+++ b/src/stores/notifications/ListNotificationState.ts
@@ -32,7 +32,7 @@ export class ListNotificationState extends NotificationState {
}
public get symbol(): string {
- return null; // This notification state doesn't support symbols
+ return this._color === NotificationColor.Unsent ? "!" : null;
}
public setRooms(rooms: Room[]) {
diff --git a/src/stores/notifications/NotificationColor.ts b/src/stores/notifications/NotificationColor.ts
index b12f2b7c00..fadd5ac67e 100644
--- a/src/stores/notifications/NotificationColor.ts
+++ b/src/stores/notifications/NotificationColor.ts
@@ -21,4 +21,5 @@ export enum NotificationColor {
Bold, // no badge, show as unread
Grey, // unread notified messages
Red, // unread pings
+ Unsent, // some messages failed to send
}
diff --git a/src/stores/notifications/RoomNotificationState.ts b/src/stores/notifications/RoomNotificationState.ts
index 3fadbe7d7a..d0479200bd 100644
--- a/src/stores/notifications/RoomNotificationState.ts
+++ b/src/stores/notifications/RoomNotificationState.ts
@@ -24,6 +24,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
import * as RoomNotifs from '../../RoomNotifs';
import * as Unread from '../../Unread';
import { NotificationState } from "./NotificationState";
+import { getUnsentMessages } from "../../components/structures/RoomStatusBar";
export class RoomNotificationState extends NotificationState implements IDestroyable {
constructor(public readonly room: Room) {
@@ -32,6 +33,7 @@ export class RoomNotificationState extends NotificationState implements IDestroy
this.room.on("Room.timeline", this.handleRoomEventUpdate);
this.room.on("Room.redaction", this.handleRoomEventUpdate);
this.room.on("Room.myMembership", this.handleMembershipUpdate);
+ this.room.on("Room.localEchoUpdated", this.handleLocalEchoUpdated);
MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
MatrixClientPeg.get().on("accountData", this.handleAccountDataUpdate);
this.updateNotificationState();
@@ -47,12 +49,17 @@ export class RoomNotificationState extends NotificationState implements IDestroy
this.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
this.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
this.room.removeListener("Room.myMembership", this.handleMembershipUpdate);
+ this.room.removeListener("Room.localEchoUpdated", this.handleLocalEchoUpdated);
if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
MatrixClientPeg.get().removeListener("accountData", this.handleAccountDataUpdate);
}
}
+ private handleLocalEchoUpdated = () => {
+ this.updateNotificationState();
+ };
+
private handleReadReceipt = (event: MatrixEvent, room: Room) => {
if (!readReceiptChangeIsFor(event, MatrixClientPeg.get())) return; // not our own - ignore
if (room.roomId !== this.room.roomId) return; // not for us - ignore
@@ -79,7 +86,12 @@ export class RoomNotificationState extends NotificationState implements IDestroy
private updateNotificationState() {
const snapshot = this.snapshot();
- if (RoomNotifs.getRoomNotifsState(this.room.roomId) === RoomNotifs.MUTE) {
+ if (getUnsentMessages(this.room).length > 0) {
+ // When there are unsent messages we show a red `!`
+ this._color = NotificationColor.Unsent;
+ this._symbol = "!";
+ this._count = 1; // not used, technically
+ } else if (RoomNotifs.getRoomNotifsState(this.room.roomId) === RoomNotifs.MUTE) {
// When muted we suppress all notification states, even if we have context on them.
this._color = NotificationColor.None;
this._symbol = null;
diff --git a/src/stores/notifications/SpaceNotificationState.ts b/src/stores/notifications/SpaceNotificationState.ts
index f8eb07251b..137b2ca0f2 100644
--- a/src/stores/notifications/SpaceNotificationState.ts
+++ b/src/stores/notifications/SpaceNotificationState.ts
@@ -31,7 +31,7 @@ export class SpaceNotificationState extends NotificationState {
}
public get symbol(): string {
- return null; // This notification state doesn't support symbols
+ return this._color === NotificationColor.Unsent ? "!" : null;
}
public setRooms(rooms: Room[]) {
@@ -54,7 +54,7 @@ export class SpaceNotificationState extends NotificationState {
}
public getFirstRoomWithNotifications() {
- return this.rooms.find((room) => room.getUnreadNotificationCount() > 0).roomId;
+ return Object.values(this.states).find(state => state.color >= this.color)?.room.roomId;
}
public destroy() {
@@ -83,4 +83,3 @@ export class SpaceNotificationState extends NotificationState {
this.emitIfUpdated(snapshot);
}
}
-
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 1a5ef0484e..df36ac124c 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -71,7 +71,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
private readonly watchedSettings = [
'feature_custom_tags',
- 'advancedRoomListLogging', // TODO: Remove watch: https://github.com/vector-im/element-web/issues/14602
];
constructor() {
@@ -122,8 +121,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
this.readyStore.useUnitTestClient(forcedClient);
}
- this.checkLoggingEnabled();
-
for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
RoomViewStore.addListener(() => this.handleRVSUpdate({}));
this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
@@ -141,12 +138,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
this.updateFn.trigger();
}
- private checkLoggingEnabled() {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- console.warn("Advanced room list logging is enabled");
- }
- }
-
private async readAndCacheSettingsFromStore() {
const tagsEnabled = SettingsStore.getValue("feature_custom_tags");
await this.updateState({
@@ -172,10 +163,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
console.warn(`${activeRoomId} is current in RVS but missing from client - clearing sticky room`);
this.algorithm.setStickyRoom(null);
} else if (activeRoom !== this.algorithm.stickyRoom) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Changing sticky room to ${activeRoomId}`);
- }
this.algorithm.setStickyRoom(activeRoom);
}
}
@@ -218,14 +205,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
if (payload.action === Action.SettingUpdated) {
const settingUpdatedPayload = payload as SettingUpdatedPayload;
if (this.watchedSettings.includes(settingUpdatedPayload.settingName)) {
- // TODO: Remove with https://github.com/vector-im/element-web/issues/14602
- if (settingUpdatedPayload.settingName === "advancedRoomListLogging") {
- // Log when the setting changes so we know when it was turned on in the rageshake
- const enabled = SettingsStore.getValue("advancedRoomListLogging");
- console.warn("Advanced room list logging is enabled? " + enabled);
- return;
- }
-
console.log("Regenerating room lists: Settings changed");
await this.readAndCacheSettingsFromStore();
@@ -248,20 +227,12 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
console.warn(`Own read receipt was in unknown room ${room.roomId}`);
return;
}
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Got own read receipt in ${room.roomId}`);
- }
await this.handleRoomUpdate(room, RoomUpdateCause.ReadReceipt);
this.updateFn.trigger();
return;
}
} else if (payload.action === 'MatrixActions.Room.tags') {
const roomPayload = (<any>payload); // TODO: Type out the dispatcher types
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Got tag change in ${roomPayload.room.roomId}`);
- }
await this.handleRoomUpdate(roomPayload.room, RoomUpdateCause.PossibleTagChange);
this.updateFn.trigger();
} else if (payload.action === 'MatrixActions.Room.timeline') {
@@ -273,16 +244,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
const roomId = eventPayload.event.getRoomId();
const room = this.matrixClient.getRoom(roomId);
const tryUpdate = async (updatedRoom: Room) => {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Live timeline event ${eventPayload.event.getId()}` +
- ` in ${updatedRoom.roomId}`);
- }
if (eventPayload.event.getType() === 'm.room.tombstone' && eventPayload.event.getStateKey() === '') {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Got tombstone event - trying to remove now-dead room`);
- }
const newRoom = this.matrixClient.getRoom(eventPayload.event.getContent()['replacement_room']);
if (newRoom) {
// If we have the new room, then the new room check will have seen the predecessor
@@ -315,18 +277,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
console.warn(`Event ${eventPayload.event.getId()} was decrypted in an unknown room ${roomId}`);
return;
}
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Decrypted timeline event ${eventPayload.event.getId()} in ${roomId}`);
- }
await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
this.updateFn.trigger();
} else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Received updated DM map`);
- }
const dmMap = eventPayload.event.getContent();
for (const userId of Object.keys(dmMap)) {
const roomIds = dmMap[userId];
@@ -350,54 +304,29 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
const oldMembership = getEffectiveMembership(membershipPayload.oldMembership);
const newMembership = getEffectiveMembership(membershipPayload.membership);
if (oldMembership !== EffectiveMembership.Join && newMembership === EffectiveMembership.Join) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Handling new room ${membershipPayload.room.roomId}`);
- }
-
// If we're joining an upgraded room, we'll want to make sure we don't proliferate
// the dead room in the list.
const createEvent = membershipPayload.room.currentState.getStateEvents("m.room.create", "");
if (createEvent && createEvent.getContent()['predecessor']) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Room has a predecessor`);
- }
const prevRoom = this.matrixClient.getRoom(createEvent.getContent()['predecessor']['room_id']);
if (prevRoom) {
const isSticky = this.algorithm.stickyRoom === prevRoom;
if (isSticky) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Clearing sticky room due to room upgrade`);
- }
this.algorithm.setStickyRoom(null);
}
// Note: we hit the algorithm instead of our handleRoomUpdate() function to
// avoid redundant updates.
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Removing previous room from room list`);
- }
this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
}
}
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Adding new room to room list`);
- }
await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
this.updateFn.trigger();
return;
}
if (oldMembership !== EffectiveMembership.Invite && newMembership === EffectiveMembership.Invite) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Handling invite to ${membershipPayload.room.roomId}`);
- }
await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
this.updateFn.trigger();
return;
@@ -405,10 +334,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
// If it's not a join, it's transitioning into a different list (possibly historical)
if (oldMembership !== newMembership) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Handling membership change in ${membershipPayload.room.roomId}`);
- }
await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.PossibleTagChange);
this.updateFn.trigger();
return;
@@ -438,10 +363,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
const shouldUpdate = this.algorithm.handleRoomUpdate(room, cause);
if (shouldUpdate) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[DEBUG] Room "${room.name}" (${room.roomId}) triggered by ${cause} requires list update`);
- }
this.updateFn.mark();
}
}
@@ -450,11 +371,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
if (!this.algorithm) return;
if (!this.algorithm.hasTagSortingMap) return; // we're still loading
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log("Calculating new prefiltered room list");
- }
-
// Inhibit updates because we're about to lie heavily to the algorithm
this.algorithm.updatesInhibited = true;
@@ -588,10 +504,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
}
private onAlgorithmListUpdated = () => {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log("Underlying algorithm has triggered a list update - marking");
- }
this.updateFn.mark();
};
@@ -673,10 +585,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
* @param {IFilterCondition} filter The filter condition to add.
*/
public async addFilter(filter: IFilterCondition): Promise<void> {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log("Adding filter condition:", filter);
- }
let promise = Promise.resolve();
if (filter.kind === FilterKind.Prefilter) {
filter.on(FILTER_CHANGED, this.onPrefilterUpdated);
@@ -705,10 +613,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
* @param {IFilterCondition} filter The filter condition to remove.
*/
public removeFilter(filter: IFilterCondition): void {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log("Removing filter condition:", filter);
- }
let promise = Promise.resolve();
let idx = this.filterConditions.indexOf(filter);
let removed = false;
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index eb6ffe6dcf..1e2606686d 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -33,7 +33,6 @@ import { FILTER_CHANGED, IFilterCondition } from "../filters/IFilterCondition";
import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } from "../../../utils/membership";
import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
import { getListAlgorithmInstance } from "./list-ordering";
-import SettingsStore from "../../../settings/SettingsStore";
import { VisibilityProvider } from "../filters/VisibilityProvider";
import SpaceStore from "../../SpaceStore";
@@ -343,11 +342,6 @@ export class Algorithm extends EventEmitter {
}
}
newMap[tagId] = allowedRoomsInThisTag;
-
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[DEBUG] ${newMap[tagId].length}/${rooms.length} rooms filtered into ${tagId}`);
- }
}
const allowedRooms = Object.values(newMap).reduce((rv, v) => { rv.push(...v); return rv; }, <Room[]>[]);
@@ -360,10 +354,6 @@ export class Algorithm extends EventEmitter {
protected recalculateFilteredRoomsForTag(tagId: TagID): void {
if (!this.hasFilters) return; // don't bother doing work if there's nothing to do
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Recalculating filtered rooms for ${tagId}`);
- }
delete this.filteredRooms[tagId];
const rooms = this.cachedRooms[tagId].map(r => r); // cheap clone
this.tryInsertStickyRoomToFilterSet(rooms, tagId);
@@ -371,11 +361,6 @@ export class Algorithm extends EventEmitter {
if (filteredRooms.length > 0) {
this.filteredRooms[tagId] = filteredRooms;
}
-
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[DEBUG] ${filteredRooms.length}/${rooms.length} rooms filtered into ${tagId}`);
- }
}
protected tryInsertStickyRoomToFilterSet(rooms: Room[], tagId: TagID) {
@@ -415,10 +400,6 @@ export class Algorithm extends EventEmitter {
}
if (!this._cachedStickyRooms || !updatedTag) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Generating clone of cached rooms for sticky room handling`);
- }
const stickiedTagMap: ITagMap = {};
for (const tagId of Object.keys(this.cachedRooms)) {
stickiedTagMap[tagId] = this.cachedRooms[tagId].map(r => r); // shallow clone
@@ -429,10 +410,6 @@ export class Algorithm extends EventEmitter {
if (updatedTag) {
// Update the tag indicated by the caller, if possible. This is mostly to ensure
// our cache is up to date.
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Replacing cached sticky rooms for ${updatedTag}`);
- }
this._cachedStickyRooms[updatedTag] = this.cachedRooms[updatedTag].map(r => r); // shallow clone
}
@@ -441,12 +418,6 @@ export class Algorithm extends EventEmitter {
// we might have updated from the cache is also our sticky room.
const sticky = this._stickyRoom;
if (!updatedTag || updatedTag === sticky.tag) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(
- `Inserting sticky room ${sticky.room.roomId} at position ${sticky.position} in ${sticky.tag}`,
- );
- }
this._cachedStickyRooms[sticky.tag].splice(sticky.position, 0, sticky.room);
}
@@ -673,10 +644,6 @@ export class Algorithm extends EventEmitter {
* should be called after processing.
*/
public handleRoomUpdate(room: Room, cause: RoomUpdateCause): boolean {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Handle room update for ${room.roomId} called with cause ${cause}`);
- }
if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
// Note: check the isSticky against the room ID just in case the reference is wrong
@@ -733,10 +700,6 @@ export class Algorithm extends EventEmitter {
const diff = arrayDiff(oldTags, newTags);
if (diff.removed.length > 0 || diff.added.length > 0) {
for (const rmTag of diff.removed) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Removing ${room.roomId} from ${rmTag}`);
- }
const algorithm: OrderingAlgorithm = this.algorithms[rmTag];
if (!algorithm) throw new Error(`No algorithm for ${rmTag}`);
algorithm.handleRoomUpdate(room, RoomUpdateCause.RoomRemoved);
@@ -745,10 +708,6 @@ export class Algorithm extends EventEmitter {
this.recalculateStickyRoom(rmTag); // update sticky room to make sure it moves if needed
}
for (const addTag of diff.added) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Adding ${room.roomId} to ${addTag}`);
- }
const algorithm: OrderingAlgorithm = this.algorithms[addTag];
if (!algorithm) throw new Error(`No algorithm for ${addTag}`);
algorithm.handleRoomUpdate(room, RoomUpdateCause.NewRoom);
@@ -758,17 +717,9 @@ export class Algorithm extends EventEmitter {
// Update the tag map so we don't regen it in a moment
this.roomIdsToTags[room.roomId] = newTags;
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Changing update cause for ${room.roomId} to Timeline to sort rooms`);
- }
cause = RoomUpdateCause.Timeline;
didTagChange = true;
} else {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`Received no-op update for ${room.roomId} - changing to Timeline update`);
- }
cause = RoomUpdateCause.Timeline;
}
@@ -794,28 +745,15 @@ export class Algorithm extends EventEmitter {
// as the sticky room relies on this.
if (cause !== RoomUpdateCause.NewRoom && cause !== RoomUpdateCause.RoomRemoved) {
if (this.stickyRoom === room) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.warn(`[RoomListDebug] Received ${cause} update for sticky room ${room.roomId} - ignoring`);
- }
return false;
}
}
if (!this.roomIdsToTags[room.roomId]) {
if (CAUSES_REQUIRING_ROOM.includes(cause)) {
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.warn(`Skipping tag update for ${room.roomId} because we don't know about the room`);
- }
return false;
}
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Updating tags for room ${room.roomId} (${room.name})`);
- }
-
// Get the tags for the room and populate the cache
const roomTags = this.getTagsForRoom(room).filter(t => !isNullOrUndefined(this.cachedRooms[t]));
@@ -824,16 +762,6 @@ export class Algorithm extends EventEmitter {
if (!roomTags.length) throw new Error(`Tags cannot be determined for ${room.roomId}`);
this.roomIdsToTags[room.roomId] = roomTags;
-
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Updated tags for ${room.roomId}:`, roomTags);
- }
- }
-
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Reached algorithmic handling for ${room.roomId} and cause ${cause}`);
}
const tags = this.roomIdsToTags[room.roomId];
@@ -856,10 +784,6 @@ export class Algorithm extends EventEmitter {
changed = true;
}
- if (SettingsStore.getValue("advancedRoomListLogging")) {
- // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
- console.log(`[RoomListDebug] Finished handling ${room.roomId} with cause ${cause} (changed=${changed})`);
- }
return changed;
}
}
diff --git a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
index f47458d1b1..0da2c69eb8 100644
--- a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
@@ -20,6 +20,27 @@ import { IAlgorithm } from "./IAlgorithm";
import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import * as Unread from "../../../../Unread";
import { EffectiveMembership, getEffectiveMembership } from "../../../../utils/membership";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+export function shouldCauseReorder(event: MatrixEvent): boolean {
+ const type = event.getType();
+ const content = event.getContent();
+ const prevContent = event.getPrevContent();
+
+ // Never ignore membership changes
+ if (type === EventType.RoomMember && prevContent.membership !== content.membership) return true;
+
+ // Ignore status changes
+ // XXX: This should be an enum
+ if (type === "im.vector.user_status") return false;
+ // Ignore display name changes
+ if (type === EventType.RoomMember && prevContent.displayname !== content.displayname) return false;
+ // Ignore avatar changes
+ if (type === EventType.RoomMember && prevContent.avatar_url !== content.avatar_url) return false;
+
+ return true;
+}
export const sortRooms = (rooms: Room[]): Room[] => {
// We cache the timestamp lookup to avoid iterating forever on the timeline
@@ -68,7 +89,10 @@ export const sortRooms = (rooms: Room[]): Room[] => {
const ev = r.timeline[i];
if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
- if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) {
+ if (
+ (ev.getSender() === myUserId && shouldCauseReorder(ev)) ||
+ Unread.eventTriggersUnreadCount(ev)
+ ) {
return ev.getTs();
}
}
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index daa1e0e787..750034c573 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -1,5 +1,5 @@
/*
- * Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
+ * Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { ELEMENT_CLIENT_ID } from "../../identifiers";
import { getUserLanguage } from "../../languageHandler";
import { WidgetVariableCustomisations } from "../../customisations/WidgetVariables";
+import { arrayFastClone } from "../../utils/arrays";
// TODO: Destroy all of this code
@@ -146,6 +147,7 @@ export class StopGapWidget extends EventEmitter {
private scalarToken: string;
private roomId?: string;
private kind: WidgetKind;
+ private readUpToMap: {[roomId: string]: string} = {}; // room ID to event ID
constructor(private appTileProps: IAppTileProps) {
super();
@@ -294,6 +296,17 @@ export class StopGapWidget extends EventEmitter {
this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
});
+ // Populate the map of "read up to" events for this widget with the current event in every room.
+ // This is a bit inefficient, but should be okay. We do this for all rooms in case the widget
+ // requests timeline capabilities in other rooms down the road. It's just easier to manage here.
+ for (const room of MatrixClientPeg.get().getRooms()) {
+ // Timelines are most recent last
+ const events = room.getLiveTimeline()?.getEvents() || [];
+ const roomEvent = events[events.length - 1];
+ if (!roomEvent) continue; // force later code to think the room is fresh
+ this.readUpToMap[room.roomId] = roomEvent.getId();
+ }
+
// Attach listeners for feeding events - the underlying widget classes handle permissions for us
MatrixClientPeg.get().on('event', this.onEvent);
MatrixClientPeg.get().on('Event.decrypted', this.onEventDecrypted);
@@ -408,21 +421,56 @@ export class StopGapWidget extends EventEmitter {
private onEvent = (ev: MatrixEvent) => {
MatrixClientPeg.get().decryptEventIfNeeded(ev);
if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
- if (ev.getRoomId() !== this.eventListenerRoomId) return;
this.feedEvent(ev);
};
private onEventDecrypted = (ev: MatrixEvent) => {
if (ev.isDecryptionFailure()) return;
- if (ev.getRoomId() !== this.eventListenerRoomId) return;
this.feedEvent(ev);
};
private feedEvent(ev: MatrixEvent) {
if (!this.messaging) return;
+ // Check to see if this event would be before or after our "read up to" marker. If it's
+ // before, or we can't decide, then we assume the widget will have already seen the event.
+ // If the event is after, or we don't have a marker for the room, then we'll send it through.
+ //
+ // This approach of "read up to" prevents widgets receiving decryption spam from startup or
+ // receiving out-of-order events from backfill and such.
+ const upToEventId = this.readUpToMap[ev.getRoomId()];
+ if (upToEventId) {
+ // Small optimization for exact match (prevent search)
+ if (upToEventId === ev.getId()) {
+ return;
+ }
+
+ let isBeforeMark = true;
+
+ // Timelines are most recent last, so reverse the order and limit ourselves to 100 events
+ // to avoid overusing the CPU.
+ const timeline = MatrixClientPeg.get().getRoom(ev.getRoomId()).getLiveTimeline();
+ const events = arrayFastClone(timeline.getEvents()).reverse().slice(0, 100);
+
+ for (const timelineEvent of events) {
+ if (timelineEvent.getId() === upToEventId) {
+ break;
+ } else if (timelineEvent.getId() === ev.getId()) {
+ isBeforeMark = false;
+ break;
+ }
+ }
+
+ if (isBeforeMark) {
+ // Ignore the event: it is before our interest.
+ return;
+ }
+ }
+
+ this.readUpToMap[ev.getRoomId()] = ev.getId();
+
const raw = ev.getEffectiveEvent();
- this.messaging.feedEvent(raw).catch(e => {
+ this.messaging.feedEvent(raw, this.eventListenerRoomId).catch(e => {
console.error("Error sending event to widget: ", e);
});
}
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index 13cd260ef0..058a605380 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -1,5 +1,5 @@
/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import {
MatrixCapabilities,
OpenIDRequestState,
SimpleObservable,
+ Symbols,
Widget,
WidgetDriver,
WidgetEventCapability,
@@ -33,9 +34,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
import ActiveRoomObserver from "../../ActiveRoomObserver";
import Modal from "../../Modal";
import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog";
-import WidgetCapabilitiesPromptDialog, {
- getRememberedCapabilitiesForWidget,
-} from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
+import WidgetCapabilitiesPromptDialog from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions";
import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
import { WidgetType } from "../../widgets/WidgetType";
@@ -44,10 +43,19 @@ import { CHAT_EFFECTS } from "../../effects";
import { containsEmoji } from "../../effects/utils";
import dis from "../../dispatcher/dispatcher";
import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permalinks";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
// TODO: Purge this from the universe
+function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
+ return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
+}
+
+function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
+ localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
+}
+
export class StopGapWidgetDriver extends WidgetDriver {
private allowedCapabilities: Set<Capability>;
@@ -100,6 +108,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
}
}
// TODO: Do something when the widget requests new capabilities not yet asked for
+ let rememberApproved = false;
if (missing.size > 0) {
try {
const [result] = await Modal.createTrackedDialog(
@@ -111,17 +120,29 @@ export class StopGapWidgetDriver extends WidgetDriver {
widgetKind: this.forWidgetKind,
}).finished;
(result.approved || []).forEach(cap => allowedSoFar.add(cap));
+ rememberApproved = result.remember;
} catch (e) {
console.error("Non-fatal error getting capabilities: ", e);
}
}
- return new Set(iterableUnion(allowedSoFar, requested));
+ const allAllowed = new Set(iterableUnion(allowedSoFar, requested));
+
+ if (rememberApproved) {
+ setRememberedCapabilitiesForWidget(this.forWidget, Array.from(allAllowed));
+ }
+
+ return allAllowed;
}
- public async sendEvent(eventType: string, content: any, stateKey: string = null): Promise<ISendEventDetails> {
+ public async sendEvent(
+ eventType: string,
+ content: any,
+ stateKey: string = null,
+ targetRoomId: string = null,
+ ): Promise<ISendEventDetails> {
const client = MatrixClientPeg.get();
- const roomId = ActiveRoomObserver.activeRoomId;
+ const roomId = targetRoomId || ActiveRoomObserver.activeRoomId;
if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
@@ -129,6 +150,9 @@ export class StopGapWidgetDriver extends WidgetDriver {
if (stateKey !== null) {
// state event
r = await client.sendStateEvent(roomId, eventType, content, stateKey);
+ } else if (eventType === EventType.RoomRedaction) {
+ // special case: extract the `redacts` property and call redact
+ r = await client.redactEvent(roomId, content['redacts']);
} else {
// message event
r = await client.sendEvent(roomId, eventType, content);
@@ -145,48 +169,68 @@ export class StopGapWidgetDriver extends WidgetDriver {
return { roomId, eventId: r.event_id };
}
- public async readRoomEvents(eventType: string, msgtype: string | undefined, limit: number): Promise<object[]> {
- limit = limit > 0 ? Math.min(limit, 25) : 25; // arbitrary choice
-
+ private pickRooms(roomIds: (string | Symbols.AnyRoom)[] = null): Room[] {
const client = MatrixClientPeg.get();
- const roomId = ActiveRoomObserver.activeRoomId;
- const room = client.getRoom(roomId);
- if (!client || !roomId || !room) throw new Error("Not in a room or not attached to a client");
+ if (!client) throw new Error("Not attached to a client");
- const results: MatrixEvent[] = [];
- const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
- for (let i = events.length - 1; i > 0; i--) {
- if (results.length >= limit) break;
-
- const ev = events[i];
- if (ev.getType() !== eventType || ev.isState()) continue;
- if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
- results.push(ev);
- }
-
- return results.map(e => e.getEffectiveEvent());
+ const targetRooms = roomIds
+ ? (roomIds.includes(Symbols.AnyRoom) ? client.getVisibleRooms() : roomIds.map(r => client.getRoom(r)))
+ : [client.getRoom(ActiveRoomObserver.activeRoomId)];
+ return targetRooms.filter(r => !!r);
}
- public async readStateEvents(eventType: string, stateKey: string | undefined, limit: number): Promise<object[]> {
- limit = limit > 0 ? Math.min(limit, 100) : 100; // arbitrary choice
+ public async readRoomEvents(
+ eventType: string,
+ msgtype: string | undefined,
+ limitPerRoom: number,
+ roomIds: (string | Symbols.AnyRoom)[] = null,
+ ): Promise<object[]> {
+ limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
- const client = MatrixClientPeg.get();
- const roomId = ActiveRoomObserver.activeRoomId;
- const room = client.getRoom(roomId);
- if (!client || !roomId || !room) throw new Error("Not in a room or not attached to a client");
+ const rooms = this.pickRooms(roomIds);
+ const allResults: IEvent[] = [];
+ for (const room of rooms) {
+ const results: MatrixEvent[] = [];
+ const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
+ for (let i = events.length - 1; i > 0; i--) {
+ if (results.length >= limitPerRoom) break;
- const results: MatrixEvent[] = [];
- const state: Map<string, MatrixEvent> = room.currentState.events.get(eventType);
- if (state) {
- if (stateKey === "" || !!stateKey) {
- const forKey = state.get(stateKey);
- if (forKey) results.push(forKey);
- } else {
- results.push(...Array.from(state.values()));
+ const ev = events[i];
+ if (ev.getType() !== eventType || ev.isState()) continue;
+ if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
+ results.push(ev);
}
- }
- return results.slice(0, limit).map(e => e.event);
+ results.forEach(e => allResults.push(e.getEffectiveEvent()));
+ }
+ return allResults;
+ }
+
+ public async readStateEvents(
+ eventType: string,
+ stateKey: string | undefined,
+ limitPerRoom: number,
+ roomIds: (string | Symbols.AnyRoom)[] = null,
+ ): Promise<object[]> {
+ limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
+
+ const rooms = this.pickRooms(roomIds);
+ const allResults: IEvent[] = [];
+ for (const room of rooms) {
+ const results: MatrixEvent[] = [];
+ const state: Map<string, MatrixEvent> = room.currentState.events.get(eventType);
+ if (state) {
+ if (stateKey === "" || !!stateKey) {
+ const forKey = state.get(stateKey);
+ if (forKey) results.push(forKey);
+ } else {
+ results.push(...Array.from(state.values()));
+ }
+ }
+
+ results.slice(0, limitPerRoom).forEach(e => allResults.push(e.getEffectiveEvent()));
+ }
+ return allResults;
}
public async askOpenID(observer: SimpleObservable<IOpenIDUpdate>) {
diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts
index 7aef05c523..ee8d9bceae 100644
--- a/src/utils/EventUtils.ts
+++ b/src/utils/EventUtils.ts
@@ -103,6 +103,7 @@ export function getEventDisplayInfo(mxEvent: MatrixEvent): {
isInfoMessage: boolean;
tileHandler: string;
isBubbleMessage: boolean;
+ isLeftAlignedBubbleMessage: boolean;
} {
const content = mxEvent.getContent();
const msgtype = content.msgtype;
@@ -118,12 +119,16 @@ export function getEventDisplayInfo(mxEvent: MatrixEvent): {
(eventType === EventType.RoomEncryption) ||
(tileHandler === "messages.MJitsiWidgetEvent")
);
+ const isLeftAlignedBubbleMessage = (
+ !isBubbleMessage &&
+ eventType === EventType.CallInvite
+ );
let isInfoMessage = (
!isBubbleMessage &&
+ !isLeftAlignedBubbleMessage &&
eventType !== EventType.RoomMessage &&
eventType !== EventType.Sticker &&
- eventType !== EventType.RoomCreate &&
- eventType !== EventType.CallInvite
+ eventType !== EventType.RoomCreate
);
// If we're showing hidden events in the timeline, we should use the
@@ -137,5 +142,14 @@ export function getEventDisplayInfo(mxEvent: MatrixEvent): {
isInfoMessage = true;
}
- return { tileHandler, isInfoMessage, isBubbleMessage };
+ return { tileHandler, isInfoMessage, isBubbleMessage, isLeftAlignedBubbleMessage };
+}
+
+export function isVoiceMessage(mxEvent: MatrixEvent): boolean {
+ const content = mxEvent.getContent();
+ // MSC2516 is a legacy identifier. See https://github.com/matrix-org/matrix-doc/pull/3245
+ return (
+ !!content['org.matrix.msc2516.voice'] ||
+ !!content['org.matrix.msc3245.voice']
+ );
}
diff --git a/src/utils/RoomUpgrade.ts b/src/utils/RoomUpgrade.ts
index e632ec6345..366f49d892 100644
--- a/src/utils/RoomUpgrade.ts
+++ b/src/utils/RoomUpgrade.ts
@@ -22,6 +22,7 @@ import Modal from "../Modal";
import { _t } from "../languageHandler";
import ErrorDialog from "../components/views/dialogs/ErrorDialog";
import SpaceStore from "../stores/SpaceStore";
+import Spinner from "../components/views/elements/Spinner";
export async function upgradeRoom(
room: Room,
@@ -29,8 +30,10 @@ export async function upgradeRoom(
inviteUsers = false,
handleError = true,
updateSpaces = true,
+ awaitRoom = false,
): Promise<string> {
const cli = room.client;
+ const spinnerModal = Modal.createDialog(Spinner, null, "mx_Dialog_spinner");
let newRoomId: string;
try {
@@ -46,27 +49,36 @@ export async function upgradeRoom(
throw e;
}
- // We have to wait for the js-sdk to give us the room back so
- // we can more effectively abuse the MultiInviter behaviour
- // which heavily relies on the Room object being available.
- if (inviteUsers) {
- const checkForUpgradeFn = async (newRoom: Room): Promise<void> => {
- // The upgradePromise should be done by the time we await it here.
- if (newRoom.roomId !== newRoomId) return;
-
- const toInvite = [
- ...room.getMembersWithMembership("join"),
- ...room.getMembersWithMembership("invite"),
- ].map(m => m.userId).filter(m => m !== cli.getUserId());
-
- if (toInvite.length > 0) {
- // Errors are handled internally to this function
- await inviteUsersToRoom(newRoomId, toInvite);
+ if (awaitRoom || inviteUsers) {
+ await new Promise<void>(resolve => {
+ // already have the room
+ if (room.client.getRoom(newRoomId)) {
+ resolve();
+ return;
}
- cli.removeListener('Room', checkForUpgradeFn);
- };
- cli.on('Room', checkForUpgradeFn);
+ // We have to wait for the js-sdk to give us the room back so
+ // we can more effectively abuse the MultiInviter behaviour
+ // which heavily relies on the Room object being available.
+ const checkForRoomFn = (newRoom: Room) => {
+ if (newRoom.roomId !== newRoomId) return;
+ resolve();
+ cli.off("Room", checkForRoomFn);
+ };
+ cli.on("Room", checkForRoomFn);
+ });
+ }
+
+ if (inviteUsers) {
+ const toInvite = [
+ ...room.getMembersWithMembership("join"),
+ ...room.getMembersWithMembership("invite"),
+ ].map(m => m.userId).filter(m => m !== cli.getUserId());
+
+ if (toInvite.length > 0) {
+ // Errors are handled internally to this function
+ await inviteUsersToRoom(newRoomId, toInvite);
+ }
}
if (updateSpaces) {
@@ -89,5 +101,6 @@ export async function upgradeRoom(
}
}
+ spinnerModal.close();
return newRoomId;
}
diff --git a/src/utils/drawable.ts b/src/utils/drawable.ts
new file mode 100644
index 0000000000..31f7bc8cec
--- /dev/null
+++ b/src/utils/drawable.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Fetch an image using the best available method based on browser compatibility
+ * @param url the URL of the image to fetch
+ * @returns a canvas drawable object
+ */
+export async function getDrawable(url: string): Promise<CanvasImageSource> {
+ if ('createImageBitmap' in window) {
+ const response = await fetch(url);
+ const blob = await response.blob();
+ return await createImageBitmap(blob);
+ } else {
+ return new Promise<HTMLImageElement>((resolve, reject) => {
+ const img = document.createElement("img");
+ img.crossOrigin = "anonymous";
+ img.onload = () => resolve(img);
+ img.onerror = (e) => reject(e);
+ img.src = url;
+ });
+ }
+}
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index f980d1dcd6..1a120e08b3 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -15,6 +15,8 @@ limitations under the License.
*/
import { Room } from "matrix-js-sdk/src/models/room";
+import { sleep } from "matrix-js-sdk/src/utils";
+
import { MatrixClientPeg } from "../MatrixClientPeg";
import { _t } from "../languageHandler";
import Modal from "../Modal";
@@ -83,9 +85,10 @@ export function isJoinedOrNearlyJoined(membership: string): boolean {
return effective === EffectiveMembership.Join || effective === EffectiveMembership.Invite;
}
-export async function leaveRoomBehaviour(roomId: string) {
+export async function leaveRoomBehaviour(roomId: string, retry = true) {
+ const cli = MatrixClientPeg.get();
let leavingAllVersions = true;
- const history = await MatrixClientPeg.get().getRoomUpgradeHistory(roomId);
+ const history = cli.getRoomUpgradeHistory(roomId);
if (history && history.length > 0) {
const currentRoom = history[history.length - 1];
if (currentRoom.roomId !== roomId) {
@@ -95,20 +98,28 @@ export async function leaveRoomBehaviour(roomId: string) {
}
}
- let results: { [roomId: string]: Error & { errcode: string, message: string } } = {};
+ let results: { [roomId: string]: Error & { errcode?: string, message: string, data?: Record<string, any> } } = {};
if (!leavingAllVersions) {
try {
- await MatrixClientPeg.get().leave(roomId);
+ await cli.leave(roomId);
} catch (e) {
- if (e && e.data && e.data.errcode) {
+ if (e?.data?.errcode) {
const message = e.data.error || _t("Unexpected server error trying to leave the room");
- results[roomId] = Object.assign(new Error(message), { errcode: e.data.errcode });
+ results[roomId] = Object.assign(new Error(message), { errcode: e.data.errcode, data: e.data });
} else {
results[roomId] = e || new Error("Failed to leave room for unknown causes");
}
}
} else {
- results = await MatrixClientPeg.get().leaveRoomChain(roomId);
+ results = await cli.leaveRoomChain(roomId, retry);
+ }
+
+ if (retry) {
+ const limitExceededError = Object.values(results).find(e => e?.errcode === "M_LIMIT_EXCEEDED");
+ if (limitExceededError) {
+ await sleep(limitExceededError.data.retry_after_ms ?? 100);
+ return leaveRoomBehaviour(roomId, false);
+ }
}
const errors = Object.entries(results).filter(r => !!r[1]);
diff --git a/src/utils/space.tsx b/src/utils/space.tsx
index c1d8dbfbea..5bbae369e7 100644
--- a/src/utils/space.tsx
+++ b/src/utils/space.tsx
@@ -162,7 +162,9 @@ export const leaveSpace = (space: Room) => {
if (!leave) return;
const modal = Modal.createDialog(Spinner, null, "mx_Dialog_spinner");
try {
- await Promise.all(rooms.map(r => leaveRoomBehaviour(r.roomId)));
+ for (const room of rooms) {
+ await leaveRoomBehaviour(room.roomId);
+ }
await leaveRoomBehaviour(space.roomId);
} finally {
modal.close();
diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx
index 63e34eea7a..8c13a4b2fc 100644
--- a/src/widgets/CapabilityText.tsx
+++ b/src/widgets/CapabilityText.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,11 +14,22 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import { Capability, EventDirection, MatrixCapabilities, WidgetEventCapability, WidgetKind } from "matrix-widget-api";
+import {
+ Capability,
+ EventDirection,
+ getTimelineRoomIDFromCapability,
+ isTimelineCapability,
+ isTimelineCapabilityFor,
+ MatrixCapabilities, Symbols,
+ WidgetEventCapability,
+ WidgetKind,
+} from "matrix-widget-api";
import { _t, _td, TranslatedString } from "../languageHandler";
import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
import { ElementWidgetCapabilities } from "../stores/widgets/ElementWidgetCapabilities";
import React from "react";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import TextWithTooltip from "../components/views/elements/TextWithTooltip";
type GENERIC_WIDGET_KIND = "generic"; // eslint-disable-line @typescript-eslint/naming-convention
const GENERIC_WIDGET_KIND: GENERIC_WIDGET_KIND = "generic";
@@ -138,8 +149,31 @@ export class CapabilityText {
if (textForKind[GENERIC_WIDGET_KIND]) return { primary: _t(textForKind[GENERIC_WIDGET_KIND]) };
// ... we'll fall through to the generic capability processing at the end of this
- // function if we fail to locate a simple string and the capability isn't for an
- // event.
+ // function if we fail to generate a string for the capability.
+ }
+
+ // Try to handle timeline capabilities. The text here implies that the caller has sorted
+ // the timeline caps to the end for UI purposes.
+ if (isTimelineCapability(capability)) {
+ if (isTimelineCapabilityFor(capability, Symbols.AnyRoom)) {
+ return { primary: _t("The above, but in any room you are joined or invited to as well") };
+ } else {
+ const roomId = getTimelineRoomIDFromCapability(capability);
+ const room = MatrixClientPeg.get().getRoom(roomId);
+ return {
+ primary: _t("The above, but in <Room /> as well", {}, {
+ Room: () => {
+ if (room) {
+ return <TextWithTooltip tooltip={room.getCanonicalAlias() ?? roomId}>
+ <b>{ room.name }</b>
+ </TextWithTooltip>;
+ } else {
+ return <b><code>{ roomId }</code></b>;
+ }
+ },
+ }),
+ };
+ }
}
// We didn't have a super simple line of text, so try processing the capability as the
diff --git a/test/TextForEvent-test.ts b/test/TextForEvent-test.ts
new file mode 100644
index 0000000000..b8a459af67
--- /dev/null
+++ b/test/TextForEvent-test.ts
@@ -0,0 +1,129 @@
+import './skinned-sdk';
+
+import { textForEvent } from "../src/TextForEvent";
+import { MatrixEvent } from "matrix-js-sdk";
+import SettingsStore from "../src/settings/SettingsStore";
+import { SettingLevel } from "../src/settings/SettingLevel";
+import renderer from 'react-test-renderer';
+
+function mockPinnedEvent(
+ pinnedMessageIds?: string[],
+ prevPinnedMessageIds?: string[],
+): MatrixEvent {
+ return new MatrixEvent({
+ type: "m.room.pinned_events",
+ state_key: "",
+ sender: "@foo:example.com",
+ content: {
+ pinned: pinnedMessageIds,
+ },
+ prev_content: {
+ pinned: prevPinnedMessageIds,
+ },
+ });
+}
+
+// Helper function that renders a component to a plain text string.
+// Once snapshots are introduced in tests, this function will no longer be necessary,
+// and should be replaced with snapshots.
+function renderComponent(component): string {
+ const serializeObject = (object): string => {
+ if (typeof object === 'string') {
+ return object === ' ' ? '' : object;
+ }
+
+ if (Array.isArray(object) && object.length === 1 && typeof object[0] === 'string') {
+ return object[0];
+ }
+
+ if (object['type'] !== undefined && typeof object['children'] !== undefined) {
+ return serializeObject(object.children);
+ }
+
+ if (!Array.isArray(object)) {
+ return '';
+ }
+
+ return object.map(child => {
+ return serializeObject(child);
+ }).join('');
+ };
+
+ return serializeObject(component.toJSON());
+}
+
+describe('TextForEvent', () => {
+ describe("TextForPinnedEvent", () => {
+ SettingsStore.setValue("feature_pinning", null, SettingLevel.DEVICE, true);
+
+ it("mentions message when a single message was pinned, with no previously pinned messages", () => {
+ const event = mockPinnedEvent(['message-1']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com pinned a message to this room. See all pinned messages.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+
+ it("mentions message when a single message was pinned, with multiple previously pinned messages", () => {
+ const event = mockPinnedEvent(['message-1', 'message-2', 'message-3'], ['message-1', 'message-2']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com pinned a message to this room. See all pinned messages.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+
+ it("mentions message when a single message was unpinned, with a single message previously pinned", () => {
+ const event = mockPinnedEvent([], ['message-1']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com unpinned a message from this room. See all pinned messages.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+
+ it("mentions message when a single message was unpinned, with multiple previously pinned messages", () => {
+ const event = mockPinnedEvent(['message-2'], ['message-1', 'message-2']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com unpinned a message from this room. See all pinned messages.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+
+ it("shows generic text when multiple messages were pinned", () => {
+ const event = mockPinnedEvent(['message-1', 'message-2', 'message-3'], ['message-1']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com changed the pinned messages for the room.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+
+ it("shows generic text when multiple messages were unpinned", () => {
+ const event = mockPinnedEvent(['message-3'], ['message-1', 'message-2', 'message-3']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com changed the pinned messages for the room.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+
+ it("shows generic text when one message was pinned, and another unpinned", () => {
+ const event = mockPinnedEvent(['message-2'], ['message-1']);
+ const plainText = textForEvent(event);
+ const component = renderer.create(textForEvent(event, true));
+
+ const expectedText = "@foo:example.com changed the pinned messages for the room.";
+ expect(plainText).toBe(expectedText);
+ expect(renderComponent(component)).toBe(expectedText);
+ });
+ });
+});
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.js
index 0c4bde76a8..db5b55df90 100644
--- a/test/components/views/rooms/SendMessageComposer-test.js
+++ b/test/components/views/rooms/SendMessageComposer-test.js
@@ -46,7 +46,7 @@ describe('<SendMessageComposer/>', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("hello world", "insertText", { offset: 11, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "hello world",
@@ -58,7 +58,7 @@ describe('<SendMessageComposer/>', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("hello *world*", "insertText", { offset: 13, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "hello *world*",
@@ -72,7 +72,7 @@ describe('<SendMessageComposer/>', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("/me blinks __quickly__", "insertText", { offset: 22, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "blinks __quickly__",
@@ -86,7 +86,7 @@ describe('<SendMessageComposer/>', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("//dev/null is my favourite place", "insertText", { offset: 32, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "/dev/null is my favourite place",
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index 2e823aa72b..698bd01370 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -276,10 +276,12 @@ describe("SpaceStore", () => {
describe("test fixture 1", () => {
beforeEach(async () => {
- [fav1, fav2, fav3, dm1, dm2, dm3, orphan1, orphan2, invite1, invite2, room1].forEach(mkRoom);
+ [fav1, fav2, fav3, dm1, dm2, dm3, orphan1, orphan2, invite1, invite2, room1, room2, room3]
+ .forEach(mkRoom);
mkSpace(space1, [fav1, room1]);
mkSpace(space2, [fav1, fav2, fav3, room1]);
mkSpace(space3, [invite2]);
+ // client.getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
[fav1, fav2, fav3].forEach(roomId => {
client.getRoom(roomId).tags = {
@@ -329,6 +331,48 @@ describe("SpaceStore", () => {
]);
// dmPartner3 is not in any common spaces with you
+ // room 2 claims to be a child of space2 and is so via a valid m.space.parent
+ const cliRoom2 = client.getRoom(room2);
+ cliRoom2.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
+ mkEvent({
+ event: true,
+ type: EventType.SpaceParent,
+ room: room2,
+ user: client.getUserId(),
+ skey: space2,
+ content: { via: [], canonical: true },
+ ts: Date.now(),
+ }),
+ ]));
+ const cliSpace2 = client.getRoom(space2);
+ cliSpace2.currentState.maySendStateEvent.mockImplementation((evType: string, userId: string) => {
+ if (evType === EventType.SpaceChild) {
+ return userId === client.getUserId();
+ }
+ return true;
+ });
+
+ // room 3 claims to be a child of space3 but is not due to invalid m.space.parent (permissions)
+ const cliRoom3 = client.getRoom(room3);
+ cliRoom3.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
+ mkEvent({
+ event: true,
+ type: EventType.SpaceParent,
+ room: room3,
+ user: client.getUserId(),
+ skey: space3,
+ content: { via: [], canonical: true },
+ ts: Date.now(),
+ }),
+ ]));
+ const cliSpace3 = client.getRoom(space3);
+ cliSpace3.currentState.maySendStateEvent.mockImplementation((evType: string, userId: string) => {
+ if (evType === EventType.SpaceChild) {
+ return false;
+ }
+ return true;
+ });
+
await run();
});
@@ -445,6 +489,14 @@ describe("SpaceStore", () => {
expect(store.getNotificationState(space2).rooms.map(r => r.roomId).includes(room1)).toBeTruthy();
expect(store.getNotificationState(space3).rooms.map(r => r.roomId).includes(room1)).toBeFalsy();
});
+
+ it("honours m.space.parent if sender has permission in parent space", () => {
+ expect(store.getSpaceFilteredRoomIds(client.getRoom(space2)).has(room2)).toBeTruthy();
+ });
+
+ it("does not honour m.space.parent if sender does not have permission in parent space", () => {
+ expect(store.getSpaceFilteredRoomIds(client.getRoom(space3)).has(room3)).toBeFalsy();
+ });
});
});
@@ -562,7 +614,7 @@ describe("SpaceStore", () => {
]);
mkSpace(space3).getMyMembership.mockReturnValue("invite");
await run();
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
expect(store.activeSpace).toBe(null);
});
afterEach(() => {
@@ -570,31 +622,31 @@ describe("SpaceStore", () => {
});
it("switch to home space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
fn.mockClear();
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, null);
expect(store.activeSpace).toBe(null);
});
it("switch to invited space", async () => {
const space = client.getRoom(space3);
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(space);
});
it("switch to top level space", async () => {
const space = client.getRoom(space1);
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(space);
});
it("switch to subspace", async () => {
const space = client.getRoom(space2);
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(space);
});
@@ -602,7 +654,7 @@ describe("SpaceStore", () => {
it("switch to unknown space is a nop", async () => {
expect(store.activeSpace).toBe(null);
const space = client.getRoom(room1); // not a space
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).not.toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(null);
});
@@ -635,59 +687,59 @@ describe("SpaceStore", () => {
};
it("last viewed room in target space is the current viewed and in both spaces", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
expect(getCurrentRoom()).toBe(room2);
});
it("last viewed room in target space is in the current space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2);
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
expect(getCurrentRoom()).toBe(room2);
});
it("last viewed room in target space is not in the current space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
expect(getCurrentRoom()).toBe(room1);
});
it("last viewed room is target space is not known", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
localStorage.setItem(`mx_space_context_${space2}`, orphan2);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2);
});
it("last viewed room is target space is no longer in that space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
localStorage.setItem(`mx_space_context_${space2}`, room1);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2); // Space home instead of room1
});
it("no last viewed room in target space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2);
});
it("no last viewed room in home space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
expect(getCurrentRoom()).toBeNull(); // Home
});
});
@@ -715,28 +767,28 @@ describe("SpaceStore", () => {
it("no switch required, room is in current space", async () => {
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space1), false);
+ store.setActiveSpace(client.getRoom(space1), false);
viewRoom(room2);
expect(store.activeSpace).toBe(client.getRoom(space1));
});
it("switch to canonical parent space for room", async () => {
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space2), false);
+ store.setActiveSpace(client.getRoom(space2), false);
viewRoom(room2);
expect(store.activeSpace).toBe(client.getRoom(space2));
});
it("switch to first containing space for room", async () => {
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space2), false);
+ store.setActiveSpace(client.getRoom(space2), false);
viewRoom(room3);
expect(store.activeSpace).toBe(client.getRoom(space1));
});
it("switch to home for orphaned room", async () => {
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space1), false);
+ store.setActiveSpace(client.getRoom(space1), false);
viewRoom(orphan1);
expect(store.activeSpace).toBeNull();
});
@@ -744,7 +796,7 @@ describe("SpaceStore", () => {
it("when switching rooms in the all rooms home space don't switch to related space", async () => {
await setShowAllRooms(true);
viewRoom(room2);
- await store.setActiveSpace(null, false);
+ store.setActiveSpace(null, false);
viewRoom(room1);
expect(store.activeSpace).toBeNull();
});
diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts
index 85f79c75b6..474c279fdd 100644
--- a/test/stores/room-list/SpaceWatcher-test.ts
+++ b/test/stores/room-list/SpaceWatcher-test.ts
@@ -57,7 +57,7 @@ describe("SpaceWatcher", () => {
beforeEach(async () => {
filter = null;
store.removeAllListeners();
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
client.getVisibleRooms.mockReturnValue(rooms = []);
space1 = mkSpace(space1Id);
@@ -95,7 +95,7 @@ describe("SpaceWatcher", () => {
await setShowAllRooms(true);
new SpaceWatcher(mockRoomListStore);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
@@ -114,7 +114,7 @@ describe("SpaceWatcher", () => {
await setShowAllRooms(false);
new SpaceWatcher(mockRoomListStore);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
@@ -124,22 +124,22 @@ describe("SpaceWatcher", () => {
await setShowAllRooms(true);
new SpaceWatcher(mockRoomListStore);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
- await SpaceStore.instance.setActiveSpace(null);
+ SpaceStore.instance.setActiveSpace(null);
expect(filter).toBeNull();
});
it("updates filter correctly for space -> home transition", async () => {
await setShowAllRooms(false);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
- await SpaceStore.instance.setActiveSpace(null);
+ SpaceStore.instance.setActiveSpace(null);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(null);
@@ -147,12 +147,12 @@ describe("SpaceWatcher", () => {
it("updates filter correctly for space -> space transition", async () => {
await setShowAllRooms(false);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
- await SpaceStore.instance.setActiveSpace(space2);
+ SpaceStore.instance.setActiveSpace(space2);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space2);
@@ -160,7 +160,7 @@ describe("SpaceWatcher", () => {
it("doesn't change filter when changing showAllRooms mode to true", async () => {
await setShowAllRooms(false);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
@@ -173,7 +173,7 @@ describe("SpaceWatcher", () => {
it("doesn't change filter when changing showAllRooms mode to false", async () => {
await setShowAllRooms(true);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
diff --git a/test/test-utils.js b/test/test-utils.js
index f62df53c3a..803d97c163 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -85,9 +85,8 @@ export function createTestClient() {
generateClientSecret: () => "t35tcl1Ent5ECr3T",
isGuest: () => false,
isCryptoEnabled: () => false,
- getSpaceSummary: jest.fn().mockReturnValue({
+ getRoomHierarchy: jest.fn().mockReturnValue({
rooms: [],
- events: [],
}),
// Used by various internal bits we aren't concerned with (yet)
diff --git a/test/utils/DateUtils-test.ts b/test/utils/DateUtils-test.ts
new file mode 100644
index 0000000000..ad0530c87e
--- /dev/null
+++ b/test/utils/DateUtils-test.ts
@@ -0,0 +1,31 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { formatSeconds } from "../../src/DateUtils";
+
+describe("formatSeconds", () => {
+ it("correctly formats time with hours", () => {
+ expect(formatSeconds((60 * 60 * 3) + (60 * 31) + (55))).toBe("03:31:55");
+ expect(formatSeconds((60 * 60 * 3) + (60 * 0) + (55))).toBe("03:00:55");
+ expect(formatSeconds((60 * 60 * 3) + (60 * 31) + (0))).toBe("03:31:00");
+ });
+
+ it("correctly formats time without hours", () => {
+ expect(formatSeconds((60 * 60 * 0) + (60 * 31) + (55))).toBe("31:55");
+ expect(formatSeconds((60 * 60 * 0) + (60 * 0) + (55))).toBe("00:55");
+ expect(formatSeconds((60 * 60 * 0) + (60 * 31) + (0))).toBe("31:00");
+ });
+});
diff --git a/yarn.lock b/yarn.lock
index 256fee5277..6ab04fe9b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
"@actions/core@^1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz#cf2e6ee317e314b03886adfeb20e448d50d6e524"
- integrity sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.5.0.tgz#885b864700001a1b9a6fba247833a036e75ad9d3"
+ integrity sha512-eDOLH1Nq9zh+PJlYLqEMkS/jLQxhksPNmUGNBHfa4G+tQmnIhzpctxmchETtVGyBOvXgOVVpYuE40+eS4cUnwQ==
"@actions/github@^5.0.0":
version "5.0.0"
@@ -47,25 +47,25 @@
dependencies:
"@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
- integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
+ integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.7.5":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"
- integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
+ integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.14.8"
- "@babel/helper-compilation-targets" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.8"
+ "@babel/generator" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.0"
+ "@babel/helper-module-transforms" "^7.15.0"
"@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.14.8"
+ "@babel/parser" "^7.15.0"
"@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.8"
- "@babel/types" "^7.14.8"
+ "@babel/traverse" "^7.15.0"
+ "@babel/types" "^7.15.0"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -74,9 +74,9 @@
source-map "^0.5.0"
"@babel/eslint-parser@^7.12.10":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz#91be59a4f7dd60d02a3ef772d156976465596bda"
- integrity sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ==
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz#b54f06e04d0e93aebcba99f89251e3bf0ee39f21"
+ integrity sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==
dependencies:
eslint-scope "^5.1.1"
eslint-visitor-keys "^2.1.0"
@@ -89,12 +89,12 @@
dependencies:
eslint-rule-composer "^0.3.0"
-"@babel/generator@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070"
- integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==
+"@babel/generator@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
+ integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
dependencies:
- "@babel/types" "^7.14.8"
+ "@babel/types" "^7.15.0"
jsesc "^2.5.1"
source-map "^0.5.0"
@@ -113,26 +113,26 @@
"@babel/helper-explode-assignable-expression" "^7.14.5"
"@babel/types" "^7.14.5"
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
- integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818"
+ integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==
dependencies:
- "@babel/compat-data" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
"@babel/helper-validator-option" "^7.14.5"
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.14.6":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc"
- integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"
+ integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==
dependencies:
"@babel/helper-annotate-as-pure" "^7.14.5"
"@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.14.7"
+ "@babel/helper-member-expression-to-functions" "^7.15.0"
"@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.15.0"
"@babel/helper-split-export-declaration" "^7.14.5"
"@babel/helper-create-regexp-features-plugin@^7.14.5":
@@ -187,12 +187,12 @@
dependencies:
"@babel/types" "^7.14.5"
-"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
- integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==
+"@babel/helper-member-expression-to-functions@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b"
+ integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.0"
"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
version "7.14.5"
@@ -201,19 +201,19 @@
dependencies:
"@babel/types" "^7.14.5"
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"
- integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==
+"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
+ integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
dependencies:
"@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.15.0"
"@babel/helper-simple-access" "^7.14.8"
"@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.8"
+ "@babel/helper-validator-identifier" "^7.14.9"
"@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.8"
- "@babel/types" "^7.14.8"
+ "@babel/traverse" "^7.15.0"
+ "@babel/types" "^7.15.0"
"@babel/helper-optimise-call-expression@^7.14.5":
version "7.14.5"
@@ -236,17 +236,17 @@
"@babel/helper-wrap-function" "^7.14.5"
"@babel/types" "^7.14.5"
-"@babel/helper-replace-supers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
- integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"
+ integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.14.5"
+ "@babel/helper-member-expression-to-functions" "^7.15.0"
"@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/traverse" "^7.15.0"
+ "@babel/types" "^7.15.0"
-"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8":
+"@babel/helper-simple-access@^7.14.8":
version "7.14.8"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
@@ -267,10 +267,10 @@
dependencies:
"@babel/types" "^7.14.5"
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c"
- integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
+ version "7.14.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48"
+ integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==
"@babel/helper-validator-option@^7.14.5":
version "7.14.5"
@@ -288,13 +288,13 @@
"@babel/types" "^7.14.5"
"@babel/helpers@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77"
- integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==
+ version "7.15.3"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357"
+ integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==
dependencies:
"@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.8"
- "@babel/types" "^7.14.8"
+ "@babel/traverse" "^7.15.0"
+ "@babel/types" "^7.15.0"
"@babel/highlight@^7.14.5":
version "7.14.5"
@@ -305,10 +305,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.13.16", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4"
- integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.13.16", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0":
+ version "7.15.3"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
+ integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
version "7.14.5"
@@ -319,10 +319,10 @@
"@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace"
- integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==
+"@babel/plugin-proposal-async-generator-functions@^7.14.9":
+ version "7.14.9"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"
+ integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-remap-async-to-generator" "^7.14.5"
@@ -628,16 +628,16 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-block-scoping@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
- integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==
+ version "7.15.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
+ integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf"
- integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==
+"@babel/plugin-transform-classes@^7.14.9":
+ version "7.14.9"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f"
+ integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==
dependencies:
"@babel/helper-annotate-as-pure" "^7.14.5"
"@babel/helper-function-name" "^7.14.5"
@@ -722,14 +722,14 @@
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
- integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==
+"@babel/plugin-transform-modules-commonjs@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281"
+ integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==
dependencies:
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.15.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.5"
+ "@babel/helper-simple-access" "^7.14.8"
babel-plugin-dynamic-import-node "^2.3.3"
"@babel/plugin-transform-modules-systemjs@^7.14.5":
@@ -751,10 +751,10 @@
"@babel/helper-module-transforms" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e"
- integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
+ version "7.14.9"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
+ integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.14.5"
@@ -788,9 +788,9 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-react-display-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz#baa92d15c4570411301a85a74c13534873885b65"
- integrity sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==
+ version "7.15.1"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz#6aaac6099f1fcf6589d35ae6be1b6e10c8c602b9"
+ integrity sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -802,15 +802,15 @@
"@babel/plugin-transform-react-jsx" "^7.14.5"
"@babel/plugin-transform-react-jsx@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz#39749f0ee1efd8a1bd729152cf5f78f1d247a44a"
- integrity sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==
+ version "7.14.9"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c"
+ integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.14.5"
"@babel/helper-module-imports" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-jsx" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.14.9"
"@babel/plugin-transform-react-pure-annotations@^7.14.5":
version "7.14.5"
@@ -835,9 +835,9 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-runtime@^7.12.10":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523"
- integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
+ integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==
dependencies:
"@babel/helper-module-imports" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
@@ -882,12 +882,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-typescript@^7.14.5":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c"
- integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA==
+"@babel/plugin-transform-typescript@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e"
+ integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.6"
+ "@babel/helper-create-class-features-plugin" "^7.15.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript" "^7.14.5"
@@ -907,16 +907,16 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/preset-env@^7.12.11":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b"
- integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg==
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464"
+ integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==
dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.7"
+ "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
"@babel/plugin-proposal-class-properties" "^7.14.5"
"@babel/plugin-proposal-class-static-block" "^7.14.5"
"@babel/plugin-proposal-dynamic-import" "^7.14.5"
@@ -949,7 +949,7 @@
"@babel/plugin-transform-async-to-generator" "^7.14.5"
"@babel/plugin-transform-block-scoped-functions" "^7.14.5"
"@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.5"
+ "@babel/plugin-transform-classes" "^7.14.9"
"@babel/plugin-transform-computed-properties" "^7.14.5"
"@babel/plugin-transform-destructuring" "^7.14.7"
"@babel/plugin-transform-dotall-regex" "^7.14.5"
@@ -960,10 +960,10 @@
"@babel/plugin-transform-literals" "^7.14.5"
"@babel/plugin-transform-member-expression-literals" "^7.14.5"
"@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.14.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.15.0"
"@babel/plugin-transform-modules-systemjs" "^7.14.5"
"@babel/plugin-transform-modules-umd" "^7.14.5"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
"@babel/plugin-transform-new-target" "^7.14.5"
"@babel/plugin-transform-object-super" "^7.14.5"
"@babel/plugin-transform-parameters" "^7.14.5"
@@ -978,11 +978,11 @@
"@babel/plugin-transform-unicode-escapes" "^7.14.5"
"@babel/plugin-transform-unicode-regex" "^7.14.5"
"@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.14.8"
+ "@babel/types" "^7.15.0"
babel-plugin-polyfill-corejs2 "^0.2.2"
babel-plugin-polyfill-corejs3 "^0.2.2"
babel-plugin-polyfill-regenerator "^0.2.2"
- core-js-compat "^3.15.0"
+ core-js-compat "^3.16.0"
semver "^6.3.0"
"@babel/preset-modules@^0.1.4":
@@ -1009,18 +1009,18 @@
"@babel/plugin-transform-react-pure-annotations" "^7.14.5"
"@babel/preset-typescript@^7.12.7":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz#aa98de119cf9852b79511f19e7f44a2d379bcce0"
- integrity sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw==
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz#e8fca638a1a0f64f14e1119f7fe4500277840945"
+ integrity sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-transform-typescript" "^7.14.5"
+ "@babel/plugin-transform-typescript" "^7.15.0"
"@babel/register@^7.12.10":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.14.5.tgz#d0eac615065d9c2f1995842f85d6e56c345f3233"
- integrity sha512-TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg==
+ version "7.15.3"
+ resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.15.3.tgz#6b40a549e06ec06c885b2ec42c3dd711f55fe752"
+ integrity sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==
dependencies:
clone-deep "^4.0.1"
find-cache-dir "^2.0.0"
@@ -1029,9 +1029,9 @@
source-map-support "^0.5.16"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
- integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
+ version "7.15.3"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
+ integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
dependencies:
regenerator-runtime "^0.13.4"
@@ -1044,27 +1044,27 @@
"@babel/parser" "^7.14.5"
"@babel/types" "^7.14.5"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.12", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.17", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"
- integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.12", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.17", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
+ integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.14.8"
+ "@babel/generator" "^7.15.0"
"@babel/helper-function-name" "^7.14.5"
"@babel/helper-hoist-variables" "^7.14.5"
"@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.14.8"
- "@babel/types" "^7.14.8"
+ "@babel/parser" "^7.15.0"
+ "@babel/types" "^7.15.0"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728"
- integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==
+"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
+ integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
dependencies:
- "@babel/helper-validator-identifier" "^7.14.8"
+ "@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"
"@bcoe/v8-coverage@^0.2.3":
@@ -1384,44 +1384,24 @@
"@octokit/types" "^6.0.3"
universal-user-agent "^6.0.0"
-"@octokit/openapi-types@^9.3.0":
- version "9.3.0"
- resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz#160347858d727527901c6aae7f7d5c2414cc1f2e"
- integrity sha512-oz60hhL+mDsiOWhEwrj5aWXTOMVtQgcvP+sRzX4C3cH7WOK9QSAoEtjWh0HdOf6V3qpdgAmUMxnQPluzDWR7Fw==
-
"@octokit/openapi-types@^9.5.0":
version "9.7.0"
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz#9897cdefd629cd88af67b8dbe2e5fb19c63426b2"
integrity sha512-TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg==
-"@octokit/plugin-paginate-rest@^2.13.3":
+"@octokit/plugin-paginate-rest@^2.13.3", "@octokit/plugin-paginate-rest@^2.6.2":
version "2.15.1"
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz#264189dd3ce881c6c33758824aac05a4002e056a"
integrity sha512-47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg==
dependencies:
"@octokit/types" "^6.24.0"
-"@octokit/plugin-paginate-rest@^2.6.2":
- version "2.15.0"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz#9c956c3710b2bd786eb3814eaf5a2b17392c150d"
- integrity sha512-/vjcb0w6ggVRtsb8OJBcRR9oEm+fpdo8RJk45khaWw/W0c8rlB2TLCLyZt/knmC17NkX7T9XdyQeEY7OHLSV1g==
- dependencies:
- "@octokit/types" "^6.23.0"
-
"@octokit/plugin-request-log@^1.0.2":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
-"@octokit/plugin-rest-endpoint-methods@5.6.0":
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.6.0.tgz#c28833b88d0f07bf94093405d02d43d73c7de99b"
- integrity sha512-2G7lIPwjG9XnTlNhe/TRnpI8yS9K2l68W4RP/ki3wqw2+sVeTK8hItPxkqEI30VeH0UwnzpuksMU/yHxiVVctw==
- dependencies:
- "@octokit/types" "^6.23.0"
- deprecation "^2.3.1"
-
-"@octokit/plugin-rest-endpoint-methods@^5.1.1":
+"@octokit/plugin-rest-endpoint-methods@5.8.0", "@octokit/plugin-rest-endpoint-methods@^5.1.1":
version "5.8.0"
resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz#33b342fe41f2603fdf8b958e6652103bb3ea3f3b"
integrity sha512-qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A==
@@ -1439,9 +1419,9 @@
once "^1.4.0"
"@octokit/request@^5.6.0":
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz#6084861b6e4fa21dc40c8e2a739ec5eff597e672"
- integrity sha512-4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA==
+ version "5.6.1"
+ resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.1.tgz#f97aff075c37ab1d427c49082fefeef0dba2d8ce"
+ integrity sha512-Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ==
dependencies:
"@octokit/endpoint" "^6.0.1"
"@octokit/request-error" "^2.1.0"
@@ -1451,23 +1431,16 @@
universal-user-agent "^6.0.0"
"@octokit/rest@^18.6.7":
- version "18.8.0"
- resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.8.0.tgz#ba24f7ba554f015a7ae2b7cc2aecef5386ddfea5"
- integrity sha512-lsuNRhgzGnLMn/NmQTNCit/6jplFWiTUlPXhqN0zCMLwf2/9pseHzsnTW+Cjlp4bLMEJJNPa5JOzSLbSCOahKw==
+ version "18.9.1"
+ resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.9.1.tgz#db1d7ac1d7b10e908f7d4b78fe35a392554ccb26"
+ integrity sha512-idZ3e5PqXVWOhtZYUa546IDHTHjkGZbj3tcJsN0uhCy984KD865e8GB2WbYDc2ZxFuJRiyd0AftpL2uPNhF+UA==
dependencies:
"@octokit/core" "^3.5.0"
"@octokit/plugin-paginate-rest" "^2.6.2"
"@octokit/plugin-request-log" "^1.0.2"
- "@octokit/plugin-rest-endpoint-methods" "5.6.0"
+ "@octokit/plugin-rest-endpoint-methods" "5.8.0"
-"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.23.0":
- version "6.23.0"
- resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.23.0.tgz#b39f242b20036e89fa8f34f7962b4e9b7ff8f65b"
- integrity sha512-eG3clC31GSS7K3oBK6C6o7wyXPrkP+mu++eus8CSZdpRytJ5PNszYxudOQ0spWZQ3S9KAtoTG6v1WK5prJcJrA==
- dependencies:
- "@octokit/openapi-types" "^9.3.0"
-
-"@octokit/types@^6.24.0", "@octokit/types@^6.25.0":
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.24.0", "@octokit/types@^6.25.0":
version "6.25.0"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz#c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a"
integrity sha512-bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q==
@@ -1475,13 +1448,13 @@
"@octokit/openapi-types" "^9.5.0"
"@peculiar/asn1-schema@^2.0.27", "@peculiar/asn1-schema@^2.0.32":
- version "2.0.37"
- resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.37.tgz#700476512ab903d809f64a3040fb1b2fe6fb6d4b"
- integrity sha512-f/dozij2XCZZ7ayOWI88TbHt/1rk3zJ91O/xTtDdc8SttyF6pleu4RYBuFohkobA5HJn+bEcY6Cvq4x9feXokQ==
+ version "2.0.38"
+ resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.38.tgz#98b6f12daad275ecd6774dfe31fb62f362900412"
+ integrity sha512-zZ64UpCTm9me15nuCpPgJghSdbEm8atcDQPCyK+bKXjZAQ1735NCZXCSCfbckbQ4MH36Rm9403n/qMq77LFDzQ==
dependencies:
"@types/asn1js" "^2.0.2"
asn1js "^2.1.1"
- pvtsutils "^1.1.7"
+ pvtsutils "^1.2.0"
tslib "^2.3.0"
"@peculiar/json-schema@^1.1.12":
@@ -1552,16 +1525,11 @@
"@sentry/utils" "6.11.0"
tslib "^1.9.3"
-"@sentry/types@6.11.0":
+"@sentry/types@6.11.0", "@sentry/types@^6.10.0":
version "6.11.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.11.0.tgz#5122685478d32ddacd3a891cbcf550012df85f7c"
integrity sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg==
-"@sentry/types@^6.10.0":
- version "6.10.0"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.10.0.tgz#6b1f44e5ed4dbc2710bead24d1b32fb08daf04e1"
- integrity sha512-M7s0JFgG7/6/yNVYoPUbxzaXDhnzyIQYRRJJKRaTD77YO4MHvi4Ke8alBWqD5fer0cPIfcSkBqa9BLdqRqcMWw==
-
"@sentry/utils@6.11.0":
version "6.11.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.11.0.tgz#d1dee4faf4d9c42c54bba88d5a66fb96b902a14c"
@@ -1745,9 +1713,9 @@
pretty-format "^26.0.0"
"@types/json-schema@^7.0.7":
- version "7.0.8"
- resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
- integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
+ version "7.0.9"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+ integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
"@types/linkifyjs@^2.1.3":
version "2.1.4"
@@ -1757,14 +1725,14 @@
"@types/react" "*"
"@types/lodash@^4.14.168":
- version "4.14.171"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b"
- integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg==
+ version "4.14.172"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
+ integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
"@types/mdast@^3.0.0":
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b"
- integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg==
+ version "3.0.10"
+ resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+ integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
dependencies:
"@types/unist" "*"
@@ -1779,14 +1747,14 @@
integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
"@types/node@*":
- version "16.4.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.0.tgz#2c219eaa3b8d1e4d04f4dd6e40bc68c7467d5272"
- integrity sha512-HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg==
+ version "16.7.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz#c6b9198178da504dfca1fd0be9b2e1002f1586f0"
+ integrity sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==
"@types/node@^14.14.22":
- version "14.17.5"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz#b59daf6a7ffa461b5648456ca59050ba8e40ed54"
- integrity sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==
+ version "14.17.11"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.11.tgz#82d266d657aec5ff01ca59f2ffaff1bb43f7bf0f"
+ integrity sha512-n2OQ+0Bz6WEsUjrvcHD1xZ8K+Kgo4cn9/w94s1bJS690QMUWfJPW/m7CCb7gPkA1fcYwL2UpjXP/rq/Eo41m6w==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -1915,72 +1883,72 @@
integrity sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==
"@typescript-eslint/eslint-plugin@^4.17.0":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz#e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921"
- integrity sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw==
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa"
+ integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.28.4"
- "@typescript-eslint/scope-manager" "4.28.4"
+ "@typescript-eslint/experimental-utils" "4.29.3"
+ "@typescript-eslint/scope-manager" "4.29.3"
debug "^4.3.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.1.0"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.28.4":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz#9c70c35ebed087a5c70fb0ecd90979547b7fec96"
- integrity sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA==
+"@typescript-eslint/experimental-utils@4.29.3":
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1"
+ integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg==
dependencies:
"@types/json-schema" "^7.0.7"
- "@typescript-eslint/scope-manager" "4.28.4"
- "@typescript-eslint/types" "4.28.4"
- "@typescript-eslint/typescript-estree" "4.28.4"
+ "@typescript-eslint/scope-manager" "4.29.3"
+ "@typescript-eslint/types" "4.29.3"
+ "@typescript-eslint/typescript-estree" "4.29.3"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
"@typescript-eslint/parser@^4.17.0":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz#bc462dc2779afeefdcf49082516afdc3e7b96fab"
- integrity sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA==
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.3.tgz#2ac25535f34c0e98f50c0e6b28c679c2357d45f2"
+ integrity sha512-jrHOV5g2u8ROghmspKoW7pN8T/qUzk0+DITun0MELptvngtMrwUJ1tv5zMI04CYVEUsSrN4jV7AKSv+I0y0EfQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.28.4"
- "@typescript-eslint/types" "4.28.4"
- "@typescript-eslint/typescript-estree" "4.28.4"
+ "@typescript-eslint/scope-manager" "4.29.3"
+ "@typescript-eslint/types" "4.29.3"
+ "@typescript-eslint/typescript-estree" "4.29.3"
debug "^4.3.1"
-"@typescript-eslint/scope-manager@4.28.4":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz#bdbce9b6a644e34f767bd68bc17bb14353b9fe7f"
- integrity sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w==
+"@typescript-eslint/scope-manager@4.29.3":
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz#497dec66f3a22e459f6e306cf14021e40ec86e19"
+ integrity sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA==
dependencies:
- "@typescript-eslint/types" "4.28.4"
- "@typescript-eslint/visitor-keys" "4.28.4"
+ "@typescript-eslint/types" "4.29.3"
+ "@typescript-eslint/visitor-keys" "4.29.3"
-"@typescript-eslint/types@4.28.4":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz#41acbd79b5816b7c0dd7530a43d97d020d3aeb42"
- integrity sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww==
+"@typescript-eslint/types@4.29.3":
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017"
+ integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg==
-"@typescript-eslint/typescript-estree@4.28.4":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz#252e6863278dc0727244be9e371eb35241c46d00"
- integrity sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ==
+"@typescript-eslint/typescript-estree@4.29.3":
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40"
+ integrity sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag==
dependencies:
- "@typescript-eslint/types" "4.28.4"
- "@typescript-eslint/visitor-keys" "4.28.4"
+ "@typescript-eslint/types" "4.29.3"
+ "@typescript-eslint/visitor-keys" "4.29.3"
debug "^4.3.1"
globby "^11.0.3"
is-glob "^4.0.1"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/visitor-keys@4.28.4":
- version "4.28.4"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz#92dacfefccd6751cbb0a964f06683bfd72d0c4d3"
- integrity sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg==
+"@typescript-eslint/visitor-keys@4.29.3":
+ version "4.29.3"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf"
+ integrity sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA==
dependencies:
- "@typescript-eslint/types" "4.28.4"
+ "@typescript-eslint/types" "4.29.3"
eslint-visitor-keys "^2.0.0"
"@wojtekmaj/enzyme-adapter-react-17@^0.6.1":
@@ -2068,10 +2036,10 @@ ajv@^8.0.1:
require-from-string "^2.0.2"
uri-js "^4.2.2"
-allchange@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz#f5177b7d97f8e97a2d059a1524db9a72d94dc6d2"
- integrity sha512-O0VIaMIORxOaReyYEijDfKdpudJhbzzVYLdJR1aROyUgOLBEp9e5V/TDXQpjX23W90IFCSRZxsDb3exLRD05HA==
+allchange@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.3.tgz#f8814ddfbcfe39a01bf4570778ee7e6d9ff0ebb3"
+ integrity sha512-UZkfz5SkNEMFQFLr8vZcXHaph2EbJxmkVNF5Nt6D9RIa5pmAar7oAMfNdda714jg7IQijvaFty5PYazXLgd5WA==
dependencies:
"@actions/core" "^1.4.0"
"@actions/github" "^5.0.0"
@@ -2289,7 +2257,7 @@ autoprefixer@^9.8.6:
postcss "^7.0.32"
postcss-value-parser "^4.1.0"
-available-typed-arrays@^1.0.2:
+available-typed-arrays@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9"
integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==
@@ -2361,9 +2329,9 @@ babel-plugin-polyfill-corejs2@^0.2.2:
semver "^6.1.1"
babel-plugin-polyfill-corejs3@^0.2.2:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b"
- integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9"
+ integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==
dependencies:
"@babel/helper-define-polyfill-provider" "^0.2.2"
core-js-compat "^3.14.0"
@@ -2469,9 +2437,9 @@ bluebird@^3.5.0:
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
blurhash@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz#dc325af7da836d07a0861d830bdd63694382483e"
- integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.4.tgz#a7010ceb3019cd2c9809b17c910ebf6175d29244"
+ integrity sha512-MXIPz6zwYUKayju+Uidf83KhH0vodZfeRl6Ich8Gu+KGl0JgKiFq9LsfqV7cVU5fKD/AotmduZqvOfrGKOfTaA==
boolbase@^1.0.0:
version "1.0.0"
@@ -2524,16 +2492,16 @@ browser-request@^0.3.3:
resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
-browserslist@^4.12.0, browserslist@^4.16.6:
- version "4.16.6"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
- integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.8:
+ version "4.16.8"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0"
+ integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==
dependencies:
- caniuse-lite "^1.0.30001219"
- colorette "^1.2.2"
- electron-to-chromium "^1.3.723"
+ caniuse-lite "^1.0.30001251"
+ colorette "^1.3.0"
+ electron-to-chromium "^1.3.811"
escalade "^3.1.1"
- node-releases "^1.1.71"
+ node-releases "^1.1.75"
bs58@^4.0.1:
version "4.0.1"
@@ -2568,9 +2536,9 @@ buffer-fill@^1.0.0:
integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
buffer-from@^1.0.0, buffer-from@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
- integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+ integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
buffer@^5.4.3:
version "5.7.1"
@@ -2627,10 +2595,10 @@ camelcase@^6.0.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001246"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz#fe17d9919f87124d6bb416ef7b325356d69dc76c"
- integrity sha512-Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA==
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001251:
+ version "1.0.30001251"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85"
+ integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==
capture-exit@^2.0.0:
version "2.0.0"
@@ -2662,9 +2630,9 @@ chalk@^3.0.0:
supports-color "^7.1.0"
chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
- integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+ integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
dependencies:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
@@ -2850,10 +2818,10 @@ color-name@^1.1.4, color-name@~1.1.4:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-colorette@^1.2.1, colorette@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
- integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
+ integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
version "1.0.8"
@@ -2929,12 +2897,12 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-core-js-compat@^3.14.0, core-js-compat@^3.15.0:
- version "3.15.2"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb"
- integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ==
+core-js-compat@^3.14.0, core-js-compat@^3.16.0:
+ version "3.16.3"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.3.tgz#ae12a6e20505a1d79fbd16b6689dfc77fc989114"
+ integrity sha512-A/OtSfSJQKLAFRVd4V0m6Sep9lPdjD8bpN8v3tCCGwE0Tmh0hOiVDm9tw6mXmWOKOSZIyr3EkywPo84cJjGvIQ==
dependencies:
- browserslist "^4.16.6"
+ browserslist "^4.16.8"
semver "7.0.0"
core-js@^1.0.0:
@@ -2948,9 +2916,9 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -3081,9 +3049,9 @@ data-urls@^2.0.0:
whatwg-url "^8.0.0"
date-fns@^2.0.1:
- version "2.22.1"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4"
- integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==
+ version "2.23.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
+ integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
date-names@^0.1.11:
version "0.1.13"
@@ -3313,10 +3281,10 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
-electron-to-chromium@^1.3.723:
- version "1.3.782"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz#522740fe6b4b5255ca754c68d9c406a17b0998e2"
- integrity sha512-6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA==
+electron-to-chromium@^1.3.811:
+ version "1.3.817"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.817.tgz#911b4775b5d9fa0c4729d4694adc81de85d8d8f6"
+ integrity sha512-Vw0Faepf2Id9Kf2e97M/c99qf168xg86JLKDxivvlpBQ9KDtjSeX0v+TiuSE25PqeQfTz+NJs375b64ca3XOIQ==
emittery@^0.7.1:
version "0.7.2"
@@ -3422,10 +3390,10 @@ error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
-es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
- version "1.18.3"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
- integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
+es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5:
+ version "1.18.5"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19"
+ integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==
dependencies:
call-bind "^1.0.2"
es-to-primitive "^1.2.1"
@@ -3433,11 +3401,12 @@ es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-
get-intrinsic "^1.1.1"
has "^1.0.3"
has-symbols "^1.0.2"
+ internal-slot "^1.0.3"
is-callable "^1.2.3"
is-negative-zero "^2.0.1"
is-regex "^1.1.3"
is-string "^1.0.6"
- object-inspect "^1.10.3"
+ object-inspect "^1.11.0"
object-keys "^1.1.1"
object.assign "^4.1.2"
string.prototype.trimend "^1.0.4"
@@ -3804,11 +3773,11 @@ expect@^26.6.2:
jest-regex-util "^26.0.0"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+ integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend-shallow@^2.0.1:
version "2.0.1"
@@ -3891,9 +3860,9 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
- integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
+ version "1.12.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794"
+ integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==
dependencies:
reusify "^1.0.4"
@@ -4005,9 +3974,9 @@ flat-cache@^3.0.4:
rimraf "^3.0.2"
flatted@^3.1.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05"
- integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
+ integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
flux@2.1.1:
version "2.1.1"
@@ -4252,9 +4221,9 @@ gonzales-pe@^4.3.0:
minimist "^1.2.5"
graceful-fs@^4.1.11, graceful-fs@^4.2.4:
- version "4.2.6"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
- integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+ version "4.2.8"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+ integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
growly@^1.3.0:
version "1.3.0"
@@ -4299,6 +4268,13 @@ has-symbols@^1.0.1, has-symbols@^1.0.2:
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+has-tostringtag@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+ integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+ dependencies:
+ has-symbols "^1.0.2"
+
has-value@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4574,11 +4550,12 @@ is-alphanumerical@^1.0.0:
is-decimal "^1.0.0"
is-arguments@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
- integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+ integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
dependencies:
- call-bind "^1.0.0"
+ call-bind "^1.0.2"
+ has-tostringtag "^1.0.0"
is-arrayish@^0.2.1:
version "0.2.1"
@@ -4597,10 +4574,12 @@ is-async-fn@^1.1.0:
resolved "https://registry.yarnpkg.com/is-async-fn/-/is-async-fn-1.1.0.tgz#a1a15b11d4a1155cc23b11e91b301b45a3caad16"
integrity sha1-oaFbEdShFVzCOxHpGzAbRaPKrRY=
-is-bigint@^1.0.1, is-bigint@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
- integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
+is-bigint@^1.0.1, is-bigint@^1.0.3:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+ integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+ dependencies:
+ has-bigints "^1.0.1"
is-binary-path@^1.0.0:
version "1.0.1"
@@ -4616,12 +4595,13 @@ is-binary-path@~2.1.0:
dependencies:
binary-extensions "^2.0.0"
-is-boolean-object@^1.0.1, is-boolean-object@^1.1.0, is-boolean-object@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
- integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
+is-boolean-object@^1.0.1, is-boolean-object@^1.1.0, is-boolean-object@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+ integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
dependencies:
call-bind "^1.0.2"
+ has-tostringtag "^1.0.0"
is-buffer@^1.1.5:
version "1.1.6"
@@ -4633,10 +4613,10 @@ is-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
- integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.3, is-callable@^1.2.4:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+ integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
is-ci@^2.0.0:
version "2.0.0"
@@ -4645,10 +4625,10 @@ is-ci@^2.0.0:
dependencies:
ci-info "^2.0.0"
-is-core-module@^2.2.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
- integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
+is-core-module@^2.2.0, is-core-module@^2.5.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
+ integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
dependencies:
has "^1.0.3"
@@ -4666,10 +4646,12 @@ is-data-descriptor@^1.0.0:
dependencies:
kind-of "^6.0.0"
-is-date-object@^1.0.1, is-date-object@^1.0.2, is-date-object@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
- integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
+is-date-object@^1.0.1, is-date-object@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+ integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+ dependencies:
+ has-tostringtag "^1.0.0"
is-decimal@^1.0.0:
version "1.0.4"
@@ -4700,26 +4682,28 @@ is-docker@^2.0.0:
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
is-equal@^1.5.1:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.2.tgz#9de9a33fee63c310372e401d2a6ef86dc2668615"
- integrity sha512-paNlhukQqphbdiILWvU4Sl3Q1wvJNDqpZUQdnFKbL6XEvSIUemV8BVCOVuElqnYeWN+fG3nLDlv3Mgh3/ehTMA==
+ version "1.6.3"
+ resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.3.tgz#7f5578799a644cfb6dc82285ce9168f151e23259"
+ integrity sha512-LTIjMaisYvuz8FhWSCc/Lux7MSE6Ucv7G+C2lixnn2vW+pOMgyTWGq3JPeyqFOfcv0Jb1fMpvQ121rjbfF0Z+A==
dependencies:
es-get-iterator "^1.1.2"
functions-have-names "^1.2.2"
has "^1.0.3"
+ has-bigints "^1.0.1"
+ has-symbols "^1.0.2"
is-arrow-function "^2.0.3"
- is-bigint "^1.0.2"
- is-boolean-object "^1.1.1"
- is-callable "^1.2.3"
- is-date-object "^1.0.4"
- is-generator-function "^1.0.9"
- is-number-object "^1.0.5"
- is-regex "^1.1.3"
- is-string "^1.0.6"
- is-symbol "^1.0.3"
+ is-bigint "^1.0.3"
+ is-boolean-object "^1.1.2"
+ is-callable "^1.2.4"
+ is-date-object "^1.0.5"
+ is-generator-function "^1.0.10"
+ is-number-object "^1.0.6"
+ is-regex "^1.1.4"
+ is-string "^1.0.7"
+ is-symbol "^1.0.4"
isarray "^2.0.5"
- object-inspect "^1.10.3"
- object.entries "^1.1.3"
+ object-inspect "^1.11.0"
+ object.entries "^1.1.4"
object.getprototypeof "^1.0.1"
which-boxed-primitive "^1.0.2"
which-collection "^1.0.1"
@@ -4761,10 +4745,12 @@ is-generator-fn@^2.0.0:
resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-is-generator-function@^1.0.8, is-generator-function@^1.0.9:
- version "1.0.9"
- resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.9.tgz#e5f82c2323673e7fcad3d12858c83c4039f6399c"
- integrity sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==
+is-generator-function@^1.0.10:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+ integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+ dependencies:
+ has-tostringtag "^1.0.0"
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
version "4.0.1"
@@ -4795,10 +4781,12 @@ is-negative-zero@^2.0.1:
resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-is-number-object@^1.0.4, is-number-object@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
- integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
+is-number-object@^1.0.4, is-number-object@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
+ integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+ dependencies:
+ has-tostringtag "^1.0.0"
is-number@^3.0.0:
version "3.0.0"
@@ -4844,13 +4832,13 @@ is-promise@^2.2.2:
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-is-regex@^1.0.3, is-regex@^1.0.5, is-regex@^1.1.2, is-regex@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
- integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
+is-regex@^1.0.3, is-regex@^1.0.5, is-regex@^1.1.3, is-regex@^1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+ integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
dependencies:
call-bind "^1.0.2"
- has-symbols "^1.0.2"
+ has-tostringtag "^1.0.0"
is-regexp@^2.0.0:
version "2.1.0"
@@ -4868,37 +4856,39 @@ is-stream@^1.0.1, is-stream@^1.1.0:
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
is-stream@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
- integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+ integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
- integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
+is-string@^1.0.5, is-string@^1.0.6, is-string@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+ integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+ dependencies:
+ has-tostringtag "^1.0.0"
is-subset@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
-is-symbol@^1.0.2, is-symbol@^1.0.3:
+is-symbol@^1.0.2, is-symbol@^1.0.3, is-symbol@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
dependencies:
has-symbols "^1.0.2"
-is-typed-array@^1.1.3:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
- integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
+is-typed-array@^1.1.6:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.7.tgz#881ddc660b13cb8423b2090fa88c0fe37a83eb2f"
+ integrity sha512-VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA==
dependencies:
- available-typed-arrays "^1.0.2"
+ available-typed-arrays "^1.0.4"
call-bind "^1.0.2"
- es-abstract "^1.18.0-next.2"
+ es-abstract "^1.18.5"
foreach "^2.0.5"
- has-symbols "^1.0.1"
+ has-tostringtag "^1.0.0"
is-typedarray@^1.0.0, is-typedarray@~1.0.0:
version "1.0.0"
@@ -5477,9 +5467,9 @@ jsbn@~0.1.0:
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
jsdom@^16.2.1, jsdom@^16.4.0:
- version "16.6.0"
- resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac"
- integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==
+ version "16.7.0"
+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+ integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
dependencies:
abab "^2.0.5"
acorn "^8.2.4"
@@ -5506,7 +5496,7 @@ jsdom@^16.2.1, jsdom@^16.4.0:
whatwg-encoding "^1.0.5"
whatwg-mimetype "^2.3.0"
whatwg-url "^8.5.0"
- ws "^7.4.5"
+ ws "^7.4.6"
xml-name-validator "^3.0.0"
jsesc@^2.5.1:
@@ -5802,8 +5792,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "12.3.1"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3216d7e5a7a333212b00d4d7578e29a9f0e247d8"
+ version "12.5.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d4f35bf07a3d3ec2467c8e2346f7edff28f2f0d4"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@@ -5837,10 +5827,10 @@ matrix-react-test-utils@^0.2.3:
"@babel/traverse" "^7.13.17"
walk "^2.3.14"
-matrix-widget-api@^0.1.0-beta.15:
- version "0.1.0-beta.15"
- resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.15.tgz#b02511f93fe1a3634868b6e246d736107f182745"
- integrity sha512-sWmtb8ZarSbHVbk5ni7IHBR9jOh7m1+5R4soky0fEO9VKl+MN7skT0+qNux3J9WuUAu2D80dZW9xPUT9cxfxbg==
+matrix-widget-api@^0.1.0-beta.16:
+ version "0.1.0-beta.16"
+ resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.16.tgz#32655f05cab48239b97fe4111a1d0858f2aad61a"
+ integrity sha512-9zqaNLaM14YDHfFb7WGSUOivGOjYw+w5Su84ZfOl6A4IUy1xT9QPp0nsSA8wNfz0LpxOIPn3nuoF8Tn/40F5tg==
dependencies:
"@types/events" "^3.0.0"
events "^3.2.0"
@@ -5960,17 +5950,17 @@ micromatch@^4.0.2, micromatch@^4.0.4:
braces "^3.0.1"
picomatch "^2.2.3"
-mime-db@1.48.0:
- version "1.48.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
- integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
+mime-db@1.49.0:
+ version "1.49.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
+ integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
mime-types@^2.1.12, mime-types@~2.1.19:
- version "2.1.31"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
- integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
+ version "2.1.32"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
+ integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
dependencies:
- mime-db "1.48.0"
+ mime-db "1.49.0"
mimic-fn@^2.1.0:
version "2.1.0"
@@ -6034,9 +6024,9 @@ ms@2.1.2:
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
nanoid@^3.1.23:
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
- integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+ version "3.1.25"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+ integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
nanomatch@^1.2.9:
version "1.2.13"
@@ -6120,10 +6110,10 @@ node-notifier@^8.0.0:
uuid "^8.3.0"
which "^2.0.2"
-node-releases@^1.1.71:
- version "1.1.73"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
- integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
+node-releases@^1.1.75:
+ version "1.1.75"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+ integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
@@ -6136,12 +6126,12 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
validate-npm-package-license "^3.0.1"
normalize-package-data@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
- integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+ integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
dependencies:
hosted-git-info "^4.0.1"
- resolve "^1.20.0"
+ is-core-module "^2.5.0"
semver "^7.3.4"
validate-npm-package-license "^3.0.1"
@@ -6217,7 +6207,7 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-inspect@^1.1.0, object-inspect@^1.10.3, object-inspect@^1.7.0, object-inspect@^1.9.0:
+object-inspect@^1.1.0, object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
@@ -6252,7 +6242,7 @@ object.assign@^4.1.0, object.assign@^4.1.2:
has-symbols "^1.0.1"
object-keys "^1.1.1"
-object.entries@^1.1.1, object.entries@^1.1.3, object.entries@^1.1.4:
+object.entries@^1.1.1, object.entries@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"
integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==
@@ -6336,9 +6326,9 @@ optionator@^0.9.1:
word-wrap "^1.2.3"
opus-recorder@^8.0.3:
- version "8.0.3"
- resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.3.tgz#f7b44f8f68500c9b96a15042a69f915fd9c1716d"
- integrity sha512-8vXGiRwlJAavT9D3yYzukNVXQ8vEcKHcsQL/zXO24DQtJ0PLXvoPHNQPJrbMCdB4ypJgWDExvHF4JitQDL7dng==
+ version "8.0.4"
+ resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.4.tgz#c4cdbb8bb94d17aa406934b58dcf9caab6c79b09"
+ integrity sha512-nWwLH5BySgNDHdpkOMV+igl9iyS99g60ap/0LycIgbSXykZvUpweuWCgAl3mTKSL0773yvKohlO5dOv5RQqG/Q==
p-each-series@^2.1.0:
version "2.2.0"
@@ -6385,9 +6375,9 @@ p-try@^2.0.0:
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
pako@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.3.tgz#cdf475e31b678565251406de9e759196a0ea7a43"
- integrity sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d"
+ integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==
parent-module@^1.0.0:
version "1.0.1"
@@ -6620,9 +6610,9 @@ postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.
supports-color "^6.1.0"
postcss@^8.0.2:
- version "8.3.5"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
- integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
+ version "8.3.6"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
+ integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
dependencies:
colorette "^1.2.2"
nanoid "^3.1.23"
@@ -6717,10 +6707,10 @@ punycode@^2.1.0, punycode@^2.1.1:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-pvtsutils@^1.1.2, pvtsutils@^1.1.6, pvtsutils@^1.1.7:
- version "1.1.7"
- resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.1.7.tgz#39a65ccb3b7448c974f6a6141ce2aad037b3f13c"
- integrity sha512-faOiD/XpB/cIebRzYwzYjCmYgiDd53YEBni+Mt1+8/HlrARHYBpsU2OHOt3EZ1ZhfRNxPL0dH3K/vKaMgNWVGA==
+pvtsutils@^1.1.2, pvtsutils@^1.1.6, pvtsutils@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.2.0.tgz#619e4767093d23cd600482600c16f4c36d3025bb"
+ integrity sha512-IDefMJEQl7HX0FP2hIKJFnAR11klP1js2ixCrOaMhe3kXFK6RQ2ABUCuwWaaD4ib0hSbh2fGTICvWJJhDfNecA==
dependencies:
tslib "^2.2.0"
@@ -6980,9 +6970,9 @@ redent@^3.0.0:
strip-indent "^3.0.0"
redux@^4.0.0, redux@^4.0.4:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4"
- integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47"
+ integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==
dependencies:
"@babel/runtime" "^7.9.2"
@@ -7010,9 +7000,9 @@ regenerate@^1.4.0:
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
regenerator-runtime@^0.13.4:
- version "0.13.7"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
- integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+ version "0.13.9"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+ integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
regenerator-transform@^0.14.2:
version "0.14.5"
@@ -7172,7 +7162,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.18.1:
version "1.20.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -7529,9 +7519,9 @@ spdx-expression-parse@^3.0.0:
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.9"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f"
- integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==
+ version "3.0.10"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b"
+ integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==
specificity@^0.4.1:
version "0.4.1"
@@ -7994,9 +7984,9 @@ tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
- integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
tsutils@^3.21.0:
version "3.21.0"
@@ -8066,7 +8056,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
@@ -8394,21 +8384,22 @@ which-boxed-primitive@^1.0.2:
is-symbol "^1.0.3"
which-builtin-type@^1.0.1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.0.tgz#0295cbda3fa75837bf4ab6cc56c4b33af1e99454"
- integrity sha512-KOX/VAdpOLOahMo64rn+tPK8IHc8TY12r2iCM/Lvlgk6JMzShmxz751C5HEHP55zBAQe2eJeltmfyGbe3ggw4Q==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.1.tgz#1d14bb1b69b5680ebdddd7244689574678a1d83c"
+ integrity sha512-zY3bUNzl/unBfSDS6ePT+/dwu6hZ7RMVMqHFvYxZEhisGEwCV/pYnXQ70nd3Hn2X6l8BNOWge5sHk3wAR3L42w==
dependencies:
function.prototype.name "^1.1.4"
+ has-tostringtag "^1.0.0"
is-async-fn "^1.1.0"
- is-date-object "^1.0.2"
+ is-date-object "^1.0.5"
is-finalizationregistry "^1.0.1"
- is-generator-function "^1.0.8"
- is-regex "^1.1.2"
+ is-generator-function "^1.0.10"
+ is-regex "^1.1.4"
is-weakref "^1.0.1"
isarray "^2.0.5"
which-boxed-primitive "^1.0.2"
which-collection "^1.0.1"
- which-typed-array "^1.1.4"
+ which-typed-array "^1.1.5"
which-collection@^1.0.1:
version "1.0.1"
@@ -8425,18 +8416,17 @@ which-module@^2.0.0:
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-which-typed-array@^1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
- integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
+which-typed-array@^1.1.5:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.6.tgz#f3713d801da0720a7f26f50c596980a9f5c8b383"
+ integrity sha512-DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q==
dependencies:
- available-typed-arrays "^1.0.2"
- call-bind "^1.0.0"
- es-abstract "^1.18.0-next.1"
+ available-typed-arrays "^1.0.4"
+ call-bind "^1.0.2"
+ es-abstract "^1.18.5"
foreach "^2.0.5"
- function-bind "^1.1.1"
- has-symbols "^1.0.1"
- is-typed-array "^1.1.3"
+ has-tostringtag "^1.0.0"
+ is-typed-array "^1.1.6"
which@^1.2.9, which@^1.3.1:
version "1.3.1"
@@ -8499,7 +8489,7 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
signal-exit "^3.0.2"
typedarray-to-buffer "^3.1.5"
-ws@^7.4.5:
+ws@^7.4.6:
version "7.5.3"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
@@ -8589,9 +8579,9 @@ yargs@^15.4.1:
yargs-parser "^18.1.2"
yargs@^17.0.1:
- version "17.0.1"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
- integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+ version "17.1.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"
+ integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
dependencies:
cliui "^7.0.2"
escalade "^3.1.1"