PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Redirect UISI autorageshakes to separate repo and add more labels for filtering (#7598)

Browse source 
This adds a new key `uisi_autorageshake_app` to config.json, holding an optional custom app name for UISI autorageshakes so that the rageshake server can file them separately from user-submitted rageshakes.
This commit is contained in:
Faye Duxovni 2022-01-26 14:30:45 -05:00 committed by GitHub
parent 2f209c4346
commit 31e6b942f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/dialogs/BugReportDialog.tsx
View file

@ -96,7 +96,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
userText,
sendLogs: true,
progressCallback: this.sendProgressCallback,
label: this.props.label,
labels: [this.props.label],
}).then(() => {
if (!this.unmounted) {
this.props.onFinished(false);
@ -128,7 +128,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
await downloadBugReport({
sendLogs: true,
progressCallback: this.downloadProgressCallback,
label: this.props.label,
labels: [this.props.label],
});
this.setState({

11
src/rageshake/submit-rageshake.ts
View file

@ -28,10 +28,11 @@ import SettingsStore from "../settings/SettingsStore";
import SdkConfig from "../SdkConfig";
interface IOpts {
label?: string;
labels?: string[];
userText?: string;
sendLogs?: boolean;
progressCallback?: (s: string) => void;
customApp?: string;
customFields?: Record<string, string>;
}
@ -67,7 +68,7 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true) {
const body = new FormData();
body.append('text', opts.userText || "User did not supply any additional text.");
body.append('app', 'element-web');
body.append('app', opts.customApp || 'element-web');
body.append('version', version);
body.append('user_agent', userAgent);
body.append('installed_pwa', installedPWA);
@ -120,8 +121,10 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true) {
}
}
if (opts.label) {
body.append('label', opts.label);
if (opts.labels) {
for (const label of opts.labels) {
body.append('label', label);
}
}
// add labs options

6
src/stores/AutoRageshakeStore.ts
View file

@ -98,7 +98,8 @@ export default class AutoRageshakeStore extends AsyncStoreWithClient<IState> {
const rageshakeURL = await sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
userText: "Auto-reporting decryption error (recipient)",
sendLogs: true,
label: "Z-UISI",
labels: ["Z-UISI", "web", "uisi-recipient"],
customApp: SdkConfig.get().uisi_autorageshake_app,
customFields: { "auto_uisi": JSON.stringify(eventInfo) },
});
@ -123,7 +124,8 @@ export default class AutoRageshakeStore extends AsyncStoreWithClient<IState> {
await sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
userText: `Auto-reporting decryption error (sender)\nRecipient rageshake: ${recipientRageshake}`,
sendLogs: true,
label: "Z-UISI",
labels: ["Z-UISI", "web", "uisi-sender"],
customApp: SdkConfig.get().uisi_autorageshake_app,
customFields: {
"recipient_rageshake": recipientRageshake,
"auto_uisi": JSON.stringify(messageContent),