gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake 

Include MXID and device id in rageshakes
This commit is contained in:
David Baker 2017-05-04 17:30:51 +01:00 committed by GitHub
parent e6e2e6989a 45efdbdd43
commit d419024da9
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vector/submit-rageshake.js
View File

@ -17,6 +17,7 @@ limitations under the License.
import pako from 'pako'; import pako from 'pako';
import q from "q"; import q from "q";
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg'; import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
import rageshake from './rageshake' import rageshake from './rageshake'
@ -64,6 +65,8 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
userAgent = window.navigator.userAgent; userAgent = window.navigator.userAgent;
} }
const client = MatrixClientPeg.get();
console.log("Sending bug report."); console.log("Sending bug report.");
const body = new FormData(); const body = new FormData();
@ -72,6 +75,11 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
body.append('version', version); body.append('version', version);
body.append('user_agent', userAgent); body.append('user_agent', userAgent);
if (client) {
body.append('user_id', client.credentials.userId);
body.append('device_id', client.deviceId);
}
if (opts.sendLogs) { if (opts.sendLogs) {
progressCallback("Collecting logs"); progressCallback("Collecting logs");
const logs = await rageshake.getLogsForReport(); const logs = await rageshake.getLogsForReport();