mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-23 03:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions"

Browse source 
This reverts commit 09a8fec2
This commit is contained in:
Michael Telatynski 2019-11-12 11:56:21 +00:00
parent 09a8fec261
commit 168b1b68bb
43 changed files with 72 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Lifecycle.js
View file

@ -524,7 +524,7 @@ export function logout() {
console.log("Failed to call logout API: token will not be invalidated");
onLoggedOut();
},
).then();
).done();
}
export function softLogout() {
@ -608,7 +608,7 @@ export function onLoggedOut() {
// that can occur when components try to use a null client.
dis.dispatch({action: 'on_logged_out'}, true);
stopMatrixClient();
_clearStorage().then();
_clearStorage().done();
}
/**

2
src/Notifier.js
View file

@ -198,7 +198,7 @@ const Notifier = {
if (enable) {
// Attempt to get permission from user
plaf.requestNotificationPermission().then((result) => {
plaf.requestNotificationPermission().done((result) => {
if (result !== 'granted') {
// The permission request was dismissed or denied
// TODO: Support alternative branding in messaging

2
src/Resend.js
View file

@ -35,7 +35,7 @@ module.exports = {
},
resend: function(event) {
const room = MatrixClientPeg.get().getRoom(event.getRoomId());
MatrixClientPeg.get().resendEvent(event, room).then(function(res) {
MatrixClientPeg.get().resendEvent(event, room).done(function(res) {
dis.dispatch({
action: 'message_sent',
event: event,

8
src/ScalarMessaging.js
View file

@ -279,7 +279,7 @@ function inviteUser(event, roomId, userId) {
}
}
client.invite(roomId, userId).then(function() {
client.invite(roomId, userId).done(function() {
sendResponse(event, {
success: true,
});
@ -398,7 +398,7 @@ function setPlumbingState(event, roomId, status) {
sendError(event, _t('You need to be logged in.'));
return;
}
client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).then(() => {
client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).done(() => {
sendResponse(event, {
success: true,
});
@ -414,7 +414,7 @@ function setBotOptions(event, roomId, userId) {
sendError(event, _t('You need to be logged in.'));
return;
}
client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).then(() => {
client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).done(() => {
sendResponse(event, {
success: true,
});
@ -444,7 +444,7 @@ function setBotPower(event, roomId, userId, level) {
},
);
client.setPowerLevel(roomId, userId, level, powerEvent).then(() => {
client.setPowerLevel(roomId, userId, level, powerEvent).done(() => {
sendResponse(event, {
success: true,
});

4
src/components/structures/GroupView.js
View file

@ -639,7 +639,7 @@ export default createReactClass({
title: _t('Error'),
description: _t('Failed to upload image'),
});
}).then();
}).done();
},
_onJoinableChange: function(ev) {
@ -678,7 +678,7 @@ export default createReactClass({
this.setState({
avatarChanged: false,
});
}).then();
}).done();
},
_saveGroup: async function() {

2
src/components/structures/InteractiveAuth.js
View file

@ -121,7 +121,7 @@ export default createReactClass({
this.setState({
errorText: msg,
});
}).then();
}).done();
this._intervalId = null;
if (this.props.poll) {

8
src/components/structures/MatrixChat.js
View file

@ -541,7 +541,7 @@ export default createReactClass({
const Loader = sdk.getComponent("elements.Spinner");
const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
MatrixClientPeg.get().leave(payload.room_id).then(() => {
MatrixClientPeg.get().leave(payload.room_id).done(() => {
modal.close();
if (this.state.currentRoomId === payload.room_id) {
dis.dispatch({action: 'view_next_room'});
@ -862,7 +862,7 @@ export default createReactClass({
waitFor = this.firstSyncPromise.promise;
}
waitFor.then(() => {
waitFor.done(() => {
let presentedId = roomInfo.room_alias || roomInfo.room_id;
const room = MatrixClientPeg.get().getRoom(roomInfo.room_id);
if (room) {
@ -974,7 +974,7 @@ export default createReactClass({
const [shouldCreate, createOpts] = await modal.finished;
if (shouldCreate) {
createRoom({createOpts}).then();
createRoom({createOpts}).done();
}
},
@ -1750,7 +1750,7 @@ export default createReactClass({
return;
}
cli.sendEvent(roomId, event.getType(), event.getContent()).then(() => {
cli.sendEvent(roomId, event.getType(), event.getContent()).done(() => {
dis.dispatch({action: 'message_sent'});
}, (err) => {
dis.dispatch({action: 'message_send_failed'});

2
src/components/structures/MyGroups.js
View file

@ -47,7 +47,7 @@ export default createReactClass({
},
_fetch: function() {
this.context.matrixClient.getJoinedGroups().then((result) => {
this.context.matrixClient.getJoinedGroups().done((result) => {
this.setState({groups: result.groups, error: null});
}, (err) => {
if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {

8
src/components/structures/RoomDirectory.js
View file

@ -89,7 +89,7 @@ module.exports = createReactClass({
this.setState({protocolsLoading: false});
return;
}
MatrixClientPeg.get().getThirdpartyProtocols().then((response) => {
MatrixClientPeg.get().getThirdpartyProtocols().done((response) => {
this.protocols = response;
this.setState({protocolsLoading: false});
}, (err) => {
@ -135,7 +135,7 @@ module.exports = createReactClass({
publicRooms: [],
loading: true,
});
this.getMoreRooms().then();
this.getMoreRooms().done();
},
getMoreRooms: function() {
@ -246,7 +246,7 @@ module.exports = createReactClass({
if (!alias) return;
step = _t('delete the alias.');
return MatrixClientPeg.get().deleteAlias(alias);
}).then(() => {
}).done(() => {
modal.close();
this.refreshRoomList();
}, (err) => {
@ -348,7 +348,7 @@ module.exports = createReactClass({
});
return;
}
MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).then((resp) => {
MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => {
if (resp.length > 0 && resp[0].alias) {
this.showRoomAlias(resp[0].alias, true);
} else {

8
src/components/structures/RoomView.js
View file

@ -1101,7 +1101,7 @@ module.exports = createReactClass({
}
ContentMessages.sharedInstance().sendStickerContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
.then(undefined, (error) => {
.done(undefined, (error) => {
if (error.name === "UnknownDeviceError") {
// Let the staus bar handle this
return;
@ -1145,7 +1145,7 @@ module.exports = createReactClass({
filter: filter,
term: term,
});
this._handleSearchResult(searchPromise).then();
this._handleSearchResult(searchPromise).done();
},
_handleSearchResult: function(searchPromise) {
@ -1316,7 +1316,7 @@ module.exports = createReactClass({
},
onForgetClick: function() {
MatrixClientPeg.get().forget(this.state.room.roomId).then(function() {
MatrixClientPeg.get().forget(this.state.room.roomId).done(function() {
dis.dispatch({ action: 'view_next_room' });
}, function(err) {
const errCode = err.errcode || _t("unknown error code");
@ -1333,7 +1333,7 @@ module.exports = createReactClass({
this.setState({
rejecting: true,
});
MatrixClientPeg.get().leave(this.state.roomId).then(function() {
MatrixClientPeg.get().leave(this.state.roomId).done(function() {
dis.dispatch({ action: 'view_next_room' });
self.setState({
rejecting: false,

4
src/components/structures/TimelinePanel.js
View file

@ -462,7 +462,7 @@ const TimelinePanel = createReactClass({
// timeline window.
//
// see https://github.com/vector-im/vector-web/issues/1035
this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).done(() => {
if (this.unmounted) { return; }
const { events, liveEvents } = this._getEvents();
@ -1088,7 +1088,7 @@ const TimelinePanel = createReactClass({
prom = prom.then(onLoaded, onError);
}
prom.then();
prom.done();
},
// handle the completion of a timeline load or localEchoUpdate, by

2
src/components/structures/auth/ForgotPassword.js
View file

@ -105,7 +105,7 @@ module.exports = createReactClass({
phase: PHASE_SENDING_EMAIL,
});
this.reset = new PasswordReset(this.props.serverConfig.hsUrl, this.props.serverConfig.isUrl);
this.reset.resetPassword(email, password).then(() => {
this.reset.resetPassword(email, password).done(() => {
this.setState({
phase: PHASE_EMAIL_SENT,
});

4
src/components/structures/auth/Login.js
View file

@ -253,7 +253,7 @@ module.exports = createReactClass({
this.setState({
busy: false,
});
}).then();
}).done();
},
onUsernameChanged: function(username) {
@ -424,7 +424,7 @@ module.exports = createReactClass({
this.setState({
busy: false,
});
}).then();
}).done();
},
_isSupportedFlow: function(flow) {

2
src/components/structures/auth/PostRegistration.js
View file

@ -43,7 +43,7 @@ module.exports = createReactClass({
const cli = MatrixClientPeg.get();
this.setState({busy: true});
const self = this;
cli.getProfileInfo(cli.credentials.userId).then(function(result) {
cli.getProfileInfo(cli.credentials.userId).done(function(result) {
self.setState({
avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url),
busy: false,

2
src/components/structures/auth/Registration.js
View file

@ -371,7 +371,7 @@ module.exports = createReactClass({
if (pushers[i].kind === 'email') {
const emailPusher = pushers[i];
emailPusher.data = { brand: this.props.brand };
matrixClient.setPusher(emailPusher).then(() => {
matrixClient.setPusher(emailPusher).done(() => {
console.log("Set email branding to " + this.props.brand);
}, (error) => {
console.error("Couldn't set email branding: " + error);

2
src/components/views/auth/InteractiveAuthEntryComponents.js
View file

@ -441,7 +441,7 @@ export const MsisdnAuthEntry = createReactClass({
this.props.fail(e);
}).finally(() => {
this.setState({requestingToken: false});
}).then();
}).done();
},
/*

4
src/components/views/context_menus/RoomTileContextMenu.js
View file

@ -161,7 +161,7 @@ module.exports = createReactClass({
_onClickForget: function() {
// FIXME: duplicated with RoomSettings (and dead code in RoomView)
MatrixClientPeg.get().forget(this.props.room.roomId).then(() => {
MatrixClientPeg.get().forget(this.props.room.roomId).done(() => {
// Switch to another room view if we're currently viewing the
// historical room
if (RoomViewStore.getRoomId() === this.props.room.roomId) {
@ -191,7 +191,7 @@ module.exports = createReactClass({
this.setState({
roomNotifState: newState,
});
RoomNotifs.setRoomNotifsState(roomId, newState).then(() => {
RoomNotifs.setRoomNotifsState(roomId, newState).done(() => {
// delay slightly so that the user can see their state change
// before closing the menu
return sleep(500).then(() => {

4
src/components/views/dialogs/AddressPickerDialog.js
View file

@ -267,7 +267,7 @@ module.exports = createReactClass({
this.setState({
searchError: err.errcode ? err.message : _t('Something went wrong!'),
});
}).then(() => {
}).done(() => {
this.setState({
busy: false,
});
@ -380,7 +380,7 @@ module.exports = createReactClass({
// Do a local search immediately
this._doLocalSearch(query);
}
}).then(() => {
}).done(() => {
this.setState({
busy: false,
});

2
src/components/views/dialogs/CreateGroupDialog.js
View file

@ -93,7 +93,7 @@ export default createReactClass({
this.setState({createError: e});
}).finally(() => {
this.setState({creating: false});
}).then();
}).done();
},
_onCancel: function() {

2
src/components/views/dialogs/KeyShareDialog.js
View file

@ -78,7 +78,7 @@ export default createReactClass({
true,
);
}
}).then();
}).done();
},
componentWillUnmount: function() {

4
src/components/views/dialogs/SetEmailDialog.js
View file

@ -62,7 +62,7 @@ export default createReactClass({
return;
}
this._addThreepid = new AddThreepid();
this._addThreepid.addEmailAddress(emailAddress).then(() => {
this._addThreepid.addEmailAddress(emailAddress).done(() => {
Modal.createTrackedDialog('Verification Pending', '', QuestionDialog, {
title: _t("Verification Pending"),
description: _t(
@ -96,7 +96,7 @@ export default createReactClass({
},
verifyEmailAddress: function() {
this._addThreepid.checkEmailLinkClicked().then(() => {
this._addThreepid.checkEmailLinkClicked().done(() => {
this.props.onFinished(true);
}, (err) => {
this.setState({emailBusy: false});

2
src/components/views/elements/AppTile.js
View file

@ -205,7 +205,7 @@ export default class AppTile extends React.Component {
if (!this._scalarClient) {
this._scalarClient = defaultManager.getScalarClient();
}
this._scalarClient.getScalarToken().then((token) => {
this._scalarClient.getScalarToken().done((token) => {
// Append scalar_token as a query param if not already present
this._scalarClient.scalarToken = token;
const u = url.parse(this._addWurlParams(this.props.url));

4
src/components/views/elements/EditableTextContainer.js
View file

@ -51,7 +51,7 @@ export default class EditableTextContainer extends React.Component {
this.setState({busy: true});
this.props.getInitialValue().then(
this.props.getInitialValue().done(
(result) => {
if (this._unmounted) { return; }
this.setState({
@ -83,7 +83,7 @@ export default class EditableTextContainer extends React.Component {
errorString: null,
});
this.props.onSubmit(value).then(
this.props.onSubmit(value).done(
() => {
if (this._unmounted) { return; }
this.setState({

2
src/components/views/elements/ErrorBoundary.js
View file

@ -54,7 +54,7 @@ export default class ErrorBoundary extends React.PureComponent {
if (!PlatformPeg.get()) return;
MatrixClientPeg.get().stopClient();
MatrixClientPeg.get().store.deleteAllData().then(() => {
MatrixClientPeg.get().store.deleteAllData().done(() => {
PlatformPeg.get().reload();
});
};

2
src/components/views/elements/ImageView.js
View file

@ -84,7 +84,7 @@ export default class ImageView extends React.Component {
title: _t('Error'),
description: _t('You cannot delete this image. (%(code)s)', {code: code}),
});
}).then();
}).done();
},
});
};

2
src/components/views/elements/LanguageDropdown.js
View file

@ -49,7 +49,7 @@ export default class LanguageDropdown extends React.Component {
this.setState({langs});
}).catch(() => {
this.setState({langs: ['en']});
}).then();
}).done();
if (!this.props.value) {
// If no value is given, we start with the first

2
src/components/views/groups/GroupUserSettings.js
View file

@ -36,7 +36,7 @@ export default createReactClass({
},
componentWillMount: function() {
this.context.matrixClient.getJoinedGroups().then((result) => {
this.context.matrixClient.getJoinedGroups().done((result) => {
this.setState({groups: result.groups || [], error: null});
}, (err) => {
console.error(err);

2
src/components/views/messages/MAudioBody.js
View file

@ -55,7 +55,7 @@ export default class MAudioBody extends React.Component {
decryptFile(content.file).then(function(blob) {
decryptedBlob = blob;
return URL.createObjectURL(decryptedBlob);
}).then((url) => {
}).done((url) => {
this.setState({
decryptedUrl: url,
decryptedBlob: decryptedBlob,

2
src/components/views/messages/MImageBody.js
View file

@ -289,7 +289,7 @@ export default class MImageBody extends React.Component {
this.setState({
error: err,
});
}).then();
}).done();
}
// Remember that the user wanted to show this particular image

2
src/components/views/messages/MVideoBody.js
View file

@ -115,7 +115,7 @@ module.exports = createReactClass({
this.setState({
error: err,
});
}).then();
}).done();
}
},

2
src/components/views/right_panel/UserInfo.js
View file

@ -870,7 +870,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
},
).finally(() => {
stopUpdating();
}).then();
}).done();
};
const roomId = user.roomId;

2
src/components/views/rooms/LinkPreviewWidget.js
View file

@ -53,7 +53,7 @@ module.exports = createReactClass({
);
}, (error)=>{
console.error("Failed to get URL preview: " + error);
}).then();
}).done();
},
componentDidMount: function() {

6
src/components/views/rooms/MemberInfo.js
View file

@ -248,7 +248,7 @@ module.exports = createReactClass({
return client.getStoredDevicesForUser(member.userId);
}).finally(function() {
self._cancelDeviceList = null;
}).then(function(devices) {
}).done(function(devices) {
if (cancelled) {
// we got cancelled - presumably a different user now
return;
@ -572,7 +572,7 @@ module.exports = createReactClass({
},
).finally(()=>{
this.setState({ updating: this.state.updating - 1 });
}).then();
}).done();
},
onPowerChange: async function(powerLevel) {
@ -629,7 +629,7 @@ module.exports = createReactClass({
this.setState({ updating: this.state.updating + 1 });
createRoom({dmUserId: this.props.member.userId}).finally(() => {
this.setState({ updating: this.state.updating - 1 });
}).then();
}).done();
},
onLeaveClick: function() {

2
src/components/views/settings/ChangeAvatar.js
View file

@ -112,7 +112,7 @@ module.exports = createReactClass({
}
});
httpPromise.then(function() {
httpPromise.done(function() {
self.setState({
phase: self.Phases.Display,
avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl),

2
src/components/views/settings/ChangePassword.js
View file

@ -174,7 +174,7 @@ module.exports = createReactClass({
newPassword: "",
newPasswordConfirm: "",
});
}).then();
}).done();
},
_optionallySetEmail: function() {

2
src/components/views/settings/DevicesPanel.js
View file

@ -52,7 +52,7 @@ export default class DevicesPanel extends React.Component {
}
_loadDevices() {
MatrixClientPeg.get().getDevices().then(
MatrixClientPeg.get().getDevices().done(
(resp) => {
if (this._unmounted) { return; }
this.setState({devices: resp.devices || []});

14
src/components/views/settings/Notifications.js
View file

@ -97,7 +97,7 @@ module.exports = createReactClass({
phase: this.phases.LOADING,
});
MatrixClientPeg.get().setPushRuleEnabled('global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked).then(function() {
MatrixClientPeg.get().setPushRuleEnabled('global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked).done(function() {
self._refreshFromServer();
});
},
@ -170,7 +170,7 @@ module.exports = createReactClass({
emailPusher.kind = null;
emailPusherPromise = MatrixClientPeg.get().setPusher(emailPusher);
}
emailPusherPromise.then(() => {
emailPusherPromise.done(() => {
this._refreshFromServer();
}, (error) => {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@ -274,7 +274,7 @@ module.exports = createReactClass({
}
}
Promise.all(deferreds).then(function() {
Promise.all(deferreds).done(function() {
self._refreshFromServer();
}, function(error) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@ -343,7 +343,7 @@ module.exports = createReactClass({
}
}
Promise.all(deferreds).then(function(resps) {
Promise.all(deferreds).done(function(resps) {
self._refreshFromServer();
}, function(error) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@ -398,7 +398,7 @@ module.exports = createReactClass({
};
// Then, add the new ones
Promise.all(removeDeferreds).then(function(resps) {
Promise.all(removeDeferreds).done(function(resps) {
const deferreds = [];
let pushRuleVectorStateKind = self.state.vectorContentRules.vectorState;
@ -434,7 +434,7 @@ module.exports = createReactClass({
}
}
Promise.all(deferreds).then(function(resps) {
Promise.all(deferreds).done(function(resps) {
self._refreshFromServer();
}, onError);
}, onError);
@ -650,7 +650,7 @@ module.exports = createReactClass({
externalContentRules: self.state.externalContentRules,
externalPushRules: self.state.externalPushRules,
});
}).then();
}).done();
MatrixClientPeg.get().getThreePids().then((r) => this.setState({threepids: r.threepids}));
},

2
src/components/views/settings/tabs/user/HelpUserSettingsTab.js
View file

@ -75,7 +75,7 @@ export default class HelpUserSettingsTab extends React.Component {
// stopping in the middle of the logs.
console.log("Clear cache & reload clicked");
MatrixClientPeg.get().stopClient();
MatrixClientPeg.get().store.deleteAllData().then(() => {
MatrixClientPeg.get().store.deleteAllData().done(() => {
PlatformPeg.get().reload();
});
};

4
src/stores/RoomViewStore.js
View file

@ -186,7 +186,7 @@ class RoomViewStore extends Store {
roomLoading: true,
roomLoadError: null,
});
MatrixClientPeg.get().getRoomIdForAlias(payload.room_alias).then(
MatrixClientPeg.get().getRoomIdForAlias(payload.room_alias).done(
(result) => {
dis.dispatch({
action: 'view_room',
@ -223,7 +223,7 @@ class RoomViewStore extends Store {
});
MatrixClientPeg.get().joinRoom(
this._state.roomAlias || this._state.roomId, payload.opts,
).then(() => {
).done(() => {
// We don't actually need to do anything here: we do *not*
// clear the 'joining' flag because the Room object and/or
// our 'joined' member event may not have come down the sync

3
test/components/views/dialogs/InteractiveAuthDialog-test.js
View file

@ -26,7 +26,6 @@ import sdk from 'matrix-react-sdk';
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import * as test_utils from '../../../test-utils';
import {sleep} from "../../../../src/utils/promise";
const InteractiveAuthDialog = sdk.getComponent(
'views.dialogs.InteractiveAuthDialog',
@ -108,7 +107,7 @@ describe('InteractiveAuthDialog', function() {
},
})).toBe(true);
// let the request complete
return sleep(1);
return Promise.delay(1);
}).then(() => {
expect(onFinished.callCount).toEqual(1);
expect(onFinished.calledWithExactly(true, {a: 1})).toBe(true);

2
test/components/views/elements/MemberEventListSummary-test.js
View file

@ -91,7 +91,7 @@ describe('MemberEventListSummary', function() {
testUtils.beforeEach(this);
sandbox = testUtils.stubClient();
languageHandler.setLanguage('en').then(done);
languageHandler.setLanguage('en').done(done);
languageHandler.setMissingEntryGenerator(function(key) {
return key.split('|', 2)[1];
});

3
test/components/views/rooms/MessageComposerInput-test.js
View file

@ -8,7 +8,6 @@ import * as testUtils from '../../../test-utils';
import sdk from 'matrix-react-sdk';
const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import {sleep} from "../../../../src/utils/promise";
function addTextToDraft(text) {
const components = document.getElementsByClassName('public-DraftEditor-content');
@ -50,7 +49,7 @@ xdescribe('MessageComposerInput', () => {
// warnings
// (please can we make the components not setState() after
// they are unmounted?)
sleep(10).then(() => {
Promise.delay(10).done(() => {
if (parentDiv) {
ReactDOM.unmountComponentAtNode(parentDiv);
parentDiv.remove();

2
test/i18n-test/languageHandler-test.js
View file

@ -11,7 +11,7 @@ describe('languageHandler', function() {
testUtils.beforeEach(this);
sandbox = testUtils.stubClient();
languageHandler.setLanguage('en').then(done);
languageHandler.setLanguage('en').done(done);
});
afterEach(function() {