OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3580 from matrix-org/t3chguy/better_slash_command_errors_unknown 

Fix error message which is shown when unknown slash command attempted
pull/21833/head
Michael Telatynski 2019-10-31 13:26:43 +00:00 committed by GitHub
parent db0e643f4d 178accae19
commit bc263fa4bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/views/rooms/SendMessageComposer.js
View File

@ -37,7 +37,7 @@ import SendHistoryManager from "../../../SendHistoryManager";
import {processCommandInput} from '../../../SlashCommands'; import {processCommandInput} from '../../../SlashCommands';
import sdk from '../../../index'; import sdk from '../../../index';
import Modal from '../../../Modal'; import Modal from '../../../Modal';
import { _t } from '../../../languageHandler'; import {_t, _td} from '../../../languageHandler';
import ContentMessages from '../../../ContentMessages'; import ContentMessages from '../../../ContentMessages';
import {Key} from "../../../Keyboard"; import {Key} from "../../../Keyboard";
@ -214,12 +214,20 @@ export default class SendMessageComposer extends React.Component {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
// assume the error is a server error when the command is async // assume the error is a server error when the command is async
const isServerError = !!cmd.promise; const isServerError = !!cmd.promise;
const title = isServerError ? "Server error" : "Command error"; const title = isServerError ? _td("Server error") : _td("Command error");
let errText;
if (typeof error === 'string') {
errText = error;
} else if (error.message) {
errText = error.message;
} else {
errText = _t("Server unavailable, overloaded, or something else went wrong.");
}
Modal.createTrackedDialog(title, '', ErrorDialog, { Modal.createTrackedDialog(title, '', ErrorDialog, {
title: isServerError ? _t("Server error") : _t("Command error"), title: _t(title),
description: error.message ? error.message : _t( description: errText,
"Server unavailable, overloaded, or something else went wrong.",
),
}); });
} else { } else {
console.log("Command success."); console.log("Command success.");