matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

clean up promises properly

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2019-06-29 07:05:43 +01:00
parent e8db379fed
commit 77dbc79386
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SlashCommands.js
View File

@@ -45,7 +45,7 @@ const singleMxcUpload = async () => {
Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, { Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, {
file, file,
onFinished: (shouldContinue) => { onFinished: (shouldContinue) => {
if (shouldContinue) resolve(MatrixClientPeg.get().uploadContent(file)); resolve(shouldContinue ? MatrixClientPeg.get().uploadContent(file) : null);
}, },
}); });
}; };
@@ -246,6 +246,7 @@ export const CommandMap = {
} }
return success(promise.then((url) => { return success(promise.then((url) => {
if (!url) return;
const ev = room.currentState.getStateEvents('m.room.member', userId); const ev = room.currentState.getStateEvents('m.room.member', userId);
const content = { const content = {
...ev ? ev.getContent() : { membership: 'join' }, ...ev ? ev.getContent() : { membership: 'join' },
@@ -267,6 +268,7 @@ export const CommandMap = {
} }
return success(promise.then((url) => { return success(promise.then((url) => {
if (!url) return;
return MatrixClientPeg.get().setAvatarUrl(url); return MatrixClientPeg.get().setAvatarUrl(url);
})); }));
}, },