Merge pull request #10321 from vector-im/travis/rageshake-required

Require descriptions in mxSendRageshake and remove infinite loop in issue templates
This commit is contained in:
Travis Ralston 2019-07-12 08:12:03 -06:00 committed by GitHub
commit a1432ef0f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions

View file

@ -31,9 +31,10 @@ Describe here the problem that you are experiencing, or the feature you are requ
Describe how what happens differs from what you expected. Describe how what happens differs from what you expected.
Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug' <!-- Please send us logs for your bug report. They're very important for bugs
link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please which are hard to reproduce. To do this, create this issue then go to your
file a bug here too! --> account settings and click 'Submit Debug Logs' from the Help & About tab -->
Logs being sent: yes/no
<!-- Include screenshots if possible: you can drag and drop images below. --> <!-- Include screenshots if possible: you can drag and drop images below. -->

View file

@ -33,9 +33,10 @@ Describe here the problem that you are experiencing, or the feature you are requ
Describe how what happens differs from what you expected. Describe how what happens differs from what you expected.
Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug' <!-- Please send us logs for your bug report. They're very important for bugs
link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please which are hard to reproduce. To do this, create this issue then go to your
file a bug here too! --> account settings and click 'Submit Debug Logs' from the Help & About tab -->
Logs being sent: yes/no
<!-- Include screenshots if possible: you can drag and drop images below. --> <!-- Include screenshots if possible: you can drag and drop images below. -->

View file

@ -50,6 +50,10 @@ initRageshake();
global.mxSendRageshake = function(text, withLogs) { global.mxSendRageshake = function(text, withLogs) {
if (withLogs === undefined) withLogs = true; if (withLogs === undefined) withLogs = true;
if (!text || !text.trim()) {
console.error("Cannot send a rageshake without a message - please tell us what went wrong");
return;
}
require(['matrix-react-sdk/lib/rageshake/submit-rageshake'], (s) => { require(['matrix-react-sdk/lib/rageshake/submit-rageshake'], (s) => {
s(SdkConfig.get().bug_report_endpoint_url, { s(SdkConfig.get().bug_report_endpoint_url, {
userText: text, userText: text,