PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into travis/3pid-invites

Browse source
This commit is contained in:
Travis Ralston 2020-09-14 11:50:08 -06:00
commit 61e8d3e3d7
8 changed files with 130 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
CHANGELOG.md
View file

@ -1,3 +1,96 @@
Changes in [3.4.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.4.1) (2020-09-14)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.4.0...v3.4.1)
* Don't count widgets which no longer exist towards pinned count
[\#5202](https://github.com/matrix-org/matrix-react-sdk/pull/5202)
* Fix crashes with cannot read isResizing of undefined
[\#5205](https://github.com/matrix-org/matrix-react-sdk/pull/5205)
Changes in [3.4.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.4.0) (2020-09-14)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.4.0-rc.1...v3.4.0)
* Upgrade to JS SDK 8.3.0
* [Release] Show verification status in the room summary card
[\#5196](https://github.com/matrix-org/matrix-react-sdk/pull/5196)
* Fix user info scrolling in new card view
[\#5200](https://github.com/matrix-org/matrix-react-sdk/pull/5200)
* Fix sticker picker height
[\#5199](https://github.com/matrix-org/matrix-react-sdk/pull/5199)
* [Release] Account for via in pill matching regex
[\#5190](https://github.com/matrix-org/matrix-react-sdk/pull/5190)
Changes in [3.4.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.4.0-rc.1) (2020-09-09)
=============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.3.0...v3.4.0-rc.1)
* Upgrade to JS SDK 8.3.0-rc.1
* Update from Weblate
[\#5183](https://github.com/matrix-org/matrix-react-sdk/pull/5183)
* Right Panel Room Summary and Widgets
[\#5167](https://github.com/matrix-org/matrix-react-sdk/pull/5167)
* null-guard roomId in RightPanel and pass Room to UserView
[\#5180](https://github.com/matrix-org/matrix-react-sdk/pull/5180)
* Fix create-react-class regression.
[\#5178](https://github.com/matrix-org/matrix-react-sdk/pull/5178)
* Fix WatchManager for global room watchers and tidy widget code a little
[\#5176](https://github.com/matrix-org/matrix-react-sdk/pull/5176)
* Fix permalink local linkification to not strip via servers
[\#5174](https://github.com/matrix-org/matrix-react-sdk/pull/5174)
* Support creation of Jitsi widgets with "openidtoken-jwt" auth
[\#5173](https://github.com/matrix-org/matrix-react-sdk/pull/5173)
* Fix create-react-class regression.
[\#5177](https://github.com/matrix-org/matrix-react-sdk/pull/5177)
* Update openid_credentials Widget API action for MSC1960 updates
[\#5172](https://github.com/matrix-org/matrix-react-sdk/pull/5172)
* Allow persistent resizing of the widget app drawer
[\#5138](https://github.com/matrix-org/matrix-react-sdk/pull/5138)
* add lenny face command
[\#5158](https://github.com/matrix-org/matrix-react-sdk/pull/5158)
* Prep work for Settings changes with cross-signing deferral
[\#5169](https://github.com/matrix-org/matrix-react-sdk/pull/5169)
* Small code clean ups and tweaks
[\#5168](https://github.com/matrix-org/matrix-react-sdk/pull/5168)
* Fix soft crash from TruncatedList in the createReactClass conversion
[\#5170](https://github.com/matrix-org/matrix-react-sdk/pull/5170)
* Remove create-react-class
[\#5157](https://github.com/matrix-org/matrix-react-sdk/pull/5157)
* Consolidate Lodash files in bundle
[\#5162](https://github.com/matrix-org/matrix-react-sdk/pull/5162)
* Communities v2 prototype: "In community" view
[\#5161](https://github.com/matrix-org/matrix-react-sdk/pull/5161)
* Respect user preference for whether pills should have an avatar or not
[\#5165](https://github.com/matrix-org/matrix-react-sdk/pull/5165)
* Communities v2 prototype: DM copy updates
[\#5153](https://github.com/matrix-org/matrix-react-sdk/pull/5153)
* Only wait for public keys during verification
[\#5164](https://github.com/matrix-org/matrix-react-sdk/pull/5164)
* Fix eslint ts override tsx matching and delint
[\#5155](https://github.com/matrix-org/matrix-react-sdk/pull/5155)
* Fix react error about functional components can't take refs
[\#5159](https://github.com/matrix-org/matrix-react-sdk/pull/5159)
* Remove redundant components and devDependencies
[\#5156](https://github.com/matrix-org/matrix-react-sdk/pull/5156)
* Add display-capture to iframe allow for widgets
[\#5154](https://github.com/matrix-org/matrix-react-sdk/pull/5154)
* Update create room dialog copy & community prototype home icon
[\#5151](https://github.com/matrix-org/matrix-react-sdk/pull/5151)
* Migrate to new, separate APIs for cross-signing and secret storage
[\#5149](https://github.com/matrix-org/matrix-react-sdk/pull/5149)
* Fix clicking the background of the tag panel not clearing the filter
[\#5152](https://github.com/matrix-org/matrix-react-sdk/pull/5152)
* Communities v2 prototype: Associate created rooms with the selected
community
[\#5147](https://github.com/matrix-org/matrix-react-sdk/pull/5147)
* Communities v2 prototype: Tag panel selection changes
[\#5145](https://github.com/matrix-org/matrix-react-sdk/pull/5145)
* Communities v2 prototype: Create community flow
[\#5144](https://github.com/matrix-org/matrix-react-sdk/pull/5144)
* Communities v2 prototype: Override invite aesthetics for community-as-room
invites
[\#5143](https://github.com/matrix-org/matrix-react-sdk/pull/5143)
Changes in [3.3.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.3.0) (2020-09-01)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.3.0-rc.1...v3.3.0)

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "3.3.0",
"version": "3.4.1",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {

32
src/CallHandler.js
View file

@ -56,7 +56,6 @@ limitations under the License.
import {MatrixClientPeg} from './MatrixClientPeg';
import PlatformPeg from './PlatformPeg';
import Modal from './Modal';
import * as sdk from './index';
import { _t } from './languageHandler';
import Matrix from 'matrix-js-sdk';
import dis from './dispatcher/dispatcher';
@ -69,6 +68,9 @@ import {WidgetType} from "./widgets/WidgetType";
import {SettingLevel} from "./settings/SettingLevel";
import {base32} from "rfc4648";
import QuestionDialog from "./components/views/dialogs/QuestionDialog";
import ErrorDialog from "./components/views/dialogs/ErrorDialog";
global.mxCalls = {
//room_id: MatrixCall
};
@ -131,7 +133,6 @@ function _setCallListeners(call) {
return;
}
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
title: _t('Call Failed'),
description: err.message,
@ -160,7 +161,6 @@ function _setCallListeners(call) {
_setCallState(call, call.roomId, "busy");
pause("ringbackAudio");
play("busyAudio");
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'Call Timeout', ErrorDialog, {
title: _t('Call Timeout'),
description: _t('The remote side failed to pick up') + '.',
@ -202,7 +202,6 @@ function _setCallState(call, roomId, status) {
function _showICEFallbackPrompt() {
const cli = MatrixClientPeg.get();
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
const code = sub => <code>{sub}</code>;
Modal.createTrackedDialog('No TURN servers', '', QuestionDialog, {
title: _t("Call failed due to misconfigured server"),
@ -245,7 +244,6 @@ function _onAction(payload) {
if (screenCapErrorString) {
_setCallState(undefined, newCall.roomId, "ended");
console.log("Can't capture screen: " + screenCapErrorString);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'Unable to capture screen', ErrorDialog, {
title: _t('Unable to capture screen'),
description: screenCapErrorString,
@ -265,7 +263,6 @@ function _onAction(payload) {
case 'place_call':
{
if (callHandler.getAnyActiveCall()) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
title: _t('Existing Call'),
description: _t('You are already in a call.'),
@ -275,7 +272,6 @@ function _onAction(payload) {
// if the runtime env doesn't do VoIP, whine.
if (!MatrixClientPeg.get().supportsVoip()) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
title: _t('VoIP is unsupported'),
description: _t('You cannot place VoIP calls in this browser.'),
@ -291,7 +287,6 @@ function _onAction(payload) {
const members = room.getJoinedMembers();
if (members.length <= 1) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
description: _t('You cannot place a call with yourself.'),
});
@ -366,8 +361,6 @@ async function _startCallApp(roomId, type) {
const currentJitsiWidgets = WidgetUtils.getRoomWidgetsOfType(room, WidgetType.JITSI);
if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentJitsiWidgets, WidgetType.JITSI)) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
title: _t('Call in Progress'),
description: _t('A call is currently being placed!'),
@ -380,12 +373,25 @@ async function _startCallApp(roomId, type) {
"Refusing to start conference call widget in " + roomId +
" a conference call widget is already present",
);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
if (WidgetUtils.canUserModifyWidgets(roomId)) {
Modal.createTrackedDialog('Already have Jitsi Widget', '', QuestionDialog, {
title: _t('End Call'),
description: _t('Remove the group call from the room?'),
button: _t('End Call'),
cancelButton: _t('Cancel'),
onFinished: (endCall) => {
if (endCall) {
WidgetUtils.setRoomWidget(roomId, currentJitsiWidgets[0].getContent()['id']);
}
},
});
} else {
Modal.createTrackedDialog('Already have Jitsi Widget', '', ErrorDialog, {
title: _t('Call in Progress'),
description: _t('A call is already in progress!'),
description: _t("You don't have permission to remove the call from the room"),
});
}
return;
}
@ -429,8 +435,6 @@ async function _startCallApp(roomId, type) {
console.log('Jitsi widget added');
}).catch((e) => {
if (e.errcode === 'M_FORBIDDEN') {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
title: _t('Permission Required'),
description: _t("You do not have permission to start a conference call in this room"),

3
src/components/structures/ScrollPanel.js
View file

@ -198,7 +198,8 @@ export default class ScrollPanel extends React.Component {
}
onScroll = ev => {
if (this.props.resizeNotifier.isResizing) return; // skip scroll events caused by resizing
// skip scroll events caused by resizing
if (this.props.resizeNotifier && this.props.resizeNotifier.isResizing) return;
debuglog("onScroll", this._getScrollNode().scrollTop);
this._scrollTimeout.restart();
this._saveScrollState();

7
src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
View file

@ -46,9 +46,10 @@ export default class BridgeSettingsTab extends React.Component<IProps> {
const client = MatrixClientPeg.get();
const roomState = client.getRoom(roomId).currentState;
return [].concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
Array.from(roomState.events.get(typeName).values()),
));
return BRIDGE_EVENT_TYPES.map(typeName => {
const events = roomState.events.get(typeName);
return events ? Array.from(events.values()) : [];
}).flat(1);
}
render() {

6
src/i18n/strings/en_EN.json
View file

@ -50,7 +50,10 @@
"You cannot place a call with yourself.": "You cannot place a call with yourself.",
"Call in Progress": "Call in Progress",
"A call is currently being placed!": "A call is currently being placed!",
"A call is already in progress!": "A call is already in progress!",
"End Call": "End Call",
"Remove the group call from the room?": "Remove the group call from the room?",
"Cancel": "Cancel",
"You don't have permission to remove the call from the room": "You don't have permission to remove the call from the room",
"Permission Required": "Permission Required",
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
"Replying With Files": "Replying With Files",
@ -140,7 +143,6 @@
"Cancel entering passphrase?": "Cancel entering passphrase?",
"Are you sure you want to cancel entering passphrase?": "Are you sure you want to cancel entering passphrase?",
"Go Back": "Go Back",
"Cancel": "Cancel",
"Setting up keys": "Setting up keys",
"Messages": "Messages",
"Actions": "Actions",

4
src/stores/WidgetStore.ts
View file

@ -167,7 +167,9 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
// the only case it will go to three is if you have two and then a Jitsi gets added
const roomId = this.getRoomId(widgetId);
const roomInfo = this.getRoom(roomId);
return roomInfo && Object.keys(roomInfo.pinned).length < 2;
return roomInfo && Object.keys(roomInfo.pinned).filter(k => {
return roomInfo.widgets.some(app => app.id === k);
}).length < 2;
}
public pinWidget(widgetId: string) {

4
yarn.lock
View file

@ -5931,8 +5931,8 @@ mathml-tag-names@^2.0.1:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "8.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6992e2056901502af19e40ba0d1103c4c1f61ed"
version "8.3.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b9886d4f3479c041fc6d91ebc88c4a998e9d2e7c"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"