From 90212c76a5602a92577faaf3a465ec020cc4a8c5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jul 2019 13:24:47 -0600
Subject: [PATCH 1/3] Use r0 media endpoints for group tests

---
 test/components/structures/GroupView-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index d163a1d6cb..b0768d3911 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -187,7 +187,7 @@ describe('GroupView', function() {
             const avatarImgElement = ReactDOM.findDOMNode(img);
             expect(avatarImgElement).toBeTruthy();
             expect(avatarImgElement.src).toContain(
-                'https://my.home.server/_matrix/media/v1/thumbnail/' +
+                'https://my.home.server/_matrix/media/r0/thumbnail/' +
                 'someavatarurl?width=28&height=28&method=crop',
             );
 
@@ -265,7 +265,7 @@ describe('GroupView', function() {
             expect(longDescElement.innerHTML).toContain('<ul>');
             expect(longDescElement.innerHTML).toContain('<li>And lists!</li>');
 
-            const imgSrc = "https://my.home.server/_matrix/media/v1/thumbnail/someimageurl?width=800&amp;height=600";
+            const imgSrc = "https://my.home.server/_matrix/media/r0/thumbnail/someimageurl?width=800&amp;height=600";
             expect(longDescElement.innerHTML).toContain('<img src="' + imgSrc + '">');
         });
 

From 5f9a123a80fe7019d78de756b66b1bb85de2513f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jul 2019 09:14:31 -0600
Subject: [PATCH 2/3] Require an issue URL (or notes) on rageshakes

Fixes https://github.com/vector-im/riot-web/issues/8155
---
 src/components/views/dialogs/BugReportDialog.js | 9 ++++++++-
 src/i18n/strings/en_EN.json                     | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 4f9b592691..6a469161bb 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -50,6 +50,13 @@ export default class BugReportDialog extends React.Component {
     }
 
     _onSubmit(ev) {
+        if ((!this.state.text || !this.state.text.trim()) && (!this.state.issueUrl || !this.state.issueUrl.trim())) {
+            this.setState({
+                err: _t("Please enter an issue URL to help us analyse the problem."),
+            });
+            return;
+        }
+
         const userText =
             (this.state.text.length > 0 ? this.state.text + '\n\n': '') + 'Issue: ' +
             (this.state.issueUrl.length > 0 ? this.state.issueUrl : 'No issue link given');
@@ -93,7 +100,7 @@ export default class BugReportDialog extends React.Component {
         this.setState({ issueUrl: ev.target.value });
     }
 
-   _onSendLogsChange(ev) {
+    _onSendLogsChange(ev) {
         this.setState({ sendLogs: ev.target.checked });
     }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 449c6ce6bc..7588e7557a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1108,6 +1108,7 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
     "Invite anyway and never warn me again": "Invite anyway and never warn me again",
     "Invite anyway": "Invite anyway",
+    "Please enter an issue URL to help us analyse the problem.": "Please enter an issue URL to help us analyse the problem.",
     "Preparing to send logs": "Preparing to send logs",
     "Logs sent": "Logs sent",
     "Thank you!": "Thank you!",

From c89a864a82284880c01e7168ebd922308cff8014 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jul 2019 12:54:26 -0600
Subject: [PATCH 3/3] update copy

---
 src/components/views/dialogs/BugReportDialog.js | 2 +-
 src/i18n/strings/en_EN.json                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 6a469161bb..e00104b99c 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -52,7 +52,7 @@ export default class BugReportDialog extends React.Component {
     _onSubmit(ev) {
         if ((!this.state.text || !this.state.text.trim()) && (!this.state.issueUrl || !this.state.issueUrl.trim())) {
             this.setState({
-                err: _t("Please enter an issue URL to help us analyse the problem."),
+                err: _t("Please tell us what went wrong or, better, a github issue that describes the problem."),
             });
             return;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7588e7557a..4db032f665 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1108,7 +1108,7 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
     "Invite anyway and never warn me again": "Invite anyway and never warn me again",
     "Invite anyway": "Invite anyway",
-    "Please enter an issue URL to help us analyse the problem.": "Please enter an issue URL to help us analyse the problem.",
+    "Please tell us what went wrong or, better, a github issue that describes the problem.": "Please tell us what went wrong or, better, a github issue that describes the problem.",
     "Preparing to send logs": "Preparing to send logs",
     "Logs sent": "Logs sent",
     "Thank you!": "Thank you!",