imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5189 from matrix-org/travis/rageshake-fix

Browse source 
Run the rageshake command through the bug report dialog
This commit is contained in:
Travis Ralston 2020-09-09 15:08:43 -06:00 • committed by GitHub
commit a765db8977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/SlashCommands.tsx
View file

@ -38,8 +38,7 @@ import {inviteUsersToRoom} from "./RoomInvite";
import { WidgetType } from "./widgets/WidgetType"; import { WidgetType } from "./widgets/WidgetType";
import { Jitsi } from "./widgets/Jitsi"; import { Jitsi } from "./widgets/Jitsi";
import { parseFragment as parseHtml } from "parse5"; import { parseFragment as parseHtml } from "parse5";
import sendBugReport from "./rageshake/submit-rageshake"; import BugReportDialog from "./components/views/dialogs/BugReportDialog";
import SdkConfig from "./SdkConfig";
import { ensureDMExists } from "./createRoom"; import { ensureDMExists } from "./createRoom";
import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload"; import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload";
import { Action } from "./dispatcher/actions"; import { Action } from "./dispatcher/actions";
@ -975,16 +974,9 @@ export const Commands = [
args: "<description>", args: "<description>",
runFn: function(roomId, args) { runFn: function(roomId, args) {
return success( return success(
sendBugReport(SdkConfig.get().bug_report_endpoint_url, { Modal.createTrackedDialog('Slash Commands', 'Bug Report Dialog', BugReportDialog, {
userText: args, initialText: args,
sendLogs: true, }).finished,
}).then(() => {
const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
Modal.createTrackedDialog('Slash Commands', 'Rageshake sent', InfoDialog, {
title: _t('Logs sent'),
description: _t('Thank you!'),
});
}),
); );
}, },
category: CommandCategories.advanced, category: CommandCategories.advanced,

3
src/components/views/dialogs/BugReportDialog.js
View file

@ -34,7 +34,7 @@ export default class BugReportDialog extends React.Component {
busy: false, busy: false,
err: null, err: null,
issueUrl: "", issueUrl: "",
text: "", text: props.initialText || "",
progress: null, progress: null,
downloadBusy: false, downloadBusy: false,
downloadProgress: null, downloadProgress: null,
@ -255,4 +255,5 @@ export default class BugReportDialog extends React.Component {
BugReportDialog.propTypes = { BugReportDialog.propTypes = {
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,
initialText: PropTypes.string,
}; };

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

@ -206,8 +206,6 @@
"Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions", "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
"Displays information about a user": "Displays information about a user", "Displays information about a user": "Displays information about a user",
"Send a bug report with logs": "Send a bug report with logs", "Send a bug report with logs": "Send a bug report with logs",
"Logs sent": "Logs sent",
"Thank you!": "Thank you!",
"Opens chat with the given user": "Opens chat with the given user", "Opens chat with the given user": "Opens chat with the given user",
"Sends a message to the given user": "Sends a message to the given user", "Sends a message to the given user": "Sends a message to the given user",
"Displays action": "Displays action", "Displays action": "Displays action",
@ -1602,6 +1600,8 @@
"Close dialog": "Close dialog", "Close dialog": "Close dialog",
"Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.", "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
"Preparing to send logs": "Preparing to send logs", "Preparing to send logs": "Preparing to send logs",
"Logs sent": "Logs sent",
"Thank you!": "Thank you!",
"Failed to send logs: ": "Failed to send logs: ", "Failed to send logs: ": "Failed to send logs: ",
"Preparing to download logs": "Preparing to download logs", "Preparing to download logs": "Preparing to download logs",
"Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.", "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",