diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2ccabcb..7ef29ebf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +Changes in [9.3.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v9.3.0) (2020-12-07) +================================================================================================ +[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v9.3.0-rc.1...v9.3.0) + +* No changes since rc.1 + +Changes in [9.3.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v9.3.0-rc.1) (2020-12-02) +========================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v9.2.0...v9.3.0-rc.1) + + * Export CallError + [\#1551](https://github.com/matrix-org/matrix-js-sdk/pull/1551) + * Upgrade dependencies + [\#1550](https://github.com/matrix-org/matrix-js-sdk/pull/1550) + * Don't log error when environment does not support WebRTC + [\#1547](https://github.com/matrix-org/matrix-js-sdk/pull/1547) + * Fix dehydration method name + [\#1544](https://github.com/matrix-org/matrix-js-sdk/pull/1544) + Changes in [9.2.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v9.2.0) (2020-11-23) ================================================================================================ [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v9.2.0-rc.1...v9.2.0) diff --git a/package.json b/package.json index 9488696b5..f710e68e1 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,15 @@ { "name": "matrix-js-sdk", - "version": "9.2.0", + "version": "9.3.0", "description": "Matrix Client-Server SDK for Javascript", "scripts": { - "prepare": "yarn build", + "prepublishOnly": "yarn build", + "postinstall": "yarn build:dev", "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && babel src -w -s -d lib --verbose --extensions \".ts,.js\"", "dist": "echo 'This is for the release script so it can make assets (browser bundle).' && yarn build", "clean": "rimraf lib dist", - "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:compile-browser && yarn build:minify-browser && yarn build:types", + "build": "yarn build:dev && yarn build:compile-browser && yarn build:minify-browser", + "build:dev": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types", "build:types": "tsc --emitDeclarationOnly", "build:compile": "babel -d lib --verbose --extensions \".ts,.js\" src", "build:compile-browser": "mkdirp dist && browserify -d src/browser-index.js -p [ tsify -p ./tsconfig.json ] -t [ babelify --sourceMaps=inline --presets [ @babel/preset-env @babel/preset-typescript ] ] | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js", diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts index 71762ca2c..da884c2ca 100644 --- a/src/webrtc/call.ts +++ b/src/webrtc/call.ts @@ -1300,13 +1300,12 @@ export class MatrixCall extends EventEmitter { // party ID must match (our chosen partner hanging up the call) or be undefined (we haven't chosen // a partner yet but we're treating the hangup as a reject as per VoIP v0) - if (!this.partyIdMatches(msg) && this.opponentPartyId !== undefined) { + if (this.partyIdMatches(msg) || this.opponentPartyId === undefined || this.state === CallState.Ringing) { + // default reason is user_hangup + this.terminate(CallParty.Remote, msg.reason || CallErrorCode.UserHangup, true); + } else { logger.info(`Ignoring message from party ID ${msg.party_id}: our partner is ${this.opponentPartyId}`); - return; } - - // default reason is user_hangup - this.terminate(CallParty.Remote, msg.reason || CallErrorCode.UserHangup, true); }; onRejectReceived = (msg) => {